Add USE=static support.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 29 insertions, 18 deletions

diff --git a/app-arch/pigz/ChangeLog b/app-arch/pigz/ChangeLog
index 829a04436a1f..69a664298c71 100644
--- a/app-arch/pigz/ChangeLog
+++ b/app-arch/pigz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/pigz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/ChangeLog,v 1.22 2012/08/03 08:32:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/ChangeLog,v 1.23 2012/08/06 19:34:16 vapier Exp $
+
+  06 Aug 2012; Mike Frysinger <vapier@gentoo.org> pigz-2.2.5.ebuild:
+  Add USE=static support.
 
   03 Aug 2012; Tim Harder <radhermit@gentoo.org> -pigz-2.1.6.ebuild,
   -pigz-2.1.6-r1.ebuild, -files/pigz-2.1.6-doubledash.patch,
@@ -99,4 +102,3 @@
   26 Mar 2009; Timothy Redaelli <drizzt@gentoo.org>
   +files/pigz-2.1.4-respect-flags.patch, +metadata.xml, +pigz-2.1.4.ebuild:
   New ebuild
-
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 8b82ae4e7bc7..54267dcdb6eb 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -4,17 +4,23 @@ Hash: SHA256
 DIST pigz-2.2.4.tar.gz 49505 SHA256 7e7967c47f66c07be97cbfa25c8816b72f9d35258466ea31eddc7666c914160e SHA512 ebedc10d79de9fc21cacf302eb323dd3d1c73492da9407b7a2d69be65728bac1619a4b0c6c26cdcb2b955a47572f176ee3e18f9ebc230e4db981b1ab9347da30 WHIRLPOOL a9a8882312ae0588926fc2b1c4dae0ac9a56b1f59ea8211d976d7f30fe2b798a71249d03b4d33c590b62cbddb63c6b7998c1de200880770098dc062bd367d343
 DIST pigz-2.2.5.tar.gz 49717 SHA256 e37498cbf3a475d7ebe2519751188c29564bf8dd27ba68bd3c7fe1ac08792759 SHA512 b399dee20c3484b5425490ee06404f8c6e3335a1c8eda8f625b62025dba99d2ebdd398a6acd7dd9c44cdb5370ccf66e0a6334bb5aace0a5dee30351cfd3abd4c WHIRLPOOL 178efcb07a79fd7667029c837a19291a73c089cac6dc4c2c8dceeef0ff5e836e26bdfc39d04888ed4896c36c4b52b3d96d344dbf73165acc1f320e1abea83077
 EBUILD pigz-2.2.4.ebuild 876 SHA256 9a5d58bde0bb01ef49b32b824b2de3699ab76301ab8960149a9569875a333c05 SHA512 172a8c8b742c7e797a0ee62b7c0d40e659f981330c5c17aa39d8a9cfc605714da0c741f1ae10c14ecefb46ee609c4519345be858907abdfbe78f83b5ff9d2949 WHIRLPOOL 3a3730d3bf9d4a2da68e16048bb1786897734b57b2d1ab0dc260f5b0fe70f71cc8a7d1c3fc332d8addc55088e4be513820568bc59dc69c40d554db8b98780927
-EBUILD pigz-2.2.5.ebuild 881 SHA256 e97e4d3b65cb9d7e8f2f49e2fde77df4a5975170748b6327d89d8413036f6026 SHA512 1a57af6dd54bf9efd78e54a710d628c1a2a16e7ed766e6931e41b41ae9cc31bef44856c98a1cc4fd1270de400025175285bb29520bb80f1c78b7fd845acef9af WHIRLPOOL 0ab13c1a40cec70a81c1a82780ff2598a4cfba6c7d4ba1c521f5f1377923aa529b90da67ed34d7f6f9e14ffdb5852ab4204c348fc15f6a1ce71608eff6cea5aa
-MISC ChangeLog 3507 SHA256 ed2c06342ddc4be59a8e6bafbfb5c3bf8d56b7779337e1244532fec002fbacbc SHA512 12af10472125fbde30a64c7d6cce84a454fe6e31f2f05a9d3dae9be2e1956c8e53cd8e3a27868a2beea68fdc6a6e7bcbe0d03455ee057a7de0516c92731fc7ba WHIRLPOOL 35c9c0a0a01c1a6a1f1fc0c8d585a28301521b5f8f86e557fe9c058c215938ef3b22dbd1053a3ac500dad4eaa5ca8b17d06bc0a89b382981f19a3dd2f8e91501
+EBUILD pigz-2.2.5.ebuild 1011 SHA256 c1494c5d3265fa3c9e2e07ffe7092d631899836cb80a5b7149bef62f8f8203bc SHA512 9a1897d9a46fc0ae79bfcd6adb0fa4685ee53500c4eb9ce4c6682bb01c0f6b9ddc5f85de9db4d8b85d0fae59cfff4da09187fb70785bc99640a26fbb58232141 WHIRLPOOL f1d974ad07fe8ccb871ebb989781abc677ea3f299fc1bd5e39ab9559e407ecbcb6d42544f992c64d256f98a2a3911a860d631bf7aabdaf89216e04607f25f736
+MISC ChangeLog 3599 SHA256 b650d9da8e6a6be444e4035365aa450306c81579abbd7e46fcf7d6a421baf49b SHA512 1f0390d26866cb6c753f804eb6d7ff0c2a94bd1a06a49d1246c6696cb3518660e293e205947c8b787aed5bf28bca1cb6cf1edf9eceb0f58056fbf5ab962239aa WHIRLPOOL ba644c900884e3272cef1d551fdc74272d6285d04aef9096ec1300f6a3ce808c794f14492695aba35308bf2f61234c05c7ca683cebcd01a3b6193701697b6db1
 MISC metadata.xml 457 SHA256 db6837d4c07a83cd702bf309a6b3ba2fbcd0af3f700c7802f9414aa4cde35187 SHA512 33aed117d1dfffa818d5a9d1d6516be4a370af73c0bc147b71c8015c09d7d0057577d1d2aa2e3dea50e1351f76ab40308486fdd0e3d07a869d2e73c1b1778d83 WHIRLPOOL 7a1742ceebf9df78e873abed24fb0623d4549f209758e55d1d59c9efc5ff869cf00a65d23f1c8280fded24176dec1671a309d231de95f7247557ce4e6a37cd42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQG4yNAAoJEEqz6FtPBkyjH9EH/iPBkbQ4E6bmlqigrshx0irW
-9HkLLlrdQUD3AaeXrQOx6Z3U3wcYZk85laNJKniiW3aKgvF3fxhzaZtzU/f4KEAS
-gyhLa0Q3/cRC8IIcjPhoMQkxW7/ey35Qu1l09RvDFFU3QS1NNSdzuKYUC1UYZI5F
-7kjhdSAOsK8wA4g8yvLhSZ5+RUkd63Jyp5FjX40zvBniDZQZZjMORmBbEacFnhtr
-I3ZkQ+BHtFRwsnrZL+M4XkZiJpGDJtRHh+5Ql9GR57KLKAeKHn1gE4EZXdlNFmkz
-qxRAs9qInubKkdDwZMUrEAd89Vm+qIlOyIfg+neW+xvldACAKZRw0y1e9Vpxkig=
-=mynV
+iQIcBAEBCAAGBQJQIBw/AAoJELEHsLL7fEFWD7UP/RwndTknkRYz7BV43pxwp4Sa
+2b4vapdZY9BRwrgrbo/jNoipzyKnD14CRsoDiUa+z/+dpavNtIrKxRJmqTUfNmyp
+pxBA1hRUqCdq8h+32l8R4oaFkgSjSj16lQIRf2ySJa9KnZnyP+sTcOyj2Feqf2/A
+R9fJQg9zMzeQqNsdZLf8ApIjE/w3iuaLESMDWAaW2bw8tMJ28mGj9bVEhAdCKYz0
+cNTepjemD+UWjHiboRCsKOpm3+cKK8QQP7D2AWfgN8831K4IlZR+STZ6dCTH4TG2
+YPMcytKMIpWOYSMGaza22jwIHJkCV9uv/Cwt89CWYXS3f67H5kL4ta2O7MzLaWCy
+OcTBljLeg1LcHC1Lz6xsdu3EmXOPmF5CTP9enbOcGTpkfmLqUeIM/hjUOohpZI15
+Sbl/XlTUmS4DFojE47IGHhBjd9iVj8+LsD4rqS0PKeEjSXHvPAZl8KAEbIEZ6NSL
+xM8NAErPpE2JWSdnFV8xhZQeXDOsa/ZN7sWY1DTHcP2dk89NbQnsLVoWXf42jzEa
+LqjFYrwL+g19dXWLxmX0hR+1nt/uLUeeODr8s63HqU/oursW2TQo5Q2xuHzWQr5A
+ZDc6q0kfR02bGLWQ/aQf/JwCtPj90iQQBFogya7f8wXY2VsTeHwHjrGcqmRoxUSW
++uFVEVaFUu6UUTcJfLWW
+=CwLi
 -----END PGP SIGNATURE-----
diff --git a/app-arch/pigz/pigz-2.2.5.ebuild b/app-arch/pigz/pigz-2.2.5.ebuild
index 962e6192b54e..55426e7e9761 100644
--- a/app-arch/pigz/pigz-2.2.5.ebuild
+++ b/app-arch/pigz/pigz-2.2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.2.5.ebuild,v 1.1 2012/08/03 08:30:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.2.5.ebuild,v 1.2 2012/08/06 19:34:16 vapier Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A parallel implementation of gzip"
 HOMEPAGE="http://www.zlib.net/pigz/"
@@ -13,25 +13,28 @@ SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~mips ~sparc ~x86 ~amd64-linux ~sparc64-solaris"
-IUSE="symlink test"
+IUSE="static symlink test"
 
-RDEPEND="sys-libs/zlib"
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
 	test? ( app-arch/ncompress )"
 
 src_prepare() {
 	sed -i -e '1,3d' -e '5s/$(CC)/$(CC) $(LDFLAGS)/' Makefile || die
+	use static && append-ldflags -static
 	tc-export CC
 }
 
 src_install() {
 	dobin ${PN}
-	dosym /usr/bin/${PN} /usr/bin/un${PN}
+	dosym ${PN} /usr/bin/un${PN}
 	dodoc README
 	doman ${PN}.1
 
 	if use symlink; then
-		dosym /usr/bin/${PN} /usr/bin/gzip
-		dosym /usr/bin/un${PN} /usr/bin/gunzip
+		dosym ${PN} /usr/bin/gzip
+		dosym un${PN} /usr/bin/gunzip
 	fi
 }