fix bug 352464; add missing libxml2 || expat dep for xar support.

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

4 files changed, 18 insertions, 12 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 5111187ee0a7..b8abfa1531d3 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/libarchive
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.85 2010/12/31 09:18:01 ferringb Exp $
+# 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 $
+
+  14 Feb 2011; Brian Harring <ferringb@gentoo.org> libarchive-2.8.3.ebuild,
+  libarchive-2.8.4.ebuild:
+  add missing libxml2/expat dep for xar support. bug #352464
 
   31 Dec 2010; Brian Harring <ferringb@gentoo.org> libarchive-2.7.1-r1.ebuild,
   -libarchive-2.8.0.ebuild, libarchive-2.8.3.ebuild, libarchive-2.8.4.ebuild,
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 270c29329cd3..9b53fae75ae2 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -6,14 +6,14 @@ 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.ebuild 2662 RMD160 c22df36f9143e15cfe5f8b2033f6f72faeef761f SHA1 3d4e665197eaf2c95ee140d893b79888beb7d91d SHA256 79f6bd19206e6b316cd233784dff2124b3a91f1234343af08b6afdeffe37f41e
-EBUILD libarchive-2.8.4.ebuild 2668 RMD160 33e40a8f039a92e00ebe4c32a75fbdcac9f13594 SHA1 03568abe6fc7cb13280f16778090d1290564aa21 SHA256 2b9c78cb6f2ebb32d242050cb295c2013944970b5d1c4344bf57e6e9966c9ca3
-MISC ChangeLog 26420 RMD160 5f552c69a114ac72aa76623c5d9f87a8af5b45d5 SHA1 b6402a2e272e4d8220bb2e2de25ae09bc7791d4f SHA256 f8a2ae27d8d4be7bb49829fb21450b7e94b40150ac885055b87889233ff46e17
+EBUILD libarchive-2.8.3.ebuild 2702 RMD160 6438f59b1379de2b9d55ffe1f207436d9f16b4f9 SHA1 2783a2d3549a783210189e8b7702c7d432d5a83c SHA256 04862c8c5c651df9a4ae52ed9666eba9019545ac5b51b269eacf0a41c331e190
+EBUILD libarchive-2.8.4.ebuild 2708 RMD160 660331e531564a2c1b7506760946da64f43e468d SHA1 064fe42e6773b71516c974f35d90c95f5e7c8fab SHA256 a2118d977b5e3adb2eca3b98e0108cef512a121f23aa9982c86f40f9b721dcea
+MISC ChangeLog 26585 RMD160 b5a95262ffbe0bb686a52cedf958c918bb52e81b SHA1 fa96d0ef5c9bc9419e8b18f34c8f49942a135220 SHA256 52f9db168e55607be028faa6abbb46d0e69fb9f9c5347afee268cc47dcc0c303
 MISC metadata.xml 1216 RMD160 337435107c616573f847037641dd542c7a24015c SHA1 3da011edda7fc72969758d40647db2b3923bd654 SHA256 e29b8e1de7ad22e681df9eb149ace27215e5bf222fda9b2096f1449ffbaa68fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0dn+oACgkQsiLx3HvNzgfDcwCfclpDrHr9LJC7y//+lFw3jXT0
-DOsAn3OtSzhNOg5EL5+Ofu8f6RSdCBpT
-=Rlxq
+iEYEARECAAYFAk1YeksACgkQsiLx3HvNzgfvfACbBMu/Ch1vtmdjH7O2r8UNQgdT
+Y3MAoJ2E72kMS9gCdDXlxZgY9iJadN/g
+=GhvL
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/libarchive-2.8.3.ebuild b/app-arch/libarchive/libarchive-2.8.3.ebuild
index 4ed8ba4e04c0..24e19877133d 100644
--- a/app-arch/libarchive/libarchive-2.8.3.ebuild
+++ b/app-arch/libarchive/libarchive-2.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.ebuild,v 1.4 2010/12/31 09:18:02 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.3.ebuild,v 1.5 2011/02/14 00:41:04 ferringb Exp $
 
 EAPI="2"
 
@@ -22,6 +22,7 @@ COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
 
 RDEPEND="!dev-libs/libarchive
 	dev-libs/openssl
+	|| ( dev-libs/libxml2 dev-libs/expat )
 	acl? ( virtual/acl )
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
 	!static? ( ${COMPRESS_LIBS_DEPEND} )"
diff --git a/app-arch/libarchive/libarchive-2.8.4.ebuild b/app-arch/libarchive/libarchive-2.8.4.ebuild
index 5e9e839dcf88..a3b7564b0217 100644
--- a/app-arch/libarchive/libarchive-2.8.4.ebuild
+++ b/app-arch/libarchive/libarchive-2.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.ebuild,v 1.4 2010/12/31 09:18:02 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.4.ebuild,v 1.5 2011/02/14 00:41:04 ferringb Exp $
 
 EAPI="2"
 
@@ -22,6 +22,7 @@ COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
 
 RDEPEND="!dev-libs/libarchive
 	dev-libs/openssl
+	|| ( dev-libs/libxml2 dev-libs/expat )
 	acl? ( virtual/acl )
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
 	!static? ( ${COMPRESS_LIBS_DEPEND} )"