Version bump, patch taken from Flameeyes overlay

Package-Manager: portage-2.1.2.2

5 files changed, 130 insertions, 9 deletions

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index b991fdfc838b..0a4114d96528 100644
--- a/app-arch/bsdtar/ChangeLog
+++ b/app-arch/bsdtar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/bsdtar
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.57 2007/03/04 22:34:16 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.58 2007/03/10 14:26:47 drizzt Exp $
+
+*bsdtar-2.0.21 (10 Mar 2007)
+
+  10 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
+  +files/libarchive-2.0.21-tests.patch, +bsdtar-2.0.21.ebuild:
+  Version bump, patch taken from Flameeyes overlay
 
 *bsdtar-2.0.20 (04 Mar 2007)
 
diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest
index caac92a0a867..45637720f92e 100644
--- a/app-arch/bsdtar/Manifest
+++ b/app-arch/bsdtar/Manifest
@@ -17,12 +17,17 @@ AUX libarchive-1.3.1-static.patch 1333 RMD160 21488116b37c75506061f6f5873f91670a
 MD5 6590bb296f0bb64ecfcd6b779cae3890 files/libarchive-1.3.1-static.patch 1333
 RMD160 21488116b37c75506061f6f5873f91670a3fe45a files/libarchive-1.3.1-static.patch 1333
 SHA256 40be241edf721d5601824286e9221955add582d9136f3fc7e29f9abcb192a78c files/libarchive-1.3.1-static.patch 1333
+AUX libarchive-2.0.21-tests.patch 565 RMD160 2a921bd76ced83d9103a7503475236fcadf58ff2 SHA1 800101380c957f551c39533821b224e48a55bedf SHA256 6c8a7660aab2558a8e359ceb1a1b0a9d76fce84a58693cc6a66f0133f3135838
+MD5 15a6414f4b9d6d81d3e5386f305e24bf files/libarchive-2.0.21-tests.patch 565
+RMD160 2a921bd76ced83d9103a7503475236fcadf58ff2 files/libarchive-2.0.21-tests.patch 565
+SHA256 6c8a7660aab2558a8e359ceb1a1b0a9d76fce84a58693cc6a66f0133f3135838 files/libarchive-2.0.21-tests.patch 565
 AUX libarchive-2.0b6-acl.patch 2533 RMD160 5f9aaab92f184379cf3255432db97347125cfef0 SHA1 43c793d5616aebacd610ddf13cfc7ea6663d2df3 SHA256 05baba3fbda9a89db562ae18fc1c88f570093988ab374391f50944fe52481319
 MD5 f4cc3b69187c53fc80574147f90b3134 files/libarchive-2.0b6-acl.patch 2533
 RMD160 5f9aaab92f184379cf3255432db97347125cfef0 files/libarchive-2.0b6-acl.patch 2533
 SHA256 05baba3fbda9a89db562ae18fc1c88f570093988ab374391f50944fe52481319 files/libarchive-2.0b6-acl.patch 2533
 DIST libarchive-1.3.1.tar.gz 901173 RMD160 e518f802d9a50afcfede6dd7cbb4f42b2cbe12a1 SHA1 aed6eda15b012adbb88af0f0d76887920ffe7bbf SHA256 ad9eaf5779df75b9a0618a732eb227792e65db17c6713fe81ef5bff2bbc616a8
 DIST libarchive-2.0.20.tar.gz 566980 RMD160 cdd7368982f96524dd2315106e7c74a2a18920ac SHA1 d33e399547cebf075057091c16d51834eed01571 SHA256 ff846d4f8be27c7f2efcf3e26f56f91347c88b289bab31f65fada7093f879c1f
+DIST libarchive-2.0.21.tar.gz 571136 RMD160 0b9523b2b27d71d6f799e0d941b39fd810600c08 SHA1 1b1adcffae86f51d2fb1412bff8869e9a5094fba SHA256 358f56110da504cde229047ef958707f93f7159994e0c9b44ec92c3e9cb860ae
 EBUILD bsdtar-1.3.1-r2.ebuild 1900 RMD160 2ab4303a9250f0bb958c838fee4b78b0d40d6079 SHA1 dc695fd9ff572f84b45b32e723d59a83444db1d6 SHA256 f4975dbc3ea0ce23cee1c0a21b1f0017f58e65b946fe5959752908e3939ab2f3
 MD5 91eb945235769a64c6f88e79561ff150 bsdtar-1.3.1-r2.ebuild 1900
 RMD160 2ab4303a9250f0bb958c838fee4b78b0d40d6079 bsdtar-1.3.1-r2.ebuild 1900
@@ -31,10 +36,14 @@ EBUILD bsdtar-2.0.20.ebuild 1881 RMD160 68460527da55f79d0bb57955f8e6e65d5cd6e537
 MD5 21d44ab3c17d9429350b9bccd6d13312 bsdtar-2.0.20.ebuild 1881
 RMD160 68460527da55f79d0bb57955f8e6e65d5cd6e537 bsdtar-2.0.20.ebuild 1881
 SHA256 132c5c3d35c5ce107740e6f8f27341ec76f17b5900aac780ef2dada19386ffff bsdtar-2.0.20.ebuild 1881
-MISC ChangeLog 10061 RMD160 4274c9f8736fc551d28f38f473aba4ae529ec07e SHA1 2b4022fdb52450fb8b3652ab8a907bc717612feb SHA256 28bfd4ad95b81caa970c9d2dfb54ca01c433d0074cb7253d0ea6c79fe7cc0dab
-MD5 4244f36ee95b826c631eeca09918eb26 ChangeLog 10061
-RMD160 4274c9f8736fc551d28f38f473aba4ae529ec07e ChangeLog 10061
-SHA256 28bfd4ad95b81caa970c9d2dfb54ca01c433d0074cb7253d0ea6c79fe7cc0dab ChangeLog 10061
+EBUILD bsdtar-2.0.21.ebuild 1933 RMD160 ad23828817549bd1cce817972c786a1c3635d84a SHA1 5ba995de4b96a2cb82e566ef48b9bf3608d76ce1 SHA256 7eeffa5e340d589fc5349c7c8c8dc929377fbb908219b74c7a2f3ee73656a1ac
+MD5 577056a6b63e14e11e74c2c564e496b6 bsdtar-2.0.21.ebuild 1933
+RMD160 ad23828817549bd1cce817972c786a1c3635d84a bsdtar-2.0.21.ebuild 1933
+SHA256 7eeffa5e340d589fc5349c7c8c8dc929377fbb908219b74c7a2f3ee73656a1ac bsdtar-2.0.21.ebuild 1933
+MISC ChangeLog 10258 RMD160 5f133b2a679a148c610e3c36a8e63759fb8f13b1 SHA1 bea31d11a14fadfc2f3c286ddf465add55b12f93 SHA256 a688d2f94819ad706570ea84e9ef1ff276cf3a17deb7f869820c96be859ad12f
+MD5 5bcbedf74479da5f39fe1863ba99a918 ChangeLog 10258
+RMD160 5f133b2a679a148c610e3c36a8e63759fb8f13b1 ChangeLog 10258
+SHA256 a688d2f94819ad706570ea84e9ef1ff276cf3a17deb7f869820c96be859ad12f ChangeLog 10258
 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b
 MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337
 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337
@@ -45,10 +54,13 @@ SHA256 bbe48267a685e9836d773f76142f7f7a0bcc3f1a05262ed7fb3fb847a9fefd1e files/di
 MD5 b669ed5ac71d37aa2c591e49ed1c9bf1 files/digest-bsdtar-2.0.20 253
 RMD160 5fa5b0120d3466bd0186d2bb3b8cfc6671ee5fdf files/digest-bsdtar-2.0.20 253
 SHA256 fe10be1d7bccbc6a89af6d168ecd9ad9830f7c41ed69b8417bbb2c49b6618a3a files/digest-bsdtar-2.0.20 253
+MD5 649fcd9dc8dc13104321e1e23eefb2df files/digest-bsdtar-2.0.21 253
+RMD160 8480416976d8a2e57d046f83c1a5bb4ea4414f64 files/digest-bsdtar-2.0.21 253
+SHA256 f11ed5c3ee1a570b045ecb4bd36933612f539aa3787ce1ecbba6b3b491acdd96 files/digest-bsdtar-2.0.21 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF60luGDyatLGpTbYRAgy1AJ9MBVg2E6hFYLttorMdgQxOYgBxnwCdEcyV
-wV3l9+RF9aKUanbWHrdPxuA=
-=G7k3
+iD8DBQFF8sAtGDyatLGpTbYRAswgAJ4mEAirJrLqYV8IkCA6knAw2NRCJACePP/C
+nAKbR9kGEZhRtZWfvYWRuzU=
+=kCCS
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bsdtar/bsdtar-2.0.21.ebuild b/app-arch/bsdtar/bsdtar-2.0.21.ebuild
new file mode 100644
index 000000000000..9aa25a05a13a
--- /dev/null
+++ b/app-arch/bsdtar/bsdtar-2.0.21.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-2.0.21.ebuild,v 1.1 2007/03/10 14:26:47 drizzt Exp $
+
+inherit eutils autotools toolchain-funcs flag-o-matic
+
+MY_P="libarchive-${PV/_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"
+
+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}"/libarchive-1.3.1-static.patch
+	epatch "${FILESDIR}"/libarchive-2.0b6-acl.patch
+	epatch "${FILESDIR}"/libarchive-2.0.21-tests.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/bsdtar/files/digest-bsdtar-2.0.21 b/app-arch/bsdtar/files/digest-bsdtar-2.0.21
new file mode 100644
index 000000000000..cce4259db867
--- /dev/null
+++ b/app-arch/bsdtar/files/digest-bsdtar-2.0.21
@@ -0,0 +1,3 @@
+MD5 5269f23a5921aa369c0cd57465d31155 libarchive-2.0.21.tar.gz 571136
+RMD160 0b9523b2b27d71d6f799e0d941b39fd810600c08 libarchive-2.0.21.tar.gz 571136
+SHA256 358f56110da504cde229047ef958707f93f7159994e0c9b44ec92c3e9cb860ae libarchive-2.0.21.tar.gz 571136
diff --git a/app-arch/bsdtar/files/libarchive-2.0.21-tests.patch b/app-arch/bsdtar/files/libarchive-2.0.21-tests.patch
new file mode 100644
index 000000000000..11975b7801f2
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-2.0.21-tests.patch
@@ -0,0 +1,17 @@
+Index: libarchive-2.0.21/libarchive/test/test.h
+===================================================================
+--- libarchive-2.0.21.orig/libarchive/test/test.h
++++ libarchive-2.0.21/libarchive/test/test.h
+@@ -54,6 +54,12 @@
+ #error Oops: No config.h and no pre-built configuration in test.h.
+ #endif
+ 
++/* No non-FreeBSD platform will have __FBSDID, so just define it here. */
++#ifdef __FreeBSD__
++#include <sys/cdefs.h>  /* For __FBSDID */
++#else
++#define	__FBSDID(a)     /* null */
++#endif
+ 
+ /*
+  * "list.h" is simply created by "grep DEFINE_TEST"; it has