summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2018-03-10 21:44:41 +0000
committerJames Le Cuirot <chewi@gentoo.org>2018-03-10 21:45:31 +0000
commit5628fb77eca475b17e311da4f5564f6e56622d28 (patch)
tree1350bb8d184001b150c68d2ed983f0b93874bab4 /dev-java
parentdev-java/oracle-jdk-bin: Fix installation of fontconfig.properties (diff)
downloadgentoo-5628fb77eca475b17e311da4f5564f6e56622d28.tar.gz
gentoo-5628fb77eca475b17e311da4f5564f6e56622d28.tar.bz2
gentoo-5628fb77eca475b17e311da4f5564f6e56622d28.zip
dev-java/oracle-jre-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-jre-bin/files/fontconfig.properties (renamed from dev-java/oracle-jre-bin/files/fontconfig.Gentoo.properties)0
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162-r1.ebuild (renamed from dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild)2
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild (renamed from dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4.ebuild)4
3 files changed, 3 insertions, 3 deletions
diff --git a/dev-java/oracle-jre-bin/files/fontconfig.Gentoo.properties b/dev-java/oracle-jre-bin/files/fontconfig.properties
index 43cb5eed0c4..43cb5eed0c4 100644
--- a/dev-java/oracle-jre-bin/files/fontconfig.Gentoo.properties
+++ b/dev-java/oracle-jre-bin/files/fontconfig.properties
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162-r1.ebuild
index 01e3433b5fd..517737cee4d 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162-r1.ebuild
@@ -169,7 +169,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.
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild
index 81ca64dc5cc..f95added7c3 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -169,7 +169,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.