From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
Date: Sun, 09 Mar 2025 22:22:16 +0000 (UTC) [thread overview]
Message-ID: <1741558928.00b9dc9eecbdd5db438304f2e4c40695e933ef70.asturm@gentoo> (raw)
commit: 00b9dc9eecbdd5db438304f2e4c40695e933ef70
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 9 22:20:29 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 9 22:22:08 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b9dc9e
dev-libs/libzip: Revert "drop 1.9.2-r1" for ~alpha ......
This reverts commit b5e0155b3af7f5420cb7642662d1d5c031021c17.
Bug: https://bugs.gentoo.org/944730
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libzip/Manifest | 1 +
dev-libs/libzip/libzip-1.9.2-r1.ebuild | 116 +++++++++++++++++++++++++++++++++
2 files changed, 117 insertions(+)
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index cd4dbe54508d..b88c2d201f43 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1 +1,2 @@
DIST libzip-1.11.3.tar.xz 788520 BLAKE2B 3296ff48ce853687ea4fbe310130c2468c87990da9a6c285acb09406afb23fe2240fb27a94c23db8b2ad58bd7b80f5b6e84d0702957792d0baddd13487c483dd SHA512 7ad7e5f04f28e777604833e702aaa68d603b9895e70d6ee9e587549eb628a89e5569aca0ea255f82de1adb8f4599b828c63dd282eb15a5ea55a147aa7df7b2a4
+DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5
diff --git a/dev-libs/libzip/libzip-1.9.2-r1.ebuild b/dev-libs/libzip/libzip-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..4481cb00690e
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.9.2-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2025 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 ~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:0= )
+ !mbedtls? ( dev-libs/openssl:0= )
+ )
+ )
+ zstd? ( app-arch/zstd )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ # Upstream doesn't support building dynamic & static
+ # simultaneously: https://github.com/nih-at/libzip/issues/76
+ MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+ append-lfs-flags
+ myconfigure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=OFF # nothing is installed
+ -DENABLE_COMMONCRYPTO=OFF # not in tree
+ -DENABLE_BZIP2=$(usex bzip2)
+ -DENABLE_LZMA=$(usex lzma)
+ -DENABLE_ZSTD=$(usex zstd)
+ )
+ if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+ mycmakeargs+=(
+ -DBUILD_DOC=OFF
+ -DBUILD_EXAMPLES=OFF
+ -DBUILD_SHARED_LIBS=OFF
+ -DBUILD_TOOLS=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_DOC=ON
+ -DBUILD_REGRESS=$(usex test)
+ -DBUILD_TOOLS=$(usex tools)
+ )
+ fi
+
+ if use ssl; then
+ if use gnutls; then
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_MBEDTLS=OFF
+ -DENABLE_OPENSSL=OFF
+ )
+ elif use mbedtls; then
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=OFF
+ -DENABLE_MBEDTLS=$(usex mbedtls)
+ -DENABLE_OPENSSL=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=OFF
+ -DENABLE_MBEDTLS=OFF
+ -DENABLE_OPENSSL=ON
+ )
+ fi
+ else
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=OFF
+ -DENABLE_MBEDTLS=OFF
+ -DENABLE_OPENSSL=OFF
+ )
+ fi
+ cmake_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+ run_tests() {
+ [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+ }
+
+ multibuild_foreach_variant run_tests
+}
+
+src_install() {
+ multibuild_foreach_variant cmake_src_install
+}
next reply other threads:[~2025-03-09 22:22 UTC|newest]
Thread overview: 129+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-09 22:22 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-09 22:05 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/ Andreas Sturmlechner
2025-03-09 20:19 Sam James
2025-02-27 2:42 Sam James
2025-02-26 23:45 Sam James
2025-02-26 23:35 Sam James
2025-02-26 23:35 Sam James
2025-02-26 23:29 Jakov Smolić
2025-02-26 23:29 Jakov Smolić
2025-02-26 22:16 Sam James
2025-02-04 20:02 Andreas Sturmlechner
2025-01-25 16:21 Sam James
2025-01-07 19:54 Sam James
2025-01-05 13:40 WANG Xuerui
2024-12-28 8:52 Arthur Zamarin
2024-12-28 8:52 Arthur Zamarin
2024-12-28 2:53 Sam James
2024-12-28 2:53 Sam James
2024-12-28 2:53 Sam James
2024-11-24 22:16 Jakov Smolić
2024-11-23 16:02 Michał Górny
2024-11-23 15:13 Sam James
2024-11-23 15:13 Sam James
2024-11-23 15:13 Sam James
2022-10-17 23:34 Sam James
2022-08-01 19:53 Andreas Sturmlechner
2022-08-01 14:17 Jakov Smolić
2022-07-24 23:23 Sam James
2022-07-21 0:29 Sam James
2022-07-21 0:25 Sam James
2022-07-21 0:25 Sam James
2022-07-20 5:49 Sam James
2022-07-20 2:50 Sam James
2022-06-29 20:29 Andreas Sturmlechner
2022-06-14 8:05 Andreas Sturmlechner
2022-05-17 12:48 WANG Xuerui
2022-02-26 2:16 Sam James
2022-01-19 7:47 Fabian Groffen
2022-01-01 11:52 James Le Cuirot
2021-09-08 0:43 Sam James
2021-08-09 1:18 Sam James
2021-08-09 1:18 Sam James
2021-08-07 14:43 Sam James
2021-08-05 14:10 Sam James
2021-08-05 11:11 Sergei Trofimovich
2021-06-25 1:33 Yixun Lan
2021-06-24 21:03 Sergei Trofimovich
2021-06-20 19:59 Sam James
2021-06-20 19:59 Sam James
2021-05-17 21:00 Sam James
2021-05-01 7:29 Mikle Kolyada
2021-01-06 19:34 Fabian Groffen
2020-09-08 18:08 Andreas Sturmlechner
2020-09-01 20:12 Sam James
2020-08-29 20:02 Sam James
2020-08-29 17:57 Thomas Deutschmann
2020-08-24 17:33 Sergei Trofimovich
2020-08-23 16:57 Sam James
2020-07-19 19:48 Andreas Sturmlechner
2020-07-19 19:48 Andreas Sturmlechner
2020-06-21 14:48 Andreas Sturmlechner
2020-06-14 21:51 Andreas Sturmlechner
2020-06-06 16:42 Andreas Sturmlechner
2020-04-09 22:02 Sergei Trofimovich
2020-03-19 20:38 Mart Raudsepp
2020-03-19 15:43 Andreas Sturmlechner
2020-03-19 15:43 Andreas Sturmlechner
2020-03-09 12:42 Agostino Sarubbo
2020-03-09 12:41 Agostino Sarubbo
2020-03-09 12:39 Agostino Sarubbo
2020-03-09 11:17 Agostino Sarubbo
2020-03-09 10:49 Agostino Sarubbo
2020-03-09 10:23 Agostino Sarubbo
2020-03-08 23:22 Thomas Deutschmann
2020-03-02 7:29 Matt Turner
2020-02-26 18:25 Andreas Sturmlechner
2020-02-24 8:20 Sergei Trofimovich
2020-02-05 19:24 Andreas Sturmlechner
2020-02-05 19:24 Andreas Sturmlechner
2020-01-29 5:11 Georgy Yakovlev
2020-01-28 15:11 Andreas Sturmlechner
2019-12-25 20:50 Sergei Trofimovich
2019-12-25 20:39 Sergei Trofimovich
2019-12-25 20:24 Sergei Trofimovich
2019-12-24 14:06 Mikle Kolyada
2019-12-24 8:08 Agostino Sarubbo
2019-12-23 14:03 Agostino Sarubbo
2019-12-23 10:00 Sergei Trofimovich
2019-12-22 22:53 Aaron Bauman
2019-09-13 20:41 Andreas Sturmlechner
2019-09-13 20:41 Andreas Sturmlechner
2019-05-22 2:52 Aaron Bauman
2019-04-24 18:42 Tobias Klausmann
2019-04-01 17:21 Thomas Deutschmann
2019-04-01 10:08 Michael Palimaka
2019-03-17 19:29 Andreas Sturmlechner
2019-03-17 19:02 Andreas Sturmlechner
2019-03-16 22:55 Sergei Trofimovich
2019-03-16 21:57 Sergei Trofimovich
2019-03-16 21:39 Agostino Sarubbo
2019-03-16 14:06 Mikle Kolyada
2019-03-14 21:53 Sergei Trofimovich
2019-03-14 8:31 Sergei Trofimovich
2019-03-11 19:58 Sergei Trofimovich
2018-09-24 18:17 Markus Meier
2018-09-16 12:08 Sergei Trofimovich
2018-06-28 14:37 Mikle Kolyada
2017-10-23 18:42 Thomas Deutschmann
2017-09-24 18:50 Sergei Trofimovich
2017-09-23 19:38 Sergei Trofimovich
2017-09-20 9:59 Agostino Sarubbo
2017-09-15 7:31 Sergei Trofimovich
2017-09-03 5:28 Michael Palimaka
2017-07-30 20:46 Andreas Sturmlechner
2017-07-07 21:44 Alexis Ballier
2017-06-21 12:17 Agostino Sarubbo
2017-06-21 11:57 Agostino Sarubbo
2017-06-20 14:56 Tobias Klausmann
2017-06-20 5:17 Agostino Sarubbo
2017-06-18 14:01 Agostino Sarubbo
2017-06-17 22:01 Sergei Trofimovich
2017-04-04 9:04 Andreas Sturmlechner
2017-03-28 18:43 Andreas Sturmlechner
2017-03-17 18:50 Andreas Sturmlechner
2016-12-14 9:14 Tobias Klausmann
2016-09-04 18:56 Michael Palimaka
2016-02-24 20:52 Manuel Rüger
2016-02-24 20:52 Manuel Rüger
2016-02-10 22:54 Manuel Rüger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1741558928.00b9dc9eecbdd5db438304f2e4c40695e933ef70.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox