Version bump, and remove old versions and patches.

Package-Manager: portage-2.1.4_rc9

9 files changed, 46 insertions, 244 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/Manifest b/app-arch/libarchive/Manifest
index 50477b771124..1db9fec4fd56 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,40 +1,34 @@
-AUX libarchive-2.1.5-acl.patch 2310 RMD160 829e44e2375f35a2f721bc66c98d01bf74d701c8 SHA1 bda71f9e3b0f027d7f7edcab37dd704cb6fc61b7 SHA256 0dfbfef839f20be89cfb402d94a59d3e669bebea35e4b8c706e3b57a2b9e6c9f
-MD5 80edcf63f106b0c2cf976ac28ba184b1 files/libarchive-2.1.5-acl.patch 2310
-RMD160 829e44e2375f35a2f721bc66c98d01bf74d701c8 files/libarchive-2.1.5-acl.patch 2310
-SHA256 0dfbfef839f20be89cfb402d94a59d3e669bebea35e4b8c706e3b57a2b9e6c9f files/libarchive-2.1.5-acl.patch 2310
-AUX libarchive-2.1.9-static.patch 1323 RMD160 e69e1b894c9ce6d1a4098731d10ebedcd2a812c8 SHA1 cfcef4ad62f276d2c40ae020acc7be1d48099397 SHA256 6ab2eee004a6ec228acea4ceda9515c84edd9ca1187b8a918bef541d3dd9492d
-MD5 1dd8a4adb1851e0a84fa752b970ff445 files/libarchive-2.1.9-static.patch 1323
-RMD160 e69e1b894c9ce6d1a4098731d10ebedcd2a812c8 files/libarchive-2.1.9-static.patch 1323
-SHA256 6ab2eee004a6ec228acea4ceda9515c84edd9ca1187b8a918bef541d3dd9492d files/libarchive-2.1.9-static.patch 1323
-DIST libarchive-2.2.4.tar.gz 636879 RMD160 2aa2e4124c1081acfdc666335b659457dccb4fd6 SHA1 171c25a40f6cc3eee3be3343f2b9436b22368f18 SHA256 186d3aa24817f64b12cb0ff4c8b4a76df33921446b912ca015a05b66f8755df0
-DIST libarchive-2.4.0.tar.gz 791312 RMD160 fac39fc336dd6701c3c871c6634e2876239ef58c SHA1 b1d845e1c9e1631ba4b220627604832a14d84679 SHA256 edde790bdcae164a2f4abda5e3b34b6ad6c15c45b1d30d561bbb67bef4cd9724
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libarchive-2.4.5.tar.gz 803319 RMD160 ae0eedc64ea7c68be8874564e8966c304c5e27fb SHA1 f5d26c3f8460cc07d15ffb0b165f084bcb1a0963 SHA256 8e156e08b35c6fd422457566e697347ec19914b007352b2c686e9f860ceddcc5
-EBUILD libarchive-2.2.4.ebuild 1879 RMD160 58516de1505d655691f203043f08d39be2bac1f9 SHA1 d5fa91126fdfef5e7a2bf7e9942f3dac69c680a9 SHA256 29a4441e8e6be06f56bfcefdaf712c882d4497ecd69a291426d3ceff029b4e6e
-MD5 3f7521926bfb5cdc879f1d230768a03e libarchive-2.2.4.ebuild 1879
-RMD160 58516de1505d655691f203043f08d39be2bac1f9 libarchive-2.2.4.ebuild 1879
-SHA256 29a4441e8e6be06f56bfcefdaf712c882d4497ecd69a291426d3ceff029b4e6e libarchive-2.2.4.ebuild 1879
-EBUILD libarchive-2.4.0-r1.ebuild 1911 RMD160 cdea89930dd1f8e2eb44ab0fb5559951c3f5a8b0 SHA1 569357ea3acdbe86d3bb7ba4f4015f3cc5883ec4 SHA256 de2277eeb786241a54849e06f1c4ea24e0b1cadaa1ff4c740c39aef462693099
-MD5 ab89efc6163f961285888e1353d05c9b libarchive-2.4.0-r1.ebuild 1911
-RMD160 cdea89930dd1f8e2eb44ab0fb5559951c3f5a8b0 libarchive-2.4.0-r1.ebuild 1911
-SHA256 de2277eeb786241a54849e06f1c4ea24e0b1cadaa1ff4c740c39aef462693099 libarchive-2.4.0-r1.ebuild 1911
+DIST libarchive-2.4.7.tar.gz 807368 RMD160 b731d86b84f49ad4eb0fd4efe587135c1ea42724 SHA1 9889c9b80d43d245d3e710fdeb63270796eb8450 SHA256 b9a3ad1add28f80040a5c71831a4443de24f5d33e37aa2423a02df8da61f8334
 EBUILD libarchive-2.4.5.ebuild 1643 RMD160 72fb72d357bf3f3e7915caeed57dee9951e6b227 SHA1 c15b1173156afaa1297dab72fd145459b2bace95 SHA256 9d8e062395e20de770758e5e19b104d552fc749cacda0e42e0875355a5f2adb1
 MD5 38ae257b04613f10a7c256a47fd972a1 libarchive-2.4.5.ebuild 1643
 RMD160 72fb72d357bf3f3e7915caeed57dee9951e6b227 libarchive-2.4.5.ebuild 1643
 SHA256 9d8e062395e20de770758e5e19b104d552fc749cacda0e42e0875355a5f2adb1 libarchive-2.4.5.ebuild 1643
-MISC ChangeLog 14588 RMD160 6d175b67ea6bf9522131a6820122c9eeadaa96e0 SHA1 31f8250360930960cb0ca4746e633ad72a8e003f SHA256 4aedc35234a5812ec60929c2d17d73218849a4586a19c3a5f979071efbe1ef3d
-MD5 b9e96b1248c5485910bb4000c7bf13ca ChangeLog 14588
-RMD160 6d175b67ea6bf9522131a6820122c9eeadaa96e0 ChangeLog 14588
-SHA256 4aedc35234a5812ec60929c2d17d73218849a4586a19c3a5f979071efbe1ef3d ChangeLog 14588
+EBUILD libarchive-2.4.7.ebuild 1649 RMD160 eb05b0722a7160968e9253f0e6f24c87bff8c308 SHA1 6ff6d0f1da56d694573c0f22344b08c039d602e5 SHA256 e3beea0dee416c40cdd707c36fb969420f698b04c55e3918295ea167414c6f6d
+MD5 bd0bf67d1465fa6c4c8b4f9183c47b14 libarchive-2.4.7.ebuild 1649
+RMD160 eb05b0722a7160968e9253f0e6f24c87bff8c308 libarchive-2.4.7.ebuild 1649
+SHA256 e3beea0dee416c40cdd707c36fb969420f698b04c55e3918295ea167414c6f6d libarchive-2.4.7.ebuild 1649
+MISC ChangeLog 14893 RMD160 5dc557c016e9c5d5c4c173372aa66aa14489a0b9 SHA1 e99b455c55fa6037a75875ea051764b7877c1b05 SHA256 38033ccb0f38a46a670eea7998066fa71c742e71ef939fbb29c4eff0782bc98b
+MD5 d7aad46a68586deddb8929a29de6257d ChangeLog 14893
+RMD160 5dc557c016e9c5d5c4c173372aa66aa14489a0b9 ChangeLog 14893
+SHA256 38033ccb0f38a46a670eea7998066fa71c742e71ef939fbb29c4eff0782bc98b ChangeLog 14893
 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b
 MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337
 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337
 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b metadata.xml 337
-MD5 53696d479c86b015e22391c32b61a9d0 files/digest-libarchive-2.2.4 250
-RMD160 454948c529e1df57ec59333b90a0f3836330ecee files/digest-libarchive-2.2.4 250
-SHA256 2ecca5a95f31cc517355482604cdb19437b11d7ec5ff2884dc8707c780791eeb files/digest-libarchive-2.2.4 250
-MD5 25255d2ff2328999a08912800c47f659 files/digest-libarchive-2.4.0-r1 250
-RMD160 14204d58c53b78ee9b302366203b2ef4053291f8 files/digest-libarchive-2.4.0-r1 250
-SHA256 b81e1b3b3fc6748d2192e9aacfaeb264439a07feaa81ce8c59a502bb3c7fe457 files/digest-libarchive-2.4.0-r1 250
 MD5 63ee2dcb1141d4d4dd1bc6edcd828088 files/digest-libarchive-2.4.5 250
 RMD160 bee1a58fe68f6f9b18421d4e6acb5b4738c5d030 files/digest-libarchive-2.4.5 250
 SHA256 40f239780296afa92204d79634c80b6e2bd28c8c7f5a8483dfd36c476305dfbd files/digest-libarchive-2.4.5 250
+MD5 06cd7833c149fe8eee13f35ce43e319a files/digest-libarchive-2.4.7 250
+RMD160 a5ef03ee8c67f161ba8b5fd8d5af8156d98577fe files/digest-libarchive-2.4.7 250
+SHA256 0ee3793b96302c08cb9d6995317c36739fd883b5a3dfcabec2ce63f845688a85 files/digest-libarchive-2.4.7 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHYW4qAiZjviIA2XgRArAWAKC6wIHvN35YKd3QJBGgHO5M92HoBQCeJbjl
+4VJzzgC+ZaVYDqYwhRFb18c=
+=w20u
+-----END PGP SIGNATURE-----
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