Version bump. Remove old versions and clean up the patch.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

5 files changed, 34 insertions, 71 deletions

diff --git a/app-arch/libzpaq/ChangeLog b/app-arch/libzpaq/ChangeLog
index f6f0c47fee77..9953f2f1c233 100644
--- a/app-arch/libzpaq/ChangeLog
+++ b/app-arch/libzpaq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/libzpaq
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/ChangeLog,v 1.10 2013/07/20 14:21:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/ChangeLog,v 1.11 2013/09/19 09:04:01 mgorny Exp $
+
+*libzpaq-6.41 (19 Sep 2013)
+
+  19 Sep 2013; Michał Górny <mgorny@gentoo.org> +libzpaq-6.41.ebuild,
+  -libzpaq-5.01.ebuild, -libzpaq-6.10.ebuild,
+  files/0001-Add-autotools-files.patch:
+  Version bump. Remove old versions and clean up the patch.
 
 *libzpaq-6.38 (20 Jul 2013)
 
diff --git a/app-arch/libzpaq/Manifest b/app-arch/libzpaq/Manifest
index 843039e12dcd..cc0a7c58dcce 100644
--- a/app-arch/libzpaq/Manifest
+++ b/app-arch/libzpaq/Manifest
@@ -1,31 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0001-Add-autotools-files.patch 1704 SHA256 dd96581f0dcc61be21db94201b4a4d5b8256b73b12e1738a60c17b5fa33b70cd SHA512 f41aa1476c05a7af6b2ab3c07a212d811729ea25ebca0ff0bff55ad79b4164c50275990ef100ce41e607892b6f59aa59a981c68da54e5a90dc647f547e0225e1 WHIRLPOOL 3f82b23914e8707d61a595ec509aac270b923afe1058ff262b58b359179b3bed9e476b2a19f03ba6d6c758f85d00a2b165ffe6bfcf3acc62060c8aab82d18afd
-DIST libzpaq501.zip 43716 SHA256 3ea073fd7f02a5eafe6bd4e64723f8098224484eaa2ff42f5c56508bb48cc689 SHA512 67e7301297a56eb1b75db863f5e9dc79c66c1b478b92dfbe4bdeeef0605323c78f940798faaf2828510d3f40064a19e31032ca35f32c177462b9958d7f6b7308 WHIRLPOOL 165c23488142078fda516b98518e90508484dd1963e48ba9ea53a628a4a6b362746481ce578f71211d8aedab7b976d77ed5c9707ecb8d79eae802da9c75ca146
-DIST zpaq610.zip 266105 SHA256 886caae1779b67e8daa1a3aa7b2dc744da297a5e6d160755ccf3dddb55409f83 SHA512 ff1337877d5393b099392582820cb493d5e695c52070cfd6ce6b1967326bc0c3985e5ac6872959f69ec9c3945ed365570711b4e590f7f437bc1a30e46a61f01f WHIRLPOOL c10a7d98eb694c540832f7c209668d07e40c7e752932d30ed21ab955c13d9a39e557daad928c3faf5b2098654bfc5bffd1a5ab74537dc16a88f9fbbdf1ce38c8
+AUX 0001-Add-autotools-files.patch 1691 SHA256 5cb35337de6754e7aa921f3e1f7846d8b3058c1b2bfcba5716818772680356b8 SHA512 c9fbd7a2588c950721c9232b20debd44f47950e21f825265177f735b0060ad6dc0e26127113cb541f72ddfe1506ca9ed021814e5d14ee16537a252d523261d49 WHIRLPOOL 30728473a134666ef9cd17fe60408a2626d9af5dff60c051a7f31276d75956a99f60dd3871f924b64529b46ead0aba355fc2dbdf877fb2c35c18e823809f9be7
 DIST zpaq638.zip 568402 SHA256 83d6a0a018e8edbac721517225475c06f0e7d88e6a1a69abe3b58e687eb6e13b SHA512 a2c038c6f9861f74c18cbdbf81ed94a18cc4b4440a931e3355abb5a14a906e91ff38f0c1be771b4b43a0442985d7d85779dfe1efed3d57b8155646f379204441 WHIRLPOOL 1d1a8aa7e590f81771ffcee58b12fe253802528e7decaa3442a6448270ef3cf32f1233757e17eee58d3b37a0df9b0c8def9460541ac4ac97e559345a0ca29046
-EBUILD libzpaq-5.01.ebuild 950 SHA256 c5f55252cdd2af19177fc7ff1c4610bba382be82569057cd00dce0a960b9ce59 SHA512 ed8020126d4a01aab25379f6e1895e76c820a2e326c429590f1c6d01b70e4702511239488590230fb35516f567f9e5a1d0ecfc862fdd1e23fe85482f29b5f45f WHIRLPOOL 8b1a85d3e98051b5ce3a00df0f4c38c93f4e8bfff1ba1fc4d346291e63499755042f02328c1c71e31edddfb1d22e341d0a89b2486ba7f86e7dbca4477fe1f67f
-EBUILD libzpaq-6.10.ebuild 1040 SHA256 d84744633f947c7a0ab8348c48de9a5f2bc62e4b5cd6446c8de2f8226bbf4449 SHA512 40b1546ce52a2089181d6dfdc15b77b92d533145b180d88bdd8cb41c162f659cd3106e9cc9237dba61b282ad88998f56b50f10872049d6a890dd0dd40e2a6e55 WHIRLPOOL 29e42bb95caa8fb392adafde0994186d2e9c8dfea32ffbfa3de67c7f6db9639310304f5df39e4fbe7d6db5daca4c334ba39b47cd5c1e76cf0f1601b0773ce4af
+DIST zpaq641.zip 576673 SHA256 0d90a6be9a70c9c2b337116da4044385821c3b7bbd1988bff8d21171e5daf86c SHA512 48ee840496ee3b61b33117a7a421903635b515040c1a4414c83be66ae6da2516e26511fb3a09ecd1448a84f6b1e7f6df5069af6806d53361110a11590270e7eb WHIRLPOOL a27c3a06854face7e6a6558863e351700601459b354904d61733e75d3719a047a041fff3b315954801ca610355facdf1242b232edfd630d25bef94a321179e6e
 EBUILD libzpaq-6.38.ebuild 1051 SHA256 90c39b9871514e19eaaf5e0fc934849af4bd18fa974cf7397322431a020aad99 SHA512 635cb6feacba89f2c1db7a01570123cfbb44690545d65184044ce2c70cafb87ed2e83c4933e744587778b4f26652ddc203af4d00703532639542f7d715b85581 WHIRLPOOL cebb51c34c3d2f4be8bb826b267773e0dcb84b57e367ee23198b032c7680ef266de52db7d2a6220bbfef8d518a21f1d39465e16e686c667cd31068228a210ede
-MISC ChangeLog 1864 SHA256 0040afed71f80fa26f436c32f9f03c13f57a925d02900a7b8332d5959732736a SHA512 0b563db2e0701eeeb4420bfef56c95e7c2497ece15a96f4de6cb3367bd3fc8a4b42833c65058d9228f718c052e87dcef559908c1ebe9a050c965c576947a4aeb WHIRLPOOL 794889d94115872d2dbb35456a05b4c802c66578af10addeb430326cd042794225d341e0ae48ff448af0caedaa7b91e3b46567cd98320827e0dddef16b2b54eb
+EBUILD libzpaq-6.41.ebuild 962 SHA256 b934d723cbfc37ce4100cef8c948e17d8f159c586a9d6d569153c0affeab7ba0 SHA512 094e04cb9e496bff479a6b9827f0fffffbcb54d71b998487f9b97e4eaed075fc823c9e0ffcbcf8de1f61b358b30766c1a8eb0f928bd08b2916cf922e0d2c5b72 WHIRLPOOL def7d9208d7e2febd2cb725b133ef4769301f67341d39026eae85fdb87e0c7d15028e87bcb32e374b3356bce78c7d88244ff07f7a7a46e5d75583a209429db8b
+MISC ChangeLog 2112 SHA256 bd90c1fe89a92d75efd200f0a6ec6c5e00b7c577642aae08e658579aea584674 SHA512 20a6400c318dbeaef251f8bd31f7870468522ca7785f4432d5291a8634cbd619367c59a832785c3296ba792fe1382774275957191c329a7510d2207fdf3e9e0b WHIRLPOOL d4bbc0fbacc402f7547c79c7a5176b93c37fcd37c6fb1f32ad03f3e77a4fe771faf76c19b925dc8ab2edc5f48db2fd89954006c3ba93affb4b37b7eb19ea5c53
 MISC metadata.xml 348 SHA256 16cf630a1013b7e3cd7a7d4fb0f1ee14ea8e3ab85c6a44b7fea2d955ff5f0617 SHA512 f8672521b00e6101acecaddffaedefd8c5cd3d692f0d24d21ae110e063bd1d565c4bf510bc8049145ba8a5e07193e50c4e34b51cad777b40830ca6cc1617d26f WHIRLPOOL eb9c6c5b66b2e492629ef7d0b0599f4c8321df7df78ca19000715f6f7be4754cbed9d9a8a7eac2aa2f665d6884519851224b13014d574f9d5eda3dcf2306a661
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR6pz9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDk1YQAK9g17AlkMjH6R83xNVTGE80
-i+OpIYyygQoqnbyljfMKXImfHwli2XMTap5j2btsghpt1VOSeGp9vxPFEmFz4STE
-CJwLu7k9ekkwhowCbYNyuo7Jct2cUYBgVq9Tfja+LeSLz2ZyYO+bbCrvjZdTrpKd
-wOs+07MkNz7C/gjw5jnAXawD9coaxNqjtC0OD+5IKLuSRBSKggbFDRUE8xvnBGXH
-3oh7MA2zbWtT7Lbmlvh+C+NgD1dmhTP7zjJ2vFtgaD0ezSbU7nC+renmsJ4WljMC
-6LEqlvdm3qyVv3zGAxgMf50QMxLxNj132IGyKTN6b8VJGoOQb58sbuKz6D1LScpr
-en7qagUkxADFmHmqLz32gqucqLyUg130doQ+527BlZ8eZ7CxtAauNg79c4NL4vt9
-vv3Nk5hanPJ5m6o/aY3HKS6XQNNlKXONBNLMz+jk75ZYkX26JuOJ/TF6EMETL5zb
-4zGc6A+mA5IhyOOb5VvvlCSrTfwS1b2Zh/mProbitnDTJJgQuWao+A6rPyfQfRA4
-XkFA+eFM1B3yjelxHOxUxPS5JLlvn4Ucv3Ui5puxX90MKA6Ma2vz7MS4nRnQll4t
-9kvSeVmrkh96AJJeJCfoaypwRbg2EPYKTPcl3Rcc44mA1sEVLc2en5pSjd+PkQIQ
-Z1lYc5eytjRNkYU/WqEE
-=8Qg1
+iQJ8BAEBCABmBQJSOr4oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJkwP/i3tW4EnPIHyh5UGUQliH2yI
+6sM1EM6c1yJ6xasSbOxTYsgl0l7lS0qWpP86MSPIHh5deqdXrDoR15Rqpup3Ulf7
+xkYOwm8B4Pv66N14ooCTZOYObcVlDYVP4SXLWrE7xzZlnO6CW14TD5l4qVEQkh/n
+FQVWEvio/rs2MgK2t+unAGo0UDFuqfzX1Tcn2Kf1LP+wUOiKSlWM8thAAKDrYXqT
+ZMLgvgC2VDrNs7pNV5AEFtsinsVQc1PTyc4aq1p+JKVYofX3Fv4vJNgT2sFe13kz
+qxK5mogssa2PjQYCK/7f3sRgqsU+OaxxHgB/aHXCS9ZR3QuO2J+VBd8awnyCKzmL
+rC/QBLGgm6QOgnrBUWcCpOGowhwvJV5mqe6aXuZEIZm9gw8r24MkQGEn3caHlLdW
+/w36MXprLKBtCCIW2q6H5qXzzdSUNs/Hzhgz7jhuXDEuQyGVl8IjM05EFfe5polI
+t8erRetNzHjv6WGJzRO+QH12J0Mb16DmoTGcKaIH2nB5BB5WLu3H8bTW5OMjwKzW
+KghxGK2YWjBy7I5qQcjYCoKDzddLxZew44jse4WO4VbxY95TI8xWo3GRJSskuhVu
+VoL25DhygUotunVy4F2ESNrTHKcPKZ8AL25FG/leFh/BUCaP5NEHYFq3Nd0DyUcH
+/Bl6YArZ9rHuq238/kaq
+=vCwP
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libzpaq/files/0001-Add-autotools-files.patch b/app-arch/libzpaq/files/0001-Add-autotools-files.patch
index 02204fb2d335..fcd0dd4fe474 100644
--- a/app-arch/libzpaq/files/0001-Add-autotools-files.patch
+++ b/app-arch/libzpaq/files/0001-Add-autotools-files.patch
@@ -27,7 +27,7 @@ index 0000000..b6dd881
 +	$(POD2MAN) $< > $@
 +endif
 +
-+libzpaq_la_SOURCES = libzpaq.cpp libzpaqo.cpp libzpaq.h
++libzpaq_la_SOURCES = libzpaq.cpp libzpaq.h
 +libzpaq_la_LDFLAGS = -version-info @ABI_VERSION@
 +
 +MOSTLYCLEANFILES = libzpaq.3
diff --git a/app-arch/libzpaq/libzpaq-5.01.ebuild b/app-arch/libzpaq/libzpaq-5.01.ebuild
deleted file mode 100644
index 5c21d194d0e7..000000000000
--- a/app-arch/libzpaq/libzpaq-5.01.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-5.01.ebuild,v 1.3 2012/05/24 04:33:22 vapier Exp $
-
-EAPI=3
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils flag-o-matic eutils
-
-MY_P=${PN}${PV/./}
-DESCRIPTION="Library to compress files or objects in the ZPAQ format"
-HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
-SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
-
-LICENSE="zpaq"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+jit static-libs"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/0001-Add-autotools-files.patch
-	# XXX: update the patch instead when the old version is gone
-	touch libzpaqo.cpp || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-library-version=2:0:0
-	)
-
-	use jit || append-flags -DNOJIT
-
-	autotools-utils_src_configure
-}
diff --git a/app-arch/libzpaq/libzpaq-6.10.ebuild b/app-arch/libzpaq/libzpaq-6.41.ebuild
index 0372b0bf4936..611c35bf0e5c 100644
--- a/app-arch/libzpaq/libzpaq-6.10.ebuild
+++ b/app-arch/libzpaq/libzpaq-6.41.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-6.10.ebuild,v 1.1 2012/10/14 07:42:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-6.41.ebuild,v 1.1 2013/09/19 09:04:01 mgorny Exp $
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
 inherit autotools-utils flag-o-matic eutils
@@ -13,7 +13,7 @@ HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
 SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
 
 LICENSE="zpaq"
-SLOT="0"
+SLOT="0/4"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +jit static-libs"
 
@@ -24,14 +24,12 @@ S=${WORKDIR}
 
 src_prepare() {
 	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/0001-Add-autotools-files.patch
-	# XXX: update the patch instead when the old version is gone
-	touch libzpaqo.cpp || die
 	autotools-utils_src_prepare
 }
 
 src_configure() {
 	local myeconfargs=(
-		--with-library-version=3:0:0
+		--with-library-version=${SLOT#*/}:0:0
 		# man-page is no longer there
 		ac_cv_prog_POD2MAN=
 	)