old

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 5 insertions, 123 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 08f47cd89bda..fcae713f1fe4 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.137 2013/01/15 07:26:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.138 2013/01/15 07:30:39 ssuominen Exp $
+
+  15 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> -libarchive-3.0.3.ebuild,
+  -files/libarchive-3.0.3-nozlib.patch:
+  old
 
 *libarchive-3.1.1 (15 Jan 2013)
 
diff --git a/app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch b/app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch
deleted file mode 100644
index 16caa153faf1..000000000000
--- a/app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://code.google.com/p/libarchive/issues/detail?id=242
-http://bugs.gentoo.org/403733
-
---- a/libarchive/archive_write_set_format_7zip.c
-+++ b/libarchive/archive_write_set_format_7zip.c
-@@ -1585,7 +1585,8 @@ file_init_register_empty(struct _7zip *zip)
- 	zip->empty_list.last = &(zip->empty_list.first);
- }
- 
--#if !defined(HAVE_BZLIB_H) || !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H)
-+#if !defined(HAVE_ZLIB_H) || !defined(HAVE_BZLIB_H) ||\
-+	 !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H)
- static int
- compression_unsupported_encoder(struct archive *a,
-     struct la_zstream *lastrm, const char *name)
-
---- a/libarchive/test/test_write_compress_program.c
-+++ b/libarchive/test/test_write_compress_program.c
-@@ -40,6 +40,15 @@ DEFINE_TEST(test_write_compress_program)
- 		skipping("Cannot run 'gzip'");
- 		return;
- 	}
-+	/* NOTE: Setting blocksize=1024 will cause gunzip failure because
-+	 * it add extra bytes that gunzip ignores with its warning and
-+	 * exit code 1. So we should set blocksize=1 in order not to
-+	 * yield the extra bytes when using gunzip. */
-+	assert((a = archive_read_new()) != NULL);
-+	r = archive_read_support_filter_gzip(a);
-+	if (r != ARCHIVE_OK && canGunzip())
-+		blocksize = 1;
-+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
- 
- 	/* Create a new archive in memory. */
- 	/* Write it through an external "gzip" program. */
diff --git a/app-arch/libarchive/libarchive-3.0.3.ebuild b/app-arch/libarchive/libarchive-3.0.3.ebuild
deleted file mode 100644
index 83284dc3dc43..000000000000
--- a/app-arch/libarchive/libarchive-3.0.3.ebuild
+++ /dev/null
@@ -1,88 +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/libarchive/libarchive-3.0.3.ebuild,v 1.11 2012/05/18 18:18:53 ryao Exp $
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://code.google.com/p/libarchive/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux +lzma nettle static-libs xattr +zlib"
-
-RDEPEND="dev-libs/openssl:0
-	acl? ( virtual/acl )
-	bzip2? ( app-arch/bzip2 )
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )
-	iconv? ( virtual/libiconv )
-	kernel_linux? (
-		xattr? ( sys-apps/attr )
-		)
-	lzma? ( app-arch/xz-utils )
-	nettle? ( dev-libs/nettle )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-		)"
-
-DOCS="NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nozlib.patch
-}
-
-src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	# We disable lzmadec because we support the newer liblzma from xz-utils
-	# and not liblzmadec with this version.
-	econf \
-		$(use_enable static-libs static) \
-		--enable-bsdtar=shared \
-		--enable-bsdcpio=shared \
-		$(use_enable xattr) \
-		$(use_enable acl) \
-		$(use_with zlib) \
-		$(use_with bzip2 bz2lib) \
-		--without-lzmadec \
-		$(use_with iconv) \
-		$(use_with lzma) \
-		$(use_with nettle) \
-		$(use_with !expat xml2) \
-		$(use_with expat)
-}
-
-src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	emake check
-}
-
-src_install() {
-	default
-
-	# Libs.private: should be used from libarchive.pc instead
-	rm -f "${ED}"usr/lib*/lib*.la
-
-	# Create tar symlink for FreeBSD
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		dosym bsdtar /usr/bin/tar
-		echo '.so bsdtar.1' > "${T}"/tar.1
-		doman "${T}"/tar.1
-		# We may wish to switch to symlink bsdcpio to cpio too one day
-	fi
-}
-
-pkg_preinst() {
-	preserve_old_lib /{,usr/}$(get_libdir)/${PN}$(get_libname 2)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/${PN}$(get_libname 2)
-}