Remove old.

(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

4 files changed, 6 insertions, 113 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/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
-}