Make sure that build/static useflags are correctly respected (as this package is used in Gentoo/FreeBSD stage1).

Package-Manager: portage-2.1.2_pre2-r3

5 files changed, 149 insertions, 8 deletions

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index 30e599911119..ad1d698e1e54 100644
--- a/app-arch/bsdtar/ChangeLog
+++ b/app-arch/bsdtar/ChangeLog
@@ -1,6 +1,13 @@
 # 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.36 2006/10/06 12:57:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.37 2006/10/06 14:04:00 flameeyes Exp $
+
+*bsdtar-1.3.1-r1 (06 Oct 2006)
+
+  06 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libarchive-1.3.1-static.patch, +bsdtar-1.3.1-r1.ebuild:
+  Make sure that build/static useflags are correctly respected (as this
+  package is used in Gentoo/FreeBSD stage1).
 
   06 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> bsdtar-1.3.1.ebuild:
   Fix dependencies.
diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest
index 81e62a8dd075..8f46dd731961 100644
--- a/app-arch/bsdtar/Manifest
+++ b/app-arch/bsdtar/Manifest
@@ -17,6 +17,10 @@ AUX libarchive-1.2.57-acl.patch 2526 RMD160 c6101f157aa719d8e0075a13bfd7efb73c1e
 MD5 1ec027876e064e268a47ef73d2033991 files/libarchive-1.2.57-acl.patch 2526
 RMD160 c6101f157aa719d8e0075a13bfd7efb73c1ee70a files/libarchive-1.2.57-acl.patch 2526
 SHA256 b444555096ebd1e1591414cc84f85b65b1f50e753045a5f63ae313de58715125 files/libarchive-1.2.57-acl.patch 2526
+AUX libarchive-1.3.1-static.patch 1333 RMD160 21488116b37c75506061f6f5873f91670a3fe45a SHA1 2668779f2bc99a4b7f3b2a73b168cb1f81674304 SHA256 40be241edf721d5601824286e9221955add582d9136f3fc7e29f9abcb192a78c
+MD5 6590bb296f0bb64ecfcd6b779cae3890 files/libarchive-1.3.1-static.patch 1333
+RMD160 21488116b37c75506061f6f5873f91670a3fe45a files/libarchive-1.3.1-static.patch 1333
+SHA256 40be241edf721d5601824286e9221955add582d9136f3fc7e29f9abcb192a78c files/libarchive-1.3.1-static.patch 1333
 DIST libarchive-1.2.53.tar.gz 522540 RMD160 651d5b93d36b2a2c3f3cb781669e368e83a73964 SHA1 24c960b57ac7502944c95daedf265a333ee347af SHA256 7ea32dcf542471d48464bad4e408fbb3b7dbea7d6594a01df73236ae3dc378e8
 DIST libarchive-1.2.57.tar.gz 536128 RMD160 238a44ec554aa4fc5ae795c1af3640d253f36445 SHA1 70bf5a0a6a8af4cefda412db5a2ba53724e9e3e8 SHA256 96b7db97df7e889f0ee2637b6986e94a2136ebac7d48f605dcec1165374746c6
 DIST libarchive-1.3.1.tar.gz 901173 RMD160 e518f802d9a50afcfede6dd7cbb4f42b2cbe12a1 SHA1 aed6eda15b012adbb88af0f0d76887920ffe7bbf SHA256 ad9eaf5779df75b9a0618a732eb227792e65db17c6713fe81ef5bff2bbc616a8
@@ -28,14 +32,18 @@ EBUILD bsdtar-1.2.57.ebuild 1726 RMD160 9afb07094e2802cad8dbd96b6719498245010a8e
 MD5 ba0e73ff3acb121bb3783782f5aa542b bsdtar-1.2.57.ebuild 1726
 RMD160 9afb07094e2802cad8dbd96b6719498245010a8e bsdtar-1.2.57.ebuild 1726
 SHA256 48ebf799eb947638cda829d05f8cf1b634d64b184eb6e239c0853ed531d59d8c bsdtar-1.2.57.ebuild 1726
+EBUILD bsdtar-1.3.1-r1.ebuild 1893 RMD160 21ce901ac47f0818c457d071a2e42a5001664a4a SHA1 b3e885120be3ece91a362c7317e378ed81c51beb SHA256 4dd53165ee25db3fc01178139f8eafb08f47be74d3b3cbd7b013cbafb6f2dcdf
+MD5 cd5dab095cb9476b93255787e95dfca0 bsdtar-1.3.1-r1.ebuild 1893
+RMD160 21ce901ac47f0818c457d071a2e42a5001664a4a bsdtar-1.3.1-r1.ebuild 1893
+SHA256 4dd53165ee25db3fc01178139f8eafb08f47be74d3b3cbd7b013cbafb6f2dcdf bsdtar-1.3.1-r1.ebuild 1893
 EBUILD bsdtar-1.3.1.ebuild 1769 RMD160 c9501e413becc54575b86d626b86ffe4c69efbab SHA1 e9b6de6a2ab65186e7dd388b72d3cdd3656b3f8c SHA256 069d414ab5269fae254b7c8bcccb6e1bf5f5121db0c4e55a8cad989ed677dbd7
 MD5 0faf49f273668565c1cc67312050b1d9 bsdtar-1.3.1.ebuild 1769
 RMD160 c9501e413becc54575b86d626b86ffe4c69efbab bsdtar-1.3.1.ebuild 1769
 SHA256 069d414ab5269fae254b7c8bcccb6e1bf5f5121db0c4e55a8cad989ed677dbd7 bsdtar-1.3.1.ebuild 1769
-MISC ChangeLog 6324 RMD160 08944119273564cf7eb1e4cfc059d1df984f4d4c SHA1 b710b30eb304eac65bfa85e0e745c4719594b2b4 SHA256 6a93c9f7beac8c8b92673543608727f7b56e2ce9be89a76ddf9db0e10a4bdf60
-MD5 85929cb0420d3109829ccf77c2305a0c ChangeLog 6324
-RMD160 08944119273564cf7eb1e4cfc059d1df984f4d4c ChangeLog 6324
-SHA256 6a93c9f7beac8c8b92673543608727f7b56e2ce9be89a76ddf9db0e10a4bdf60 ChangeLog 6324
+MISC ChangeLog 6592 RMD160 3642e74e6baa02363edb4a3f8b357a9515fe0036 SHA1 e9f5c4498af303778d6b545043e399f981890feb SHA256 5e7d5650f65c4d237d0b7b40f07ca00c42c593c50b52e01376198aecea89a22b
+MD5 e8349e2e49cae4e6ce213e926a4ad5e5 ChangeLog 6592
+RMD160 3642e74e6baa02363edb4a3f8b357a9515fe0036 ChangeLog 6592
+SHA256 5e7d5650f65c4d237d0b7b40f07ca00c42c593c50b52e01376198aecea89a22b ChangeLog 6592
 MISC metadata.xml 428 RMD160 b1ff6b3d84ad489dc4f5ab5f1d9ee9b60266c2ff SHA1 a45d1c0b222b298767f08a2df8d4d84fdecc8434 SHA256 236fee13551e3785be53bd3f70c0784803827edf245c913851f239689e3278f4
 MD5 afec809b169074e5d5b0803e4f8f5ec8 metadata.xml 428
 RMD160 b1ff6b3d84ad489dc4f5ab5f1d9ee9b60266c2ff metadata.xml 428
@@ -49,10 +57,13 @@ SHA256 5dc6a314cd6a804369cf4c9c2bd4d61ce00b41e58647edfbb66f526766a4719f files/di
 MD5 46c18ca117e44e7e3f070e41f466f72e files/digest-bsdtar-1.3.1 250
 RMD160 5bacf3a8252a2b227bfe4e6edf52d55c4240f6a4 files/digest-bsdtar-1.3.1 250
 SHA256 bbe48267a685e9836d773f76142f7f7a0bcc3f1a05262ed7fb3fb847a9fefd1e files/digest-bsdtar-1.3.1 250
+MD5 46c18ca117e44e7e3f070e41f466f72e files/digest-bsdtar-1.3.1-r1 250
+RMD160 5bacf3a8252a2b227bfe4e6edf52d55c4240f6a4 files/digest-bsdtar-1.3.1-r1 250
+SHA256 bbe48267a685e9836d773f76142f7f7a0bcc3f1a05262ed7fb3fb847a9fefd1e files/digest-bsdtar-1.3.1-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJlK+AiZjviIA2XgRAuYMAKDSPAwyXcfCNl324WCijeCobmThuwCaAklO
-zfocFT7YZT/fdWYhTUk2kl0=
-=GNcM
+iD8DBQFFJmJWAiZjviIA2XgRAp0BAKDE2d694Y40v4rhliCx1nmZzhyO+gCgkD8R
+cwOebPyZe2i9TPw10J/9Xn8=
+=XM5R
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bsdtar/bsdtar-1.3.1-r1.ebuild b/app-arch/bsdtar/bsdtar-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..8aa6c1c531b5
--- /dev/null
+++ b/app-arch/bsdtar/bsdtar-1.3.1-r1.ebuild
@@ -0,0 +1,84 @@
+# 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.3.1-r1.ebuild,v 1.1 2006/10/06 14:04:00 flameeyes Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit eutils autotools toolchain-funcs flag-o-matic
+
+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 )
+	)
+	!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-1.3.1-static.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 use build; then
+		rm -rf "${D}"/usr
+		rm -rf "${D}"/lib/*.so*
+		return 0
+	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.3.1-r1 b/app-arch/bsdtar/files/digest-bsdtar-1.3.1-r1
new file mode 100644
index 000000000000..853d5013146e
--- /dev/null
+++ b/app-arch/bsdtar/files/digest-bsdtar-1.3.1-r1
@@ -0,0 +1,3 @@
+MD5 c618d26d680ace57fcd5f59cea3151c6 libarchive-1.3.1.tar.gz 901173
+RMD160 e518f802d9a50afcfede6dd7cbb4f42b2cbe12a1 libarchive-1.3.1.tar.gz 901173
+SHA256 ad9eaf5779df75b9a0618a732eb227792e65db17c6713fe81ef5bff2bbc616a8 libarchive-1.3.1.tar.gz 901173
diff --git a/app-arch/bsdtar/files/libarchive-1.3.1-static.patch b/app-arch/bsdtar/files/libarchive-1.3.1-static.patch
new file mode 100644
index 000000000000..20c7238ad3a2
--- /dev/null
+++ b/app-arch/bsdtar/files/libarchive-1.3.1-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 -lbz2 -lz
+-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