Handle USE="livecd" in a way support for fbcon, jpeg and gpm are always enabled without REQUIRED_USE for compability with USE flags set by catalyst.

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

3 files changed, 40 insertions, 18 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index 8156a0533d0f..1ab2dd48ef1d 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.172 2012/04/16 17:03:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.173 2012/04/22 16:04:16 ssuominen Exp $
+
+  22 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> links-2.6.ebuild:
+  Handle USE="livecd" in a way support for fbcon, jpeg and gpm are always
+  enabled without REQUIRED_USE for compability with USE flags set by catalyst.
 
   16 Apr 2012; Brent Baude <ranger@gentoo.org> links-2.6.ebuild:
   Marking links-2.6 ppc for bug 411493
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 0ef32974947d..9e4f00b68a41 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST links-2.5.tar.bz2 3849259 RMD160 ec0c2fbf239289d757fd12526495bdcb3c08a588 SHA1 fe4bc37be8aebd9196c35ffef724435cea94349c SHA256 f5c7f23f31d71d073b7b6ad2f123f3f93b07b787912b7b01b4fff565349295f2
 DIST links-2.6.tar.bz2 3866614 RMD160 ea13e446903fbeaa8b05b3aa81dcfe5f69224962 SHA1 228bd726c176ea44d35fa12cafd97aa83214d9dc SHA256 df9149f5f50d0b7742f6b3972b0fc0e9ff091ad4ef27153a3362a9ac1033835b
 DIST links2_2.5-1.debian.tar.gz 20869 RMD160 997338fd263a9519f105d24ced17caba65181caf SHA1 82a2f23c12dca937c29e8f4cd83b7527a7e374e8 SHA256 28fb3fe213b3ba2a2274353a810bcd23d4fd39d949d8cb608c3a366f09651b7e
 EBUILD links-2.5.ebuild 3352 RMD160 e5a88418045af2f898b0e0bc8edc8fe16d133d90 SHA1 4dde689c120577388b94be32a171756bfe1a33de SHA256 211ff99c3ca734e46362ad747ddcdc5cc646dfe65438e150aafdad1b1b9a3fcc
-EBUILD links-2.6.ebuild 3132 RMD160 76856970febed84a9cff4494055fbbbbeddeb042 SHA1 5a15d6c368bfb6510940642654ed8e84ac4247fe SHA256 97e52eca91fd2b92dccf5e285dd24e3830797c188470ccfaa2d1623f6dfda297
-MISC ChangeLog 33425 RMD160 0508fc7ef4c3bb343dea1a61ad502c1c3be4df81 SHA1 353cfc676541f56922fab0b6184ceca1e09a5673 SHA256 097865454ee128dde96f1f2caa0fdb744d16466031066cf0f3dc0475c52d7b4a
+EBUILD links-2.6.ebuild 3217 RMD160 b1f890e2d673a056e2584706ac685757b13fcfcd SHA1 eb9cf73a8cd2ce51c6aa7a4bad33749a1d352821 SHA256 4979a2b2d981404c637daf980caffcb541fdb5f9d35dc8b39edd8f1ab4ff9b37
+MISC ChangeLog 33654 RMD160 d2a1dabee304e29c2e67c10affe5d4fa7fe1f430 SHA1 e03c31b885ea192acb2745656be1b844ee57d3d4 SHA256 96f7f3fa854cc91afb6c2e66dd85f8e1156273e9cfb4a5d94cf99f0efca3db85
 MISC metadata.xml 475 RMD160 8089a45a24128919ea9045afeab78b7f2142224f SHA1 1f7e54ea9eaf0ba842701c75e96ae0d045e42f5e SHA256 47cdac116651eba8a04d0e7a0560d5013bc967ce3aa2d86f61ee8688649a3916
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPlCujAAoJEEdUh39IaPFNwtMH/1y7IbL3/b8wiA1EPUPWwfOQ
+8Yk/FDJtHL9ORu2D9JqZuA90uznDoDuraLa3Vknkctswi8JwJMZT7Fk51NryHEUM
+vr2X8msvFXfFZDHzR77wppS7NOLWKi9YeIToqA+RDmlIIDFWXCL7rSFe4UQ+sAb2
+UD05Qs0aNLoJOM/1nvWyv2zf1nnufZXwTFeVFmJgMzlsS6jjw624GWnG+QJLhA7S
+upI9jHNjS9MgBTyX1z5iiuBD4DIYcIJgQ+DaKaAMISqbr7OG6fnEAFMemUYPNvBI
+m2/66BjgromGR0yGyQspqrkqOoq0ALyvPS2/sa6Bh3u6tWWUvbLn8YWb42RP0bA=
+=oM5G
+-----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.6.ebuild b/www-client/links/links-2.6.ebuild
index a83114bc1aad..974d0f8a16c1 100644
--- a/www-client/links/links-2.6.ebuild
+++ b/www-client/links/links-2.6.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.6.ebuild,v 1.8 2012/04/16 17:03:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.6.ebuild,v 1.9 2012/04/22 16:04:16 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils fdo-mime
@@ -23,7 +23,11 @@ RDEPEND=">=sys-libs/ncurses-5.7-r7
 	fbcon? ( ${GRAPHICS_DEPEND} )
 	gpm? ( sys-libs/gpm )
 	jpeg? ( virtual/jpeg )
-	livecd? ( ${GRAPHICS_DEPEND} )
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg
+		)
 	lzma? ( app-arch/xz-utils )
 	ssl? ( dev-libs/openssl:0 )
 	svga? (
@@ -36,13 +40,13 @@ RDEPEND=">=sys-libs/ncurses-5.7-r7
 		x11-libs/libXext
 		)
 	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
 
-GRAPHICS_USE="jpeg gpm"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
 
-REQUIRED_USE="fbcon? ( ${GRAPHICS_USE} )
-	livecd? ( ${GRAPHICS_USE} )
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
 	svga? ( suid )"
 
 DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
@@ -66,18 +70,17 @@ 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+=' --enable-graphics'
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
 	fi
 
-	if use fbcon || use livecd; then
-		myconf+=' --with-fb'
-	else
-		myconf+=' --without-fb'
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf+=' --enable-graphics'
 	fi
 
 	econf \
@@ -87,6 +90,7 @@ src_configure() {
 		$(use_with lzma) \
 		$(use_with svga svgalib) \
 		$(use_with X x) \
+		$(use_with fbcon fb) \
 		$(use_with directfb) \
 		$(use_with jpeg libjpeg) \
 		$(use_with tiff libtiff) \