Fix building against sys-libs/ncurses[tinfo] (bug #529892).

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

4 files changed, 33 insertions, 31 deletions

diff --git a/net-irc/xaric/ChangeLog b/net-irc/xaric/ChangeLog
index 74b56f539ec7..a9f5bbcc054a 100644
--- a/net-irc/xaric/ChangeLog
+++ b/net-irc/xaric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xaric
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xaric/ChangeLog,v 1.2 2014/01/14 06:38:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xaric/ChangeLog,v 1.3 2014/11/23 10:37:44 jer Exp $
+
+  23 Nov 2014; Jeroen Roovers <jer@gentoo.org> -xaric-0.13.5.ebuild,
+  xaric-0.13.6.ebuild, +files/xaric-0.13.6-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #529892).
 
 *xaric-0.13.6 (14 Jan 2014)
 
diff --git a/net-irc/xaric/files/xaric-0.13.6-tinfo.patch b/net-irc/xaric/files/xaric-0.13.6-tinfo.patch
new file mode 100644
index 000000000000..0fcfe3aa1846
--- /dev/null
+++ b/net-irc/xaric/files/xaric-0.13.6-tinfo.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -279,9 +279,10 @@
+   olibs="$LIBS"
+   AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $olibs",
+     AC_CHECK_LIB(termlib, tgetent, LIBS="-ltermlib $olibs",
+-      AC_CHECK_LIB(curses, tgetent, LIBS="-lcurses $olibs",
+-        AC_CHECK_LIB(xtermcap, tgetent, LIBS="-lxtermcap $olibs",
+-          AC_MSG_ERROR([i can not find tgetent.  you need to help me])))))
++      AC_CHECK_LIB(tinfo, tgetent, LIBS="-ltinfo $olibs",
++        AC_CHECK_LIB(curses, tgetent, LIBS="-lcurses $olibs",
++          AC_CHECK_LIB(xtermcap, tgetent, LIBS="-lxtermcap $olibs",
++            AC_MSG_ERROR([i can not find tgetent.  you need to help me]))))))
+ fi
+ 
+ dnl ----------------------------------------------------------
diff --git a/net-irc/xaric/xaric-0.13.5.ebuild b/net-irc/xaric/xaric-0.13.5.ebuild
deleted file mode 100644
index 95f345da9c96..000000000000
--- a/net-irc/xaric/xaric-0.13.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xaric/xaric-0.13.5.ebuild,v 1.2 2010/03/24 20:30:21 ssuominen Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="An IRC client similar to ircII, BitchX, or ircII EPIC"
-HOMEPAGE="http://xaric.org/"
-SRC_URI="http://xaric.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	dev-libs/openssl"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-	doicon xaric.xpm
-}
diff --git a/net-irc/xaric/xaric-0.13.6.ebuild b/net-irc/xaric/xaric-0.13.6.ebuild
index 17060c517b52..d2c7e98277c9 100644
--- a/net-irc/xaric/xaric-0.13.6.ebuild
+++ b/net-irc/xaric/xaric-0.13.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xaric/xaric-0.13.6.ebuild,v 1.1 2014/01/14 06:38:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xaric/xaric-0.13.6.ebuild,v 1.2 2014/11/23 10:37:44 jer Exp $
 
-EAPI=2
-inherit eutils
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="An IRC client similar to ircII, BitchX, or ircII EPIC"
 HOMEPAGE="http://xaric.org/"
@@ -12,13 +12,19 @@ SRC_URI="http://xaric.org/software/${PN}/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="sys-libs/ncurses
 	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
+	default
 	doicon xaric.xpm
 }