Revert this until we have a better solution (bug #453396).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 16 insertions, 76 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index ab6b44b344fd..acc1a22c2bd3 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/irssi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.181 2013/12/26 17:58:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.182 2013/12/28 18:04:35 jer Exp $
+
+  28 Dec 2013; Jeroen Roovers <jer@gentoo.org> -irssi-0.8.15-r2.ebuild,
+  irssi-9999.ebuild, metadata.xml:
+  Revert this until we have a better solution (bug #453396).
 
   26 Dec 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Join <flag> lines.
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 82cacc1dc0d4..7b5fe0408830 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -3,14 +3,13 @@ Hash: SHA256
 
 DIST irssi-0.8.15.tar.bz2 948847 SHA256 c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6 SHA512 cecda925ae7c422fd95e8e94a123be8732a59a3a3c5d149b2fe16e1cac78cc516acb7a89ad79cf4ac0c412c9d4d3ea83fe5c0535ab6428e98479dc8909d0615a WHIRLPOOL 67c9f3f995d7d2e58b61c88d00bf4b5b7bb30181b143deac23a701422bdb5857642d346f34c75307954064da4f21752bd1f860da69446554c2658db3f28163f3
 EBUILD irssi-0.8.15-r1.ebuild 1395 SHA256 3489c64d044cc3300ef029df31414922d3d7b556404cc8110e0bf8d67c029e3a SHA512 2fe38b8d97d8d0f5b7f156cc47e5095604d25cdea2c088cb5212284cb178360d97feecca817f0abd456a39fd9d34f745bb41fde9eb2d4d61dbcace24b1e3603c WHIRLPOOL 2e06e9ef92dbbee11aabbf6f4339c486ede284faa89f74aa4c74dac848f62c6fb61388f5f5785b21188269bcbcb3cfab7e9e37746ee1ae8ad902ce3630f12f5b
-EBUILD irssi-0.8.15-r2.ebuild 1491 SHA256 7603a0e13a93d003810b1f0a0f4ab675c975701314acb487c3ee0bb71f0cbf7d SHA512 84f2f82180067f296b86b617ac477059bc3ce8525d2cdcc150e2f53eed2e8aef1a723511abcb56a49e115364f64c1735fd9e6ce4161d3efedb1f71d647a0d7e9 WHIRLPOOL bddba1593696c6414d355273af85b18dd62ad477f23b420ae9c6f121c8d77ce7de666e8fdbaa48bc3907dc6e3e290a1a9702637e1d92ecd7548885525f45f01b
-EBUILD irssi-9999.ebuild 1429 SHA256 87b5d1f8bc0ae714fa3d164a698267024a0d427fd0dd8b19414600231110c5ce SHA512 35b1b27e863c3452c74cac223e7fbe714fab57594cfb5ad200cec5bbe05721ee5ed988c55e0d16a44438f42735d44032a286679db2278a4dd96b66acf6a54304 WHIRLPOOL d4758402dc7cddf98531aa598bc64708c94dfc2fc748805c533c5fb7d40a47ccedbb637ad567da299220b7e17be690669a3fc5ad6d388074f8f558b40edaaca7
-MISC ChangeLog 24390 SHA256 f3a73f507f5f0fda21ead4251693af50f04a1cfeaef947faf505820e1d1c6253 SHA512 a9bbbbebb3f57e5eceed938d167ad7085c91468a8b0fe046b1a492df539d489a26f0919bc21a70f850b012edab8094869e76d0480b44b00bcc63f9ce5cf132e6 WHIRLPOOL 035a1c434d8bbe5260c2f9275f9f17b1a88588185a3a6643198008c94869499c1e656c53fcc970d0d365eb6288ccdb882bb00b63a09d3ed51ba568e193c5b094
-MISC metadata.xml 360 SHA256 b86fb41cec21279ca0c4319b2437bb43aff7f818cca95deddc826523face0a73 SHA512 2255482d9e7f834298e148b2376c15e5c31d996b5711f70cf17f25a0f531b684f7ce9bb49531c817408bc05e8d033ce27c8c0b581d504d8eab271df2b306418e WHIRLPOOL 82e9374fc7fc4290e04c213869882435f0d149d251cdeafd53dd39f653cadca2aed4230241f9447e5f8bdafacea0b94834f0a4679fd72c599d44052ff187b801
+EBUILD irssi-9999.ebuild 1351 SHA256 88103f701e85596a30b2b2a8dd44cc3044ceef2a0843e84d683abf823ff2e20a SHA512 0f9a97f7243a1b9f4bfe7e2cba43fa8ca70a71ef187f41928b9eb81f0fe946d3e5c0139c897db93c1998c2f624497a1f213cbcb152b69eedd850b669448ff367 WHIRLPOOL 1caf2dcccbac33883a0e2f8d58ded3f21248ee9345765a935031e3c4c1d0c010c560a8f5b2dc9fb26561cee068ae5791f5615724bb02dab38e5f2f1bb5cb6a8c
+MISC ChangeLog 24559 SHA256 762831ddbf7fe94158ac95c58a4a9a52b61f071a4ee2e67fc7718884f15a7fb3 SHA512 05f10a4debc5395e976e5fda3b4c3450aae7d0927b571a97233e67b55e69d3afea742f9a721588dc2e388b765cc482066cbf992e631e06a42f37e68f12315f5b WHIRLPOOL a0dea3e93fa86f516456227810a0d1f03d2d73abee13496474947a5daf46e56834b490bfc9f6ffbf4035dfb49c0d49d2c7ec8ed3e7003fd406fcf3ebcc4786e5
+MISC metadata.xml 270 SHA256 4962741e0eded229c8ac0cca6dc8fed203d9b63ed7d8de546c661e6661579c75 SHA512 d5854a0d3b4ba749b35e980202f1bb430bb0ffe7de651d381e52b59407486fb0b32bca09f9cbfcd1c94896e90c822eb3f425f28190b680a56b0bbb802933a781 WHIRLPOOL 375e0a25bf1b6bb3212c7a9ce1f0f03b10f6fabf4ebe3007c28a43d92a92e7ce3a2d51d591ddc86caa1c368c6daebff62847792078983371528859a11b0a2a7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK8bkUACgkQVWmRsqeSphPCqQCfR8nKAdrHC0YYUDgLiirC1uAO
-okMAn0450SZJbt0sXdlFVx53y07FdRJD
-=CFQq
+iEYEAREIAAYFAlK/ErgACgkQVWmRsqeSphMw8wCdHK0d3bK3sjeTFXixr2QIcEdY
+Tp0An13qWY7Id7Yam4F6u47YDy6mdgZI
+=vf7c
 -----END PGP SIGNATURE-----
diff --git a/net-irc/irssi/irssi-0.8.15-r2.ebuild b/net-irc/irssi/irssi-0.8.15-r2.ebuild
deleted file mode 100644
index cf5008b7c60c..000000000000
--- a/net-irc/irssi/irssi-0.8.15-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.15-r2.ebuild,v 1.1 2013/12/26 15:57:35 jer Exp $
-
-EAPI=4
-
-inherit perl-module libtool
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="http://irssi.org/"
-SRC_URI="http://irssi.org/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6 +perl ssl socks5 tinfo"
-
-RDEPEND="sys-libs/ncurses[tinfo=]
-	>=dev-libs/glib-2.6.0
-	ssl? ( dev-libs/openssl )
-	perl? ( dev-lang/perl )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	perl? ( !net-im/silc-client )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epunt_cxx
-	elibtoolize  # for Darwin bundle
-}
-
-src_configure() {
-	econf \
-		--with-proxy \
-		$(usex tinfo '--with-terminfo --without-ncurses' \
-			"--without-terminfo --with-ncurses="${EPREFIX}"/usr") \
-		--with-perl-lib=vendor \
-		$(use_with perl) \
-		$(use_with socks5 socks) \
-		$(use_enable ssl) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	use perl && fixlocalpod
-
-	dodoc AUTHORS ChangeLog README TODO NEWS
-}
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 8d1be6dee97e..4d752494cbd8 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-9999.ebuild,v 1.6 2013/12/26 15:57:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-9999.ebuild,v 1.7 2013/12/28 18:04:35 jer Exp $
 
 EAPI=4
 
@@ -15,9 +15,9 @@ HOMEPAGE="http://irssi.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="ipv6 +perl ssl socks5 tinfo"
+IUSE="ipv6 +perl ssl socks5"
 
-RDEPEND="sys-libs/ncurses[tinfo=]
+RDEPEND="sys-libs/ncurses
 	>=dev-libs/glib-2.6.0
 	ssl? ( dev-libs/openssl )
 	perl? ( dev-lang/perl )
@@ -41,8 +41,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--with-proxy \
-		$(usex tinfo '--with-terminfo --without-ncurses' \
-			"--without-terminfo --with-ncurses="${EPREFIX}"/usr") \
+		--with-ncurses="${EPREFIX}"/usr \
 		--with-perl-lib=vendor \
 		$(use_with perl) \
 		$(use_with socks5 socks) \
@@ -53,7 +52,7 @@ src_configure() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		install
 
 	use perl && fixlocalpod
diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml
index b09037a6cddd..b7d13cc9117d 100644
--- a/net-irc/irssi/metadata.xml
+++ b/net-irc/irssi/metadata.xml
@@ -6,7 +6,4 @@
 	<email>swegener@gentoo.org</email>
 	<description>Primary Maintainer</description>
 </maintainer>
-<use>
-<flag name='tinfo'>Use only libtinfo from <pkg>sys-libs/ncurses</pkg></flag>
-</use>
 </pkgmetadata>