diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-17 22:48:34 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-17 22:48:34 +0000 |
| commit | 45b4ad7e6f1b0c4b091fb91eac8f8dfca155fc32 (patch) | |
| tree | 7dab283daff2dbc8c9853806a6a8678cb78bc68e /media-libs/giflib | |
| parent | Stable for ppc/ppc64; bug #371697 (diff) | |
| download | gentoo-2-45b4ad7e6f1b0c4b091fb91eac8f8dfca155fc32.tar.gz gentoo-2-45b4ad7e6f1b0c4b091fb91eac8f8dfca155fc32.tar.bz2 gentoo-2-45b4ad7e6f1b0c4b091fb91eac8f8dfca155fc32.zip | |
Revision bump to add back .la file when using static libs. Preserve the stable keywords as the former change might break stable static builds only. Fixes bug #371173.
(Portage version: 2.2.0_alpha45/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'media-libs/giflib')
| -rw-r--r-- | media-libs/giflib/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/giflib/giflib-4.1.6-r2.ebuild (renamed from media-libs/giflib/giflib-4.1.6-r1.ebuild) | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog index a848eb49de41..43e531c5a994 100644 --- a/media-libs/giflib/ChangeLog +++ b/media-libs/giflib/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/giflib # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.62 2011/06/12 11:26:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.63 2011/07/17 22:48:34 scarabeus Exp $ + +*giflib-4.1.6-r2 (17 Jul 2011) + + 17 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> -giflib-4.1.6-r1.ebuild, + +giflib-4.1.6-r2.ebuild: + Revision bump to add back .la file when using static libs. Preserve the + stable keywords as the former change might break stable static builds only. + Fixes bug #371173. 12 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> giflib-4.1.6-r1.ebuild: Introduce (add back) optional support for static libraries as per bug diff --git a/media-libs/giflib/giflib-4.1.6-r1.ebuild b/media-libs/giflib/giflib-4.1.6-r2.ebuild index a6ba9df4c14e..6a2c28a75bc2 100644 --- a/media-libs/giflib/giflib-4.1.6-r1.ebuild +++ b/media-libs/giflib/giflib-4.1.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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-r1.ebuild,v 1.9 2011/06/12 11:26:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6-r2.ebuild,v 1.1 2011/07/17 22:48:34 scarabeus Exp $ EAPI=4 @@ -15,14 +15,14 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="rle static-libs X" -DEPEND=" - X? ( +DEPEND="X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libICE x11-libs/libSM ) rle? ( media-libs/urt )" +RDEPEND="${DEPEND}" src_prepare() { epatch "${FILESDIR}"/${P}-gif2rle.patch @@ -50,7 +50,8 @@ src_configure() { src_install() { default - find "${ED}" -name '*.la' -exec rm -f {} + + # for static libs the .la file is required if build with +rle or +X + use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt dohtml -r doc } |