Add USE=ncurses to control the lib usage #221941 by Jim Kukunas and Mart Raudsepp.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 22 insertions, 15 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index f2f783077f84..0fde06274320 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.334 2011/04/07 01:09:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.335 2011/04/07 05:18:20 vapier Exp $
+
+  07 Apr 2011; Mike Frysinger <vapier@gentoo.org> util-linux-2.19.ebuild,
+  util-linux-9999.ebuild:
+  Add USE=ncurses to control the lib usage #221941 by Jim Kukunas and Mart
+  Raudsepp.
 
   07 Apr 2011; Mike Frysinger <vapier@gentoo.org> util-linux-2.19.ebuild,
   +files/util-linux-2.19-old-libc.patch:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 3a392baa6038..24a230772fff 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -15,14 +15,14 @@ DIST util-linux-ng-2.18-20100706.diff.bz2 58805 RMD160 5b1d645ecf33af652c7be704f
 DIST util-linux-ng-2.18.tar.bz2 7669676 RMD160 4781871a8f86195b886e81d364d41a57d67869e3 SHA1 154db0512caae0b6e90eee4b7312d4caf3d6b978 SHA256 b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc
 EBUILD util-linux-2.17.2.ebuild 3015 RMD160 57dac717c0d9f30dbfa07cd40dec812d18c0cfe3 SHA1 903a657757ee19a86e1f6109d0ef36c3a10e6bb7 SHA256 c2bc733ccecd90d10664a821ab7c56cb26be6e0fa8448b3fd26878241bce6d20
 EBUILD util-linux-2.18-r1.ebuild 3271 RMD160 998c66452f87b053114d10625cc4f2e39ae4bd00 SHA1 14d9df40e418ec6155ba2dfc7b5ca2b30eb6f3d6 SHA256 7e6cca4e22388a373cf61538b4ff9973f706a71119e4bb66bef556175dde0170
-EBUILD util-linux-2.19.ebuild 2962 RMD160 9c0ddaee991f52895061f568583e68daee8270cf SHA1 35d86a6bc290aa5485db53c291074e90c276d5ea SHA256 2b2bdcaf18ce4a24250f52a977c45bbd0b8c428b4cbfea0ea2c2b2fcad30a798
-EBUILD util-linux-9999.ebuild 2913 RMD160 04bc55fc5bb67b378ee6e289b0d35f91f0e6fc87 SHA1 5bc790db211795f5af51cad2930154e78c4e4daf SHA256 a58ec1380524f30582df2c2738e877bc0ee04b43a7f177203fb6329a0eb56b39
-MISC ChangeLog 50497 RMD160 f8dfd0e6bf92f8c60c8846b25cc4352b5f95ce4c SHA1 4b737d6c8a47bd42dd0b958b629fdcff95235f6e SHA256 80afc56539868a8c42a354a964714fc490bb29c24041b3890770670e96477c83
+EBUILD util-linux-2.19.ebuild 3059 RMD160 29645f9660d0caf38bd2eb3d7a97d1d0ba544e94 SHA1 e3df015f117c4867f04abc3b8b1e1be82d8cbea5 SHA256 224395e264f11496a12b8f150022bf408428fbac16b893106dbddca5d77e1724
+EBUILD util-linux-9999.ebuild 3010 RMD160 1e86679c20553c622a8dd29f773a75bd9383c96f SHA1 a58a39f1bffcdbdecdcfa55b00b437d5d9a1f6dc SHA256 20b881374f42811f5237a0707b25a288f13a0b9879f9b6487300f2f47b149463
+MISC ChangeLog 50685 RMD160 d437cf854ac873ba9d1e256c6e86955ebdf8aca8 SHA1 5dc0d760425266e5ff69b9733ee0ccc0fcfd3541 SHA256 cf440b260669b1d44b9250c1193bc5d5e26b0a6c8c9195327447103e197bbfb1
 MISC metadata.xml 384 RMD160 edc316c85d2496b41a73c9d7f135f3eaa3170a3f SHA1 98e669843d3432322128d58d296c559ec8f3a65c SHA256 bc2d4dcca297085f924ce7f2103e0972817ed3793a1973786d5f6d014f0384fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2dDrgACgkQaC/OocHi7JY6IwD/VOLtX8m9Y2pu8dIPhFU+i6yU
-0yL/X8ARCf+CfWMKURwA/A3sqlcYubTQVl0axIezB0eUkf3ltsXXR/PUxHqr6RpS
-=2pNS
+iF4EAREIAAYFAk2dSSAACgkQaC/OocHi7JYk+gD+LjGlw2NqHRgWvOHV6J3XNKWo
+avTopqxDtmxSAr62io4A/3ggZCg4X7dNlRoglpfsiDtXAvaDq+Z37hAP5awJL5SF
+=Xk8R
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.19.ebuild b/sys-apps/util-linux/util-linux-2.19.ebuild
index 19cd55bd5d1f..63670a45502b 100644
--- a/sys-apps/util-linux/util-linux-2.19.ebuild
+++ b/sys-apps/util-linux/util-linux-2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.19.ebuild,v 1.3 2011/04/07 01:09:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.19.ebuild,v 1.4 2011/04/07 05:18:20 vapier Exp $
 
 EAPI="2"
 
@@ -24,14 +24,14 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+cramfs crypt nls old-linux perl selinux slang uclibc unicode"
+IUSE="+cramfs crypt ncurses nls old-linux perl selinux slang uclibc unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
-	>=sys-libs/ncurses-5.2-r2
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	cramfs? ( sys-libs/zlib )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
 	perl? ( dev-lang/perl )
 	selinux? ( sys-libs/libselinux )
 	slang? ( sys-libs/slang )"
@@ -62,6 +62,7 @@ lfs_fallocate_test() {
 	rm -f "${T}"/fallocate.c
 }
 
+usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
 src_configure() {
 	lfs_fallocate_test
 	econf \
@@ -70,6 +71,7 @@ src_configure() {
 		--enable-agetty \
 		$(use_enable cramfs) \
 		$(use_enable old-linux elvtune) \
+		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
 		--disable-init \
 		--disable-kill \
 		--disable-last \
@@ -83,7 +85,6 @@ src_configure() {
 		--disable-wall \
 		--enable-write \
 		--without-pam \
-		$(use unicode || echo --with-ncurses) \
 		$(use_with selinux) \
 		$(use_with slang) \
 		$(tc-has-tls || echo --disable-tls)
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 93fe979adab0..2aeccccbb73d 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.18 2011/03/12 06:33:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.19 2011/04/07 05:18:20 vapier Exp $
 
 EAPI="2"
 
@@ -24,14 +24,14 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+cramfs crypt nls old-linux perl selinux slang uclibc unicode"
+IUSE="+cramfs crypt ncurses nls old-linux perl selinux slang uclibc unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
-	>=sys-libs/ncurses-5.2-r2
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	cramfs? ( sys-libs/zlib )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
 	perl? ( dev-lang/perl )
 	selinux? ( sys-libs/libselinux )
 	slang? ( sys-libs/slang )"
@@ -61,6 +61,7 @@ lfs_fallocate_test() {
 	rm -f "${T}"/fallocate.c
 }
 
+usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
 src_configure() {
 	lfs_fallocate_test
 	econf \
@@ -69,6 +70,7 @@ src_configure() {
 		--enable-agetty \
 		$(use_enable cramfs) \
 		$(use_enable old-linux elvtune) \
+		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
 		--disable-init \
 		--disable-kill \
 		--disable-last \
@@ -82,7 +84,6 @@ src_configure() {
 		--disable-wall \
 		--enable-write \
 		--without-pam \
-		$(use unicode || echo --with-ncurses) \
 		$(use_with selinux) \
 		$(use_with slang) \
 		$(tc-has-tls || echo --disable-tls)