commit:     7f1a124048e84443481f14e3a3b23074f0333344
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 15:01:00 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 15:06:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f1a1240

app-arch/libarchive: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-arch/libarchive/Manifest                |   2 -
 app-arch/libarchive/libarchive-3.4.3.ebuild | 140 ---------------------------
 app-arch/libarchive/libarchive-3.5.0.ebuild | 141 ----------------------------
 3 files changed, 283 deletions(-)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 154a0d252b7..5a2008cb799 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,3 +1 @@
-DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 
12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256
 SHA512 
d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
-DIST libarchive-3.5.0.tar.gz 7017726 BLAKE2B 
651c9e28d1a1b0a6dd2dbd2aefa0a47ba23d5fb5e96c1bc8c059152952c284f089ce16626b9fbc2cbea70dac2d16ab949235bf4c28f38235f23aeb6da3d69f0d
 SHA512 
9a3d4ce9d4bc856c8d85b846d9d0c9f30369393aa107941c202ba0100c6bac009952c92d809e6981276b3bf91e9f37d018e7f1446b17c0c1c316fe5aafe15440
 DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 
243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9
 SHA512 
08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996

diff --git a/app-arch/libarchive/libarchive-3.4.3.ebuild 
b/app-arch/libarchive/libarchive-3.4.3.ebuild
deleted file mode 100644
index 6fecde8a1a1..00000000000
--- a/app-arch/libarchive/libarchive-3.4.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/";
-SRC_URI="https://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 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 
+lzma lzo nettle static-libs +threads xattr +zlib zstd"
-
-RDEPEND="
-       acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-       blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-       bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-       expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-       !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-       iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-       kernel_linux? (
-               xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-       )
-       !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-       libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-       lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-       lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-       lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-       nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-       zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-       zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-       kernel_linux? (
-               virtual/os-headers
-               e2fsprogs? ( sys-fs/e2fsprogs )
-       )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.3.3-libressl.patch
-)
-
-src_prepare() {
-       default
-       elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-       export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-       local myconf=(
-               $(use_enable acl)
-               $(use_enable static-libs static)
-               $(use_enable xattr)
-               $(use_with blake2 libb2)
-               $(use_with bzip2 bz2lib)
-               $(use_with expat)
-               $(use_with !expat xml2)
-               $(use_with iconv)
-               $(use_with lz4)
-               $(use_with lzma)
-               $(use_with lzo lzo2)
-               $(use_with nettle)
-               $(use_with zlib)
-               $(use_with zstd)
-
-               # Windows-specific
-               --without-cng
-       )
-       if multilib_is_native_abi ; then
-               myconf+=(
-                       --enable-bsdcat=$(tc-is-static-only && echo static || 
echo shared)
-                       --enable-bsdcpio=$(tc-is-static-only && echo static || 
echo shared)
-                       --enable-bsdtar=$(tc-is-static-only && echo static || 
echo shared)
-               )
-       else
-               myconf+=(
-                       --disable-bsdcat
-                       --disable-bsdcpio
-                       --disable-bsdtar
-               )
-       fi
-
-       ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi ; then
-               emake
-       else
-               emake libarchive.la
-       fi
-}
-
-src_test() {
-       mkdir -p "${T}"/bin || die
-       # tests fail when lbzip2[symlink] is used in place of ref bunzip2
-       ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-       local -x PATH=${T}/bin:${PATH}
-       multilib-minimal_src_test
-}
-
-multilib_src_test() {
-       # sandbox is breaking long symlink behavior
-       local -x SANDBOX_ON=0
-       local -x LD_PRELOAD=
-       emake check
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi ; then
-               emake DESTDIR="${D}" install
-
-               # Create symlinks for FreeBSD
-               if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-                       # Exclude cat for the time being #589876
-                       for bin in cpio tar; do
-                               dosym bsd${bin} /usr/bin/${bin}
-                               echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-                               doman "${T}"/${bin}.1
-                       done
-               fi
-       else
-               local install_targets=(
-                       install-includeHEADERS
-                       install-libLTLIBRARIES
-                       install-pkgconfigDATA
-               )
-               emake DESTDIR="${D}" "${install_targets[@]}"
-       fi
-
-       # Libs.private: should be used from libarchive.pc instead
-       find "${ED}" -type f -name "*.la" -delete || die
-}
-
-multilib_src_install_all() {
-       cd "${S}" || die
-       einstalldocs
-}

diff --git a/app-arch/libarchive/libarchive-3.5.0.ebuild 
b/app-arch/libarchive/libarchive-3.5.0.ebuild
deleted file mode 100644
index bab927f9b80..00000000000
--- a/app-arch/libarchive/libarchive-3.5.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/";
-SRC_URI="https://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 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 
+lzma lzo nettle static-libs +threads xattr +zlib zstd"
-
-RDEPEND="
-       acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-       blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-       bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-       expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-       !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-       iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-       kernel_linux? (
-               xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-       )
-       !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-       libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-       lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-       lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-       lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-       nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-       zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-       zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-       kernel_linux? (
-               virtual/os-headers
-               e2fsprogs? ( sys-fs/e2fsprogs )
-       )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.3.3-libressl.patch
-       "${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
-)
-
-src_prepare() {
-       default
-       elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-       export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-       local myconf=(
-               $(use_enable acl)
-               $(use_enable static-libs static)
-               $(use_enable xattr)
-               $(use_with blake2 libb2)
-               $(use_with bzip2 bz2lib)
-               $(use_with expat)
-               $(use_with !expat xml2)
-               $(use_with iconv)
-               $(use_with lz4)
-               $(use_with lzma)
-               $(use_with lzo lzo2)
-               $(use_with nettle)
-               $(use_with zlib)
-               $(use_with zstd)
-
-               # Windows-specific
-               --without-cng
-       )
-       if multilib_is_native_abi ; then
-               myconf+=(
-                       --enable-bsdcat=$(tc-is-static-only && echo static || 
echo shared)
-                       --enable-bsdcpio=$(tc-is-static-only && echo static || 
echo shared)
-                       --enable-bsdtar=$(tc-is-static-only && echo static || 
echo shared)
-               )
-       else
-               myconf+=(
-                       --disable-bsdcat
-                       --disable-bsdcpio
-                       --disable-bsdtar
-               )
-       fi
-
-       ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi ; then
-               emake
-       else
-               emake libarchive.la
-       fi
-}
-
-src_test() {
-       mkdir -p "${T}"/bin || die
-       # tests fail when lbzip2[symlink] is used in place of ref bunzip2
-       ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-       local -x PATH=${T}/bin:${PATH}
-       multilib-minimal_src_test
-}
-
-multilib_src_test() {
-       # sandbox is breaking long symlink behavior
-       local -x SANDBOX_ON=0
-       local -x LD_PRELOAD=
-       emake check
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi ; then
-               emake DESTDIR="${D}" install
-
-               # Create symlinks for FreeBSD
-               if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-                       # Exclude cat for the time being #589876
-                       for bin in cpio tar; do
-                               dosym bsd${bin} /usr/bin/${bin}
-                               echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-                               doman "${T}"/${bin}.1
-                       done
-               fi
-       else
-               local install_targets=(
-                       install-includeHEADERS
-                       install-libLTLIBRARIES
-                       install-pkgconfigDATA
-               )
-               emake DESTDIR="${D}" "${install_targets[@]}"
-       fi
-
-       # Libs.private: should be used from libarchive.pc instead
-       find "${ED}" -type f -name "*.la" -delete || die
-}
-
-multilib_src_install_all() {
-       cd "${S}" || die
-       einstalldocs
-}

Reply via email to