Add patches to make acl and attr optional, plus link bsdtar non statically.

Package-Manager: portage-2.1_pre6-r5

6 files changed, 158 insertions, 23 deletions

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index 1e77869ad866..0dcd0ab90b1f 100644
--- a/app-arch/bsdtar/ChangeLog
+++ b/app-arch/bsdtar/ChangeLog
@@ -1,6 +1,14 @@
 # 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.21 2006/03/19 20:58:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.22 2006/03/21 20:05:45 flameeyes Exp $
+
+*bsdtar-1.2.51-r1 (21 Mar 2006)
+
+  21 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libarchive-1.2.51-acl.patch,
+  +files/libarchive-1.2.51-linking.patch, -bsdtar-1.2.51.ebuild,
+  +bsdtar-1.2.51-r1.ebuild:
+  Add patches to make acl and attr optional, plus link bsdtar non statically.
 
 *bsdtar-1.2.51 (19 Mar 2006)
 
diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest
index 38a9a5a75827..4ceb327161f2 100644
--- a/app-arch/bsdtar/Manifest
+++ b/app-arch/bsdtar/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a5c59744ce135bf630bc3863b7b16428 ChangeLog 4047
-RMD160 2d2eb13a6e0a57106b2d211944ba2a0c09fc2efc ChangeLog 4047
-SHA256 882f8a5fd2fcfa71733551a77feea956ac8fa8d316b60750d73d37cff8e579ba ChangeLog 4047
+MD5 b0de840850ca82b0ea43971d6c56da6b ChangeLog 4343
+RMD160 600c954966f617d40833a89362ee08dd8604f779 ChangeLog 4343
+SHA256 7562e2611888e268920daaafda9676dc9d18b21c0349a713a71ce82c8f432388 ChangeLog 4343
 MD5 48b22e51a819c59e46fc138c054cde24 bsdtar-1.02.027-r1.ebuild 1108
 RMD160 0373bfb85e38be5dce78b46fa79751310047aed1 bsdtar-1.02.027-r1.ebuild 1108
 SHA256 c440fc335e973e57a19a1b1b65950d7876dcdf82e3855a2590eb9d06cb348f84 bsdtar-1.02.027-r1.ebuild 1108
@@ -13,9 +13,9 @@ SHA256 9aabc54e4cef64fab90bb7ef403585a8bb8faafed2d8206cbf7292021d49afb3 bsdtar-1
 MD5 0674feb289a2b6348a47d3765a1fa7b0 bsdtar-1.2.38.ebuild 940
 RMD160 b9237fe19b06658d8b8785168104b27fd42012ac bsdtar-1.2.38.ebuild 940
 SHA256 ad62a7a29aa1cb1e77eaa6bae2cb4a859eb06689be10db8920cdc5207f0e2f11 bsdtar-1.2.38.ebuild 940
-MD5 3bc55f51ed49046902d1fbd6869eb108 bsdtar-1.2.51.ebuild 1251
-RMD160 7a384ac06d641f758fb115cba018594dc8a7f693 bsdtar-1.2.51.ebuild 1251
-SHA256 01b5d10ea6c5ced371417eeb5439b2b344c58cc1d8df88df83743030a690e8d2 bsdtar-1.2.51.ebuild 1251
+MD5 02a7208fc0c30f82bf21014aef7c398a bsdtar-1.2.51-r1.ebuild 1562
+RMD160 00bf772e088848c969b744f34ad45a065a3e1c6a bsdtar-1.2.51-r1.ebuild 1562
+SHA256 64f73684ef82a7e4383a504019a153c5a091fdfb64acb516d54bcf24951fbb3e bsdtar-1.2.51-r1.ebuild 1562
 MD5 23a5ba81fd708274f460d74e61f6f10d files/bsdtar-1.02.027-osx.patch 475
 RMD160 5bfe5047f3e629dbadd0de7221aa85e06499af91 files/bsdtar-1.02.027-osx.patch 475
 SHA256 4ae8a76c18ee03bc2d383fc3d7a1d7e2af663cfbf5cf2c37b95fdef5488d91d1 files/bsdtar-1.02.027-osx.patch 475
@@ -28,16 +28,22 @@ SHA256 7293c4e47058bd4210da83146e4fbe595de154d07735b5ecb83be72fb2a33596 files/di
 MD5 1e77db6ad616cb2ad955f980adc8561e files/digest-bsdtar-1.2.38 241
 RMD160 9eef3ea92f37a206592cbd646ad675bc3f4d3945 files/digest-bsdtar-1.2.38 241
 SHA256 f53c4c793b1304dde232ab7cd20ce743f97e9d8f17f18dfdd9831f2ccb0e76cc files/digest-bsdtar-1.2.38 241
-MD5 dd471ad345c6243177cd28242dad6101 files/digest-bsdtar-1.2.51 253
-RMD160 848783c97e22104341c65db199782082a2d5ad0d files/digest-bsdtar-1.2.51 253
-SHA256 fd7251ab8a6dafd78fc18d19e80981acb7bd169c5c23dbc160cf1d172c0da98f files/digest-bsdtar-1.2.51 253
+MD5 dd471ad345c6243177cd28242dad6101 files/digest-bsdtar-1.2.51-r1 253
+RMD160 848783c97e22104341c65db199782082a2d5ad0d files/digest-bsdtar-1.2.51-r1 253
+SHA256 fd7251ab8a6dafd78fc18d19e80981acb7bd169c5c23dbc160cf1d172c0da98f files/digest-bsdtar-1.2.51-r1 253
+MD5 1728ebab5ae7315f1ca463ab5448474c files/libarchive-1.2.51-acl.patch 2740
+RMD160 307439bd45948f57c68aaa581ee2728ba9582b2a files/libarchive-1.2.51-acl.patch 2740
+SHA256 9953e4ecfd7c905920a48ae66d35bf901f8ba89765a8b51c51065c1c01a15ec2 files/libarchive-1.2.51-acl.patch 2740
+MD5 70231828a2a2269c2f912708d80226ed files/libarchive-1.2.51-linking.patch 1234
+RMD160 ace6aed10691c0cf240bc2f76f8182ffcbb5a3be files/libarchive-1.2.51-linking.patch 1234
+SHA256 88095bb5782102108f3048d900b23fe7746ae5fb881b268463bdbcf3512964a7 files/libarchive-1.2.51-linking.patch 1234
 MD5 afec809b169074e5d5b0803e4f8f5ec8 metadata.xml 428
 RMD160 b1ff6b3d84ad489dc4f5ab5f1d9ee9b60266c2ff metadata.xml 428
 SHA256 236fee13551e3785be53bd3f70c0784803827edf245c913851f239689e3278f4 metadata.xml 428
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEHcYaAiZjviIA2XgRAiQgAKDtnmYbOtE4vbekoMgigQgm4LHXhgCeJmaq
-5Cq06RdS4TCUyJaVAKpNbPo=
-=YT9b
+iD8DBQFEIFxNAiZjviIA2XgRAg/3AKDEAh/ERhHKz3HQ8JpopwOdtmlyGQCgzP0y
+NuYHYCSIDgivp5z+G+0qGCE=
+=+Ma3
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bsdtar/bsdtar-1.2.51.ebuild b/app-arch/bsdtar/bsdtar-1.2.51-r1.ebuild
index d8a5305e91f7..f6767e00f956 100644
--- a/app-arch/bsdtar/bsdtar-1.2.51.ebuild
+++ b/app-arch/bsdtar/bsdtar-1.2.51-r1.ebuild
@@ -1,38 +1,54 @@
 # 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.51.ebuild,v 1.1 2006/03/19 20:58:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-1.2.51-r1.ebuild,v 1.1 2006/03/21 20:05:45 flameeyes Exp $
 
-inherit eutils flag-o-matic libtool
+inherit eutils autotools
+
+MY_P="libarchive-${PV}"
 
 DESCRIPTION="BSD tar command"
 HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive/"
-SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/libarchive-${PV}.tar.gz"
+SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc-macos ~x86"
-IUSE="build static"
+IUSE="build static acl xattr"
 
-RDEPEND="!dev-libs/libarchive"
+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}/libarchive-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	elibtoolize
+	epatch "${FILESDIR}/${MY_P}-linking.patch"
+	epatch "${FILESDIR}/${MY_P}-acl.patch"
+
+	eautoreconf
 	epunt_cxx
 }
 
 src_compile() {
-	if ! use userland_Darwin; then
-		( use static || use build ) && append-ldflags -static
+	local myconf
+
+	if ! use userland_Darwin && ( use static || use build ); then
+		myconf="${myconf} --enable-static-bsdtar"
+	else
+		myconf="${myconf} --disable-static-bsdtar"
 	fi
 
-	econf --bindir=/bin || die "econf failed"
+	econf --bindir=/bin \
+		$(use_enable acl) \
+		$(use_enable xattr) \
+		${myconf} || die "econf failed"
 	emake || die "emake failed"
 }
 
diff --git a/app-arch/bsdtar/files/digest-bsdtar-1.2.51 b/app-arch/bsdtar/files/digest-bsdtar-1.2.51-r1
index 9c7e52918e29..9c7e52918e29 100644
--- a/app-arch/bsdtar/files/digest-bsdtar-1.2.51
+++ b/app-arch/bsdtar/files/digest-bsdtar-1.2.51-r1
diff --git a/app-arch/bsdtar/files/libarchive-1.2.51-acl.patch b/app-arch/bsdtar/files/libarchive-1.2.51-acl.patch
new file mode 100644
index 000000000000..1c4ace1eadfa
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-1.2.51-acl.patch
@@ -0,0 +1,73 @@
+Index: libarchive-1.2.51/configure.ac
+===================================================================
+--- libarchive-1.2.51.orig/configure.ac
++++ libarchive-1.2.51/configure.ac
+@@ -55,11 +55,10 @@ 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])
+ AC_CHECK_HEADERS([locale.h paths.h])
+-AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/acl.h sys/ioctl.h])
++AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/ioctl.h])
+ AC_CHECK_HEADERS([sys/param.h sys/time.h unistd.h wchar.h zlib.h])
+ 
+ AC_ARG_ENABLE([static-bsdtar],
+@@ -68,8 +67,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)
+ 
+@@ -133,9 +130,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])
+@@ -173,6 +169,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,
+@@ -180,6 +186,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])
+@@ -213,6 +223,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-1.2.51-linking.patch b/app-arch/bsdtar/files/libarchive-1.2.51-linking.patch
new file mode 100644
index 000000000000..b23862351c3a
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-1.2.51-linking.patch
@@ -0,0 +1,32 @@
+Index: libarchive-1.2.51/configure.ac
+===================================================================
+--- libarchive-1.2.51.orig/configure.ac
++++ libarchive-1.2.51/configure.ac
+@@ -62,6 +62,11 @@ AC_CHECK_HEADERS([locale.h paths.h])
+ AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/acl.h sys/ioctl.h])
+ AC_CHECK_HEADERS([sys/param.h sys/time.h unistd.h wchar.h zlib.h])
+ 
++AC_ARG_ENABLE([static-bsdtar],
++	AS_HELP_STRING([--disable-static-bsdtar], [Makes bsdtar link dynamically to libarchive (default: static)]) )
++
++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)
+Index: libarchive-1.2.51/Makefile.am
+===================================================================
+--- libarchive-1.2.51.orig/Makefile.am
++++ libarchive-1.2.51/Makefile.am
+@@ -110,8 +110,10 @@ bsdtar_DEPENDENCIES = libarchive.la		\
+ 		libarchive/archive_entry.h	\
+ 		libarchive/archive.h
+ 
+-bsdtar_LDADD= -larchive -lbz2 -lz
++bsdtar_LDADD= libarchive.la
+ bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive
++if STATIC_BSDTAR
+ # Link libarchive statically...
+ bsdtar_LDFLAGS= -static -I$(destdir)/libarchive
++endif
+ bsdtar_dist_man_MANS=	tar/bsdtar.1