Version bump, and add a src_test function with the libarchive/bsdtar tests, it is...

Package-Manager: portage-2.1.2-r9

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index 73467cee0fc44233c2a2551d1c36918aa4bc0b55..27971cef9e61bc6ac362adaf58c70a1e81f9623f 100644 (file)
--- 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.49 2007/02/07 14:03:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.50 2007/02/11 19:19:10 flameeyes Exp $
+
+*bsdtar-2.0_beta11 (11 Feb 2007)
+
+  11 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libarchive-2.0b11-tests.patch, -bsdtar-2.0_beta9.ebuild,
+  -bsdtar-2.0_beta10.ebuild, +bsdtar-2.0_beta11.ebuild:
+  Version bump, and add a src_test function with the libarchive/bsdtar tests,
+  it is currently failing.
 
 *bsdtar-2.0_beta10 (07 Feb 2007)
 

diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest
index 5568127b89c0a358d88fb5f7532bfd1330b03650..82a48bba72b4d0ad680f5baeaf4f47c729d32eaa 100644 (file)
--- a/app-arch/bsdtar/Manifest
+++ b/app-arch/bsdtar/Manifest
@@ -17,6 +17,10 @@ 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.0b11-tests.patch 348 RMD160 dfd61f87b442e4320ed1684d6a24f9904f94efd7 SHA1 3fc3b0f06418c196b717ba7a14d486a5e3e56cac SHA256 491d95e4b58db6ff8dade39d73f008aa79b0c5d2bd8d0239ccab43ed6901e72c
+MD5 0041bfe5a8d8a256f7602b0993102573 files/libarchive-2.0b11-tests.patch 348
+RMD160 dfd61f87b442e4320ed1684d6a24f9904f94efd7 files/libarchive-2.0b11-tests.patch 348
+SHA256 491d95e4b58db6ff8dade39d73f008aa79b0c5d2bd8d0239ccab43ed6901e72c files/libarchive-2.0b11-tests.patch 348
 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
@@ -30,24 +34,19 @@ MD5 c0559a40e643fa7b46ac7c1efc6f02cc files/libarchive-2.0b7-noacl.patch 430
 RMD160 84889fde49d509b25f16e3aecc7dd5e1a51e2269 files/libarchive-2.0b7-noacl.patch 430
 SHA256 b21433e6d6c2b07776df2b8d2e313a05b1ecf6abbede21f68cc70d096ca0f42e files/libarchive-2.0b7-noacl.patch 430
 DIST libarchive-1.3.1.tar.gz 901173 RMD160 e518f802d9a50afcfede6dd7cbb4f42b2cbe12a1 SHA1 aed6eda15b012adbb88af0f0d76887920ffe7bbf SHA256 ad9eaf5779df75b9a0618a732eb227792e65db17c6713fe81ef5bff2bbc616a8
-DIST libarchive-2.0b10.tar.gz 952208 RMD160 1462e919195c51a737eecd94b8d60d69f800822c SHA1 76073cad93f3e3f015b1771833d0ad1aab18015e SHA256 2d933d126fe4b1bc284d59da18d34fca050a7de494746f6aac856022d9fe5dde
-DIST libarchive-2.0b9.tar.gz 951737 RMD160 0aebba3f780dd1fd44f071cc202c0082c49b8d04 SHA1 d1eefb505408623bbf4eaac404338782a9cfb82c SHA256 af6a23d536891429fe90e671889849b17a2298bc6565103c6aa374caa2ef02e4
+DIST libarchive-2.0b11.tar.gz 557357 RMD160 a32209cdf0fd6f68473927ce5ce28989e055eeac SHA1 2a73ddf0073635ac96445f8f9df0ccae4b06afd6 SHA256 fc475b995e9d0f0541bf5e77d1372eadfb9c83777a0788596b40af54a7b4f3e9
 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
 SHA256 f4975dbc3ea0ce23cee1c0a21b1f0017f58e65b946fe5959752908e3939ab2f3 bsdtar-1.3.1-r2.ebuild 1900
-EBUILD bsdtar-2.0_beta10.ebuild 1939 RMD160 8e9cb83790371dfa8b384ebc6b15bf4366f94eef SHA1 eb7fe30d250fbb674258214cec8ccdcec5aad215 SHA256 211ff36404b24a6bccd0d2939425d67bd439cfab0c8caedf98b9fe8fdee937ca
-MD5 caef8b806d7c5034aea52d7c9c83d0c4 bsdtar-2.0_beta10.ebuild 1939
-RMD160 8e9cb83790371dfa8b384ebc6b15bf4366f94eef bsdtar-2.0_beta10.ebuild 1939
-SHA256 211ff36404b24a6bccd0d2939425d67bd439cfab0c8caedf98b9fe8fdee937ca bsdtar-2.0_beta10.ebuild 1939
-EBUILD bsdtar-2.0_beta9.ebuild 1938 RMD160 09030351d779ec4c4d92aac2ba56a0d248d425a5 SHA1 3e4c218931e3202530fb1b04c40034839f1aef49 SHA256 1f01cef0a328a4809104df1615c88f94514357e9753dc37fa21e16fb057c35f8
-MD5 f1f2d5fccfce081d77bc0da429df8b94 bsdtar-2.0_beta9.ebuild 1938
-RMD160 09030351d779ec4c4d92aac2ba56a0d248d425a5 bsdtar-2.0_beta9.ebuild 1938
-SHA256 1f01cef0a328a4809104df1615c88f94514357e9753dc37fa21e16fb057c35f8 bsdtar-2.0_beta9.ebuild 1938
-MISC ChangeLog 8430 RMD160 1af8f4728a6b360adf8f7cba9d6e1018fc789af0 SHA1 701f2c004ae602c4100764c100bef8b799e96796 SHA256 cf5b90a9eaf5ee7a3a17b2313e37afd0e94a737f5b6fa2d5ffce2cb0b7b2005c
-MD5 449f2b172e856fdb47324a3df0bcc629 ChangeLog 8430
-RMD160 1af8f4728a6b360adf8f7cba9d6e1018fc789af0 ChangeLog 8430
-SHA256 cf5b90a9eaf5ee7a3a17b2313e37afd0e94a737f5b6fa2d5ffce2cb0b7b2005c ChangeLog 8430
+EBUILD bsdtar-2.0_beta11.ebuild 2257 RMD160 fa4d441c8c9ee65bfb696bbec337b6c0038f6cae SHA1 614555aaf02d4ac6fee73911167c67b63e49a010 SHA256 396cf3e60efde4d77d59d8e94952e04f18c80a0a0c44cbd30195ea90d4129a35
+MD5 e13fef39936ece8c4bb0249f6dd140bf bsdtar-2.0_beta11.ebuild 2257
+RMD160 fa4d441c8c9ee65bfb696bbec337b6c0038f6cae bsdtar-2.0_beta11.ebuild 2257
+SHA256 396cf3e60efde4d77d59d8e94952e04f18c80a0a0c44cbd30195ea90d4129a35 bsdtar-2.0_beta11.ebuild 2257
+MISC ChangeLog 8745 RMD160 f6be96fa630d7e3966df3fd657cafa95c60378f4 SHA1 07db1722e21ef83368df0a187de11d843340cde9 SHA256 1292f004bc34f87c59530378eeede0d1f4e2098d1f5d2e070c8b4cee01d31f14
+MD5 b82ffb7544f29970da826e565e1869b7 ChangeLog 8745
+RMD160 f6be96fa630d7e3966df3fd657cafa95c60378f4 ChangeLog 8745
+SHA256 1292f004bc34f87c59530378eeede0d1f4e2098d1f5d2e070c8b4cee01d31f14 ChangeLog 8745
 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b
 MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337
 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337
@@ -55,16 +54,13 @@ SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b metadata
 MD5 46c18ca117e44e7e3f070e41f466f72e files/digest-bsdtar-1.3.1-r2 250
 RMD160 5bacf3a8252a2b227bfe4e6edf52d55c4240f6a4 files/digest-bsdtar-1.3.1-r2 250
 SHA256 bbe48267a685e9836d773f76142f7f7a0bcc3f1a05262ed7fb3fb847a9fefd1e files/digest-bsdtar-1.3.1-r2 250
-MD5 436f2c75e551f9726d7bf3941da9f625 files/digest-bsdtar-2.0_beta10 253
-RMD160 9b900d1bb0f94d66ed8dd8a47d0abe52717b71b8 files/digest-bsdtar-2.0_beta10 253
-SHA256 4da42a4470487642559d64929f872fecdae66bc228c0c90164e210dd5655eedb files/digest-bsdtar-2.0_beta10 253
-MD5 3b2b08314cdae8549cab8ccbc1836d61 files/digest-bsdtar-2.0_beta9 250
-RMD160 31ba27f7563786feafb7cabd6d5c8bda51c2735b files/digest-bsdtar-2.0_beta9 250
-SHA256 01e37ffdbd1e97cddbb1924c0a67c933a4642d7deb3b662c096cf3eeb741b618 files/digest-bsdtar-2.0_beta9 250
+MD5 665310802742deee0c76b116bae78944 files/digest-bsdtar-2.0_beta11 253
+RMD160 5a5f0ec6328ac7a37215d80491447b39c4a5c9e0 files/digest-bsdtar-2.0_beta11 253
+SHA256 faaa1e985dfc91a163c5eb46b683384d0a96adb4bd321103335a13cf9398b802 files/digest-bsdtar-2.0_beta11 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFydw9AiZjviIA2XgRAjvCAKDmVcGKV+pAHyPLinuB8L0Qh0PSrACfaxfc
-VsZuL89J/EwSj5whxqD6cUk=
-=suuf
+iD8DBQFFz2w1AiZjviIA2XgRAoFPAJ0cUHusbnMnagLkU6+2zr7W/OzF3ACfS3+Q
+R5qEFftwmiIety/prWw0g+A=
+=d8hZ
 -----END PGP SIGNATURE-----

diff --git a/app-arch/bsdtar/bsdtar-2.0_beta10.ebuild b/app-arch/bsdtar/bsdtar-2.0_beta11.ebuild
similarity index 82%
rename from app-arch/bsdtar/bsdtar-2.0_beta10.ebuild
rename to app-arch/bsdtar/bsdtar-2.0_beta11.ebuild
index 33984a850498746ed7f30bcbd5f8818680913e0e..bac23581513ac7dc57562fba9daee2c3abfbeddf 100644 (file)
--- a/app-arch/bsdtar/bsdtar-2.0_beta10.ebuild
+++ b/app-arch/bsdtar/bsdtar-2.0_beta11.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_beta10.ebuild,v 1.1 2007/02/07 14:03:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-2.0_beta11.ebuild,v 1.1 2007/02/11 19:19:10 flameeyes 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"
+IUSE="build static acl xattr test"
 
 RDEPEND="!dev-libs/libarchive
        kernel_linux? (
@@ -24,6 +24,7 @@ RDEPEND="!dev-libs/libarchive
                app-arch/bzip2
                sys-libs/zlib ) )"
 DEPEND="${RDEPEND}
+       test? ( virtual/pmake )
        kernel_linux? ( sys-fs/e2fsprogs
                virtual/os-headers )"
 
@@ -36,6 +37,7 @@ src_unpack() {
        epatch "${FILESDIR}"/libarchive-1.3.1-static.patch
        epatch "${FILESDIR}"/libarchive-2.0b6-acl.patch
        epatch "${FILESDIR}"/libarchive-2.0b7-noacl.patch
+       epatch "${FILESDIR}"/libarchive-2.0b11-tests.patch
 
        eautoreconf
        epunt_cxx
@@ -62,6 +64,15 @@ 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/bsdtar-2.0_beta9.ebuild b/app-arch/bsdtar/bsdtar-2.0_beta9.ebuild
deleted file mode 100644 (file)
index eba921b..0000000
--- a/app-arch/bsdtar/bsdtar-2.0_beta9.ebuild
+++ /dev/null
@@ -1,83 +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/bsdtar/bsdtar-2.0_beta9.ebuild,v 1.2 2007/02/01 13:01:58 flameeyes 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.0b7-noacl.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_beta10 b/app-arch/bsdtar/files/digest-bsdtar-2.0_beta10
deleted file mode 100644 (file)
index 5ee2bc6..0000000
--- a/app-arch/bsdtar/files/digest-bsdtar-2.0_beta10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1dd7bebc4c1cae6281f09502fe9168bf libarchive-2.0b10.tar.gz 952208
-RMD160 1462e919195c51a737eecd94b8d60d69f800822c libarchive-2.0b10.tar.gz 952208
-SHA256 2d933d126fe4b1bc284d59da18d34fca050a7de494746f6aac856022d9fe5dde libarchive-2.0b10.tar.gz 952208

diff --git a/app-arch/bsdtar/files/digest-bsdtar-2.0_beta11 b/app-arch/bsdtar/files/digest-bsdtar-2.0_beta11
new file mode 100644 (file)
index 0000000..24c62de
--- /dev/null
+++ b/app-arch/bsdtar/files/digest-bsdtar-2.0_beta11
@@ -0,0 +1,3 @@
+MD5 e8a9ff3e8e4735217e2eb168fa6e9604 libarchive-2.0b11.tar.gz 557357
+RMD160 a32209cdf0fd6f68473927ce5ce28989e055eeac libarchive-2.0b11.tar.gz 557357
+SHA256 fc475b995e9d0f0541bf5e77d1372eadfb9c83777a0788596b40af54a7b4f3e9 libarchive-2.0b11.tar.gz 557357

diff --git a/app-arch/bsdtar/files/digest-bsdtar-2.0_beta9 b/app-arch/bsdtar/files/digest-bsdtar-2.0_beta9
deleted file mode 100644 (file)
index f2485b6..0000000
--- a/app-arch/bsdtar/files/digest-bsdtar-2.0_beta9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fae6ca3ffe8fccb0002c2e0e14163c88 libarchive-2.0b9.tar.gz 951737
-RMD160 0aebba3f780dd1fd44f071cc202c0082c49b8d04 libarchive-2.0b9.tar.gz 951737
-SHA256 af6a23d536891429fe90e671889849b17a2298bc6565103c6aa374caa2ef02e4 libarchive-2.0b9.tar.gz 951737

diff --git a/app-arch/bsdtar/files/libarchive-2.0b11-tests.patch b/app-arch/bsdtar/files/libarchive-2.0b11-tests.patch
new file mode 100644 (file)
index 0000000..c45b1d6
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-2.0b11-tests.patch
@@ -0,0 +1,12 @@
+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"
+