suggested changes and stable version added from bug #444530

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 78 insertions, 22 deletions

diff --git a/app-arch/pixz/ChangeLog b/app-arch/pixz/ChangeLog
index b93397ca9550..14c9f4c6e05b 100644
--- a/app-arch/pixz/ChangeLog
+++ b/app-arch/pixz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/pixz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/ChangeLog,v 1.1 2012/11/13 23:37:20 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/ChangeLog,v 1.2 2012/11/25 02:10:01 zerochaos Exp $
+
+*pixz-1.0 (25 Nov 2012)
+
+  25 Nov 2012; Rick Farina <zerochaos@gentoo.org> +pixz-1.0.ebuild,
+  pixz-9999.ebuild:
+  suggested changes and stable version added from bug #444530
 
 *pixz-9999 (13 Nov 2012)
 
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index 1e0370144005..2e901a96081d 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-EBUILD pixz-9999.ebuild 529 SHA256 1cb15a62cb883d195d95f74692f011e3136c71e0a88e30f74e8ab26564496906 SHA512 e2c1732d6af5109299123561cb63e6fdcee74d1c9f52129fedf72998cc4fbd63c1da8315c6e80a16a75a5c0574653922d45f4151f07e8f358cf2e9a2cb04398a WHIRLPOOL d2b8f7b2ffd9ab224e1cecb79e37680ac851d05ce9facb9dda24a124b0d0aa55c4f9d867d1345e2c4b2e884085f73a9479001a84758d5454c6b53fa9cb5c8a8b
-MISC ChangeLog 336 SHA256 771c77565b233af3c099556cd9e106824ae1e17b49209affb275f65083138372 SHA512 0d89d6c0d0d72fa66c8c28f94e8eab25d46c646eed46e2c5b1e9a1c4e59493c29ad18ed8d60ec716312e18b14e72d5acac1aecf08b122bab1516cfa5057882c6 WHIRLPOOL 337adcae8533638b1602ce487cc4ac8f34caf8cdee2122fec169c609bb4204f7e14d15c91d7bccf3ee7401ba0626523400e7b4cd1c0c9dcb948f42a044beb72c
+DIST pixz-1.0.tar.gz 17736 SHA256 912c60de88f7eca2e1c6fe13eec5371f723018dca933796c47cd50bf6a349fc9 SHA512 5b0df7ed8ff4c54ffe899decd1f0874aa7a0245cd4968f416c457508583c9048f483592ac933620b2325815052803508a2bf0d70ab679333288e5249c0dbc5c2 WHIRLPOOL 5b6ea1fc5d66ccab4bf07ecf291c6110abc73dc46ced312eb564c7bad950052d4f214563df72bb04eb2d723f0b1b1ece71c2aa59d3d4a2fa480b4fb740cdbb98
+EBUILD pixz-1.0.ebuild 739 SHA256 3b6bffa7fb2c7a6bff66531441b255e50cf47dd4a2d457ca7b12080ffe5a9d28 SHA512 e3657914f03813f383e14b811a760a964646dee4623539c8a0eb825f61b83110499fbf401b2d367b80261cc5141e64e58cbab70b146f2f0cbbebef1332fefdd1 WHIRLPOOL ef087e305e5e57d10e690c4f1583077aae5c7d874409cec7cd3b755c97739adc05f8e28d9d189561f8af4290cf68a92653f84eda6f6104ad953171f94ca93102
+EBUILD pixz-9999.ebuild 740 SHA256 8f3b6bfdf48d663982c85acc8503018e3a514a56a0531a16d8a77b3f51629844 SHA512 39cd44a1a7fc017570e01fa29a409b047510b06c49c71f251602fa46801308bdad49cc2888671080e29cd58c1547b747357679dd20a6d8339020844031531ba2 WHIRLPOOL 89e934f3b7e0e2586ffaf4ad91c5b4469213473ade5526d502ea2174a72aed278c1e521c0cff3cc414f432b578aef2339f7a67ec893e4a3cb24f26c95d364fe8
+MISC ChangeLog 512 SHA256 ab3b0df4cffc52fbc19b28374649acb4ae894f2883f863a4ea375accb871b962 SHA512 4c850fd85424a227f3c863fb5aeabe7ff64355d2bb44a313c4203e4329023d3cc21417d0ef517b925e3f59aff3e7ade6db3dfc94e3dd21c5afb10167650c04d2 WHIRLPOOL 331895b209403b154aeaa20e92619662a654693aa5abf8f631dfc3cb9ab4a10922747fcdb109468f2aa5894db84e9e39935a403686ef4b43083a9ba18fbc7127
 MISC metadata.xml 275 SHA256 ddea40fdfb3de36c4e8ec395d93195500089d461dc340ca376d7d93a3b6c3c70 SHA512 23a0fff59aeb0bceae496a74b75da3bc80d71fe9c60f63b1c20eecb97dd75fa32180457dfca21871c1e8d0a34f85a4a201a0eae0b46cbf91abb0fc8322d0b9f2 WHIRLPOOL 9f6a81dc72dc72656e6c32be440c3276225a7d7d09b4b1833db219eee071d3916e8eda3bdf6dbde6db1e5a6c9b4972fa6bb6e6ddecd2302941d9fdf283246761
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQotm6AAoJEKXdFCfdEflK83kP/jjwhm04P5kUH1RLwi6l4ZGj
-5uUJPYgT2ZEYTVQs7wUANYqG8sREMAnQmmNCU7Zf2U81v8PFg8F4gzDTdCo4PgPO
-Z2ManZ2EmWal/qGyviAeR6//k0GxOonQQ63FayGF3Zy2LK8X9kSVaay/7hq0qVSE
-MwuWkr9mc8ICML5VqMcmlKJcWGk1mLZXcMR1S5LYadcBdaZe9aQliKWEUB/4zOWn
-27jn057g306vVUe6S/MN+qD1sFhpdwtpLeOalb4CTGgfv9rQayvZf6QnAbm24cC9
-XKQaGeXwankQ1o9mST++7OhEjQ0m/hLobbbRZlzSfb5klvEHhJ4u+WCQQcb9Q+5R
-3Y8PLQNl1Mt9cdcC6ltrohtjdY3tQOCwEo4mCDywYg0sz619hndIaXORQHzLj5eN
-ILkWT+SNvBgz7WG789vhD7JUjlQ0mcgLIzimzaOU5MKloQlYg3yfWcrdPNLt6oR8
-3jycEILRaSINk6KtDCBCb1efj6z+kiU8vBxxApvwbhp/nQ2f99kXC0jpcikM6fmn
-A1gYf3AELfdOAroaEL4o5HhXpCEQVsahUbkCV2LJbOTG4U6LOBnWrfVwtdjxw4hN
-zZHpmDopVyhArHgvzRBjnoJywxIfsYKGsyynsd2LdGCg9/DQ70ntIBX7+g/3pZHR
-ds2Ji4CFy5vDwddvKoeo
-=UFx4
+iQIcBAEBCgAGBQJQsX4mAAoJEKXdFCfdEflKqQAP/2Ah7hS5vHXTpuuBSlFQnKOQ
+uyOMU3cFYpdOmYrvasJgWYB38AbL6uyxotxiq7u4sbNmDT3wSnCTG8PExJ20i4aW
+/JQyVuTyFfDhVnRaTVgxYRCnKw1HKTqruiirXg/Y/p6noq+z02GROYb9LdXzascX
+iY7wh8psvG9cH2g9nVQ1FT/Knp6T1wbJLdpOuS1tpXxphINnVsgk491SWDS7abUh
+n65gKw86SaaSnm6Zwmk3uxBzLd3yb56HGA2bNmmqtmCKHvEF5dcvPiHn6YUvJeqr
+MWW5OP2XTclje0So6OWvXAKX5lda5fSvXPeu09pw8mccN6lXKduiWmUSKU++imG/
+dvMobTvNI5z4UEr1nZMTUGxImuWe6KGLu1ZzGyw4vbz9UBq4tFrLL90WfjBZQ5Eh
+N9g0V0Y/f/ceH4u9NnPR8L7ACun9/Kn/X22X4tQlGmCsaYIoIZipqj20uR49PRIM
+T1jyxknW9hjNcnRL8QA/TsihPlNQhQFIVg3jkZPUmN2vmJWetns76W+m0+Oppikf
+gveWBCJdRJyu5aVwv9VC4UPkyN3pWAs/wy1vr4UEdR2xdoR+TBPrBdZdah8qyDF+
+9DW0FSDoJs+tDQlsovLLb+6Fqmi0+wopGslW487gIcKY0fxk1AGkuuLXVlT7yjsx
+u+uO/GSXzpMigqQO4A9X
+=KSgN
 -----END PGP SIGNATURE-----
diff --git a/app-arch/pixz/pixz-1.0.ebuild b/app-arch/pixz/pixz-1.0.ebuild
new file mode 100644
index 000000000000..47b343bda7ca
--- /dev/null
+++ b/app-arch/pixz/pixz-1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.ebuild,v 1.1 2012/11/25 02:10:01 zerochaos Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Parallel Indexed XZ compressor"
+HOMEPAGE="https://github.com/vasi/pixz"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/vasi/pixz.git"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://github/vasi/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=app-arch/libarchive-2.8
+	>=app-arch/xz-utils-5"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPT=""
+}
+
+src_install() {
+	dobin pixz
+	dodoc README TODO
+}
diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
index 41fed2d69369..d6844dfc39f5 100644
--- a/app-arch/pixz/pixz-9999.ebuild
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -1,24 +1,36 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-9999.ebuild,v 1.1 2012/11/13 23:37:20 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-9999.ebuild,v 1.2 2012/11/25 02:10:01 zerochaos Exp $
 
-EAPI=4
+EAPI=5
 
-inherit git-2
+inherit toolchain-funcs
 
 DESCRIPTION="Parallel Indexed XZ compressor"
 HOMEPAGE="https://github.com/vasi/pixz"
-EGIT_REPO_URI="https://github.com/vasi/pixz.git"
 
-LICENSE="as-is"
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/vasi/pixz.git"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://github/vasi/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 DEPEND=">=app-arch/libarchive-2.8
 	>=app-arch/xz-utils-5"
 RDEPEND="${DEPEND}"
 
+src_compile() {
+	emake CC="$(tc-getCC)" OPT=""
+}
+
 src_install() {
 	dobin pixz
+	dodoc README TODO
 }