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 | 62c5837c15db4d92eb364b2528305b12d694db39 (patch) | |
| tree | 77dc72ee94983b50cacc3f979341c9c29a35a8e2 /media-libs | |
| parent | Allow gcc-apple[fortran] to satisfy this virtual as well (diff) | |
| download | historical-62c5837c15db4d92eb364b2528305b12d694db39.tar.gz historical-62c5837c15db4d92eb364b2528305b12d694db39.tar.bz2 historical-62c5837c15db4d92eb364b2528305b12d694db39.zip | |
Disable png/zlib related programs when support is disabled #363491 by Albert W. Hopkins.
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/gd/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/gd/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/gd/gd-2.0.35-r3.ebuild | 16 |
3 files changed, 25 insertions, 7 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/Manifest b/media-libs/gd/Manifest index 1c52fc9cc456..a23efd2fadb4 100644 --- a/media-libs/gd/Manifest +++ b/media-libs/gd/Manifest @@ -7,13 +7,13 @@ AUX gd-2.0.35-maxcolors.patch 348 RMD160 14ef5425229c5406c90beb4a8fade801cd1013b DIST gd-2.0.35.tar.bz2 1212730 RMD160 f452a2c333b2ba9b7b4c143983ec2af18a335516 SHA1 ccf34a610abff2dbf133a20c4d2a4aa94939018a SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9 EBUILD gd-2.0.35-r1.ebuild 1238 RMD160 47424c23f20db301c026d45a649793b270757722 SHA1 ca814a7bc69cc2c8804f812ae7d1386f2e08fbd0 SHA256 bba6e84fc0e5d7b2e9e287773c9397d5d0d6e00bd8ef619273e9e4a4f4077e5b EBUILD gd-2.0.35-r2.ebuild 1416 RMD160 3e048f308cc881702f2dea4bde0a6c5d45b96b82 SHA1 91fc8e4954cb0c3ad52cefb3c5c919331c90ea38 SHA256 832cd51c0c0cf61a2321811cc0186fc5c4d152adc970bf6c510f65597a69dd04 -EBUILD gd-2.0.35-r3.ebuild 1618 RMD160 ffbbd7a877b3ea88dc16ff5832ebaaacde7124c5 SHA1 7955a376cceec9d0626a75bb1e18aa981bce4bb6 SHA256 bebebf788cf865e41e95d21e5a63b7bb32935dd8c634dcf9c9f29cda386180c3 -MISC ChangeLog 14453 RMD160 7913415c7a5928825c61147da51b936b8218992d SHA1 003002fb590a0d481bc1aef78545fb35ec09eb88 SHA256 f15ad99dbe1baa1f5eb121ee59f6fd211ca8f7f49bc769f2bd508d12bbe40ad2 +EBUILD gd-2.0.35-r3.ebuild 2068 RMD160 10b22d119fdeafcb27eae1b866ae0e5f243256d0 SHA1 37df97a2c2d769c4992af362489da3ff3e913743 SHA256 0887648f4fa93a385f779649a48b6310f17c9aa96883180fa97b345d9ae4330a +MISC ChangeLog 14618 RMD160 9b414c99ad35f7054281cf5ccf0d91f8d65d6feb SHA1 62b2919019578d4cff39d87c1becd4e27a817260 SHA256 0430559e27c72764c09ca38020cf7d6f6722fbdade9022449b474cb7b4498e97 MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk2lQ6AACgkQaC/OocHi7JbKswEAkQYL5d7wFwwu7ksGSm9aTfxH -GA02pKwuiNIZqet3ouYA/ibiYPA9/Vdwb8Xre3sn6GaPm465oG9AIcpYFU+duVv1 -=zhfs +iF4EAREIAAYFAk2oBw8ACgkQaC/OocHi7JaGzAEAkPak5crMiVLqlTmh7xn/ckyU +VpDYBTnisicH8ubvCKAA/3eOVL4ApR3DLRbfmr0sJw4lBC4iDYM1ch0U5Qu10Aww +=JtYF -----END PGP SIGNATURE----- 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 } |