app-arch/libarchive: Clean old up

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

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index a4e6b87969596ec3ea12efb429526bb25b904d6b..3037624f54581b4b48662e06c2a7068528ffcc33 100644 (file)
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,3 +1 @@
-DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
-DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7

diff --git a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
deleted file mode 100644 (file)
index 7ee48d4..0000000
--- a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libarchive/archive_openssl_evp_private.h       2017-01-29 05:06:27.000000000 +0000
-+++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 +0000
-@@ -28,7 +28,8 @@
- #include <openssl/evp.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
-
---- a/libarchive/archive_openssl_hmac_private.h        2017-01-29 05:06:27.000000000 +0000
-+++ b/libarchive/archive_openssl_hmac_private.h        2018-04-19 04:02:18.309167446 +0000
-@@ -28,7 +28,8 @@
- #include <openssl/hmac.h>
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline HMAC_CTX *HMAC_CTX_new(void)

diff --git a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
deleted file mode 100644 (file)
index e053a53..0000000
--- a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libarchive/archive_openssl_evp_private.h       2017-01-29 05:06:27.000000000 +0000
-+++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 +0000
-@@ -28,7 +28,8 @@
- #include <openssl/evp.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
-
---- a/libarchive/archive_openssl_hmac_private.h        2017-01-29 05:06:27.000000000 +0000
-+++ b/libarchive/archive_openssl_hmac_private.h        2018-04-19 04:02:18.309167446 +0000
-@@ -28,7 +28,8 @@
- #include <openssl/hmac.h>
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline HMAC_CTX *HMAC_CTX_new(void)

diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild
deleted file mode 100644 (file)
index 5ccced5..0000000
--- a/app-arch/libarchive/libarchive-3.3.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils 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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
-
-RDEPEND="
-       acl? ( virtual/acl[${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}] )"
-DEPEND="${RDEPEND}
-       kernel_linux? (
-               virtual/os-headers
-               e2fsprogs? ( sys-fs/e2fsprogs )
-       )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.3.1-libressl.patch
-)
-
-# Various test problems, starting with the fact that sandbox
-# explodes on long paths. https://bugs.gentoo.org/598806
-RESTRICT="test"
-
-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=()
-       myconf=(
-               $(use_enable acl)
-               $(use_enable static-libs static)
-               $(use_enable xattr)
-               $(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)
-       )
-       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
-}
-
-multilib_src_test() {
-       # Replace the default src_test so that it builds tests in parallel
-       multilib_is_native_abi && 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
-               emake DESTDIR="${D}" \
-                       install-includeHEADERS \
-                       install-libLTLIBRARIES \
-                       install-pkgconfigDATA
-       fi
-
-       # Libs.private: should be used from libarchive.pc instead
-       prune_libtool_files
-}
-
-multilib_src_install_all() {
-       cd "${S}" || die
-       einstalldocs
-}

diff --git a/app-arch/libarchive/libarchive-3.3.2.ebuild b/app-arch/libarchive/libarchive-3.3.2.ebuild
deleted file mode 100644 (file)
index d53b773..0000000
--- a/app-arch/libarchive/libarchive-3.3.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils 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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
-
-RDEPEND="
-       acl? ( virtual/acl[${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}] )"
-DEPEND="${RDEPEND}
-       kernel_linux? (
-               virtual/os-headers
-               e2fsprogs? ( sys-fs/e2fsprogs )
-       )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.3.2-libressl.patch
-)
-
-# Various test problems, starting with the fact that sandbox
-# explodes on long paths. https://bugs.gentoo.org/598806
-RESTRICT="test"
-
-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=()
-       myconf=(
-               $(use_enable acl)
-               $(use_enable static-libs static)
-               $(use_enable xattr)
-               $(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)
-       )
-       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
-}
-
-multilib_src_test() {
-       # Replace the default src_test so that it builds tests in parallel
-       multilib_is_native_abi && 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
-       prune_libtool_files
-}
-
-multilib_src_install_all() {
-       cd "${S}" || die
-       einstalldocs
-}