Merge updates from master

dev-java/eclipse-ecj/Manifest

@@ -5,3 +5,4 @@ DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469c
 DIST ecjsrc-4.31.jar 2347993 BLAKE2B edb1a525646fc3152661a6583ab5c50a1dd7f06dac0b7cdae0913843e0ed6ef2c9862889351557857140c79c479505aeca154958b649d05ace6a5b83f6ccac45 SHA512 3e72ae5e5209dd80f7b3f208aeb0a6eece28ab416c56eedd590c67724c6a905b39b8f27a41394e3cf6a96acc16a9c7dd91d12df9651bc289839648036ac2d430
 DIST ecjsrc-4.32.jar 2357386 BLAKE2B f6c440b13eb3cd014f317d9232a7db713621b3bcb902bc385561fc4ce68711c9fde021920b535fafb4db7e93d515e23c9d57ac3506539915e1ba33ce37a4570a SHA512 e45cfe0df73f5ec83efeeb12785c2efab9977e927de8766507668f104fea4fefeaa59695988d977734fee4ccd43da43da798976177bb3b15a87ca2966e448d9e
 DIST ecjsrc-4.33.jar 2361539 BLAKE2B 1bfd2f7d8e9f79bceebec337ddff651a42d133015be8749076d6a67f60d7fbf8e56e658b1535f52fe7f736b6e59eff6187ee94c6c260b399145c1018ae388e35 SHA512 48823264ff18b666b6d350c58e8b3b7d0429d2c5de061cee4c88894da2d44049bf0fcf13ca20d848797ef0591fccd028ac687ec072b8eb02deb5f57b7e560677
+DIST ecjsrc-4.34.jar 2369991 BLAKE2B 61ab2deff1753864b1b69eafb7ed99134a15d0e467ad91bc9ca8a74ca607ae2f3831b8e5af11fa2a584232302b7af510d043445e86bd327e09153666e8f0103e SHA512 6bf4f7c1630d81901ff8ed2345371cadcaf7f62c4edc7ade3211c0c254a2099c4e9506563c27c49be966765899f447fc280ff4ca411e636e269fca0f687a502c

dev-java/eclipse-ecj/eclipse-ecj-4.34.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+# 3.38.0 according to
+# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_32/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.38.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DMF="R-${PV/_rc/RC}-202411201800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+SLOT="4.34"
+# KEYWORDS="~amd64 ~arm64 ~ppc64" # Seems to depend on higher jdk which is not LTS
+
+BDEPEND="app-arch/unzip"
+
+# restrict to >=virtual/jdk-23:*
+# ./org/eclipse/jdt/internal/compiler/apt/model/ElementsImpl9.java:347: error: cannot find symbol
+#     public DocCommentKind getDocCommentKind(Element e) {
+#            ^
+#   symbol:   class DocCommentKind
+#   location: class ElementsImpl9
+DEPEND="
+	>=dev-java/ant-1.10.15:0
+	>=virtual/jdk-23:*
+"
+
+# restrict to >=virtual/jre-21:*
+# ./org/eclipse/jdt/internal/compiler/lookup/TypeBinding.java:722:
+# error: unconditional patterns in instanceof are not supported in -source 17
+# 	return isRecord() && components() instanceof RecordComponentBinding [] components && components.length > 0;
+# 	                                  ^
+#   (use -source 21 or higher to enable unconditional patterns in instanceof)
+RDEPEND=">=virtual/jre-21:*"
+
+DOCS=( org/eclipse/jdt/core/README.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
+JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
+	rm META-INF/ECLIPSE_* || die
+
+	mkdir "${JAVA_RESOURCE_DIRS}" || die
+	find -type f \
+		! -name '*.java' \
+		! -name 'package.html' \
+		! -path '*/grammar/*' \
+		! -path '*/OSGI-INF/*' \
+		| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}

dev-java/protobuf-java/Manifest

@@ -1,3 +1,4 @@
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
 DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
+DIST protobuf-29.1.tar.gz 9363710 BLAKE2B 8d43358c17f14a807391f37796226b9cedef3ef27ef536a6cb50a7a336a80fe221777ba669f3cee7e6a33a4decfc64e3b091d658de73e24a708297e2a539322c SHA512 eb604b473e09a5a001bf451ccd417cdb8732ebd3c2075fa46f3d0e48b7ed4d458f05d2e09eedc71c0f4252ba18d3161837efb7a2eed46d78b9eb3cc9b45f96ff
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8

dev-java/protobuf-java/protobuf-java-4.29.1.ebuild

@@ -0,0 +1,152 @@
+# Copyright 2008-2024 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:${PV}"
+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 4.29.1 from the 29.1 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+MY_PV4="${PV#4.}"
+MY_PV="${MY_PV4/_rc/-rc}"
+MY_P="protobuf-${MY_PV}.tar.gz"
+TV="1.1.3"
+SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P}
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar )"
+S="${WORKDIR}/protobuf-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-protoc"
+
+BDEPEND="
+	system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] )
+	!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+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
+		cmake_src_prepare
+	fi
+	java-pkg-2_src_prepare
+
+	# ${S}/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.java_source.dir}:java/core/src/main/resources:' \
+		-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"
+
+	# ${S}/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
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if ! use system-protoc; then
+		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() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar"
+
+	# google/protobuf/java_features.proto: File not found.
+	cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die
+
+	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"
+
+	# java/core/src/test/java/editions_unittest/TestDelimited.java:2867:
+	# error: package editions_unittest.MessageImport does not exist
+	rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die
+
+	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
+}

dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.ebuild

@@ -181,6 +181,9 @@ src_prepare() {
 	# e(u)ptex are installed by texlive-core[cjk]
 	sed -i '/AddFormat name=eptex /d' tlpkg/tlpobj/ptex.tlpobj || die
 	sed -i '/AddFormat name=euptex /d' tlpkg/tlpobj/uptex.tlpobj || die
-	# ptekf.1 is installed by dev-libs/ptexenc
-	rm texmf-dist/doc/man/man1/ptekf.1 || die
+
+	if use doc; then
+		# ptekf.1 is installed by dev-libs/ptexenc
+		rm texmf-dist/doc/man/man1/ptekf.1 || die
+	fi
 }