1 |
commit: ed49e92a6e7a7dfc99e6671bef19d0c3a263bb8f |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 23 22:10:35 2017 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 23 22:52:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed49e92a |
7 |
|
8 |
dev-java/oracle-jdk-bin: Trim the commercial and duplicated fat |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-java/oracle-jdk-bin/metadata.xml | 1 + |
13 |
.../oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild | 23 +++++++++------------- |
14 |
2 files changed, 10 insertions(+), 14 deletions(-) |
15 |
|
16 |
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml |
17 |
index 6eb282a..6850de6 100644 |
18 |
--- a/dev-java/oracle-jdk-bin/metadata.xml |
19 |
+++ b/dev-java/oracle-jdk-bin/metadata.xml |
20 |
@@ -7,6 +7,7 @@ |
21 |
</maintainer> |
22 |
<longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription> |
23 |
<use> |
24 |
+ <flag name="commercial">Install features requiring a commercial license for production use</flag> |
25 |
<flag name="derby">Install bundled Derby (Java database)</flag> |
26 |
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> |
27 |
<flag name="javafx">Install JavaFX libraries</flag> |
28 |
|
29 |
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
30 |
index f0a77c0..ac3ee6a 100644 |
31 |
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
32 |
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
33 |
@@ -61,7 +61,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )" |
34 |
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" |
35 |
SLOT="1.8" |
36 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" |
37 |
-IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source" |
38 |
+IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source" |
39 |
REQUIRED_USE="javafx? ( alsa fontconfig )" |
40 |
|
41 |
RESTRICT="fetch preserve-libs strip" |
42 |
@@ -211,6 +211,10 @@ src_install() { |
43 |
rm -vf jre/lib/*/libjsoundalsa.* || die |
44 |
fi |
45 |
|
46 |
+ if ! use commercial; then |
47 |
+ rm -vfr lib/missioncontrol jre/lib/jfr* || die |
48 |
+ fi |
49 |
+ |
50 |
if use headless-awt ; then |
51 |
rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ |
52 |
{,jre/}bin/{javaws,policytool} \ |
53 |
@@ -233,6 +237,9 @@ src_install() { |
54 |
# provided, they generally lag behind what Gentoo has available. |
55 |
rm -vf jre/lib/*/libavplugin* || die |
56 |
|
57 |
+ # We package this as dev-util/visualvm. |
58 |
+ rm -vfr lib/visualvm || die |
59 |
+ |
60 |
dodoc COPYRIGHT |
61 |
dodir "${dest}" |
62 |
cp -pPR bin include jre lib man "${ddest}" || die |
63 |
@@ -325,7 +332,7 @@ src_install() { |
64 |
if use x64-macos ; then |
65 |
# Fix miscellaneous install_name issues. |
66 |
pushd "${ddest}"/jre/lib > /dev/null || die |
67 |
- local lib needed nlib npath |
68 |
+ local lib |
69 |
for lib in decora_sse glass prism_{common,es2,sw} ; do |
70 |
lib=lib${lib}.dylib |
71 |
einfo "Fixing self-reference of ${lib}" |
72 |
@@ -334,18 +341,6 @@ src_install() { |
73 |
"${lib}" |
74 |
done |
75 |
popd > /dev/null |
76 |
- |
77 |
- # This is still jdk1{5,6}, even on Java 8, so don't change it |
78 |
- # until you know different. |
79 |
- for nlib in jdk1{5,6} ; do |
80 |
- install_name_tool -change \ |
81 |
- /usr/lib/libgcc_s_ppc64.1.dylib \ |
82 |
- /usr/lib/libSystem.B.dylib \ |
83 |
- "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib |
84 |
- install_name_tool -id \ |
85 |
- "${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \ |
86 |
- "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib |
87 |
- done |
88 |
fi |
89 |
|
90 |
java-vm_install-env "${FILESDIR}"/${PN}.env.sh |