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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 10 insertions, 69 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/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>