From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A56D9138252 for ; Wed, 11 May 2016 04:45:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAACEE086A; Wed, 11 May 2016 04:45:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C6ABE086A for ; Wed, 11 May 2016 04:45:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64239340896 for ; Wed, 11 May 2016 04:45:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82676929 for ; Wed, 11 May 2016 04:45:06 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1462941851.a189a251f23bd7a5a65460ad55c6cb55d26320f5.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/libarchive/libarchive-3.1.2-r1.ebuild app-arch/libarchive/libarchive-3.1.2-r2.ebuild X-VCS-Directories: app-arch/libarchive/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: a189a251f23bd7a5a65460ad55c6cb55d26320f5 X-VCS-Branch: master Date: Wed, 11 May 2016 04:45:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b29973ea-0f9a-472c-92c9-26bc93bd8fab X-Archives-Hash: 313b6c4ad9db24b9e6d245acf0719080 commit: a189a251f23bd7a5a65460ad55c6cb55d26320f5 Author: NP-Hardass gentoo org> AuthorDate: Wed May 11 04:44:11 2016 +0000 Commit: NP Hardass gentoo org> CommitDate: Wed May 11 04:44:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a189a251 app-arch/libarchive: Revert "app-arch/libarchive: Drop old" This reverts commit fc9dc7a13724115678d2df7acb93fc5ae30609b4. app-arch/libarchive/libarchive-3.1.2-r1.ebuild | 91 +++++++++++++++++++++++++ app-arch/libarchive/libarchive-3.1.2-r2.ebuild | 93 ++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) diff --git a/app-arch/libarchive/libarchive-3.1.2-r1.ebuild b/app-arch/libarchive/libarchive-3.1.2-r1.ebuild new file mode 100644 index 0000000..ce57a80 --- /dev/null +++ b/app-arch/libarchive/libarchive-3.1.2-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils libtool multilib toolchain-funcs + +DESCRIPTION="BSD tar command" +HOMEPAGE="http://www.libarchive.org/" +SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" + +LICENSE="BSD BSD-2 BSD-4 public-domain" +SLOT="0/13" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux +lzma lzo nettle static-libs xattr +zlib" + +RDEPEND="dev-libs/openssl:0 + acl? ( virtual/acl ) + bzip2? ( app-arch/bzip2 ) + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2 ) + iconv? ( virtual/libiconv ) + kernel_linux? ( + xattr? ( sys-apps/attr ) + ) + lzma? ( app-arch/xz-utils ) + lzo? ( >=dev-libs/lzo-2 ) + nettle? ( dev-libs/nettle ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + kernel_linux? ( + virtual/os-headers + e2fsprogs? ( sys-fs/e2fsprogs ) + )" + +DOCS="NEWS README" + +src_prepare() { + epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch + elibtoolize +} + +src_configure() { + export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 + + # We disable lzmadec because we support the newer liblzma from xz-utils + # and not liblzmadec with this version. + econf \ + $(use_enable static-libs static) \ + --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) \ + --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) \ + $(use_enable xattr) \ + $(use_enable acl) \ + $(use_with zlib) \ + $(use_with bzip2 bz2lib) \ + --without-lzmadec \ + $(use_with iconv) \ + $(use_with lzma) \ + $(use_with lzo lzo2) \ + $(use_with nettle) \ + $(use_with !expat xml2) \ + $(use_with expat) +} + +src_test() { + # Replace the default src_test so that it builds tests in parallel + emake check +} + +src_install() { + default + + # Libs.private: should be used from libarchive.pc instead + prune_libtool_files + + # Create tar symlink for FreeBSD + if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then + dosym bsdtar /usr/bin/tar + echo '.so bsdtar.1' > "${T}"/tar.1 + doman "${T}"/tar.1 + # We may wish to switch to symlink bsdcpio to cpio too one day + fi +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 12) +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 12) +} diff --git a/app-arch/libarchive/libarchive-3.1.2-r2.ebuild b/app-arch/libarchive/libarchive-3.1.2-r2.ebuild new file mode 100644 index 0000000..5b56888 --- /dev/null +++ b/app-arch/libarchive/libarchive-3.1.2-r2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils libtool multilib toolchain-funcs + +DESCRIPTION="BSD tar command" +HOMEPAGE="http://www.libarchive.org/" +SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" + +LICENSE="BSD BSD-2 BSD-4 public-domain" +SLOT="0/13" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + acl? ( virtual/acl ) + bzip2? ( app-arch/bzip2 ) + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2 ) + iconv? ( virtual/libiconv ) + kernel_linux? ( + xattr? ( sys-apps/attr ) + ) + lzma? ( app-arch/xz-utils ) + lzo? ( >=dev-libs/lzo-2 ) + nettle? ( dev-libs/nettle ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + kernel_linux? ( + virtual/os-headers + e2fsprogs? ( sys-fs/e2fsprogs ) + )" + +DOCS="NEWS README" + +src_prepare() { + epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch + elibtoolize +} + +src_configure() { + export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 + + # We disable lzmadec because we support the newer liblzma from xz-utils + # and not liblzmadec with this version. + econf \ + $(use_enable static-libs static) \ + --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) \ + --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) \ + $(use_enable xattr) \ + $(use_enable acl) \ + $(use_with zlib) \ + $(use_with bzip2 bz2lib) \ + --without-lzmadec \ + $(use_with iconv) \ + $(use_with lzma) \ + $(use_with lzo lzo2) \ + $(use_with nettle) \ + $(use_with !expat xml2) \ + $(use_with expat) +} + +src_test() { + # Replace the default src_test so that it builds tests in parallel + emake check +} + +src_install() { + default + + # Libs.private: should be used from libarchive.pc instead + prune_libtool_files + + # Create tar symlink for FreeBSD + if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then + dosym bsdtar /usr/bin/tar + echo '.so bsdtar.1' > "${T}"/tar.1 + doman "${T}"/tar.1 + # We may wish to switch to symlink bsdcpio to cpio too one day + fi +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 12) +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 12) +}