Migrate to use virtual/acl (xattr is no virtual, they have different implementations). Remove old ebuilds.

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

6 files changed, 15 insertions, 250 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 3792b9e1610d..e5dd51b9f315 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,12 @@
 # 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.58 2009/05/14 22:12:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.59 2009/05/29 19:46:35 flameeyes Exp $
+
+  29 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libarchive-2.6.0.ebuild, -libarchive-2.6.1.ebuild,
+  -libarchive-2.7.0.ebuild, libarchive-2.7.0-r1.ebuild:
+  Migrate to use virtual/acl (xattr is no virtual, they have different
+  implementations). Remove old ebuilds.
 
 *libarchive-2.7.0-r1 (14 May 2009)
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 2fda1846d7f1..5fd0a1230e09 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -5,21 +5,16 @@ 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.0.tar.gz 948077 RMD160 2eb439ffd367052e1917652dbcff616861f93fef SHA1 8288d79c00cea65b73aad7f9e0090257227b4edb SHA256 6b924c2dc7d6584792ac5a90866edaded6a7695080de89b9880f42bcabf1fa03
-DIST libarchive-2.6.1.tar.gz 948450 RMD160 577d88c26047cdcdef0477fae61c54bc12122eb4 SHA1 f0fa90645afce1ff1d8c5f5e21a1ce986d58e376 SHA256 4d0ad4e5c33aa9725c7d92a42ae605815781372db949cd9906945e6c0d85c179
 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
-EBUILD libarchive-2.6.0.ebuild 1918 RMD160 1b91013a5c1543d238bb0e8818fead95dfceefb8 SHA1 9d84abe8d80b75b6ae12deaf0a7dd3bcba6d6210 SHA256 4d3a72604e3e36e85f76b413e9faffa461e79a1e4f817a0e5f4fcc9cf0b2bcb9
-EBUILD libarchive-2.6.1.ebuild 1928 RMD160 14d6b5328f85275c21ae18ed0424894bc5392da2 SHA1 dbb0dddfc7013e54a2b3f1110ed445ee89612a90 SHA256 5595309ea655599054d31340b92a52c329d31ac10c12abf96ed377b4a2affd18
 EBUILD libarchive-2.6.2.ebuild 1876 RMD160 84556dfbcab7b5d05d05e3d1996b581820437241 SHA1 0d58c1d98da2ddbaefd67b216883702c0c7b532e SHA256 7506f0e66beff98c1733a48068eb263a3d4c28197fcc1cd8016353e6887ffaa0
-EBUILD libarchive-2.7.0-r1.ebuild 2303 RMD160 7b783778950b4e010428df567355230440abeaed SHA1 bfbad7c60f505952e678ede2326882deaa0d8449 SHA256 ec16eb6c52d93b003b80e86519a3ede64aca8a5db3f6513c12336fe2f402fa89
-EBUILD libarchive-2.7.0.ebuild 2262 RMD160 3a3bc5873a1e4a2fd1093f5fca7e0621b7fe96e0 SHA1 b7ea6e33b9cbdc9c3aff0aed213d958b75c1b85d SHA256 966ebcf176ed359cac912808af4c96eb2548608b605596929c8de0739a48f708
-MISC ChangeLog 22017 RMD160 ae59331680887c323d4b6eb127a12238579a7164 SHA1 7c6e1a169856df6a917fc766a8d439541e8ffc9c SHA256 2fa5a925e5753c2f8bc29d884e7e48dc52118c505a52ecba7cdb9e1645268ade
+EBUILD libarchive-2.7.0-r1.ebuild 2298 RMD160 a644f03a878ed5453bad41cf6d0be4acdf7bcbf1 SHA1 b802ec7486fb234e5bfd06e31a8194943d9d9b82 SHA256 871d175ce3a7ecbbfa3c88164cc5b448e86a4c276f6ddba4b70f23bde7710240
+MISC ChangeLog 22295 RMD160 4b4fb521c4074fcab45c3eabb3889561f7e20ea7 SHA1 176b5a967c42c0b5a5811efad00eee917721ea8e SHA256 953e16a14038b1f58ef86cfad3ef2e9f3d5ce9a79105838bfe558f68ae80618e
 MISC metadata.xml 872 RMD160 895e9e13d46da8427f2695bc24aaefb16a5d8195 SHA1 e64e4be1a494de7e45305a7085b82b4b551c9c6f SHA256 c736f7829f1a1571706230bd5ec245389317faa2888300a1b74f440307f2c6e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoMl18ACgkQAiZjviIA2Xic7wCfT9chV90GlDAm20iBYH5cjXoS
-5IcAoKivjajT0dIO2ObKNtLyl9v1rkH8
-=O6h8
+iEYEARECAAYFAkogO6EACgkQAiZjviIA2Xgi8QCfUwCHjO6MIWvC+rXtJ7W8Vw5V
+YSsAoJ1FJdR9D+1ZcQkYN2M2Sg5g6gBp
+=R/eC
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/libarchive-2.6.0.ebuild b/app-arch/libarchive/libarchive-2.6.0.ebuild
deleted file mode 100644
index 33052daa3a71..000000000000
--- a/app-arch/libarchive/libarchive-2.6.0.ebuild
+++ /dev/null
@@ -1,76 +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.0.ebuild,v 1.5 2009/03/06 14:27:43 ranger 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 ~hppa ~ia64 ppc ppc64 ~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}"
-
-	epatch "${FILESDIR}/${P}-nolibs.patch"
-
-	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.6.1.ebuild b/app-arch/libarchive/libarchive-2.6.1.ebuild
deleted file mode 100644
index 3d7040507d6b..000000000000
--- a/app-arch/libarchive/libarchive-2.6.1.ebuild
+++ /dev/null
@@ -1,74 +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.1.ebuild,v 1.6 2009/04/12 20:50:35 bluebird 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}"
-	epatch "${FILESDIR}"/${P}-headers.patch
-	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.0-r1.ebuild b/app-arch/libarchive/libarchive-2.7.0-r1.ebuild
index 5d9184cfa7eb..507fec80aa56 100644
--- a/app-arch/libarchive/libarchive-2.7.0-r1.ebuild
+++ b/app-arch/libarchive/libarchive-2.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.0-r1.ebuild,v 1.1 2009/05/14 22:12:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.7.0-r1.ebuild,v 1.2 2009/05/29 19:46:35 flameeyes Exp $
 
 EAPI=1
 
@@ -21,10 +21,8 @@ COMPRESS_LIBS_DEPEND="lzma? ( app-arch/lzma-utils )
 		zlib? ( sys-libs/zlib )"
 
 RDEPEND="!dev-libs/libarchive
-	kernel_linux? (
-		acl? ( sys-apps/acl )
-		xattr? ( sys-apps/attr )
-	)
+	acl? ( virtual/acl )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
 	!static? ( ${COMPRESS_LIBS_DEPEND} )"
 DEPEND="${RDEPEND}
 	${COMPRESS_LIBS_DEPEND}
diff --git a/app-arch/libarchive/libarchive-2.7.0.ebuild b/app-arch/libarchive/libarchive-2.7.0.ebuild
deleted file mode 100644
index 217cc686fee2..000000000000
--- a/app-arch/libarchive/libarchive-2.7.0.ebuild
+++ /dev/null
@@ -1,84 +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.7.0.ebuild,v 1.2 2009/04/17 10:58:00 flameeyes Exp $
-
-EAPI=1
-
-inherit eutils libtool toolchain-funcs flag-o-matic
-
-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}"
-
-	epatch "${FILESDIR}"/${P}-fortified-sources.patch
-
-	elibtoolize
-	epunt_cxx
-}
-
-src_compile() {
-	local myconf
-
-	if ! use static ; then
-		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
-	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 lzma because we don't have liblzma (not liblzmadec!)
-	# currently.
-	econf --bindir=/bin \
-		--enable-bsdtar --enable-bsdcpio \
-		$(use_enable acl) $(use_enable xattr) \
-		$(use_with zlib) \
-		$(use_with bzip2 bz2lib) $(use_with lzma lzmadec) \
-		--without-lzma \
-		${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
-}