From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EECC91382C5 for ; Sat, 10 Mar 2018 21:45:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 593DCE0893; Sat, 10 Mar 2018 21:45:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D435E0893 for ; Sat, 10 Mar 2018 21:45:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0BFB8335C31 for ; Sat, 10 Mar 2018 21:45:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FFC4230 for ; Sat, 10 Mar 2018 21:45:40 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1520718330.48b7242b8ddfc78f4a3a7d2beb5a8fc8ae125ac7.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/, dev-java/oracle-jdk-bin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties dev-java/oracle-jdk-bin/files/fontconfig.properties dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r1.ebuild dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild X-VCS-Directories: dev-java/oracle-jdk-bin/ dev-java/oracle-jdk-bin/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 48b7242b8ddfc78f4a3a7d2beb5a8fc8ae125ac7 X-VCS-Branch: master Date: Sat, 10 Mar 2018 21:45:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ea675126-2463-4c13-aebf-3e8623692770 X-Archives-Hash: 97edd163a291f3749d9c816d80d28aa2 commit: 48b7242b8ddfc78f4a3a7d2beb5a8fc8ae125ac7 Author: James Le Cuirot gentoo org> AuthorDate: Sat Mar 10 21:43:43 2018 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sat Mar 10 21:45:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b7242b 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 .../files/{fontconfig.Gentoo.properties => fontconfig.properties} | 0 ...acle-jdk-bin-1.8.0.162.ebuild => oracle-jdk-bin-1.8.0.162-r1.ebuild} | 2 +- .../{oracle-jdk-bin-9.0.4-r1.ebuild => oracle-jdk-bin-9.0.4-r2.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 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 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 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 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.