Bump and enable bsdcpio.

Package-Manager: portage-2.1.3.16

4 files changed, 104 insertions, 5 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index b470f74f9bc0..181156417308 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.4 2007/10/10 09:41:44 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.5 2007/10/29 17:23:03 uberlord Exp $
+
+*libarchive-2.3.5 (29 Oct 2007)
+
+  29 Oct 2007; Roy Marples <uberlord@gentoo.org> +libarchive-2.3.5.ebuild:
+  Bump and enable bsdcpio.
 
 *libarchive-2.3.4 (10 Oct 2007)
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 2ccc5a3a754a..b5d167d4bf1c 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -10,6 +10,7 @@ DIST libarchive-2.2.4.tar.gz 636879 RMD160 2aa2e4124c1081acfdc666335b659457dccb4
 DIST libarchive-2.2.5.tar.gz 637691 RMD160 fda5c804679e29954b387ae2c06b32bca4ae7bd4 SHA1 fd04f17397c7af6c8964bde02146eda391413bf4 SHA256 510102b594b8cfd8fa6b3718f40a8ef059a95ed453a97b60ad9a3502c0f16f26
 DIST libarchive-2.3.3.tar.gz 673965 RMD160 0e764b36b26fafac763d059b49f44749b44b9dfa SHA1 1230708e8d82e6555a2f09316e41c1cd9f8f074e SHA256 30abee01050fd46048537f3ad689a88a460de6b0108736fd197392669feaa898
 DIST libarchive-2.3.4.tar.gz 682180 RMD160 ea3d7ed18221ecb69ca794c10f5e2d91558bed4a SHA1 99e5a77911e933162d19a0b69be357b8824e88bb SHA256 1956e384f2097031b0a1797c1c8172458270fb13b9944ee6f9cb0f4b71ca1c07
+DIST libarchive-2.3.5.tar.gz 698478 RMD160 0547786b802698b1f2a241c5dcb4bafcddda5477 SHA1 515472d42073ae427ca030797937cd715095cf0a SHA256 a04cc5664cac8e4b4a0848901073ef21b03fca3ab63fb9d7d09993fc0791f055
 EBUILD libarchive-2.2.4.ebuild 1868 RMD160 03bc43fdf4a3ee5d92cb08c5401837ca7e75a786 SHA1 4cc0629e72c8f1462c268ccd1692eccb59d6381a SHA256 c0d2905e5f14678164d95ff0c9dd359c5bfa867b664fa5a4ea848f951ebf458d
 MD5 bb22d30882b5d99c194d375a0fdb5bef libarchive-2.2.4.ebuild 1868
 RMD160 03bc43fdf4a3ee5d92cb08c5401837ca7e75a786 libarchive-2.2.4.ebuild 1868
@@ -26,10 +27,14 @@ EBUILD libarchive-2.3.4.ebuild 1820 RMD160 2318889f5fab53eab694e239919862f81715d
 MD5 88dccd29573c9e49cfdd42ef5dae09b0 libarchive-2.3.4.ebuild 1820
 RMD160 2318889f5fab53eab694e239919862f81715da11 libarchive-2.3.4.ebuild 1820
 SHA256 bbf27269ce4eab92446c7b45c416b43c0381bd026c376afdf48aa7fdf15870af libarchive-2.3.4.ebuild 1820
-MISC ChangeLog 13315 RMD160 d14b7e0efff692e49d44edc87b6e7f76cf327233 SHA1 8148f513332a6ef26a78a02cc9ae05121d759528 SHA256 51165f506a05cfb795986d138d3c5f36bf0a62f00d5601847838f57a76b65aa1
-MD5 4788f117ceb9990122d6eb3e9e9cef05 ChangeLog 13315
-RMD160 d14b7e0efff692e49d44edc87b6e7f76cf327233 ChangeLog 13315
-SHA256 51165f506a05cfb795986d138d3c5f36bf0a62f00d5601847838f57a76b65aa1 ChangeLog 13315
+EBUILD libarchive-2.3.5.ebuild 1907 RMD160 66702bb38cb8b8b6cef84fa3a02b1258d9c16583 SHA1 2ba42936d977d7b164973d8541fce2140f154ede SHA256 9ab13c1165447c0080929cc00618aab9f67d424634de0d734b9eb30e456dbbf6
+MD5 1c130f3a6bb81fc1acef09e68385c020 libarchive-2.3.5.ebuild 1907
+RMD160 66702bb38cb8b8b6cef84fa3a02b1258d9c16583 libarchive-2.3.5.ebuild 1907
+SHA256 9ab13c1165447c0080929cc00618aab9f67d424634de0d734b9eb30e456dbbf6 libarchive-2.3.5.ebuild 1907
+MISC ChangeLog 13451 RMD160 1cbaf3f155a5fde0d04600ff2102741cb77557c9 SHA1 ae339ff52410e9c5f74940ea3c00a4b18ea1552a SHA256 95ad1945495053b08fae43616bc5f60c2998aca5429f5dfdf7b86a76caf74757
+MD5 4f70af8e36d4b69065fb0918c67e9dda ChangeLog 13451
+RMD160 1cbaf3f155a5fde0d04600ff2102741cb77557c9 ChangeLog 13451
+SHA256 95ad1945495053b08fae43616bc5f60c2998aca5429f5dfdf7b86a76caf74757 ChangeLog 13451
 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b
 MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337
 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337
@@ -46,3 +51,6 @@ SHA256 0ba0432e6e4c51ebe357dec6d15b8e2d41975cc270b441a4bb9cdc720e7d24bb files/di
 MD5 e0e088e77e161d06c560e49f27955c36 files/digest-libarchive-2.3.4 250
 RMD160 afe77775431a30dc2eda8a5ca5de8094f594d52a files/digest-libarchive-2.3.4 250
 SHA256 a616dd35edd0671599b1bd5df079d42c6a6cdbaf11afc6b621abe590915ae8ff files/digest-libarchive-2.3.4 250
+MD5 a2262de9b217839283e522d29b35a4bd files/digest-libarchive-2.3.5 250
+RMD160 9a2bec287f49836a7f1f92c9d944723482d63fbb files/digest-libarchive-2.3.5 250
+SHA256 824ccb21a3f9174b5078a3b0704a2e40927af45363b61d208b6f4b0e08a58e0b files/digest-libarchive-2.3.5 250
diff --git a/app-arch/libarchive/files/digest-libarchive-2.3.5 b/app-arch/libarchive/files/digest-libarchive-2.3.5
new file mode 100644
index 000000000000..e87677d28b29
--- /dev/null
+++ b/app-arch/libarchive/files/digest-libarchive-2.3.5
@@ -0,0 +1,3 @@
+MD5 954ed005e64c368d2ce890581b52b6fb libarchive-2.3.5.tar.gz 698478
+RMD160 0547786b802698b1f2a241c5dcb4bafcddda5477 libarchive-2.3.5.tar.gz 698478
+SHA256 a04cc5664cac8e4b4a0848901073ef21b03fca3ab63fb9d7d09993fc0791f055 libarchive-2.3.5.tar.gz 698478
diff --git a/app-arch/libarchive/libarchive-2.3.5.ebuild b/app-arch/libarchive/libarchive-2.3.5.ebuild
new file mode 100644
index 000000000000..a6ee235af702
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.3.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.3.5.ebuild,v 1.1 2007/10/29 17:23:03 uberlord Exp $
+
+inherit eutils autotools toolchain-funcs flag-o-matic
+
+MY_P=${P/_beta/b}
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive/"
+SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="build static acl xattr"
+
+RDEPEND="!dev-libs/libarchive
+	kernel_linux? (
+		acl? ( sys-apps/acl )
+		xattr? ( sys-apps/attr )
+	)
+	!static? ( !build? (
+		app-arch/bzip2
+		sys-libs/zlib ) )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-fs/e2fsprogs
+		virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-2.1.5-acl.patch
+
+	eautoreconf
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf=
+
+	if use static || use build ; then
+		myconf="${myconf} --enable-static-bsdtar"
+	else
+		myconf="${myconf} --disable-static-bsdtar"
+	fi
+
+	# Upstream doesn't seem to care to fix the problems
+	# and I don't want to continue running after them.
+	#append-flags -fno-strict-aliasing
+
+	econf \
+		--bindir=/bin \
+		--enable-bsdcpio \
+		$(use_enable acl) \
+		$(use_enable xattr) \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	# 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
+
+	if use build; then
+		rm -rf "${D}"/usr
+		rm -rf "${D}"/lib/*.so*
+		return 0
+	fi
+
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+	gen_usr_ldscript libarchive.so
+}