commit: 4d1b05451843921c4bb22f744928d3ea6a97859e Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Apr 4 22:10:21 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 5 00:39:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d1b0545
dev-libs/protobuf: 25.6, 25.5 drop libupb leftovers Bug: https://bugs.gentoo.org/939200 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 | 4 +--- dev-libs/protobuf/protobuf-25.6.ebuild | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dev-libs/protobuf/protobuf-25.5.ebuild b/dev-libs/protobuf/protobuf-25.5.ebuild index 6a9820f1a034..494ce3cd351c 100644 --- a/dev-libs/protobuf/protobuf-25.5.ebuild +++ b/dev-libs/protobuf/protobuf-25.5.ebuild @@ -28,14 +28,13 @@ HOMEPAGE="https://protobuf.dev/"; LICENSE="BSD" SLOT="0/${MY_SLOT}.0" -IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib" +IUSE="conformance debug emacs examples +libprotoc +protobuf +protoc test zlib" # Require protobuf for the time being REQUIRED_USE=" protobuf examples? ( protobuf protoc ) libprotoc? ( protobuf ) - libupb? ( protobuf ) protoc? ( protobuf ) " @@ -81,7 +80,6 @@ multilib_src_configure() { -Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")" -Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)" - -Dprotobuf_BUILD_LIBUPB="$(usex libupb)" -Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)" -Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)" -Dprotobuf_BUILD_SHARED_LIBS="yes" diff --git a/dev-libs/protobuf/protobuf-25.6.ebuild b/dev-libs/protobuf/protobuf-25.6.ebuild index 6a9820f1a034..494ce3cd351c 100644 --- a/dev-libs/protobuf/protobuf-25.6.ebuild +++ b/dev-libs/protobuf/protobuf-25.6.ebuild @@ -28,14 +28,13 @@ HOMEPAGE="https://protobuf.dev/"; LICENSE="BSD" SLOT="0/${MY_SLOT}.0" -IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib" +IUSE="conformance debug emacs examples +libprotoc +protobuf +protoc test zlib" # Require protobuf for the time being REQUIRED_USE=" protobuf examples? ( protobuf protoc ) libprotoc? ( protobuf ) - libupb? ( protobuf ) protoc? ( protobuf ) " @@ -81,7 +80,6 @@ multilib_src_configure() { -Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")" -Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)" - -Dprotobuf_BUILD_LIBUPB="$(usex libupb)" -Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)" -Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)" -Dprotobuf_BUILD_SHARED_LIBS="yes"
