Convert export to ac_cv_lib_gpm_Gpm_Open usex from eutils.eclass and USE_REQUIRED for gpm in USE fbcon and livecd.

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

3 files changed, 23 insertions, 23 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index be348fedc278..7e01b26ebe47 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.155 2012/02/11 15:33:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.156 2012/02/11 15:43:51 ssuominen Exp $
+
+  11 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> links-2.5.ebuild:
+  Convert export to ac_cv_lib_gpm_Gpm_Open usex from eutils.eclass and
+  USE_REQUIRED for gpm in USE fbcon and livecd.
 
   11 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
   -links-2.3_pre1-r1.ebuild, -files/links-2.3_pre1-libpng-1.5.patch,
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 390b40394242..716c88488243 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -6,17 +6,17 @@ DIST links-2.5.tar.bz2 3849259 RMD160 ec0c2fbf239289d757fd12526495bdcb3c08a588 S
 DIST links2_2.4-1.debian.tar.gz 20808 RMD160 cedde06aa161c9f429531e3a045230cf9e0b46ee SHA1 2caa1602dcbac0d9c0092b2eae99e0f7ae64379c SHA256 5f092ec2eef39048cee2114d9f6c32d18778e244b0217b5e38b4f92e805d235d
 DIST links2_2.5-1.debian.tar.gz 20869 RMD160 997338fd263a9519f105d24ced17caba65181caf SHA1 82a2f23c12dca937c29e8f4cd83b7527a7e374e8 SHA256 28fb3fe213b3ba2a2274353a810bcd23d4fd39d949d8cb608c3a366f09651b7e
 EBUILD links-2.4-r2.ebuild 3175 RMD160 03a378b7a5f100d3b7bda772ada40dec247c432b SHA1 83f227ee76f2ba8736c26eaeb01780598c82ca5c SHA256 c9f10d7cae4081e452668ff87b9202744cc3ac02e8893c23214cc58564b9c6ae
-EBUILD links-2.5.ebuild 3335 RMD160 0d0484dfd7215db7cd4b5bea926eec2b250d634d SHA1 3147e625c7b4374c69c7ee6c5dcbef6955a3facb SHA256 08091d9e9cf98cb34a3ee95f950d87e5da27be12da3a9462bc80d2cc3804c10e
-MISC ChangeLog 31151 RMD160 dddf336f1a8b51ae73a046010575a1e138ec5da1 SHA1 554a4540aacc1691d813d19f7a841973bf7b8260 SHA256 1fee29e57e7bb5193f55dbcc3fcc5cb024c874c08d19eb77f813c07a7f1da6ce
+EBUILD links-2.5.ebuild 3274 RMD160 6fb7a2afad8d38444346b00b3eacc846a484e836 SHA1 780036575bed0d97cfa6f648325de647792a32a5 SHA256 83ee2f0c0c10b0799b24df573581d620d8b6bd968d165bf0a84af2c214b9bba8
+MISC ChangeLog 31343 RMD160 aeaf3cea9dad6adc270a3dd6f5934ca80658d055 SHA1 f35f5c86459484b4ec21e62cf84df1c6658d60a6 SHA256 ea7ec563e75f08f80da8eb8ee6fcbca78714d36ec32ce116707342abf13b8c71
 MISC metadata.xml 342 RMD160 f48da44e2ff7ef33505a66744713dde872654bf5 SHA1 09f4631fef863d70a152eec29c2455243413c9ee SHA256 264e605d3878a9b815b642d43c413afd628f1945e9a875fc31eaf7e2cef0a085
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPNomOAAoJEEdUh39IaPFNNlMH/A9j6mAgzSA4XkG2Vg0AVeld
-QwrhwSqrsv5ov3y9ntk8w1pYN8HeP7u2dOdRROxJkzY/zFK6VOWTOz8aGzMlKRY5
-/onR8X3NZ0xvnFrpZKSjEJ4ilRwR/FAiS1IFZfcfS3/+qV2bk34I6QvGtEpmdZio
-UsgJBZ9afHLo57Q5fLKoq6cShs0IkHmClf3dbG11IkSaGaJ0HD5Nj00fNmAIxQGu
-dZnGp15vD52fFDwnVI12mSp0cgRPxyyMFJioaLWGDuzaXa4B4sH7Ey8PKvIAnsDq
-tAYqi4yOGizegzY3tUFciK0kp7T+ODf0ZdpK1vCMxufSmORimC2AcohOtY2/v8I=
-=gWj/
+iQEcBAEBAgAGBQJPNovqAAoJEEdUh39IaPFN0PoH/3Rf54v+usATMBRIyv/D3WTz
+6bOZCatLmWbmAVLDNy4Vo3V7T5JEd2N3o/OHf6XeQw7XsVW2y4sCqz9d9TgvqG2P
+vfBT2dFICAIvTlLKp3s28RZ5IGCmweN9rYwnpaOrpc0v11kJdbBOr8DoiOVpTO+6
+DASlUxOh6K3ZQvkxfaNEtQiW9ZQ3EnTvvVZ7anxS2oMaBIsXzmW80w7NElnyFJ2y
+b6CUQGXQm7/+GwKGXmNZSMtMotMwzZpPSuyaUEHYNyzbG2oYVAed4odkV9Y3JzUR
+XK8ddPe8XT0m41vywx1NE1pYuTCBtnifJh6CjqwgxSLhpUW7nMdccGNtIw5hzzM=
+=BXiG
 -----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.5.ebuild b/www-client/links/links-2.5.ebuild
index 1395538f9ea7..1741c705b185 100644
--- a/www-client/links/links-2.5.ebuild
+++ b/www-client/links/links-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.5.ebuild,v 1.4 2012/01/08 11:47:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.5.ebuild,v 1.5 2012/02/11 15:43:51 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils fdo-mime
@@ -21,19 +21,14 @@ IUSE="bzip2 directfb fbcon gpm jpeg livecd lzma ssl suid svga tiff unicode X zli
 
 # We've also made USE=livecd compile in graphics mode.  This closes bug #75685.
 PNG_DEPEND=">=media-libs/libpng-1.2:0"
+
 RDEPEND=">=sys-libs/ncurses-5.7-r7
 	bzip2? ( app-arch/bzip2 )
 	directfb? ( dev-libs/DirectFB )
-	fbcon? (
-		${PNG_DEPEND}
-		sys-libs/gpm
-		)
+	fbcon? ( ${PNG_DEPEND} )
 	gpm? ( sys-libs/gpm )
 	jpeg? ( virtual/jpeg )
-	livecd? (
-		${PNG_DEPEND}
-		sys-libs/gpm
-		)
+	livecd? ( ${PNG_DEPEND} )
 	lzma? ( app-arch/xz-utils )
 	ssl? ( dev-libs/openssl:0 )
 	svga? (
@@ -46,11 +41,12 @@ RDEPEND=">=sys-libs/ncurses-5.7-r7
 		x11-libs/libXext
 		)
 	zlib? ( sys-libs/zlib )"
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-REQUIRED_USE="fbcon? ( jpeg )
-	livecd? ( jpeg )
+REQUIRED_USE="fbcon? ( jpeg gpm )
+	livecd? ( jpeg gpm )
 	svga? ( suid )"
 
 DOCS=( AUTHORS BRAILLE_HOWTO BUGS ChangeLog KEYS NEWS README SITES TODO )
@@ -74,14 +70,14 @@ src_prepare() {
 }
 
 src_configure() {
+	export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+
 	local myconf
 
 	if use X || use fbcon || use directfb || use svga || use livecd; then
 		myconf="${myconf} --enable-graphics"
 	fi
 
-	( use gpm || use fbcon || use livecd ) || export ac_cv_lib_gpm_Gpm_Open=no
-
 	if use fbcon || use livecd; then
 		myconf="${myconf} --with-fb"
 	else