summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2018-03-10 21:43:43 +0000
committerJames Le Cuirot <chewi@gentoo.org>2018-03-10 21:45:30 +0000
commit48b7242b8ddfc78f4a3a7d2beb5a8fc8ae125ac7 (patch)
tree0f6f5fbf343363d27f0e03470d93f6eb154db7fc /dev-java
parentapp-misc/pax-utils: fix python dependencies (diff)
downloadgentoo-48b7242b8ddfc78f4a3a7d2beb5a8fc8ae125ac7.tar.gz
gentoo-48b7242b8ddfc78f4a3a7d2beb5a8fc8ae125ac7.tar.bz2
gentoo-48b7242b8ddfc78f4a3a7d2beb5a8fc8ae125ac7.zip
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
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/oracle-jdk-bin/files/fontconfig.properties (renamed from dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties)0
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild (renamed from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild)2
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild (renamed from dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild)2
3 files changed, 2 insertions, 2 deletions
diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties b/dev-java/oracle-jdk-bin/files/fontconfig.properties
index 43cb5eed0c4..43cb5eed0c4 100644
--- a/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties
+++ b/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
index a57793e032f..8da2c3466fa 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
index 216d6da2217..272910669d9 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.