old

(Portage version: 2.2.0_alpha92/cvs/Linux x86_64)

2 files changed, 4 insertions, 90 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index fd61242db3ed..485d04789bcf 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.118 2012/03/18 17:58:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.119 2012/03/22 07:44:12 ssuominen Exp $
+
+  22 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -libarchive-2.8.5.ebuild:
+  old
 
   18 Mar 2012; Raúl Porcel <armin76@gentoo.org> libarchive-3.0.3.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #403173
diff --git a/app-arch/libarchive/libarchive-2.8.5.ebuild b/app-arch/libarchive/libarchive-2.8.5.ebuild
deleted file mode 100644
index 6f9d98e68303..000000000000
--- a/app-arch/libarchive/libarchive-2.8.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.5.ebuild,v 1.10 2012/01/22 15:03:12 armin76 Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://code.google.com/p/libarchive/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
-	http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat"
-
-COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
-		bzip2? ( app-arch/bzip2 )
-		zlib? ( sys-libs/zlib )"
-
-RDEPEND="!dev-libs/libarchive
-	dev-libs/openssl
-	!expat? ( dev-libs/libxml2 )
-	expat? ( dev-libs/expat )
-	acl? ( virtual/acl )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	!static? ( ${COMPRESS_LIBS_DEPEND} )"
-DEPEND="${RDEPEND}
-	${COMPRESS_LIBS_DEPEND}
-	kernel_linux? ( sys-fs/e2fsprogs
-		virtual/os-headers )"
-
-src_configure() {
-	local myconf
-
-	if ! use static ; then
-		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
-	fi
-
-	# force static libs for static binaries
-	if use static && ! use static-libs; then
-		myconf="${myconf} --enable-static"
-	fi
-
-	# Check for need of this in 2.7.1 and later, on 2.7.0, -Werror was
-	# added to the final release, but since it's done in the
-	# Makefile.am we can just work it around this way.
-	append-flags -Wno-error
-
-	# We disable lzmadec because we support the newer liblzma from xz-utils
-	# and not liblzmadec with this version.
-	econf --bindir=/bin \
-		--enable-bsdtar --enable-bsdcpio \
-		$(use_enable acl) $(use_enable xattr) \
-		$(use_with zlib) \
-		$(use_with bzip2 bz2lib) $(use_with lzma) \
-		$(use_enable static-libs static) \
-		$(use_with expat) \
-		$(use_with !expat xml2) \
-		--without-lzmadec \
-		${myconf} \
-		--disable-dependency-tracking
-}
-
-src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	# remove useless .a and .la files (only for non static compilation)
-	use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
-
-	# 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 NEWS README
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
-	gen_usr_ldscript libarchive.so
-}