Version bump (taken from Flameeyes overlay)

(Portage version: 2.1.2-r11)

6 files changed, 47 insertions, 45 deletions

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index 465b3efc39da..1b2eb8ac40e9 100644
--- a/app-arch/bsdtar/ChangeLog
+++ b/app-arch/bsdtar/ChangeLog
@@ -1,6 +1,14 @@
 # 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.53 2007/02/25 19:24:00 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.54 2007/02/26 14:34:32 drizzt Exp $
+
+*bsdtar-2.0_beta13 (26 Feb 2007)
+
+  26 Feb 2007; Timothy Redaelli <drizzt@gentoo.org>
+  -files/libarchive-2.0b11-tests.patch,
+  +files/libarchive-2.0b12-tests.patch, -bsdtar-2.0_beta12.ebuild,
+  +bsdtar-2.0_beta13.ebuild:
+  Version bump (taken from Flameeyes overlay)
 
 *bsdtar-2.0_beta12 (25 Feb 2007)
 
diff --git a/app-arch/bsdtar/bsdtar-2.0_beta12.ebuild b/app-arch/bsdtar/bsdtar-2.0_beta13.ebuild
index 73328d3d5995..b9ac42e7691a 100644
--- a/app-arch/bsdtar/bsdtar-2.0_beta12.ebuild
+++ b/app-arch/bsdtar/bsdtar-2.0_beta13.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/bsdtar/bsdtar-2.0_beta12.ebuild,v 1.1 2007/02/25 19:24:00 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-2.0_beta13.ebuild,v 1.1 2007/02/26 14:34:32 drizzt Exp $
 
 inherit eutils autotools toolchain-funcs flag-o-matic
 
@@ -13,7 +13,7 @@ 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 test"
+IUSE="build static acl xattr"
 
 RDEPEND="!dev-libs/libarchive
 	kernel_linux? (
@@ -24,7 +24,6 @@ RDEPEND="!dev-libs/libarchive
 		app-arch/bzip2
 		sys-libs/zlib ) )"
 DEPEND="${RDEPEND}
-	test? ( virtual/pmake )
 	kernel_linux? ( sys-fs/e2fsprogs
 		virtual/os-headers )"
 
@@ -36,7 +35,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/libarchive-1.3.1-static.patch
 	epatch "${FILESDIR}"/libarchive-2.0b6-acl.patch
-	#epatch "${FILESDIR}"/libarchive-2.0b11-tests.patch
+	epatch "${FILESDIR}"/libarchive-2.0b12-tests.patch
 
 	eautoreconf
 	epunt_cxx
@@ -63,15 +62,6 @@ src_compile() {
 	emake || die "emake failed"
 }
 
-src_test() {
-	cd "${S}/libarchive/test"
-	$(get_bmake) || einfo "Ignore this failure."
-	$(get_bmake) test || die "$(get_bmake) test failed"
-
-	cd "${S}/tar/test"
-	PATH="${S}:${PATH}" $(get_bmake) test || die "$(get_bmake) test failed"
-}
-
 src_install() {
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
diff --git a/app-arch/bsdtar/files/digest-bsdtar-2.0_beta12 b/app-arch/bsdtar/files/digest-bsdtar-2.0_beta12
deleted file mode 100644
index dec03cb4599e..000000000000
--- a/app-arch/bsdtar/files/digest-bsdtar-2.0_beta12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 762c2c99d6f9e15a88ef3d00e8c800b6 libarchive-2.0b12.tar.gz 565902
-RMD160 0eaf77a01f33f9d522c44bc1089c4bc737fa87bb libarchive-2.0b12.tar.gz 565902
-SHA256 89b1d527a359fb221c2ad5dcac206e9e233de30bd0e757d9899ee66bdd3fc419 libarchive-2.0b12.tar.gz 565902
diff --git a/app-arch/bsdtar/files/digest-bsdtar-2.0_beta13 b/app-arch/bsdtar/files/digest-bsdtar-2.0_beta13
new file mode 100644
index 000000000000..e99783c03720
--- /dev/null
+++ b/app-arch/bsdtar/files/digest-bsdtar-2.0_beta13
@@ -0,0 +1,3 @@
+MD5 573a198e21bf4735ba3f01f35c865dea libarchive-2.0b13.tar.gz 566970
+RMD160 4a9a522b924347db1c157a08a6c88d4b7a7deb6a libarchive-2.0b13.tar.gz 566970
+SHA256 135cd65e91964faf491915618a3084655954aaab123eb5d6c485d3a62b3acfb2 libarchive-2.0b13.tar.gz 566970
diff --git a/app-arch/bsdtar/files/libarchive-2.0b11-tests.patch b/app-arch/bsdtar/files/libarchive-2.0b11-tests.patch
deleted file mode 100644
index dfb5d4d41d96..000000000000
--- a/app-arch/bsdtar/files/libarchive-2.0b11-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: libarchive-2.0b11/libarchive/test/main.c
-===================================================================
---- libarchive-2.0b11.orig/libarchive/test/main.c
-+++ libarchive-2.0b11/libarchive/test/main.c
-@@ -28,6 +28,7 @@
-  * Each test program is linked against this file.
-  */
- #include <stdarg.h>
-+#include <time.h>
- 
- #include "test.h"
- 
-Index: libarchive-2.0b11/libarchive/test/test_read_extract.c
-===================================================================
---- libarchive-2.0b11.orig/libarchive/test/test_read_extract.c
-+++ libarchive-2.0b11/libarchive/test/test_read_extract.c
-@@ -126,7 +126,11 @@ DEFINE_TEST(test_read_extract)
- 	assert(0 == stat("dir4/c", &st));
- 	assert(st.st_mode == (S_IFDIR | 0711));
- 	assert(0 == lstat("symlink", &st));
-+#ifdef __linux__
-+	assert(st.st_mode == (S_IFLNK | 0777));
-+#else
- 	assert(st.st_mode == (S_IFLNK | 0755));
-+#endif
- 	assert(0 == stat("symlink", &st));
- 	assert(st.st_mode == (S_IFREG | 0755));
- 
diff --git a/app-arch/bsdtar/files/libarchive-2.0b12-tests.patch b/app-arch/bsdtar/files/libarchive-2.0b12-tests.patch
new file mode 100644
index 000000000000..714e2192ef49
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-2.0b12-tests.patch
@@ -0,0 +1,32 @@
+Index: libarchive-2.0b12/libarchive/test/test_read_extract.c
+===================================================================
+--- libarchive-2.0b12.orig/libarchive/test/test_read_extract.c
++++ libarchive-2.0b12/libarchive/test/test_read_extract.c
+@@ -126,7 +126,11 @@ DEFINE_TEST(test_read_extract)
+ 	assert(0 == stat("dir4/c", &st));
+ 	assert(st.st_mode == (S_IFDIR | 0711));
+ 	assert(0 == lstat("symlink", &st));
++#ifdef __linux__
++	assert(st.st_mode == (S_IFLNK | 0777));
++#else
+ 	assert(st.st_mode == (S_IFLNK | 0755));
++#endif
+ 	assert(0 == stat("symlink", &st));
+ 	assert(st.st_mode == (S_IFREG | 0755));
+ 
+Index: libarchive-2.0b12/libarchive/test/test_write_disk_secure.c
+===================================================================
+--- libarchive-2.0b12.orig/libarchive/test/test_write_disk_secure.c
++++ libarchive-2.0b12/libarchive/test/test_write_disk_secure.c
+@@ -88,7 +88,11 @@ DEFINE_TEST(test_write_disk_secure)
+ 
+ 	assert(0 == lstat("link_to_dir", &st));
+ 	failure("link_to_dir: st.st_mode=%o", st.st_mode);
++#ifdef __linux__
++	assert((st.st_mode & 07777) == 0777);
++#else
+ 	assert((st.st_mode & 07777) == 0755);
++#endif
+ 	failure("link_to_dir: st.st_mode=%o", st.st_mode);
+ 	assert(S_ISLNK(st.st_mode));
+