diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-04-15 08:51:24 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-04-15 08:51:24 +0000 |
| commit | 6d774cf5dbe27a5700b770c3a5780d4297a0957f (patch) | |
| tree | 95f28a86b29da59b968500691b48a366f611a214 /media-libs/gd | |
| parent | Allow gcc-apple[fortran] to satisfy this virtual as well (diff) | |
| download | gentoo-2-6d774cf5dbe27a5700b770c3a5780d4297a0957f.tar.gz gentoo-2-6d774cf5dbe27a5700b770c3a5780d4297a0957f.tar.bz2 gentoo-2-6d774cf5dbe27a5700b770c3a5780d4297a0957f.zip | |
Disable png/zlib related programs when support is disabled #363491 by Albert W. Hopkins.
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/gd')
| -rw-r--r-- | media-libs/gd/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/gd/gd-2.0.35-r3.ebuild | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog index 03e58de21f50..6af8e50a9f47 100644 --- a/media-libs/gd/ChangeLog +++ b/media-libs/gd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/gd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.67 2011/04/13 06:32:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.68 2011/04/15 08:51:24 vapier Exp $ + + 15 Apr 2011; Mike Frysinger <vapier@gentoo.org> gd-2.0.35-r3.ebuild: + Disable png/zlib related programs when support is disabled #363491 by Albert + W. Hopkins. *gd-2.0.35-r3 (13 Apr 2011) diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild index 370c5d7ca1ce..b153d1e31900 100644 --- a/media-libs/gd/gd-2.0.35-r3.ebuild +++ b/media-libs/gd/gd-2.0.35-r3.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/gd/gd-2.0.35-r3.ebuild,v 1.1 2011/04/13 06:32:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.2 2011/04/15 08:51:24 vapier Exp $ EAPI="2" @@ -31,6 +31,20 @@ src_prepare() { # Try libpng14 first, then fallback to plain libpng sed -i -e 's:png12:png14:' configure.ac || die + # Avoid programs we never install + sed -i '/^noinst_PROGRAMS/s:=:=\n___fooooo =:' Makefile.in || die + + if ! use png ; then + sed -i -r \ + -e '/^bin_PROGRAMS/,/^noinst_PROGRAMS/s:(gdparttopng|gdtopng|gd2topng|pngtogd|pngtogd2|webpng)..EXEEXT.::g' \ + Makefile.in || die + fi + if ! use zlib ; then + sed -i -r \ + -e '/^bin_PROGRAMS/,/^noinst_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng)..EXEEXT.::g' \ + Makefile.in || die + fi + eautoconf find . -type f -print0 | xargs -0 touch -r configure } |