commit: 71aaa628973f1a81a46fae740e0dffb045896611
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Apr 4 14:27:01 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 5 00:39:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71aaa628
dev-libs/protobuf: 29.4, 29.2, 28.3-r1, 28.0, 25.6, 25.5 update to match 9999
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/protobuf/protobuf-25.5.ebuild | 9 ++++-----
dev-libs/protobuf/protobuf-25.6.ebuild | 9 ++++-----
dev-libs/protobuf/protobuf-28.0.ebuild | 17 ++++++++---------
dev-libs/protobuf/protobuf-28.3-r1.ebuild | 11 +++++------
dev-libs/protobuf/protobuf-29.2.ebuild | 11 +++++------
dev-libs/protobuf/protobuf-29.4.ebuild | 11 +++++------
6 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/dev-libs/protobuf/protobuf-25.5.ebuild
b/dev-libs/protobuf/protobuf-25.5.ebuild
index 494ce3cd351c..e947731a59ef 100644
--- a/dev-libs/protobuf/protobuf-25.5.ebuild
+++ b/dev-libs/protobuf/protobuf-25.5.ebuild
@@ -14,28 +14,27 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
if [[ "${PV}" == *9999 ]]; then
EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git";
EGIT_SUBMODULES=( '-*' )
- MY_SLOT="28.0"
+ SLOT="0/9999"
inherit git-r3
else
SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz";
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
- MY_SLOT=$(ver_cut 1-2)
+ SLOT="0/$(ver_cut 1-2).0"
fi
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing
structured data"
HOMEPAGE="https://protobuf.dev/";
LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
IUSE="conformance debug emacs examples +libprotoc +protobuf +protoc test zlib"
# Require protobuf for the time being
REQUIRED_USE="
protobuf
- examples? ( protobuf protoc )
+ protobuf? ( protoc )
+ examples? ( protobuf )
libprotoc? ( protobuf )
- protoc? ( protobuf )
"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-25.6.ebuild
b/dev-libs/protobuf/protobuf-25.6.ebuild
index 494ce3cd351c..e947731a59ef 100644
--- a/dev-libs/protobuf/protobuf-25.6.ebuild
+++ b/dev-libs/protobuf/protobuf-25.6.ebuild
@@ -14,28 +14,27 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
if [[ "${PV}" == *9999 ]]; then
EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git";
EGIT_SUBMODULES=( '-*' )
- MY_SLOT="28.0"
+ SLOT="0/9999"
inherit git-r3
else
SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz";
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
- MY_SLOT=$(ver_cut 1-2)
+ SLOT="0/$(ver_cut 1-2).0"
fi
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing
structured data"
HOMEPAGE="https://protobuf.dev/";
LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
IUSE="conformance debug emacs examples +libprotoc +protobuf +protoc test zlib"
# Require protobuf for the time being
REQUIRED_USE="
protobuf
- examples? ( protobuf protoc )
+ protobuf? ( protoc )
+ examples? ( protobuf )
libprotoc? ( protobuf )
- protoc? ( protobuf )
"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-28.0.ebuild
b/dev-libs/protobuf/protobuf-28.0.ebuild
index 08a9d6fd464f..2621d4f7ba83 100644
--- a/dev-libs/protobuf/protobuf-28.0.ebuild
+++ b/dev-libs/protobuf/protobuf-28.0.ebuild
@@ -14,29 +14,28 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
if [[ "${PV}" == *9999 ]]; then
EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git";
EGIT_SUBMODULES=( '-*' )
- MY_SLOT="28.0"
+ SLOT="0/9999"
inherit git-r3
else
SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz";
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 sparc
x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
- MY_SLOT=$(ver_cut 1-2)
+ SLOT="0/$(ver_cut 1-2).0"
fi
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing
structured data"
HOMEPAGE="https://protobuf.dev/";
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
+ protobuf? ( protoc )
+ examples? ( protobuf )
+ libprotoc? ( protobuf )
+ libupb? ( protobuf )
"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-28.3-r1.ebuild
b/dev-libs/protobuf/protobuf-28.3-r1.ebuild
index ed7af8070753..e53658010cb3 100644
--- a/dev-libs/protobuf/protobuf-28.3-r1.ebuild
+++ b/dev-libs/protobuf/protobuf-28.3-r1.ebuild
@@ -14,29 +14,28 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
if [[ "${PV}" == *9999 ]]; then
EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git";
EGIT_SUBMODULES=( '-*' )
- MY_SLOT="28.0"
+ SLOT="0/9999"
inherit git-r3
else
SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz";
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
- MY_SLOT=$(ver_cut 1-2)
+ SLOT="0/$(ver_cut 1-2).0"
fi
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing
structured data"
HOMEPAGE="https://protobuf.dev/";
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="
protobuf
- examples? ( protobuf protoc )
+ protobuf? ( protoc )
+ examples? ( protobuf )
libprotoc? ( protobuf )
- libupb? ( protobuf )
- protoc? ( protobuf )
+ libupb? ( protobuf )
"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-29.2.ebuild
b/dev-libs/protobuf/protobuf-29.2.ebuild
index 90c31cdfe7a2..d1c1fc5e9516 100644
--- a/dev-libs/protobuf/protobuf-29.2.ebuild
+++ b/dev-libs/protobuf/protobuf-29.2.ebuild
@@ -14,29 +14,28 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
if [[ "${PV}" == *9999 ]]; then
EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git";
EGIT_SUBMODULES=( '-*' )
- MY_SLOT="28.0"
+ SLOT="0/9999"
inherit git-r3
else
SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz";
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc64 ~riscv
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
- MY_SLOT=$(ver_cut 1-2)
+ SLOT="0/$(ver_cut 1-2).0"
fi
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing
structured data"
HOMEPAGE="https://protobuf.dev/";
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="
protobuf
- examples? ( protobuf protoc )
+ protobuf? ( protoc )
+ examples? ( protobuf )
libprotoc? ( protobuf )
- libupb? ( protobuf )
- protoc? ( protobuf )
+ libupb? ( protobuf )
"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-29.4.ebuild
b/dev-libs/protobuf/protobuf-29.4.ebuild
index 92bb4f6121b5..8ce1e903d955 100644
--- a/dev-libs/protobuf/protobuf-29.4.ebuild
+++ b/dev-libs/protobuf/protobuf-29.4.ebuild
@@ -14,29 +14,28 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
if [[ "${PV}" == *9999 ]]; then
EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git";
EGIT_SUBMODULES=( '-*' )
- MY_SLOT="28.0"
+ SLOT="0/9999"
inherit git-r3
else
SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz";
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
- MY_SLOT=$(ver_cut 1-2)
+ SLOT="0/$(ver_cut 1-2).0"
fi
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing
structured data"
HOMEPAGE="https://protobuf.dev/";
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="
protobuf
- examples? ( protobuf protoc )
+ protobuf? ( protoc )
+ examples? ( protobuf )
libprotoc? ( protobuf )
- libupb? ( protobuf )
- protoc? ( protobuf )
+ libupb? ( protobuf )
"
RESTRICT="!test? ( test )"
