commit: 45bce3abccdf0b1f5203d31a061efde3feaf7c19 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri May 17 10:04:16 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri May 24 09:42:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45bce3ab
net-vpn/i2p: restrict to >=virtual/jdk-11:* for #932030 - Updates to >=dev-java/ant-1.10.14-r3 - Removes obsolete check for MERGE_VM Closes: https://bugs.gentoo.org/932030 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36717 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> .../i2p/{i2p-2.3.0-r2.ebuild => i2p-2.3.0-r3.ebuild} | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/net-vpn/i2p/i2p-2.3.0-r2.ebuild b/net-vpn/i2p/i2p-2.3.0-r3.ebuild similarity index 93% rename from net-vpn/i2p/i2p-2.3.0-r2.ebuild rename to net-vpn/i2p/i2p-2.3.0-r3.ebuild index 31f2d30af985..1be7a9458c8f 100644 --- a/net-vpn/i2p/i2p-2.3.0-r2.ebuild +++ b/net-vpn/i2p/i2p-2.3.0-r3.ebuild @@ -41,12 +41,13 @@ CP_DEPEND=" sys-devel/gettext:0[java] www-servers/tomcat:9 " +# jdk-11 for bug #932030 DEPEND=" dev-libs/gmp:0= ${CP_DEPEND} - >=virtual/jdk-1.8:* + >=virtual/jdk-11:* test? ( - dev-java/ant:0[junit4] + >=dev-java/ant-1.10.14-r3:0[junit4] dev-java/hamcrest:0 dev-java/junit:4 dev-java/mockito:4 @@ -75,21 +76,6 @@ EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar DOCS=( README.md history.txt ) -pkg_pretend() { - # see https://bugs.gentoo.org/831290 - if [[ "`java-config --show-active-vm`" = *-8 ]] && - [[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]] - then - eerror "dev-java/ant-core was emerged with a newer version of the JDK." - eerror "It will fail to build with virtual/jdk:1.8 due to #831290." - eerror "Please switch to a newer JDK" - eerror " eselect java-vm set system ..." - eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8" - eerror " emerge dev-java/ant-core" - die 'bad JDK for ant-core' - fi -} - src_prepare() { default # apply PATCHES java-pkg-2_src_prepare
