diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 18:43:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 18:43:28 +0000 |
| commit | b184bba04a0d82756d8231aeaa18860e031cc15c (patch) | |
| tree | 3d5a256b0eec08633154f45080caad50d5fc0acb /media-gfx | |
| parent | Drop obsolete stripping of openjdk checks (diff) | |
| download | gentoo-2-b184bba04a0d82756d8231aeaa18860e031cc15c.tar.gz gentoo-2-b184bba04a0d82756d8231aeaa18860e031cc15c.tar.bz2 gentoo-2-b184bba04a0d82756d8231aeaa18860e031cc15c.zip | |
Use internal copy of libpng14 with system libpng15 wrt #355739 by Hanno Boeck. This is a temporary solution until upstream has migrated.
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/optipng/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/optipng/optipng-0.6.5.ebuild | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog index b06ac8bd818b..d561bad7cfbf 100644 --- a/media-gfx/optipng/ChangeLog +++ b/media-gfx/optipng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/optipng # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.63 2011/08/02 15:10:47 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.64 2011/09/17 18:43:28 ssuominen Exp $ + + 17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> optipng-0.6.5.ebuild: + Use internal copy of libpng14 with system libpng15 wrt #355739 by Hanno + Boeck. This is a temporary solution until upstream has migrated. *optipng-0.6.5 (02 Aug 2011) diff --git a/media-gfx/optipng/optipng-0.6.5.ebuild b/media-gfx/optipng/optipng-0.6.5.ebuild index fbb0fa635087..8323045d9774 100644 --- a/media-gfx/optipng/optipng-0.6.5.ebuild +++ b/media-gfx/optipng/optipng-0.6.5.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-gfx/optipng/optipng-0.6.5.ebuild,v 1.1 2011/08/02 15:10:47 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.5.ebuild,v 1.2 2011/09/17 18:43:28 ssuominen Exp $ EAPI=2 inherit eutils toolchain-funcs @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="" -DEPEND="<media-libs/libpng-1.5" +RDEPEND=">=media-libs/libpng-1.4" +DEPEND="${RDEPEND}" src_prepare() { sed -i \ @@ -23,15 +24,19 @@ src_prepare() { src/scripts/gcc.mak.in \ lib/pngxtern/scripts/gcc.mak.in \ || die "sed failed" - cp lib/libpng/pngpriv.h src/ || die - rm -rf lib/{libpng,zlib} - epatch "${FILESDIR}"/${P}-libpng-1.4.8.patch + if has_version "<media-libs/libpng-1.5:0"; then + cp lib/libpng/pngpriv.h src/ || die + rm -rf lib/{libpng,zlib} + epatch "${FILESDIR}"/${P}-libpng-1.4.8.patch + else + rm -rf lib/zlib + fi } src_configure() { ./configure \ - -with-system-libpng \ + $(has_version "<media-libs/libpng-1.5:0" && echo -with-system-libpng) \ -with-system-zlib \ || die "configure failed" } |