verbump to 2.8.5

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64

3 files changed, 102 insertions, 6 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 05a723b8bf4e..ed7efc278243 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.95 2011/05/07 16:51:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.96 2011/09/06 03:17:49 ferringb Exp $
+
+*libarchive-2.8.5 (06 Sep 2011)
+
+  06 Sep 2011; Brian Harring <ferringb@gentoo.org> +libarchive-2.8.5.ebuild:
+  bugfix release primarily
 
   07 May 2011; Raúl Porcel <armin76@gentoo.org> libarchive-2.8.4-r1.ebuild:
   ia64/sh/sparc stable wrt #357771
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 7bb4d743cf80..97b8a11881b2 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -5,17 +5,19 @@ AUX libarchive-disable-lzma-size-test.patch 1780 RMD160 b7e62759b0821b6787155d9c
 DIST libarchive-2.7.1.tar.gz 1248222 RMD160 7a0b5747569452f015e94e54afa90ca85dfd7cca SHA1 3810ded09b2d248eab9754d008f0cf144f27848d SHA256 a7e066ef857d3db0211e2d916ca14aafc48a4776c4fa108fd67092ce862a7ba8
 DIST libarchive-2.8.3.tar.gz 1438099 RMD160 7c77a87cdfc096417f67182bfc74141eab61aea4 SHA1 e0634a326cce2b46c8dc637de84d7556257e59e0 SHA256 16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a
 DIST libarchive-2.8.4.tar.gz 1502828 RMD160 4df65456c9026cdcf05b285db33518f4ff734c6e SHA1 b9cc3bbd20bd71f996be9ec738f19fda8653f7af SHA256 86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688
+DIST libarchive-2.8.5.tar.gz 1410485 RMD160 b4b75a5cf5b15312dff8addde44d91161ad1a7a4 SHA1 e48a3b50de84b1d747f5af9ca5ba90eb6d3a4a78 SHA256 13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d
 EBUILD libarchive-2.7.1-r1.ebuild 2537 RMD160 75c73b310d81b40fa4c734fbdbd543fb96ce3c8c SHA1 a707050438136643a5a0d701ede86e1763b87bf5 SHA256 778c0f5efa9284100da01f195d86d2128793a4f9f7bc62426e45dc08488d53cd
 EBUILD libarchive-2.8.3-r1.ebuild 2782 RMD160 ec5107f384d912ba1ecfde8dc56cfda15fcc2a3c SHA1 9effece5324bc6a4e7a164b52dd71fce9a341417 SHA256 c60c400ef3094e53cd196cd618f93e3191858be59d447377facb33b60df83927
 EBUILD libarchive-2.8.3.ebuild 2702 RMD160 6438f59b1379de2b9d55ffe1f207436d9f16b4f9 SHA1 2783a2d3549a783210189e8b7702c7d432d5a83c SHA256 04862c8c5c651df9a4ae52ed9666eba9019545ac5b51b269eacf0a41c331e190
 EBUILD libarchive-2.8.4-r1.ebuild 2779 RMD160 c35f8ef577c68178f7b8f1c50b6057f35ed48f75 SHA1 9c9c9f10e3629df12dd6bfbbd3ca1ce91240e35b SHA256 4da38893146dc4c5a0b8ef6c51afcea4ccd7a0d3607d5fd06f2661f5d5dc71a8
 EBUILD libarchive-2.8.4.ebuild 2705 RMD160 82947ba234a3350384408a8c2ca47c70d6a88c00 SHA1 4ea6e95687fb264c3ae131981a831ebfc60a418f SHA256 81c4c2d06a8b30f96b51cf323a0319b95267427ad7a62b3348daa0cbbb44339d
-MISC ChangeLog 27788 RMD160 9cf753fcca3c399efce5b44057c4d50147e02897 SHA1 5fdc2c54de0a482ead0df9daae12ce5492dcd704 SHA256 47f037900cfc3777a3700500517d6d924aab9b96b3dd1ecfe32c65a54f554156
+EBUILD libarchive-2.8.5.ebuild 2669 RMD160 15a4f1265b444d7afe23fb49c67a35b54d22a28a SHA1 8d49d43e4ba6da3cf6ae33f87d7ff2af61d3e4d5 SHA256 be6256a002612a6d6e63ead4476db88c50a3806d00c27f8bcc47264a0b6b9ee2
+MISC ChangeLog 27927 RMD160 fb4d42298ee176e17cc98df77e167d713f726bba SHA1 c0d2b11ef9e8141fa0cdebecfe130dba5a3cf5cf SHA256 f5fa7e493c82f0b1178db1b2ec9247583b6196f08321081376c3cf8d53450f93
 MISC metadata.xml 1216 RMD160 337435107c616573f847037641dd542c7a24015c SHA1 3da011edda7fc72969758d40647db2b3923bd654 SHA256 e29b8e1de7ad22e681df9eb149ace27215e5bf222fda9b2096f1449ffbaa68fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3FeIUACgkQuQc30/atMkAxwgCglV/syFdcPMhNqlR2o0OQvSrO
-5Q0AoIqvgdSwSeYBG6Entg599DoKh2jr
-=kRvS
+iEYEARECAAYFAk5lkOMACgkQsiLx3HvNzge7EQCg5TY9f6aByKByReBD1yrNGliF
+b3cAoM/7sI6Rldc5amwctksmodkQi7xH
+=lJuv
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/libarchive-2.8.5.ebuild b/app-arch/libarchive/libarchive-2.8.5.ebuild
new file mode 100644
index 000000000000..e2537c7c8e97
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.8.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.5.ebuild,v 1.1 2011/09/06 03:17:49 ferringb Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://code.google.com/p/libarchive/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
+	http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat"
+
+COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
+		bzip2? ( app-arch/bzip2 )
+		zlib? ( sys-libs/zlib )"
+
+RDEPEND="!dev-libs/libarchive
+	dev-libs/openssl
+	!expat? ( dev-libs/libxml2 )
+	expat? ( dev-libs/expat )
+	acl? ( virtual/acl )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	!static? ( ${COMPRESS_LIBS_DEPEND} )"
+DEPEND="${RDEPEND}
+	${COMPRESS_LIBS_DEPEND}
+	kernel_linux? ( sys-fs/e2fsprogs
+		virtual/os-headers )"
+
+src_configure() {
+	local myconf
+
+	if ! use static ; then
+		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+	fi
+
+	# force static libs for static binaries
+	if use static && ! use static-libs; then
+		myconf="${myconf} --enable-static"
+	fi
+
+	# Check for need of this in 2.7.1 and later, on 2.7.0, -Werror was
+	# added to the final release, but since it's done in the
+	# Makefile.am we can just work it around this way.
+	append-flags -Wno-error
+
+	# We disable lzmadec because we support the newer liblzma from xz-utils
+	# and not liblzmadec with this version.
+	econf --bindir=/bin \
+		--enable-bsdtar --enable-bsdcpio \
+		$(use_enable acl) $(use_enable xattr) \
+		$(use_with zlib) \
+		$(use_with bzip2 bz2lib) $(use_with lzma) \
+		$(use_enable static-libs static) \
+		$(use_with expat expat) \
+		$(use_with !expat xml2) \
+		--without-lzmadec \
+		${myconf} \
+		--disable-dependency-tracking
+}
+
+src_test() {
+	# Replace the default src_test so that it builds tests in parallel
+	emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# remove useless .a and .la files (only for non static compilation)
+	use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
+
+	# Create tar symlink for FreeBSD
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		dosym bsdtar /bin/tar
+		dosym bsdtar.1 /usr/share/man/man1/tar.1
+		# We may wish to switch to symlink bsdcpio to cpio too one day
+	fi
+
+	dodoc NEWS README
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+	gen_usr_ldscript libarchive.so
+}