| 1 |
commit: 44fc88593e0aadc2e69b48034280ecb4c0149887 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 21 23:18:07 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 22:52:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44fc8859 |
| 7 |
|
| 8 |
dev-java/oracle-jdk-bin: Drop support for PT PaX marking, bug #592856 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild | 9 +++------ |
| 13 |
1 file changed, 3 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index 82fc8b6..f0a77c0 100644 |
| 17 |
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
| 18 |
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
| 19 |
@@ -61,7 +61,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )" |
| 20 |
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" |
| 21 |
SLOT="1.8" |
| 22 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" |
| 23 |
-IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source" |
| 24 |
+IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source" |
| 25 |
REQUIRED_USE="javafx? ( alsa fontconfig )" |
| 26 |
|
| 27 |
RESTRICT="fetch preserve-libs strip" |
| 28 |
@@ -107,12 +107,9 @@ RDEPEND="!x64-macos? ( |
| 29 |
!prefix? ( sys-libs/glibc:* ) |
| 30 |
selinux? ( sec-policy/selinux-java )" |
| 31 |
|
| 32 |
-# A PaX header isn't created by scanelf so depend on paxctl to avoid |
| 33 |
-# fallback marking. See bug #427642. |
| 34 |
DEPEND="app-arch/zip |
| 35 |
jce? ( app-arch/unzip ) |
| 36 |
- examples? ( x64-macos? ( app-arch/unzip ) ) |
| 37 |
- pax_kernel? ( sys-apps/paxctl )" |
| 38 |
+ examples? ( x64-macos? ( app-arch/unzip ) )" |
| 39 |
|
| 40 |
S="${WORKDIR}/jdk" |
| 41 |
|
| 42 |
@@ -187,7 +184,7 @@ src_prepare() { |
| 43 |
|
| 44 |
if [[ -n ${JAVA_PKG_STRICT} ]] ; then |
| 45 |
# Mark this binary early to run it now. |
| 46 |
- pax-mark Cm ./bin/javap |
| 47 |
+ pax-mark m ./bin/javap |
| 48 |
|
| 49 |
eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936." |
| 50 |
eqawarn |
Archives