Version bump with a new patch.

(Portage version: 2.1.1_rc1-r2)

4 files changed, 149 insertions, 1 deletions

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index dfe3f4c874d6..97ff626646b4 100644
--- a/app-arch/bsdtar/ChangeLog
+++ b/app-arch/bsdtar/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2006/07/31 11:19:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.33 2006/09/02 20:56:41 flameeyes Exp $
+
+*bsdtar-1.2.57 (02 Sep 2006)
+
+  02 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libarchive-1.2.57-acl.patch, +bsdtar-1.2.57.ebuild:
+  Version bump with a new patch.
 
   31 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   bsdtar-1.2.53-r1.ebuild:
diff --git a/app-arch/bsdtar/bsdtar-1.2.57.ebuild b/app-arch/bsdtar/bsdtar-1.2.57.ebuild
new file mode 100644
index 000000000000..8f5fe986065a
--- /dev/null
+++ b/app-arch/bsdtar/bsdtar-1.2.57.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-1.2.57.ebuild,v 1.1 2006/09/02 20:56:41 flameeyes Exp $
+
+inherit eutils autotools toolchain-funcs
+
+MY_P="libarchive-${PV}"
+
+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 ~ppc-macos ~x86 ~x86-fbsd"
+IUSE="build static acl xattr"
+
+RDEPEND="!dev-libs/libarchive
+	kernel_linux? (
+		acl? ( sys-apps/acl )
+		xattr? ( sys-apps/attr )
+	)"
+DEPEND="kernel_linux? ( sys-fs/e2fsprogs
+	virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/libarchive-1.2.51-linking.patch
+	epatch "${FILESDIR}"/libarchive-1.2.57-acl.patch
+	epatch "${FILESDIR}"/libarchive-1.2.53-strict-aliasing.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
+
+	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 [[ ${CHOST} != *-darwin* ]]; then
+		dodir /$(get_libdir)
+		mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+		gen_usr_ldscript libarchive.so
+	fi
+}
diff --git a/app-arch/bsdtar/files/digest-bsdtar-1.2.57 b/app-arch/bsdtar/files/digest-bsdtar-1.2.57
new file mode 100644
index 000000000000..ddf66c8c0084
--- /dev/null
+++ b/app-arch/bsdtar/files/digest-bsdtar-1.2.57
@@ -0,0 +1,3 @@
+MD5 f9934a6a78c7050fd32bd3b185424e50 libarchive-1.2.57.tar.gz 536128
+RMD160 238a44ec554aa4fc5ae795c1af3640d253f36445 libarchive-1.2.57.tar.gz 536128
+SHA256 96b7db97df7e889f0ee2637b6986e94a2136ebac7d48f605dcec1165374746c6 libarchive-1.2.57.tar.gz 536128
diff --git a/app-arch/bsdtar/files/libarchive-1.2.57-acl.patch b/app-arch/bsdtar/files/libarchive-1.2.57-acl.patch
new file mode 100644
index 000000000000..6df561418ba4
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-1.2.57-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])
+ 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