revisit 352464; add IUSE=expat to enforce expat linkage, else libxml2 (match the configure's preference).

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

4 files changed, 205 insertions, 5 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index b8abfa1531d3..db536b810b3a 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,14 @@
 # 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.86 2011/02/14 00:41:04 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.87 2011/02/14 13:29:07 ferringb Exp $
+
+*libarchive-2.8.4-r1 (14 Feb 2011)
+*libarchive-2.8.3-r1 (14 Feb 2011)
+
+  14 Feb 2011; Brian Harring <ferringb@gentoo.org> +libarchive-2.8.3-r1.ebuild,
+  +libarchive-2.8.4-r1.ebuild:
+  revisit 352464; revbump (missed in the last round), add IUSE=expat to
+  enforce linkage via expat, else libxml2 is used.
 
   14 Feb 2011; Brian Harring <ferringb@gentoo.org> libarchive-2.8.3.ebuild,
   libarchive-2.8.4.ebuild:
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 9b53fae75ae2..c0918925ca16 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -6,14 +6,16 @@ DIST libarchive-2.7.1.tar.gz 1248222 RMD160 7a0b5747569452f015e94e54afa90ca85dfd
 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
 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 2790 RMD160 0e4e4b553b77069e62f9680c4d53a367dffe03f8 SHA1 1fe3ff4cdc6bdaa3745fe5d14b978429d60d6fe5 SHA256 de76267806c9b4bfe394cd5fa3962e3591bbf263961d60ac0637d5d2b730ade3
 EBUILD libarchive-2.8.4.ebuild 2708 RMD160 660331e531564a2c1b7506760946da64f43e468d SHA1 064fe42e6773b71516c974f35d90c95f5e7c8fab SHA256 a2118d977b5e3adb2eca3b98e0108cef512a121f23aa9982c86f40f9b721dcea
-MISC ChangeLog 26585 RMD160 b5a95262ffbe0bb686a52cedf958c918bb52e81b SHA1 fa96d0ef5c9bc9419e8b18f34c8f49942a135220 SHA256 52f9db168e55607be028faa6abbb46d0e69fb9f9c5347afee268cc47dcc0c303
+MISC ChangeLog 26891 RMD160 a4ca372f08589837281ef8c90f3f880a7b3ca026 SHA1 bc904d5ca20bcdf5ca86c4073d1c1b88e01cde3d SHA256 88202303cf30341f4e9dd7e0faea4472b5132131333b8d2320c5d4f2a622ac97
 MISC metadata.xml 1216 RMD160 337435107c616573f847037641dd542c7a24015c SHA1 3da011edda7fc72969758d40647db2b3923bd654 SHA256 e29b8e1de7ad22e681df9eb149ace27215e5bf222fda9b2096f1449ffbaa68fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk1YeksACgkQsiLx3HvNzgfvfACbBMu/Ch1vtmdjH7O2r8UNQgdT
-Y3MAoJ2E72kMS9gCdDXlxZgY9iJadN/g
-=GhvL
+iEYEARECAAYFAk1ZLjkACgkQsiLx3HvNzgeuJgCfU5kFsxppnwgXYUPMCCLTNMxh
+vrIAn0of5gLjeD8fVyybTql0oLaXPVAM
+=UXhY
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/libarchive-2.8.3-r1.ebuild b/app-arch/libarchive/libarchive-2.8.3-r1.ebuild
new file mode 100644
index 000000000000..c0b6384bca65
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.8.3-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.3-r1.ebuild,v 1.1 2011/02/14 13:29:07 ferringb Exp $
+
+EAPI="2"
+
+inherit eutils libtool 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 ~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_prepare() {
+	epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
+	elibtoolize
+	epunt_cxx
+}
+
+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
+}
diff --git a/app-arch/libarchive/libarchive-2.8.4-r1.ebuild b/app-arch/libarchive/libarchive-2.8.4-r1.ebuild
new file mode 100644
index 000000000000..b410182d35d4
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.8.4-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.4-r1.ebuild,v 1.1 2011/02/14 13:29:07 ferringb Exp $
+
+EAPI="2"
+
+inherit eutils libtool 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_prepare() {
+	epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
+	elibtoolize
+	epunt_cxx
+}
+
+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
+}