summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-10-10 17:25:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-10-10 17:25:15 +0000
commit060f77f3d974b5e7e2634e0d6dcc4e2235188039 (patch)
treec2311dd1380797d5edfd03e048160732e8df6000 /media-gfx
parentKeyworded for Prefix, bug #385887 (diff)
downloadgentoo-2-060f77f3d974b5e7e2634e0d6dcc4e2235188039.tar.gz
gentoo-2-060f77f3d974b5e7e2634e0d6dcc4e2235188039.tar.bz2
gentoo-2-060f77f3d974b5e7e2634e0d6dcc4e2235188039.zip
ppc stable wrt #386001
(Portage version: 2.2.0_alpha64/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/optipng/ChangeLog5
-rw-r--r--media-gfx/optipng/optipng-0.6.5.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 1f832ddfea39..9fee9e6617b7 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,9 @@
# 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.66 2011/10/08 16:53:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.67 2011/10/10 17:25:15 ssuominen Exp $
+
+ 10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> optipng-0.6.5.ebuild:
+ ppc stable wrt #386001
08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> optipng-0.6.5.ebuild:
amd64 stable wrt #386001
diff --git a/media-gfx/optipng/optipng-0.6.5.ebuild b/media-gfx/optipng/optipng-0.6.5.ebuild
index 0584be7dc6cd..81389d58f6eb 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.4 2011/10/08 16:53:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.5.ebuild,v 1.5 2011/10/10 17:25:15 ssuominen Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -11,10 +11,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
-RDEPEND=">=media-libs/libpng-1.4"
+RDEPEND=">=media-libs/libpng-1.4:0"
DEPEND="${RDEPEND}"
src_prepare() {
@@ -25,11 +25,13 @@ src_prepare() {
lib/pngxtern/scripts/gcc.mak.in \
|| die "sed failed"
+ # FIXME
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
+ ewarn "Using internal copy of libpng, see bug 355739"
rm -rf lib/zlib
fi
}