From: James Le Cuirot <chewi@gentoo.org>
Date: Sat, 10 Mar 2018 21:44:41 +0000 (+0000)
Subject: dev-java/oracle-jre-bin: Fix installation of fontconfig.properties
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5628fb77eca475b17e311da4f5564f6e56622d28;p=gentoo.git

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
---

diff --git a/dev-java/oracle-jre-bin/files/fontconfig.Gentoo.properties b/dev-java/oracle-jre-bin/files/fontconfig.properties
similarity index 100%
rename from dev-java/oracle-jre-bin/files/fontconfig.Gentoo.properties
rename to 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
similarity index 98%
rename from dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild
rename to dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162-r1.ebuild
index 01e3433b5fd6..517737cee4d1 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
similarity index 98%
rename from dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4.ebuild
rename to dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild
index 81ca64dc5cc8..f95added7c38 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.