dev-java/oracle-jdk-bin: Fix installation of fontconfig.properties

I previously simplified this but accidentally changed the filename.

Closes: https://bugs.gentoo.org/649022
Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties b/dev-java/oracle-jdk-bin/files/fontconfig.properties
similarity index 100%
rename from dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties
rename to dev-java/oracle-jdk-bin/files/fontconfig.properties

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
similarity index 99%
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
index a57793e032f0acd791064472c1b27c8f48debbe8..8da2c3466faf5dfb2e2e6265b13caa324a013785 100644 (file)
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
@@ -239,7 +239,7 @@ src_install() {
        # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
        if ! use fontconfig ; then
                insinto "${dest}"/jre/lib/
-               doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+               doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
        fi
 
        # Needs to be done before CDS, bug #215225.

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
similarity index 98%
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
index 216d6da2217879c903474840686bef2bdaa63e2f..272910669d9bbdb0c5fbd9254fd3e7cba273863d 100644 (file)
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
@@ -185,7 +185,7 @@ src_install() {
        # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
        if ! use fontconfig ; then
                insinto "${dest}"/lib/
-               doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+               doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
        fi
 
        # Needs to be done before CDS, bug #215225.