From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- dev-libs/libzip/Manifest | 6 +- dev-libs/libzip/files/libzip-1.5.1-bzip2.patch | 53 ----------- dev-libs/libzip/files/libzip-1.5.1-options.patch | 50 ----------- dev-libs/libzip/libzip-1.5.1.ebuild | 90 ------------------- dev-libs/libzip/libzip-1.6.0.ebuild | 109 +++++++++++++++++++++++ 5 files changed, 111 insertions(+), 197 deletions(-) delete mode 100644 dev-libs/libzip/files/libzip-1.5.1-bzip2.patch delete mode 100644 dev-libs/libzip/files/libzip-1.5.1-options.patch delete mode 100644 dev-libs/libzip/libzip-1.5.1.ebuild create mode 100644 dev-libs/libzip/libzip-1.6.0.ebuild (limited to 'dev-libs/libzip') diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 1c39105423d2..59fa3431987e 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,8 +1,6 @@ -AUX libzip-1.5.1-bzip2.patch 1861 BLAKE2B fdb4734858512718079af900ab96ba1be9664e2d5def086c44a52eba256759dbf733acf097dfec4e76e1f20aecf60dffbf7e7ef21c2e8a51b634c08678ea765c SHA512 af66da5aa509a3dfc47c0d456d7b462361847f68d5abe3aed7d33f52165a7e0fd0eb2d246e05bde1e47669f56cac5a85eb3b5aecaf8a83196e6297ae2175265d -AUX libzip-1.5.1-options.patch 1297 BLAKE2B d2394b095b59d484269bc29cbbb311c5c58564dbf715c131874fc4b76649bae909c0a1c5509d9b2d085aabb9c54ace50e3ea65fa2494e584e92a6cfef68ca0b6 SHA512 41a1f8f33e485f0e5b63ca899aa4feb3eab121f7a19fa67821de7aeb5499810ae998dada973dda375e247c978ad1e5769c2080d91394ffc1028921712bc42b63 AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc -DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 -EBUILD libzip-1.5.1.ebuild 1906 BLAKE2B 1fa9eb69305913a45f96969003a415bab5c74a3abd515930e681fd16d5597ff378c55207182170e153f5d49b7d82e24b35f147b752fb21ad978d82eb796368c0 SHA512 f01ffc83940b6f3e9d3eeb96a21a83eec834c518d7da80c631a63673169683472c0e48432dce759fbb6ec17e3fee25e52bc9af94d787806a74fc14f83c96a04b +DIST libzip-1.6.0.tar.xz 732812 BLAKE2B 9023994e3f0a6e893ab42e2f2951b4b32ee8c1f6ea265a9481e32293c0ea229e364f00d9340cdc22404aa7ab7a294ff297ea9e821c2d1ad8486eb8b5301b637b SHA512 a173bebc0a199d65d9e2d5e5adf65eb10e9d3a1c409006b3f78e3453aa6166d825fea20e818e725f5d3c6b63137023a2cccb7fb2a1da50a88c4f5f057cf879f8 EBUILD libzip-1.5.2-r2.ebuild 2280 BLAKE2B f102a555784cab5a21fa0e49d5d2d965b1af8739551a02ce7a8c901ca6ad9dc5d40430fe263f561482d3f528d7ea94d52a3d23e3e346523b0842c20c38299b6d SHA512 f6d34b19bc4ae80a8b57dc7ee5f23f86b659dccfb8a1c0891fd8d94e88d99466759b2d62b416d79cca10fc572a478900d3ce98e185f95c20ba6c6e7d6bb5a817 +EBUILD libzip-1.6.0.ebuild 2269 BLAKE2B 69fea9eddb814fe679679ab4ca3aca249c61a883a72c9a61d5586d55ec4ad956271cc8cca3fb090c9c3f00833aa2029bdb20e68af6689f6f06789c2370dd133d SHA512 338e80c3e39f1cb15f93c770271d27eb5bb6aebe3a394cf9290097b68c10030b28d4a53431e5b144dac1683d5f40adf55e71a5d3cb1fc993b906101f924c3d03 MISC metadata.xml 411 BLAKE2B 9b9ed5a214bd0ada5651c71831f103af8729535fb0ddc43cbab1ccb14cbfcd4103052b2549b739ded6caca6dc9f65bac346a00ed55806e37c77de367980b1bef SHA512 16b33f8e04a089007c9744141f12d04df43f1a733aed098fc6759d68616849b884180cdbafaf6694c8553de86dddb95864beeb76447f3dc241b83846ef651e3d diff --git a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch deleted file mode 100644 index 9b70eaca8e87..000000000000 --- a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 028c492c9d45ca29e2fbec79a203ba492016f15e Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -Date: Fri, 7 Sep 2018 23:12:36 +0200 -Subject: [PATCH] Add an option to disable bzip2 support - -The explicit switch is still on by default, but this way it's possible -to explicitly disable bzip2 support even if bzip2 is available on the -system. - -This is useful if bzip2 is not needed, but would automatically lead to -an unwanted dependency. ---- - CMakeLists.txt | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73a34855..879e0f21 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,6 +10,7 @@ PROJECT(libzip C) - OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON) - OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) - OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) -+OPTION(ENABLE_BZIP2 "Enable use of BZip2" ON) - - OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON) - OPTION(BUILD_REGRESS "Build regression tests" ON) -@@ -186,15 +187,17 @@ IF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2") - MESSAGE(FATAL_ERROR "-- ZLIB version too old, please install at least v1.1.2") - ENDIF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2") - --FIND_PACKAGE(BZip2) --IF(BZIP2_FOUND) -- SET (HAVE_LIBBZ2 1) -+IF(ENABLE_BZIP2) -+ FIND_PACKAGE(BZip2) -+ IF(BZIP2_FOUND) -+ SET (HAVE_LIBBZ2 1) - -- INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) -- SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY}) --ELSE() -- MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled") --ENDIF(BZIP2_FOUND) -+ INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) -+ SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY}) -+ ELSE() -+ MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled") -+ ENDIF(BZIP2_FOUND) -+ENDIF(ENABLE_BZIP2) - - IF (COMMONCRYPTO_FOUND) - SET (HAVE_CRYPTO 1) diff --git a/dev-libs/libzip/files/libzip-1.5.1-options.patch b/dev-libs/libzip/files/libzip-1.5.1-options.patch deleted file mode 100644 index 0cca187d90a0..000000000000 --- a/dev-libs/libzip/files/libzip-1.5.1-options.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b6e53cce5370fba88299f9ed2944ab8a7a4cef5c Mon Sep 17 00:00:00 2001 -From: Florian Delizy -Date: Tue, 7 Aug 2018 22:09:32 +0800 -Subject: [PATCH] adding BUILD_TOOLS BUILD_REGRESS BUILD_EXAMPLES BUILD_DOC - options (default ON) - ---- - CMakeLists.txt | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 69e6548e..def25607 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,11 @@ OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON) - OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) - OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) - -+OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON) -+OPTION(BUILD_REGRESS "Build regression tests" ON) -+OPTION(BUILD_EXAMPLES "Build examples" ON) -+OPTION(BUILD_DOC "Build documentation" ON) -+ - INCLUDE(CheckFunctionExists) - INCLUDE(CheckIncludeFiles) - INCLUDE(CheckSymbolExists) -@@ -234,10 +239,23 @@ ENABLE_TESTING() - - # Targets - ADD_SUBDIRECTORY(lib) -+ -+IF(BUILD_DOC) - ADD_SUBDIRECTORY(man) -+ENDIF() -+ -+IF(BUILD_TOOLS) - ADD_SUBDIRECTORY(src) -+ENDIF() -+ -+IF(BUILD_REGRESS) - ADD_SUBDIRECTORY(regress) -+ENDIF() -+ -+IF(BUILD_EXAMPLES) - ADD_SUBDIRECTORY(examples) -+ENDIF() -+ - - # pkgconfig file - SET(prefix ${CMAKE_INSTALL_PREFIX}) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild deleted file mode 100644 index e28826e21828..000000000000 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils multibuild - -DESCRIPTION="Library for manipulating zip archives" -HOMEPAGE="https://nih.at/libzip/" -SRC_URI="https://www.nih.at/libzip/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0/5" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="bzip2 doc gnutls libressl ssl static-libs test" -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-options.patch" - "${FILESDIR}/${P}-bzip2.patch" -) - -pkg_setup() { - # Upstream doesn't support building dynamic & static - # simultaneously: https://github.com/nih-at/libzip/issues/76 - MULTIBUILD_VARIANTS=( shared $(usev static-libs) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=OFF # nothing is installed - -DENABLE_COMMONCRYPTO=OFF # not in tree - -DENABLE_BZIP2=$(usex bzip2) - ) - if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then - mycmakeargs+=( - -DBUILD_DOC=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_SHARED_LIBS=OFF - -DBUILD_TOOLS=OFF - ) - else - mycmakeargs+=( - -DBUILD_DOC=$(usex doc) - -DBUILD_REGRESS=$(usex test) - ) - fi - - if use ssl; then - mycmakeargs+=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_OPENSSL=$(usex !gnutls) - ) - else - mycmakeargs+=( - -DENABLE_GNUTLS=OFF - -DENABLE_OPENSSL=OFF - ) - fi - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} diff --git a/dev-libs/libzip/libzip-1.6.0.ebuild b/dev-libs/libzip/libzip-1.6.0.ebuild new file mode 100644 index 000000000000..71e055e5470a --- /dev/null +++ b/dev-libs/libzip/libzip-1.6.0.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake multibuild + +DESCRIPTION="Library for manipulating zip archives" +HOMEPAGE="https://nih.at/libzip/" +SRC_URI="https://www.nih.at/libzip/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0/5" +KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" +RESTRICT="!test? ( test )" + +DEPEND=" + sys-libs/zlib + bzip2? ( app-arch/bzip2:= ) + lzma? ( app-arch/lzma:= ) + ssl? ( + gnutls? ( + dev-libs/nettle:0= + >=net-libs/gnutls-3.6.5:= + ) + !gnutls? ( + mbedtls? ( net-libs/mbedtls:= ) + !mbedtls? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) + ) +" +RDEPEND="${DEPEND}" + +pkg_setup() { + # Upstream doesn't support building dynamic & static + # simultaneously: https://github.com/nih-at/libzip/issues/76 + MULTIBUILD_VARIANTS=( shared $(usev static-libs) ) +} + +src_configure() { + myconfigure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF # nothing is installed + -DENABLE_COMMONCRYPTO=OFF # not in tree + -DENABLE_BZIP2=$(usex bzip2) + -DENABLE_LZMA=$(usex lzma) + ) + if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then + mycmakeargs+=( + -DBUILD_DOC=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_SHARED_LIBS=OFF + -DBUILD_TOOLS=OFF + ) + else + mycmakeargs+=( + -DBUILD_DOC=$(usex doc) + -DBUILD_REGRESS=$(usex test) + ) + fi + + if use ssl; then + if use gnutls; then + mycmakeargs+=( + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_MBEDTLS=OFF + -DENABLE_OPENSSL=OFF + ) + elif use mbedtls; then + mycmakeargs+=( + -DENABLE_GNUTLS=OFF + -DENABLE_MBEDTLS=$(usex mbedtls) + -DENABLE_OPENSSL=OFF + ) + else + mycmakeargs+=( + -DENABLE_GNUTLS=OFF + -DENABLE_MBEDTLS=OFF + -DENABLE_OPENSSL=ON + ) + fi + else + mycmakeargs+=( + -DENABLE_GNUTLS=OFF + -DENABLE_MBEDTLS=OFF + -DENABLE_OPENSSL=OFF + ) + fi + cmake_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_test() { + [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test +} + +src_install() { + multibuild_foreach_variant cmake_src_install +} -- cgit v1.2.3