summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2017-01-23 22:27:02 +0000
committerJames Le Cuirot <chewi@gentoo.org>2017-01-23 22:52:26 +0000
commit6dc480a769da3aa975990de3f0ca52b46919147a (patch)
tree2b7ab4a5d72284869482398d675292844dddd1d6
parentdev-java/oracle-jre-bin: Drop support for PT PaX marking, bug #592856 (diff)
downloadgentoo-6dc480a769da3aa975990de3f0ca52b46919147a.tar.gz
gentoo-6dc480a769da3aa975990de3f0ca52b46919147a.tar.bz2
gentoo-6dc480a769da3aa975990de3f0ca52b46919147a.zip
dev-java/oracle-jre-bin: Trim the commercial fat
Package-Manager: Portage-2.3.3, Repoman-2.3.1
-rw-r--r--dev-java/oracle-jre-bin/metadata.xml1
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild6
2 files changed, 6 insertions, 1 deletions
diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml
index 87c0c72cc0cf..8442caf9ee0c 100644
--- a/dev-java/oracle-jre-bin/metadata.xml
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription>
<use>
+ <flag name="commercial">Install features requiring a commercial license for production use</flag>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="javafx">Install JavaFX libraries</flag>
<flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
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 e40a4da8edf9..5808f5e700af 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