Version bump, fixed static patch

Package-Manager: portage-2.1.2.3

5 files changed, 147 insertions, 8 deletions

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index 058a20cd6971..41e0cbc09520 100644
--- a/app-arch/bsdtar/ChangeLog
+++ b/app-arch/bsdtar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/bsdtar
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.63 2007/04/17 20:32:15 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.64 2007/04/26 20:59:09 drizzt Exp $
+
+*bsdtar-2.1.9 (26 Apr 2007)
+
+  26 Apr 2007; Timothy Redaelli <drizzt@gentoo.org>
+  +files/libarchive-2.1.9-static.patch, +bsdtar-2.1.9.ebuild:
+  Version bump, fixed static patch
 
 *bsdtar-2.1.5 (17 Apr 2007)
 
diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest
index 60f1f5b4e2d6..22b75f92324f 100644
--- a/app-arch/bsdtar/Manifest
+++ b/app-arch/bsdtar/Manifest
@@ -25,6 +25,10 @@ AUX libarchive-2.1.5-acl.patch 2310 RMD160 829e44e2375f35a2f721bc66c98d01bf74d70
 MD5 80edcf63f106b0c2cf976ac28ba184b1 files/libarchive-2.1.5-acl.patch 2310
 RMD160 829e44e2375f35a2f721bc66c98d01bf74d701c8 files/libarchive-2.1.5-acl.patch 2310
 SHA256 0dfbfef839f20be89cfb402d94a59d3e669bebea35e4b8c706e3b57a2b9e6c9f files/libarchive-2.1.5-acl.patch 2310
+AUX libarchive-2.1.9-static.patch 1323 RMD160 e69e1b894c9ce6d1a4098731d10ebedcd2a812c8 SHA1 cfcef4ad62f276d2c40ae020acc7be1d48099397 SHA256 6ab2eee004a6ec228acea4ceda9515c84edd9ca1187b8a918bef541d3dd9492d
+MD5 1dd8a4adb1851e0a84fa752b970ff445 files/libarchive-2.1.9-static.patch 1323
+RMD160 e69e1b894c9ce6d1a4098731d10ebedcd2a812c8 files/libarchive-2.1.9-static.patch 1323
+SHA256 6ab2eee004a6ec228acea4ceda9515c84edd9ca1187b8a918bef541d3dd9492d files/libarchive-2.1.9-static.patch 1323
 DIST libarchive-1.3.1.tar.gz 901173 RMD160 e518f802d9a50afcfede6dd7cbb4f42b2cbe12a1 SHA1 aed6eda15b012adbb88af0f0d76887920ffe7bbf SHA256 ad9eaf5779df75b9a0618a732eb227792e65db17c6713fe81ef5bff2bbc616a8
 DIST libarchive-2.0.20.tar.gz 566980 RMD160 cdd7368982f96524dd2315106e7c74a2a18920ac SHA1 d33e399547cebf075057091c16d51834eed01571 SHA256 ff846d4f8be27c7f2efcf3e26f56f91347c88b289bab31f65fada7093f879c1f
 DIST libarchive-2.0.24.tar.gz 574114 RMD160 81f6fc4074c017e6139d7330b9c92594a8c59a0e SHA1 569776e5516c8fb99dca247ff57eb37ac26a44e7 SHA256 2d233e4191fde110a4dadcdff33016f027d2942658f273f6f10ee59f5112db94
@@ -32,6 +36,7 @@ DIST libarchive-2.0.25.tar.gz 574428 RMD160 d699cb9612bba7a71616ce95d39986d34d93
 DIST libarchive-2.0.28.tar.gz 587038 RMD160 800d43826bfcc9f1caf05a564ac0dedcb1e04ff8 SHA1 b321a930bf3ccf22cc3bfb944ddfaefa10374280 SHA256 8c543ee180aa0b3d2c045e0f5301cece5346f374ab972f1ca6502e18550798d6
 DIST libarchive-2.0.31.tar.gz 602844 RMD160 11a67ff388a02cf2d570df1a0576ead91570e6b6 SHA1 07a455ad4a9fb4ba37a33675693bc5a56fb67393 SHA256 ee661b2c5ef7e19930834e047acd247f83d019af46ded1c7016bf747b0eeb9df
 DIST libarchive-2.1.5.tar.gz 613462 RMD160 79db55906c34db90b765e80aa8ea9a7fabdc1d2b SHA1 5a4997032a15c4f621989122b9052a56489bc182 SHA256 e6bb256d3400be1cfff62ca70420e45706b47b546e4dbf682c101cfa1d42152f
+DIST libarchive-2.1.9.tar.gz 614004 RMD160 63726482e805508df6c40d627e08f558a6d1e3ac SHA1 729dc62496abd82a275e50d972897fac1e7e040e SHA256 0748bf8bc06d7ab20fb3046f9f057a0d00d26c00fda416b9f911de06238663ef
 EBUILD bsdtar-1.3.1-r2.ebuild 1900 RMD160 2ab4303a9250f0bb958c838fee4b78b0d40d6079 SHA1 dc695fd9ff572f84b45b32e723d59a83444db1d6 SHA256 f4975dbc3ea0ce23cee1c0a21b1f0017f58e65b946fe5959752908e3939ab2f3
 MD5 91eb945235769a64c6f88e79561ff150 bsdtar-1.3.1-r2.ebuild 1900
 RMD160 2ab4303a9250f0bb958c838fee4b78b0d40d6079 bsdtar-1.3.1-r2.ebuild 1900
@@ -60,10 +65,14 @@ EBUILD bsdtar-2.1.5.ebuild 1880 RMD160 28c2689cfba47530f1fc1701588c8a87e81570ed
 MD5 b5c061aa4a196cbd402540f929349712 bsdtar-2.1.5.ebuild 1880
 RMD160 28c2689cfba47530f1fc1701588c8a87e81570ed bsdtar-2.1.5.ebuild 1880
 SHA256 3454da62fc01d168d0e9a1a673303522905044793300aedf83de2728857002c5 bsdtar-2.1.5.ebuild 1880
-MISC ChangeLog 11087 RMD160 7f157f8f09e557604fffa54547ce0d7449ffeb08 SHA1 701cd6eb91fcd74e54f1c708f589ad143693ce55 SHA256 203376627ae18202f045d563af8a4d39f66aae0fde0009e1713b7a697a8d3997
-MD5 d071fd4fcc8bcc8001b663170b16e4c0 ChangeLog 11087
-RMD160 7f157f8f09e557604fffa54547ce0d7449ffeb08 ChangeLog 11087
-SHA256 203376627ae18202f045d563af8a4d39f66aae0fde0009e1713b7a697a8d3997 ChangeLog 11087
+EBUILD bsdtar-2.1.9.ebuild 1880 RMD160 2ae2ff2ffcc63716ba3ec9df0837d1a18131fc7c SHA1 b2f2ecf58744f5fe3275515907b969d25c2dc335 SHA256 b872faff4223d1d5e9cd584bfff6a19c5ee701d94cec71caca8da2af013430e0
+MD5 9f426f059fe40f3093e5f56dca83aae9 bsdtar-2.1.9.ebuild 1880
+RMD160 2ae2ff2ffcc63716ba3ec9df0837d1a18131fc7c bsdtar-2.1.9.ebuild 1880
+SHA256 b872faff4223d1d5e9cd584bfff6a19c5ee701d94cec71caca8da2af013430e0 bsdtar-2.1.9.ebuild 1880
+MISC ChangeLog 11266 RMD160 ecfd6bf0753307c1e8659d7e257638b4735b1451 SHA1 05df55c6f7f38d023ceba4df7728956b1aa4b177 SHA256 0199fca242ad6a1fbe2393d0c4104d96adc58c216baad2b676a1295881228ed2
+MD5 66f1fd1f8aa4fba3ad3df871ad0afc51 ChangeLog 11266
+RMD160 ecfd6bf0753307c1e8659d7e257638b4735b1451 ChangeLog 11266
+SHA256 0199fca242ad6a1fbe2393d0c4104d96adc58c216baad2b676a1295881228ed2 ChangeLog 11266
 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b
 MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337
 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337
@@ -89,10 +98,13 @@ SHA256 557ebd11dce3faa8f6014ab3d4fc8b1caac52ccfa698f6bcff1bc1c126e50f9a files/di
 MD5 7a3c444e5a6ecc4e15dd7f20b426cfc2 files/digest-bsdtar-2.1.5 250
 RMD160 a03e67e8f36cbe18bdb683bf202bc010b197772c files/digest-bsdtar-2.1.5 250
 SHA256 1d2ad41ffe36ba0586564214e4b70b6565e15e5005d6ed5bcd3638104f7083ae files/digest-bsdtar-2.1.5 250
+MD5 53a3322c33d7a8816eb9c82f5d9f6f98 files/digest-bsdtar-2.1.9 250
+RMD160 3d813efb9df694c9e5504a925d009a875dccee1a files/digest-bsdtar-2.1.9 250
+SHA256 f9ed29a6330b43ecbefd58ab6ffe0ba5f0e659b0e493a5108380cf781d02ebcd files/digest-bsdtar-2.1.9 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJS7VjJyKLBkBVroRAv1NAJ0d9bd918OdI4KkMGIOEdWDhpaCMQCfcAUe
-tGP6/WZIhh4FHeNDN7LYtxw=
-=VWmD
+iD8DBQFGMRKjjJyKLBkBVroRAng/AKDY6H13AI0OnrfBgtyHHWgqSnZDqwCfY+2y
+c6N502C5ogRzFb38Jsdt6Zw=
+=rYH7
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bsdtar/bsdtar-2.1.9.ebuild b/app-arch/bsdtar/bsdtar-2.1.9.ebuild
new file mode 100644
index 000000000000..d52b798ecdc4
--- /dev/null
+++ b/app-arch/bsdtar/bsdtar-2.1.9.ebuild
@@ -0,0 +1,82 @@
+# 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.1.9.ebuild,v 1.1 2007/04/26 20:59:09 drizzt 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-2.1.9-static.patch
+	epatch "${FILESDIR}"/libarchive-2.1.5-acl.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 /usr/share/man/man1/tar.1
+	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.1.9 b/app-arch/bsdtar/files/digest-bsdtar-2.1.9
new file mode 100644
index 000000000000..3345a5fe4cb7
--- /dev/null
+++ b/app-arch/bsdtar/files/digest-bsdtar-2.1.9
@@ -0,0 +1,3 @@
+MD5 de9b2e9faed17dcfe2066e4b1dfbfdb3 libarchive-2.1.9.tar.gz 614004
+RMD160 63726482e805508df6c40d627e08f558a6d1e3ac libarchive-2.1.9.tar.gz 614004
+SHA256 0748bf8bc06d7ab20fb3046f9f057a0d00d26c00fda416b9f911de06238663ef libarchive-2.1.9.tar.gz 614004
diff --git a/app-arch/bsdtar/files/libarchive-2.1.9-static.patch b/app-arch/bsdtar/files/libarchive-2.1.9-static.patch
new file mode 100644
index 000000000000..f59e176473e1
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-2.1.9-static.patch
@@ -0,0 +1,36 @@
+Index: libarchive-1.3.1/configure.ac
+===================================================================
+--- libarchive-1.3.1.orig/configure.ac
++++ libarchive-1.3.1/configure.ac
+@@ -71,6 +71,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.3.1/Makefile.am
+===================================================================
+--- libarchive-1.3.1.orig/Makefile.am
++++ libarchive-1.3.1/Makefile.am
+@@ -114,8 +114,12 @@ bsdtar_DEPENDENCIES = libarchive.la		\
+ 		libarchive/archive_entry.h	\
+ 		libarchive/archive.h
+ 
+-bsdtar_LDADD= -larchive
+-bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive
++if STATIC_BSDTAR
+ # Link libarchive statically...
+-bsdtar_LDFLAGS= -static -I$(destdir)/libarchive
++static=-all-static
++endif
++
++bsdtar_LDADD= -L. -larchive -lbz2 -lz
++bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive
++bsdtar_LDFLAGS= $(static)
+ bsdtar_dist_man_MANS=	tar/bsdtar.1