Updated to latest upstream version, dropped wchar patch as new libarchive fixes it definitively (changed dependency to avoid problems; also now just RDEPEND on it if not built static, and not on zlib/bzip2 as they are dependencies of libarchive itself).

(Portage version: 2.0.51.22)

6 files changed, 16 insertions, 97 deletions

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index 806f4d4272cf..c87a81461a1f 100644
--- a/app-arch/bsdtar/ChangeLog
+++ b/app-arch/bsdtar/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-arch/bsdtar
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.10 2005/09/06 08:44:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.11 2005/09/07 09:34:27 flameeyes Exp $
+
+*bsdtar-1.02.032 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/bsdtar-1.02.031-wchar.patch, -bsdtar-1.02.031.ebuild,
+  +bsdtar-1.02.032.ebuild:
+  Updated to latest upstream version, dropped wchar patch as new libarchive
+  fixes it definitively (changed dependency to avoid problems; also now just
+  RDEPEND on it if not built static, and not on zlib/bzip2 as they are
+  dependencies of libarchive itself).
 
 *bsdtar-1.02.031 (06 Sep 2005)
 
diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest
index c9a1eaf05b23..837f41f29fff 100644
--- a/app-arch/bsdtar/Manifest
+++ b/app-arch/bsdtar/Manifest
@@ -1,20 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1305c3eeea0332d6b65566a0621d5a7c bsdtar-1.02.027-r1.ebuild 1112
 MD5 b0befd4fa4fa59f09d76dea93a0f7a16 ChangeLog 1907
-MD5 7717dba1c2a051f4655c23347471acce bsdtar-1.02.031.ebuild 1150
+MD5 7717dba1c2a051f4655c23347471acce bsdtar-1.02.032.ebuild 1150
 MD5 237fafd1cf6bf6b5047443e93f74007c bsdtar-1.02.030.ebuild 1120
 MD5 afec809b169074e5d5b0803e4f8f5ec8 metadata.xml 428
 MD5 23a5ba81fd708274f460d74e61f6f10d files/bsdtar-1.02.027-osx.patch 475
-MD5 fcf87dfc943292314d8eb1287c40bd90 files/bsdtar-1.02.031-wchar.patch 2376
 MD5 7cf5fd7cad3a8974a71ce2e1622824c5 files/digest-bsdtar-1.02.027-r1 67
 MD5 2a8e4734601d558f6ce4f0df1a3a7033 files/digest-bsdtar-1.02.030 67
-MD5 d02bfada963e54e1598f87a597222f0b files/digest-bsdtar-1.02.031 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDHVcQj5H05b2HAEkRAlRlAKCS3FGez7hYb+sKx0NWwH7+G59mcACfeJMm
-Y6PCLJNJ1fSJqOU79sQwT0w=
-=XhYg
------END PGP SIGNATURE-----
+MD5 35914705dd381a1733c515e505978ceb files/digest-bsdtar-1.02.032 67
diff --git a/app-arch/bsdtar/bsdtar-1.02.031.ebuild b/app-arch/bsdtar/bsdtar-1.02.032.ebuild
index 81fff9873e4e..2fdca94cd912 100644
--- a/app-arch/bsdtar/bsdtar-1.02.031.ebuild
+++ b/app-arch/bsdtar/bsdtar-1.02.032.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-1.02.031.ebuild,v 1.1 2005/09/06 08:44:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-1.02.032.ebuild,v 1.1 2005/09/07 09:34:27 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,20 +13,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
 IUSE="build static"
 
-# This is told to be used ( !elibc_glibc? ( dev-libs/libgnugetopt ) ) but isn't
-# linked at all
-RDEPEND="app-arch/bzip2
-	sys-libs/zlib"
-
-DEPEND="dev-libs/libarchive
-	${RDEPEND}"
+RDEPEND="!static? ( >=dev-libs/libarchive-1.02.032 )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
 	epatch ${FILESDIR}/${PN}-1.02.027-osx.patch
-	epatch ${FILESDIR}/${P}-wchar.patch
 }
 
 src_compile() {
diff --git a/app-arch/bsdtar/files/bsdtar-1.02.031-wchar.patch b/app-arch/bsdtar/files/bsdtar-1.02.031-wchar.patch
deleted file mode 100644
index 5dd560137a52..000000000000
--- a/app-arch/bsdtar/files/bsdtar-1.02.031-wchar.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: bsdtar-1.02.031/bsdtar.c
-===================================================================
---- bsdtar-1.02.031.orig/bsdtar.c
-+++ bsdtar-1.02.031/bsdtar.c
-@@ -27,6 +27,10 @@
- #include "bsdtar_platform.h"
- __FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.64 2005/08/02 03:02:55 kientzle Exp $");
- 
-+#if HAVE_WCHAR_H
-+#include <wchar.h>
-+#endif
-+
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <archive.h>
-Index: bsdtar-1.02.031/configure.ac
-===================================================================
---- bsdtar-1.02.031.orig/configure.ac
-+++ bsdtar-1.02.031/configure.ac
-@@ -13,7 +13,7 @@ AC_PROG_YACC
- # Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
--AC_CHECK_HEADERS([bzlib.h fcntl.h inttypes.h langinfo.h limits.h locale.h paths.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h zlib.h])
-+AC_CHECK_HEADERS([bzlib.h fcntl.h inttypes.h langinfo.h limits.h locale.h paths.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h wchar.h zlib.h])
- 
- # Checks for libraries.
- AC_CHECK_LIB([z], [inflate])
-Index: bsdtar-1.02.031/read.c
-===================================================================
---- bsdtar-1.02.031.orig/read.c
-+++ bsdtar-1.02.031/read.c
-@@ -27,6 +27,10 @@
- #include "bsdtar_platform.h"
- __FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.23 2005/04/17 17:20:54 kientzle Exp $");
- 
-+#if HAVE_WCHAR_H
-+#include <wchar.h>
-+#endif
-+
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-Index: bsdtar-1.02.031/util.c
-===================================================================
---- bsdtar-1.02.031.orig/util.c
-+++ bsdtar-1.02.031/util.c
-@@ -27,6 +27,10 @@
- #include "bsdtar_platform.h"
- __FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.13 2005/04/17 19:46:50 kientzle Exp $");
- 
-+#ifdef HAVE_WCHAR_H
-+#include <wchar.h>
-+#endif
-+
- #include <sys/stat.h>
- #include <sys/types.h>  /* Linux doesn't define mode_t, etc. in sys/stat.h. */
- #include <archive_entry.h>
-Index: bsdtar-1.02.031/write.c
-===================================================================
---- bsdtar-1.02.031.orig/write.c
-+++ bsdtar-1.02.031/write.c
-@@ -27,6 +27,10 @@
- #include "bsdtar_platform.h"
- __FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.41 2005/05/08 06:25:15 kientzle Exp $");
- 
-+#ifdef HAVE_WCHAR_H
-+#include <wchar.h>
-+#endif
-+
- #include <sys/stat.h>
- #include <sys/types.h>
- #ifdef HAVE_POSIX_ACL
diff --git a/app-arch/bsdtar/files/digest-bsdtar-1.02.031 b/app-arch/bsdtar/files/digest-bsdtar-1.02.031
deleted file mode 100644
index ffa4847cf43f..000000000000
--- a/app-arch/bsdtar/files/digest-bsdtar-1.02.031
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4926a14f489e45fef75cf90d517f82ed bsdtar-1.02.031.tar.gz 133433
diff --git a/app-arch/bsdtar/files/digest-bsdtar-1.02.032 b/app-arch/bsdtar/files/digest-bsdtar-1.02.032
new file mode 100644
index 000000000000..ca1b426fd8ed
--- /dev/null
+++ b/app-arch/bsdtar/files/digest-bsdtar-1.02.032
@@ -0,0 +1 @@
+MD5 8c793d2af064fc46b397fbfc74db9c40 bsdtar-1.02.032.tar.gz 133434