gentoo resync : 02.08.2019

5 files changed, 2 insertions, 168 deletions

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 9100a843d325..8de224425508 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,9 +1,4 @@
-AUX libressl.patch 1373 BLAKE2B 8cc6dd14a7f79d95ef037be9267570ca476dd92ca002cdaec81f45681f656df26f38b7f98d8f1055277c4f7296a26e3965d7f3e47825b45bb84d458230d88849 SHA512 3fe7fdceecf2a232df280c54754b4458963d3fc8ac767380972c45b6ccbb73c1d4ae113426d57de117fd27539c2161c2e3c92ed2d03113dabdeae86d4593a128
-DIST irssi-1.1.2.tar.xz 1084328 BLAKE2B 6f4e49097d97a511d0fd679806bfa3d261c26f9160ed66d34e7d314b3f330accf90c5e019c31dafd5418c25d538fcb44fc35fcdf6210370f640ff95743556a9a SHA512 706f811c810b976888101a29bab6ff6b9aa6116678994b3710d6b266bfbc0ae2be1d4fd889aedfbf0a13a2e3da3f1affcce0018346ecc582865eaccd8cc79f84
-DIST irssi-1.2.0.tar.xz 1138984 BLAKE2B 940b8fb0c6633ea82ccd242241a39b67fa1a356aa58758ca9e0388971ccaabbdfe954140d27abd06d1ca36d0aac14decbb1fd0929d969305abfaa9c9dbeafd24 SHA512 343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40
 DIST irssi-1.2.1.tar.xz 1140380 BLAKE2B 11ab48ce6d7efa0a4c33f823dd414660107d94b9f00c863feb8377f4586e6c62043932bdcf35f1f4e9e9ab545ccc3bb0bfd207727e55856243c8494ae6172cf9 SHA512 67c4501b5a0055c1b24fa6753305658de809cd66e952e6f9233701a112989fd8721a065b1c681725b82346b40b53a29bd2b6b8b8315ac0ad196235a9e5156d5a
-EBUILD irssi-1.1.2.ebuild 1410 BLAKE2B e4afbeeef63408b98189f96df84a368068e8d1985158629928c0a8d7acd1eb6784b1a66eb34a1313873b529552012a3bb6bdb59af7e091c5e7398ee81370b926 SHA512 8ce49e74840ebdfa69fc56b9ec1d99bbd336990eb94e53a6a91beddafbd26f5c2f0ab519a31590aab1fa1bdf61d91d1c26432957d7883d99805132ade9dd0421
-EBUILD irssi-1.2.0-r2.ebuild 1561 BLAKE2B 1071df359650b4e3cc737aa83b4ce0eadbb71bee59f8461706e00ae01a79703e1ba46b4f3a5d38fc96db0f173cc818ee443a42d6ddebc70d73b52c4d1fa9a8e5 SHA512 82d93c6d99cc7563a3460e0a739955c89ab5132d704f9734d3d19d4cc300182c27e5838a37e20ebaa86f10d83e0832ad244c0e67fbb937ec9ed0dcaa5363cf08
-EBUILD irssi-1.2.1.ebuild 1578 BLAKE2B 4ca97e543571e31494079a554d418607741a0a64c4320a789a29c37bf647839a726516e07de8f2237db8177a68ec499b70ac3b9ba1574340de28bb844f912bfe SHA512 98895d9f04521dc7f35c6725555bb37e251f750cc618abf9de2739c0f82bb0a09e14c8303365ac3ed10eea356f6c75ceda5ac5974263ec8105e31247cd6aabb4
+EBUILD irssi-1.2.1.ebuild 1576 BLAKE2B fe7fcbdfa0415293d8b2a0d06da8ae3e08d9c388b88bddea6ada08ae5f1942eeaed3c9b8660a66333667677aa20dfe31975475a2811817a664025f7996846335 SHA512 4e15b662b4ebec22e07ad4e68197ea2c18f62c2defb9270934b4a7335fc502d7a8ff1ee8ba0970bdf57878c087c7c3dabe8cea8dad6621e8cd0d428b25f2726d
 EBUILD irssi-9999.ebuild 1486 BLAKE2B 2742c15d0b3f5a2787aeea9db79693e36845957a28b5146e8eb839278681f538d7be2e46d37875e5f230b0edc7fa37a79809f2ba93f6927363398201335c030f SHA512 ba8be2fe7989ed59714cc454b372edf377261cb5b2fcbe6cfaec10f9fef1b1871d238ab3920f05b1c8da93d2f35b7049dbf12418659eedff457e99b225959159
 MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
diff --git a/net-irc/irssi/files/libressl.patch b/net-irc/irssi/files/libressl.patch
deleted file mode 100644
index 644c73be32ff..000000000000
--- a/net-irc/irssi/files/libressl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 25a44dacf4114f33f3a887f358c02f4fd9938427 Mon Sep 17 00:00:00 2001
-From: Dorian Harmans <dorian@woohooyeah.nl>
-Date: Fri, 23 Mar 2018 21:35:35 +0100
-Subject: [PATCH] fix build with LibreSSL 2.7.0
-
----
- src/core/network-openssl.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
-index 9fddf073e..692c7e716 100644
---- a/src/core/network-openssl.c
-+++ b/src/core/network-openssl.c
-@@ -35,7 +35,8 @@
- #include <openssl/err.h>
- 
- /* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
-+    (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- /* The two functions below could be already defined if OPENSSL_API_COMPAT is
-  * below the 1.1.0 version so let's do a clean start */
- #undef  X509_get_notBefore
-@@ -47,7 +48,8 @@
- 
- /* OpenSSL 1.1.0 also introduced some useful additions to the api */
- #if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+    (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static int X509_STORE_up_ref(X509_STORE *vfy)
- {
-     int n;
diff --git a/net-irc/irssi/irssi-1.1.2.ebuild b/net-irc/irssi/irssi-1.1.2.ebuild
deleted file mode 100644
index a431ec54825e..000000000000
--- a/net-irc/irssi/irssi-1.1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit ltprune perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+perl selinux socks5 +proxy libressl"
-
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if has_version '>=dev-libs/libressl-2.7.3'; then
-	eapply "${FILESDIR}"/libressl.patch
-	fi
-}
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	default
-	use perl && perl_delete_localpod
-	prune_libtool_files --modules
-}
diff --git a/net-irc/irssi/irssi-1.2.0-r2.ebuild b/net-irc/irssi/irssi-1.2.0-r2.ebuild
deleted file mode 100644
index 83dffcd5041b..000000000000
--- a/net-irc/irssi/irssi-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit ltprune perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="otr +perl selinux socks5 +proxy libressl"
-
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!net-irc/irssi-otr
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( >=dev-libs/libressl-2.7.4:= )
-	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-		>=net-libs/libotr-4.1.0 )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
-	export ac_cv_lib_utf8proc_utf8proc_version=no
-
-	local myeconfargs=(
-		--with-perl-lib=vendor
-		--enable-true-color
-		$(use_with otr)
-		$(use_with proxy)
-		$(use_with perl)
-		$(use_with socks5 socks)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	use perl && perl_delete_localpod
-	prune_libtool_files --modules
-}
diff --git a/net-irc/irssi/irssi-1.2.1.ebuild b/net-irc/irssi/irssi-1.2.1.ebuild
index 7e00a0652972..07e3cb75fc68 100644
--- a/net-irc/irssi/irssi-1.2.1.ebuild
+++ b/net-irc/irssi/irssi-1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="otr +perl selinux socks5 +proxy libressl"
 
 COMMON_DEPEND="