sys-fs/ncdu: Add fix for building against ncurses[tinfo]

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 61 insertions, 10 deletions

diff --git a/sys-fs/ncdu/ChangeLog b/sys-fs/ncdu/ChangeLog
index 21cd153d2ad4..cf132b1f8aa8 100644
--- a/sys-fs/ncdu/ChangeLog
+++ b/sys-fs/ncdu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/ncdu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ChangeLog,v 1.41 2013/03/07 12:29:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ChangeLog,v 1.42 2013/03/07 12:37:45 jlec Exp $
+
+  07 Mar 2013; Justin Lecher <jlec@gentoo.org> ncdu-1.9.ebuild,
+  +files/ncdu-1.9-pkgconfig.patch:
+  Add fix for building against ncurses[tinfo]
 
   07 Mar 2013; Justin Lecher <jlec@gentoo.org> ncdu-1.9.ebuild:
   Correct UDE dep for ncurses
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index fc67c13ba51a..6e7a78cf74a7 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ncdu-1.9-pkgconfig.patch 1343 SHA256 86a5f44ca4479d363f5d87f83b6abf4ce0d94ceb268424c44dd363f66c76c1bd SHA512 b700c9ec239d2a15e5eae0b4bb569192efc9196f9fe1a1839fee2bdef782a119bf24771be4f665eeaf66ad60ed3999554bfbebeac2f2acd3ebce19284916923f WHIRLPOOL 8a54e9e73faaaaaff22b30cf874caeea23379e80728defad61d3fb72670c5c2e9714a2a6fde65151d7e97d619ca56cc5fdef6166f74224d1254c3235217a3874
 DIST ncdu-1.9.tar.gz 124738 SHA256 ea7349544a9da77764293d84e52862110ab49ee29b949158bc4bab908d3dd3a5 SHA512 10f1a58f8233e11c0309f18386845b51df6de2e074f4777c8b02c8c267f4a4da44024a2287d4dbf3bde17048f97e6254632c038c4882059215dbe39f51a96c3f WHIRLPOOL 674beacdb88a8823afff826ad328d8386f9be87d7d9cca3dbed613cbf2cfc7101d3f9714ef8ee77ec08d15defbbe51799fbfc17a1f40af45b5a1fcb08bc4c3b7
-EBUILD ncdu-1.9.ebuild 498 SHA256 428e4f0d88bfb886f34a9dbd2efb095f1cde782678878c02ca84d4a6f1295178 SHA512 16e7cf3f3681fecf1c65e368a6d16a25a2a07ca12caa050a7f64b5ca7aa04e367399be22f8de592c4452d209e89de8e4ce5515617d384e2aaf31f66e14ad3dee WHIRLPOOL 63dec108dceb8a23107c0d6d035324d5bed92ff67d75e6d9ac7cef1a286f54e23ca1fd16caef58db98f92b0bff7b745a6a98637aae750cbc8e6dbd8bd1a33ea9
-MISC ChangeLog 4550 SHA256 a6448fd8c6b643a5de56364a4470ccc606a63570121c599dca1a1a5a4a29c2cf SHA512 104f45717543df9fbfbe6d09c5a84b93154a40d009f0f5ae623264a5d5d05e149cee3556f135ffd74ee0aeeeb9cda1e1224947c177d255a8fde6391ebec537ef WHIRLPOOL 48113a707e9629e319a3522a708bfdf64aa4e6b2e0d2e64eb7042c8912cb31b520017bd4441890bc603a6bc0f1f2834d0c68b8dcde4e0a9f8607d01bb1f19a00
+EBUILD ncdu-1.9.ebuild 618 SHA256 4fd71c7e8f9f7df495512e77c74ae3e3de6263661aac5d45c4bdbdf8236e40e2 SHA512 45bd443d81ac424d6a4db87c7e10c30911b089b1d35170482c2586586ab3dd648af0c4517787077eeb9563b1b40a05c235acbb5d742965b091cf9ce3d52eaff8 WHIRLPOOL a268507a43dd413603e37e26e6e82edaf136c8739e89284fbf098a057083eee9abb4a9ec66c6cb74df81a4477d4c60db0c9a170c3281cff858e36a831ce63d06
+MISC ChangeLog 4696 SHA256 8599d327a8dc4bb728c540a5e138c9c437c5114bcd20d2982ddd54202f4ebed2 SHA512 dea2d67d4c7473ce751e22d2d25dd66e6863cb2c1b4d385be76def6848a76e250a0b69a8b29c462e843691af8e05f444aa91e8730978ffb3cfa94f27043a2cc2 WHIRLPOOL 23af3aad26bb58a35d8d2de119936830aeebc8eec42d878cf209253a358b0997af49e1e8ad78d0266ca980cbd0f13f15af7c88b3e7689dc1ee3c022445a0190e
 MISC metadata.xml 622 SHA256 bb3e6cf63305e9864969b30fb13e6cd89cf70c4a465a5faa5875c8ca516243fc SHA512 7ae72c55c5b76e31f2512b48ca050404728fa8d5568e721996f2efdf5f9186407b01a59fb64b210b2aafaf3d1948923b60b22323c193dc03438d20624a1101fc WHIRLPOOL aedc6a754bfbfac717c31ca6b807cf1641bbb595e01fc8454d5a9ec517d717163c64255f423c71d6a683d6b9a2af9fd9ae80086421cec74e5cbe145cee710fcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE4iC4ACgkQgAnW8HDreRbaygCgu6TszT4opydULIQc1eq1Y6PA
-gDkAoI9rdIQrIG9T2vVZS3TwOKraZkxd
-=h+uB
+iEYEAREIAAYFAlE4ihoACgkQgAnW8HDreRas2wCfRmc/at2bNI07xDDUgszq+z14
+ZM4AoK4QKz9aYBbzi4tcNOJfbRBjQ4Ph
+=0PFj
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ncdu/files/ncdu-1.9-pkgconfig.patch b/sys-fs/ncdu/files/ncdu-1.9-pkgconfig.patch
new file mode 100644
index 000000000000..0d180b34239f
--- /dev/null
+++ b/sys-fs/ncdu/files/ncdu-1.9-pkgconfig.patch
@@ -0,0 +1,39 @@
+ configure.in | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f4a4a2d..1333234 100644
+--- a/configure.in
++++ b/configure.in
+@@ -36,19 +36,22 @@ AC_ARG_WITH([ncursesw],
+             AC_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]),
+             [ncurses=ncursesw])
+ if test "$ncurses" = "auto" -o "$ncurses" = "ncursesw"; then
+-  AC_CHECK_LIB([ncursesw],
+-               [initscr],
+-               [LIBS="$LIBS -lncursesw"; ncurses=ncursesw],
+-               [ncurses=ncurses])
++  PKG_CHECK_MODULES([NCURSES], [ncursesw], [LIBS="$LIBS $NCURSES_LIBS"; ncurses=ncursesw],
++    [AC_CHECK_LIB([ncursesw],
++                 [initscr],
++                 [LIBS="$LIBS -lncursesw"; ncurses=ncursesw],
++                 [ncurses=ncurses])
++    ])
+ fi
+ if test "$ncurses" = "ncurses"; then
+-  AC_CHECK_LIB([ncurses],
+-               [initscr],
+-               [LIBS="$LIBS -lncurses"],
+-               [AC_MSG_ERROR(ncurses library is required)])
++  PKG_CHECK_MODULES([NCURSES], [ncurses], [LIBS="$LIBS $NCURSES_LIBS"],
++    [AC_CHECK_LIB([ncurses],
++                 [initscr],
++                 [LIBS="$LIBS -lncurses"],
++                 [AC_MSG_ERROR(ncurses library is required)])
++    ])
+ fi
+ 
+ 
+ 
+ AC_OUTPUT([Makefile])
+-
diff --git a/sys-fs/ncdu/ncdu-1.9.ebuild b/sys-fs/ncdu/ncdu-1.9.ebuild
index 12c6c72cbecf..943f939d45c8 100644
--- a/sys-fs/ncdu/ncdu-1.9.ebuild
+++ b/sys-fs/ncdu/ncdu-1.9.ebuild
@@ -1,8 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ncdu-1.9.ebuild,v 1.7 2013/03/07 12:29:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ncdu-1.9.ebuild,v 1.8 2013/03/07 12:37:45 jlec Exp $
 
-EAPI=4
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
 
 DESCRIPTION="NCurses Disk Usage"
 HOMEPAGE="http://dev.yorhel.nl/ncdu/"
@@ -13,5 +17,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
-DEPEND="sys-libs/ncurses[unicode]"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-libs/ncurses[unicode]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch )