[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 0655df9629e84fcff1a458261220adcc09571008 Author: Sam James gentoo org> AuthorDate: Mon Oct 17 23:03:13 2022 + Commit: Sam James gentoo org> CommitDate: Mon Oct 17 23:08:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0655df96 dev-libs/libzip: add github upstream metadata Signed-off-by: Sam James gentoo.org> dev-libs/libzip/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml index e8ddaca4fc3b..fb236457f255 100644 --- a/dev-libs/libzip/metadata.xml +++ b/dev-libs/libzip/metadata.xml @@ -7,6 +7,7 @@ cpe:/a:nih:libzip + nih-at/libzip Use net-libs/mbedtls as TLS provider
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 743c3a11f723b2a842a9792b1577661f4347a83f Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Aug 1 19:53:04 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Aug 1 19:53:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743c3a11 dev-libs/libzip: drop 1.8.0-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 - dev-libs/libzip/libzip-1.8.0-r1.ebuild | 116 - 2 files changed, 117 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 73d3a2adfe6b..01ddc1b30655 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5 diff --git a/dev-libs/libzip/libzip-1.8.0-r1.ebuild b/dev-libs/libzip/libzip-1.8.0-r1.ebuild deleted file mode 100644 index 2da9c9ac1ee2.. --- a/dev-libs/libzip/libzip-1.8.0-r1.ebuild +++ /dev/null @@ -1,116 +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 ~loong ~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 -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: a0a36cf027c8a7c09ab0558b10015aaa45716a35 Author: matoro users noreply github com> AuthorDate: Mon Aug 1 05:39:12 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Aug 1 14:17:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a36cf0 dev-libs/libzip: Stabilize 1.9.2 sparc, #860801 Signed-off-by: matoro users.noreply.github.com> Closes: https://github.com/gentoo/gentoo/pull/26691 Signed-off-by: Jakov Smolić gentoo.org> dev-libs/libzip/libzip-1.9.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild index 1e1425303962..195d947e2730 100644 --- a/dev-libs/libzip/libzip-1.9.2.ebuild +++ b/dev-libs/libzip/libzip-1.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 2d80b8ef20b595cd87b15a5ce2345f3aec8b80d7 Author: Sam James gentoo org> AuthorDate: Sun Jul 24 23:23:08 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jul 24 23:23:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d80b8ef dev-libs/libzip: Stabilize 1.9.2 x86, #860801 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.9.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild index 0212f9c81975..1e1425303962 100644 --- a/dev-libs/libzip/libzip-1.9.2.ebuild +++ b/dev-libs/libzip/libzip-1.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 6bdf02fdebd64ac228fbb47addf45a45080e0b74 Author: Sam James gentoo org> AuthorDate: Thu Jul 21 00:29:22 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jul 21 00:29:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bdf02fd dev-libs/libzip: Stabilize 1.9.2 hppa, #856823 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.9.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild index 455be6358249..0212f9c81975 100644 --- a/dev-libs/libzip/libzip-1.9.2.ebuild +++ b/dev-libs/libzip/libzip-1.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 1e3aeff22c8c5f600344571e27f239701c5364fa Author: Sam James gentoo org> AuthorDate: Thu Jul 21 00:25:10 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jul 21 00:25:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3aeff2 dev-libs/libzip: Stabilize 1.9.2 ppc, #856823 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.9.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild index 20517344615c..5773e2fc9290 100644 --- a/dev-libs/libzip/libzip-1.9.2.ebuild +++ b/dev-libs/libzip/libzip-1.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: f08c9efcfc19eebb70f85c9542df6fa0d10a788c Author: Sam James gentoo org> AuthorDate: Thu Jul 21 00:25:14 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jul 21 00:25:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08c9efc dev-libs/libzip: Stabilize 1.9.2 ppc64, #856823 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.9.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild index 5773e2fc9290..455be6358249 100644 --- a/dev-libs/libzip/libzip-1.9.2.ebuild +++ b/dev-libs/libzip/libzip-1.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 99fdcfcb7d1b3571cf6b811a72c1c5a1b7b02988 Author: Sam James gentoo org> AuthorDate: Wed Jul 20 05:44:28 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jul 20 05:48:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99fdcfcb dev-libs/libzip: Stabilize 1.9.2 arm64, #856823 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.9.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild index dfd54862a5e1..20517344615c 100644 --- a/dev-libs/libzip/libzip-1.9.2.ebuild +++ b/dev-libs/libzip/libzip-1.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 08c178a4095ddab9c9cc330eeeb486afb4b20be4 Author: Sam James gentoo org> AuthorDate: Wed Jul 20 02:50:16 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jul 20 02:50:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c178a4 dev-libs/libzip: Stabilize 1.9.2 arm, #856823 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.9.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild index 0a706c57e930..d9b61ee98cdb 100644 --- a/dev-libs/libzip/libzip-1.9.2.ebuild +++ b/dev-libs/libzip/libzip-1.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: e642d2a7f315209b81e721c2954d76fdc576d281 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 29 20:28:23 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 29 20:28:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e642d2a7 dev-libs/libzip: 1.9.2 version bump Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.9.2.ebuild | 116 2 files changed, 117 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 421c0fa8a412..2e68b36d9edb 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1,3 @@ DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e DIST libzip-1.9.0.tar.xz 763704 BLAKE2B 204952e96ddcff0d799cd7f4ce4be868aad6f6555999673eba9bd85382ab26546f6423034fa68461009d095d4a2513b490b2b144aca0caa8c0be0980b35ba124 SHA512 dd0c7046f5b1faf00690774572982e870edaa1819563f9ebf7caf823c9c5718623576a7135a64c9acfed9cefac5601cf944b7aa0b623986f5c85743f3014b349 +DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5 diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild new file mode 100644 index ..0a706c57e930 --- /dev/null +++ b/dev-libs/libzip/libzip-1.9.2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 ~loong ~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+=( +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 7ac5d24168746dfe6f957993dbdfd771fd94ea45 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 08:04:27 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 14 08:04:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac5d241 dev-libs/libzip: 1.9.0 version bump See also: https://libzip.org/news/release-1.9.0.html Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.9.0.ebuild | 116 2 files changed, 117 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 38df18044128..421c0fa8a412 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1 +1,2 @@ DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e +DIST libzip-1.9.0.tar.xz 763704 BLAKE2B 204952e96ddcff0d799cd7f4ce4be868aad6f6555999673eba9bd85382ab26546f6423034fa68461009d095d4a2513b490b2b144aca0caa8c0be0980b35ba124 SHA512 dd0c7046f5b1faf00690774572982e870edaa1819563f9ebf7caf823c9c5718623576a7135a64c9acfed9cefac5601cf944b7aa0b623986f5c85743f3014b349 diff --git a/dev-libs/libzip/libzip-1.9.0.ebuild b/dev-libs/libzip/libzip-1.9.0.ebuild new file mode 100644 index ..0a706c57e930 --- /dev/null +++ b/dev-libs/libzip/libzip-1.9.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 ~loong ~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 +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 2d53ec8afe75f4e28d5840d4c6e31888694c358f Author: WANG Xuerui gentoo org> AuthorDate: Tue May 17 12:41:09 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Tue May 17 12:48:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d53ec8a dev-libs/libzip: keyword 1.8.0-r1 for ~loong Tests passed on real hardware. Signed-off-by: WANG Xuerui gentoo.org> dev-libs/libzip/libzip-1.8.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0-r1.ebuild b/dev-libs/libzip/libzip-1.8.0-r1.ebuild index 63d0cba908af..2da9c9ac1ee2 100644 --- a/dev-libs/libzip/libzip-1.8.0-r1.ebuild +++ b/dev-libs/libzip/libzip-1.8.0-r1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 482acd6a90760b9b5712df63689bb6ebd7d7bb79 Author: Liam Flaherty chromium org> AuthorDate: Thu Feb 24 07:43:30 2022 + Commit: Sam James gentoo org> CommitDate: Sat Feb 26 02:10:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482acd6a dev-libs/libzip: Add zstd build options [sam: revbump for automagic fix] Signed-off-by: Liam Flaherty chromium.org> Closes: https://github.com/gentoo/gentoo/pull/24343 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/{libzip-1.8.0.ebuild => libzip-1.8.0-r1.ebuild} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0-r1.ebuild similarity index 95% rename from dev-libs/libzip/libzip-1.8.0.ebuild rename to dev-libs/libzip/libzip-1.8.0-r1.ebuild index b5bd1678c9c4..63d0cba908af 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0-r1.ebuild @@ -12,7 +12,7 @@ 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" +IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd" REQUIRED_USE="test? ( tools )" RESTRICT="!test? ( test )" @@ -31,6 +31,7 @@ DEPEND=" !mbedtls? ( dev-libs/openssl:0= ) ) ) + zstd? ( app-arch/zstd ) " RDEPEND="${DEPEND}" @@ -48,6 +49,7 @@ src_configure() { -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+=(
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: acdca3bd277a7b34fcde51df002dd83521251655 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 19 07:32:51 2022 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 19 07:47:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdca3bd dev-libs/libzip-1.8.0: marked ~x64-macos Closes: https://bugs.gentoo.org/831444 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Fabian Groffen gentoo.org> dev-libs/libzip/libzip-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild index 75dc43584331..b5bd1678c9c4 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -11,7 +11,7 @@ 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" +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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 01a294a7c02b60ca3147f05d74bfdfef762d498e Author: James Le Cuirot gentoo org> AuthorDate: Sat Jan 1 11:52:35 2022 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Jan 1 11:52:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a294a7 dev-libs/libzip: Keyword 1.8.0 for ~m68k The tests pass. Signed-off-by: James Le Cuirot gentoo.org> dev-libs/libzip/libzip-1.8.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild index 1e84155026e6..75dc43584331 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 66f38b2cd49e9131ddb3dbb3d5e4a4e65dd5bdfa Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 8 06:23:12 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 8 06:23:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f38b2c dev-libs/libzip: Drop 1.7.3-r1 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 - .../libzip/files/libzip-1.7.3-missing-header.patch | 43 dev-libs/libzip/libzip-1.7.3-r1.ebuild | 116 - 3 files changed, 160 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index cfd516e3bb7..38df1804412 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870 DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e diff --git a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch deleted file mode 100644 index bebe3802841..000 --- a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=98rjan=20Malde?= -Date: Wed, 15 Jul 2020 12:16:16 +0200 -Subject: [PATCH] Include limits.h for INT_MAX - - lib/zip_crypto_openssl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c -index 1cb00479..60f92758 100644 a/lib/zip_crypto_openssl.c -+++ b/lib/zip_crypto_openssl.c -@@ -38,6 +38,7 @@ - #include "zip_crypto.h" - - #include -+#include - - #if OPENSSL_VERSION_NUMBER < 0x101fL || defined(LIBRESSL_VERSION_NUMBER) - #define USE_OPENSSL_1_0_API - -From b4a4f778806fe2c3ca9ec57c0411a8dcf462e655 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Wed, 15 Jul 2020 12:38:07 +0200 -Subject: [PATCH] Include limits.h for INT_MAX. - - lib/zip_crypto_mbedtls.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/zip_crypto_mbedtls.c b/lib/zip_crypto_mbedtls.c -index c348ad2a..7063c6b6 100644 a/lib/zip_crypto_mbedtls.c -+++ b/lib/zip_crypto_mbedtls.c -@@ -41,6 +41,7 @@ - #include - #include - -+#include - - _zip_crypto_aes_t * - _zip_crypto_aes_new(const zip_uint8_t *key, zip_uint16_t key_size, zip_error_t *error) { diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild deleted file mode 100644 index 4d7fa7066ed..000 --- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -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}" - -PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) # bug 733326 - -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 -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 1475ddfad8e8d3789138a0a7cf022b0eab31aa59 Author: Sam James gentoo org> AuthorDate: Wed Sep 8 00:43:06 2021 + Commit: Sam James gentoo org> CommitDate: Wed Sep 8 00:43:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1475ddfa dev-libs/libzip: Stabilize 1.8.0 x86, #806294 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild index e7bae79941c..1e84155026e 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -11,7 +11,7 @@ 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 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 1b73218b10c1b2f8d6eda1b3c456fa4ccacbdd95 Author: Sam James gentoo org> AuthorDate: Mon Aug 9 01:17:31 2021 + Commit: Sam James gentoo org> CommitDate: Mon Aug 9 01:17:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b73218b dev-libs/libzip: Stabilize 1.8.0 ppc64, #806294 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild index b927a18bb32..704f2b4f89c 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -11,7 +11,7 @@ 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 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: e1b84182cf61e7ecd117ce1236a7a2e3dce89f75 Author: Sam James gentoo org> AuthorDate: Mon Aug 9 01:17:16 2021 + Commit: Sam James gentoo org> CommitDate: Mon Aug 9 01:17:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b84182 dev-libs/libzip: Stabilize 1.8.0 ppc, #806294 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild index ad4328e563b..b927a18bb32 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -11,7 +11,7 @@ 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 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 62c6f8a7222a05ea84c46b1840fe8492654b32ce Author: Sam James gentoo org> AuthorDate: Sat Aug 7 14:40:35 2021 + Commit: Sam James gentoo org> CommitDate: Sat Aug 7 14:40:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c6f8a7 dev-libs/libzip: Stabilize 1.8.0 amd64, #806294 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild index 551feb1e552..ad4328e563b 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -11,7 +11,7 @@ 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 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 55cb53fc946692a8c98ee2512d869846a7f7099f Author: Sam James gentoo org> AuthorDate: Thu Aug 5 14:09:38 2021 + Commit: Sam James gentoo org> CommitDate: Thu Aug 5 14:09:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55cb53fc dev-libs/libzip: Stabilize 1.8.0 arm, #806294 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild index cf33eb3647a..551feb1e552 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -11,7 +11,7 @@ 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 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: f6e001735d2ee06e3a013bf203a8e5af8005d397 Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Aug 5 10:08:35 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Aug 5 11:10:53 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e00173 dev-libs/libzip: stable 1.8.0 for hppa/sparc, bug #806294 Package-Manager: Portage-3.0.20, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild index 85789584b71..cf33eb3647a 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -11,7 +11,7 @@ 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: d1d83dbe60cb661910de4c5da5338bf0c68163f0 Author: Ye Cao rioslab org> AuthorDate: Thu Jun 24 10:11:10 2021 + Commit: Yixun Lan gentoo org> CommitDate: Fri Jun 25 01:27:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d83dbe dev-libs/libzip: add ~riscv keyword Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ye Cao rioslab.org> Signed-off-by: Yixun Lan gentoo.org> dev-libs/libzip/libzip-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild index 858fde7ef4d..85789584b71 100644 --- a/dev-libs/libzip/libzip-1.8.0.ebuild +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: a5b7b6aea6930e4f81e82a53f2f65600c9ae11e8 Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Jun 24 20:13:58 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Jun 24 21:03:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b7b6ae dev-libs/libzip: stable 1.7.3-r1 for hppa, bug #796941 Package-Manager: Portage-3.0.20, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.7.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild index 889bec7371e..4d7fa7066ed 100644 --- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild +++ b/dev-libs/libzip/libzip-1.7.3-r1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 9f7b4a37b5b8670957662e8f4e16a0926da371c8 Author: Sam James gentoo org> AuthorDate: Sun Jun 20 19:51:34 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jun 20 19:59:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f7b4a37 dev-libs/libzip: add 1.8.0 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.8.0.ebuild | 114 2 files changed, 115 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 6f8f0a99134..cfd516e3bb7 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1 +1,2 @@ DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870 +DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild new file mode 100644 index 000..858fde7ef4d --- /dev/null +++ b/dev-libs/libzip/libzip-1.8.0.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2021 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +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_con
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 4dd131e17546b66d1f02cdbc9d2ea7c488d9d891 Author: Sam James gentoo org> AuthorDate: Sun Jun 20 19:51:26 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jun 20 19:59:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd131e1 dev-libs/libzip: fix running tests with multibuild Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.7.3-r1.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild index 4426e7855d1..889bec7371e 100644 --- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild +++ b/dev-libs/libzip/libzip-1.7.3-r1.ebuild @@ -104,7 +104,11 @@ src_compile() { } src_test() { - [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test + run_tests() { + [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test + } + + multibuild_foreach_variant run_tests } src_install() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: b68f75ced2dd0ea6843ad4ac2f012bdcac698295 Author: François Degros chromium org> AuthorDate: Wed Apr 28 00:21:41 2021 + Commit: Sam James gentoo org> CommitDate: Mon May 17 21:00:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b68f75ce dev-libs/libzip: Add large file support (LFS) This is needed to handle big ZIPs (4+GB) on 32-bit devices. Bug: https://bugs.gentoo.org/471102 Signed-off-by: François Degros chromium.org> Closes: https://github.com/gentoo/gentoo/pull/20564 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/{libzip-1.7.3.ebuild => libzip-1.7.3-r1.ebuild} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild similarity index 97% rename from dev-libs/libzip/libzip-1.7.3.ebuild rename to dev-libs/libzip/libzip-1.7.3-r1.ebuild index 82713f354e1..4426e7855d1 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake multibuild +inherit cmake multibuild flag-o-matic DESCRIPTION="Library for manipulating zip archives" HOMEPAGE="https://nih.at/libzip/"; @@ -43,6 +43,7 @@ pkg_setup() { } src_configure() { + append-lfs-flags myconfigure() { local mycmakeargs=( -DBUILD_EXAMPLES=OFF # nothing is installed
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 854cd1dc9926736f29dff05e8fee1c34451797e1 Author: Mikle Kolyada gentoo org> AuthorDate: Sat May 1 07:19:58 2021 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat May 1 07:19:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854cd1dc dev-libs/libzip: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> dev-libs/libzip/libzip-1.7.3.ebuild | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index 626153d5f73..82713f354e1 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -12,7 +12,7 @@ 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" -IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools" +IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )" RESTRICT="!test? ( test )" @@ -28,10 +28,7 @@ DEPEND=" ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) - !mbedtls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + !mbedtls? ( dev-libs/openssl:0= ) ) ) "
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 872afa10abf13db9186fe925890b1eed5dd19de8 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 6 19:28:00 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 6 19:33:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872afa10 dev-libs/libzip: drop x86-macos Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> dev-libs/libzip/libzip-1.7.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index 9b1dc59f268..626153d5f73 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: c643d1695ac24b19ac2d0bf1e17f523256774902 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 8 17:04:22 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 8 18:07:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c643d169 dev-libs/libzip: Drop 1.6.1-r1 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 - dev-libs/libzip/libzip-1.6.1-r1.ebuild | 109 - 2 files changed, 110 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index be8065cef85..6f8f0a99134 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870 diff --git a/dev-libs/libzip/libzip-1.6.1-r1.ebuild b/dev-libs/libzip/libzip-1.6.1-r1.ebuild deleted file mode 100644 index b8389696d92..000 --- a/dev-libs/libzip/libzip-1.6.1-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# 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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc 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/xz-utils ) - 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 -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: a32d6dd0b7671caa6b97d944c01e5317f530b55f Author: Sam James gentoo org> AuthorDate: Tue Sep 1 20:05:00 2020 + Commit: Sam James gentoo org> CommitDate: Tue Sep 1 20:05:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a32d6dd0 dev-libs/libzip: Stabilize 1.7.3 amd64, #738384 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.7.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index 515c418de76..fe0d6941567 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: fa4ce335924f7d1ea280f431b5b7d2167a1a8ea1 Author: Sam James gentoo org> AuthorDate: Sat Aug 29 20:02:13 2020 + Commit: Sam James gentoo org> CommitDate: Sat Aug 29 20:02:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4ce335 dev-libs/libzip: Stabilize 1.7.3 arm, #738384 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.7.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index 5140c9eddc0..515c418de76 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: f1ebddd3288a3a6b7be058249e2b7ce275f18084 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Aug 29 17:46:41 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Aug 29 17:56:49 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ebddd3 dev-libs/libzip: x86 stable (bug #738384) Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> dev-libs/libzip/libzip-1.7.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index 2953f97bb22..5140c9eddc0 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 183bc6cc959d4c3f08df54ba862f4d9d9e8f101a Author: Rolf Eike Beer sf-mail de> AuthorDate: Mon Aug 24 15:34:43 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Aug 24 17:33:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183bc6cc dev-libs/libzip: stable 1.7.3 for hppa/sparc, bug #738384 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="hppa sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.7.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index 436fb248703..2953f97bb22 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: aa7373a1ff858f29152d4f4d39ab1ea3a0bdd31a Author: Sam James gentoo org> AuthorDate: Sun Aug 23 16:57:25 2020 + Commit: Sam James gentoo org> CommitDate: Sun Aug 23 16:57:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa7373a1 dev-libs/libzip: Stabilize 1.7.3 arm64, #738384 Signed-off-by: Sam James gentoo.org> dev-libs/libzip/libzip-1.7.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index 1f81a4ee336..436fb248703 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools" REQUIRED_USE="test? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/
commit: 19c3e94aa0d6f570381cd5f57e13c0e7925077c0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 21 16:45:11 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 21 17:32:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c3e94a dev-libs/libzip: Add missing limits.h includes Thanks-to: Reuben Farrelly reub.net> Closes: https://bugs.gentoo.org/733326 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../libzip/files/libzip-1.7.3-missing-header.patch | 43 ++ dev-libs/libzip/libzip-1.7.3.ebuild| 2 + 2 files changed, 45 insertions(+) diff --git a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch new file mode 100644 index 000..bebe3802841 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch @@ -0,0 +1,43 @@ +From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98rjan=20Malde?= +Date: Wed, 15 Jul 2020 12:16:16 +0200 +Subject: [PATCH] Include limits.h for INT_MAX + +--- + lib/zip_crypto_openssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c +index 1cb00479..60f92758 100644 +--- a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c +@@ -38,6 +38,7 @@ + #include "zip_crypto.h" + + #include ++#include + + #if OPENSSL_VERSION_NUMBER < 0x101fL || defined(LIBRESSL_VERSION_NUMBER) + #define USE_OPENSSL_1_0_API + +From b4a4f778806fe2c3ca9ec57c0411a8dcf462e655 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Wed, 15 Jul 2020 12:38:07 +0200 +Subject: [PATCH] Include limits.h for INT_MAX. + +--- + lib/zip_crypto_mbedtls.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/zip_crypto_mbedtls.c b/lib/zip_crypto_mbedtls.c +index c348ad2a..7063c6b6 100644 +--- a/lib/zip_crypto_mbedtls.c b/lib/zip_crypto_mbedtls.c +@@ -41,6 +41,7 @@ + #include + #include + ++#include + + _zip_crypto_aes_t * + _zip_crypto_aes_new(const zip_uint8_t *key, zip_uint16_t key_size, zip_error_t *error) { diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild index 8edc5a80ac6..1f81a4ee336 100644 --- a/dev-libs/libzip/libzip-1.7.3.ebuild +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -37,6 +37,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) # bug 733326 + pkg_setup() { # Upstream doesn't support building dynamic & static # simultaneously: https://github.com/nih-at/libzip/issues/76
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: c4c76247367f825b76230e9fc222a07728c76d7c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 19 19:46:08 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 19 19:47:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c76247 dev-libs/libzip: Drop 1.7.1 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 - dev-libs/libzip/libzip-1.7.1.ebuild | 112 2 files changed, 113 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 4cb0d6504b6..be8065cef85 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,3 +1,2 @@ DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 -DIST libzip-1.7.1.tar.xz 737496 BLAKE2B bd4c73bf317fa767ff0ea3c10b7f2e96699dc7ed7bd05fdaf3c5d477cd42aa18b40627569498697be1b5360d43471a9b8132909781f8bd32bda6f46534e4a61b SHA512 e924749274e5e45b83ba4bc961bfd299b9dd05829c1f42880a9814f942dbf7afe79aa1ea4e2b33d6db1dba1f7f948c0de40517f2ef90cc8725650b8cb88d9a14 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870 diff --git a/dev-libs/libzip/libzip-1.7.1.ebuild b/dev-libs/libzip/libzip-1.7.1.ebuild deleted file mode 100644 index 8edc5a80ac6..000 --- a/dev-libs/libzip/libzip-1.7.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="bzip2 gnutls libressl 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? ( - !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=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+=( -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 1084b00fc0033816b7d909e17cda0f01512c224d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 19 19:41:28 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 19 19:47:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1084b00f dev-libs/libzip: 1.7.3 version bump Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.7.3.ebuild | 112 2 files changed, 113 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 6a081005c67..4cb0d6504b6 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1,3 @@ DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 DIST libzip-1.7.1.tar.xz 737496 BLAKE2B bd4c73bf317fa767ff0ea3c10b7f2e96699dc7ed7bd05fdaf3c5d477cd42aa18b40627569498697be1b5360d43471a9b8132909781f8bd32bda6f46534e4a61b SHA512 e924749274e5e45b83ba4bc961bfd299b9dd05829c1f42880a9814f942dbf7afe79aa1ea4e2b33d6db1dba1f7f948c0de40517f2ef90cc8725650b8cb88d9a14 +DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870 diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild new file mode 100644 index 000..8edc5a80ac6 --- /dev/null +++ b/dev-libs/libzip/libzip-1.7.3.ebuild @@ -0,0 +1,112 @@ +# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="bzip2 gnutls libressl 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? ( + !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=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+=( +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 96eb52f4a673a7d4d7e99fe8523a6db21c4ea4ab Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 21 13:08:28 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 21 14:47:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96eb52f4 dev-libs/libzip: Drop 1.7.0 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 - dev-libs/libzip/libzip-1.7.0.ebuild | 112 2 files changed, 113 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 101089bf203..6a081005c67 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,3 +1,2 @@ DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 -DIST libzip-1.7.0.tar.xz 737184 BLAKE2B 4442925b77ad336793ecc891e2c096c8b98457d193a5ebda239462ef5120b3e041b1882d56dc0c4c94d0f3c00e5117d04964af0a8827230f0dbf937a8b07a5fa SHA512 9c1632b4e0b4cfe22c5670d815bc8893d540226e3e64cf8cce7039a90bdc7048dedadb4804b151291e312c97bb384bd671e43021401c4c3e33a4e597972bc681 DIST libzip-1.7.1.tar.xz 737496 BLAKE2B bd4c73bf317fa767ff0ea3c10b7f2e96699dc7ed7bd05fdaf3c5d477cd42aa18b40627569498697be1b5360d43471a9b8132909781f8bd32bda6f46534e4a61b SHA512 e924749274e5e45b83ba4bc961bfd299b9dd05829c1f42880a9814f942dbf7afe79aa1ea4e2b33d6db1dba1f7f948c0de40517f2ef90cc8725650b8cb88d9a14 diff --git a/dev-libs/libzip/libzip-1.7.0.ebuild b/dev-libs/libzip/libzip-1.7.0.ebuild deleted file mode 100644 index 8edc5a80ac6..000 --- a/dev-libs/libzip/libzip-1.7.0.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="bzip2 gnutls libressl 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? ( - !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=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+=( -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: a4d813b3dd8c0309711c243c84ba80e88eaab9a4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 14 09:59:54 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 14 21:51:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d813b3 dev-libs/libzip: 1.7.1 version bump Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.7.1.ebuild | 112 2 files changed, 113 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 28a20f34cce..101089bf203 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1,3 @@ DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 DIST libzip-1.7.0.tar.xz 737184 BLAKE2B 4442925b77ad336793ecc891e2c096c8b98457d193a5ebda239462ef5120b3e041b1882d56dc0c4c94d0f3c00e5117d04964af0a8827230f0dbf937a8b07a5fa SHA512 9c1632b4e0b4cfe22c5670d815bc8893d540226e3e64cf8cce7039a90bdc7048dedadb4804b151291e312c97bb384bd671e43021401c4c3e33a4e597972bc681 +DIST libzip-1.7.1.tar.xz 737496 BLAKE2B bd4c73bf317fa767ff0ea3c10b7f2e96699dc7ed7bd05fdaf3c5d477cd42aa18b40627569498697be1b5360d43471a9b8132909781f8bd32bda6f46534e4a61b SHA512 e924749274e5e45b83ba4bc961bfd299b9dd05829c1f42880a9814f942dbf7afe79aa1ea4e2b33d6db1dba1f7f948c0de40517f2ef90cc8725650b8cb88d9a14 diff --git a/dev-libs/libzip/libzip-1.7.1.ebuild b/dev-libs/libzip/libzip-1.7.1.ebuild new file mode 100644 index 000..8edc5a80ac6 --- /dev/null +++ b/dev-libs/libzip/libzip-1.7.1.ebuild @@ -0,0 +1,112 @@ +# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="bzip2 gnutls libressl 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? ( + !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=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+=( +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 8800984b8209ba4faabf43392d4a500957afaa2f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 6 16:29:38 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 6 16:42:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8800984b dev-libs/libzip: 1.7.0 version bump, drop IUSE=doc, add IUSE=tools Unconditionally install manpages. Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.7.0.ebuild | 112 dev-libs/libzip/metadata.xml| 21 +++ 3 files changed, 124 insertions(+), 10 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 1f8806b1803..28a20f34cce 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1 +1,2 @@ DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 +DIST libzip-1.7.0.tar.xz 737184 BLAKE2B 4442925b77ad336793ecc891e2c096c8b98457d193a5ebda239462ef5120b3e041b1882d56dc0c4c94d0f3c00e5117d04964af0a8827230f0dbf937a8b07a5fa SHA512 9c1632b4e0b4cfe22c5670d815bc8893d540226e3e64cf8cce7039a90bdc7048dedadb4804b151291e312c97bb384bd671e43021401c4c3e33a4e597972bc681 diff --git a/dev-libs/libzip/libzip-1.7.0.ebuild b/dev-libs/libzip/libzip-1.7.0.ebuild new file mode 100644 index 000..8edc5a80ac6 --- /dev/null +++ b/dev-libs/libzip/libzip-1.7.0.ebuild @@ -0,0 +1,112 @@ +# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="bzip2 gnutls libressl 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? ( + !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=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 +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 143dda37b357fa949abd681742f465d8cb5f981e Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 9 23:20:18 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 9 23:20:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143dda37 dev-libs/libzip: Drop 1.5.2-r2 Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 - dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch | 23 - dev-libs/libzip/libzip-1.5.2-r2.ebuild | 109 --- 3 files changed, 133 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 0056bff2e49..1f8806b1803 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch deleted file mode 100644 index 564cc9b79f1..000 --- a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Tue, 2 Apr 2019 15:26:06 +0200 -Subject: [PATCH] mbedtls: link against the correct library - -Inspired by https://github.com/nih-at/libzip/pull/88 - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3f252b3f7..f8eb16eeb 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,7 @@ ELSE() - ENDIF() - IF(ENABLE_MBEDTLS) - FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h) -- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls) -+ FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto) - ELSE() - SET(MBEDTLS_LIBRARIES FALSE) - ENDIF() diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild deleted file mode 100644 index 7f74994f024..000 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2019 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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - 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}" - -PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 - -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 - if use gnutls; then - mycmakeargs+=( -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 46b64e45c3a55da7ea395497dd8fe5f6c55c5eff Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Apr 9 20:46:53 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Apr 9 22:01:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b64e45 dev-libs/libzip: stable 1.6.1-r1 for hppa, bug #710682 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.6.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1-r1.ebuild b/dev-libs/libzip/libzip-1.6.1-r1.ebuild index 5443afe0d87..b8389696d92 100644 --- a/dev-libs/libzip/libzip-1.6.1-r1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1-r1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: c5ecc7cb71b2932a90c5a4dc3a9ae1213d4d749e Author: Mart Raudsepp gentoo org> AuthorDate: Thu Mar 19 20:37:04 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Thu Mar 19 20:38:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ecc7cb dev-libs/libzip: arm64 stable (bug #710682) Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> dev-libs/libzip/libzip-1.6.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1-r1.ebuild b/dev-libs/libzip/libzip-1.6.1-r1.ebuild index 0d09edc25ab..e827414589a 100644 --- a/dev-libs/libzip/libzip-1.6.1-r1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1-r1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 956a273c69a479ae232a65c3b79cc83ef07024da Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 19 15:01:47 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 19 15:42:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956a273c dev-libs/libzip: Fix USE lzma DEPEND Closes: https://bugs.gentoo.org/712092 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/libzip-1.6.1-r1.ebuild | 109 + 1 file changed, 109 insertions(+) diff --git a/dev-libs/libzip/libzip-1.6.1-r1.ebuild b/dev-libs/libzip/libzip-1.6.1-r1.ebuild new file mode 100644 index 000..0d09edc25ab --- /dev/null +++ b/dev-libs/libzip/libzip-1.6.1-r1.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="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc 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/xz-utils ) + 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 223cb9c0cda081478db3fa7f87940943e19090fb Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 19 15:02:05 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 19 15:42:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=223cb9c0 dev-libs/libzip: Drop 1.6.1 (r0) Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 109 1 file changed, 109 deletions(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild deleted file mode 100644 index 74cf845fa65..000 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# 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="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc 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 -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 520f78796b6247044e641f75672d56d6e9cb9927 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 9 12:42:29 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 9 12:42:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520f7879 dev-libs/libzip: ppc64 stable wrt bug #710682 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index 791f76656da..74cf845fa65 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 5389b5b6a90c976003ae4434a92e7c3bb3d1014b Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 9 12:41:28 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 9 12:41:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5389b5b6 dev-libs/libzip: ia64 stable wrt bug #710682 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ia64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index 766747f198d..791f76656da 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 1b365c48db00ed8649d70ad2beaf9a529a16f886 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 9 12:38:32 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 9 12:38:32 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b365c48 dev-libs/libzip: amd64 stable wrt bug #710682 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index 7767c0ef5ae..766747f198d 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 2fb3c4ff82330d857813a3b719a68e78258ba204 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 9 11:17:10 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 9 11:17:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb3c4ff dev-libs/libzip: ppc stable wrt bug #710682 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index 38aa0b5c868..7767c0ef5ae 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 5afc9d956fd1753f54499bbeb530a810a38fe86c Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 9 10:48:52 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 9 10:48:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5afc9d95 dev-libs/libzip: arm stable wrt bug #710682 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="arm" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index e64c2832caa..38aa0b5c868 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 77aff3ba8a606d7ce6fbf34b7a39712d9ad3ffd8 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 9 10:23:25 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 9 10:23:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77aff3ba dev-libs/libzip: sparc stable wrt bug #710682 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index 1c887014f78..e64c2832caa 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: b13e81b3b0e0db97026fa8760f2cefb4395223b8 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Mar 8 23:19:14 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Mar 8 23:19:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b13e81b3 dev-libs/libzip: x86 stable (bug #710682) Package-Manager: Portage-2.3.91, Repoman-2.3.20 Signed-off-by: Thomas Deutschmann gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index 7a197ed42e6..1c887014f78 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 494ccf92c75ddeefd5d35fe0f4f940d2f3ad67f2 Author: Matt Turner gentoo org> AuthorDate: Mon Mar 2 07:29:12 2020 + Commit: Matt Turner gentoo org> CommitDate: Mon Mar 2 07:29:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494ccf92 dev-libs/libzip-1.6.1: add ~alpha, bug 706986 Signed-off-by: Matt Turner gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index 27ab2b357da..7a197ed42e6 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 06c6a96466b5081a1a27c40179d526abfa2f5a66 Author: Roy Bamford gentoo org> AuthorDate: Tue Feb 25 11:37:39 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 26 18:25:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c6a964 dev-libs/libzip: added ~arm64 keyword Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Roy Bamford gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index 5335c696a7b..27ab2b357da 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 28825761d8ba066ead3a0ceb774cdbcb4eae90e4 Author: Rolf Eike Beer sf-mail de> AuthorDate: Mon Feb 24 06:42:09 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Feb 24 08:20:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28825761 dev-libs/libzip: keyworded 1.6.1 for hppa, bug #706986 Package-Manager: Portage-2.3.84, Repoman-2.3.20 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild index 0e5d64337eb..5335c696a7b 100644 --- a/dev-libs/libzip/libzip-1.6.1.ebuild +++ b/dev-libs/libzip/libzip-1.6.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: a98dd28441fdf85c247e30c5a1c1bd795dbae7c7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 5 19:22:48 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 5 19:22:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a98dd284 dev-libs/libzip: 1.6.1 version bump, ~ppc keyworded, bug #706986 Thanks-to: ernsteiswuerfel mailbox.org> Bug: https://bugs.gentoo.org/706986 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.6.1.ebuild | 109 2 files changed, 110 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index bfca91717e9..b9e72908cc3 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1,3 @@ DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 DIST libzip-1.6.0.tar.xz 732812 BLAKE2B 9023994e3f0a6e893ab42e2f2951b4b32ee8c1f6ea265a9481e32293c0ea229e364f00d9340cdc22404aa7ab7a294ff297ea9e821c2d1ad8486eb8b5301b637b SHA512 a173bebc0a199d65d9e2d5e5adf65eb10e9d3a1c409006b3f78e3453aa6166d825fea20e818e725f5d3c6b63137023a2cccb7fb2a1da50a88c4f5f057cf879f8 +DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild new file mode 100644 index 000..0e5d64337eb --- /dev/null +++ b/dev-libs/libzip/libzip-1.6.1.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 ~ppc ~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+=( +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: d7927c3bfd43d28a6ac139e6ceda75cca649fac9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 5 19:23:46 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 5 19:23:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7927c3b dev-libs/libzip: Drop 1.6.0 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 - dev-libs/libzip/libzip-1.6.0.ebuild | 109 2 files changed, 110 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index b9e72908cc3..0056bff2e49 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,3 +1,2 @@ DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 -DIST libzip-1.6.0.tar.xz 732812 BLAKE2B 9023994e3f0a6e893ab42e2f2951b4b32ee8c1f6ea265a9481e32293c0ea229e364f00d9340cdc22404aa7ab7a294ff297ea9e821c2d1ad8486eb8b5301b637b SHA512 a173bebc0a199d65d9e2d5e5adf65eb10e9d3a1c409006b3f78e3453aa6166d825fea20e818e725f5d3c6b63137023a2cccb7fb2a1da50a88c4f5f057cf879f8 DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574 diff --git a/dev-libs/libzip/libzip-1.6.0.ebuild b/dev-libs/libzip/libzip-1.6.0.ebuild deleted file mode 100644 index 71e055e5470..000 --- a/dev-libs/libzip/libzip-1.6.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# 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 -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: d3a241f1573901bf35294874e501be1b62a89cf0 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jan 29 05:10:33 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jan 29 05:11:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3a241f1 dev-libs/libzip: keyword on ~ppc64, bug #706986 Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> dev-libs/libzip/libzip-1.6.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.6.0.ebuild b/dev-libs/libzip/libzip-1.6.0.ebuild index 3636729665d..71e055e5470 100644 --- a/dev-libs/libzip/libzip-1.6.0.ebuild +++ b/dev-libs/libzip/libzip-1.6.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"; LICENSE="BSD" SLOT="0/5" -KEYWORDS="~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +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 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 3d85b73f9e40e168776914d4faabe89b9132b9a7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 28 14:41:49 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 28 15:11:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d85b73f dev-libs/libzip: 1.6.0 version bump Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.6.0.ebuild | 109 2 files changed, 110 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index ba1849f0064..bfca91717e9 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1 +1,2 @@ DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 +DIST libzip-1.6.0.tar.xz 732812 BLAKE2B 9023994e3f0a6e893ab42e2f2951b4b32ee8c1f6ea265a9481e32293c0ea229e364f00d9340cdc22404aa7ab7a294ff297ea9e821c2d1ad8486eb8b5301b637b SHA512 a173bebc0a199d65d9e2d5e5adf65eb10e9d3a1c409006b3f78e3453aa6166d825fea20e818e725f5d3c6b63137023a2cccb7fb2a1da50a88c4f5f057cf879f8 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 000..3636729665d --- /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 ~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 + -DENAB
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 9865b0a57872b76b34b9e1b8e6f13913924af100 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 26 00:53:17 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 26 13:03:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9865b0a5 dev-libs/libzip: Drop 1.5.1 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 - 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 4 files changed, 194 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 713cf88635c..ba1849f0064 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 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 9b70eaca8e8..000 --- 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 0cca187d90a..000 --- 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_SUBD
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 6feeb749e96279140f65cdc32d9dbd54c64a73c9 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Dec 25 20:49:49 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Dec 25 20:50:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6feeb749 dev-libs/libzip: stable 1.5.2-r2 for ppc64, bug #703556 Package-Manager: Portage-2.3.83, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.5.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild index c38be8b2758..f1c84d5ed7b 100644 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: d82da454bd7604c759042e65d80c6f5b5b34bd71 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Dec 25 20:37:45 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Dec 25 20:39:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d82da454 dev-libs/libzip: stable 1.5.2-r2 for ppc, bug #703556 Package-Manager: Portage-2.3.83, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.5.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild index 83a8b30fd80..c38be8b2758 100644 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: e76c5d8a007587bf11bf4ece5489c3b334d74b13 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Dec 25 20:24:05 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Dec 25 20:24:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76c5d8a dev-libs/libzip: stable 1.5.2-r2 for ia64, bug #703556 Package-Manager: Portage-2.3.83, Repoman-2.3.20 RepoMan-Options: --include-arches="ia64" Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.5.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild index 1da668dc842..83a8b30fd80 100644 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 996e1d89ba1475a657c2bb8fd25cf572b2d71451 Author: Mikle Kolyada gentoo org> AuthorDate: Tue Dec 24 14:06:00 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue Dec 24 14:06:00 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=996e1d89 dev-libs/libzip: arm stable wrt bug #703556 Package-Manager: Portage-2.3.79, Repoman-2.3.16 RepoMan-Options: --include-arches="arm" Signed-off-by: Mikle Kolyada gentoo.org> dev-libs/libzip/libzip-1.5.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild index 70837deef25..1da668dc842 100644 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 29dd278fac47c61d1a83a3aa7f9c240eae7dc343 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Dec 24 08:08:01 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Dec 24 08:08:01 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dd278f dev-libs/libzip: x86 stable wrt bug #703556 Package-Manager: Portage-2.3.79, Repoman-2.3.16 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/libzip/libzip-1.5.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild index 82cb95dbfd4..70837deef25 100644 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: e29fb7e186249bd88539fc0be0aeda3ed6c84713 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Dec 23 14:03:15 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Dec 23 14:03:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29fb7e1 dev-libs/libzip: amd64 stable wrt bug #703556 Package-Manager: Portage-2.3.79, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/libzip/libzip-1.5.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild index ba8204fca23..82cb95dbfd4 100644 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 48e7b6830e0139f760babd4eeca78c6a692c3c91 Author: Rolf Eike Beer sf-mail de> AuthorDate: Mon Dec 23 08:46:22 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Dec 23 10:00:37 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e7b683 dev-libs/libzip: stable 1.5.2-r2 for hppa/sparc, bug #703556 Package-Manager: Portage-2.3.79, Repoman-2.3.16 RepoMan-Options: --include-arches="hppa sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.5.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild index 3c1fb36150c..ba8204fca23 100644 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 0e82aefd5cfda0e429d5b0a2a7d0bbb60c28b54f Author: Aaron Bauman gentoo org> AuthorDate: Sun Dec 22 22:52:53 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Sun Dec 22 22:53:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e82aefd dev-libs/libzip: arm64 stable (bug #703556) Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.82, Repoman-2.3.20 dev-libs/libzip/libzip-1.5.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild index 4c386426e34..3c1fb36150c 100644 --- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 2cf210e3c1e492f112862307b1944770a38cf2b8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Sep 13 20:02:12 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 13 20:41:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf210e3 dev-libs/libzip: Add missing dependency Reported-by: Arfrever Frehtes Taifersar Arahesis gmail.com> Closes: https://bugs.gentoo.org/692874 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/libzip-1.5.2-r2.ebuild | 108 + 1 file changed, 108 insertions(+) diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild new file mode 100644 index 000..bb6769b3f6e --- /dev/null +++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild @@ -0,0 +1,108 @@ +# 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" + +DEPEND=" + sys-libs/zlib + bzip2? ( app-arch/bzip2 ) + 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}" + +PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 + +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 + 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-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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: b00daebdc2fb1bcff062faaf1a05e756933e0d78 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Sep 13 20:02:34 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 13 20:41:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b00daebd dev-libs/libzip: Drop 1.5.2-r1 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/libzip-1.5.2-r1.ebuild | 105 - 1 file changed, 105 deletions(-) diff --git a/dev-libs/libzip/libzip-1.5.2-r1.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild deleted file mode 100644 index 814a668c430..000 --- a/dev-libs/libzip/libzip-1.5.2-r1.ebuild +++ /dev/null @@ -1,105 +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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" - -DEPEND=" - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - ssl? ( - gnutls? ( >=net-libs/gnutls-3.6.5:= ) - !gnutls? ( - mbedtls? ( net-libs/mbedtls:= ) - !mbedtls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 - -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 - 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-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 -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 9c4783b8ff968708298d0feff63371a7dd2fe89e Author: Aaron Bauman gentoo org> AuthorDate: Wed May 22 02:43:11 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Wed May 22 02:51:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4783b8 dev-libs/libzip: arm64 stable Signed-off-by: Aaron Bauman gentoo.org> dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index c58ae4a7383..95c3608bf77 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/
commit: 30fc49dd8f340fdc6284fef60aab8b1a56183db3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 24 19:29:43 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 24 19:29:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30fc49dd dev-libs/libzip: Drop 1.3.0 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 - dev-libs/libzip/files/libzip-1.2.0-fts.patch | 11 -- dev-libs/libzip/files/libzip-1.2.0-headers.patch | 12 -- dev-libs/libzip/libzip-1.3.0.ebuild | 48 4 files changed, 72 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index b8f03031b82..713cf88635c 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,3 +1,2 @@ -DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 diff --git a/dev-libs/libzip/files/libzip-1.2.0-fts.patch b/dev-libs/libzip/files/libzip-1.2.0-fts.patch deleted file mode 100644 index bd9bf232c0a..000 --- a/dev-libs/libzip/files/libzip-1.2.0-fts.patch +++ /dev/null @@ -1,11 +0,0 @@ a/configure.ac 2016-05-28 10:35:31.0 +0100 -+++ b/configure.ac 2017-02-25 23:34:22.309684397 +0100 -@@ -65,6 +65,8 @@ - AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname]) - fi - -+AC_SEARCH_LIBS(fts_open, fts) -+ - AC_CACHE_CHECK([whether we are building for a Win32 host], [ac_cv_win32_host], - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#ifdef _WIN32 - choke me diff --git a/dev-libs/libzip/files/libzip-1.2.0-headers.patch b/dev-libs/libzip/files/libzip-1.2.0-headers.patch deleted file mode 100644 index f1a6d5d0819..000 --- a/dev-libs/libzip/files/libzip-1.2.0-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -3,8 +3,7 @@ - - lib_LTLIBRARIES = libzip.la - noinst_HEADERS = zipint.h gladman-fcrypt.h --include_HEADERS = zip.h --nodist_libinclude_HEADERS = zipconf.h -+include_HEADERS = zip.h zipconf.h - - # also update CMakeLists.txt when changing version - libzip_la_LDFLAGS=-no-undefined -version-info 3:0:1 diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild deleted file mode 100644 index 14b5af8dd18..000 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -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 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="bzip2 static-libs" - -RDEPEND=" - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - elibc_musl? ( sys-libs/fts-standalone ) -" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS NEWS.md API-CHANGES THANKS ) - -PATCHES=( - "${FILESDIR}/${PN}-1.2.0-headers.patch" - "${FILESDIR}/${PN}-1.2.0-fts.patch" -) - -src_prepare() { - default - - # fails in portage build only - sed -i -e "/encryption-nonrandom-aes.*.test/d" regress/Makefile.am || die - - eautoreconf -} - -src_configure() { - econf $(use_with bzip2) -} - -src_install() { - default - use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die - find "${D}" -name '*.la' -delete || die -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: d97b0a1048983c04d5e3ca3949ede387340f795e Author: Tobias Klausmann gentoo org> AuthorDate: Wed Apr 24 18:34:29 2019 + Commit: Tobias Klausmann gentoo org> CommitDate: Wed Apr 24 18:42:40 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97b0a10 dev-libs/libzip-1.5.1-r0: alpha stable Bug: http://bugs.gentoo.org/679988 Signed-off-by: Tobias Klausmann gentoo.org> dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index 68002b6f0c2..c58ae4a7383 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 8d4451669c00abbdc582b73a3e4664ece5ad Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 4 00:09:05 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 4 00:09:44 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d445166 dev-libs/libzip: Fix USE mbedtls Closes: https://bugs.gentoo.org/680820 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch | 23 +++ dev-libs/libzip/libzip-1.5.2-r1.ebuild | 2 ++ 2 files changed, 25 insertions(+) diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch new file mode 100644 index 000..564cc9b79f1 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch @@ -0,0 +1,23 @@ +From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Tue, 2 Apr 2019 15:26:06 +0200 +Subject: [PATCH] mbedtls: link against the correct library + +Inspired by https://github.com/nih-at/libzip/pull/88 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f252b3f7..f8eb16eeb 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -42,7 +42,7 @@ ELSE() + ENDIF() + IF(ENABLE_MBEDTLS) + FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h) +- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls) ++ FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto) + ELSE() + SET(MBEDTLS_LIBRARIES FALSE) + ENDIF() diff --git a/dev-libs/libzip/libzip-1.5.2-r1.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild index 795775cb0b0..814a668c430 100644 --- a/dev-libs/libzip/libzip-1.5.2-r1.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r1.ebuild @@ -30,6 +30,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820 + pkg_setup() { # Upstream doesn't support building dynamic & static # simultaneously: https://github.com/nih-at/libzip/issues/76
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: c3ff0d518e45a72cdb546b146f879b554ba4aa48 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Apr 1 17:03:12 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Apr 1 17:03:12 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ff0d51 dev-libs/libzip: x86 stable (bug #679988) Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index e4441526a7e..68002b6f0c2 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 4d79a87aa14057647d78bd61cdc0adba9420e6d2 Author: Michael Palimaka gentoo org> AuthorDate: Mon Apr 1 10:07:44 2019 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Apr 1 10:07:53 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d79a87a dev-libs/libzip: raise net-libs/gnutls dependency Closes: https://bugs.gentoo.org/681654 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Michael Palimaka gentoo.org> dev-libs/libzip/{libzip-1.5.2.ebuild => libzip-1.5.2-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.2.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild similarity index 98% rename from dev-libs/libzip/libzip-1.5.2.ebuild rename to dev-libs/libzip/libzip-1.5.2-r1.ebuild index d34cd65a835..795775cb0b0 100644 --- a/dev-libs/libzip/libzip-1.5.2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2-r1.ebuild @@ -18,7 +18,7 @@ DEPEND=" sys-libs/zlib bzip2? ( app-arch/bzip2 ) ssl? ( - gnutls? ( net-libs/gnutls:= ) + gnutls? ( >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? (
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 2e5126c80778fd8fd03f4a444a8b681e8ab6f2f7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 17 19:29:18 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 17 19:29:36 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5126c8 dev-libs/libzip: Actually fix cmake options Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/libzip-1.5.2.ebuild | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dev-libs/libzip/libzip-1.5.2.ebuild b/dev-libs/libzip/libzip-1.5.2.ebuild index 261eb19e86e..d34cd65a835 100644 --- a/dev-libs/libzip/libzip-1.5.2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2.ebuild @@ -58,11 +58,25 @@ src_configure() { fi if use ssl; then - mycmakeargs+=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_MBEDTLS=$(usex mbedtls) - -DENABLE_OPENSSL=$(usex !gnutls) - ) + 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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 8adf3eed29de8a7c21bef71d9edb75d7c7c8dce3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 17 18:50:07 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 17 19:02:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8adf3eed dev-libs/libzip: 1.5.2 version bump, add USE mbedtls Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.5.2.ebuild | 89 + dev-libs/libzip/metadata.xml| 3 ++ 3 files changed, 93 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 396290996fd..b8f03031b82 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1,3 @@ DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d +DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 diff --git a/dev-libs/libzip/libzip-1.5.2.ebuild b/dev-libs/libzip/libzip-1.5.2.ebuild new file mode 100644 index 000..261eb19e86e --- /dev/null +++ b/dev-libs/libzip/libzip-1.5.2.ebuild @@ -0,0 +1,89 @@ +# 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test" + +DEPEND=" + sys-libs/zlib + bzip2? ( app-arch/bzip2 ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !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) + ) + 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_MBEDTLS=$(usex mbedtls) + -DENABLE_OPENSSL=$(usex !gnutls) + ) + else + mycmakeargs+=( + -DENABLE_GNUTLS=OFF + -DENABLE_MBEDTLS=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/metadata.xml b/dev-libs/libzip/metada
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 2a79a2d561ffa6d3b90fe993fb811f2962fd2166 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Mar 16 22:39:00 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Mar 16 22:55:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a79a2d5 dev-libs/libzip: stable 1.5.1 for ppc64, bug #679988 Package-Manager: Portage-2.3.62, Repoman-2.3.12 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index e887f460795..e4441526a7e 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: eec0252bd27c249dd1c0e33075b30a2cd795abb7 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Mar 16 21:56:23 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Mar 16 21:56:59 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec0252b dev-libs/libzip: stable 1.5.1 for ppc, bug #679988 Package-Manager: Portage-2.3.62, Repoman-2.3.12 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index 4f37f1e2246..e887f460795 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 82acbe41d68ccc04a3f907b9b1f2cc810c46881d Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Mar 16 21:37:33 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Mar 16 21:37:33 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82acbe41 dev-libs/libzip: amd64 stable wrt bug #679988 Signed-off-by: Agostino Sarubbo gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 RepoMan-Options: --include-arches="amd64" dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index 27063779d19..4f37f1e2246 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 48ed90f0047efccfcd4b5e5c9b1607c4826e04fb Author: Mikle Kolyada gentoo org> AuthorDate: Sat Mar 16 14:03:03 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Mar 16 14:03:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ed90f0 dev-libs/libzip: arm stable wrt bug #679988 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="arm" dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index f72a36b9bb8..27063779d19 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: febb2f2f0f647ccc7a9aba6db423ad3bf9007e35 Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Mar 14 21:07:30 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Mar 14 21:53:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=febb2f2f dev-libs/libzip: stable 1.5.1 for hppa, bug #679988 Signed-off-by: Rolf Eike Beer sf-mail.de> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="hppa" Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index 9b915c5e138..f72a36b9bb8 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: bc24a2febd7b3dc4053ba6bf75533fb0c3f5d00d Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Mar 14 08:31:11 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Mar 14 08:31:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc24a2fe dev-libs/libzip: stable 1.5.1 for ia64, bug #679988 Package-Manager: Portage-2.3.62, Repoman-2.3.12 RepoMan-Options: --include-arches="ia64" Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index b3b7c8df464..9b915c5e138 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 1336277bc28aefb0a2ccbf19fcc71085a07bbb50 Author: Rolf Eike Beer sf-mail de> AuthorDate: Mon Mar 11 17:57:48 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Mar 11 19:58:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1336277b dev-libs/libzip: stable 1.5.1 for sparc, bug #679988 Signed-off-by: Rolf Eike Beer sf-mail.de> Package-Manager: Portage-2.3.51, Repoman-2.3.11 RepoMan-Options: --include-arches="sparc" Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libzip/libzip-1.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild index b0125575cca..b3b7c8df464 100644 --- a/dev-libs/libzip/libzip-1.5.1.ebuild +++ b/dev-libs/libzip/libzip-1.5.1.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 doc gnutls libressl ssl static-libs test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: 34e6aee94f736c0493e3bffa6abcd261e08a207c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 9 20:55:40 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 9 20:57:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34e6aee9 dev-libs/libzip: 1.5.1 version bump for testing Thanks-to: Hung-Te Lin gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10846 Closes: https://bugs.gentoo.org/675560 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/Manifest | 1 + 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 | 89 4 files changed, 193 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index c0eb5a5ea60..396290996fd 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1 +1,2 @@ DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900 +DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d diff --git a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch new file mode 100644 index 000..9b70eaca8e8 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch @@ -0,0 +1,53 @@ +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 new file mode 100644 index 000..0cca187d90a --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.5.1-options.patch @@ -0,0 +1,50 @@ +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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 7f4e8c46a9848187b2b5b9b16fad03e9bdf42880 Author: Markus Meier gentoo org> AuthorDate: Mon Sep 24 18:16:11 2018 + Commit: Markus Meier gentoo org> CommitDate: Mon Sep 24 18:16:11 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f4e8c46 dev-libs/libzip: arm stable, bug #666256 Package-Manager: Portage-2.3.49, Repoman-2.3.10 RepoMan-Options: --include-arches="arm" dev-libs/libzip/libzip-1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index fc4f03055a7..14b5af8dd18 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -11,7 +11,7 @@ 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 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: fad0fefe6f636cdaeebb6ef33cafb1c313771950 Author: Rolf Eike Beer sf-mail de> AuthorDate: Sun Sep 16 10:43:32 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Sep 16 12:08:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad0fefe dev-libs/libzip: stable 1.3.0 for sparc, bug #629574 Package-Manager: Portage-2.3.40, Repoman-2.3.9 RepoMan-Options: --include-arches="sparc" dev-libs/libzip/libzip-1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index 1d27b7ae357..fc4f03055a7 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -11,7 +11,7 @@ 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 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: ed0977b4c93ffe4fd7ee92c164b8c36795926f59 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Jun 28 14:31:33 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Jun 28 14:36:51 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0977b4 dev-libs/libzip: mark s390 stable Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libzip/libzip-1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index 6ad653a1e13..1d27b7ae357 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, profiles/arch/hppa/
commit: e69e61a9d982b7bc621365e5aca2db767023c05b Author: Matt Turner gentoo org> AuthorDate: Thu Mar 22 00:34:57 2018 + Commit: Matt Turner gentoo org> CommitDate: Thu Mar 22 00:35:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69e61a9 dev-libs/libzip: hppa stable, bugs 622044, 629574 dev-libs/libzip/libzip-1.3.0.ebuild| 4 ++-- profiles/arch/hppa/package.use.stable.mask | 5 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index f7fdc6738e8..6ad653a1e13 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND=" diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask index c0f6e5b2f77..fe22b1e5037 100644 --- a/profiles/arch/hppa/package.use.stable.mask +++ b/profiles/arch/hppa/package.use.stable.mask @@ -50,8 +50,3 @@ dev-libs/boost mpi media-gfx/exiv2 webready media-video/ffmpeg ssh net-analyzer/wireshark ciscodump libssh sshdump - -# Andreas Sturmlechner (03 Aug 2017) -# Mask pptx support for dev-libs/libzip stabilisation timeout -# (bug 622044) -media-gfx/pstoedit pptx
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/, dev-libs/libzip/files/
commit: b4a9cb3e5493b414c2d671e6e5c1e8bcf084915c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 23 23:25:22 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 23 23:25:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a9cb3e dev-libs/libzip: Security cleanup, bug #629574 Package-Manager: Portage-2.3.12, Repoman-2.3.3 dev-libs/libzip/Manifest | 1 - .../libzip/files/libzip-1.2.0-CVE-2017-12858.patch | 37 --- .../libzip/files/libzip-1.2.0-CVE-2017-14107.patch | 27 -- dev-libs/libzip/libzip-1.2.0-r1.ebuild | 40 - dev-libs/libzip/libzip-1.2.0-r2.ebuild | 41 -- dev-libs/libzip/libzip-1.2.0.ebuild| 39 6 files changed, 185 deletions(-) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 4fd8d312a19..9206b63f7b6 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1 @@ -DIST libzip-1.2.0.tar.xz 938284 SHA256 ffc0764395fba3d45dc5a6e32282788854618b9e9838337f8218b596007f1376 SHA512 1ba8626d72e6b47f735568afaf007d1e18beb3ebedf6b69a6b575f9e04d3b84550371191a89be153f8fcedb4a8eac2f996e141da95cdbb52380b6283cc99cf8b WHIRLPOOL 794a462fc4d1529008fccbe6df41c5616b34712ef34721e0cbe555aa12ada7928d22f6e9421de210efdf7b460188a4d6a9a6e53fc0266bcf52d47d6a7e30a5f6 DIST libzip-1.3.0.tar.xz 955876 SHA256 aa936efe34911be7acac2ab07fb5c8efa53ed9bb4d44ad1fe8bff19630e0d373 SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900 WHIRLPOOL eca44e4c7e3a09d90f7a9c694de01c97fdc97ce7989bd8ccf9acb8e33e10145f6860c4dd5bb282d2ab0a708d9ddb6b7ecde88bf5276365179057c02f534e182d diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch deleted file mode 100644 index 26236510fee..000 --- a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2217022b7d1142738656d891e00b3d2d9179b796 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Mon, 14 Aug 2017 10:55:44 +0200 -Subject: [PATCH] Fix double free(). - -Found by Brian 'geeknik' Carpenter using AFL. - THANKS | 1 + - lib/zip_dirent.c | 3 --- - 2 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/THANKS b/THANKS -index be0cca9..a80ee1d 100644 a/THANKS -+++ b/THANKS -@@ -12,6 +12,7 @@ BALATON Zoltan - Benjamin Gilbert - Boaz Stolk - Bogdan -+Brian 'geeknik' Carpenter - Chris Nehren - Coverity - Dane Springmeyer -diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c -index a369900..e5a7cc9 100644 a/lib/zip_dirent.c -+++ b/lib/zip_dirent.c -@@ -579,9 +579,6 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, zip_buffer_t *buffer, boo - } - - if (!_zip_dirent_process_winzip_aes(zde, error)) { -- if (!from_buffer) { -- _zip_buffer_free(buffer); -- } - return -1; - } - diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch deleted file mode 100644 index 3d1f9a0aabc..000 --- a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9b46957ec98d85a572e9ef98301247f39338a3b5 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Tue, 29 Aug 2017 10:25:03 +0200 -Subject: [PATCH] Make eocd checks more consistent between zip and zip64 cases. - - lib/zip_open.c | 7 ++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/zip_open.c b/lib/zip_open.c -index 3bd593b..9d3a4cb 100644 a/lib/zip_open.c -+++ b/lib/zip_open.c -@@ -847,7 +847,12 @@ _zip_read_eocd64(zip_source_t *src, zip_buffer_t *buffer, zip_uint64_t buf_offse - zip_error_set(error, ZIP_ER_SEEK, EFBIG); - return NULL; - } --if ((flags & ZIP_CHECKCONS) && offset+size != eocd_offset) { -+if (offset+size > buf_offset + eocd_offset) { -+ /* cdir spans past EOCD record */ -+ zip_error_set(error, ZIP_ER_INCONS, 0); -+ return NULL; -+} -+if ((flags & ZIP_CHECKCONS) && offset+size != buf_offset + eocd_offset) { - zip_error_set(error, ZIP_ER_INCONS, 0); - return NULL; - } diff --git a/dev-libs/libzip/libzip-1.2.0-r1.ebuild b/dev-libs/libzip/libzip-1.2.0-r1.ebuild deleted file mode 100644 index 61f933dcd36..000 --- a/dev-libs/libzip/libzip-1.2.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Library for manipulating zip archives" -HOMEPAGE="http://www.nih.at/libzip/"; -SRC_URI="http://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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 804f07474401e8be91c92519abc0625b1d09fb63 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Oct 23 18:30:45 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Oct 23 18:42:31 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804f0747 dev-libs/libzip: x86 stable (bug #629574) Package-Manager: Portage-2.3.11, Repoman-2.3.3 dev-libs/libzip/libzip-1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index bd3e0fe2344..f7fdc6738e8 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: a64d19b4a44a03eb6d78500525b75d380a3f5fdb Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Sep 24 18:48:25 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Sep 24 18:49:56 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64d19b4 dev-libs/libzip: stable 1.3.0 for ppc, bug #629574 Package-Manager: Portage-2.3.10, Repoman-2.3.3 RepoMan-Options: --include-arches="ppc" dev-libs/libzip/libzip-1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index 979511cb4b1..7b78428aaf6 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 3183f6d61246663028d861afdf3ee66e35d969cd Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Sep 23 19:38:12 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Sep 23 19:38:12 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3183f6d6 dev-libs/libzip: stable 1.3.0 for ppc64, bug #629574 Package-Manager: Portage-2.3.10, Repoman-2.3.3 RepoMan-Options: --include-arches="ppc64" dev-libs/libzip/libzip-1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index 049922c3e0c..979511cb4b1 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: 1d9f1d44c67d17e7d4ed76c5cd43cb07c11cdec9 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 20 09:56:50 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 20 09:56:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d9f1d44 dev-libs/libzip: amd64 stable wrt bug #629574 Package-Manager: Portage-2.3.8, Repoman-2.3.1 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/libzip/libzip-1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index 6dc485662a2..049922c3e0c 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: d58008f9548cfaef6202167d1906aa9e49b4e609 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Sep 15 07:31:30 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Sep 15 07:31:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d58008f9 dev-libs/libzip: stable 1.3.0 for ia64, bug #629574 Package-Manager: Portage-2.3.8, Repoman-2.3.3 RepoMan-Options: --include-arches="ia64" dev-libs/libzip/libzip-1.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index c3a635836ed..6dc485662a2 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
commit: dbcb0a042eb17aa24e486251e8fe231f9309fcdf Author: Michael Palimaka gentoo org> AuthorDate: Sun Sep 3 05:28:16 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Sep 3 05:28:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbcb0a04 dev-libs/libzip: version bump 1.3.0 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-libs/libzip/Manifest| 1 + dev-libs/libzip/libzip-1.3.0.ebuild | 48 + 2 files changed, 49 insertions(+) diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 91b982835ed..4fd8d312a19 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1 +1,2 @@ DIST libzip-1.2.0.tar.xz 938284 SHA256 ffc0764395fba3d45dc5a6e32282788854618b9e9838337f8218b596007f1376 SHA512 1ba8626d72e6b47f735568afaf007d1e18beb3ebedf6b69a6b575f9e04d3b84550371191a89be153f8fcedb4a8eac2f996e141da95cdbb52380b6283cc99cf8b WHIRLPOOL 794a462fc4d1529008fccbe6df41c5616b34712ef34721e0cbe555aa12ada7928d22f6e9421de210efdf7b460188a4d6a9a6e53fc0266bcf52d47d6a7e30a5f6 +DIST libzip-1.3.0.tar.xz 955876 SHA256 aa936efe34911be7acac2ab07fb5c8efa53ed9bb4d44ad1fe8bff19630e0d373 SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900 WHIRLPOOL eca44e4c7e3a09d90f7a9c694de01c97fdc97ce7989bd8ccf9acb8e33e10145f6860c4dd5bb282d2ab0a708d9ddb6b7ecde88bf5276365179057c02f534e182d diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild new file mode 100644 index 000..c3a635836ed --- /dev/null +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="bzip2 static-libs" + +RDEPEND=" + sys-libs/zlib + bzip2? ( app-arch/bzip2 ) + elibc_musl? ( sys-libs/fts-standalone ) +" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS NEWS.md API-CHANGES THANKS ) + +PATCHES=( + "${FILESDIR}/${PN}-1.2.0-headers.patch" + "${FILESDIR}/${PN}-1.2.0-fts.patch" +) + +src_prepare() { + default + + # fails in portage build only + sed -i -e "/encryption-nonrandom-aes.*.test/d" regress/Makefile.am || die + + eautoreconf +} + +src_configure() { + econf $(use_with bzip2) +} + +src_install() { + default + use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die + find "${D}" -name '*.la' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/
commit: 496ef5159327a6ec7726c0ec5ec849e16f416b7a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 2 08:34:07 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 2 08:39:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496ef515 dev-libs/libzip: Security revbump for CVE-2017-14107 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../libzip/files/libzip-1.2.0-CVE-2017-12858.patch | 2 +- .../libzip/files/libzip-1.2.0-CVE-2017-14107.patch | 27 ++ dev-libs/libzip/libzip-1.2.0-r2.ebuild | 41 ++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch index b7586e45a56..26236510fee 100644 --- a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch +++ b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch @@ -34,4 +34,4 @@ index a369900..e5a7cc9 100644 - } return -1; } - \ No newline at end of file + diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch new file mode 100644 index 000..3d1f9a0aabc --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch @@ -0,0 +1,27 @@ +From 9b46957ec98d85a572e9ef98301247f39338a3b5 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Tue, 29 Aug 2017 10:25:03 +0200 +Subject: [PATCH] Make eocd checks more consistent between zip and zip64 cases. + +--- + lib/zip_open.c | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/lib/zip_open.c b/lib/zip_open.c +index 3bd593b..9d3a4cb 100644 +--- a/lib/zip_open.c b/lib/zip_open.c +@@ -847,7 +847,12 @@ _zip_read_eocd64(zip_source_t *src, zip_buffer_t *buffer, zip_uint64_t buf_offse + zip_error_set(error, ZIP_ER_SEEK, EFBIG); + return NULL; + } +-if ((flags & ZIP_CHECKCONS) && offset+size != eocd_offset) { ++if (offset+size > buf_offset + eocd_offset) { ++ /* cdir spans past EOCD record */ ++ zip_error_set(error, ZIP_ER_INCONS, 0); ++ return NULL; ++} ++if ((flags & ZIP_CHECKCONS) && offset+size != buf_offset + eocd_offset) { + zip_error_set(error, ZIP_ER_INCONS, 0); + return NULL; + } diff --git a/dev-libs/libzip/libzip-1.2.0-r2.ebuild b/dev-libs/libzip/libzip-1.2.0-r2.ebuild new file mode 100644 index 000..524782f42c3 --- /dev/null +++ b/dev-libs/libzip/libzip-1.2.0-r2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" + +RDEPEND=" + sys-libs/zlib + elibc_musl? ( sys-libs/fts-standalone ) +" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS NEWS.md API-CHANGES THANKS ) + +PATCHES=( + "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}/${P}-fts.patch" + "${FILESDIR}/${P}-CVE-2017-12858.patch" + "${FILESDIR}/${P}-CVE-2017-14107.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die + find "${D}" -name '*.la' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/
commit: 8ae28c0fa697b98cc15aace97cf1668df29b5fd7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 24 17:12:33 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 24 17:16:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ae28c0f dev-libs/libzip: Security revbump for CVE-2017-12858 Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../libzip/files/libzip-1.2.0-CVE-2017-12858.patch | 37 dev-libs/libzip/libzip-1.2.0-r1.ebuild | 40 ++ 2 files changed, 77 insertions(+) diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch new file mode 100644 index 000..b7586e45a56 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch @@ -0,0 +1,37 @@ +From 2217022b7d1142738656d891e00b3d2d9179b796 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Mon, 14 Aug 2017 10:55:44 +0200 +Subject: [PATCH] Fix double free(). + +Found by Brian 'geeknik' Carpenter using AFL. +--- + THANKS | 1 + + lib/zip_dirent.c | 3 --- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/THANKS b/THANKS +index be0cca9..a80ee1d 100644 +--- a/THANKS b/THANKS +@@ -12,6 +12,7 @@ BALATON Zoltan + Benjamin Gilbert + Boaz Stolk + Bogdan ++Brian 'geeknik' Carpenter + Chris Nehren + Coverity + Dane Springmeyer +diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c +index a369900..e5a7cc9 100644 +--- a/lib/zip_dirent.c b/lib/zip_dirent.c +@@ -579,9 +579,6 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, zip_buffer_t *buffer, boo + } + + if (!_zip_dirent_process_winzip_aes(zde, error)) { +- if (!from_buffer) { +- _zip_buffer_free(buffer); +- } + return -1; + } + \ No newline at end of file diff --git a/dev-libs/libzip/libzip-1.2.0-r1.ebuild b/dev-libs/libzip/libzip-1.2.0-r1.ebuild new file mode 100644 index 000..61f933dcd36 --- /dev/null +++ b/dev-libs/libzip/libzip-1.2.0-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Library for manipulating zip archives" +HOMEPAGE="http://www.nih.at/libzip/"; +SRC_URI="http://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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" + +RDEPEND=" + sys-libs/zlib + elibc_musl? ( sys-libs/fts-standalone ) +" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS NEWS.md API-CHANGES THANKS ) + +PATCHES=( + "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}/${P}-fts.patch" + "${FILESDIR}/${P}-CVE-2017-12858.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die + find "${D}" -name '*.la' -delete || die +}