From 6d1ceac2bcd17c435084946465cfecc33b9364d4 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 16 Apr 2020 04:10:43 +0000 Subject: [PATCH] bump(app-arch/libarchive): sync with upstream --- .../portage-stable/app-arch/libarchive/Manifest | 2 +- ...archive-3.3.3.ebuild => libarchive-3.4.2.ebuild} | 13 +++++++------ .../portage-stable/app-arch/libarchive/metadata.xml | 13 +++++++------ 3 files changed, 15 insertions(+), 13 deletions(-) rename sdk_container/src/third_party/portage-stable/app-arch/libarchive/{libarchive-3.3.3.ebuild => libarchive-3.4.2.ebuild} (85%) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/Manifest index 3037624f54..dc4b48a9a9 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/Manifest @@ -1 +1 @@ -DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7 +DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.3.3.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.4.2.ebuild similarity index 85% rename from sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.3.3.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.4.2.ebuild index 50cb45ba64..d9f9a71caa 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.3.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,11 +10,12 @@ 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 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 zstd" +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 ~x86-macos ~m68k-mint ~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}] ) @@ -52,11 +53,11 @@ src_prepare() { multilib_src_configure() { export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 - local myconf=() - myconf=( + 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) @@ -124,7 +125,7 @@ multilib_src_install() { fi # Libs.private: should be used from libarchive.pc instead - find "${ED}" -name "*.la" -delete || die + find "${ED}" -type f -name "*.la" -delete || die } multilib_src_install_all() { diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/metadata.xml index 8451f55586..82253c34ca 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/metadata.xml @@ -1,14 +1,17 @@ - - bsd@gentoo.org - BSD Project + + mgorny@gentoo.org + Michał Górny C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats. + + Enable Blake2 hash support via app-crypt/libb2. + Allow accessing bzip2-compressed archives through libbz2 (which comes with app-arch/bzip2). This only affects @@ -18,9 +21,6 @@ Use file flags from sys-fs/e2fsprogs headers instead of virtual/os-headers headers - - Enable support for LZ4 compression using app-arch/lz4 - Use dev-libs/nettle as crypto backend @@ -33,6 +33,7 @@ + cpe:/a:libarchive:libarchive libarchive/libarchive https://github.com/libarchive/libarchive/issues