Bump latest alpha; also drop older versions. New version builds tests in parallel during test phase.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 36 insertions, 93 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index b613384ea36f..3746879a9f50 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/libarchive
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.68 2009/10/25 19:37:08 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.69 2010/01/05 15:12:20 flameeyes Exp $
+
+*libarchive-2.7.902a (05 Jan 2010)
+
+  05 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libarchive-2.6.2.ebuild, -libarchive-2.7.1.ebuild,
+  +libarchive-2.7.902a.ebuild:
+  Bump latest alpha; also drop older versions. New version builds tests in
+  parallel during test phase.
 
 *libarchive-2.7.1-r1 (25 Oct 2009)
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index caaf23c17533..3fcb451f44a5 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -5,19 +5,18 @@ AUX libarchive-2.6.0-nolibs.patch 1104 RMD160 1c753db6a19e73307fdc7c43e781b37135
 AUX libarchive-2.6.1-headers.patch 635 RMD160 d6d2e7f1dfda2c352fac08b1b48fea611543ab17 SHA1 04fc37daef70f40aafeeadcd627432551533b505 SHA256 a5167e9cc721f3e946ba36e5d2beb35310facea8360c5582adf3d6fa142c2c22
 AUX libarchive-2.7.0-fortified-sources.patch 1057 RMD160 66f769ff31e29399f71f23f972026d46516cac5d SHA1 5187d93686eff8c1f3d8eca8f6389dc0b3cdfdc6 SHA256 78d8bd768e621d91e988570dbff907c37f06895649706aaaa4ccd5e56f0899cf
 AUX libarchive-2.7.0-pipe.patch 3859 RMD160 334dd1d0b9e3e4310afc5c757287f47c6a867ef2 SHA1 e2b3ffd4d16420098abb9d994648feca6b8e9b82 SHA256 01fc2a68b0c9bbcdfd93d69c81f4aa23bf29bd946e8aa768f46b9741ee28f023
-DIST libarchive-2.6.2.tar.gz 948569 RMD160 a32ea45632b2704b13cf04ec5ffba44258c85fa4 SHA1 56be9601877f467369cc7792f1319f0271becd1c SHA256 48c27c0ce12e1363e6f7dd87ee5cf65aaad6ebbaa502791e9aa548d1523ebbb1
 DIST libarchive-2.7.0.tar.gz 1243793 RMD160 997f2809cb91eb84707714cb58f4840dee0a9ea0 SHA1 625347766797929873a8e31819a14c405bcb2275 SHA256 ae21ffc8160241001ecbc7af0751ff65cfc5ceffae8a1b9cf6822328f4c0474e
 DIST libarchive-2.7.1.tar.gz 1248222 RMD160 7a0b5747569452f015e94e54afa90ca85dfd7cca SHA1 3810ded09b2d248eab9754d008f0cf144f27848d SHA256 a7e066ef857d3db0211e2d916ca14aafc48a4776c4fa108fd67092ce862a7ba8
-EBUILD libarchive-2.6.2.ebuild 1876 RMD160 84556dfbcab7b5d05d05e3d1996b581820437241 SHA1 0d58c1d98da2ddbaefd67b216883702c0c7b532e SHA256 7506f0e66beff98c1733a48068eb263a3d4c28197fcc1cd8016353e6887ffaa0
+DIST libarchive-2.7.902a.tar.gz 1443571 RMD160 eebda4d24bcf423779f78538bd123087ff962b9d SHA1 60dc74a5867d728cc073990292a0569c316a818c SHA256 e79e8ad7a7f539abe0bb78f4b4f1aa8a8f96d2350896c7d161f2c3dc3baf1fc8
 EBUILD libarchive-2.7.0-r1.ebuild 2303 RMD160 bf14bcc72dfb78a423d40e3f49de958d4a397ad8 SHA1 67c314581e87ae6af2139b866c6a732a2e7917c4 SHA256 ddc98d9f075fb6d9e40c9628d0c82c8ee4eee6d53167e89512ef4497b2ef410b
 EBUILD libarchive-2.7.1-r1.ebuild 2520 RMD160 6f666a4f7f76359d1e91f704abc10eaaf3d02991 SHA1 2ad16a322e04c7ae3f8847f93a88c886a31b3bfa SHA256 e689cf8dfe50ebc2f67abdc031b79b92694fd05b70389d222eb8f27174759fe5
-EBUILD libarchive-2.7.1.ebuild 2249 RMD160 bbf10353bc03cd6d3cc5520259205dead50035a2 SHA1 3fcec7109d27dfb4e09d3d9b34d6b8507fefd5cf SHA256 70c92ffcde64e3b5f77b3cd7d40b20b3231676ccfb0c87346d104ec62a94d2e5
-MISC ChangeLog 23845 RMD160 ce6f93f20cd7e3bf5a334bc634087bb7b38591d8 SHA1 1c3d1accd3a9c360f1e0585541322fa71afacd18 SHA256 3ba73eeccfea5ebd10ca9dccb0d75b4889ebf9ef7fafc0c5545661e5c0231510
+EBUILD libarchive-2.7.902a.ebuild 2639 RMD160 ce603696108385c0008df49172a0d44a3ec1f7a5 SHA1 ee81bc84a1071e431ae8529c36e6f982e77b429c SHA256 644a208f738fe0345dd586dbcce855876f1f82952bdb6890c4e3a7df869f917a
+MISC ChangeLog 24128 RMD160 7fa7f22016bdbcd472d1d634045e53e88bf09666 SHA1 74971bdedeb3837ae0fbc9e4f8ddb8ae2ab80990 SHA256 016398cb46c7380d3240586a3b8f07633c2bd82db6bebabde768e97c5a6863bf
 MISC metadata.xml 1845 RMD160 ebaeeeb4cb7f3c67ef467f51325eee01e736abbe SHA1 ac5a67d2b4aeda593a482c68b5e91bd280e03d81 SHA256 a7d0423f9f20913e7eb763301312de583551f75db9597df2724a22684d800843
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkrkqPYACgkQAiZjviIA2XhJMACePGT53GeG1vDMc4Vpl1L1sxp/
-/BQAoKhz2Cqo5fZ3ANY1kMh2KEEw+VUy
-=8NbQ
+iEYEARECAAYFAktDVtUACgkQAiZjviIA2Xjr0QCgmd1MB8qCyaSlBwbY+K5dC0iK
+aU4AoMe1ri3nWZCl+PTviN5+PZlP6ABD
+=AfnY
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/libarchive-2.6.2.ebuild b/app-arch/libarchive/libarchive-2.6.2.ebuild
deleted file mode 100644
index 9f448e240b0f..000000000000
--- a/app-arch/libarchive/libarchive-2.6.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.6.2.ebuild,v 1.8 2009/04/27 13:51:00 jer Exp $
-
-EAPI=1
-
-inherit eutils libtool toolchain-funcs
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://people.freebsd.org/~kientzle/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 ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="static acl xattr kernel_linux +bzip2 +lzma +zlib"
-
-COMPRESS_LIBS_DEPEND="lzma? ( app-arch/lzma-utils )
-		bzip2? ( app-arch/bzip2 )
-		zlib? ( sys-libs/zlib )"
-
-RDEPEND="!dev-libs/libarchive
-	kernel_linux? (
-		acl? ( sys-apps/acl )
-		xattr? ( sys-apps/attr )
-	)
-	!static? ( ${COMPRESS_LIBS_DEPEND} )"
-DEPEND="${RDEPEND}
-	${COMPRESS_LIBS_DEPEND}
-	kernel_linux? ( sys-fs/e2fsprogs
-		virtual/os-headers )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	elibtoolize
-	epunt_cxx
-}
-
-src_compile() {
-	local myconf
-
-	if ! use static ; then
-		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
-	fi
-
-	econf --bindir=/bin \
-		--enable-bsdtar --enable-bsdcpio \
-		$(use_enable acl) $(use_enable xattr) \
-		$(use_with zlib) \
-		$(use_with bzip2 bz2lib) $(use_with lzma lzmadec) \
-		${myconf} \
-		--disable-dependency-tracking || die "econf failed."
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake 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
-
-	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.7.1.ebuild b/app-arch/libarchive/libarchive-2.7.902a.ebuild
index a9ac805f64eb..3f4210b476be 100644
--- a/app-arch/libarchive/libarchive-2.7.1.ebuild
+++ b/app-arch/libarchive/libarchive-2.7.902a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.7.1.ebuild,v 1.1 2009/09/09 13:04:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.7.902a.ebuild,v 1.1 2010/01/05 15:12:20 flameeyes Exp $
 
-EAPI=1
+EAPI="2"
 
 inherit eutils libtool toolchain-funcs flag-o-matic
 
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static acl xattr kernel_linux +bzip2 +lzma +zlib"
+IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib"
 
 COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
 		bzip2? ( app-arch/bzip2 )
@@ -30,21 +30,23 @@ DEPEND="${RDEPEND}
 	kernel_linux? ( sys-fs/e2fsprogs
 		virtual/os-headers )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	elibtoolize
 	epunt_cxx
 }
 
-src_compile() {
+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.
@@ -57,16 +59,23 @@ src_compile() {
 		$(use_enable acl) $(use_enable xattr) \
 		$(use_with zlib) \
 		$(use_with bzip2 bz2lib) $(use_with lzma) \
+		$(use_enable static-libs static) \
 		--without-lzmadec \
 		${myconf} \
 		--disable-dependency-tracking || die "econf failed."
+}
 
-	emake || die "emake failed."
+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