Version bump, the automagic patch has been merged upstream entirely. 903a has been skipped for test failure.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r5 x86_64

4 files changed, 20 insertions, 114 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 1d876211deed..9eeb0ac6044c 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.34 2008/12/07 05:57:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.35 2008/12/11 18:41:36 flameeyes Exp $
+
+*libarchive-2.5.904a (11 Dec 2008)
+
+  11 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/libarchive-2.5.902a-automagic.patch, -libarchive-2.5.902a.ebuild,
+  +libarchive-2.5.904a.ebuild:
+  Version bump, the automagic patch has been merged upstream entirely. 903a
+  has been skipped for test failure.
 
   07 Dec 2008; Mike Frysinger <vapier@gentoo.org> libarchive-2.5.5.ebuild,
   libarchive-2.5.902a.ebuild:
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index f9a1b30c351e..db6f87f05226 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,17 +1,16 @@
 -----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
+DIST libarchive-2.5.904a.tar.gz 948319 RMD160 97b0a76728e57f7b8c306c6f9b0025afb2a854b8 SHA1 e3a63c4df3387e3f22d40d1d8c6f541efdff9d61 SHA256 551297a6d299d0b091ce24aacea568c6a7f16c5f168e0fe46454eb9a3e917010
 EBUILD libarchive-2.5.5.ebuild 1660 RMD160 afcd0bafbc33195de851e6c3f47cf1803c241923 SHA1 16141baafad92b9de34f414325f6c8232992e098 SHA256 36bddebf7fa83c78d11263a64a21bfb93e7a46aeb9d0382dd98ae01e60493824
-EBUILD libarchive-2.5.902a.ebuild 1868 RMD160 98bde91331b545332abd3f26ea22ec6360775a25 SHA1 15785aaf9339b13dc0be250ba344324be801ff15 SHA256 9be080f50a577cb9f17374ac4efe1823c47c9ae7b8b8c46e41ad0e76bf17a9d3
-MISC ChangeLog 18527 RMD160 6ba722e7de64a1262653dc16886309ccc34fc56f SHA1 ef92420b04a266ee321514371880b26995c99ad7 SHA256 18da4ec895bcf7346c3ca053d45c2fd0a39c150bc5c1c1aba6768a4ec9bc95ea
+EBUILD libarchive-2.5.904a.ebuild 1840 RMD160 3cefa0f939988452b4d94b7c0983959225bdefae SHA1 a5548938e06d1e955c9abc4cee1c89d84364da1c SHA256 4626bc35927d451986150199d81ecd52543f8e4cb3f24883b2fa8517c1d9a333
+MISC ChangeLog 18842 RMD160 a131c61e7c258ef2c9cf72d920628b1761de6094 SHA1 1c45849827328822f14a3a1a83bc55ed07fe2d2b SHA256 375c52db7d569af48d747b6331a2bd4df975c64a87408216cfbe3310ec5bb6bf
 MISC metadata.xml 872 RMD160 895e9e13d46da8427f2695bc24aaefb16a5d8195 SHA1 e64e4be1a494de7e45305a7085b82b4b551c9c6f SHA256 c736f7829f1a1571706230bd5ec245389317faa2888300a1b74f440307f2c6e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk7ZbQACgkQ67wieSYcaxfF5ACdFz4xdXBbyE5veZDL963yh9Q3
-7l0AmwZuO9qDihzAh2fW7zw0SHPqFrm1
-=mDP8
+iEYEARECAAYFAklBXuYACgkQAiZjviIA2XgivQCdEeRbiZ5DeXwy/Ok3Ba0KAWvw
+Hw0An3D9bZpuwE4Wpq1BZccsFtK/Uiv/
+=LxBE
 -----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
deleted file mode 100644
index 8c802f3769cb..000000000000
--- a/app-arch/libarchive/files/libarchive-2.5.902a-automagic.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-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.904a.ebuild
index ced4e1da5bb1..9ed2c1e566f4 100644
--- a/app-arch/libarchive/libarchive-2.5.902a.ebuild
+++ b/app-arch/libarchive/libarchive-2.5.904a.ebuild
@@ -1,10 +1,10 @@
 # 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.2 2008/12/07 05:57:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.5.904a.ebuild,v 1.1 2008/12/11 18:41:36 flameeyes Exp $
 
 EAPI=1
 
-inherit eutils libtool toolchain-funcs autotools
+inherit eutils libtool toolchain-funcs
 
 DESCRIPTION="BSD tar command"
 HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive"
@@ -13,11 +13,11 @@ 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"
+IUSE="static acl xattr kernel_linux +bzip2 +lzma +zlib"
 
 COMPRESS_LIBS_DEPEND="lzma? ( app-arch/lzma-utils )
 		bzip2? ( app-arch/bzip2 )
-		sys-libs/zlib"
+		zlib? ( sys-libs/zlib )"
 
 RDEPEND="!dev-libs/libarchive
 	kernel_linux? (
@@ -34,10 +34,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-automagic.patch
-
-	eautoreconf
-
 	elibtoolize
 	epunt_cxx
 }
@@ -52,6 +48,7 @@ src_compile() {
 	econf --bindir=/bin \
 		--enable-bsdtar --enable-bsdcpio \
 		$(use_enable acl) $(use_enable xattr) \
+		$(use_with zlib) \
 		$(use_with bzip2 bz2lib) $(use_with lzma lzmadec) \
 		${myconf} \
 		--disable-dependency-tracking || die "econf failed."