gentoo resync : 16.02.1018

5 files changed, 98 insertions, 12 deletions

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 89f82ba7ce5f..bde3eff1505d 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,5 +1,7 @@
 AUX libressl.patch 1373 BLAKE2B 8cc6dd14a7f79d95ef037be9267570ca476dd92ca002cdaec81f45681f656df26f38b7f98d8f1055277c4f7296a26e3965d7f3e47825b45bb84d458230d88849 SHA512 3fe7fdceecf2a232df280c54754b4458963d3fc8ac767380972c45b6ccbb73c1d4ae113426d57de117fd27539c2161c2e3c92ed2d03113dabdeae86d4593a128
 DIST irssi-1.1.2.tar.xz 1084328 BLAKE2B 6f4e49097d97a511d0fd679806bfa3d261c26f9160ed66d34e7d314b3f330accf90c5e019c31dafd5418c25d538fcb44fc35fcdf6210370f640ff95743556a9a SHA512 706f811c810b976888101a29bab6ff6b9aa6116678994b3710d6b266bfbc0ae2be1d4fd889aedfbf0a13a2e3da3f1affcce0018346ecc582865eaccd8cc79f84
-EBUILD irssi-1.1.2.ebuild 1411 BLAKE2B aee21f4d5e4f7b1dad271613e871400fa23015e9bf6d0ef3bdd69d89ca308d34b2eb20ee618fa4ec698dcc0ee37b3b7fda9ce0066dc0fe86b6969d6e2610d44a SHA512 d5d991a674356a75bb3f69b309811245dfeb2733bc71d9abdffe3a1e9db0c847de27e12453f8b02e96f12a9644557707094530128fccb3e593a58658e6944617
-EBUILD irssi-9999.ebuild 1227 BLAKE2B 05d2bdb2a2dfad06afb4951b4a489dbfc451fd97e40c6123c6b8bc8a4daa0f2a7fb772198da000da7a7db8fcc1deb59944df5742fdc773697815fd6deafbbcc3 SHA512 8bea8381bd09c5f4fc7bad261564eee950210a830f431bd3520e511f189d10fe2d4934fb4d0e0a7a5ed60049e53ffebf6ec1ba760970880988310e9dc3b5eb18
-MISC metadata.xml 631 BLAKE2B 1ed4dcb701f0884e365891d63aa8ae33d14bbc4b343703ea1ce446c3028ee115f4760fe42583c94e89f829f26dc0abf71192d216af4e6c241bc9a21ed1ab0cc6 SHA512 b3fbbd3085bf6e39d62373b9ac4eeaf423a019276d83319e2e72484763e3e1588c9060864cbb36c080847b6f46e299a17b61acfccea1dacdfdd0709f6c142543
+DIST irssi-1.2.0.tar.xz 1138984 BLAKE2B 940b8fb0c6633ea82ccd242241a39b67fa1a356aa58758ca9e0388971ccaabbdfe954140d27abd06d1ca36d0aac14decbb1fd0929d969305abfaa9c9dbeafd24 SHA512 343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40
+EBUILD irssi-1.1.2.ebuild 1410 BLAKE2B e4afbeeef63408b98189f96df84a368068e8d1985158629928c0a8d7acd1eb6784b1a66eb34a1313873b529552012a3bb6bdb59af7e091c5e7398ee81370b926 SHA512 8ce49e74840ebdfa69fc56b9ec1d99bbd336990eb94e53a6a91beddafbd26f5c2f0ab519a31590aab1fa1bdf61d91d1c26432957d7883d99805132ade9dd0421
+EBUILD irssi-1.2.0-r2.ebuild 1682 BLAKE2B 8fedd75612c97e83231bed5a2034c6cae76728efcdc3991e6a894d11818378f1f6fe5465eff528255ab713f9a7999e34ee64ec22c7072a81644c9a861a4d5b5f SHA512 174046f531ec95f1398e8d46c4343e1a123b6ca7b6b5efd547176e6f6fcc43e48add2fe0c6e3ba4c0943082bd2b96f4e8386a5a8db4cef88e427277cf0500ba9
+EBUILD irssi-9999.ebuild 1487 BLAKE2B 3f83206f2b22dc6de4636cd749549383cbf82068e6415564ec5afa1aeb6a4d06e99b8f0f6e2cc7cd8db4d455c37bc89f28e67d9412c7342f79634620074cd118 SHA512 035223cce0c3bd26a1862c4bb88e60e3d7138e84d01bacbc21d621b6d2ccefbbcac6106ba5eef9ca5f40205a2065a8eb1956064c89899dd956ed0b04bed581d3
+MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
diff --git a/net-irc/irssi/irssi-1.1.2.ebuild b/net-irc/irssi/irssi-1.1.2.ebuild
index f2d403eeb5a9..a431ec54825e 100644
--- a/net-irc/irssi/irssi-1.1.2.ebuild
+++ b/net-irc/irssi/irssi-1.1.2.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="+perl selinux socks5 +proxy libressl"
 
 COMMON_DEPEND="
diff --git a/net-irc/irssi/irssi-1.2.0-r2.ebuild b/net-irc/irssi/irssi-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..36f6a5c7d237
--- /dev/null
+++ b/net-irc/irssi/irssi-1.2.0-r2.ebuild
@@ -0,0 +1,72 @@
+# 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
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
+		>=net-libs/libotr-4.1.0
+		!net-irc/irssi-otr )
+	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() {
+	# 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-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 615a7053a1c8..73df7ceb2125 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,12 +14,17 @@ HOMEPAGE="https://irssi.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+perl selinux socks5 +proxy libressl"
+IUSE="otr +perl selinux socks5 +proxy libressl"
 
 CDEPEND="sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( dev-libs/libressl:= )
+	otr? (
+		>=dev-libs/libgcrypt-1.2.0:0=
+		>=net-libs/libotr-4.1.0
+		!net-irc/irssi-otr
+	)
 	perl? ( dev-lang/perl:= )
 	socks5? ( >=net-proxy/dante-1.1.18 )"
 
@@ -41,17 +46,23 @@ src_prepare() {
 	sed -i -e /^autoreconf/d autogen.sh || die
 	NOCONFIGURE=1 ./autogen.sh || die
 
-	eapply_user
+	default
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
+	# 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() {
diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml
index 186512652415..4944f1133301 100644
--- a/net-irc/irssi/metadata.xml
+++ b/net-irc/irssi/metadata.xml
@@ -14,6 +14,7 @@
 		<name>Mikle Kolyada</name>
 	</maintainer>
 	<use>
+		<flag name="otr">Adds support for a loadable IRC otr module</flag>
 		<flag name="proxy">Adds support for a loadable IRC proxy module</flag>
 	</use>
 	<upstream>