From a0b3301cc2af99d257c501bbf08d1541eab6a662 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Wed, 10 Dec 2025 21:28:34 +0100
Subject: [PATCH] change java install method

---
 java/build_jdk.sh       | 24 ++----------------------
 java/install_gentoo.txt | 14 +++++++-------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/java/build_jdk.sh b/java/build_jdk.sh
index 4aeba77..ff0c90c 100755
--- a/java/build_jdk.sh
+++ b/java/build_jdk.sh
@@ -47,7 +47,6 @@ cd "$srcdir"
 chmod +x configure
 
 # Some jdk versions require fixing up things
-noinstall=false  # TODO: Invert...
 CFLAGS=
 CXXFLAGS=
 case "$version_jdk_major" in
@@ -85,21 +84,6 @@ jdk16)
     sed -i -e 's/\<prefix\>/fixpath_prefix/g' \
         make/autoconf/util_paths.m4
     ;;
-jdk21)
-    noinstall=true
-    ;;
-jdk22)
-    noinstall=true
-    ;;
-jdk23)
-    noinstall=true
-    ;;
-jdk24)
-    noinstall=true
-    ;;
-jdk25)
-    noinstall=true
-    ;;
 esac
 
 unset _JAVA_OPTIONS JAVAC
@@ -119,10 +103,6 @@ echo "$version_jdk" > .src-rev
 
 # Build and install
 unset MAKEFLAGS
-if ! $noinstall; then
-    make install
-else
-    make product-images
-    cp -rT build/*-release/images/jdk "$dir_install"
-fi
+make product-images
+cp -rT build/*-release/images/jdk "$dir_install"
 find "$dir_install" -name '*.debuginfo' -delete
diff --git a/java/install_gentoo.txt b/java/install_gentoo.txt
index ce7b93d..5bc88b0 100644
--- a/java/install_gentoo.txt
+++ b/java/install_gentoo.txt
@@ -1,32 +1,32 @@
 # NOTE: All of these commands rely on a same-version sdk not previously being installed
 
-sudo rsync -rvP build/install-icedtea8/ /opt/icedtea8
+sudo rsync -rvP --chmod=ugo=rwX build/install-icedtea8/ /opt/icedtea8
 sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-8
 echo 8 | sudo tee /var/db/pkg/dev-java/openjdk-bin-8/SLOT > /dev/null
 sudo JDK_HOME=/opt/icedtea8 emerge --usepkg=n dev-java/openjdk:8
 sudo rm -rf /opt/icedtea8 /var/db/pkg/dev-java/openjdk-bin-8
 
-sudo rsync -rvP build/install-jdk11/ /opt/jdk11
+sudo rsync -rvP --chmod=ugo=rwX build/install-jdk11/ /opt/jdk11
 sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-11
 echo 11 | sudo tee /var/db/pkg/dev-java/openjdk-bin-11/SLOT > /dev/null
-sudo JDK_HOME="$(echo /opt/jdk11/jvm/*/)" emerge --usepkg=n dev-java/openjdk:11
+sudo JDK_HOME=/opt/jdk11 emerge --usepkg=n dev-java/openjdk:11
 sudo rm -rf /opt/jdk11 /var/db/pkg/dev-java/openjdk-bin-11
 
-sudo rsync -rvP build/install-jdk17/ /opt/jdk17
+sudo rsync -rvP --chmod=ugo=rwX build/install-jdk17/ /opt/jdk17
 sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-17
 echo 17 | sudo tee /var/db/pkg/dev-java/openjdk-bin-17/SLOT > /dev/null
-sudo ln -s /opt/jdk17/jvm/*/ /opt/openjdk-bin-17
+sudo ln -s /opt/jdk17/ /opt/openjdk-bin-17
 sudo emerge --usepkg=n dev-java/openjdk:17
 sudo rm -rf /opt/jdk17 /opt/openjdk-bin-17 /var/db/pkg/dev-java/openjdk-bin-17
 
-sudo rsync -rvP build/install-jdk21/ /opt/jdk21
+sudo rsync -rvP --chmod=ugo=rwX build/install-jdk21/ /opt/jdk21
 sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-21
 echo 21 | sudo tee /var/db/pkg/dev-java/openjdk-bin-21/SLOT > /dev/null
 sudo ln -s /opt/jdk21/ /opt/openjdk-bin-21
 sudo emerge --usepkg=n dev-java/openjdk:21
 sudo rm -rf /opt/jdk21 /opt/openjdk-bin-21 /var/db/pkg/dev-java/openjdk-bin-21
 
-sudo rsync -rvP build/install-jdk25/ /opt/jdk25
+sudo rsync -rvP --chmod=ugo=rwX build/install-jdk25/ /opt/jdk25
 sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-25
 echo 25 | sudo tee /var/db/pkg/dev-java/openjdk-bin-25/SLOT > /dev/null
 sudo ln -s /opt/jdk25/ /opt/openjdk-bin-25