summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Góes <vanquirius@gentoo.org>2005-05-13 16:18:21 +0000
committerMarcelo Góes <vanquirius@gentoo.org>2005-05-13 16:18:21 +0000
commit1372c7df770cb900c598acf128990da23e6b5a70 (patch)
tree4ad2c02a1fe13a510841892a415f7df82263ba54 /www-client
parentStable on hppa. (diff)
downloadgentoo-2-1372c7df770cb900c598acf128990da23e6b5a70.tar.gz
gentoo-2-1372c7df770cb900c598acf128990da23e6b5a70.tar.bz2
gentoo-2-1372c7df770cb900c598acf128990da23e6b5a70.zip
bug 91946
(Portage version: 2.0.51.19)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/links/ChangeLog6
-rw-r--r--www-client/links/Manifest2
-rw-r--r--www-client/links/links-2.1_pre17-r1.ebuild14
3 files changed, 15 insertions, 7 deletions
diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index 2e38a6045860..b41a3541e132 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/links
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.13 2005/05/09 20:41:50 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.14 2005/05/13 16:18:21 vanquirius Exp $
+
+ 13 May 2005; Marcelo Goes <vanquirius@gentoo.org> links-2.1_pre17-r1.ebuild:
+ Changed RDEPEND to allow ppc-macos to work again, changed src_compile to fix
+ bug 91946 regarding failure to display jpeg images.
09 May 2005; Marcelo Goes <vanquirius@gentoo.org> links-2.1_pre17-r1.ebuild:
This ebuild is broken (see bug 91946) and should have been tested in the first
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 249ae66fcbf6..5348e9d334f1 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,6 +1,6 @@
MD5 23210c68197b9588f90f4f89cefa2ded links-2.1_pre15.ebuild 3164
MD5 8f55bf67895afc6253e73f3c8ca91e9c links-2.1_pre17.ebuild 3183
-MD5 ca440be64a0e6397cd97eb86589831cb links-2.1_pre17-r1.ebuild 3459
+MD5 4b1bd05afbc53f81bf7b811f804d616e links-2.1_pre17-r1.ebuild 3518
MD5 cfc05c3a3e2f797e60688231a492cc0c ChangeLog 12614
MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498
MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17-r1 139
diff --git a/www-client/links/links-2.1_pre17-r1.ebuild b/www-client/links/links-2.1_pre17-r1.ebuild
index c365d3d83e9d..37b78c50e82f 100644
--- a/www-client/links/links-2.1_pre17-r1.ebuild
+++ b/www-client/links/links-2.1_pre17-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre17-r1.ebuild,v 1.4 2005/05/09 20:41:50 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre17-r1.ebuild,v 1.5 2005/05/13 16:18:21 vanquirius Exp $
inherit eutils
@@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/download/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
IUSE="directfb ssl javascript png X gpm tiff fbcon svga jpeg unicode livecd"
# Note: if X or fbcon usegflag are enabled, links will be built in graphic
@@ -36,9 +36,10 @@ RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
directfb? ( dev-libs/DirectFB )
fbcon? ( >=media-libs/libpng-1.2.1
sys-libs/gpm )
- livecd? ( >=media-libs/jpeg-6b
+ !ppc-macos? ( livecd?
+ ( >=media-libs/jpeg-6b
>=media-libs/libpng-1.2.1
- sys-libs/gpm )
+ sys-libs/gpm ))
sys-libs/zlib
virtual/libc
sys-libs/ncurses"
@@ -93,6 +94,10 @@ src_compile (){
myconf="${myconf} --without-fb"
fi
+ if use livecd; then
+ myconf="${myconf} --with-libjpeg"
+ fi
+
econf \
$(use_with X x) \
$(use_with png libpng) \
@@ -100,7 +105,6 @@ src_compile (){
$(use_with tiff libtiff) \
$(use_with svga svgalib) \
$(use_with directfb) \
- $(use_with livecd libjpeg) \
$(use_with ssl) \
$(use_enable javascript) \
${myconf} || die "configure failed"