gentoo resync : 27.10.2018

5 files changed, 48 insertions, 62 deletions

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 92c140791aaa..5409005870e3 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,7 +1,7 @@
+AUX libressl.patch 1373 BLAKE2B 8cc6dd14a7f79d95ef037be9267570ca476dd92ca002cdaec81f45681f656df26f38b7f98d8f1055277c4f7296a26e3965d7f3e47825b45bb84d458230d88849 SHA512 3fe7fdceecf2a232df280c54754b4458963d3fc8ac767380972c45b6ccbb73c1d4ae113426d57de117fd27539c2161c2e3c92ed2d03113dabdeae86d4593a128
 DIST irssi-1.0.7.tar.xz 1034188 BLAKE2B 738ac8c09bb70a1a4f2fea880cf745d38145637ba7afb02dca13be9ee8df1dc5f39eaedd9245a0511446d9ca3cac0a2729d818fa50ce8c2af1825aedc2d52e76 SHA512 f5593ffdbb15c815e1445d15379245a3dba7935a82a6caca0ca2b720e03000df06e6515f5f5d78eaec3923aafccea7396baf12ac945ecddd02664c5f10611bc5
 DIST irssi-1.1.1.tar.xz 1080992 BLAKE2B a7f7f2004958d9b71d0bba3dea2ee09ebd7f99246d9b6e950a36ae772e4e8c49e4f6be6b18b7cd05ec50397fef2b3c4d16dba41637773b149eff8f7755610df4 SHA512 b2fc0805d6213c31bc34c48237baf2e33ac509c0fa09c483fd39f1473e32eee227ff4532efc60fb495c2ec263c05290578bca7ad6d39149e0594f864da5986c0
-EBUILD irssi-1.0.7-r1.ebuild 1285 BLAKE2B 1f53752f6f47bfeebd6750603b7091ceaf1205e42fb08cb693968de1ec6e8df63a832384aca83f798e42b9a3894b8f9f495d83bbecbeeb4f2d6b509ebe86218b SHA512 86bc0b025697adc86cb4abe1bed602b1d3c5d7a3dc7cd05893a6b441b65c42af70d64ab657df1ffb1118931dffbe6712cf7dce3138e0eddac2d2d986e92620e4
-EBUILD irssi-1.0.7.ebuild 1245 BLAKE2B 32fa87796dbf411b5049432d30b90f81ff9f50e8191bdb7800226e2560c4c453d7e849860b8ceafb0f1e4c1b45f82a29fdb0e4e5e50ef5b2b0c7fb21d1c52e5c SHA512 81ddf2fc815a1233c38c0e701ab4ea3d0dd789b2fad8cc177372bbcf58e738b9d52c828ac3bf46ad6e4555a76365abe8abd32ef3c2deb27bbcd28ae14390c8e8
-EBUILD irssi-1.1.1-r1.ebuild 1274 BLAKE2B 718de0e5242f074832e73b2c3a345e75984901d94c75a5cdd45d4e0b02d46e19328df59e79b0d3982e34da6c0a5b5a8af9bdafabceb5dcc4fc0c059e012d1ef0 SHA512 1ff6aeeed105211b78be6047ad282e53fe111fe7aa52531ab26d1d740b22b1a78f96c5210b8ea7616621e56765db5dedfd7f99dd96d58c6c7be5d8a2404fed84
+EBUILD irssi-1.0.7-r1.ebuild 1275 BLAKE2B 5e6d98b2ef47c8959b787de49e7156ebca6bb0d7b2248c7a1896ac8e1a25de4d59a82e01826b7b90abba5cb3c717816bd0e47d1db5e504e0025b42929f2a4724 SHA512 79ac0eff964286913c97785f893bdf9dd9a0f18542088f1da8e43fe59000af47b77d5e4dad48f9dba2ed8565084ecbb7f047a5bce13353597cde9b4d6c68edea
+EBUILD irssi-1.1.1-r2.ebuild 1411 BLAKE2B c763c6b804232977a302c9f0fc5434558037066428c7b35b51e832c5ab61d07a650f67e878cbd17648b30950368f3a0dc30fa4bcd567e7e21532f860d662bc28 SHA512 b5e13b22ab3740b039bfcb47366779d8df0f6a96c0a644a7f8bd04bec756db00be790e434e9fb09f7cc2771ba66ab059c685203a3bb1e2893b2108deca59fff7
 EBUILD irssi-9999.ebuild 1227 BLAKE2B 05d2bdb2a2dfad06afb4951b4a489dbfc451fd97e40c6123c6b8bc8a4daa0f2a7fb772198da000da7a7db8fcc1deb59944df5742fdc773697815fd6deafbbcc3 SHA512 8bea8381bd09c5f4fc7bad261564eee950210a830f431bd3520e511f189d10fe2d4934fb4d0e0a7a5ed60049e53ffebf6ec1ba760970880988310e9dc3b5eb18
 MISC metadata.xml 631 BLAKE2B 1ed4dcb701f0884e365891d63aa8ae33d14bbc4b343703ea1ce446c3028ee115f4760fe42583c94e89f829f26dc0abf71192d216af4e6c241bc9a21ed1ab0cc6 SHA512 b3fbbd3085bf6e39d62373b9ac4eeaf423a019276d83319e2e72484763e3e1588c9060864cbb36c080847b6f46e299a17b61acfccea1dacdfdd0709f6c142543
diff --git a/net-irc/irssi/files/libressl.patch b/net-irc/irssi/files/libressl.patch
new file mode 100644
index 000000000000..644c73be32ff
--- /dev/null
+++ b/net-irc/irssi/files/libressl.patch
@@ -0,0 +1,33 @@
+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.0.7-r1.ebuild b/net-irc/irssi/irssi-1.0.7-r1.ebuild
index 5dfd52eed6e2..d9f5671ef476 100644
--- a/net-irc/irssi/irssi-1.0.7-r1.ebuild
+++ b/net-irc/irssi/irssi-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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="+perl selinux socks5 +proxy libressl"
 
 CDEPEND="
diff --git a/net-irc/irssi/irssi-1.0.7.ebuild b/net-irc/irssi/irssi-1.0.7.ebuild
deleted file mode 100644
index 3f6899b5e5d9..000000000000
--- a/net-irc/irssi/irssi-1.0.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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"
-
-CDEPEND="
-	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="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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.1.1-r1.ebuild b/net-irc/irssi/irssi-1.1.1-r2.ebuild
index 34f3518a7679..e14f79e14557 100644
--- a/net-irc/irssi/irssi-1.1.1-r1.ebuild
+++ b/net-irc/irssi/irssi-1.1.1-r2.ebuild
@@ -19,7 +19,7 @@ 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"
 
-CDEPEND="
+COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
 	!libressl? ( dev-libs/openssl:= )
@@ -28,11 +28,11 @@ CDEPEND="
 	socks5? ( >=net-proxy/dante-1.1.18 )"
 
 DEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 RDEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-irc )
 	perl? ( !net-im/silc-client )"
 
@@ -40,6 +40,13 @@ 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 \