summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2013-02-21 09:26:25 +0000
committerSven Wegener <swegener@gentoo.org>2013-02-21 09:26:25 +0000
commit37539b7c1e4dbbb9a3457e68331a0ef2f106778e (patch)
tree0373ac00d8d709552d6f4388fdc45cc617b08b03
parentSign the Manifest properly. (diff)
downloadhistorical-37539b7c1e4dbbb9a3457e68331a0ef2f106778e.tar.gz
historical-37539b7c1e4dbbb9a3457e68331a0ef2f106778e.tar.bz2
historical-37539b7c1e4dbbb9a3457e68331a0ef2f106778e.zip
Allow building against bundled libpng and libz.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
-rw-r--r--media-gfx/pngcrush/ChangeLog6
-rw-r--r--media-gfx/pngcrush/Manifest21
-rw-r--r--media-gfx/pngcrush/metadata.xml3
-rw-r--r--media-gfx/pngcrush/pngcrush-1.7.51.ebuild19
4 files changed, 23 insertions, 26 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/Manifest b/media-gfx/pngcrush/Manifest
index 3cde075f4f45..ddcd9099d83a 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,22 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST pngcrush-1.7.41-nolib.tar.xz 52760 SHA256 ab8a08b840c1a827c0a19ae888efa7dbeccf496944ec02f896650939f48d2b60 SHA512 a99ea1ad1a8c26f9f5db18c46ce93b070ae6c175630cd6a783097feea3307d59ecd3ecf843c352c4f5db0ed9f5bf2416000ca39cfc4ecd8e02365db9782bdb53 WHIRLPOOL 6488fb44cc9f6cce673b8efc7655235f408aa6949b8b5cc1904b58e6c58eb568a82273408b0e93570ff4bec44e42fe1420198260b228f84f5006880a19e13e13
DIST pngcrush-1.7.50-nolib.tar.xz 53300 SHA256 a1983a6a10a572b528b89f5335c63e6d7d5344fd7f1d0e81feca6bbe9fc44bf5 SHA512 db09b8467a7185d74631c7418e76becfcf6420df5f202b095edef835cb6de79e3e811c6fc573c649c5c478431a48a1c3bd1d89cb7de33bb9c8f3564fb1d57582 WHIRLPOOL c1daf70cefc1291daaed1a6748d661adad56ac68e98379c1d01c21f779b2b73759c88c71d3b28e6abe01a6cd673cefb7b13a9645199e89303a2d5c9e5bc81752
DIST pngcrush-1.7.51-nolib.tar.xz 53912 SHA256 78df26dd2c6fdb09e55078d173350bef62abb2ba51ccfe352f4be6f6b8cf7762 SHA512 9b4e773bb1d00b49265ae755b59f6bdcb67241cdeec872358b9e8f2777848ce501041b89f1fac70026e70d849a0651c54b78e7341caf814b81fad7111baa59c0 WHIRLPOOL 2b8825bdfaf9df488806d189cf3d0275da91bd0d5b7af99a9462a77e731a1cd52a96e8b5d93fe5d89fc6f7abaabce37719b53b6a4c8f5c9b80fb1de5b56b1ac6
+DIST pngcrush-1.7.51.tar.xz 350732 SHA256 1d9a40c86b261f5de5bb766f7e1f15f6017cb9f604f58b36243b457e980b82b5 SHA512 f55904b71ef9038a4659759f6a2b26df386d7fc537c340624bbdc868e18a6aacaa31367d0f97bdaf1cfa392d5be176108069e13d34508ac971f50834cf3efb1f WHIRLPOOL cf64453bbb891d34efc78533ad7de2e6162564f1bc830f089195c7ea803946c905b79941c9297e330a0fb1f92e16c0991b5ea82f3873efef0f0e76e474cef29f
EBUILD pngcrush-1.7.41.ebuild 840 SHA256 9997cf2ab9b8dbd492e5e6660c47dac47f1c2cb3a25da89d5d32e85df19519b2 SHA512 27d45ac718a974c65bfe073713ff296a5a1aa18e5596c460753a3563a56d98b2ea3e3b2492812ba849ba17ee9db6cd8488cd2d0e2b71e1e74e4a2e5d76a72acc WHIRLPOOL 357ba05e4af118076b3b3c905651d2756d5ed014752bba0b0e3a41ace9834091a023627fc0508995d0b98d156b221e83a3ff719b9f735abc6bebb2538a299427
EBUILD pngcrush-1.7.50.ebuild 848 SHA256 27a79d89a7d76a55fc12ca5753da087a5ad26dc43090212720aa904798932a5e SHA512 ae9aa3480b508c1e2cf7f6e42dc7a8e5cce4b417fce61d082b4b9bfecb5d639acc615ce48314bb3078e88e4e48d0ff9d382e021a09975196b7b3bf414ca02601 WHIRLPOOL 8a9a916cd302372b8a0c88a6768e5bf0fc09487a9706e79d9d562ba4cd669b7de0fc153c4bac67c923aa2699011e889fbbf7b488f10404add95e113ce0940941
-EBUILD pngcrush-1.7.51.ebuild 848 SHA256 76fbc9449adc8bf05c05c0b52ac75f911032ab71640ca858778b98c1db9fb797 SHA512 4c1e401ab9617e1e2792657732699b55ac1bc6b8e68a5fa68bff51976d04163d11f1635f80b7cb35d8882f0f2abce9aea62fc8e9e1b87bf43ea3a9ac1e7aeda3 WHIRLPOOL 57b781cd9b00a49139619deef9e611e9c97ee002b4dc7f23c733d0950abf496dd245c6e84370c54cc475d1b5dcdf514799f86a5cad1fb6a158c4a22e5786c9d0
-MISC ChangeLog 13415 SHA256 b573e7a77a169d4dce94b1e499fc930f30557b2db139a7b0aeebd4313e188aa1 SHA512 570ccd05de1bc79dc77478a6fba1cf9431dcc6c6909fcb90245b38a45c255a5eadac829c8b0ba936b8c36df7143bbd6267315baea8eea227b132021ea6bdff68 WHIRLPOOL 5a3bbc5c0b9e482f71b1031e0a2493f6fa2e4798870ceadc8c6aefc0fd72ee159c6d1a8d8dea76852bff776beffa41733764a0e7d5c6220f17683053c2e86f00
-MISC metadata.xml 390 SHA256 7dbac64e461b6d218c6f839bd88ee315b696edc4082001f202db2edc40cd9e4e SHA512 3e128e8370ce7865f761c9bbc5c8e5264644d11842b3429646282a2851571f7c462472e99850307b60eeaafc3131c6cf2a6d911cc0a676f3760bf6dc3e506621 WHIRLPOOL 6928fbf34f74b8ae85410212a0a06a7eae985a6aff10ca97599f03013c31d0912dbcb1d3c0510178e0c4f2f4af81073ffa16a78a2b5a6d1a8af8ddc5569b3a34
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRJcmvAAoJEEqz6FtPBkyjjbMIAI6WcfrBqTxfaD0QADgE41Pg
-g0013xR5OKPd3AlY1oeVfMI2CZcXLBMSPjJql4dUH6T4yBJcNFMpnvknCLNvsFOC
-JMCCGOkamIQxJgwxZKPLUXJT0bvtGBNYqJu0cWHSphcNprtUB2FZLq4sNMDWVkGU
-X6VtvYfgLRc7wtCOZqM/FecFMc6IHtYoMBy4UkciOkbIELsD7KZcgopSYu19YrTZ
-sOBmMooAADBJ9WL1E6VWoAqJpZ1LGejsqqhJqqOGkB8QBKBApRdBKg6GzpGXv9Hk
-BsAgpBWICUPJvxT5xdiqp1qCfim5V4KPb6PfzbDpfzXzF/EWbl9gTSsv0hHCKi4=
-=WFIc
------END PGP SIGNATURE-----
+EBUILD pngcrush-1.7.51.ebuild 966 SHA256 40634777021acaa5899906752ab49d6386c9a323ece79b7708d3adc3fcf6164b SHA512 8dadf452fad9d590ba67921179676e4bdf30c1fd358e8d754c664feac4400c1e333df54c0570cb0f36b6dd22af0937ecdfbeaff3bc085c0c80874d7055a50d4b WHIRLPOOL fa1be613a18e2d1fc6829f9a3ce935fe5dbe91ea4140102fbf008a90f27cea57b94e0472e919a4132fc1221aa629dc5245b1a9e87a747399edbea2e7586d88fa
+MISC ChangeLog 13555 SHA256 e708a1bcf6f5ceb4400db661e31df285ee737a6631bc37c1ef46382ccd200cfc SHA512 3d0c06c6fc347931e84ea93d046b09312615a0a1f9fa5eeb626c698109fb0d0940f05d1609ff33bae67a150b6cd361a18ef0641a5beda64138aa11ac87fe0423 WHIRLPOOL e498fc8776d1da796aa9e9bede0dfb9f7d46d6b61813950bc1dd61d05f6e40f51dabba6fc16b98cf5e75042178f766978517ad38603f42c137e484f4964e7d86
+MISC metadata.xml 476 SHA256 ddd78286e08e166d556fed889b67f3d5cf6325d6a7b96096b053b84e039cd54b SHA512 968ae36b5e3ad3e4ec0b08ed8e55d2f5f3665247f33e3c493565a2009a35ef92c9d43a3609043219232790ebb5a71683e02a6f95a58cb4840e6569cb8f74e81e WHIRLPOOL fb804ecfde07f340c9c2d4e5a6781266d0de79539983aec9babc9f8da2cfd406497e8fdfc8d67504e32fc592c0db015fb168f6b9883e145e6e8a4620ea5eb538
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 \