| 1 |
commit: 6dc480a769da3aa975990de3f0ca52b46919147a |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 23 22:27:02 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 22:52:26 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc480a7 |
| 7 |
|
| 8 |
dev-java/oracle-jre-bin: Trim the commercial fat |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-java/oracle-jre-bin/metadata.xml | 1 + |
| 13 |
dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild | 6 +++++- |
| 14 |
2 files changed, 6 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml |
| 17 |
index 87c0c72..8442caf 100644 |
| 18 |
--- a/dev-java/oracle-jre-bin/metadata.xml |
| 19 |
+++ b/dev-java/oracle-jre-bin/metadata.xml |
| 20 |
@@ -7,6 +7,7 @@ |
| 21 |
</maintainer> |
| 22 |
<longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription> |
| 23 |
<use> |
| 24 |
+ <flag name="commercial">Install features requiring a commercial license for production use</flag> |
| 25 |
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> |
| 26 |
<flag name="javafx">Install JavaFX libraries</flag> |
| 27 |
<flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag> |
| 28 |
|
| 29 |
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild |
| 30 |
index e40a4da..5808f5e 100644 |
| 31 |
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild |
| 32 |
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild |
| 33 |
@@ -35,7 +35,7 @@ SRC_URI=" |
| 34 |
LICENSE="Oracle-BCLA-JavaSE" |
| 35 |
SLOT="1.8" |
| 36 |
KEYWORDS="~amd64 ~x86" |
| 37 |
-IUSE="alsa cups +fontconfig headless-awt javafx jce nsplugin selinux" |
| 38 |
+IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux" |
| 39 |
|
| 40 |
RESTRICT="fetch preserve-libs strip" |
| 41 |
QA_PREBUILT="*" |
| 42 |
@@ -141,6 +141,10 @@ src_install() { |
| 43 |
rm -vf lib/*/libjsoundalsa.* || die |
| 44 |
fi |
| 45 |
|
| 46 |
+ if ! use commercial; then |
| 47 |
+ rm -vfr lib/jfr* || die |
| 48 |
+ fi |
| 49 |
+ |
| 50 |
if use headless-awt ; then |
| 51 |
rm -vf lib/*/lib*{[jx]awt,splashscreen}* \ |
| 52 |
bin/{javaws,policytool} || die |
Archives