Added pkg-config driver to find 'ncurses[tinfo]' libraries. Fixes bug #468566 by Justin Lecher.

Package-Manager: portage-2.2.0_alpha173_p24/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

5 files changed, 97 insertions, 8 deletions

diff --git a/media-libs/aalib/ChangeLog b/media-libs/aalib/ChangeLog
index c53d3d706a66..34791e68086d 100644
--- a/media-libs/aalib/ChangeLog
+++ b/media-libs/aalib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/aalib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.47 2013/04/30 16:59:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.48 2013/05/05 14:42:47 slyfox Exp $
+
+*aalib-1.4_rc5-r5 (05 May 2013)
+
+  05 May 2013; Sergei Trofimovich <slyfox@gentoo.org> +aalib-1.4_rc5-r5.ebuild,
+  +files/aalib-1.4_rc5-tinfo.patch, aalib-1.4_rc5.ebuild:
+  Added pkg-config driver to find 'ncurses[tinfo]' libraries. Fixes bug #468566
+  by Justin Lecher.
 
   30 Apr 2013; Sergei Trofimovich <slyfox@gentoo.org> aalib-1.4_rc5-r4.ebuild,
   aalib-1.4_rc5.ebuild:
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 8b12c48fbaec..954630b0c0ae 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -5,15 +5,17 @@ AUX aalib-1.4_rc4-gentoo.patch 1245 SHA256 fa5d946e9d0e4a78c37187f6795b27bcb057e
 AUX aalib-1.4_rc4-m4.patch 241 SHA256 24d09cb9eb9ed8d0990c677b5fbfe43762fe872d198c146c7de6fdb39eab692f SHA512 bea8e769596ec8d529d67a2b6081d2a7c1e47d9089551a31356f8b15a4dbfd36fdc97839754ef188621d8870628707b274f2183cebffc219ea0f3784fa12d8f1 WHIRLPOOL 9d5cf224edf45ffef0b42f8087d43833a86ee13e9b7871f422024d84bc36f905ef5dce5f39799104bf24046164a6c9c2e84b01165c57bf90c6a396dffb90f560
 AUX aalib-1.4_rc5-fix-aarender.patch 1350 SHA256 ce8900622dd0fca6ccd35ea7027e159ae1174bb2876ca0ca87b7a66d51a451a6 SHA512 83f6a1fffcdfa342d23df9a47d3803cd4416fba33a126602cc341405b953600f5e7b14ce21bd9f7699113f975815ddfcb6a9a95cc392ae62828557f59064a9da WHIRLPOOL 45ea620daa1074294a37effc557d6b642f015f795d3142de951cf85574bc971e384ba5afe0c7d5f4039719a4cd52c55443844a2efa98bfa63d5bd5c3245d3413
 AUX aalib-1.4_rc5-fix-protos.patch 2105 SHA256 1ada77080d8dbd5636d2d9a29a3fcf9033fe9ff9860cede5ab8338d5bcbea161 SHA512 e46268f5fb972500851f5489cc6311171a07a8b1a7a564bdafe5760008db72787650ad74e5144cbdb30b7fef027ee646e5534dd2eabddbd057bef1b27229af37 WHIRLPOOL 063fcd38329c7c2a841d004059c01314d17148c64408631f6a9a58f2d8594984aebd76874bce1666b0e4d02e3d204cbba84e2593f12e6a62611b50e63bf78cc2
+AUX aalib-1.4_rc5-tinfo.patch 709 SHA256 283b4a484b16cb422db7ecef0771d10e8a85a9eadeb6128fd86bf5545ab386c0 SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b WHIRLPOOL ab11bf3e74fbf8d4cdc1f593bef4589d0f8d31d41230ecc5add3f7a8ee7586875997e76cec3084da3955c6960126c6cb6832210128e9ac4ab72c0e9f8dca54c2
 DIST aalib-1.4rc5.tar.gz 391028 SHA256 fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299 WHIRLPOOL ec98116736b64eb6e855777a5ec13894446b76beb4f874a490144919031d6ddd341b49cc429b2c918acde5cebc22a3e2dc97b949379200f441d2c544a02f2736
 EBUILD aalib-1.4_rc5-r4.ebuild 1591 SHA256 5c810854bf8485b612242de4735dcfbc39dda484f72d28241a0326ae06fc33b7 SHA512 34be0007bd23deaac2bacd01e4eb28b3434008fff575c6619295b48c7ff1cf825e45583401c84b30bbbddaf56255780c2bba62c569286c71a7c2b35e70956a3a WHIRLPOOL 1257b9a5b65c5a0ffaaa3526c80a5671ae450bf4bfd9e07f7b7061e45000bd85ed85fedfe200a1ab4b2e07b215832d9b5c00262086bf03a84b22808379f81285
-EBUILD aalib-1.4_rc5.ebuild 1446 SHA256 205e8cc2cb66972a3754c4e12f5e6c2f5e8cb5ebb8d0de5c87470cfb9ecf2cb7 SHA512 c385e7c33bd81ab817a6dffaf1bde2c796f31448920eb40954bf4bf27f142c2b624ff0c58f008ed742a5108abaaf884af7b6cb1dad8766d8b15cf99f11febb35 WHIRLPOOL 000c64b60312a2f943a7bdf4dbf7611ddedec55c9e3a775556dfd423c5d87968894967f818822da84e2d8504498e75a63c487ed8a7071a279d343881c50e4060
-MISC ChangeLog 6668 SHA256 9405f39e832590eec4817a3d6e3e8ed401f2745b94d10d731660aef0e1cb929f SHA512 42af8a83e943f4eb12e43219a398882c97d70f99fe9938ca76540405175aef1b7c76c4d7d062c3984e2a6c6656c18a17dfac001cd7769ed8489e8fe12e3e0f54 WHIRLPOOL b85d0da665ff0d64d4d77a1b9c2dbef65f7041dc9b5e087511d1716b8727120e66a5decc4df9e9f6f5cec6db9e98c899eaf8b455da6b6b82d87575b9d383cdd1
+EBUILD aalib-1.4_rc5-r5.ebuild 1718 SHA256 1b582e25047f1e6eae3ac68935b64a3d806d5d6c77c22afe3ccef59a00f5b415 SHA512 e43d574bc5456d2f76fb5fb3763a50451ddfed4754fdc4b6c824a41c8cfcb0c7a407e45fa8afa737981e38440f212446c299497ba2737654db8d5102f9cc4935 WHIRLPOOL 333a6c1f07964df43aabcb0d27ef54e9168dd2e0ae83b9ffcb5feff8943641e24b5504ea7a051be133f27e012886cdf44e832c435782ddd7a1e93ec47be54752
+EBUILD aalib-1.4_rc5.ebuild 1433 SHA256 43068d6d8cb95396d1cc99ec4cc56afbba412f644a7d68d8389ab43a921e4787 SHA512 35b7791a2fe826023d7c41cb4abb4e219d4089d9dca11108fec4df9935e71c2329857767f15743aad59b0bfe1c731ca86ac2b371fc1d97105410f6c7761f89bd WHIRLPOOL a2477e7a55d6f49294537febc8168081b17257276394c1e829509c371d4615f13eb88ee8226cdcce0601204b2d0b7efc2cb4160f23d01f8a4351b0b019d8ac3b
+MISC ChangeLog 6940 SHA256 2636e88ad66c59f9d6d0e1b5624a0f1d0222062010eb44887e8072d918b7a751 SHA512 0449125b1b25c8e688884a21a6a18282fcf3c9e079d369052d540d0b625214eb31c86e69fc804035ac005853e8d68e3de503858dfa77f3eaac888ee5b4839769 WHIRLPOOL 919085161e40e77a124ebb6e608f36159c15f2e6147b4e6949942e2cdffda916d21fa5d31f6795207fdf5007f8ad342f45070c472acc94110a66fdf8f336344d
 MISC metadata.xml 326 SHA256 95f97cf9a89a4d76a706ed7b4d58e279d2b0e54b2eb45cdc4b7d443d222e1314 SHA512 63a5dc71a943a7ba8828f39cfb7235735530dc4f7bc4de1f0f8b49e757aa6ea45643d2d2939eeaa185d4dc1ddc9a51c98073818e692e2ba73fa7434a72dfaf09 WHIRLPOOL 808eda3cb5de104e9ddcf78287449bb6f593f0a11992e18ca5372c80cd34880a410a16669a8b46e8db32100e0a7d2063ea15262640bc39aa0624992ab4c4d42b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlF/+EUACgkQcaHudmEf86qmLwCeJ/ucnroqQL3q4usVjaiUNcW2
-fqEAn20knfR/EGtcUbjhg0+8/xLiLRb7
-=9tE+
+iEYEAREIAAYFAlGGb7kACgkQcaHudmEf86okrwCfRMW2PUoc2UKf/VeH5BL5L2ZK
+dQoAn3mMlROQ74kGiRt7gpoD/zyFEbPg
+=h32T
 -----END PGP SIGNATURE-----
diff --git a/media-libs/aalib/aalib-1.4_rc5-r5.ebuild b/media-libs/aalib/aalib-1.4_rc5-r5.ebuild
new file mode 100644
index 000000000000..29621e69d60e
--- /dev/null
+++ b/media-libs/aalib/aalib-1.4_rc5-r5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5-r5.ebuild,v 1.1 2013/05/05 14:42:47 slyfox Exp $
+
+EAPI=4
+
+inherit autotools eutils toolchain-funcs
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${PN}-1.4.0"
+
+DESCRIPTION="A ASCII-Graphics Library"
+HOMEPAGE="http://aa-project.sourceforge.net/aalib/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="X slang gpm static-libs"
+
+RDEPEND="X? ( x11-libs/libX11 )
+	gpm? ( sys-libs/gpm )
+	slang? ( >=sys-libs/slang-1.4.2 )
+	>=sys-libs/ncurses-5.1
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? ( x11-proto/xproto )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-1.4_rc4-m4.patch
+	epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267
+	epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-aarender.patch #214142
+	epatch "${FILESDIR}"/${PN}-1.4_rc5-tinfo.patch #468566
+
+	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/src/*.c
+
+	# Fix bug #165617.
+	use gpm || sed -i \
+		's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in"
+
+	#467988 automake-1.13
+	mv configure.{in,ac} || die
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	PKG_CONFIG=$(tc-getPKG_CONFIG) \
+	econf \
+		$(use_with slang slang-driver) \
+		$(use_with X x11-driver) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodoc ANNOUNCE AUTHORS ChangeLog NEWS README*
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/aalib/aalib-1.4_rc5.ebuild b/media-libs/aalib/aalib-1.4_rc5.ebuild
index 502d19a33e03..97afe1f9c925 100644
--- a/media-libs/aalib/aalib-1.4_rc5.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5.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/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.27 2013/04/30 16:59:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.28 2013/05/05 14:42:47 slyfox Exp $
 
 inherit eutils libtool toolchain-funcs autotools
 
@@ -38,7 +38,6 @@ src_unpack() {
 	#467988 automake-1.13
 	mv configure.{in,ac} || die
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	eautoreconf
 }
 
 src_compile() {
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-tinfo.patch b/media-libs/aalib/files/aalib-1.4_rc5-tinfo.patch
new file mode 100644
index 000000000000..daf9cde9f575
--- /dev/null
+++ b/media-libs/aalib/files/aalib-1.4_rc5-tinfo.patch
@@ -0,0 +1,19 @@
+diff --git a/configure.ac b/configure.ac
+index 66bcbc0..f15f06e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -302,6 +302,14 @@ AC_DEFUN(AC_CURSES, [
+ if test  "$curses_driver_test" = yes; then
+ if $search_ncurses
+ then
+     AC_CHECKING("location of curses")
++    PKG_CHECK_MODULES([CURSES], [ncurses], [
++      AC_MSG_RESULT([Found ncurses via pkg-config: CURSES_CFLAGS="$CURSES_CFLAGS" CURSES_LIBS="$CURSES_LIBS"])
++        CFLAGS="$CFLAGS $CURSES_CFLAGS"
++        LIBS="$LIBS $CURSES_LIBS"
++        AALIB_LIBS="$AALIB_LIBS $CURSES_LIBS"
++        search_ncurses=false
++        curses_driver=true
++    ], [])
+ 
+     AC_NCURSES(/usr/include, ncurses.h, , -I/usr/include/ncurses , "ncurses on /usr/include")