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

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

5 files changed, 46 insertions, 35 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/Manifest b/net-irc/xaric/Manifest
index 61254210c224..0803f9960caf 100644
--- a/net-irc/xaric/Manifest
+++ b/net-irc/xaric/Manifest
@@ -1,6 +1,15 @@
-DIST xaric-0.13.5.tar.gz 454516 SHA256 36fb68e0c01b85e7613bd7ca68abd9023c05bef41a195192ea3648d27c95e4ba SHA512 16694091c954b6a50a58300f73f218d7970bf4660545154f21f8846bad9b572cf5cf52c86d0ddc2b80f9d5d60b8aade06c95d3439bd616ba7e8dcd9d3c6c1b11 WHIRLPOOL d1eb9a13aed446aada458076626d7be960c322fd51578d6dd5aacb7c82772b5a3143fbb935bc3560c1def5909cc4551e06f296cfbd3646f4181191cd3c45101f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xaric-0.13.6-tinfo.patch 740 SHA256 74497f9286f29c169d1e5eb2d1bfb0be7cdc11ed55822abb40d19ee8007f84b0 SHA512 bf74a17c714e38c84bdaefd2183928918c221e5bcbcf292ceb8427e719b148d0e0ebb7114d636ba42b0bcfc3a6a021613b4eb648c8d9ba137817f0700043b27a WHIRLPOOL ce2e7f33212df838010475f3c375513db8d1f826dd10bca6fe4f6803c05a170c250ea80923877e219c0b2b8d24b2d87d16ba19f8c7306af9354a906506b68bc4
 DIST xaric-0.13.6.tar.gz 479754 SHA256 dbed41ed43efcea05baac0af0fe87cca36eebd96e5b7d4838b38cca3da4518bb SHA512 1c52e30cfab49d82306cd0b4402175f68cfc411b7ef04156b2361fadeea01648476742015306a0c242c13f4ab29916e8ac48a59f481ecdb5475584ef6cdf028f WHIRLPOOL b76afdbaa6e0352af8bc6a9fc76fced02f9a8c6210b1e6092a3b31a160ca3bd3095bcc959837c1a0c7142d73a5c03d32a743626f638f7f4110b53028968efba9
-EBUILD xaric-0.13.5.ebuild 610 SHA256 0b203e35873d1181943eb28ce0388acb22e945983094c521ade5c0a19a32f874 SHA512 384b64c5a086f446cfbf7b97e80639b23232b930f7a3c5e01967f259f9699fd7b60293fb5a7ca87f1a3caddaf9fc411c23bed0b19a94e3d6004e3b9745049e6b WHIRLPOOL adf0963e8867dbc8d73881c271fe5d465eb150f57e666b2f4871c3eda46effeb8d0b8827048d9cade9b805f93b55432c80bb5d187f09ddd03c0c68144c7334a0
-EBUILD xaric-0.13.6.ebuild 608 SHA256 463b2356680daf9a16a0f818adce9c6b9d62627d5d5943b9cf327b81d5fdc6ba SHA512 105833b63dd1d925ab959be05c7160a549139048d6b2b94ed334fa8adba25dbc48f7835000d56afd59f57e8729459ce7f3d7b2d0145fab9d081c6a89d6b6bce0 WHIRLPOOL 831147a17cad171b279b6ac7a783593096d86e1956cbfd0eacd34a3ac18711f25f75d7be7f25d0d359d5977c68a134497962e070459f298aa4d13e0aed8c05f7
-MISC ChangeLog 432 SHA256 b87764e483bac12ecf378b505c456daac1637bb66d7d9fee9f543af9ae98ea6f SHA512 4ade6ab9af8b208f1d27c625dd73b900bda746dfa87bb73b955fdc24d7deac50d3e2f290bf03356c47e03e88433462d4b908f23141ee893fdb136f147724b2a4 WHIRLPOOL 072aa69fed741e79b9fda2918300a14c02fac82d91b158e4441df4f939c8449f0ba34bc9c49f15bdc46de9816e165cfd4b8404246003422acec91093f8627d8a
+EBUILD xaric-0.13.6.ebuild 672 SHA256 c983b92a6257c640e79e5cd196e78cc09d47df5bb51bed5c305e834986b8a715 SHA512 bec3412c0bc273767b53bfca7d40da4b5f38f303bf954f0eeefa9561b9e32afebd6c280289d5557671a8ca65c859a8b9ce66b464ec677bcc3a2fdba625e0d4a4 WHIRLPOOL 50db72c1106d695af99424f5f5f88a2e87eb8c1959eb2cdab8c0649103b65453da98b714e35faac6dfdfc6efe834f9128a5477fdb1c7586e71d4448b8dbf1b98
+MISC ChangeLog 616 SHA256 80f7d7f9309b8f3cb0388d0b68532811efe4d7a5090ff72c9f7c63e0d5f99487 SHA512 7ed6fd6a5fa72a4fb64615d015002cffdafbe3395774a20f125c8b7237221de6fb703d25f029a31af2b57ee429b2d8dfa13b01046d32b7bab0a23e16edd15348 WHIRLPOOL fed5405ce2e3853e5ba4d19220484202485959dd4134783fa62e5fdbcca58727dc1be738e478437994e6f39922887ba21bfbfcdda1653d8ba65c9fb1e71b9852
 MISC metadata.xml 162 SHA256 afb3bb5da42503b529a3a59e275a16c61aae4905b9bd817eeaf2ea6565f7ca1a SHA512 863bdcc2bb5a14e115295b033a888c81256e72c2d0bc7368cd6761ba31f587007c2914a711d17a0f5c814e3e94ac55178f022161c9744f346208a368c0604d9d WHIRLPOOL 5615e70e147dadc280d0fe41e01417f660e45ad00f81e061540e3079ba13111a0851ca4af4d7399e7d453030d10ae5753889e5b0b63760fe2b1293ed7991f18d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlRxuPkACgkQVWmRsqeSphN3LQCfQeAp1OppKwupbRHMQiy8DcgE
+t8AAnAuPEeWOT0mxG8kI4DVS5OAMv7GR
+=6ZEJ
+-----END PGP SIGNATURE-----
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
 }