diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2024-05-17 12:04:16 +0200 |
|---|---|---|
| committer |   Florian Schmaus <flow@gentoo.org> | 2024-05-24 11:42:47 +0200 |
| commit | 45bce3abccdf0b1f5203d31a061efde3feaf7c19 (patch) | |
| tree | 425c2004348b13daffbeaf4db0cf03d43a822f7e /net-vpn | |
| parent | dev-lang/erlang: ignore pthread_set_name_np implicit decl (diff) | |
| download | gentoo-45bce3abccdf0b1f5203d31a061efde3feaf7c19.tar.gz gentoo-45bce3abccdf0b1f5203d31a061efde3feaf7c19.tar.bz2 gentoo-45bce3abccdf0b1f5203d31a061efde3feaf7c19.zip | |
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@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36717
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'net-vpn')
| -rw-r--r-- | net-vpn/i2p/i2p-2.3.0-r3.ebuild (renamed from net-vpn/i2p/i2p-2.3.0-r2.ebuild) | 20 |
1 files 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 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 |