From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-925884-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E53D9139085
for <garchives@archives.gentoo.org>; Mon, 23 Jan 2017 22:52:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3D1C521C043;
Mon, 23 Jan 2017 22:52:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 063E321C03E
for <gentoo-commits@lists.gentoo.org>; Mon, 23 Jan 2017 22:52:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A665334166C
for <gentoo-commits@lists.gentoo.org>; Mon, 23 Jan 2017 22:52:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 12F8E2D14
for <gentoo-commits@lists.gentoo.org>; Mon, 23 Jan 2017 22:52:39 +0000 (UTC)
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" <chewi@gentoo.org>
Message-ID: <1485211931.ed49e92a6e7a7dfc99e6671bef19d0c3a263bb8f.chewi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-java/oracle-jdk-bin/metadata.xml dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
X-VCS-Directories: dev-java/oracle-jdk-bin/
X-VCS-Committer: chewi
X-VCS-Committer-Name: James Le Cuirot
X-VCS-Revision: ed49e92a6e7a7dfc99e6671bef19d0c3a263bb8f
X-VCS-Branch: master
Date: Mon, 23 Jan 2017 22:52:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dfc2e4f5-b420-424c-bdf3-34e79a2b9042
X-Archives-Hash: 27301fb267839fe31a63c8bd85468414
commit: ed49e92a6e7a7dfc99e6671bef19d0c3a263bb8f
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 22:10:35 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 22:52:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed49e92a
dev-java/oracle-jdk-bin: Trim the commercial and duplicated fat
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-java/oracle-jdk-bin/metadata.xml | 1 +
.../oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild | 23 +++++++++-------------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index 6eb282a..6850de6 100644
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription>
<use>
+ <flag name="commercial">Install features requiring a commercial license for production use</flag>
<flag name="derby">Install bundled Derby (Java database)</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>
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
index f0a77c0..ac3ee6a 100644
--- 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
@@ -61,7 +61,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
SLOT="1.8"
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source"
+IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source"
REQUIRED_USE="javafx? ( alsa fontconfig )"
RESTRICT="fetch preserve-libs strip"
@@ -211,6 +211,10 @@ src_install() {
rm -vf jre/lib/*/libjsoundalsa.* || die
fi
+ if ! use commercial; then
+ rm -vfr lib/missioncontrol jre/lib/jfr* || die
+ fi
+
if use headless-awt ; then
rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
{,jre/}bin/{javaws,policytool} \
@@ -233,6 +237,9 @@ src_install() {
# provided, they generally lag behind what Gentoo has available.
rm -vf jre/lib/*/libavplugin* || die
+ # We package this as dev-util/visualvm.
+ rm -vfr lib/visualvm || die
+
dodoc COPYRIGHT
dodir "${dest}"
cp -pPR bin include jre lib man "${ddest}" || die
@@ -325,7 +332,7 @@ src_install() {
if use x64-macos ; then
# Fix miscellaneous install_name issues.
pushd "${ddest}"/jre/lib > /dev/null || die
- local lib needed nlib npath
+ local lib
for lib in decora_sse glass prism_{common,es2,sw} ; do
lib=lib${lib}.dylib
einfo "Fixing self-reference of ${lib}"
@@ -334,18 +341,6 @@ src_install() {
"${lib}"
done
popd > /dev/null
-
- # This is still jdk1{5,6}, even on Java 8, so don't change it
- # until you know different.
- for nlib in jdk1{5,6} ; do
- install_name_tool -change \
- /usr/lib/libgcc_s_ppc64.1.dylib \
- /usr/lib/libSystem.B.dylib \
- "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
- install_name_tool -id \
- "${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
- "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
- done
fi
java-vm_install-env "${FILESDIR}"/${PN}.env.sh