11 files changed, 173 insertions, 28 deletions
diff --git a/dev-java/testng/testng-6.11-r1.ebuild b/dev-java/testng/testng-6.11-r1.ebuild
index 556064c5616e..108e53d2533a 100644
--- a/dev-java/testng/testng-6.11-r1.ebuild
+++ b/dev-java/testng/testng-6.11-r1.ebuild
@@ -87,6 +87,7 @@ src_test() {
 		src/test/groovy/test/groovy/* || die
 
 	JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/groovy-all-${GAV}.jar"
+	JAVA_TEST_EXTRA_ARGS=( -Dtest.resources.dir=src/test/resources )
 	java-pkg-simple_src_test
 }
 
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 7199d922e862..47fa9ff4b4cf 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -2,3 +2,4 @@ DIST git-1.19.1.tar.gz 177887 BLAKE2B 0da2a829679fd4e2d4b3aec5e88f421d221593729b
 DIST git-2.3.0.tar.gz 194653 BLAKE2B a82ea8c7b8cd239de2cb4dd08f013412efcc7dfcd4c85839ff145b2998df4cf4da6cbf7b5942592b086741ed1fca0a3678bfb4ce5ab45c7c4a3259ce9c3c8d94 SHA512 6ca0a9f33fe4cb24b69035d80f689664558d3ebe868604e8592da225e14102fc572b472e7fd8db697c4338569a560ba012694a637d1dd9622fd33d06e9f55780
 DIST git-2.3.1.tar.gz 197100 BLAKE2B b0051f15f537524ecfac78ba24873aba988935777b516457f7c9f71a9939bfb4aec458dfee7758843b3cdd5f911de17702437befdef24931a64b034c0bf3b08b SHA512 2829cb7f2bc0afd568b75e26b27082f918abb79e90295b14d30eb6727b4d2cabc38b825800ca2c3270777075eed2d4db71c5347322ed5d714ce9263c0feff857
 DIST git-2.3.2.tar.gz 197434 BLAKE2B 79b79d31f0cd2b634b772186499b13ecc26fb76046e2abac687f056fc1377237abed90c08498d7b533cd6379aa96a37dd61889dae3119262ead342de059f524c SHA512 af28d22903041bf7160ce9038d05514619930363bc9f5c250d94a986d27de64133d3e6cde270a8947bbb576d418c5993ec292bb6bc0397509c7f7df553d60690
+DIST git-2.3.3.tar.gz 199255 BLAKE2B 1e426c65088619dcf0c53829f397a990bd94b75fe2f638473c1d5ada4069d9936ae671beba5119c3fd63eb1233264a8161b1ea3e452423fa964d76bfcb7ad49c SHA512 8b4104db931fa497b7c23d12c62782dfae6b5952389abab9a96b7dc81e091e6826bd723521e9ef4009408d41d8b65eb62e19c01bb9895cb016c57c75f97ca67a
diff --git a/dev-ruby/git/git-2.3.3.ebuild b/dev-ruby/git/git-2.3.3.ebuild
new file mode 100644
index 000000000000..ddb8abb8b33d
--- /dev/null
+++ b/dev-ruby/git/git-2.3.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="git.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for using Git in Ruby"
+HOMEPAGE="https://github.com/ruby-git/ruby-git"
+SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-git-${PV}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc ~ppc64"
+IUSE="test"
+
+DEPEND="test? ( >=dev-vcs/git-1.6.0.0 net-misc/openssh app-arch/tar )"
+RDEPEND=">=dev-vcs/git-1.6.0.0"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-5.0:*
+	>=dev-ruby/addressable-2.8:0
+	>=dev-ruby/process_executer-1.1:1
+	>=dev-ruby/rchardet-1.8:1
+"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitar-0.9 >=dev-ruby/mocha-2.1:2 dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Don't use hardcoded /tmp directory.
+	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+
+	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Don't use deprecated key type that is removed from openssh
+	sed -i -e 's/-t dsa/-t rsa/' tests/units/test_signed_commits.rb || die
+}
+
+each_ruby_test() {
+	git config --global user.email "git@example.com" || die
+	git config --global user.name "GitExample" || die
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/http-cookie/Manifest b/dev-ruby/http-cookie/Manifest
index 55ee187e045e..55fe74178b48 100644
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@@ -1,3 +1,4 @@
 DIST http-cookie-1.0.5.gem 39424 BLAKE2B 569a0d18c962be378f3974b400ddf2289c72490b2b93619fcd83ed6c00bbf5def76239c52163dc6231060792abf3a19988285a6cd28f158ff7339252da912e61 SHA512 d530d64b5c2fc3757a6de03384fe768317e24a523d4a4215f5bcc6b5bca9e7b94eeaad1e52fbb67548396b7b2ca7c9d8b68ea7b99109e24770fcf34c950469ef
 DIST http-cookie-1.0.6.gem 40448 BLAKE2B 428cd8aef9d08ff86486c1dab10f75e2cf0aa614eda598a95e35598f945a41cc35cf7a871b4b6b56f01435790c7995d1cb83c2fff46463282d66f0e1cd8a0883 SHA512 088949816b70c3eea5464b492cb067d1d1cea8608ba8ad791876b5a33cc57c95b036420e3e9872a40e35c84168a37ab6b4615a049ea98b04588000cdf594bc5f
 DIST http-cookie-1.0.7.gem 40448 BLAKE2B 36ce6daabaa5e2385fbe5f3db4b18cef8c304ac23f2200978d56ef726c6ed2f5bab09bd779c885bd23207130101b0143833696753e00c71f3504c2696fe15d17 SHA512 ed83e492d60f5af50d184e590ae3bb85be1cc34019619ac8053e0a8249deea239c66076b70b48b2db4066f18fcc478fee5bca118e7ee697b8bbb5f5985da7124
+DIST http-cookie-1.0.8.gem 40960 BLAKE2B f00aaefa3df170cd66bc8106211c0e20150f08984cd3890dfdd539b6dd706f67a727033ab177d0fc32d545c02064e7b43305809d8fa1507309550639df21985e SHA512 2331da73f2c077e9582d609a08a60a247c0b44b8e4a7be820ac3ed630a05779b985a19de3ed94a5a4753f401be0392d364313498b03475c442ed4859d2a142cd
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.8.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.8.ebuild
new file mode 100644
index 000000000000..047a9505786e
--- /dev/null
+++ b/dev-ruby/http-cookie/http-cookie-1.0.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby library to handle HTTP cookies"
+HOMEPAGE="https://github.com/sparklemotion/http-cookie"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# See https://github.com/sparklemotion/http-cookie/issues/16 for dropping domain_name
+ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/d" -e "/bundler/d" Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_http_cookie.rb || die
+	${RUBY} -Ilib test/test_http_cookie_jar.rb || die
+}
diff --git a/dev-ruby/useragent/Manifest b/dev-ruby/useragent/Manifest
index dff7f58806ed..3175d2055ddd 100644
--- a/dev-ruby/useragent/Manifest
+++ b/dev-ruby/useragent/Manifest
@@ -1 +1,2 @@
 DIST useragent-0.16.10.tar.gz 24652 BLAKE2B 8162ae1aaac16a90729605d028c5b96062150ed55d6a2f444b0594eae8b49034f2847b93fca81b95cc4607d34a802fc7fc32d4bdabea7f5aa10214421d6fb813 SHA512 4cb2dd1d824d85bdb3a6fb0dc0455c283b9687a6c50b3e63d96c32518b4cd5336ec61cf942b65a3523c1d02b40135a1d5aaa54b2f5966a2936ffa3ed898ede3a
+DIST useragent-0.16.11.tar.gz 25051 BLAKE2B 2af78950cd18564192569ed00f936ed73ca14b3fd0a4c95919ca3d8f82a7049675340924592cc5f29bef4ac7a7fd1c4643c2505c1dcaa4857d3debf400bbef9b SHA512 5e65001bf74621703b22043286a013705b20bfcdc7d1824bb320494ddce44d87ad8bbd7ef0c181ca664f25dd37500507ff3993e5d0e818c396caf4a5258e1e47
diff --git a/dev-ruby/useragent/useragent-0.16.11.ebuild b/dev-ruby/useragent/useragent-0.16.11.ebuild
new file mode 100644
index 000000000000..c300c565399e
--- /dev/null
+++ b/dev-ruby/useragent/useragent-0.16.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP User Agent parser"
+HOMEPAGE="https://github.com/gshutler/useragent"
+SRC_URI="https://github.com/gshutler/useragent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index c0a900b35a00..e2af63819839 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -213,6 +213,48 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com
 # 	ebuild foo.ebuild compile
 # @CODE
 
+# @ECLASS_VARIABLE: EBUILD_DEATH_HOOKS
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Used internally.
+
+# @ECLASS_VARIABLE: JAVA_PKG_BUILD_DEPEND_FILE
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Used in ejunit_, java-pkg_do_write_ and java-pkg_record-jar_
+
+# @ECLASS_VARIABLE: JAVA_PKG_DEPEND_FILE
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Used in ejunit_, java-pkg_do_write_ and java-pkg_record-jar_
+
+# @ECLASS_VARIABLE: JAVA_PKG_EXTRA_ENV
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Used in java-pkg_register-environment-variable and java-pkg_do_write_,
+
+# @ECLASS_VARIABLE: JAVA_PKG_EXTRA_ENV_VARS
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Used in java-pkg_register-environment-variable and java-pkg_do_write_
+
+# @ECLASS_VARIABLE: JAVA_PKG_OPTIONAL_DEPEND_FILE
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Used in java-pkg_do_write_ and java-pkg_record-jar_
+
+# @ECLASS_VARIABLE: WANT_JAVA_CONFIG
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Gets exported to make sure we use java-config-2
+
 # @ECLASS_VARIABLE: JAVADOC_CLASSPATH
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -253,9 +295,6 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com
 #	)
 # @CODE
 
-# TODO document me
-JAVA_PKG_QA_VIOLATIONS=0
-
 # @FUNCTION: java-pkg_doexamples
 # @USAGE: [--subdir <subdir>] <file1/dir1> [<file2> ...]
 # @DESCRIPTION:
@@ -1942,7 +1981,6 @@ etestng() {
 		-cp ${cp}
 		-Djava.io.tmpdir="${T}"
 		-Djava.awt.headless=true
-		-Dtest.resources.dir="${JAVA_TEST_RESOURCE_DIRS}"
 		${JAVA_TEST_EXTRA_ARGS[@]}
 		${runner}
 		${JAVA_TEST_RUNNER_EXTRA_ARGS[@]}
@@ -2785,19 +2823,6 @@ java-pkg_die() {
 }
 
 
-# TODO document
-# List jars in the source directory, ${S}
-java-pkg_jar-list() {
-	if [[ -n "${JAVA_PKG_DEBUG}" ]]; then
-		einfo "Linked Jars"
-		find "${S}" -type l -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
-		einfo "Jars"
-		find "${S}" -type f -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
-		einfo "Classes"
-		find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR},"
-	fi
-}
-
 # @FUNCTION: java-pkg_verify-classes
 # @INTERNAL
 # @DESCRIPTION:
@@ -2959,16 +2984,9 @@ java-pkg_announce-qa-violation() {
 		nodie="true"
 		shift
 	fi
-	echo "Java QA Notice: $@" >&2
-	increment-qa-violations
 	[[ -z "${nodie}" ]] && is-java-strict && die "${@}"
 }
 
-increment-qa-violations() {
-	let "JAVA_PKG_QA_VIOLATIONS+=1"
-	export JAVA_PKG_QA_VIOLATIONS
-}
-
 # @FUNCTION: is-java-strict
 # @INTERNAL
 # @RETURN: 0: JAVA_PKG_STRICT is set
diff --git a/sys-fs/jdiskreport-bin/Manifest b/sys-fs/jdiskreport-bin/Manifest
index 778a070476f0..239ec5184bcd 100644
--- a/sys-fs/jdiskreport-bin/Manifest
+++ b/sys-fs/jdiskreport-bin/Manifest
@@ -1 +1,2 @@
 DIST jdiskreport-1_4_1.zip 864613 BLAKE2B 9f10a10e54f0553e9130bdaf801380b40982a48e308fff5418308a37a4e02a886961d5ff2787b9bc3d1dfa1db087409e0447b275f6419b5e775716d20843fa98 SHA512 c1e17bdaab739561ae46475d69805e18be271a0d41b555e981cde59091d6c46fe3cf6775bdd992200edbb4646b7a04003a6b67bfedc18161952a20e47b18ea38
+DIST jdiskreport-2beta5.jar 2868440 BLAKE2B 64a0b9dec9a4109b4d8a25f7bf23e28d80d611dd2cd65ffa6424f6274e358c581891b028543d2ef86af5bf348a2e83928abc9d9011a78644ff89107596c163aa SHA512 924005459af662b4bbd8c2062c78972e3b95f47baa80775ae5654c01f7037bd6e9fc88a0417382af7a6c8ede76d74d25c2df97fc835f2f66f71190f9884ab95c
diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1-r1.ebuild
index 05d9deaeb551..f65f5bebf23f 100644
--- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild
+++ b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit java-pkg-2
 
@@ -10,7 +10,7 @@ MY_PV=${PV//\./_}
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="JDiskReport helps you to understand disk drive usage"
-HOMEPAGE="http://www.jgoodies.com/freeware/jdiskreport/"
+HOMEPAGE="https://www.jgoodies.com/freeware/jdiskreport/"
 SRC_URI="http://www.jgoodies.com/download/${MY_PN}/${MY_P}.zip"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
@@ -18,7 +18,7 @@ LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=virtual/jre-1.6"
+RDEPEND="virtual/jre:1.8"
 BDEPEND="app-arch/unzip"
 
 src_install() {
diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-2_beta5.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-2_beta5.ebuild
new file mode 100644
index 000000000000..4815e5d16de2
--- /dev/null
+++ b/sys-fs/jdiskreport-bin/jdiskreport-bin-2_beta5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="JDiskReport helps you to understand disk drive usage"
+HOMEPAGE="https://www.jgoodies.com/freeware/jdiskreport/"
+SRC_URI="https://www.jgoodies.com/download/jdiskreport2/jdiskreport-${PV//_/}.jar"
+S="${WORKDIR}"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="<=virtual/jre-21"
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}/jdiskreport-${PV//_/}.jar" "${PN}.jar"
+	java-pkg_dolauncher jdiskreport-bin
+}