public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/
Date: Tue, 28 Jan 2020 15:11:56 +0000 (UTC)	[thread overview]
Message-ID: <1580224299.3d85b73f9e40e168776914d4faabe89b9132b9a7.asturm@gentoo> (raw)

commit:     3d85b73f9e40e168776914d4faabe89b9132b9a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 14:41:49 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 15:11:39 2020 +0000
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 <asturm <AT> 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 00000000000..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
+				-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
+}


             reply	other threads:[~2020-01-28 15:12 UTC|newest]

Thread overview: 129+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-28 15:11 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-09 22:22 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/ Andreas Sturmlechner
2025-03-09 22:05 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
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=1580224299.3d85b73f9e40e168776914d4faabe89b9132b9a7.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