From 48b7242b8ddfc78f4a3a7d2beb5a8fc8ae125ac7 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 10 Mar 2018 21:43:43 +0000 Subject: [PATCH] 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 --- .../{fontconfig.Gentoo.properties => fontconfig.properties} | 0 ...-bin-1.8.0.162.ebuild => oracle-jdk-bin-1.8.0.162-r1.ebuild} | 2 +- ...e-jdk-bin-9.0.4-r1.ebuild => oracle-jdk-bin-9.0.4-r2.ebuild} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename dev-java/oracle-jdk-bin/files/{fontconfig.Gentoo.properties => fontconfig.properties} (100%) rename dev-java/oracle-jdk-bin/{oracle-jdk-bin-1.8.0.162.ebuild => oracle-jdk-bin-1.8.0.162-r1.ebuild} (99%) rename dev-java/oracle-jdk-bin/{oracle-jdk-bin-9.0.4-r1.ebuild => oracle-jdk-bin-9.0.4-r2.ebuild} (98%) 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 a57793e032f0..8da2c3466faf 100644 --- 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 216d6da22178..272910669d9b 100644 --- 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. -- 2.26.2