From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1706270-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8E12615812D
for <garchives@archives.gentoo.org>; Sun, 05 Jan 2025 20:35:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 15E8CE07D7;
Sun, 05 Jan 2025 20:35:26 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id F119BE07D3
for <gentoo-commits@lists.gentoo.org>; Sun, 05 Jan 2025 20:35:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 41A6233BE1D
for <gentoo-commits@lists.gentoo.org>; Sun, 05 Jan 2025 20:35:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DA9B91A7E
for <gentoo-commits@lists.gentoo.org>; Sun, 05 Jan 2025 20:35:21 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1736109242.0e0354ad2e4b7dc177df883de0d9eecd212e143c.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/protobuf/Manifest dev-libs/protobuf/protobuf-25.5.ebuild dev-libs/protobuf/protobuf-27.5.ebuild dev-libs/protobuf/protobuf-28.3-r1.ebuild dev-libs/protobuf/protobuf-28.3.ebuild
X-VCS-Directories: dev-libs/protobuf/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 0e0354ad2e4b7dc177df883de0d9eecd212e143c
X-VCS-Branch: master
Date: Sun, 05 Jan 2025 20:35:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e71181ca-c639-47f5-9b6c-d18454703868
X-Archives-Hash: 1e4637f311bbfd6f83daceb7c3e52027
commit: 0e0354ad2e4b7dc177df883de0d9eecd212e143c
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Sep 19 21:31:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 20:34:02 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0354ad
dev-libs/protobuf: add 28.3-r1 27.5 25.5
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/protobuf/Manifest | 2 ++
.../{protobuf-28.3.ebuild => protobuf-25.5.ebuild} | 29 ++++++++++++----------
.../{protobuf-28.3.ebuild => protobuf-27.5.ebuild} | 28 ++++++++++++---------
...rotobuf-28.3.ebuild => protobuf-28.3-r1.ebuild} | 28 ++++++++++++---------
4 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 3c3a725e543d..b0781706ea8a 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -6,8 +6,10 @@ DIST protobuf-23.4.tar.gz 5043507 BLAKE2B bf6a50771eb977ef92b779a32fd909693faae6
DIST protobuf-24.4.tar.gz 5180235 BLAKE2B 1c7e9035d9f3810886baaea7d679414c882463c79828c99dd8895a9549638c1ca17f9ab3b38d461019f3e1412d9cb9584b995b1da99866eb6fdbb8bdeb063e6f SHA512 52b6ab5587d03cbd1f35cf3cdc388e1710fa50f3031559ac53cf754965407ded7602cdead56080444ab695588112cc3391a1d7fdd5e565d90d0af7ad08706315
DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
DIST protobuf-25.4.tar.gz 5878444 BLAKE2B 9b40985bda31a84dd3ab7a1d18f746d5f88660d9e036a20234cbc85e79322005d2ffd4e60d72c55a8b5f624d7cc50522771f0804f203f2eabca7b0b8ace0545e SHA512 1b3ba1a1575bcc9d52ddce93d466912863d600dfbb40f64845b8e66c8000047d05508b8f1baba8d5eef42a7ff90eb778f7c8a553c9ec2778fd3a9a18122c67ab
+DIST protobuf-25.5.tar.gz 5877036 BLAKE2B a8174c7cbda47afa3f31d64c7a7aa7f233efd5df5a783abedd229613c8c27a2380684fb5851dad67f76f063688dd8060a0a373f2c95441c2ad91630eb187af22 SHA512 9fe130f5c04919accc99113e13096df93db4c2254a9c2428faf9459416907c77fbf4adefbae3fe644e1f26d9c1fc597165e2c5b6219156c97500d6ef3fdc0793
DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4
DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
DIST protobuf-27.4.tar.gz 9156456 BLAKE2B 004427f4923e523bf77298600bf91a8fe4ca8be4bd6da5b7efcfe9186a032155e525426f83f683e1bed1e799ed1e62d250053386c1463cbd0c062bd05da786d0 SHA512 d076ce7e075096d0dba7ee2314b12e3223c4239c019e25670636a0ef812ddf0ce3f1fd9b9fe8517319db87b14bbdb2653cc4e06023f90032dfedb014457b2863
+DIST protobuf-27.5.tar.gz 9153935 BLAKE2B 08b1b5927188e68ef2ae8ce8cdc6f21c34ee8453f4dfaeb362a7f5a5f0ee5ddc24772e5583ab10fbf193aa43e7fdd316e8fbbe4d066df704aef5469dae01fc8d SHA512 bb266483b11268c207aa0e8ce76442351a331f30151586714d57ed7c9bae05f09aabf5042b90eac85658f708671ba0b33c64d1c58a91a24c00bbf4f4ffdce1bb
DIST protobuf-28.0.tar.gz 9259114 BLAKE2B 328e09ebffb296d838557ea72a4fc4da8e0ad5f1edfccebcc8ee7c9e0e74d06e5e6dbad741fd89f6a4502c1cb246a973fd60c035ccdbf89700b7baff49e2a65e SHA512 8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1
DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
diff --git a/dev-libs/protobuf/protobuf-28.3.ebuild b/dev-libs/protobuf/protobuf-25.5.ebuild
similarity index 90%
copy from dev-libs/protobuf/protobuf-28.3.ebuild
copy to dev-libs/protobuf/protobuf-25.5.ebuild
index bffa811e8049..6a9820f1a034 100644
--- a/dev-libs/protobuf/protobuf-28.3.ebuild
+++ b/dev-libs/protobuf/protobuf-25.5.ebuild
@@ -30,32 +30,29 @@ LICENSE="BSD"
SLOT="0/${MY_SLOT}.0"
IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+# Require protobuf for the time being
REQUIRED_USE="
- || (
- libprotoc
- libupb
- protobuf
- protoc
- )
+ protobuf
+ examples? ( protobuf protoc )
+ libprotoc? ( protobuf )
+ libupb? ( protobuf )
+ protoc? ( protobuf )
"
RESTRICT="!test? ( test )"
BDEPEND="
emacs? ( app-editors/emacs:* )
- !protobuf? (
- >=dev-libs/protobuf-${PV}
- )
"
COMMON_DEPEND="
- dev-libs/jsoncpp[${MULTILIB_USEDEP}]
>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
"
DEPEND="
${COMMON_DEPEND}
+ conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
"
RDEPEND="
@@ -67,7 +64,6 @@ PATCHES=(
"${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch"
"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
"${FILESDIR}/${PN}-27.4-findJsonCpp.patch"
- "${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch"
)
DOCS=( CONTRIBUTORS.txt README.md )
@@ -84,7 +80,6 @@ multilib_src_configure() {
-Dprotobuf_JSONCPP_PROVIDER="package"
-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
- -Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
@@ -95,13 +90,21 @@ multilib_src_configure() {
-Dprotobuf_DISABLE_RTTI="no"
-Dprotobuf_INSTALL="yes"
- -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
-Dprotobuf_WITH_ZLIB="$(usex zlib)"
-Dprotobuf_VERBOSE="$(usex debug)"
-DCMAKE_MODULE_PATH="${S}/cmake"
)
+ if use protobuf ; then
+ if use examples ; then
+ mycmakeargs+=(
+ -Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+ -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+ )
+ fi
+ fi
+
use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
cmake_src_configure
diff --git a/dev-libs/protobuf/protobuf-28.3.ebuild b/dev-libs/protobuf/protobuf-27.5.ebuild
similarity index 90%
copy from dev-libs/protobuf/protobuf-28.3.ebuild
copy to dev-libs/protobuf/protobuf-27.5.ebuild
index bffa811e8049..3c5e73019120 100644
--- a/dev-libs/protobuf/protobuf-28.3.ebuild
+++ b/dev-libs/protobuf/protobuf-27.5.ebuild
@@ -30,32 +30,29 @@ LICENSE="BSD"
SLOT="0/${MY_SLOT}.0"
IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+# Require protobuf for the time being
REQUIRED_USE="
- || (
- libprotoc
- libupb
- protobuf
- protoc
- )
+ protobuf
+ examples? ( protobuf protoc )
+ libprotoc? ( protobuf )
+ libupb? ( protobuf )
+ protoc? ( protobuf )
"
RESTRICT="!test? ( test )"
BDEPEND="
emacs? ( app-editors/emacs:* )
- !protobuf? (
- >=dev-libs/protobuf-${PV}
- )
"
COMMON_DEPEND="
- dev-libs/jsoncpp[${MULTILIB_USEDEP}]
>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
"
DEPEND="
${COMMON_DEPEND}
+ conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
"
RDEPEND="
@@ -84,7 +81,6 @@ multilib_src_configure() {
-Dprotobuf_JSONCPP_PROVIDER="package"
-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
- -Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
@@ -95,13 +91,21 @@ multilib_src_configure() {
-Dprotobuf_DISABLE_RTTI="no"
-Dprotobuf_INSTALL="yes"
- -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
-Dprotobuf_WITH_ZLIB="$(usex zlib)"
-Dprotobuf_VERBOSE="$(usex debug)"
-DCMAKE_MODULE_PATH="${S}/cmake"
)
+ if use protobuf ; then
+ if use examples ; then
+ mycmakeargs+=(
+ -Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+ -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+ )
+ fi
+ fi
+
use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
cmake_src_configure
diff --git a/dev-libs/protobuf/protobuf-28.3.ebuild b/dev-libs/protobuf/protobuf-28.3-r1.ebuild
similarity index 90%
rename from dev-libs/protobuf/protobuf-28.3.ebuild
rename to dev-libs/protobuf/protobuf-28.3-r1.ebuild
index bffa811e8049..3c5e73019120 100644
--- a/dev-libs/protobuf/protobuf-28.3.ebuild
+++ b/dev-libs/protobuf/protobuf-28.3-r1.ebuild
@@ -30,32 +30,29 @@ LICENSE="BSD"
SLOT="0/${MY_SLOT}.0"
IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+# Require protobuf for the time being
REQUIRED_USE="
- || (
- libprotoc
- libupb
- protobuf
- protoc
- )
+ protobuf
+ examples? ( protobuf protoc )
+ libprotoc? ( protobuf )
+ libupb? ( protobuf )
+ protoc? ( protobuf )
"
RESTRICT="!test? ( test )"
BDEPEND="
emacs? ( app-editors/emacs:* )
- !protobuf? (
- >=dev-libs/protobuf-${PV}
- )
"
COMMON_DEPEND="
- dev-libs/jsoncpp[${MULTILIB_USEDEP}]
>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
"
DEPEND="
${COMMON_DEPEND}
+ conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
"
RDEPEND="
@@ -84,7 +81,6 @@ multilib_src_configure() {
-Dprotobuf_JSONCPP_PROVIDER="package"
-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
- -Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
@@ -95,13 +91,21 @@ multilib_src_configure() {
-Dprotobuf_DISABLE_RTTI="no"
-Dprotobuf_INSTALL="yes"
- -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
-Dprotobuf_WITH_ZLIB="$(usex zlib)"
-Dprotobuf_VERBOSE="$(usex debug)"
-DCMAKE_MODULE_PATH="${S}/cmake"
)
+ if use protobuf ; then
+ if use examples ; then
+ mycmakeargs+=(
+ -Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+ -Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+ )
+ fi
+ fi
+
use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
cmake_src_configure