summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2008-02-22 07:15:13 +0000
committerLuca Barbato <lu_zero@gentoo.org>2008-02-22 07:15:13 +0000
commit1feef4eaac2bb3975d787044757849c059988d04 (patch)
treeb4abde55f864bc4b81a770150ea6cec2413f5872 /media-libs
parentAdd kolab USE flag. (diff)
downloadhistorical-1feef4eaac2bb3975d787044757849c059988d04.tar.gz
historical-1feef4eaac2bb3975d787044757849c059988d04.tar.bz2
historical-1feef4eaac2bb3975d787044757849c059988d04.zip
minor side condition fix
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/giflib/ChangeLog7
-rw-r--r--media-libs/giflib/Manifest4
-rw-r--r--media-libs/giflib/giflib-4.1.6.ebuild20
3 files changed, 16 insertions, 15 deletions
diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog
index 3ff1fd89ffdf..8d1cff6baa4a 100644
--- a/media-libs/giflib/ChangeLog
+++ b/media-libs/giflib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/giflib
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.52 2007/12/25 17:40:28 armin76 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.53 2008/02/22 07:15:13 lu_zero Exp $
+
+ 22 Feb 2008; Luca Barbato <lu_zero@gentoo.org> giflib-4.1.6.ebuild:
+ fix urt check and clarify, thanks to jakub for pointing it
25 Dec 2007; Raúl Porcel <armin76@gentoo.org> giflib-4.1.6.ebuild:
alpha/ia64 stable wrt #203032
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 018cdc5fd3dd..d72595690f9b 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -2,6 +2,6 @@ AUX giflib-4.1.6-gif2rle.patch 763 RMD160 e76968075b101759d17f76b1048df42d199327
DIST giflib-4.1.4.tar.gz 605811 RMD160 5736adf6b8640ca097a41d9abfe8ed8457f4f659 SHA1 95068775508599e61bfda1de255281440e11d763 SHA256 ecf6101d3b00e67cc8f9e7b1d40a507ab90403bb66997a4c53aa337865289846
DIST giflib-4.1.6.tar.bz2 506050 RMD160 bdb99f7048a79b9e771b069f90ac151537011d19 SHA1 22680f604ec92065f04caf00b1c180ba74fb8562 SHA256 e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed
EBUILD giflib-4.1.4.ebuild 1207 RMD160 bed432abf8ce8eeff7408430cf94369df248ed40 SHA1 0784ed1f57ee27ab849029737ccef6a1390a5c9f SHA256 964dd13cd9b107d9899ec8c37a5af1753e5f7266757ffd03eb820f483c882120
-EBUILD giflib-4.1.6.ebuild 1168 RMD160 7356840109e10638612211622f5b9eeab6499a30 SHA1 7e8acd111b83a75e3e3f5469b5e629abacea4bc4 SHA256 712c7cde9ccbebd79b058d136882f1b06d540707447d920c360a0c16bdd522a1
-MISC ChangeLog 6117 RMD160 fe87df0201d23b6fc28b139fe91f032e38dfab94 SHA1 fd650618ea1739a6fcbb1ef3cc3315469772a378 SHA256 968957cae21fc6877257ceccaff8f092369fc2e907bbed4cd08f6c04bc77d8f4
+EBUILD giflib-4.1.6.ebuild 1207 RMD160 c876b03db00547b2d5dc42b908386cc869f9f6fb SHA1 a872e7bc27107971069793461b81cf1050c516a6 SHA256 347ed2c143d8c3f314020e818d7ffcf84a666de901d9d6bc0a890049cc1c8310
+MISC ChangeLog 6249 RMD160 42ae00b5e4c5abae8c0e87437d882c3825d0c0a7 SHA1 163f67c10fd521924c5e089f807775848b7fb187 SHA256 39391d8116ba90dba1a72a62e96b53ce32e785bd2a66883c85f20f60c340051f
MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
diff --git a/media-libs/giflib/giflib-4.1.6.ebuild b/media-libs/giflib/giflib-4.1.6.ebuild
index b3bcca856014..e86a6b4a54ce 100644
--- a/media-libs/giflib/giflib-4.1.6.ebuild
+++ b/media-libs/giflib/giflib-4.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6.ebuild,v 1.9 2008/01/10 08:49:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6.ebuild,v 1.10 2008/02/22 07:15:13 lu_zero Exp $
inherit eutils libtool
@@ -31,16 +31,14 @@ src_unpack() {
}
src_compile() {
- econf \
- $(use_enable X x11) \
- $(
- # prevent circular depend #111455
- has_version media-libs/urt \
- || --disable-rle \
- && use_enable rle \
- ) \
- --disable-gl \
- || die
+ local myconf="--disable-gl $(use_enable X x11)"
+ # prevent circular depend #111455
+ if has_version media-libs/urt ; then
+ myconf="${myconf} $(use_enable rle)"
+ else
+ myconf="${myconf} --disable-rle"
+ fi
+ econf ${myconf}
emake || die "emake failed"
}