From 99b8f716001db0f8a6840ea3c63c48e6f9d344e0 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Mon, 26 Feb 2007 14:34:32 +0000 Subject: [PATCH] Version bump (taken from Flameeyes overlay) Package-Manager: portage-2.1.2-r11 --- app-arch/bsdtar/ChangeLog | 10 ++++- app-arch/bsdtar/Manifest | 40 +++++++++---------- ...beta12.ebuild => bsdtar-2.0_beta13.ebuild} | 16 ++------ .../bsdtar/files/digest-bsdtar-2.0_beta12 | 3 -- .../bsdtar/files/digest-bsdtar-2.0_beta13 | 3 ++ .../files/libarchive-2.0b11-tests.patch | 28 ------------- .../files/libarchive-2.0b12-tests.patch | 32 +++++++++++++++ 7 files changed, 67 insertions(+), 65 deletions(-) rename app-arch/bsdtar/{bsdtar-2.0_beta12.ebuild => bsdtar-2.0_beta13.ebuild} (81%) delete mode 100644 app-arch/bsdtar/files/digest-bsdtar-2.0_beta12 create mode 100644 app-arch/bsdtar/files/digest-bsdtar-2.0_beta13 delete mode 100644 app-arch/bsdtar/files/libarchive-2.0b11-tests.patch create mode 100644 app-arch/bsdtar/files/libarchive-2.0b12-tests.patch 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 + -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/Manifest b/app-arch/bsdtar/Manifest index 2343994ee51d..6d40892f890d 100644 --- a/app-arch/bsdtar/Manifest +++ b/app-arch/bsdtar/Manifest @@ -17,28 +17,28 @@ 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 964 RMD160 2982e366e8385bacad90eafa058da7c1227b6e56 SHA1 d396c990cab895d425a43d4e7ea7f4054aeb5aba SHA256 f39dc841f1c028cb523aca6a0222c8f53fc36f6b07a9049415ee0cfdb56664c3 -MD5 e7d13e700bdd88a76cbc5974b4dfe87d files/libarchive-2.0b11-tests.patch 964 -RMD160 2982e366e8385bacad90eafa058da7c1227b6e56 files/libarchive-2.0b11-tests.patch 964 -SHA256 f39dc841f1c028cb523aca6a0222c8f53fc36f6b07a9049415ee0cfdb56664c3 files/libarchive-2.0b11-tests.patch 964 +AUX libarchive-2.0b12-tests.patch 1232 RMD160 94dd1262799403cb19c3e76091a7eecc910d6c87 SHA1 0532a242f92ecf1fa68af5efa894b2860cf1f44f SHA256 1ac7a833c5ee1136ca1daef518ffcd8a4e483f1ec8fd80f3f6bba7d4058e026a +MD5 2a2df200c10cb88507c4530cc269a3a2 files/libarchive-2.0b12-tests.patch 1232 +RMD160 94dd1262799403cb19c3e76091a7eecc910d6c87 files/libarchive-2.0b12-tests.patch 1232 +SHA256 1ac7a833c5ee1136ca1daef518ffcd8a4e483f1ec8fd80f3f6bba7d4058e026a files/libarchive-2.0b12-tests.patch 1232 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.0b12.tar.gz 565902 RMD160 0eaf77a01f33f9d522c44bc1089c4bc737fa87bb SHA1 2f8b983b7686ecd40b5dc26054dc605248363f97 SHA256 89b1d527a359fb221c2ad5dcac206e9e233de30bd0e757d9899ee66bdd3fc419 +DIST libarchive-2.0b13.tar.gz 566970 RMD160 4a9a522b924347db1c157a08a6c88d4b7a7deb6a SHA1 ba4c8078fe00d1f9a819bcbe293571264abbbfad SHA256 135cd65e91964faf491915618a3084655954aaab123eb5d6c485d3a62b3acfb2 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_beta12.ebuild 2204 RMD160 da6288f5fd1ea1cd43d3bdafc95cc523a1eaa6eb SHA1 1b8d8d7c81e4c4321fa95b8663263640db500e89 SHA256 a9d1705df4557b92c92d27a8e9f82a954357b6fb8c89277ab1db71e9877b5324 -MD5 5464deebe1e1652afded1e7ba3f5eb28 bsdtar-2.0_beta12.ebuild 2204 -RMD160 da6288f5fd1ea1cd43d3bdafc95cc523a1eaa6eb bsdtar-2.0_beta12.ebuild 2204 -SHA256 a9d1705df4557b92c92d27a8e9f82a954357b6fb8c89277ab1db71e9877b5324 bsdtar-2.0_beta12.ebuild 2204 -MISC ChangeLog 9219 RMD160 a503257b75a75e3300bbfb8de58d04c9226128eb SHA1 451bc64af6129e3d16a05e3583beecae8365f428 SHA256 92e61dabb6929a20f2c5e572dd309a6a9615ac635d6b260d08da8ca38fffb1c2 -MD5 2c896359903ca183709f67e926b62673 ChangeLog 9219 -RMD160 a503257b75a75e3300bbfb8de58d04c9226128eb ChangeLog 9219 -SHA256 92e61dabb6929a20f2c5e572dd309a6a9615ac635d6b260d08da8ca38fffb1c2 ChangeLog 9219 +EBUILD bsdtar-2.0_beta13.ebuild 1937 RMD160 62dba985e7751329c4030cef7957ba0a422522f3 SHA1 4f846989e1ee697610f54a9742c9634c377412ec SHA256 5bd62843dc29ec2842bad3610e2e50e4e28a429024b53f1bcf8ad45020af5036 +MD5 faa631b925ea83ddb25ee0e76e6e20c1 bsdtar-2.0_beta13.ebuild 1937 +RMD160 62dba985e7751329c4030cef7957ba0a422522f3 bsdtar-2.0_beta13.ebuild 1937 +SHA256 5bd62843dc29ec2842bad3610e2e50e4e28a429024b53f1bcf8ad45020af5036 bsdtar-2.0_beta13.ebuild 1937 +MISC ChangeLog 9488 RMD160 1d5fefe0a4459a9e2259d33d772bb283b642964d SHA1 29c43ffb78fbe415a30a0a158ccf9ef7c03460f3 SHA256 a58683e6f216928f9c0eb1e73aabd586bd4899e39047c45ad88cd91ffba20294 +MD5 539ccff95ded71111f19b8022da14c95 ChangeLog 9488 +RMD160 1d5fefe0a4459a9e2259d33d772bb283b642964d ChangeLog 9488 +SHA256 a58683e6f216928f9c0eb1e73aabd586bd4899e39047c45ad88cd91ffba20294 ChangeLog 9488 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337 @@ -46,13 +46,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 6e25c8dcada3c11b8acc5223ab788ac4 files/digest-bsdtar-2.0_beta12 253 -RMD160 2746988e35eb264c3370035985956bc00f4e3db1 files/digest-bsdtar-2.0_beta12 253 -SHA256 44d9a245bbd140546e0bc6c6a10e00413e92ac35af6f01409a0631c4db93a827 files/digest-bsdtar-2.0_beta12 253 +MD5 7da12b7bf81a6f6e9844c574772b7d71 files/digest-bsdtar-2.0_beta13 253 +RMD160 93378ca38dd88ce860f547eedd9797f91ac93ea0 files/digest-bsdtar-2.0_beta13 253 +SHA256 676c697e1eca66d08e1f58b964a35e4c013c77ec08af8802874c4ce77d0e9e37 files/digest-bsdtar-2.0_beta13 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF4eJWGDyatLGpTbYRAn2cAJ9YHK9VEOkdjBHyDNOWoDV7+wTFeACeO+6W -IRptht/hNn4p03nRgjiKj/g= -=/8or +iD8DBQFF4u/+GDyatLGpTbYRAllmAKCAXKFzJJRkpS2NIgL9gausvhE6cwCeNjBz +RRdQxo0lrAcjCivFC4ipKTs= +=PAa+ -----END PGP SIGNATURE----- diff --git a/app-arch/bsdtar/bsdtar-2.0_beta12.ebuild b/app-arch/bsdtar/bsdtar-2.0_beta13.ebuild similarity index 81% rename from app-arch/bsdtar/bsdtar-2.0_beta12.ebuild rename to 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 -+#include - - #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)); + -- 2.26.2