| 1 |
commit: 5b85160c989eadb0943fe0f96940ddeee2a75de7 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 1 22:33:04 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 1 22:49:14 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b85160c |
| 7 |
|
| 8 |
dev-java/oracle-jdk-bin: awt flag, nsplugin, javapackager |
| 9 |
|
| 10 |
* Change awt USE flag to !headless-awt |
| 11 |
* Install nsplugin to /usr/lib/nsbrowser/plugins in line with |
| 12 |
eselect-java and icedtea-web changes |
| 13 |
* Don't install javapackager unless javafx is enabled (#565828) |
| 14 |
|
| 15 |
Sorry for changing the X/awt flag again but icedtea upstream preferred |
| 16 |
the term headless, which is technically more accurate than awt, so I |
| 17 |
compromised and went with headless-awt. This isn't icedtea but |
| 18 |
consistency is king and I may apply this flag to virtual/jre one day. |
| 19 |
|
| 20 |
Package-Manager: portage-2.2.26 |
| 21 |
|
| 22 |
dev-java/oracle-jdk-bin/metadata.xml | 1 + |
| 23 |
...0.65.ebuild => oracle-jdk-bin-1.8.0.65-r1.ebuild} | 14 ++++++++------ |
| 24 |
...0.65.ebuild => oracle-jdk-bin-1.8.0.66-r1.ebuild} | 20 +++++++++++--------- |
| 25 |
3 files changed, 20 insertions(+), 15 deletions(-) |
| 26 |
|
| 27 |
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml |
| 28 |
index d95caa1..e7dceb3 100644 |
| 29 |
--- a/dev-java/oracle-jdk-bin/metadata.xml |
| 30 |
+++ b/dev-java/oracle-jdk-bin/metadata.xml |
| 31 |
@@ -6,6 +6,7 @@ |
| 32 |
<use> |
| 33 |
<flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag> |
| 34 |
<flag name="derby">Install bundled Derby (Java database)</flag> |
| 35 |
+ <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> |
| 36 |
<flag name="javafx">Install JavaFX libraries</flag> |
| 37 |
<flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag> |
| 38 |
<flag name="pax_kernel">Use paxctl to mark the JVM binaries</flag> |
| 39 |
|
| 40 |
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65-r1.ebuild |
| 41 |
similarity index 96% |
| 42 |
copy from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild |
| 43 |
copy to dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65-r1.ebuild |
| 44 |
index 0d8bfc8..cf7e483 100644 |
| 45 |
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild |
| 46 |
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65-r1.ebuild |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-# Copyright 1999-2015 Gentoo Foundation |
| 49 |
+# Copyright 1999-2016 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Id$ |
| 52 |
|
| 53 |
@@ -61,7 +61,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )" |
| 54 |
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" |
| 55 |
SLOT="1.8" |
| 56 |
KEYWORDS="~arm ~arm64" |
| 57 |
-IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source" |
| 58 |
+IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source" |
| 59 |
REQUIRED_USE="javafx? ( alsa fontconfig )" |
| 60 |
|
| 61 |
RESTRICT="fetch preserve-libs strip" |
| 62 |
@@ -79,7 +79,7 @@ QA_PREBUILT="*" |
| 63 |
# dependencies below. |
| 64 |
# |
| 65 |
RDEPEND="!x64-macos? ( |
| 66 |
- awt? ( |
| 67 |
+ !headless-awt? ( |
| 68 |
x11-libs/libX11 |
| 69 |
x11-libs/libXext |
| 70 |
x11-libs/libXi |
| 71 |
@@ -212,7 +212,7 @@ src_install() { |
| 72 |
rm -vf jre/lib/*/libjsoundalsa.* || die |
| 73 |
fi |
| 74 |
|
| 75 |
- if ! use awt ; then |
| 76 |
+ if use headless-awt ; then |
| 77 |
rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ |
| 78 |
{,jre/}bin/{javaws,policytool} \ |
| 79 |
bin/appletviewer || die |
| 80 |
@@ -221,7 +221,7 @@ src_install() { |
| 81 |
if ! use javafx ; then |
| 82 |
rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \ |
| 83 |
jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \ |
| 84 |
- bin/*javafx* || die |
| 85 |
+ bin/*javafx* bin/javapackager || die |
| 86 |
fi |
| 87 |
|
| 88 |
if ! use nsplugin ; then |
| 89 |
@@ -259,7 +259,9 @@ src_install() { |
| 90 |
fi |
| 91 |
|
| 92 |
if use nsplugin ; then |
| 93 |
- install_mozilla_plugin "${dest}/${nsplugin}" |
| 94 |
+ local nsplugin_link=${nsplugin##*/} |
| 95 |
+ nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.} |
| 96 |
+ dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}" |
| 97 |
fi |
| 98 |
|
| 99 |
if use source ; then |
| 100 |
|
| 101 |
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66-r1.ebuild |
| 102 |
similarity index 94% |
| 103 |
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild |
| 104 |
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66-r1.ebuild |
| 105 |
index 0d8bfc8..e3b48a9 100644 |
| 106 |
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.65.ebuild |
| 107 |
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66-r1.ebuild |
| 108 |
@@ -1,4 +1,4 @@ |
| 109 |
-# Copyright 1999-2015 Gentoo Foundation |
| 110 |
+# Copyright 1999-2016 Gentoo Foundation |
| 111 |
# Distributed under the terms of the GNU General Public License v2 |
| 112 |
# $Id$ |
| 113 |
|
| 114 |
@@ -12,11 +12,11 @@ JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2 |
| 115 |
|
| 116 |
# This is a list of archs supported by this update. |
| 117 |
# Currently arm comes and goes. |
| 118 |
-AT_AVAILABLE=( arm arm64 ) |
| 119 |
+AT_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x64-macos ) |
| 120 |
|
| 121 |
# Sometimes some or all of the demos are missing, this is to not have to rewrite half |
| 122 |
# the ebuild when it happens. |
| 123 |
-DEMOS_AVAILABLE=( arm arm64 ) |
| 124 |
+DEMOS_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x64-macos ) |
| 125 |
|
| 126 |
if [[ "$(get_version_component_range 4)" == 0 ]] ; then |
| 127 |
S_PV="$(get_version_component_range 1-3)" |
| 128 |
@@ -60,8 +60,8 @@ SRC_URI+=" jce? ( ${JCE_FILE} )" |
| 129 |
|
| 130 |
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" |
| 131 |
SLOT="1.8" |
| 132 |
-KEYWORDS="~arm ~arm64" |
| 133 |
-IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source" |
| 134 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" |
| 135 |
+IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source" |
| 136 |
REQUIRED_USE="javafx? ( alsa fontconfig )" |
| 137 |
|
| 138 |
RESTRICT="fetch preserve-libs strip" |
| 139 |
@@ -79,7 +79,7 @@ QA_PREBUILT="*" |
| 140 |
# dependencies below. |
| 141 |
# |
| 142 |
RDEPEND="!x64-macos? ( |
| 143 |
- awt? ( |
| 144 |
+ !headless-awt? ( |
| 145 |
x11-libs/libX11 |
| 146 |
x11-libs/libXext |
| 147 |
x11-libs/libXi |
| 148 |
@@ -212,7 +212,7 @@ src_install() { |
| 149 |
rm -vf jre/lib/*/libjsoundalsa.* || die |
| 150 |
fi |
| 151 |
|
| 152 |
- if ! use awt ; then |
| 153 |
+ if use headless-awt ; then |
| 154 |
rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ |
| 155 |
{,jre/}bin/{javaws,policytool} \ |
| 156 |
bin/appletviewer || die |
| 157 |
@@ -221,7 +221,7 @@ src_install() { |
| 158 |
if ! use javafx ; then |
| 159 |
rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \ |
| 160 |
jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \ |
| 161 |
- bin/*javafx* || die |
| 162 |
+ bin/*javafx* bin/javapackager || die |
| 163 |
fi |
| 164 |
|
| 165 |
if ! use nsplugin ; then |
| 166 |
@@ -259,7 +259,9 @@ src_install() { |
| 167 |
fi |
| 168 |
|
| 169 |
if use nsplugin ; then |
| 170 |
- install_mozilla_plugin "${dest}/${nsplugin}" |
| 171 |
+ local nsplugin_link=${nsplugin##*/} |
| 172 |
+ nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.} |
| 173 |
+ dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}" |
| 174 |
fi |
| 175 |
|
| 176 |
if use source ; then |
Archives