Version bump, and remove old versions and patches.

(Portage version: 2.1.4_rc9)

8 files changed, 24 insertions, 216 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index ec247e242ac3..857756f4a19c 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,14 @@
 # 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.11 2007/12/05 21:02:21 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.12 2007/12/13 17:38:32 flameeyes Exp $
+
+*libarchive-2.4.7 (13 Dec 2007)
+
+  13 Dec 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libarchive-2.1.5-acl.patch, -files/libarchive-2.1.9-static.patch,
+  -libarchive-2.2.4.ebuild, -libarchive-2.4.0-r1.ebuild,
+  +libarchive-2.4.7.ebuild:
+  Version bump, and remove old versions and patches.
 
   05 Dec 2007; Samuli Suominen <drac@gentoo.org> libarchive-2.4.5.ebuild:
   amd64 stable wrt #200173
diff --git a/app-arch/libarchive/files/digest-libarchive-2.2.4 b/app-arch/libarchive/files/digest-libarchive-2.2.4
deleted file mode 100644
index a6e24a9d8f40..000000000000
--- a/app-arch/libarchive/files/digest-libarchive-2.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1dd9d267af446921cf93deb27d1fbe9e libarchive-2.2.4.tar.gz 636879
-RMD160 2aa2e4124c1081acfdc666335b659457dccb4fd6 libarchive-2.2.4.tar.gz 636879
-SHA256 186d3aa24817f64b12cb0ff4c8b4a76df33921446b912ca015a05b66f8755df0 libarchive-2.2.4.tar.gz 636879
diff --git a/app-arch/libarchive/files/digest-libarchive-2.4.0-r1 b/app-arch/libarchive/files/digest-libarchive-2.4.0-r1
deleted file mode 100644
index fdc8ee1ece4a..000000000000
--- a/app-arch/libarchive/files/digest-libarchive-2.4.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-libarchive-2.4.7 b/app-arch/libarchive/files/digest-libarchive-2.4.7
new file mode 100644
index 000000000000..7ded24420568
--- /dev/null
+++ b/app-arch/libarchive/files/digest-libarchive-2.4.7
@@ -0,0 +1,3 @@
+MD5 d2e848c5e9830f191ee46c89fcb1eba7 libarchive-2.4.7.tar.gz 807368
+RMD160 b731d86b84f49ad4eb0fd4efe587135c1ea42724 libarchive-2.4.7.tar.gz 807368
+SHA256 b9a3ad1add28f80040a5c71831a4443de24f5d33e37aa2423a02df8da61f8334 libarchive-2.4.7.tar.gz 807368
diff --git a/app-arch/libarchive/files/libarchive-2.1.5-acl.patch b/app-arch/libarchive/files/libarchive-2.1.5-acl.patch
deleted file mode 100644
index 40cac5b35166..000000000000
--- a/app-arch/libarchive/files/libarchive-2.1.5-acl.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.ac.orig	2007-04-17 22:18:39.000000000 +0200
-+++ configure.ac	2007-04-17 22:22:17.000000000 +0200
-@@ -56,7 +56,6 @@
- AC_HEADER_STDC
- AC_HEADER_DIRENT
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS([attr/xattr.h])
- AC_CHECK_HEADERS([bzlib.h errno.h ext2fs/ext2_fs.h fcntl.h  grp.h])
- AC_CHECK_HEADERS([inttypes.h langinfo.h limits.h linux/ext2_fs.h linux/fs.h])
- # Include inttypes.h into archive.h only if appropriate.
-@@ -79,8 +78,6 @@
- AM_CONDITIONAL([STATIC_BSDTAR], [test "x$enable_static_bsdtar" != "xno"])
- 
- # Checks for libraries.
--AC_CHECK_LIB(acl,acl_set_file)
--AC_CHECK_LIB(attr,setxattr)
- AC_CHECK_LIB(bz2,BZ2_bzDecompressInit)
- AC_CHECK_LIB(z,inflate)
- 
-@@ -148,9 +145,8 @@
- AC_FUNC_STRFTIME
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS([chflags fchdir fchflags fchmod fchown futimes])
--AC_CHECK_FUNCS([ftruncate getopt_long getxattr])
-+AC_CHECK_FUNCS([ftruncate getopt_long])
- AC_CHECK_FUNCS([lchflags lchmod lchown])
--AC_CHECK_FUNCS([lgetxattr listxattr llistxattr fsetxattr lsetxattr])
- AC_CHECK_FUNCS([lutimes memmove memset mkdir mkfifo])
- AC_CHECK_FUNCS([nl_langinfo poll reallocf select setlocale])
- AC_CHECK_FUNCS([strchr strdup strerror strrchr timegm utime utimes])
-@@ -189,6 +185,16 @@
- #endif
- ])
- 
-+# Check for Extended Attributes support
-+AC_ARG_ENABLE([xattr],
-+	AS_HELP_STRING([--disable-xattr], [Enable Extended Attributes support (default: check)]))
-+
-+if test "x$enable_xattr" != "xno"; then
-+	AC_CHECK_HEADERS([attr/xattr.h])
-+	AC_CHECK_LIB(attr,setxattr)
-+	AC_CHECK_FUNCS([getxattr lgetxattr listxattr llistxattr fsetxattr lsetxattr])
-+fi
-+
- # Check for ACL support
- #
- # The ACL support in libarchive is written against the POSIX1e draft,
-@@ -196,6 +202,10 @@
- # platforms.  Worse, some systems have completely non-POSIX acl functions,
- # which makes the following checks rather more complex than I would like.
- #
-+AC_ARG_ENABLE([acl],
-+	AS_HELP_STRING([--disable-acl], [Enable ACL support (default: check)]))
-+
-+if test "x$enable_acl" != "xno"; then
- AC_CHECK_HEADERS([sys/acl.h])
- AC_CHECK_LIB([acl],[acl_get_file])
- AC_CHECK_FUNCS([acl_create_entry acl_init acl_set_fd acl_set_fd_np acl_set_file])
-@@ -229,6 +239,7 @@
- 		[AC_DEFINE(HAVE_ACL_USER, 1, [True for systems with POSIX ACL support])],
- 		[],
- 		[#include <sys/acl.h>])
-+fi
- 
- # Additional requirements
- AC_SYS_LARGEFILE
diff --git a/app-arch/libarchive/files/libarchive-2.1.9-static.patch b/app-arch/libarchive/files/libarchive-2.1.9-static.patch
deleted file mode 100644
index f59e176473e1..000000000000
--- a/app-arch/libarchive/files/libarchive-2.1.9-static.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: libarchive-1.3.1/configure.ac
-===================================================================
---- libarchive-1.3.1.orig/configure.ac
-+++ libarchive-1.3.1/configure.ac
-@@ -71,6 +71,11 @@ AC_CHECK_HEADERS([locale.h paths.h])
- AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/acl.h sys/ioctl.h])
- AC_CHECK_HEADERS([sys/param.h sys/time.h unistd.h wchar.h zlib.h])
- 
-+AC_ARG_ENABLE([static-bsdtar],
-+	AS_HELP_STRING([--disable-static-bsdtar], [Makes bsdtar link dynamically to libarchive (default: static)]) )
-+
-+AM_CONDITIONAL([STATIC_BSDTAR], [test "x$enable_static_bsdtar" != "xno"])
-+
- # Checks for libraries.
- AC_CHECK_LIB(acl,acl_set_file)
- AC_CHECK_LIB(attr,setxattr)
-Index: libarchive-1.3.1/Makefile.am
-===================================================================
---- libarchive-1.3.1.orig/Makefile.am
-+++ libarchive-1.3.1/Makefile.am
-@@ -114,8 +114,12 @@ bsdtar_DEPENDENCIES = libarchive.la		\
- 		libarchive/archive_entry.h	\
- 		libarchive/archive.h
- 
--bsdtar_LDADD= -larchive
--bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive
-+if STATIC_BSDTAR
- # Link libarchive statically...
--bsdtar_LDFLAGS= -static -I$(destdir)/libarchive
-+static=-all-static
-+endif
-+
-+bsdtar_LDADD= -L. -larchive -lbz2 -lz
-+bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive
-+bsdtar_LDFLAGS= $(static)
- bsdtar_dist_man_MANS=	tar/bsdtar.1
diff --git a/app-arch/libarchive/libarchive-2.2.4.ebuild b/app-arch/libarchive/libarchive-2.2.4.ebuild
deleted file mode 100644
index 19707b866c29..000000000000
--- a/app-arch/libarchive/libarchive-2.2.4.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.4.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.4.0-r1.ebuild b/app-arch/libarchive/libarchive-2.4.7.ebuild
index c159ff7788e2..a3da9797ee79 100644
--- a/app-arch/libarchive/libarchive-2.4.0-r1.ebuild
+++ b/app-arch/libarchive/libarchive-2.4.7.ebuild
@@ -1,14 +1,12 @@
 # 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.4.0-r1.ebuild,v 1.1 2007/11/06 20:55:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.4.7.ebuild,v 1.1 2007/12/13 17:38:32 flameeyes Exp $
 
-inherit eutils autotools toolchain-funcs flag-o-matic
-
-MY_P=${P/_beta/b}
+inherit eutils libtool toolchain-funcs
 
 DESCRIPTION="BSD tar command"
-HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive/"
-SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/${MY_P}.tar.gz"
+HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive"
+SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -27,40 +25,29 @@ 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
+	elibtoolize
 	epunt_cxx
 }
 
 src_compile() {
-	local myconf=
+	local myconf
 
 	if ! use static && ! use build ; then
 		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
 	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."
 
-	econf \
-		--bindir=/bin \
-		--enable-bsdcpio \
-		$(use_enable acl) \
-		$(use_enable xattr) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
+	emake || die "emake failed."
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	emake -j1 DESTDIR="${D}" install || die "emake install failed."
 
 	# Create tar symlink for FreeBSD
 	if [[ ${CHOST} == *-freebsd* ]]; then
@@ -69,7 +56,7 @@ src_install() {
 		# We may wish to switch to symlink bsdcpio to cpio too one day
 	fi
 
-	dodoc README NEWS
+	dodoc NEWS README
 
 	if use build; then
 		rm -rf "${D}"/usr