gentoo auto-resync : 08:04:2024 - 12:31:06

5 files changed, 58 insertions, 3 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 59fd62f85c0b..30d5e1e2cd73 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index bd2427b32c80..493eee760e0b 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,8 +1,10 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-4.1.tar.gz 769476 BLAKE2B c2a22fa78ff4dcf1e36221a23ca1e3cd1eecb473a59ea94ce52e298673f6bd18c0ea0cf757dd68885696ebc8cc724d271c69c923a21ffa433d03c1062b1201ee SHA512 911e5e9f062561ade1748dcef3596e0f25c399c4d52dd174773783dadf24a4ceea8d3feab9ab08880370677959051d8557aed815d4c4184f5ecd5789ee8a5754
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
+DIST javacc-7.0.13.tar.gz 3199783 BLAKE2B 7e3dddbe53a6e417a31bb7386d154c0e9589f17f88e652f5e146a4e344d72cd948d4d8e55fab753bb983e5d31971efc948c1ecdca4e875031bea3f8a38bfc082 SHA512 ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144
 DIST javacc-7.0.4.tar.gz 2842349 BLAKE2B e5a2e24c99e5e3883270cf0e3931d7667e5b5b49a11c1d9b79b98767f74f4addf2dc7d3d620550bc1b5bb0bfbef8bf07af48a40d250d0902d97c8215f6cb8e01 SHA512 b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1
 EBUILD javacc-4.1.ebuild 1478 BLAKE2B 0a6e3b429e290a4371dd7df43e00022849f64fe5ce5a213973a9870da7422a531f6fa64b21859b81fa96a9dd8a9a78ce5a50ab1f897e64a38604c42c185e33a4 SHA512 7e3fc6bdecd437bcb75b07d0d08061bada5482a5c309e21323d9522a0c5e157e4bf7be81bde6dbc8f6aeb99cc778de365076b514cab7a7f2d0ed906301d5b541
 EBUILD javacc-5.0-r5.ebuild 1433 BLAKE2B 275060ccbf5ac28d7ca810d304461ea387dd6e6698cc178804a6b580d12fc9ddeb105f6d6cf385cd0b968b472cecfbdf800d30147c311bf66122df8e49fdfa60 SHA512 920a971a51aedcbbf34885d89657e3032078d5d61bb329db53b16e80a8ea0a8087ba715238b2c0acabfd8b1bd56aeed4d3a2d28e973db44731548ccf51ae3125
+EBUILD javacc-7.0.13.ebuild 1220 BLAKE2B db96859b4b4286354676f713e3e227014337883216b0a259316036751c7574898c84091012b4c0ddacf2898220f24f2153f208f23ca9924c83c7c30f6ba03922 SHA512 827944d3f19341646de4d3d50fd55ef3c9c484f8f50aaa1b5c4c0da11c870f650afa246fef21fdb7511cda2885a9bd12282e6eb75d37d20059fc05aff9076949
 EBUILD javacc-7.0.4.ebuild 1383 BLAKE2B bbc45123fe870bc31b49f067880565a77e7f8035fb9060b218af683027748b07a771ebbfdb98acc256d9b7c70975609d50a7bd6546986c1ffe0fb5ae9615b438 SHA512 c12f855604a816da3844451a210d0f223e02dcba528ddaf21886730f47f41ff8f76b39ee4a365b6038d29e6f309471ab5391e60fa808bd7fc4918dc130a38f70
 MISC metadata.xml 308 BLAKE2B 421dc38149fa3d88a66071836b7b00e6218c44f3111bf9e99b3f35f5e6ae3e550290d03b9f4ac960828484c8993b1ae5fe5ba6b4b73e172ddf905127df96eb25 SHA512 d365ba4454a45f49ceadbb4f1700ca58de8b9e0715f02056cbff899507fe39bd64e5d388245d0458ec5be9a30f134a4bcc2d8e678745f0b79502741ae30aeaa0
diff --git a/dev-java/javacc/javacc-7.0.13.ebuild b/dev-java/javacc/javacc-7.0.13.ebuild
new file mode 100644
index 000000000000..29c7faf60f0d
--- /dev/null
+++ b/dev-java/javacc/javacc-7.0.13.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.github.io/javacc/"
+SRC_URI="https://github.com/javacc/javacc/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD-2"
+SLOT="7.0.13"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (	>=dev-java/ant-1.10.14:0[junit] )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./bootstrap/*"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "target/${PN}.jar"
+
+	use doc && java-pkg_dojavadoc target/javadoc
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
+	doenvd "${T}"/22javacc-${SLOT}
+
+	echo "export VERSION=${PV}" > "${T}"/pre || die
+
+	local launcher
+	for launcher in javacc jjdoc jjtree; do
+		java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
+	done
+
+	einstalldocs
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index a5caf27717dc..e7104daae8bf 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -24,5 +24,5 @@ DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c
 EBUILD openjdk-11.0.22_p7.ebuild 8864 BLAKE2B 36030166187064b860ae74f7a11b6ae147e3c43b4251ff4e4e8cdb0136baa0208f2ba825d12f8e9270b0b33dec7a420f51b9f6929561733b685e47a771554fc1 SHA512 7e44978bb48ce996b8603cb5297587c6c3264431bb540b5d7614f4447084464e9bb28460176dd504805d19271b4f4bab3c105c327c21765ebd1dce6968c00c31
 EBUILD openjdk-17.0.10_p7.ebuild 9658 BLAKE2B 70fd9a5134572f07b227403a90ab9223fc7f70ee57b3d2868fbb623566f51af97a32ce09ea38034808d76129bbce3aaf9ac9b9006500c8f7bbe4650f900ed17f SHA512 669f8831f7783640c97ed6d27182fcca6f46cbf5adf88eef37e7d3634dda9e0cfed68355d229b685c43f71fd96e4710a8f0aa5b6d864b361daac37be3e7051a8
 EBUILD openjdk-21.0.2_p13.ebuild 9251 BLAKE2B e7fd409656211864689d2040d738a45a132d5e3150fc8fa180d7957255aaac6cff2a44dfb87bbcf0f519791f39f09bb6788bbe730738c70778d5f22c85e9fa00 SHA512 73ff9f0d4034dee508403f2ffc1924294265465629a6c0d9c33c4e5df776a474c6a7fae19eb0b446e7861cb30fc24929970b718b3da69ecb446bac994bb22950
-EBUILD openjdk-8.402_p06.ebuild 7804 BLAKE2B 032d79c00a20c297a70706bef5bd3905bc1cd00d65914bb2979bbe100a7fa89173197dbc84ac9c354f04ba09d15c71261b992ff5c518197f74a4d919b807bfe1 SHA512 4aec007ff050a974626bd2b9877ac07e35ffd25c10dd322ebfd83f88f2d4689fbc278a0dab75bd8d1c59e2d9cdd1cbd9a13d741d294c4078584f6bdd0f79cdd1
+EBUILD openjdk-8.402_p06-r1.ebuild 7737 BLAKE2B f54978bea72e47f5139c1c739386d8f96a30f65170798405dc2f28e175015b9409eebb0404aacad2993db1299bea68968a019e49c479c9b42968b9e254e4f55f SHA512 bdb7ff068ff1eebb4e484b9774cb2448b42ec411d0c47ce4a852db08dc2f5417c352561db3eb138066117208697e4492cd34711047ad555dccd2eacb87e64ed6
 MISC metadata.xml 1549 BLAKE2B 5f7caf2330b7d8eb264df12fe6eebbf1e4acf91b04e37a4c6ea6c45101a39f2e84b4d40152d58c93e63a1d2d6fdb5649b096a314f7269d33ce72da263d392c90 SHA512 8fa15bf9544f2665a47185a3701c3a9ce1654ddedf1aebfb344f77f544a71a3bda33c2d4f3c1d5d65d7ea42b6c1f04a6e1dfaaae723c1a5fcaf63ec48d79f3de
diff --git a/dev-java/openjdk/openjdk-8.402_p06.ebuild b/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild
index ce8e246db9d3..902c433e73dd 100644
--- a/dev-java/openjdk/openjdk-8.402_p06.ebuild
+++ b/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild
@@ -85,7 +85,6 @@ DEPEND="
 	x11-libs/libXtst
 	|| (
 		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
 		dev-java/openjdk:${SLOT}
 	)
 "
@@ -132,7 +131,7 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == "binary" ]] && return
 
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
 	JAVA_PKG_WANT_SOURCE="${SLOT}"
 	JAVA_PKG_WANT_TARGET="${SLOT}"