From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1734178-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(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 1D4661581EE
	for <garchives@archives.gentoo.org>; Sat, 05 Apr 2025 00:42:42 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
	(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)
	(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
	by smtp.gentoo.org (Postfix) with ESMTPSA id 07C4B3432D1
	for <garchives@archives.gentoo.org>; Sat, 05 Apr 2025 00:42:42 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
	by bobolink.gentoo.org (Postfix) with ESMTP id CB7CB1104C6;
	Sat, 05 Apr 2025 00:42:14 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(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 bobolink.gentoo.org (Postfix) with ESMTPS id BA85B1104C6
	for <gentoo-commits@lists.gentoo.org>; Sat, 05 Apr 2025 00:42:14 +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 73FB834323D
	for <gentoo-commits@lists.gentoo.org>; Sat, 05 Apr 2025 00:42:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 766A61436
	for <gentoo-commits@lists.gentoo.org>; Sat, 05 Apr 2025 00:42:11 +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: <1743813592.4d1b05451843921c4bb22f744928d3ea6a97859e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/protobuf/protobuf-25.5.ebuild dev-libs/protobuf/protobuf-25.6.ebuild
X-VCS-Directories: dev-libs/protobuf/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 4d1b05451843921c4bb22f744928d3ea6a97859e
X-VCS-Branch: master
Date: Sat, 05 Apr 2025 00:42:11 +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: d918b616-6e80-43af-8195-85514ab99948
X-Archives-Hash: e2ce866850b9e2f382772e0a6569998c

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"