Version bump, with a few patches to make it compile.

Package-Manager: portage-2.1.2-r4

7 files changed, 227 insertions, 10 deletions

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index 0a4696832520..86ef59c456fd 100644
--- a/app-arch/bsdtar/ChangeLog
+++ b/app-arch/bsdtar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/bsdtar
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.44 2006/11/21 12:26:30 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.45 2007/01/28 12:47:40 flameeyes Exp $
+
+*bsdtar-2.0_beta7 (28 Jan 2007)
+
+  28 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libarchive-2.0b6-acl.patch, +files/libarchive-2.0b6-linux.patch,
+  +files/libarchive-2.0b7-noacl.patch, +bsdtar-2.0_beta7.ebuild:
+  Version bump, with a few patches to make it compile.
 
   21 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Give this back to bsd herd.
diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest
index 1e6f1dd064f0..8ebccb8d3d1b 100644
--- a/app-arch/bsdtar/Manifest
+++ b/app-arch/bsdtar/Manifest
@@ -17,15 +17,32 @@ 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.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
+AUX libarchive-2.0b6-linux.patch 710 RMD160 b23d9d0fe8ca1f3a6a1842b507472152cf34b1ca SHA1 7cf2092506b53779b29ed5990abf1a667b9461bf SHA256 efb8db2b46d3c62eeb659bfebd5fb118b2354719f6755b53d079046284860bc6
+MD5 ecaffc3ee813695ac1ee3f6aac05f943 files/libarchive-2.0b6-linux.patch 710
+RMD160 b23d9d0fe8ca1f3a6a1842b507472152cf34b1ca files/libarchive-2.0b6-linux.patch 710
+SHA256 efb8db2b46d3c62eeb659bfebd5fb118b2354719f6755b53d079046284860bc6 files/libarchive-2.0b6-linux.patch 710
+AUX libarchive-2.0b7-noacl.patch 430 RMD160 84889fde49d509b25f16e3aecc7dd5e1a51e2269 SHA1 0e86a3458d430cfa131877741513b6c0ecc6c49d SHA256 b21433e6d6c2b07776df2b8d2e313a05b1ecf6abbede21f68cc70d096ca0f42e
+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.0b7.tar.gz 949266 RMD160 60730a499c179ed6865d68002db417cda64b99d7 SHA1 eae9da8489400e6a3546536f70a1582c5e05ac58 SHA256 1d6335ddea4c23ac46fafcb9587b73000cccfec0982dbec14dde9f48934c96b4
 EBUILD bsdtar-1.3.1-r2.ebuild 1902 RMD160 71e20bec1780b142c5130030a65c2898529ac8d1 SHA1 833662fc6915bd847c5268d951b77300b368bd83 SHA256 03912f1d79fbc6b302dbdd9d8548d50c8835b26cc8e7129a1899494f48c1b560
 MD5 f7f610f0a82206de9ef5c49e8106de4d bsdtar-1.3.1-r2.ebuild 1902
 RMD160 71e20bec1780b142c5130030a65c2898529ac8d1 bsdtar-1.3.1-r2.ebuild 1902
 SHA256 03912f1d79fbc6b302dbdd9d8548d50c8835b26cc8e7129a1899494f48c1b560 bsdtar-1.3.1-r2.ebuild 1902
-MISC ChangeLog 7619 RMD160 ec5893f026e281fa85f1b7eef85c8da39806925a SHA1 ee48e4478ad2e2b14665c7348bc0d4eb3b08b2a9 SHA256 582b093700d5a0a51e2202a6f3e5b36c0b0ba140f22385eef64c1da83a8f253b
-MD5 c7afa6d7b1e0d1dacbea5171ede05cc6 ChangeLog 7619
-RMD160 ec5893f026e281fa85f1b7eef85c8da39806925a ChangeLog 7619
-SHA256 582b093700d5a0a51e2202a6f3e5b36c0b0ba140f22385eef64c1da83a8f253b ChangeLog 7619
+EBUILD bsdtar-2.0_beta7.ebuild 1994 RMD160 c7dfc31737ff37577c2a6906f3af152ea98ebf04 SHA1 4166f92489200a5434b0d0e89a3dd2eac76720d1 SHA256 da11ab297b4aa5c13b91dea6627d33d9cef93b42a3eea876abf1769de46a6515
+MD5 0f73f2b3805b4296f5097e1a54f86cf0 bsdtar-2.0_beta7.ebuild 1994
+RMD160 c7dfc31737ff37577c2a6906f3af152ea98ebf04 bsdtar-2.0_beta7.ebuild 1994
+SHA256 da11ab297b4aa5c13b91dea6627d33d9cef93b42a3eea876abf1769de46a6515 bsdtar-2.0_beta7.ebuild 1994
+MISC ChangeLog 7900 RMD160 6e2482f3c1689aea27893363b63edeac0e9d8a74 SHA1 fec598272f292b4b5c6d4086f14cba36bf90c283 SHA256 4583eabb6f4f9cfcebda7e7245518ff8dc133f25588fac54899b48d033b0cbff
+MD5 2778581da6032ffd00c5d949c729cd94 ChangeLog 7900
+RMD160 6e2482f3c1689aea27893363b63edeac0e9d8a74 ChangeLog 7900
+SHA256 4583eabb6f4f9cfcebda7e7245518ff8dc133f25588fac54899b48d033b0cbff ChangeLog 7900
 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b
 MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337
 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337
@@ -33,10 +50,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 866b3d5f3748debb71d05ea13c80c5d5 files/digest-bsdtar-2.0_beta7 250
+RMD160 5ffb5facba0577db7292aafc1ba206effa1798b4 files/digest-bsdtar-2.0_beta7 250
+SHA256 84a7f97d550a73c97b30531267811ec30e4cbbda7eb359d693ed4dd9a1e6831c files/digest-bsdtar-2.0_beta7 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFYvB9AiZjviIA2XgRAlTqAKDKFWFcQ+GoJZZcu721RPGRuuxfeQCfUhqL
-0ukgVcB3WE3DAnlQlbT78qY=
-=Ty7b
+iD8DBQFFvJt0AiZjviIA2XgRAu1sAKChvdL4/dSoG7SGkzLlDdoJaUZ1VQCfXVrF
+AUhQ/DLMSEcrxRIRUvwK0a0=
+=kdrF
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bsdtar/bsdtar-2.0_beta7.ebuild b/app-arch/bsdtar/bsdtar-2.0_beta7.ebuild
new file mode 100644
index 000000000000..bcc0f09475f9
--- /dev/null
+++ b/app-arch/bsdtar/bsdtar-2.0_beta7.ebuild
@@ -0,0 +1,84 @@
+# 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_beta7.ebuild,v 1.1 2007/01/28 12:47:40 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.0b6-linux.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.gz /usr/share/man/man1/tar.1.gz
+	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_beta7 b/app-arch/bsdtar/files/digest-bsdtar-2.0_beta7
new file mode 100644
index 000000000000..c5f20ba45979
--- /dev/null
+++ b/app-arch/bsdtar/files/digest-bsdtar-2.0_beta7
@@ -0,0 +1,3 @@
+MD5 ff077a2d187e4d3148108e12d63fd3de libarchive-2.0b7.tar.gz 949266
+RMD160 60730a499c179ed6865d68002db417cda64b99d7 libarchive-2.0b7.tar.gz 949266
+SHA256 1d6335ddea4c23ac46fafcb9587b73000cccfec0982dbec14dde9f48934c96b4 libarchive-2.0b7.tar.gz 949266
diff --git a/app-arch/bsdtar/files/libarchive-2.0b6-acl.patch b/app-arch/bsdtar/files/libarchive-2.0b6-acl.patch
new file mode 100644
index 000000000000..776243a6b372
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-2.0b6-acl.patch
@@ -0,0 +1,68 @@
+Index: libarchive-1.2.57/configure.ac
+===================================================================
+--- libarchive-1.2.57.orig/configure.ac
++++ libarchive-1.2.57/configure.ac
+@@ -55,7 +55,6 @@ AC_CHECK_TOOL([STRIP],[strip])
+ AC_HEADER_STDC
+ AC_HEADER_DIRENT
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS([attr/xattr.h])
+ AC_CHECK_HEADERS([bzlib.h errno.h ext2fs/ext2_fs.h fcntl.h  grp.h])
+ AC_CHECK_HEADERS([inttypes.h langinfo.h limits.h linux/ext2_fs.h])
+ # Include inttypes.h into archive.h only if appropriate.
+@@ -77,8 +76,6 @@ AC_ARG_ENABLE([static-bsdtar],
+ AM_CONDITIONAL([STATIC_BSDTAR], [test "x$enable_static_bsdtar" != "xno"])
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB(acl,acl_set_file)
+-AC_CHECK_LIB(attr,setxattr)
+ AC_CHECK_LIB(bz2,BZ2_bzDecompressInit)
+ AC_CHECK_LIB(z,inflate)
+ 
+@@ -142,9 +139,8 @@ AC_FUNC_STRERROR_R
+ AC_FUNC_STRFTIME
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS([chflags fchdir fchflags fchmod fchown futimes])
+-AC_CHECK_FUNCS([ftruncate getopt_long getxattr])
++AC_CHECK_FUNCS([ftruncate getopt_long])
+ AC_CHECK_FUNCS([lchflags lchmod lchown])
+-AC_CHECK_FUNCS([lgetxattr listxattr llistxattr fsetxattr lsetxattr])
+ AC_CHECK_FUNCS([lutimes memmove])
+ AC_CHECK_FUNCS([memset mkdir mkfifo nl_langinfo reallocf setlocale])
+ AC_CHECK_FUNCS([strchr strdup strerror strrchr timegm])
+@@ -182,6 +178,16 @@ AC_CHECK_MEMBER(struct dirent.d_namlen,,
+ #endif
+ ])
+ 
++# Check for Extended Attributes support
++AC_ARG_ENABLE([xattr],
++	AS_HELP_STRING([--disable-xattr], [Enable Extended Attributes support (default: check)]))
++
++if test "x$enable_xattr" != "xno"; then
++	AC_CHECK_HEADERS([attr/xattr.h])
++	AC_CHECK_LIB(attr,setxattr)
++	AC_CHECK_FUNCS([getxattr lgetxattr listxattr llistxattr fsetxattr lsetxattr])
++fi
++
+ # Check for ACL support
+ #
+ # The ACL support in libarchive is written against the POSIX1e draft,
+@@ -189,6 +195,10 @@ AC_CHECK_MEMBER(struct dirent.d_namlen,,
+ # platforms.  Worse, some systems have completely non-POSIX acl functions,
+ # which makes the following checks rather more complex than I would like.
+ #
++AC_ARG_ENABLE([acl],
++	AS_HELP_STRING([--disable-acl], [Enable ACL support (default: check)]))
++
++if test "x$enable_acl" != "xno"; then
+ AC_CHECK_HEADERS([sys/acl.h])
+ AC_CHECK_LIB([acl],[acl_get_file])
+ AC_CHECK_FUNCS([acl_create_entry acl_init acl_set_fd acl_set_fd_np acl_set_file])
+@@ -222,6 +232,7 @@ AC_CHECK_DECL([ACL_USER],
+ 		[AC_DEFINE(HAVE_ACL_USER, 1, [True for systems with POSIX ACL support])],
+ 		[],
+ 		[#include <sys/acl.h>])
++fi
+ 
+ # Additional requirements
+ AC_SYS_LARGEFILE
diff --git a/app-arch/bsdtar/files/libarchive-2.0b6-linux.patch b/app-arch/bsdtar/files/libarchive-2.0b6-linux.patch
new file mode 100644
index 000000000000..1882ec9e557e
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-2.0b6-linux.patch
@@ -0,0 +1,22 @@
+Index: libarchive-2.0b6/libarchive/archive_write_disk.c
+===================================================================
+--- libarchive-2.0b6.orig/libarchive/archive_write_disk.c
++++ libarchive-2.0b6/libarchive/archive_write_disk.c
+@@ -398,7 +398,7 @@ archive_write_disk_set_skip_file(struct 
+ 	return (ARCHIVE_OK);
+ }
+ 
+-static int
++static ssize_t
+ _archive_write_data_block(struct archive *_a,
+     const void *buff, size_t size, off_t offset)
+ {
+@@ -432,7 +432,7 @@ _archive_write_data_block(struct archive
+ 	return (ARCHIVE_OK);
+ }
+ 
+-static int
++static ssize_t
+ _archive_write_data(struct archive *_a, const void *buff, size_t size)
+ {
+ 	struct archive_write_disk *a = (struct archive_write_disk *)_a;
diff --git a/app-arch/bsdtar/files/libarchive-2.0b7-noacl.patch b/app-arch/bsdtar/files/libarchive-2.0b7-noacl.patch
new file mode 100644
index 000000000000..34a7d63aea38
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-2.0b7-noacl.patch
@@ -0,0 +1,13 @@
+Index: libarchive-2.0b7/libarchive/archive_write_disk.c
+===================================================================
+--- libarchive-2.0b7.orig/libarchive/archive_write_disk.c
++++ libarchive-2.0b7/libarchive/archive_write_disk.c
+@@ -1535,7 +1535,7 @@ set_fflags_platform(struct archive_write
+ static int
+ set_acls(struct archive_write_disk *a)
+ {
+-	(void)ad; /* UNUSED */
++	(void)a; /* UNUSED */
+ 	return (ARCHIVE_OK);
+ }
+