Bump to install standard ZPAQ configurations as well as they are not installed stand-alone anymore in >=app-arch/zpaq-2.03 (and the built-in variants don't accept arguments).

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

3 files changed, 31 insertions, 11 deletions

diff --git a/app-arch/zpaq-extras/ChangeLog b/app-arch/zpaq-extras/ChangeLog
index fdbb9e8ad688..c747a02fb10b 100644
--- a/app-arch/zpaq-extras/ChangeLog
+++ b/app-arch/zpaq-extras/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/zpaq-extras
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/ChangeLog,v 1.2 2011/01/05 23:30:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/ChangeLog,v 1.3 2011/01/06 16:10:21 mgorny Exp $
+
+*zpaq-extras-0_p20110106 (06 Jan 2011)
+
+  06 Jan 2011; Michał Górny <mgorny@gentoo.org>
+  -zpaq-extras-0_p20100426.ebuild, +zpaq-extras-0_p20110106.ebuild:
+  Bump to install standard ZPAQ configurations as well as they are not
+  installed stand-alone anymore in >=app-arch/zpaq-2.03 (and the built-in
+  variants don't accept arguments).
 
   05 Jan 2011; Michał Górny <mgorny@gentoo.org>
   zpaq-extras-0_p20100426.ebuild:
diff --git a/app-arch/zpaq-extras/Manifest b/app-arch/zpaq-extras/Manifest
index 879c0f5fd025..5e0f8ebf8ca6 100644
--- a/app-arch/zpaq-extras/Manifest
+++ b/app-arch/zpaq-extras/Manifest
@@ -5,15 +5,18 @@ DIST bmp_j4.zip 1711 RMD160 14791dd3b9737c11eea9f3dd21f9e515108a5bff SHA1 d1c7f2
 DIST bwt_j3.zip 16535 RMD160 523b09d25217531ed9829a1cc4e27413a15a0dcb SHA1 06b24a7cd749eac1958e73725bf4849395616939 SHA256 c5e75abdd8d8a3fb6effa3c467e98aeb3175068bd454a635baae79de024b9120
 DIST bwt_slowmode1.zip 138176 RMD160 71d456f7ebfa8af38f9e7e379105c4a3a7151637 SHA1 3bd01c1ca32d07fdb5ed71851de50e46d528394d SHA256 3b7fb3c4a2491b4f8b2c243f7f67a4f2c7d2b793558207001b2565f06e145a92
 DIST exe_j1.zip 9828 RMD160 5a2c83290a03fd54e6261ae4d791df5775500458 SHA1 28fa03a186aa47f7217201727fa3cdbd2ee7f635 SHA256 8e13ca38ed6fb7fd9ae5244c44b045f179b068c3d3281f1f2690c352e45ca239
-DIST fast.cfg 359 RMD160 345ebcc3a7faa880d1e1c215cc9ceb4fa059a6b4 SHA1 9268e938c04a7aebe16da1d55953db033b195222 SHA256 2cf9605ba5eb73a58146509844d4b360c07ae55ebc2ab92d485d0c907166cfda
 DIST jpg_test2.zip 12189 RMD160 5c8e133aa613aa5d2769ef8394fb9d4f65d9ce00 SHA1 da31b4afa85dc46e924bf407c018f2495cf0ef85 SHA256 b09eedf0760826fa6822d266c1e262e67ad4ac119e11235e192e208e558e4855
-EBUILD zpaq-extras-0_p20100426.ebuild 1268 RMD160 7648e79ea29b75d35b45e23a161a07742ace696c SHA1 2720b04fa51149d4ac7c2d5b8bc6f16bcf0aeea9 SHA256 22b24bf7f40c9545078d5bda2798e34be532c43e6ba7905e0acae5e8b55ba403
-MISC ChangeLog 697 RMD160 68bbc42338800c6d86bacd8a8455b82c621bd3d0 SHA1 e2d546cd95e7f7d5f2fc0115f9da8433ea7fc7af SHA256 fa3589e4b0e940d1c34e157486115aa145fdc1e02cf8c168639b50f0737b9fd0
+DIST min.zip 9560 RMD160 76111480419f6e577df5f73521ded14aeb9dd950 SHA1 427d0d4f90a8d9762e2e7cb91f2f34823d8e85fb SHA256 7209ffaf0d48f5e10e3134826d766e2dc52ed914ed5dbad415023db10b4e1113
+DIST zpaq-fast.cfg 359 RMD160 345ebcc3a7faa880d1e1c215cc9ceb4fa059a6b4 SHA1 9268e938c04a7aebe16da1d55953db033b195222 SHA256 2cf9605ba5eb73a58146509844d4b360c07ae55ebc2ab92d485d0c907166cfda
+DIST zpaq-max.cfg 1754 RMD160 1819fab274ac370a002cc3478cfcff7c1b8c128c SHA1 25f030f7a50085e00a2fd50088c44b8c8e3ee63a SHA256 7965863923d5558409f5792167c74914a9c0d07f813ef385587450e7b5a156b7
+DIST zpaq-mid.cfg 786 RMD160 0d55dd691d517479c0f8dad0aaf38e3b58ba8df2 SHA1 e0ecba365fb9e50ec74ec9f3331a6140b1dfa21c SHA256 51dd9dc78513e36217033c501f4a3331d30820df875e466052b6b6175bc9bafa
+EBUILD zpaq-extras-0_p20110106.ebuild 1520 RMD160 e033e1cd22eeb8359765b71e0df0e62cff7996bd SHA1 749664d240a23727e767455c0c21d9afc80301d1 SHA256 613e85a35ecb2e46ffa4836c29b984901ebfa949be6c3a22c1b3ba93aa66cb97
+MISC ChangeLog 1037 RMD160 1f55e3ef4b02e2e83013c0f880c35e7a32a05756 SHA1 87344e8a9f0e5b0a643ba8e44e9716f889dab7d5 SHA256 71956b352d53cceaa1ad8cfb8b151b324f8b1d656a4c626fc4776c6740770081
 MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SHA1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640acbe75500ca6067b5f565223f62fbd525bda216b972
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0k/lAACgkQnGSe5QXeB7vMBQCgilzJGFbSobl2gvN+4RY/4K15
-pR8An2kyKY0ozLBo0zJCKeJcvAd19F8x
-=NDAE
+iEYEARECAAYFAk0l6KcACgkQnGSe5QXeB7vpTACgwIsWETPyztnjiT/se0rHHuO4
+NOUAoJ03j5n35V84n8F2olL0bnds1alh
+=P7L/
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild b/app-arch/zpaq-extras/zpaq-extras-0_p20110106.ebuild
index f7dd464ee756..c6684749dcc3 100644
--- a/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild
+++ b/app-arch/zpaq-extras/zpaq-extras-0_p20110106.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/app-arch/zpaq-extras/zpaq-extras-0_p20100426.ebuild,v 1.2 2011/01/05 23:30:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/zpaq-extras-0_p20110106.ebuild,v 1.1 2011/01/06 16:10:21 mgorny Exp $
 
 EAPI=3
 inherit base toolchain-funcs
@@ -12,7 +12,10 @@ SRC_URI="http://mattmahoney.net/dc/bwt_j3.zip
 	http://mattmahoney.net/dc/bmp_j4.zip
 	http://mattmahoney.net/dc/exe_j1.zip
 	http://mattmahoney.net/dc/jpg_test2.zip
-	http://mattmahoney.net/dc/fast.cfg"
+	http://mattmahoney.net/dc/min.zip
+	http://mattmahoney.net/dc/fast.cfg -> zpaq-fast.cfg
+	http://mattmahoney.net/dc/mid.cfg -> zpaq-mid.cfg
+	http://mattmahoney.net/dc/max.cfg -> zpaq-max.cfg"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -20,13 +23,19 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="app-arch/unzip"
-RDEPEND=""
+RDEPEND="!<app-arch/zpaq-2.03"
 
 S=${WORKDIR}
 
 src_unpack() {
+	local x
+	for x in ${A}; do
+		if [[ ${x} == *.cfg ]]; then
+			cp "${DISTDIR}"/${x} ${x#zpaq-} || die
+		fi
+	done
+
 	default
-	cp "${DISTDIR}"/fast.cfg . || die
 }
 
 src_configure() {