From 6dc480a769da3aa975990de3f0ca52b46919147a Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 23 Jan 2017 22:27:02 +0000 Subject: [PATCH] dev-java/oracle-jre-bin: Trim the commercial fat Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-java/oracle-jre-bin/metadata.xml | 1 + dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml index 87c0c72cc0cff..8442caf9ee0cf 100644 --- a/dev-java/oracle-jre-bin/metadata.xml +++ b/dev-java/oracle-jre-bin/metadata.xml @@ -7,6 +7,7 @@ Oracle Java SE Runtime Environment, Official Binary Distribution + Install features requiring a commercial license for production use Don't install the X backend for AWT, needed by some GUIs (used to be X flag) Install JavaFX libraries Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files 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 index e40a4da8edf96..5808f5e700af1 100644 --- 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 @@ -35,7 +35,7 @@ SRC_URI=" LICENSE="Oracle-BCLA-JavaSE" SLOT="1.8" KEYWORDS="~amd64 ~x86" -IUSE="alsa cups +fontconfig headless-awt javafx jce nsplugin selinux" +IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux" RESTRICT="fetch preserve-libs strip" QA_PREBUILT="*" @@ -141,6 +141,10 @@ src_install() { rm -vf lib/*/libjsoundalsa.* || die fi + if ! use commercial; then + rm -vfr lib/jfr* || die + fi + if use headless-awt ; then rm -vf lib/*/lib*{[jx]awt,splashscreen}* \ bin/{javaws,policytool} || die