Add the newest pre-release for libarchive, now supporting lzma. It comes with a patch that allows to disable lzma and bz2 libraries.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

5 files changed, 228 insertions, 9 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 881abf42d0cc..b0e371008cc7 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.32 2008/10/28 20:22:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.33 2008/11/13 01:38:48 flameeyes Exp $
+
+*libarchive-2.5.902a (13 Nov 2008)
+
+  13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libarchive-2.5.902a-automagic.patch, metadata.xml,
+  +libarchive-2.5.902a.ebuild:
+  Add the newest pre-release for libarchive, now supporting lzma. It comes
+  with a patch that allows to disable lzma and bz2 libraries.
 
   28 Oct 2008; Brent Baude <ranger@gentoo.org> libarchive-2.5.5.ebuild:
   Marking libarchive-2.5.5.ebuild ~ppc64 to support gnome stablizations
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 5f6845cebfee..591c7a19ea2b 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libarchive-2.5.902a-automagic.patch 3805 RMD160 0d5b2d85fb79dbe8b9f519a3b68cef98807a60b0 SHA1 b6b2a9bf9759d63d92c279eb01c6176d46a662fc SHA256 dd8a8b0c5a2aa56c7d149efc4e36831f697eedc518dbec5474d52501cefdb936
 DIST libarchive-2.5.5.tar.gz 865962 RMD160 f77601a9b066bbb0acc36962752e4e0fb2f9a393 SHA1 a98771df25f605b786faa36f6411cc81abb98236 SHA256 b566ffd57b6d39ea9614b03df29950064c92015d3324072b053a0bf43375a9a9
+DIST libarchive-2.5.902a.tar.gz 894619 RMD160 e56ac9e815efb39f866c074f34107e06a31f213f SHA1 e461297515e3746ac51d8e4ba558fe403b80d60b SHA256 3720bc52f2212653d8198d97ed04e37ba5286fe66a069a761bed35f8844fef1f
 EBUILD libarchive-2.5.5.ebuild 1774 RMD160 87e89d1e62ecb969ff6da09ae09d423ca33a0f0c SHA1 3b1c7ff7cf3846cb131184d6b743d1482a628993 SHA256 a112782021125d86c7a2e728ecb4899a7b2c1d117f08fbf32f3c3e07459fb70e
-MISC ChangeLog 18065 RMD160 61d47c9afef6d15e032b1316de9f3172e362b397 SHA1 6ecce46867f0c4049cc86a815ca66c7e33d9ae70 SHA256 214867825af0f6b1b9f243fb31a144488f80c9bfeb2083f286bc3733585cf194
-MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b
+EBUILD libarchive-2.5.902a.ebuild 1954 RMD160 626cdcef033a1428ac5b98e397746b8dc8ade93d SHA1 510274d19d85f3c4dd397c6c7a2bd9230113763a SHA256 3badf8060852759cbdef99c47f8277e269d8056b57466bf91fd058a01575926d
+MISC ChangeLog 18386 RMD160 cd7cd4b21808e8272f5f141242bcf5c1bda37708 SHA1 b5a7fc81bbcec99986e3f708ba8461757b9b8408 SHA256 9039dfe4efe3d76480a5bef2b7c05b51b34058ff3c717090ae35270adc1ff1ea
+MISC metadata.xml 872 RMD160 895e9e13d46da8427f2695bc24aaefb16a5d8195 SHA1 e64e4be1a494de7e45305a7085b82b4b551c9c6f SHA256 c736f7829f1a1571706230bd5ec245389317faa2888300a1b74f440307f2c6e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkbhS4ACgkQAiZjviIA2XgrSwCfTpwVLWBAEnUwOwdYfjrPSiXC
+wyUAoJ/9OvRQOI5JpN+qScvn4PZbkT4R
+=Mc6w
+-----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/files/libarchive-2.5.902a-automagic.patch b/app-arch/libarchive/files/libarchive-2.5.902a-automagic.patch
new file mode 100644
index 000000000000..8c802f3769cb
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-2.5.902a-automagic.patch
@@ -0,0 +1,98 @@
+Index: libarchive-2.5.902a/configure.ac
+===================================================================
+--- libarchive-2.5.902a.orig/configure.ac
++++ libarchive-2.5.902a/configure.ac
+@@ -162,17 +162,37 @@ AM_CONDITIONAL([STATIC_BSDCPIO], [ test 
+ AC_HEADER_STDC
+ AC_HEADER_DIRENT
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS([bzlib.h errno.h ext2fs/ext2_fs.h fcntl.h  grp.h])
++AC_CHECK_HEADERS([errno.h ext2fs/ext2_fs.h fcntl.h  grp.h])
+ AC_CHECK_HEADERS([inttypes.h langinfo.h limits.h linux/fs.h])
+-AC_CHECK_HEADERS([locale.h lzmadec.h paths.h poll.h pwd.h regex.h stdarg.h])
++AC_CHECK_HEADERS([locale.h paths.h poll.h pwd.h regex.h stdarg.h])
+ AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/acl.h sys/ioctl.h])
+ AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/select.h sys/time.h sys/utime.h])
+-AC_CHECK_HEADERS([time.h unistd.h utime.h wchar.h zlib.h])
++AC_CHECK_HEADERS([time.h unistd.h utime.h wchar.h])
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB(bz2,BZ2_bzDecompressInit)
+-AC_CHECK_LIB(z,inflate)
+-AC_CHECK_LIB(lzmadec,lzmadec_decode)
++AC_ARG_WITH([zlib],
++  AS_HELP_STRING([--without-zlib], [Don't build support for gzip through zlib]))
++
++if test "x$with_zlib" != "xno"; then
++  AC_CHECK_HEADERS([zlib.h])
++  AC_CHECK_LIB(z,inflate)
++fi
++
++AC_ARG_WITH([bz2lib],
++  AS_HELP_STRING([--without-bz2lib], [Don't build support for bzip2 through bz2lib]))
++
++if test "x$with_bz2lib" != "xno"; then
++  AC_CHECK_HEADERS([bzlib.h])
++  AC_CHECK_LIB(bz2,BZ2_bzDecompressInit)
++fi
++
++AC_ARG_WITH([lzmadec],
++  AS_HELP_STRING([--without-lzmadec], [Don't build support for lzma through lzmadec]))
++
++if test "x$with_lzmadec" != "xno"; then
++  AC_CHECK_HEADERS([lzmadec.h])
++  AC_CHECK_LIB(lzmadec,lzmadec_decode)
++fi
+ 
+ # TODO: Give the user the option of using a pre-existing system
+ # libarchive.  This will define HAVE_LIBARCHIVE which will cause
+Index: libarchive-2.5.902a/libarchive/archive_read_support_compression_bzip2.c
+===================================================================
+--- libarchive-2.5.902a.orig/libarchive/archive_read_support_compression_bzip2.c
++++ libarchive-2.5.902a/libarchive/archive_read_support_compression_bzip2.c
+@@ -171,7 +171,7 @@ bzip2_reader_bid(struct archive_reader *
+  * decompression.  We can, however, still detect compressed archives
+  * and emit a useful message.
+  */
+-static int
++static struct archive_read_source *
+ bzip2_reader_init(struct archive_read *a, struct archive_reader *reader,
+     struct archive_read_source *upstream, const void *buff, size_t n)
+ {
+@@ -183,7 +183,7 @@ bzip2_reader_init(struct archive_read *a
+ 
+ 	archive_set_error(&a->archive, -1,
+ 	    "This version of libarchive was compiled without bzip2 support");
+-	return (ARCHIVE_FATAL);
++	return (NULL);
+ }
+ 
+ 
+Index: libarchive-2.5.902a/libarchive/archive_read_support_compression_gzip.c
+===================================================================
+--- libarchive-2.5.902a.orig/libarchive/archive_read_support_compression_gzip.c
++++ libarchive-2.5.902a/libarchive/archive_read_support_compression_gzip.c
+@@ -163,17 +163,19 @@ gzip_reader_bid(struct archive_reader *s
+  * decompression.  We can, however, still detect compressed archives
+  * and emit a useful message.
+  */
+-static int
+-gzip_reader_init(struct archive_read *a, struct archive_read_source *upstream,
+-    const void *buff, size_t n)
++static struct archive_read_source *
++gzip_reader_init(struct archive_read *a, struct archive_reader *reader,
++    struct archive_read_source *upstream, const void *buff, size_t n)
+ {
+ 	(void)a;	/* UNUSED */
++	(void)reader;	/* UNUSED */
++	(void)upstream; /* UNUSED */
+ 	(void)buff;	/* UNUSED */
+ 	(void)n;	/* UNUSED */
+ 
+ 	archive_set_error(&a->archive, -1,
+ 	    "This version of libarchive was compiled without gzip support");
+-	return (ARCHIVE_FATAL);
++	return NULL;
+ }
+ 
+ #else
diff --git a/app-arch/libarchive/libarchive-2.5.902a.ebuild b/app-arch/libarchive/libarchive-2.5.902a.ebuild
new file mode 100644
index 000000000000..223e9737cb4d
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.5.902a.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.5.902a.ebuild,v 1.1 2008/11/13 01:38:48 flameeyes Exp $
+
+EAPI=1
+
+inherit eutils libtool toolchain-funcs autotools
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive"
+SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="static acl xattr kernel_linux +bzip2 +lzma"
+
+COMPRESS_LIBS_DEPEND="lzma? ( app-arch/lzma-utils )
+		bzip2? ( app-arch/bzip2 )
+		sys-libs/zlib"
+
+RDEPEND="!dev-libs/libarchive
+	kernel_linux? (
+		acl? ( sys-apps/acl )
+		xattr? ( sys-apps/attr )
+	)
+	!static? ( ${COMPRESS_LIBS_DEPEND} )"
+DEPEND="${RDEPEND}
+	${COMPRESS_LIBS_DEPEND}
+	kernel_linux? ( sys-fs/e2fsprogs
+		virtual/os-headers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-automagic.patch
+
+	eautoreconf
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf
+
+	if ! use static ; then
+		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+	fi
+
+	econf --bindir=/bin \
+		--enable-bsdtar --enable-bsdcpio \
+		$(use_enable acl) $(use_enable xattr) \
+		$(use_with bzip2 bz2lib) $(use_with lzma lzmadec) \
+		${myconf} \
+		--disable-dependency-tracking || die "econf failed."
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# Create tar symlink for FreeBSD
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		dosym bsdtar /bin/tar
+		dosym bsdtar.1 /usr/share/man/man1/tar.1
+		# We may wish to switch to symlink bsdcpio to cpio too one day
+	fi
+
+	dodoc NEWS README
+
+	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/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index 19248baa1230..1f7460becace 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
-<longdescription lang="en">
-The bsdtar program creates and manipulates streaming archive files.
-It has a number of advantages over previous tar implementations.
-</longdescription>
+  <herd>bsd</herd>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    The bsdtar program creates and manipulates streaming archive files.
+    It has a number of advantages over previous tar implementations.
+  </longdescription>
+  <use>
+    <flag name="static">
+      Build bsdtar and bsdcpio as static archives, removing
+      dependencies over the enabled compression libraries (lzmadec,
+      libbz2, zlib).
+    </flag>
+    <flag name="bzip2">
+      Allow accessing bzip2-compressed archives through libbz2 (which
+      comes with bzip2).
+    </flag>
+    <flag name="lzma">
+      Allow accessing lzma-compressed archives through the lzmadec
+      library.
+    </flag>
+  </use>
 </pkgmetadata>
-