From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-libs/libzip/Manifest | 2 +- dev-libs/libzip/libzip-1.8.0-r1.ebuild | 116 +++++++++++++++++++++++++++++++++ dev-libs/libzip/libzip-1.8.0.ebuild | 114 -------------------------------- 3 files changed, 117 insertions(+), 115 deletions(-) create mode 100644 dev-libs/libzip/libzip-1.8.0-r1.ebuild delete mode 100644 dev-libs/libzip/libzip-1.8.0.ebuild (limited to 'dev-libs/libzip') diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index cbb5e96b826f..c8aa9c6b5eeb 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,3 +1,3 @@ DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e -EBUILD libzip-1.8.0.ebuild 2377 BLAKE2B dfcff8979333cb16b1ab1af1e9a9589177f2d29348ebeea02e84becc73dd3d3748c9e4e4b6d51f657f12b2ccb6665fca491b11613643633fcba425f915d5c330 SHA512 3d596a6173000f4cb441f1e334646521f812bf13c431d880b2e88a5a0457bc91c9ef4da6dfe8088ccde5f629728602b5250b3a2c1e3d781582081866b43a38df +EBUILD libzip-1.8.0-r1.ebuild 2437 BLAKE2B 45d8062185a433a80f329d3459cd23a4dbfa719190f92daab4861c6fb506404410368abf75fa8edef0d12719dcf88a5559097bbba2d25ae20ec124ea929fd17d SHA512 74f2a2d40c44cb947d12a5c51935e5371941b4cd0ca97a2fc8d5333b9718825a94132ecb7eddaf049aa4bace6d0d04855637ebc3c3b18ec23c27208352eddb1d MISC metadata.xml 510 BLAKE2B cd0e88d175985805badcbe4b6aa771fd65ab9e8e86a3d37e18531e61ef9fac92ba191ba4a3806c37743a51541b1f353f5bf58b7195898de74eb2c389623a6994 SHA512 e073a6f074e9d5dc8abffada8338c608915527ab3c76f693cd261c6a99aef73e18c0e0088d508d62032619f779f1c6d9445cdd0273aeb61e41b9e3b449762337 diff --git a/dev-libs/libzip/libzip-1.8.0-r1.ebuild b/dev-libs/libzip/libzip-1.8.0-r1.ebuild new file mode 100644 index 000000000000..63d0cba908af --- /dev/null +++ b/dev-libs/libzip/libzip-1.8.0-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake multibuild flag-o-matic + +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 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd" +REQUIRED_USE="test? ( tools )" + +RESTRICT="!test? ( test )" + +DEPEND=" + sys-libs/zlib + bzip2? ( app-arch/bzip2:= ) + lzma? ( app-arch/xz-utils ) + ssl? ( + gnutls? ( + dev-libs/nettle:0= + >=net-libs/gnutls-3.6.5:= + ) + !gnutls? ( + mbedtls? ( net-libs/mbedtls:= ) + !mbedtls? ( dev-libs/openssl:0= ) + ) + ) + zstd? ( app-arch/zstd ) +" +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() { + append-lfs-flags + myconfigure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF # nothing is installed + -DENABLE_COMMONCRYPTO=OFF # not in tree + -DENABLE_BZIP2=$(usex bzip2) + -DENABLE_LZMA=$(usex lzma) + -DENABLE_ZSTD=$(usex zstd) + ) + if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then + mycmakeargs+=( + -DBUILD_DOC=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_SHARED_LIBS=OFF + -DBUILD_TOOLS=OFF + ) + else + mycmakeargs+=( + -DBUILD_DOC=ON + -DBUILD_REGRESS=$(usex test) + -DBUILD_TOOLS=$(usex tools) + ) + 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() { + run_tests() { + [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test + } + + multibuild_foreach_variant run_tests +} + +src_install() { + multibuild_foreach_variant cmake_src_install +} diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild deleted file mode 100644 index b5bd1678c9c4..000000000000 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake multibuild flag-o-matic - -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 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" -REQUIRED_USE="test? ( tools )" - -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/zlib - bzip2? ( app-arch/bzip2:= ) - lzma? ( app-arch/xz-utils ) - ssl? ( - gnutls? ( - dev-libs/nettle:0= - >=net-libs/gnutls-3.6.5:= - ) - !gnutls? ( - mbedtls? ( net-libs/mbedtls:= ) - !mbedtls? ( dev-libs/openssl: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() { - append-lfs-flags - 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=ON - -DBUILD_REGRESS=$(usex test) - -DBUILD_TOOLS=$(usex tools) - ) - 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() { - run_tests() { - [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test - } - - multibuild_foreach_variant run_tests -} - -src_install() { - multibuild_foreach_variant cmake_src_install -} -- cgit v1.2.3