From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-arch/libarchive/Manifest | 7 -- .../files/libarchive-3.3.1-libressl.patch | 25 ---- .../files/libarchive-3.3.2-libressl.patch | 25 ---- app-arch/libarchive/libarchive-3.3.1.ebuild | 122 -------------------- app-arch/libarchive/libarchive-3.3.2.ebuild | 128 --------------------- app-arch/libarchive/metadata.xml | 36 ------ 6 files changed, 343 deletions(-) delete mode 100644 app-arch/libarchive/Manifest delete mode 100644 app-arch/libarchive/files/libarchive-3.3.1-libressl.patch delete mode 100644 app-arch/libarchive/files/libarchive-3.3.2-libressl.patch delete mode 100644 app-arch/libarchive/libarchive-3.3.1.ebuild delete mode 100644 app-arch/libarchive/libarchive-3.3.2.ebuild delete mode 100644 app-arch/libarchive/metadata.xml (limited to 'app-arch/libarchive') diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest deleted file mode 100644 index a71577786344..000000000000 --- a/app-arch/libarchive/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX libarchive-3.3.1-libressl.patch 1069 BLAKE2B 0fb6c7c3d85b620387e76e6e2fb7b787effe8fb8c9bd911561e348eb7d0c7cbd504d8932ff5d7c2856649948c556b3807a0fc6019ef4d38fa37d873729275e17 SHA512 d82e3de1201168f6e187824e237f35a9581c34450043ce84478aca3ca74df7b00bbcba5bc462f354837e1720bcc135ce4864f81cfd499b398b1939b886b7fd3f -AUX libarchive-3.3.2-libressl.patch 1105 BLAKE2B 9b62a5b4029b8c0fd97d4c5012fac9a7dd25655e3b0d8adbcb839f05c1999eb77b902ef476841af8eb8b9de76ce9bad893d065084121434f06717d5f4db93b29 SHA512 ffcc66414f72ee2262544f4d59ca2d0b83ba2eca4f58261ec4694f5cd5d5d7975d9626a1f9ad8a1047d3e656d4dc98dd28d991ef3e6311959d8bf797ad6bc936 -DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164 -DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 -EBUILD libarchive-3.3.1.ebuild 3421 BLAKE2B 58a7875a34993cd05f6c3dd944dbd984f659931fc41a088a718c5d5f0237a7494295ad7e48aeef783905a61ea3c3c55e2617bed6994cdf3f97aa73e1306f2261 SHA512 45dcf64451b3325ab3a99a37d5e3fa23222fcc681a1e12ae9104ffc86544298b91b282328615af2da832d79d6680484ff81c1de2bec9868ef47b27864c006a67 -EBUILD libarchive-3.3.2.ebuild 3492 BLAKE2B 62da4fbace1866bb6949a0b3d611a2a5b8375c734a650ecc05229014e58290d2c4b9182b8fb573de040823bc8ab9547d2c5983c7f60099de70470187e1bd27f0 SHA512 8a2ec5bf5324f73df45481fcba3a3f20a730ec96e7db2dedd1479156ea9524d78af1105893f9b3c65e1f0d9debe6e8139d984f18b355e7c86288b0a73098f68e -MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680 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 index 7ee48d4e5f50..000000000000 --- 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 - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #include /* malloc, free */ - #include /* 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 - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #include /* malloc, free */ - #include /* 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 index e053a539fae8..000000000000 --- 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 - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #include /* malloc, free */ - #include /* 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 - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - #include /* malloc, free */ - #include /* 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 index 23c5543689d1..000000000000 --- a/app-arch/libarchive/libarchive-3.3.1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils libtool multilib-minimal 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 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 index b9482078762d..000000000000 --- a/app-arch/libarchive/libarchive-3.3.2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils libtool multilib-minimal 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 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 -} diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml deleted file mode 100644 index 126e3e29930f..000000000000 --- a/app-arch/libarchive/metadata.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - bsd@gentoo.org - BSD Project - - - The bsdtar program creates and manipulates streaming archive files. - It has a number of advantages over previous tar implementations. - - - - Allow accessing bzip2-compressed archives through libbz2 (which - comes with app-arch/bzip2). This only affects - libarchive's native support: bsdtar will keep using bunzip2 as a - filter if that's not built-in. - - - 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 - - - Allow accessing gzip-compressed archives through - sys-libs/zlib. This only affects libarchive's native - support: bsdtar will keep using gunzip as a filter if that's not - built-in. It's also needed for supporting extraction of ZIP - files. - - - -- cgit v1.2.3