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

(Portage version: 2.2.0_alpha173_p24/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

4 files changed, 90 insertions, 3 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/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")