Remove old.

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

5 files changed, 15 insertions, 132 deletions

diff --git a/dev-libs/libzip/ChangeLog b/dev-libs/libzip/ChangeLog
index 7c4441675695..e5d8df1268c5 100644
--- a/dev-libs/libzip/ChangeLog
+++ b/dev-libs/libzip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libzip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/ChangeLog,v 1.64 2013/06/25 13:01:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/ChangeLog,v 1.65 2013/06/25 17:17:21 johu Exp $
+
+  25 Jun 2013; Johannes Huber <johu@gentoo.org>
+  -files/libzip-0.10-fix_pkgconfig.patch,
+  -files/libzip-0.10.1-fix_decrypt.patch, -libzip-0.10.1-r1.ebuild:
+  Remove old.
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> libzip-0.11.ebuild:
   Stable for amd64, wrt bug #474054
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 864f7fb8f12d..d7c23de05107 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,30 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX libzip-0.10-fix_pkgconfig.patch 542 SHA256 1b85d2ca6d0dda57ee6eb641e58807d12aab4fbaaae8141da31d929e79262e9c SHA512 8bdacb1b72fec75a88a80a556009ad9e10f0d739a8e87842555eff0f2a1c593b7e59a3a30d3b565318451da5197c2f5e702d171b9daf0c23a143fe71b691bb10 WHIRLPOOL adf3a7974525a65975ae6b6749eb7f312b31415b980be69c65021ccba4bd62ad1fd466bac6571ce9100239640bac8472769a9811eee1af2b45103108b37b7a25
-AUX libzip-0.10.1-fix_decrypt.patch 1124 SHA256 949c598d8fe019f799b5e656852262fb18db5c76d12cc7b597d691bea05ff762 SHA512 efd59821bd56a9bd85b5148087f889243e773e88c2d523c5968a975b75a1dfac23a4ccec3e00dbdeeb6fcff38396b2ab7638e53a520301bbcc391e2e16355ca0 WHIRLPOOL f923226201e3c4fdb4f33242db2e6d5fbbbe87ffbb37352e875fb09f00d747c6d2f7175ebd5a5ce918d5f6a9ba0fce273f59f7f4b58e92ceac9238eddf945684
 AUX libzip-0.10_rc1-fix_headers.patch 501 SHA256 02198832803b0b4aba395766c5d0166862451de954e6790aa721ba51303f9469 SHA512 f40d0ffd54847869535e2a5e76cfc76421da877d80dee683a97f9a891caae890491bb2d3317084f25d21d2bbc07fcb96fff469a5258b7490f927cd49c36e7390 WHIRLPOOL dad80514e1a2adc9d739ac43715e27ecfbbbd3b75cfc789a12e72d6f649602c609b25865b03e71adbdab69557e536802b4f5a56ac943c2e267fe12c83ed55bc7
 AUX libzip-0.11-fix_pkgconfig.patch 359 SHA256 1efc02506c25205d4ed10b7978be4d9b14805e2c63d7721ec93b0a43c1b59739 SHA512 77b2daa518cceac50f01b1b2a666c8b9a6b3ab3bc6d90283921beea83acbe242c69479a4148bbde64db55c8d78b169abb0711f241fd07ab10bf94e469c64b8db WHIRLPOOL 1cda96815f2d215aceb4a13e0207d2e6bfe6c1275c58d5220ad72c97366964be3accc4b8f210689ef977d2f556b5c769fcab8e6010de1b9fd2766060eb312f4d
-DIST libzip-0.10.1.tar.gz 849678 SHA256 a7cdb5112004db5147f330f16c0f0e732922c342b9f0cda422c45e254590b617 SHA512 6582b58fce8981dbf78b5640fdc55dcf9d8a64be0ca1561c9caf75a28da089a638d4ad7bf47a96db54d03dda9e86e9a3694b299d2d98242e153dee70bac7b99f WHIRLPOOL 1a0a722d0f78da6bf2df4f19e67beb39cfb378f5f1556bc2f86f548fc30b610b0a0fbc2f68f6f9beed57ed5a88f52c9acb4d15331961cc541b46bc26adac2dff
 DIST libzip-0.11.tar.gz 542896 SHA256 52c6d0fb4a4566cf0931a6e648e297d0b6caeb499f5c3401cf1ad2a1c63eeab1 SHA512 ed4f12daccb3ddb826f942c316bfad2232e5bece55de63033754d425d6c2096c1828d374c6c544725c120d7710591d36ad2f3d659787c13f8ee442e2f160cecf WHIRLPOOL cb57cc3126e1e9ee39b4d6925faee7b0dcfd806fd5af77b89db40bc3393a789e3b75674861360278893e0bbe9cb877cabe267004d5371d6a904c28b075e3d703
-EBUILD libzip-0.10.1-r1.ebuild 1337 SHA256 2cbf2694c989da0dbb56c04fa4b3848920d33503468f7dc163cb84aa70b89dc5 SHA512 ebc82e6c5540235f4404648c03dea363b581f5b6c57ae4f2efecbfffa4a9d273bf02fced327d1d93a4b20a530bf178fcd10210028bb3e4c1c6e0d29c23046d68 WHIRLPOOL f270f39d283d8ca4b7515f1e90fc85a76d4bb40aef74921d5e5f08bb8494fdde9d9fd9d2474a33075bfd244f66886817f7e2de3ce95b9b7c64560dc8ca45792d
 EBUILD libzip-0.11.ebuild 1309 SHA256 3c25fd2d30ea255a798af2c9774795bb3a442a0450bf4db8a28590c010ede534 SHA512 64b16ca629965b45a97be1c8eb52217c75058d96e310f9255d1272097a22226137a7f141bb9b1c767ff0cc9c484469a45c79de6d29f76d5a131462f8a3219a1a WHIRLPOOL fea0409495a5c62c67cb1a543183c5d1696a4fab85a133cdfcdd9a45931f1d74e76fe29b87c428c8f55c54869121891be7616c14df8643059dc68f3e968a360c
-MISC ChangeLog 8078 SHA256 19da9f1702d875c0133e7bca0c744224142394a5ba1317173b1b69e7954deba7 SHA512 630c3d5f4c123be00c37604c73313a9927ff7a03052eba9c524117fdd90cae1bbd7d494d3e77e639e934525bdb7972e3c1d00da8ef6bf1a4d4004e4faa259fe2 WHIRLPOOL 5dc5bdcabae3d2fa05f7737c3af74bfd7b47eb1ce02168fd8add3f2d9c1402a2f5b71d0db8b060ba74a46accbf27f3d6a9046c5d3d34ea17dfe24f0fd0466b2f
+MISC ChangeLog 8252 SHA256 9dc418868963f526f7b0de38de418de6bb3a76843c354329b44b24c1ffaeb01b SHA512 45bbadfc95da183b864dda3472c6da215e5b48305ee3461af625757a8b116ebf40829b1cbcee7cae8d789e4d5af82c39e1d6d4589e3f964bd1491fb956915a99 WHIRLPOOL 13606fef74e54840ca22f1d48f2269a1b48e9e5f248ca93fa821cf85955605e76a35a612e7c806bbbd9ae88edf6fdf0624d8d426a002357e471590d87dc2104c
 MISC metadata.xml 247 SHA256 ec0f694e5f1424a73e65fb05f860b9f276340277c1ce3bd8f60af22669e71580 SHA512 61247135a435d322860d3381cd614e2b0b0bd5b7096a2c59d33edee093bae293bef98af041d96aa8db677d80946156c66041c7b8a39baaff430724c86ce5e7a7 WHIRLPOOL c573a2e14e965e7211dd1d3fa91cded30d71748330475dec45ae9068b0d98a0749d54a421bd0b482a81581b9a5cb3c773c7d3036b4804e4da5474dd5466bb5d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyZSMAAoJELp701BxlEWf9tAQAIOs5fwGW4O8sOkbkqiC41YX
-RfTF2tT9yL6XYDwQKY/aC14COERkzKU+ngyRB8Fmkhxpg2qZ1AvbmYPH2Z3O70Lw
-CDGQNd5tt7hAtx3wzxvn794z6fMGQ8nkmthefooSX4hiu1QtsbyRihShMdI+Sjnv
-ghZp3K0VV0HGnsnt5HIJymlTwpIVobE8FwQNWPfQwm7GQ9e1FxCWme7WIY6NNCCN
-Nqn9N23En/oXQboKCXmCK75mI5X+DC2tEth0ha8o8bYBLPz2iXagHtYj7qpYKea8
-Bf5Kiit1H7zdSduWEGF7YnHcBIQtKbMHFWgozJtUfHPAN9gxTE7Nvnsch8vsBW0D
-62gzoiNv9iDn80b3IkQEtlajc4hOw6jvgRulwec1gK1jHF/RqOAXS9dVsH+UzJ4M
-5uZcdyyGJh5aqfxbaRw1o0Rm4Pz1/gfU0knK2eQg8v+JU37e0R4yNMiJHzxhPu32
-BYSZYTF19H91/Ii2mMGcU0DGUfqALnN1hA+YbQsoRNrXL+tMwsM4cFuzFNk/FWsS
-uFr4Te8I3Q5RMVXyN1C1UilBtVhVpiq4gtXUhqcVESWcXFBXez5ck6xindAs9lJe
-ThgCMglD2rVnykPu9OQWz8pCYI2arVT1ZmdxJtJD8tI5Sw2FMPnxCdEyawVqJRKX
-ICAxOdM4pC7VuB7PlGy6
-=FQ7B
+iQEcBAEBCAAGBQJRydCmAAoJEO+t9ga+3I3aBXsH/3xj1OkWiE/+gmDvl1w4j7F5
+9pnrXBxV8tHcqMlcPkrqPnGhdjBP0OJ4SrIvJ7G2kFtFfWXHusq2EIqVB4aLHIdi
+AImPJ01piuSBrmxj9WZRnagRqFGQ7Q021nggPjgCvcH5yRjbBFNdkT+Z1p1Auidz
+2FSIqGc1ZMT2tWSZJ7YqJntYzD7efSxP2XIqBa8ithY1N7gqJxeB6aaYQVzi/WcJ
+lvfSFIKubN9S5ZxIO35odZCnXPwuELOCbVZuJsTsxqVjwPectMMc6BASOgfqOpu8
+iJZOCrf2pQtUgTX8XebthZbeIWTzXwIsxCUuPzY3jakeQQ77Yb2LsnNUP05KsnE=
+=iIOY
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libzip/files/libzip-0.10-fix_pkgconfig.patch b/dev-libs/libzip/files/libzip-0.10-fix_pkgconfig.patch
deleted file mode 100644
index 30766fd02d7e..000000000000
--- a/dev-libs/libzip/files/libzip-0.10-fix_pkgconfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN libzip-0.10.old/libzip.pc.in libzip-0.10/libzip.pc.in
---- libzip-0.10.old/libzip.pc.in	2011-04-29 12:54:23.000000000 +0200
-+++ libzip-0.10/libzip.pc.in	2011-04-29 12:55:28.000000000 +0200
-@@ -2,7 +2,6 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--libincludedir=@libdir@/libzip/include
- 
- zipcmp=@prefix@/bin/zipcmp
- 
-@@ -10,5 +9,5 @@
- Description: library for handling zip archives
- Version: @VERSION@
- Libs: -L${libdir} -lzip @LIBS@
--Cflags: -I${includedir} -I${libincludedir}
-+Cflags: -I${includedir}
- 
diff --git a/dev-libs/libzip/files/libzip-0.10.1-fix_decrypt.patch b/dev-libs/libzip/files/libzip-0.10.1-fix_decrypt.patch
deleted file mode 100644
index ae3777889e00..000000000000
--- a/dev-libs/libzip/files/libzip-0.10.1-fix_decrypt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Modify the calls to the CRC table because original calls did not behave correctly on 64-bit systems. Patch from libzip upstream commit 0e67d378b271, modified so that it applies correctly.
---- libzip-0.10.1/lib/zip_source_pkware.c
-+++ libzip-0.10.1/lib/zip_source_pkware.c
-@@ -49,10 +49,6 @@
- #define KEY1		591751049
- #define KEY2		878082192
- 
--static const uLongf *crc = NULL;
--
--#define CRC32(c, b) (crc[((c) ^ (b)) & 0xff] ^ ((c) >> 8))
--
- 
- 
- static void decrypt(struct trad_pkware *, zip_uint8_t *,
-@@ -80,9 +76,6 @@
- 	return NULL;
-     }
- 
--    if (crc == NULL)
--	crc = get_crc_table();
--
-     if ((ctx=(struct trad_pkware *)malloc(sizeof(*ctx))) == NULL) {
- 	_zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
- 	return NULL;
-@@ -128,10 +121,10 @@
- 	    out[i] = b;
- 
- 	/* update keys */
--	ctx->key[0] = CRC32(ctx->key[0], b);
-+	ctx->key[0] = crc32(ctx->key[0] ^ 0xffffffffUL, &b, 1) ^ 0xffffffffUL;
- 	ctx->key[1] = (ctx->key[1] + (ctx->key[0] & 0xff)) * 134775813 + 1;
- 	b = ctx->key[1] >> 24;
--	ctx->key[2] = CRC32(ctx->key[2], b);
-+    	ctx->key[2] = crc32(ctx->key[2] ^ 0xffffffffUL, &b, 1) ^ 0xffffffffUL;
-     }
- }
- 
diff --git a/dev-libs/libzip/libzip-0.10.1-r1.ebuild b/dev-libs/libzip/libzip-0.10.1-r1.ebuild
deleted file mode 100644
index 3e28eb6b4ecd..000000000000
--- a/dev-libs/libzip/libzip-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10.1-r1.ebuild,v 1.8 2013/03/11 13:01:20 ssuominen Exp $
-
-EAPI=4
-
-MY_P=${P/_}
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils eutils
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="http://www.nih.at/libzip/"
-SRC_URI="http://www.nih.at/libzip/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS README THANKS AUTHORS )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10_rc1-fix_headers.patch"
-	"${FILESDIR}/${PN}-0.10-fix_pkgconfig.patch"
-	"${FILESDIR}/${PN}-0.10.1-fix_decrypt.patch"
-)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	autotools-utils_src_prepare
-	# run due to fix_headers patch
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	#elibtoolize # FreeBSD .so version
-
-	# fix test return state
-	sed -i \
-		-e 's:19/2:19/0:' \
-		regress/open_nonarchive.test || die
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --all
-}
-
-src_test() {
-	#Having VERBOSE as an env variable causes the fread test to fail (bug 421651)
-	unset VERBOSE
-	autotools-utils_src_test
-}