Version bump, and cleanup of old ebuilds.

(Portage version: 2.1.3.17)

8 files changed, 17 insertions, 175 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 181156417308..5049422602bc 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2007/10/29 17:23:03 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.6 2007/11/04 17:54:42 flameeyes Exp $
+
+*libarchive-2.4.0 (04 Nov 2007)
+
+  04 Nov 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -libarchive-2.2.5.ebuild, -libarchive-2.3.3.ebuild,
+  -libarchive-2.3.4.ebuild, +libarchive-2.4.0.ebuild:
+  Version bump, and cleanup of old ebuilds.
 
 *libarchive-2.3.5 (29 Oct 2007)
 
diff --git a/app-arch/libarchive/files/digest-libarchive-2.2.5 b/app-arch/libarchive/files/digest-libarchive-2.2.5
deleted file mode 100644
index 40607dd0ccc8..000000000000
--- a/app-arch/libarchive/files/digest-libarchive-2.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4b7773786e185a16353440c7e62a289a libarchive-2.2.5.tar.gz 637691
-RMD160 fda5c804679e29954b387ae2c06b32bca4ae7bd4 libarchive-2.2.5.tar.gz 637691
-SHA256 510102b594b8cfd8fa6b3718f40a8ef059a95ed453a97b60ad9a3502c0f16f26 libarchive-2.2.5.tar.gz 637691
diff --git a/app-arch/libarchive/files/digest-libarchive-2.3.3 b/app-arch/libarchive/files/digest-libarchive-2.3.3
deleted file mode 100644
index 847a38b57de4..000000000000
--- a/app-arch/libarchive/files/digest-libarchive-2.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 309db348a2274db8ba2bb7a2578cf998 libarchive-2.3.3.tar.gz 673965
-RMD160 0e764b36b26fafac763d059b49f44749b44b9dfa libarchive-2.3.3.tar.gz 673965
-SHA256 30abee01050fd46048537f3ad689a88a460de6b0108736fd197392669feaa898 libarchive-2.3.3.tar.gz 673965
diff --git a/app-arch/libarchive/files/digest-libarchive-2.3.4 b/app-arch/libarchive/files/digest-libarchive-2.3.4
deleted file mode 100644
index 04e6d566dcaa..000000000000
--- a/app-arch/libarchive/files/digest-libarchive-2.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 22138fa535e8d47c1ec5a8df8814240d libarchive-2.3.4.tar.gz 682180
-RMD160 ea3d7ed18221ecb69ca794c10f5e2d91558bed4a libarchive-2.3.4.tar.gz 682180
-SHA256 1956e384f2097031b0a1797c1c8172458270fb13b9944ee6f9cb0f4b71ca1c07 libarchive-2.3.4.tar.gz 682180
diff --git a/app-arch/libarchive/files/digest-libarchive-2.4.0 b/app-arch/libarchive/files/digest-libarchive-2.4.0
new file mode 100644
index 000000000000..fdc8ee1ece4a
--- /dev/null
+++ b/app-arch/libarchive/files/digest-libarchive-2.4.0
@@ -0,0 +1,3 @@
+MD5 9b06995c6c9d000892b7320a4a4fedcb libarchive-2.4.0.tar.gz 791312
+RMD160 fac39fc336dd6701c3c871c6634e2876239ef58c libarchive-2.4.0.tar.gz 791312
+SHA256 edde790bdcae164a2f4abda5e3b34b6ad6c15c45b1d30d561bbb67bef4cd9724 libarchive-2.4.0.tar.gz 791312
diff --git a/app-arch/libarchive/libarchive-2.2.5.ebuild b/app-arch/libarchive/libarchive-2.2.5.ebuild
deleted file mode 100644
index fa2b2bd6c717..000000000000
--- a/app-arch/libarchive/libarchive-2.2.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.2.5.ebuild,v 1.2 2007/11/03 17:39:02 grobian 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 kernel_linux"
-
-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.9-static.patch
-	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 \
-		$(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
-	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
-}
diff --git a/app-arch/libarchive/libarchive-2.3.3.ebuild b/app-arch/libarchive/libarchive-2.3.3.ebuild
deleted file mode 100644
index a4ff92fcc5ac..000000000000
--- a/app-arch/libarchive/libarchive-2.3.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.3.ebuild,v 1.2 2007/11/03 17:39:02 grobian 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 kernel_linux"
-
-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 \
-		$(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
-	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
-}
diff --git a/app-arch/libarchive/libarchive-2.3.4.ebuild b/app-arch/libarchive/libarchive-2.4.0.ebuild
index 9c53cfc561ab..0462e8c1a255 100644
--- a/app-arch/libarchive/libarchive-2.3.4.ebuild
+++ b/app-arch/libarchive/libarchive-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.2 2007/11/03 17:39:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.4.0.ebuild,v 1.1 2007/11/04 17:54:42 flameeyes Exp $
 
 inherit eutils autotools toolchain-funcs flag-o-matic
 
@@ -40,7 +40,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
+	local myconf=
 
 	if use static || use build ; then
 		myconf="${myconf} --enable-static-bsdtar"
@@ -54,6 +54,7 @@ src_compile() {
 
 	econf \
 		--bindir=/bin \
+		--enable-bsdcpio \
 		$(use_enable acl) \
 		$(use_enable xattr) \
 		${myconf} || die "econf failed"
@@ -67,8 +68,11 @@ src_install() {
 	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 README NEWS
+
 	if use build; then
 		rm -rf "${D}"/usr
 		rm -rf "${D}"/lib/*.so*