diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2013-02-21 09:26:24 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2013-02-21 09:26:24 +0000 |
| commit | 1c16cca19e4bef213cbfbe8c19c449669ee56c45 (patch) | |
| tree | 5c8cb142b456575978a45104091c4e851884d1b3 /media-gfx/pngcrush | |
| parent | Sign the Manifest properly. (diff) | |
| download | gentoo-2-1c16cca19e4bef213cbfbe8c19c449669ee56c45.tar.gz gentoo-2-1c16cca19e4bef213cbfbe8c19c449669ee56c45.tar.bz2 gentoo-2-1c16cca19e4bef213cbfbe8c19c449669ee56c45.zip | |
Allow building against bundled libpng and libz.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-gfx/pngcrush')
| -rw-r--r-- | media-gfx/pngcrush/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/pngcrush/metadata.xml | 3 | ||||
| -rw-r--r-- | media-gfx/pngcrush/pngcrush-1.7.51.ebuild | 19 |
3 files changed, 19 insertions, 9 deletions
diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog index cab1abe769b4..f2101ee53a41 100644 --- a/media-gfx/pngcrush/ChangeLog +++ b/media-gfx/pngcrush/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/pngcrush # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.105 2013/02/21 07:15:58 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.106 2013/02/21 09:26:24 swegener Exp $ + + 21 Feb 2013; Sven Wegener <swegener@gentoo.org> metadata.xml, + pngcrush-1.7.51.ebuild: + Allow building against bundled libpng and libz. *pngcrush-1.7.51 (21 Feb 2013) diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml index 14dc65a4cf6f..c94cf905faf9 100644 --- a/media-gfx/pngcrush/metadata.xml +++ b/media-gfx/pngcrush/metadata.xml @@ -9,4 +9,7 @@ </maintainer> <bugs-to>http://sourceforge.net/tracker/?group_id=1689</bugs-to> </upstream> +<use> + <flag name='system-libs'>Use libpng and libz provided by system</flag> +</use> </pkgmetadata> diff --git a/media-gfx/pngcrush/pngcrush-1.7.51.ebuild b/media-gfx/pngcrush/pngcrush-1.7.51.ebuild index ae061b02e63a..3088d249d607 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.51.ebuild +++ b/media-gfx/pngcrush/pngcrush-1.7.51.ebuild @@ -1,28 +1,31 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.7.51.ebuild,v 1.1 2013/02/21 07:15:58 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.7.51.ebuild,v 1.2 2013/02/21 09:26:24 swegener Exp $ EAPI=5 -MY_P=${P}-nolib - inherit toolchain-funcs DESCRIPTION="Portable Network Graphics (PNG) optimizing utility" HOMEPAGE="http://pmt.sourceforge.net/pngcrush/" -SRC_URI="mirror://sourceforge/pmt/${MY_P}.tar.xz" +SRC_URI="system-libs? ( mirror://sourceforge/pmt/${P}-nolib.tar.xz ) + !system-libs? ( mirror://sourceforge/pmt/${P}.tar.xz )" LICENSE="pngcrush" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" +IUSE="+system-libs" -RDEPEND=">=media-libs/libpng-1.4:0 - sys-libs/zlib" +RDEPEND="system-libs? ( + >=media-libs/libpng-1.4:0 + sys-libs/zlib + )" DEPEND="${RDEPEND} app-arch/xz-utils" -S=${WORKDIR}/${MY_P} +pkg_setup() { + use system-libs && S+="-nolib" +} src_compile() { emake \ |