From 1a6278bfa7776a92fd414fef2f46a8a8ccccc603 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Tue, 6 Nov 2007 20:55:48 +0000 Subject: Fix linking of shared libarchive, thanks to Jan Psota for reporting. (Portage version: 2.1.3.18) --- app-arch/libarchive/ChangeLog | 9 ++- app-arch/libarchive/files/digest-libarchive-2.3.5 | 3 - app-arch/libarchive/files/digest-libarchive-2.4.0 | 3 - .../libarchive/files/digest-libarchive-2.4.0-r1 | 3 + app-arch/libarchive/libarchive-2.3.5.ebuild | 83 --------------------- app-arch/libarchive/libarchive-2.4.0-r1.ebuild | 83 +++++++++++++++++++++ app-arch/libarchive/libarchive-2.4.0.ebuild | 85 ---------------------- 7 files changed, 94 insertions(+), 175 deletions(-) delete mode 100644 app-arch/libarchive/files/digest-libarchive-2.3.5 delete mode 100644 app-arch/libarchive/files/digest-libarchive-2.4.0 create mode 100644 app-arch/libarchive/files/digest-libarchive-2.4.0-r1 delete mode 100644 app-arch/libarchive/libarchive-2.3.5.ebuild create mode 100644 app-arch/libarchive/libarchive-2.4.0-r1.ebuild delete mode 100644 app-arch/libarchive/libarchive-2.4.0.ebuild diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog index 5049422602bc..6012b8207440 100644 --- a/app-arch/libarchive/ChangeLog +++ b/app-arch/libarchive/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/libarchive # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.6 2007/11/04 17:54:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.7 2007/11/06 20:55:47 flameeyes Exp $ + +*libarchive-2.4.0-r1 (06 Nov 2007) + + 06 Nov 2007; Diego Pettenò + -libarchive-2.3.5.ebuild, -libarchive-2.4.0.ebuild, + +libarchive-2.4.0-r1.ebuild: + Fix linking of shared libarchive, thanks to Jan Psota for reporting. *libarchive-2.4.0 (04 Nov 2007) diff --git a/app-arch/libarchive/files/digest-libarchive-2.3.5 b/app-arch/libarchive/files/digest-libarchive-2.3.5 deleted file mode 100644 index e87677d28b29..000000000000 --- a/app-arch/libarchive/files/digest-libarchive-2.3.5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 954ed005e64c368d2ce890581b52b6fb libarchive-2.3.5.tar.gz 698478 -RMD160 0547786b802698b1f2a241c5dcb4bafcddda5477 libarchive-2.3.5.tar.gz 698478 -SHA256 a04cc5664cac8e4b4a0848901073ef21b03fca3ab63fb9d7d09993fc0791f055 libarchive-2.3.5.tar.gz 698478 diff --git a/app-arch/libarchive/files/digest-libarchive-2.4.0 b/app-arch/libarchive/files/digest-libarchive-2.4.0 deleted file mode 100644 index fdc8ee1ece4a..000000000000 --- a/app-arch/libarchive/files/digest-libarchive-2.4.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9b06995c6c9d000892b7320a4a4fedcb libarchive-2.4.0.tar.gz 791312 -RMD160 fac39fc336dd6701c3c871c6634e2876239ef58c libarchive-2.4.0.tar.gz 791312 -SHA256 edde790bdcae164a2f4abda5e3b34b6ad6c15c45b1d30d561bbb67bef4cd9724 libarchive-2.4.0.tar.gz 791312 diff --git a/app-arch/libarchive/files/digest-libarchive-2.4.0-r1 b/app-arch/libarchive/files/digest-libarchive-2.4.0-r1 new file mode 100644 index 000000000000..fdc8ee1ece4a --- /dev/null +++ b/app-arch/libarchive/files/digest-libarchive-2.4.0-r1 @@ -0,0 +1,3 @@ +MD5 9b06995c6c9d000892b7320a4a4fedcb libarchive-2.4.0.tar.gz 791312 +RMD160 fac39fc336dd6701c3c871c6634e2876239ef58c libarchive-2.4.0.tar.gz 791312 +SHA256 edde790bdcae164a2f4abda5e3b34b6ad6c15c45b1d30d561bbb67bef4cd9724 libarchive-2.4.0.tar.gz 791312 diff --git a/app-arch/libarchive/libarchive-2.3.5.ebuild b/app-arch/libarchive/libarchive-2.3.5.ebuild deleted file mode 100644 index 27e92389bf7d..000000000000 --- a/app-arch/libarchive/libarchive-2.3.5.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/libarchive/libarchive-2.3.5.ebuild,v 1.2 2007/11/03 17:39:02 grobian Exp $ - -inherit eutils autotools toolchain-funcs flag-o-matic - -MY_P=${P/_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 kernel_linux" - -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}"/${PN}-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 \ - --enable-bsdcpio \ - $(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 - # We may wish to switch to symlink bsdcpio to cpio too one day - 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/libarchive/libarchive-2.4.0-r1.ebuild b/app-arch/libarchive/libarchive-2.4.0-r1.ebuild new file mode 100644 index 000000000000..c159ff7788e2 --- /dev/null +++ b/app-arch/libarchive/libarchive-2.4.0-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.4.0-r1.ebuild,v 1.1 2007/11/06 20:55:47 flameeyes Exp $ + +inherit eutils autotools toolchain-funcs flag-o-matic + +MY_P=${P/_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 kernel_linux" + +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}"/${PN}-2.1.5-acl.patch + + eautoreconf + epunt_cxx +} + +src_compile() { + local myconf= + + if ! use static && ! use build ; then + myconf="--enable-bsdtar=shared --enable-bsdcpio=shared" + 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 \ + --enable-bsdcpio \ + $(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 + # We may wish to switch to symlink bsdcpio to cpio too one day + fi + + dodoc README NEWS + + 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/libarchive-2.4.0.ebuild b/app-arch/libarchive/libarchive-2.4.0.ebuild deleted file mode 100644 index 0462e8c1a255..000000000000 --- a/app-arch/libarchive/libarchive-2.4.0.ebuild +++ /dev/null @@ -1,85 +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/libarchive/libarchive-2.4.0.ebuild,v 1.1 2007/11/04 17:54:42 flameeyes Exp $ - -inherit eutils autotools toolchain-funcs flag-o-matic - -MY_P=${P/_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 kernel_linux" - -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}"/${PN}-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 \ - --enable-bsdcpio \ - $(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 - # We may wish to switch to symlink bsdcpio to cpio too one day - fi - - dodoc README NEWS - - 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 -} -- cgit v1.2.3-65-gdbad