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

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

4 files changed, 42 insertions, 35 deletions

diff --git a/net-im/pork/ChangeLog b/net-im/pork/ChangeLog
index 46bcddf3bee2..73791ba0b8b3 100644
--- a/net-im/pork/ChangeLog
+++ b/net-im/pork/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/pork
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pork/ChangeLog,v 1.45 2014/08/30 12:29:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pork/ChangeLog,v 1.46 2014/11/10 10:37:48 jer Exp $
+
+  10 Nov 2014; Jeroen Roovers <jer@gentoo.org> pork-0.99.8.1.ebuild,
+  +files/pork-0.99.8.1-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #527592).
 
   30 Aug 2014; Michał Górny <mgorny@gentoo.org> pork-0.99.8.1.ebuild:
   Replace einstall with emake install, bug #521436.
diff --git a/net-im/pork/Manifest b/net-im/pork/Manifest
index 5760b91250d9..349ccb150278 100644
--- a/net-im/pork/Manifest
+++ b/net-im/pork/Manifest
@@ -1,26 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pork-0.99.8.1-tinfo.patch 350 SHA256 77ac5deec59b8638e443f6b864304abc29f885aea25addb9fef267125ce9f483 SHA512 a5828caf0c05b9692cb1f9f6a3e2765a73d7661cc4c648f93fd5364d0725149ea26808e6d938dcf88cdb76ab019c96738e6e56a992b839d4f71dd9644c65e8b0 WHIRLPOOL 145b1547a356230f1daf444082edd530e0c0ea0cb674bcb0ea182e21883fe7239299a7f0909ec211aa6fd48f808be92f6dac1bfa656b391976a61a5fe0df6bef
 DIST pork-0.99.8.1.tar.gz 490425 SHA256 f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed SHA512 20efae37c847e4f4552280832c252341f3d541a08f94df21b780d130bb9dc61cf3464f99e119c01a540572a96340d84ed04e81458c0908357693b6af50d6e77f WHIRLPOOL d507920b28046172c607be05b1acbbbcef0889dd2ca1a39d2751e4753939eac868a43076f3281be8f9336eb226528f92fcdb1767c9909b68f0ce482718c108f6
-EBUILD pork-0.99.8.1.ebuild 1030 SHA256 85cfc82a2810a42cad5fe37eab9c921f8573cf13b6b88067fc8ed263703f42e0 SHA512 b22a3ca88ca63538197b03ea6d2213a7762f7a735a2464d0a217215c4e3cd534bbf204d4667e19388bc9f49d6d8a6f921d93c6b9162a375628d4b077c191467e WHIRLPOOL c86581fe551c697e3d77f3108706faaf4c31e772455ae8ccc64050286759502769b222e370ac35baf6f85ab36441524fcdafecbc18c3557f463cfc7d85c00944
-MISC ChangeLog 5409 SHA256 9d38f65a85b5bd686b4a8ac6e7e765ef2f4ee1c730bc69556307f4e4910f9f2b SHA512 71378f72de51fd4c0ce65a79a05b14ca24364ebd195ccc194c9f1ddc0dc1510f2bc61fe7f071d9a3c5ae8b2250cb9adc56409aca291080830b31370788257db1 WHIRLPOOL 5f538149b9a65722843e587ea159b89b931997b9b35b7f169b3985dfdd531e7486a56657f26390cee04f5ad915e015a42ca483d1dfd6e0feec7b941077e6e9f1
+EBUILD pork-0.99.8.1.ebuild 884 SHA256 f423ea4dc8284e00d8fc09cc0fad64b2720d97de9fd75c288b4cc1ca342d9a01 SHA512 26189312c317fdc67e51d583f899547b03c27a1ebb6bf4cab16cf46dd4ee126561c914e9a22f21f18d4b90e8262457b0199209de0ac61faec9e71024bacdf206 WHIRLPOOL c9ff2f0ed07a450f39eca25c25147dd6f17d8ecfec0b4a5d1b09f19ede38356ba9fb337a9155ee2193d92a6dab28a2d81c5fd08f0a0b0b4b8b16a3aa10b1f419
+MISC ChangeLog 5574 SHA256 684ca6f615838ba6eacfd7f8d96174e898f1352ede1c9f7e8270fbefa3852310 SHA512 e3e1469762b04624b882d28941b7128160841dcc24f4d02ef9750520ad934e0b88a66a8e2889dca405e4d100d9e005b01cefb908ae21b9c44a5d00d3f6768063 WHIRLPOOL 1a9c27395ecb60477e5f92bd29fe9f752b772f9eb77864b9972609fd61065bc459cfd40b9af37dc941362bdac5bc316b736fceaae8e10f82010fdab5dc6e7330
 MISC metadata.xml 332 SHA256 d78cf3e6fbcac87db2ba2bc6c08c3d42602fc896b0acac76a82a01cea585ad1f SHA512 fabbe01277669159bf82f49669cfde4c42b378c8b13590a081fae763f12fca9765d89b927675c4a223d1b3f8cd43c1c9b262005c60d3899223b1ddc1e222f66f WHIRLPOOL b5f76bfff2c4af29dacb6028f931d8ad6bbaaa495607701c0c59b28e15dccdd3193ae9fd553f819524cfaa5a61984f14cba3abb7efb462bb4baa2c302b1797ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUAcObXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOY+cQAOKXheeQhGDgw9g27JLL6JAi
-7hqM7JCuWy9s7bnSVrfeo0HqRvj2NMtW0/fvpeJkD92LIUdaNiKd2odRFOHuj+PR
-QrX8/fhkItQrDDFfAFcbY33q2bl+bonvWZkt14yLBXduF7By0bElOmlZX9Ilewz3
-ijeZp0rXGLB27lTxeFJFiJcDGMHEF84w9meY6ueJdtsjeMLdbb2eEw8crvmU8omj
-cqIetpICG2oMMLIvgA/Au+FaNaxpeiRGCQq1N0mtp+/FSxLzn7eDkYIv5owqQtDg
-7kQAu77CyhefMHR9O7AwstK6/G53nL8RIWDWIO8FwCjvr+Y1W/NsvCMvL5yu4bbZ
-tBg/YvfVu5MnDEw/CPtL7RtHIuatnZ9N83Y3aojGvGceq3E/B3KCzWMGdNqgp7Zu
-Tqmr+7q2lGXwT2cbCPrvXnYuM4mHY2v5FR+m9lTAMNXS58s6rXhhp2EU7uekEOCw
-YZBNrElEFOzj/fTeONab3Mjd6dyQ3lyL6N4oiBsdtVLngBAu3yLbx6t+3viW2AsK
-UTVeFlaLDeHhZXC2/neMstr7FfgHEU57BZHwuFqUhkrHNO6pRZS3SmrhQCdhLTle
-wdDklpxXwSaS6ZRHF2gTFSGEbT+vLLsf09E+wUZEV1gCbMy3EpGbKwxRhuLOQAFx
-kf5EZmHEtavM5LU0uVaz
-=7TuY
+iEYEAREIAAYFAlRglX4ACgkQVWmRsqeSphPStQCfUlbLG5zYpHC5cRzoDWTChAD0
+V38An2TlO5Ru3lw6tlrLSnE8QxD3CChg
+=gVPU
 -----END PGP SIGNATURE-----
diff --git a/net-im/pork/files/pork-0.99.8.1-tinfo.patch b/net-im/pork/files/pork-0.99.8.1-tinfo.patch
new file mode 100644
index 000000000000..c1f9e6bbb945
--- /dev/null
+++ b/net-im/pork/files/pork-0.99.8.1-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -114,6 +114,8 @@
+ 
+ AC_CHECK_LIB(ncurses, resizeterm, AC_DEFINE(HAVE_RESIZETERM, 1, [Define to 1 if you have the 'resizeterm' function in -lncurses.]))
+ 
++AC_SEARCH_LIBS(stdscr, tinfo)
++
+ AC_CHECK_TYPE(u_int32_t, uint32_t)
+ if test "$ac_cv_type_u_int32_t" = "no"; then
+ 	AC_CHECK_TYPE(uint32_t, unsigned int)
diff --git a/net-im/pork/pork-0.99.8.1.ebuild b/net-im/pork/pork-0.99.8.1.ebuild
index 862aee0a626b..306aa98fbcdf 100644
--- a/net-im/pork/pork-0.99.8.1.ebuild
+++ b/net-im/pork/pork-0.99.8.1.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pork/pork-0.99.8.1.ebuild,v 1.17 2014/08/30 12:29:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pork/pork-0.99.8.1.ebuild,v 1.18 2014/11/10 10:37:48 jer Exp $
+
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="Console based AIM client that looks like ircII"
 HOMEPAGE="http://dev.ojnk.net/"
@@ -11,27 +14,27 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="perl"
 
-DEPEND="perl? ( dev-lang/perl )
-	sys-libs/ncurses"
+RDEPEND="
+	perl? ( dev-lang/perl )
+	sys-libs/ncurses
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
 
-src_compile() {
-	local myconf=""
-	econf $(use_enable perl) || die "econf failed"
-	emake || die "emake failed"
+src_configure() {
+	econf $(use_enable perl)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
-	doman doc/pork.1 || die
+	doman doc/pork.1
 	insinto /usr/share/pork/examples
-	doins examples/blist.txt || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README STYLE TODO QUICK_START || die
-}
+	doins examples/blist.txt
 
-pkg_postinst() {
-	elog "Be aware that the syntax for IRC connections has"
-	elog "changed. Read ${HOMEPAGE}/stuff/pork.news"
-	elog "for details."
+	dodoc AUTHORS ChangeLog INSTALL NEWS README STYLE TODO QUICK_START
 }