diff options
| author |   Marcelo Góes <vanquirius@gentoo.org> | 2006-04-05 15:01:48 +0000 |
|---|---|---|
| committer | Marcelo Góes <vanquirius@gentoo.org> | 2006-04-05 15:01:48 +0000 |
| commit | 16989492bdcc34799f4fc641dd9a7d5556193959 (patch) | |
| tree | 03355a3aa8ab83456cf18e52ef8b0aa9de63f923 | |
| parent | remove old patch (diff) | |
| download | gentoo-2-16989492bdcc34799f4fc641dd9a7d5556193959.tar.gz gentoo-2-16989492bdcc34799f4fc641dd9a7d5556193959.tar.bz2 gentoo-2-16989492bdcc34799f4fc641dd9a7d5556193959.zip | |
Fix dependencies so that it doesn't fail in non-interactive builds. Thanks to Gustavo Zacarias <gustavoz at gentoo dot org> in bug 128252.
(Portage version: 2.0.54)
| -rw-r--r-- | www-client/links/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/links/Manifest | 2 | ||||
| -rw-r--r-- | www-client/links/links-2.1_pre20.ebuild | 29 |
3 files changed, 14 insertions, 23 deletions
diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog index 277b468883d6..a43a3fe0227c 100644 --- a/www-client/links/ChangeLog +++ b/www-client/links/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/links # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.61 2006/02/21 14:23:21 deltacow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.62 2006/04/05 15:01:48 vanquirius Exp $ + + 05 Apr 2006; Marcelo Goes <vanquirius@gentoo.org> links-2.1_pre20.ebuild: + Fix dependencies so that it doesn't fail in non-interactive builds. Thanks + to Gustavo Zacarias <gustavoz at gentoo dot org> in bug 128252. 21 Feb 2006; Scott Stoddard <deltacow@gentoo.org> links-2.1_pre20.ebuild: Stable on amd64. diff --git a/www-client/links/Manifest b/www-client/links/Manifest index 298ef01d9def..7f9f258bec5b 100644 --- a/www-client/links/Manifest +++ b/www-client/links/Manifest @@ -7,5 +7,5 @@ MD5 5b8b5b21da5582f7c332b2a2d6afafcd files/links-2.1pre18-no-javascript-fix.patc MD5 d5afe5a36fa089d1020d9f7f1d04b230 links-2.1_pre17-r1.ebuild 3515 MD5 e8ff65721f5c1b5f52d714a7700efde0 links-2.1_pre18.ebuild 3655 MD5 8efab0eb449cf677a20370b5cb0e2f9e links-2.1_pre19.ebuild 3627 -MD5 10330b34d536be9f476e68f710ab71d6 links-2.1_pre20.ebuild 3795 +MD5 28b243b85cb3cb70a74008f87e430305 links-2.1_pre20.ebuild 3415 MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498 diff --git a/www-client/links/links-2.1_pre20.ebuild b/www-client/links/links-2.1_pre20.ebuild index 0b3d6293a5ac..eafce5cb58b3 100644 --- a/www-client/links/links-2.1_pre20.ebuild +++ b/www-client/links/links-2.1_pre20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre20.ebuild,v 1.11 2006/02/21 14:23:21 deltacow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre20.ebuild,v 1.12 2006/04/05 15:01:48 vanquirius Exp $ inherit eutils toolchain-funcs @@ -27,10 +27,15 @@ RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c ) gpm? ( sys-libs/gpm ) png? ( >=media-libs/libpng-1.2.1 ) jpeg? ( >=media-libs/jpeg-6b ) + fbcon? ( >=media-libs/libpng-1.2.1 + >=media-libs/jpeg-6b + sys-libs/gpm ) tiff? ( >=media-libs/tiff-3.5.7 ) - svga? ( >=media-libs/svgalib-1.4.3 ) + svga? ( >=media-libs/svgalib-1.4.3 + >=media-libs/libpng-1.2.1 ) X? ( || ( x11-libs/libXext - virtual/x11 ) ) + virtual/x11 ) + >=media-libs/libpng-1.2.1 ) directfb? ( dev-libs/DirectFB ) sdl? ( >=media-libs/libsdl-1.2.0 ) sys-libs/zlib @@ -46,24 +51,6 @@ DEPEND="${RDEPEND} PROVIDE="virtual/textbrowser" -pkg_setup (){ - if use fbcon && ( ! use png || ! use gpm ); then - eerror "You have set the fbcon USE flag. You must also set the png & gpm USE flags" - eerror "to be able to use fbcon." - die "fbcon set without png & gpm set" - fi - - if use X && ! use png; then - eerror "You have set the X USE flag, you must also set the png USE flag" - die "X set without png" - fi - - if use svga && ! use png; then - eerror "You have set the svga USE flag, you must also set the png USE flag" - die "svga set without png" - fi -} - src_unpack (){ unpack ${A}; cd "${S}" |