diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
index 258f0d499fc00..5ccace8029b9e 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
@@ -3,8 +3,6 @@
 
 VERSION="Eclipse Temurin JRE ${PV}"
 JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
-JDK_HOME="${JAVA_HOME}"
-JAVAC="\${JAVA_HOME}/bin/javac"
 PATH="\${JAVA_HOME}/bin"
 ROOTPATH="\${JAVA_HOME}/bin"
 LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
@@ -13,4 +11,4 @@ PROVIDES_TYPE="JRE"
 PROVIDES_VERSION="${SLOT}"
 BOOTCLASSPATH=""
 GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
+ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r2.ebuild
similarity index 100%
rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild
rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r2.ebuild