Fix building with USE="-zlib" wrt #403733 by Ben Kohler

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

4 files changed, 54 insertions, 11 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index b3c96432f4de..9b886a95bda1 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.116 2012/02/25 15:03:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.117 2012/03/05 08:59:26 ssuominen Exp $
+
+  05 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> libarchive-3.0.3.ebuild,
+  +files/libarchive-3.0.3-nozlib.patch:
+  Fix building with USE="-zlib" wrt #403733 by Ben Kohler
 
   25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> libarchive-3.0.3.ebuild:
   ppc64 stable wrt #403173
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 6d474dd8867d..695ddd43f52b 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libarchive-3.0.3-nozlib.patch 1364 RMD160 6eeb4c98bf200079669e01686e16c6b4bbf7c348 SHA1 e22cb97f8904b186722d67cc332818fef352a3f9 SHA256 22d87ab401fa9fa7639b62f0e7254ffb2e45468bc1d05b6b65c9a7a7ce55ae22
 DIST libarchive-2.8.5.tar.gz 1410485 RMD160 b4b75a5cf5b15312dff8addde44d91161ad1a7a4 SHA1 e48a3b50de84b1d747f5af9ca5ba90eb6d3a4a78 SHA256 13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d
 DIST libarchive-3.0.3.tar.gz 3509104 RMD160 8bfde7be3aa15221c327641b0463f0b40a797e19 SHA1 b774e2675e5c1abafbd4d667402e8c3e72313944 SHA256 c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7
 EBUILD libarchive-2.8.5.ebuild 2658 RMD160 bd1dd460040ef78992d9581a42ce5703d8a00400 SHA1 abec66bf4ea48212a044182a45f643296ccc034d SHA256 78031563d9b7696e450c135e6ba725db4f200426e7e76a3960f6c0a9d3af976e
-EBUILD libarchive-3.0.3.ebuild 2169 RMD160 63b7c10b76aac4a5bc29e9274c3fb0fb44f90615 SHA1 bd85a01496dbae80111ab0d02a3e16fe22e7e4a8 SHA256 327cc260b47272cff7344414371220cd94f56763a987dbe7b6c0077ecce9e760
-MISC ChangeLog 30430 RMD160 36f0392b153545ef7e299c20a35962a683ab9626 SHA1 0a234693f1a78e607ad68c8bf9cb1ea6bd41e397 SHA256 a47fc3f445bce6aa0c7fbb720656842fb71315e110840418b42fb7853359544b
+EBUILD libarchive-3.0.3.ebuild 2228 RMD160 2aaec996d7940240f93b426098683c3659d76d3d SHA1 7b94557f395e9817575c9eaa242f35104965b2c5 SHA256 4dd5226352d64b64dfa0394be487f6feb0d4ca36ea727053eb190bbe48b855ef
+MISC ChangeLog 30608 RMD160 563ea3475db345fbe1c28d49499c9b1873a8e3cb SHA1 d04726743ea5562d75147f8d4da421f71a648424 SHA256 b67f715be4b1c77eae4c7e10a52d89c0ff7ed2199f054f93a4d23dcb57ab1608
 MISC metadata.xml 1450 RMD160 af260abc1af0f571107a30f272451be93dbb8597 SHA1 9dcb28ee29171e89cd243b23ee1eea87a8d88cf2 SHA256 b2b5de7c037070ad42a67a40ff967a443fa6edf82ed583aadcd2435b6b4e2256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPSPgyAAoJEEdUh39IaPFN+6sH/3qBJ602c8AcLzRNHvcsic8Y
-Q+8RUA7Nz/SvhlJu6NcBKzmuBxSRyBCaNzZfOhg0DIQHsYPOtMJB2WAf6YpZRN8q
-Lum8HXHinwxTQwxNKq2cqfnA3WXTKyWXHkl1+qXMUD7gF5O0yVETLztVZxbVfI6h
-tMxVqrB94zHDVkb+CZkL76cQzaAt4hQw/JayqOLruE94p0gHp3cET1JnNctj0exv
-4z176JXi2eBFlZZeD8vlu5LC7xhzS3AI7qt874Cdubyd9LzECHcIDczCDK3lsahB
-OCWHuXxkp3Rka6PvZlBwH83a0M8NC3R792k8osc4+Mqa2CgEGLIMnd3s42mBo4A=
-=VjlN
+iQEcBAEBAgAGBQJPVIAxAAoJEEdUh39IaPFNIqUH/RpOdulAvsoAWOOZivqjZSMN
+wT01J6QiVaDN1slxgc1SMRSsRLABxW1kKaLhVpEDvE8vEk6C8v5l5x7D1ouhEyM9
+yocldmfu+nBuLDEa9MphWKg1H0GnRfVZR9XOLMv4yCSgz16+38fECptM4KJ+1v7k
+ifUn+9xPOw+EnzgJTc34nl7ux9HYygxiPAhw0gr99TzN8KpZzrUgvPTMgZ5WveJu
+Wfkc7/vYtsy+XRr+buYNvPle3j9SGMtm+KQkZreKWQUeYde36vqcK1BxzD8GSoJP
+y9D2hOJiR5b2YhN9eiRvCCItNnd6Lix4WPL+QOAtIRdYoBJyvmGWRy6fOszMgHY=
+=mub3
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch b/app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch
new file mode 100644
index 000000000000..16caa153faf1
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch
@@ -0,0 +1,34 @@
+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
index a7d84fb2529e..592653592b57 100644
--- a/app-arch/libarchive/libarchive-3.0.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2012/02/25 15:03:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.3.ebuild,v 1.9 2012/03/05 08:59:26 ssuominen Exp $
 
 EAPI=4
 inherit eutils multilib
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
 
 DOCS="NEWS README"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nozlib.patch
+}
+
 src_configure() {
 	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923