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

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

5 files changed, 118 insertions, 7 deletions

diff --git a/app-text/pinfo/ChangeLog b/app-text/pinfo/ChangeLog
index f04528ccd03a..fe6c00e70017 100644
--- a/app-text/pinfo/ChangeLog
+++ b/app-text/pinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/pinfo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.66 2012/06/18 01:53:11 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.67 2013/02/27 20:20:39 jer Exp $
+
+*pinfo-0.6.10-r4 (27 Feb 2013)
+
+  27 Feb 2013; Jeroen Roovers <jer@gentoo.org> pinfo-0.6.10-r3.ebuild,
+  +pinfo-0.6.10-r4.ebuild, +files/pinfo-0.6.10-tinfo.patch:
+  Fix building against sys-libs/ncurses[-tinfo] (bug #459528).
 
   18 Jun 2012; Jeroen Roovers <jer@gentoo.org> -pinfo-0.6.10-r2.ebuild:
   Old.
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 50830eaa0e3e..a9d2068e3497 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pinfo-0.6.10-dir-file.patch 280 SHA256 9d133edb6882a1eb30a74e96976105b32ece189aad4b62070264d2dd0bea48e5 SHA512 bcc16752f2c98b7c013ec1dae84ada89f44d6c00298ed5069b2098674bedcb31bf9e29d3e5c821398518fd59e0fbd84e9141dad2885c55d5a3c76ef728a24b50 WHIRLPOOL 2b23ff84d0a62c48698fd3688176452ea64ac69a4727299f42693a76af52770dcabc84f9f346d392eb3561dec5dac9fdd51a6b2fe5368620fb8e3c55ad089e2d
 AUX pinfo-0.6.10-info-suffix.patch 968 SHA256 52f7f5d737a550947175a324980dffe489138f11a52a8614202d669bf54183e4 SHA512 882c80eb6d36f264e20cc532aa1cb00f3a1982b887bd199e4879e4e5845d18cd7a5e01c023ef723290c174a8534bc60060758f31ad7d1dd995f1441a4c496ada WHIRLPOOL 80dd67d9690888e366e8e37078938b4936762609296e41322e4d5afe2291338d9fb2fd04a12ad4af83ed8a2e53ef9e838514e4230e2722cf8ed08626b13dc617
+AUX pinfo-0.6.10-tinfo.patch 944 SHA256 70518777b63c738346f19fcc86855344f316220628a12f2325615019c6f32bd5 SHA512 9a4ff5fdc9a461c205f46e71cd43873270cfa1b4e5d897145bf30e51a0a0ffd350add33ff812a8870272f5e30bb8173c0a30af9fadd9f09ee9916512c106e42c WHIRLPOOL 3899b79bda32ab9c7d08a4135fffa713881640cdb0753c47d6d9c6418fb77c4140a56fcdec31839a944951ae32624b48921bb0ba69a99531c6b449682df83566
 AUX pinfo-0.6.10-version.patch 264 SHA256 cbabed690a4116ec639918e5a15f41ac51264e56923ae931f3b47f9598ee2ac2 SHA512 aa998d5b63d50c844dcfdc6e6419dafab3d31c32e6e6a2e67101d124a5badf0968eb0e52fb46aea8ca2e8ac7e8eed7c4aabbdadffe9e99165d7525d89990625d WHIRLPOOL 6e0e8f5aa4106b967011fadcb85004f91aba6b2c2c00e76e87e4e5721f4c0c0819343aee652d20817c89743167e172cd8db5b9172cf490df88553178a33fc0ca
 AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 SHA256 4ce70f8db368b69785fe28a9574dd2267a69e33ef6d98922c513080ea860211b SHA512 373eea0e8feca230c14bf658ca5e73698ea16d35b5ca790c46b5bf02a83aaf1d55628183f89666913dfea96ef0f3653789255f8dfd616fe5b3a19be195d46ce6 WHIRLPOOL ad812f647963156a8b4dff867aff7afb3035e16e69422b68a113ff81ffe193e9efa331dfc9bddf4509e8014c1adda23f73a6bb8e4af348793724cf06771b085e
 AUX pinfo-0.6.9-as-needed.patch 457 SHA256 b3e6fa18a7e3a9a1938c44ebd43184983b32adf1df24fd556cb9675b480600de SHA512 c4b23c4f273b35d2594af81ee4bf9aca60cd5208f1c3ab4a084805a63fdecc8bb7f2a7ee6118130ba691e3fa17e79f2671a90b7bc0af7e3cccaf12d2baecfe7f WHIRLPOOL 503e94d4db24a0387a4fdc60f8bf541ec34ae1e19faea5346a38709f641e46d20c05c7974e18fd1c42c2a31a5f328198597560a6478e3125fa960dc960315d3f
 AUX pinfo-0.6.9-lzma-xz.patch 614 SHA256 5c8923ee6dce84a114ad27aefaa2a3ced2a98b971958c56eefdabe26ed0fb804 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4 WHIRLPOOL 62500cf2d5736a3c92ba321c012165df2f37577d3557a088ce414e8c1a613c30fe4640d6ec82f60d9d4c80631a4ef9e50c5803efbb2794e75f41bea98856a254
 DIST pinfo-0.6.10.tar.bz2 133059 SHA256 122180a0c23d11bc9eb569a4de3ff97d3052af96e32466fa62f2daf46ff61c5d SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e WHIRLPOOL 92878e887f52729a266e99b25ea671f54f0cb5f11680c018bfb92a70de4ff2927ee59cf01e4fddbfe9c78c7c61b8c0dfd6edfcc761a0e6ddb6e751e0e6220047
-EBUILD pinfo-0.6.10-r3.ebuild 1189 SHA256 cbcb6fc25171f91efc0c04f612404935bab06168cc789b8e9226c31634c7e7e0 SHA512 4d50ad5a861e8322724c71f7d131c04fafc045cf5aee4f2c1b964471c1b0977983b300b0f2451b591c496e96ae7c6f097f939190f24847f8a617111d26f97249 WHIRLPOOL e0e410395be5e78ee965d6eba51cc19baca0c556bca761350157ae14a40b11af873f0769b47222a61534b885e60eacc009b3e612530215e79ad9e2c82e16f8a3
-MISC ChangeLog 8783 SHA256 4d342cad694b3114dd653e66112c1b1e0a0637db32d684a2780f8f77f1f386a9 SHA512 5310e156ff047b402414c5707076a918f9b4ecd2707adc510bfea72aadd9fe441f69c561400422b2cc8cd043bba7906eaf93b3c8e5ef6bac6734ef7a68329e40 WHIRLPOOL f24a2f96a26df3053cef98b33cf4f5788edbaed97a65bcab7b61aa164fe9d3656c81e8d7a9f78e38f4f51b988beb5bcf22364a53143d4292af50c551e49c8c74
+EBUILD pinfo-0.6.10-r3.ebuild 1193 SHA256 415c2e66560ab4b1e92178b602e1e243b10590b4a862c901b884232ee630724c SHA512 787949e05f58fbcc3f305ea958be43e889d49f78d8e008b0aaa4ffde406eb23285800a65b446e1549187b8d5e25909fde3871ce0dd8e920b50442c3ae23dcdd1 WHIRLPOOL 1c08d9b31bc67fbe1bdb49d350d1d744dd313a848881d9cc94f3192d3e43b9ec167d6f602ca57b758e3734834ad76cf405bdbc35380db75dc8288fd031205132
+EBUILD pinfo-0.6.10-r4.ebuild 1286 SHA256 aa9f1970f976d0d99068959a15aa2ac218386c9b7a119b6fc8017971a3bf6cd2 SHA512 5c540c94d82c39a3d2693ab0f9529a5767228cda83fe282d310aeb981e9148884738ba0ad3ddff2def9ba7f7aed576fed5999c4fcfc0fc6d3c48a58da22bd42c WHIRLPOOL c1c0bdc3a2e0129ee3ef8fdaae30b580600ce60ced43221af1db2c82a7266f745fbc5b4cb107200fec45f29e1f95be6ea6ec60da23dda26bf799c03cf166221b
+MISC ChangeLog 9010 SHA256 5a4504acbf1e5fa32182a78eb20e6af83fff53ae8a4d856e92e0cf01e9a61c93 SHA512 43a4af8c72af32eaf5368e5e038f47a75d09e697ca548ecc04f64d488d705868809ef60800f2de580bf15b0d6d23e0470d411c87949f041feb733e77eed73e4a WHIRLPOOL 07b98ad519f9bddb5e89eb98c3857de0a083af3d5a5965491742ce7d2f29ff36d31d179d436f0c2a2a6d8e1eb4023ad8f5cc8a812e74a1fb0572a399434f1f49
 MISC metadata.xml 196 SHA256 599d489eaeda79157559bc9f7ecdabec345da752748886b14ef461d4fd95bf4b SHA512 d09d812ff37949ddbd49ad24e7c10444c4205e4e8466bba88fb04a973065632160988df92dc5b1f4514b3800581c1afee799ce01533eb0dd09902aa592ffe1cb WHIRLPOOL c67c7b4c7b29362abb1195603ede1ffb02875eb10b33670cf48b94f5a8a84fb76865886f0a487496b8765ed5d340d01ea94095617179bb20bd3fb029262b9355
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEuapkACgkQVWmRsqeSphOAWgCcDqtB/zvR72OStaYiWscHocMJ
+x+YAn05fFuN0aIwnzpC4/JTJC2EcqK2x
+=xe9M
+-----END PGP SIGNATURE-----
diff --git a/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch b/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch
new file mode 100644
index 000000000000..bbb6ecfe421d
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch
@@ -0,0 +1,40 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,24 @@
+ 					
+ 
+ # curses
++PKG_CHECK_MODULES(ncursesw,ncursesw,[
++	curses_includes="$ncursesw_CFLAGS"
++	curses_libs="$ncursesw_LIBS"
++	curses_h=ncurses.h
++	stop_searching=true
++	found_curses_h=true
++	USE_CURSES=true],[
++	PKG_CHECK_MODULES(ncurses,ncurses,[
++		curses_includes="$ncurses_CFLAGS"
++		curses_libs="$ncurses_LIBS"
++		curses_h=ncurses.h
++		stop_searching=true
++		found_curses_h=true
++		USE_CURSES=true],
++		[])])
++
+ AC_CHECK_CURSES
++
+ if ! test "x$USE_CURSES" = "xtrue"; then
+ 	AC_MSG_ERROR([Curses not found. You need curses to compile pinfo])
+ fi
+--- a/macros/curses.m4
++++ b/macros/curses.m4
+@@ -175,8 +175,8 @@
+ AC_DEFUN([AC_SEARCH_CURSES_H], [
+ 	AC_MSG_CHECKING([location of curses.h file])
+ 
+-	stop_searching=false
+-	found_curses_h=false
++#	stop_searching=false
++#	found_curses_h=false
+ 
+ 	dnl  if a particular location was specified
+ 	if test "x$curses_location" != "xfalse"
diff --git a/app-text/pinfo/pinfo-0.6.10-r3.ebuild b/app-text/pinfo/pinfo-0.6.10-r3.ebuild
index 86e470919a1d..39f22af4f8e6 100644
--- a/app-text/pinfo/pinfo-0.6.10-r3.ebuild
+++ b/app-text/pinfo/pinfo-0.6.10-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/pinfo-0.6.10-r3.ebuild,v 1.7 2012/06/17 18:36:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/pinfo-0.6.10-r3.ebuild,v 1.8 2013/02/27 20:20:39 jer Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="nls readline"
 
 RDEPEND="
-	sys-libs/ncurses
+	sys-libs/ncurses[-tinfo]
 	nls? ( virtual/libintl )
 "
 
diff --git a/app-text/pinfo/pinfo-0.6.10-r4.ebuild b/app-text/pinfo/pinfo-0.6.10-r4.ebuild
new file mode 100644
index 000000000000..c858ecc9d193
--- /dev/null
+++ b/app-text/pinfo/pinfo-0.6.10-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/pinfo-0.6.10-r4.ebuild,v 1.1 2013/02/27 20:20:39 jer Exp $
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Hypertext info and man viewer based on (n)curses"
+HOMEPAGE="http://pinfo.alioth.debian.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="nls readline"
+
+RDEPEND="
+	sys-libs/ncurses
+	nls? ( virtual/libintl )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.6.9-as-needed.patch \
+		"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch \
+		"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch \
+		"${FILESDIR}"/${PN}-0.6.10-version.patch \
+		"${FILESDIR}"/${PN}-0.6.10-info-suffix.patch \
+		"${FILESDIR}"/${PN}-0.6.10-dir-file.patch \
+		"${FILESDIR}"/${PN}-0.6.10-tinfo.patch
+
+	# autoconf does not work as expected
+	./autogen.sh || die
+
+	append-cflags -D_BSD_SOURCE # sbrk()
+}
+
+src_configure() {
+	econf \
+		$(use_with readline) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysconfdir=/etc install
+}