2023-06-28 08:39:49+00:00

30 files changed, 289 insertions, 64 deletions

diff --git a/Manifest b/Manifest
index 7af8d79a3dc10..b0858022b93da 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29271 BLAKE2B 0d1d568df48661a10b365c2016134958f1bf378175a05cf45b29b823de583bea58bbdf7e40862e91cd8b5593cf10759e6fbf59894792ee01dce5b5163e338a1d SHA512 3567d7fadac475f28643d2a5ee9da132352b6bc504a465c87f470a972a20f1a79063cea71072abf088f8c453f79e453ea7845b7207b1162f468e5a573da835ce
-TIMESTAMP 2023-06-28T08:09:52Z
+MANIFEST Manifest.files.gz 29277 BLAKE2B 913abefb8dc9b56bd8a40ac23d829d7cde224ac23dcfe95c74f6f28fecfe932f709206c0d6b7220a32504e96b84880b77f9f64e39d725129d88e76eb3454994c SHA512 73e3abc244b65c47bfb98ee8d959efa5a47a03775bae3dceb0004a563375a250c2c102c43d90efae7db55a2b5a68ffb9e205c9d9a7aeed20ddb678e50bfc31b2
+TIMESTAMP 2023-06-28T08:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSb6tBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSb8dlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBb4w//Zx8R0hIT1nr3a9nXNk6zATHZpZ9sfvaoFM+F4Ra17kuRxD7WL4HBeRQ1
-HLkERXB2UQfT/uV+KgeaLmsf5EX7PSP6YCgokvwxNEvVGhjP5HS8tQiyws/zTLL6
-x8iIoTepHYg+kkr/h3D2+x0/PiJPUrA5LA59buXNHvDxwgZl65d2mN3pgh65Oh8T
-jw0a1P0EtKnY+b7ulSP808Kw+Dl+lC0iO1+KP3DnsZhY7vOYw/NQ+Zh1pxiHZeeK
-gKaMEyW7AUjLVpW+OCdE0G4c4m/a/Ct8ktoFDmUFQ7Vbr8FIb2ZQ+L4oDolnOu0r
-Dm/qhVpTVrFs2at3f5zCwbko+mdg6d6SgtdTass5hRxOYmAMsE6WSPauuFtyesz6
-7QSJjROflkYSD43b8Gp4Gn4XAfN+T0Y97KK8kqSyrvroWzHh69bPu+hR3vUGw8qr
-p0wAq3X1cWSKilwhQCCd+m3v4x35EYtAdFLc/UqprW0dUOzMHwUHMg/wOZEKbyrA
-doAky229o466hR3albuyTwDqHgd9P5ab89WusSIhGpFrJv9RGC2qFs8t/qGx9BeO
-ygHtBZJBqd0Zmhw0F7xUW5cUq1XJxtqe0CMkaqMb08lqcS9o2rZC/PMKXjfCZgGw
-JwyLkrXE+ckp5WskH0dxfyDwbdOuIPG+pYkMlJPE5E0KuVY8RxY=
-=xwDN
+klAKww/8D7FDEenHY2QVMpJGuL8v5hqrNzma+8M/hqefxKdAky+xT2CMMGIV3lXf
+99X/OJYNWK9/9C1WsX4zetcg+pXPoMZzl0RQP02F8Xe5h/hMq/g5QYGwDsKnLOCy
+JovI51jKhsl29Ka5LfxaUPYEkcRWRvpJAbqaxT5sQ1DqYv7Cl6ZzTwDCJJoVA+vo
+9A+RIbehW55Bdl5A+/Q3Y92GJGl5cna1CtwO5cvmt26ctFooEJHkVYdDFgay3z1f
+q2V7SrdDo/0jLTC3GhqUK19q5oS5jV35zdkPXPc+HiFKSSUmAGg9wTqRN9pMY7qt
+8Cwskk1SHoQGs3MYrUuttmhuiQ0DWGuKPnFAr7/Hq7ZgWLvSYXG6693dO4SHqrbb
+lNlEaDw8/ZgIFkrrvluA8kZD8mmWBnLaHCk/0tghWNP7DDqikoiyUCl1Ia0y7UIo
+qIK94bvX26IkmKwBYEjiurBi3LcGySAGQBRR/PuKlFQlNKnXzeCyrtf8BCPWxfUi
+6RVUxtdrOn5t1cAAYyeuFxSqVx5R58hues38ImQrwFA3oIeMaAr5V6DTX5iedkTy
+ugg5Q2vGyo9UufH49XWpgmDPMeMZ9vyK43xjb/kKy60lJhZmvsijBCkmyE2k3ne9
+BxWvqgtZABNyFmzXT3/G+b2UCFupTXHzR+5AFhMAli841o48UUM=
+=Tzux
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3ea942f1e377f..62e800bd97dff 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7abf3bfe64d5f..2bb66d0784cea 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 6bd30d1d21d17..ee8c9bb0a7fa4 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,4 +1,7 @@
+AUX protobuf-java-3.23.0-unittest_retention.proto.patch 2122 BLAKE2B b7c7297efaf11291809c46452291419482775e9cca712e000d8a1a604c01fe1bd1df3d076c56154c37ec6d32731a9384bcce1deb23b06dcaa26e0a00b4438160 SHA512 18e9da72f5fca6f1585836c37a3040c43c1db84f617f78ad91d642e9db2811953e30e8a676011ddb5e2c273698527c89487606c0428cfdcbb7c3e7d6d782832f
 DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346
+DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
 EBUILD protobuf-java-3.21.12.ebuild 4452 BLAKE2B d18bf0098fa38c538fd4852d4dc585040cbbd56ad17fbd02a18b1a4292008cdcf3307dc580ab5a5f3c95e4bb3e9025377bc524959f59df3ebb94f49c189b40f9 SHA512 5494d4060782c81d04f45f5184ac304ab846fd3fa375d0513d1481b7f99c85ebdaf6219ee170256fe7d7828121d3d44b790b23c9250aa4fc8a093d97a9d4773e
-MISC metadata.xml 625 BLAKE2B 13394b9a2148b9117ce719954591e79088f845ac1ceb667bbdd2645b989daadcfea09525f9dde68c405e3f1cce5cc1af32de9fb4dff629e4745e13fa92727dd7 SHA512 47f693db57dbde04f419ed65494d81b0a800c9ac49d790c9b794baef34fb1f876da29c5a0662c45aa3c01cecd34af648e196fb76110fcc0066198c59543049b3
+EBUILD protobuf-java-3.23.0.ebuild 5007 BLAKE2B fdf28abbd24a0259167abc53a62e7699b69c3a528eebcd50a866baed6517a60f09a237e5500ae2c9b488b3407a4f55abc3fbf35ddfc459535e1e5af3d428837b SHA512 83b1a6da9f7461419e206551a1810fa491ab9b32f6a32a829f3c76a85f52c296b7743be8680f2733a65aff7bef4704489aa7a2e554786ca526146c0ad4666b66
+MISC metadata.xml 777 BLAKE2B 70de12bad5be3c8278834a4a8444c7485470c0f1822ff50f8d44280ac3c1e7150c4428cc417b59e834004cc92574a7016c90acf96728abc0b86c17ac14826df1 SHA512 7addbf4ecf146a11ab301c0e0657ec0572dfa84d4fccdd0bccb3248cab7f09956758041be670f8e22f114292447e3e00c7cd7d251c29e39b2e57eb5dd3a022c5
diff --git a/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch b/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch
new file mode 100644
index 0000000000000..c838bf3cede27
--- /dev/null
+++ b/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch
@@ -0,0 +1,35 @@
+java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:68: error: cannot find symbol
+import protobuf_unittest.UnittestRetention;
+                        ^
+  symbol:   class UnittestRetention
+  location: package protobuf_unittest
+java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:402: error: cannot find symbol
+    FileOptions options = UnittestRetention.getDescriptor().getOptions();
+                          ^
+  symbol:   variable UnittestRetention
+  location: class DescriptorsTest
+java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:403: error: cannot find symbol
+    assertThat(options.hasExtension(UnittestRetention.plainOption)).isTrue();
+                                    ^
+  symbol:   variable UnittestRetention
+  location: class DescriptorsTest
+java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:404: error: cannot find symbol
+    assertThat(options.hasExtension(UnittestRetention.runtimeRetentionOption)).isTrue();
+                                    ^
+  symbol:   variable UnittestRetention
+  location: class DescriptorsTest
+java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:405: error: cannot find symbol
+    assertThat(options.hasExtension(UnittestRetention.sourceRetentionOption)).isFalse();
+                                    ^
+  symbol:   variable UnittestRetention
+  location: class DescriptorsTest
+--- a/java/core/generate-test-sources-build.xml
++++ b/java/core/generate-test-sources-build.xml
+@@ -19,6 +19,7 @@
+         <arg value="${protobuf.source.dir}/google/protobuf/unittest_optimize_for.proto"/>
+         <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/>
+         <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_optional.proto"/>
++        <arg value="${protobuf.source.dir}/google/protobuf/unittest_retention.proto"/>
+         <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/>
+         <arg value="${test.proto.dir}/com/google/protobuf/any_test.proto"/>
+         <arg value="${test.proto.dir}/com/google/protobuf/cached_field_size_test.proto"/>
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 5fdb33c1c7c3a..20b09444fc60f 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -12,10 +12,12 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
-	<slots>
-		<subslots>Soname version number of Protobuf</subslots>
-	</slots>
 	<upstream>
+		<bugs-to>https://github.com/protocolbuffers/protobuf/issues</bugs-to>
+		<doc>https://protobuf.dev/getting-started/javatutorial/</doc>
 		<remote-id type="github">protocolbuffers/protobuf</remote-id>
 	</upstream>
+	<use>
+		<flag name="system-protoc">Use protoc provided by dev-libs/protobuf</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild
new file mode 100644
index 0000000000000..aaf13ce4b65ef
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:protobuf-java:3.23.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="Core Protocol Buffers library"
+HOMEPAGE="https://protobuf.dev"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+# And we build artifact 3.23.0 from the 23.0 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+S="${WORKDIR}/protobuf-${PV#3.}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-protoc"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+		)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+BDEPEND="
+	system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0  )
+	!system-protoc? ( >=dev-cpp/abseil-cpp-20230125.2 )
+"
+
+PATCHES=(
+	"${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="java/core/src/main/resources"
+JAVA_SRC_DIR="java/core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="java/core/src/test/java"
+
+run-protoc() {
+	if use system-protoc; then
+		protoc $1
+	else
+		"${BUILD_DIR}"/protoc $1
+	fi
+}
+
+src_prepare() {
+	# If the corrsponding version of system-protoc is not available we build protoc locally
+	if use system-protoc; then
+		:
+	else
+		cmake_src_prepare
+	fi
+	java-pkg-2_src_prepare
+
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	# https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/pom.xml#L43-L62
+	PROTOS=(  $(sed \
+		-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
+		"${S}/java/core/pom.xml") ) || die
+	pushd src > /dev/null || die
+		cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
+	popd > /dev/null || die
+
+	# https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/generate-sources-build.xml
+	einfo "Replace variables in generate-sources-build.xml"
+	sed \
+		-e 's:${generated.sources.dir}:java/core/src/main/java:' \
+		-e 's:${protobuf.source.dir}:src:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|echo\|mkdir\|exec/d' \
+		-i java/core/generate-sources-build.xml || die "sed to sources failed"
+
+	# https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/generate-test-sources-build.xml
+	einfo "Replace variables in generate-test-sources-build.xml"
+	sed \
+		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
+		-e 's:${protobuf.source.dir}:src:' \
+		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|mkdir\|exec\|Also generate/d' \
+		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
+
+	# Split the file in two parts, one for each run-protoc call
+	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
+		java/core/generate-test-sources-build.xml || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_BUILD_TESTS=OFF
+		-Dprotobuf_ABSL_PROVIDER=package
+	)
+	if use system-protoc; then
+		:
+	else
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if use system-protoc; then
+		:
+	else
+		cmake_src_compile
+	fi
+
+	einfo "Run protoc to generate sources"
+	run-protoc \
+		@java/core/generate-sources-build.xml \
+		|| die "protoc sources failed"
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	# https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/pom.xml#L63-L71
+	jar cvf testdata.jar \
+		-C src google/protobuf/testdata/golden_message_oneof_implemented \
+		-C src google/protobuf/testdata/golden_packed_fields_message || die
+
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
+
+	einfo "Running protoc on first part of generate-test-sources-build.xml"
+	run-protoc @test-sources-build-1 \
+		|| die "run-protoc test-sources-build-1 failed"
+
+	einfo "Running protoc on second part of generate-test-sources-build.xml"
+	run-protoc @test-sources-build-2 \
+		|| die "run-protoc test-sources-build-2 failed"
+
+	einfo "Running tests"
+	# Invalid test class 'map_test.MapInitializationOrderTest':
+	# 1. Test class should have exactly one public constructor
+	# Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
+	# 1. Test class should have exactly one public constructor
+	pushd "${JAVA_TEST_SRC_DIR}" || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-path "**/*Test.java" \
+			! -path "**/Abstract*Test.java" \
+			! -name "MapInitializationOrderTest.java" \
+			! -path '*protobuf_unittest/CachedFieldSizeTest.java'
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3d11363bc55ca..65cb3f1ed165b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index eba9498998ccd..139447fb794b4 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,3 +1,3 @@
 DIST pyotherside-1.6.0.tar.gz 183645 BLAKE2B e2a12a9a96f3672a5e322c9f2e84d485b8086bdcacfc6586e0c23f6dd730d3e66cea66618540fd9a304480a9ab86386e2fe0136047c59f70bfa3b5cff9e8e76e SHA512 57835db9d65fae10e6b3ec8ab37793e316324e7a819a1045436adf9eabdee11ccf3090a4db0302283b236e77e5e0bd14cf92ed1430835ccc324e50085a872787
-EBUILD pyotherside-1.6.0.ebuild 1373 BLAKE2B dbc0ce6228273fd98326a0a661c2752c1659a02e578485d1347234d1b45471ce71ddda7d04ed1b4cb136937e6dd8b3cb2cc9ac881f746c50eb55ef1a1d4aa2a9 SHA512 290a247633bbbfb9e8f9528e17a5847fa2cddc8ab54b50e70941c8c3e708d46de03668f564d25134ff78d538a777ae8c2354dd764bb278bd38b5f7a219abcae5
+EBUILD pyotherside-1.6.0.ebuild 1262 BLAKE2B 2bff5a8d65ccfe2b214fc8382ba187cd17afb8cd2b42b03b21597e2169b3113e74c080cc0a9ae7e85ff57d888b127432f0361e99ca9e1b97f68cd3aebfa0feaf SHA512 13411b2916ca77f278643e68951a7f7becb61e59df16e472746aa821d216223bf5254d5e869d925e7d96f3fd3970aeba4cbf7da2c2fc4e5d0db9345ac696d72c
 MISC metadata.xml 326 BLAKE2B c323223e1038b40f67b25b1f13a4f5fec61175ef0b73bd3ec3a4228bb51b0a41e0f27ca2f47ec9f2b595e07a83358c74f254054d06b4488ff25d2a1c046899b4 SHA512 9d4649f09f1a00a9aa4a8eeb4e535ceff6b924253cd3ac93a8c0d1f6fe2a94c02a7f14f5b722b7b39744ab7331cd3efb57dc59bcb7ab6fb5ce59f692c0f2718a
diff --git a/dev-python/pyotherside/pyotherside-1.6.0.ebuild b/dev-python/pyotherside/pyotherside-1.6.0.ebuild
index 09ccc8660fa9a..41263ea70ea1c 100644
--- a/dev-python/pyotherside/pyotherside-1.6.0.ebuild
+++ b/dev-python/pyotherside/pyotherside-1.6.0.ebuild
@@ -20,8 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( qt5 qt6 )"
 
 # qt6 TODO:
-#  - add dev-qt/qt{gui,opengl}:6 once in the tree, test if qt6 deps okay then
-#  - instrument qmake6 (no eqmake6 in the eclass yet)
+#  - check if all qt6 deps are okay yet
 #  - multibuild for both qt5 and qt6 if requested
 RDEPEND="
 	${PYTHON_DEPS}
@@ -33,7 +32,7 @@ RDEPEND="
 		dev-qt/qtsvg:5
 	)
 	qt6? (
-		dev-qt/qtbase:6
+		dev-qt/qtbase:6[opengl]
 		dev-qt/qtdeclarative:6
 		dev-qt/qtsvg:6
 	)"
@@ -48,7 +47,7 @@ src_configure() {
 	if use qt5; then
 		eqmake5
 	elif use qt6; then
-		die "Qt6 support is not ready yet"
+		eqmake6
 	else
 		# This should never happen if REQUIRED_USE is enforced
 		die "Neither Qt5 nor Qt6 support enabled, aborting"
diff --git a/metadata/.checksum-test-marker b/metadata/.checksum-test-marker
index 146b994ee21b3..044ad168abeeb 100644
--- a/metadata/.checksum-test-marker
+++ b/metadata/.checksum-test-marker
@@ -1,4 +1,4 @@
-1687939827 Wed Jun 28 08:10:27 AM UTC 2023
+1687941626 Wed Jun 28 08:40:26 AM UTC 2023
 # Testcase for mirror network:
 # Watch the value over a day, if unchanging then
 # one or more mirrors is missing --checksum
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 0554fda698be6..63b078021d4f9 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9fea96a1465f8..df666f03854c8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 08:09:49 +0000
+Wed, 28 Jun 2023 08:39:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 87af6cefe5fe6..0f12fb930be49 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-06-28T08:09:52Z
+TIMESTAMP 2023-06-28T08:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSb6tBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSb8dhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDnEw/8CbO4WilLDWLGX89cEa/sOZBhi6NFnrKMrbJ4xBfKsruKHzjA8UhqX6fB
-QBTvS7IcCjldSnJdPNysWmj2DhQqfQ/W17MzCxAaM9Or4qsoJMrgUEn276WBqruP
-7grRLLnTvqGXwjFDnJFJb8oUBuy6mssTF5AJvVpGdAyBLbcU36snJSwv6pfeGWNu
-v9IgxOwBtHyr2+H0dXWcbh1j4etgYKcyc6+65mf3N9p+5ANeTGPzQ9Ud6RMDL5nZ
-5ot0E4vGoMlt6MAJ+1V4AXRX14yD0LKQVu3cJUsPbLU/3747UpIFyep97y4Er72k
-YHuHOaCl/moyCVnUNmqUVJmj8ir/YzCitBht1Rr65oAIk9PvnKIMd39b9X/pLytH
-eD04kcSEMhtFdjptLtWTVO/UaebYbN0r2CYvfnKonQYN32HDAp7Hw8WBmXKEoFmk
-VVpui/MWPW955Drh80GECoI8DGkImhCZxy6IjpD6qUx9swqEP0MJEeip1YJ+Ymof
-dqztEARPU8pSxt7iCVc73GZVZYKUio/MQ/YJjuM3yWnqztFlGsEq7yvHriewzZCr
-4MvczkG/Tqb0OrA4QnKVlFTdeCAVJF9BA5eu9SaY+W/wk5IUtH7cqAUiZ05fuIBN
-OKQR1aLdOnVFGN+iKNalBpByDpPucbvj+2zf6wpnpfJusCH6tLQ=
-=k9wI
+klCfTA/+N+D0Cwtd0jvAocKJYscnd8bVmWcQR7a9sVveR/qpljwpNKecSm22Ha+o
+OFOBtkw1vBlrodb7aZNVIWLqd+b8MxVUQ9R6mXUdqSNY4mzXnmG+A6BxojPDfxsz
+t4bGjiIBtc51g8a6JQxn6MecsPduTw0wEVMOuHNhOaaHh1OpuJZMEHQXRdYrqYgT
+JZRI3kdzelAZ9AOkz5zN9n7jiiVQAmylG42L4Rn++Bhs6PSwwSvEzdGFu1HX3YAI
+bIuoAkdJcKsTWmnjKUsI/aPEstNesjDYjlGbUzvLHZtCCLDu2fNi62KZ1AQuqqpl
+X4pHi/4Up82VZ40eeQZOolMYStybLMxgtTIsFzh5cgYmx08K5upqTi0uYqnBbOzN
+ydV2uekEnJnCYNRMwWUmbZ1xW1iYrSF2+U0C4taJsqK+QuZJzDl8mZRR2n9cMwwL
+WTffNWe9rpRduAy+3/x23xZ1XWtOVb7KXITtFoKIQ4f0E1R/KtP2uT1AJM1pO/yL
+GfsBBuJLZW1kfMuJx637JeL7/h0vi9PxpqoANIiiBgZy1D82Y7nD+EgGRfYkPn0T
+jhEj1U6hjpus397qnLHN+Ir7tfIs+VCxfcnXjz8txeAFpjXN7BcUHDRT2N76+bOE
+oarILxqYObJSXP9GCrssO/RJA7lekD5+uJYS7mU0lKuWMU2/oug=
+=sQIW
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9fea96a1465f8..df666f03854c8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 08:09:49 +0000
+Wed, 28 Jun 2023 08:39:49 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7283736420113..e263e39397b2f 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 76020b1969a83..b320633e8dbf2 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.23.0 b/metadata/md5-cache/dev-java/protobuf-java-3.23.0
new file mode 100644
index 0000000000000..f0d5815adef44
--- /dev/null
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.23.0
@@ -0,0 +1,16 @@
+BDEPEND=system-protoc? ( ~dev-libs/protobuf-23.0:0 ) !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.2 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Core Protocol Buffers library
+EAPI=8
+HOMEPAGE=https://protobuf.dev
+INHERIT=java-pkg-2 java-pkg-simple cmake
+IUSE=system-protoc doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v23.0.tar.gz -> protobuf-23.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
+_eclasses_=cmake	1abaebfe913f48975739281ab7d7ab75	flag-o-matic	ad475baa777c9978fa035216c8264a10	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	1c8a695f6cae6a50261276f4b3da9914	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=78140de8765eb6087d55552a84a124ef
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b8e39e5a3ab66..c9da0fec8d6a7 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/pyotherside-1.6.0 b/metadata/md5-cache/dev-python/pyotherside-1.6.0
index c96ea0eb1a191..f726fc5885b9e 100644
--- a/metadata/md5-cache/dev-python/pyotherside-1.6.0
+++ b/metadata/md5-cache/dev-python/pyotherside-1.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 ) qt6? ( dev-qt/qtbase:6 dev-qt/qtdeclarative:6 dev-qt/qtsvg:6 )
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 ) qt6? ( dev-qt/qtbase:6[opengl] dev-qt/qtdeclarative:6 dev-qt/qtsvg:6 )
 DESCRIPTION=Asynchronous Python 3 Bindings for Qt
 EAPI=8
 HOMEPAGE=https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/
@@ -7,9 +7,9 @@ INHERIT=qmake-utils python-single-r1
 IUSE=+qt5 qt6 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
 LICENSE=ISC
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 ) qt6? ( dev-qt/qtbase:6 dev-qt/qtdeclarative:6 dev-qt/qtsvg:6 )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 ) qt6? ( dev-qt/qtbase:6[opengl] dev-qt/qtdeclarative:6 dev-qt/qtsvg:6 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( qt5 qt6 )
 SLOT=0
 SRC_URI=https://github.com/thp/pyotherside/archive/1.6.0.tar.gz -> pyotherside-1.6.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a34d5f83235297b76d71eaf8deb53768	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=95142d2c1256e19a3964b8c7500a236f
+_md5_=12b740785f4e258ed922260416f220bb
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c8dbfe9a848ce..e7fff01ad261e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-06-28T08:09:52Z
+TIMESTAMP 2023-06-28T08:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSb6tBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSb8dlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBhsBAAodvEUHSlzKzCuX0TNrQZFkrUentTj2o9/U1Zp1I2cPupx9SbthwzQjVP
-7mGmOZpaWPm0Xhg5uGGOV9nxL7S/85560bC2DHKZP7RkW+F6KEBqyTXVQyoL16lS
-2HlHUvfniV24amiipAyKc3I4A/CGQyYqZuI2mCQ7cwesPA3etzsdZ/uVATwBZMeC
-cbjpgLKfBLb1hiFEUdGDzF0fgdQkbJztY/uDia6uKhkoWBlCE1CUfsO4FnFmgXCO
-YCR+N08CllKhjt4spY38suaDeW1jNga1dHyJkATyT66Ot+9HvMA0UiUnSlFU+ALS
-P5mgKPX9lpyt8GAbSpEUqxCGGiY8g2CAos4owoKLO2jwVBUUQlyv+9cD2FQyKY/U
-XjMwUc/GXNemo06Tfm9LprGjKbjDOi+CqZU63Tl9cdu0RECfJY2+bEC4h7cczwIy
-/KfEkyju8M4LTfWupavhGa0YQkWvMq8HsP3hs+zzb8UbyR70MM19u+QMgntHPjEK
-eubnc9RxIFmwNcNYbNZEGaI6UNM+FRb+YDkzxAPZXxhazA/+wyUWPaCekx2QnEZI
-WydGohVFP7G3azSqb77PiVC5F61YbH7ARmPP44FdI0/jxiIIE/KwDOACIO6fq1Bd
-3j3A2TB/9+t8Eb55f4BppXRxy+ytfwTIiuz84dfhpLicc5gkmR8=
-=ehBL
+klDNZRAAsIXRgbuEqgoWt2tiiWQ7bh1u3SVCGaYjuckN5zFeuz4ohsdHroniSE9Z
+/dT3GbI7hD8iVxWijMjSPHmyoDmDg/RRYKiH5B8106FdTWBbH6csziFc/UM8AY8X
+C86I8rM4cJrFRpUTDE6Vl6NyzBXhYPCvR32zOwu+gaWjoZ14pj2sUIIkwtX6XSvb
+9yphCms5FTrjbIQGylsErKtb+vuTDy3gMlcJtBoMovtivhL4zG/Cjby7Z5LY5otQ
+pEcBpchHz5b623JCGkVOFE+odowiyg2lbe2/zKywwqswH2fOsUK134qI3+P881lp
+iMJeiBooMiu1lVdTuF7VM4eweAv3c9ejEpWOHUal0uLRcrq5a5AySNa5IqCZDqtA
+vHNkqrQ7sDQsfBHPOMQYTwIZJ4cS8UTXvumdv4WQQOj/tAwzluhADmKWyFcO38GV
+f466F9OwRJmTInuWxgb0mFDljFsqiKl8LMZ0ph29cAa0V/TcAzg4ylGp9QFQYOFs
+DcnfxHStp6LurIZwiHEIICd1fzcVcEDv/0wHcEuYHx+xH1pkWz5qeZelictaCn0L
+QECbKzAM+caI1d56IQ+KKGM5TxQK/3kHXYhjy1PzukOg5mtN6/PtpAMgrsAryBf4
+S6NR7qx/MOzjGKp1e9Gmgw+X7qP9BV9AMMii7WoU0g9KF7BbgzY=
+=gbV+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9fea96a1465f8..b4f0fabf13557 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 08:09:49 +0000
+Wed, 28 Jun 2023 08:39:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 71733eaf67855..34f0b6bbad419 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jun 28 08:09:49 AM UTC 2023
+Wed Jun 28 08:39:49 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 245cdea523122..eee4214878eab 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 08:15:01 +0000
+Wed, 28 Jun 2023 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 007c3aff1b208..6d539f5fda54b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9f9f159bcdbf606e678de77928ebf552d442d6bd 1687939167 2023-06-28T07:59:27+00:00
+62f95c31cdb8d88663522dad41d574b79d91fc09 1687940983 2023-06-28T08:29:43+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b3507f273bfc4..bc5c8b93efb9f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1687939801 Wed 28 Jun 2023 08:10:01 AM UTC
+1687941601 Wed 28 Jun 2023 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9fea96a1465f8..df666f03854c8 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jun 2023 08:09:49 +0000
+Wed, 28 Jun 2023 08:39:49 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 427abb2644318..72f172065df92 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 5e6bbe64ef337..3fb41b403f570 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-05-04)
+# No suitable version of dev-libs/protobuf available.
+dev-java/protobuf-java system-protoc
+
 # Joonas Niilola <juippis@gentoo.org> (2023-06-06)
 # Runtime not tested, may require more configuration in the ebuild.
 # Bug: #906509.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c3dd22b2858e1..1b26f41869aef 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1641,6 +1641,7 @@ dev-java/openjdk-jre-bin:headless-awt - Don't install the X backend for AWT, nee
 dev-java/openjfx:media - Compile media module, based on gstreamer-minimal (does not pull gstreamer)
 dev-java/openjfx:source - Install JavaFX sources
 dev-java/pdfbox:tools - Build and install pdfbox-tools
+dev-java/protobuf-java:system-protoc - Use protoc provided by dev-libs/protobuf
 dev-java/rxtx:lfd - Installs and uses LockFileServer daemon (lfd)
 dev-java/sbt:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
 dev-lang/R:lto - Use link-time optimization for R and its recommended packages.