From 04431f4d1d3c320223ae45fbb3c19451624365cf Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Sun, 11 Mar 2007 21:56:06 +0000 Subject: Just another bsdtar bump (Portage version: 2.1.2.2) --- app-arch/bsdtar/ChangeLog | 9 ++- app-arch/bsdtar/bsdtar-2.0.21.ebuild | 83 ---------------------- app-arch/bsdtar/bsdtar-2.0.24.ebuild | 82 +++++++++++++++++++++ app-arch/bsdtar/files/digest-bsdtar-2.0.21 | 3 - app-arch/bsdtar/files/digest-bsdtar-2.0.24 | 3 + .../bsdtar/files/libarchive-2.0.21-tests.patch | 17 ----- 6 files changed, 93 insertions(+), 104 deletions(-) delete mode 100644 app-arch/bsdtar/bsdtar-2.0.21.ebuild create mode 100644 app-arch/bsdtar/bsdtar-2.0.24.ebuild delete mode 100644 app-arch/bsdtar/files/digest-bsdtar-2.0.21 create mode 100644 app-arch/bsdtar/files/digest-bsdtar-2.0.24 delete mode 100644 app-arch/bsdtar/files/libarchive-2.0.21-tests.patch (limited to 'app-arch') diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog index 0a4114d96528..c745ed6f8bbe 100644 --- a/app-arch/bsdtar/ChangeLog +++ b/app-arch/bsdtar/ChangeLog @@ -1,6 +1,13 @@ # 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.58 2007/03/10 14:26:47 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.59 2007/03/11 21:56:06 drizzt Exp $ + +*bsdtar-2.0.24 (11 Mar 2007) + + 11 Mar 2007; Timothy Redaelli + -files/libarchive-2.0.21-tests.patch, -bsdtar-2.0.21.ebuild, + +bsdtar-2.0.24.ebuild: + Just another bsdtar bump *bsdtar-2.0.21 (10 Mar 2007) diff --git a/app-arch/bsdtar/bsdtar-2.0.21.ebuild b/app-arch/bsdtar/bsdtar-2.0.21.ebuild deleted file mode 100644 index 9aa25a05a13a..000000000000 --- a/app-arch/bsdtar/bsdtar-2.0.21.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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.0.21.ebuild,v 1.1 2007/03/10 14:26:47 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-1.3.1-static.patch - epatch "${FILESDIR}"/libarchive-2.0b6-acl.patch - epatch "${FILESDIR}"/libarchive-2.0.21-tests.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/bsdtar-2.0.24.ebuild b/app-arch/bsdtar/bsdtar-2.0.24.ebuild new file mode 100644 index 000000000000..d10221ade0d4 --- /dev/null +++ b/app-arch/bsdtar/bsdtar-2.0.24.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.0.24.ebuild,v 1.1 2007/03/11 21:56:06 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-1.3.1-static.patch + epatch "${FILESDIR}"/libarchive-2.0b6-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.0.21 b/app-arch/bsdtar/files/digest-bsdtar-2.0.21 deleted file mode 100644 index cce4259db867..000000000000 --- a/app-arch/bsdtar/files/digest-bsdtar-2.0.21 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5269f23a5921aa369c0cd57465d31155 libarchive-2.0.21.tar.gz 571136 -RMD160 0b9523b2b27d71d6f799e0d941b39fd810600c08 libarchive-2.0.21.tar.gz 571136 -SHA256 358f56110da504cde229047ef958707f93f7159994e0c9b44ec92c3e9cb860ae libarchive-2.0.21.tar.gz 571136 diff --git a/app-arch/bsdtar/files/digest-bsdtar-2.0.24 b/app-arch/bsdtar/files/digest-bsdtar-2.0.24 new file mode 100644 index 000000000000..95bdef26248a --- /dev/null +++ b/app-arch/bsdtar/files/digest-bsdtar-2.0.24 @@ -0,0 +1,3 @@ +MD5 c3ff1807397598ed644eb831a6a8d182 libarchive-2.0.24.tar.gz 574114 +RMD160 81f6fc4074c017e6139d7330b9c92594a8c59a0e libarchive-2.0.24.tar.gz 574114 +SHA256 2d233e4191fde110a4dadcdff33016f027d2942658f273f6f10ee59f5112db94 libarchive-2.0.24.tar.gz 574114 diff --git a/app-arch/bsdtar/files/libarchive-2.0.21-tests.patch b/app-arch/bsdtar/files/libarchive-2.0.21-tests.patch deleted file mode 100644 index 11975b7801f2..000000000000 --- a/app-arch/bsdtar/files/libarchive-2.0.21-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libarchive-2.0.21/libarchive/test/test.h -=================================================================== ---- libarchive-2.0.21.orig/libarchive/test/test.h -+++ libarchive-2.0.21/libarchive/test/test.h -@@ -54,6 +54,12 @@ - #error Oops: No config.h and no pre-built configuration in test.h. - #endif - -+/* No non-FreeBSD platform will have __FBSDID, so just define it here. */ -+#ifdef __FreeBSD__ -+#include /* For __FBSDID */ -+#else -+#define __FBSDID(a) /* null */ -+#endif - - /* - * "list.h" is simply created by "grep DEFINE_TEST"; it has -- cgit v1.2.3-65-gdbad