Fix install with missing xattr support #517626

Fix selinux support #515582

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

8 files changed, 160 insertions, 163 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index ad84ad67b85e..ef9ee7676839 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.66 2014/07/20 21:20:33 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.67 2014/07/21 00:04:54 sera Exp $
+
+  21 Jul 2014; Ralph Sennhauser <sera@gentoo.org>
+  oracle-jdk-bin-1.7.0.65.ebuild, oracle-jdk-bin-1.8.0.11.ebuild:
+  Fix install with missing xattr support #517626
+  Fix selinux support #515582
 
 *oracle-jdk-bin-1.8.0.11 (20 Jul 2014)
 
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 852be21025a7..18aedb69b37c 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -81,19 +81,19 @@ DIST jdk-8u5-solaris-x64-demos.tar.gz 8643049 SHA256 c9355b5ff54a0c84213d2ca524d
 DIST jdk-8u5-solaris-x64.tar.gz 97716860 SHA256 fa8138a46d82b2dad2b17a57ecf30fe59eb15a1482a07852a2a60a9f63da7538 SHA512 5e05a59f0a205c9f6ff0d0ab507d930e45f15418018ef1bad7d3d0d7626a0f12bdc8f5c83d80a4b0f1f755c32d92b81e69552cbfdb869d05ab82bda9fdfd9971 WHIRLPOOL a3741c2684780876e44fcdd9c977062db34137f4708aa9b0a7c23e3b07297455ece69d96564de29ad44d1a5440599b07107f05008c6841f302a9605ae4944400
 EBUILD oracle-jdk-bin-1.7.0.55.ebuild 10022 SHA256 8fcc58b67d2452b5ba1c616ade70aab0bb2d84cd3b8378d3d28d72b367279f1b SHA512 c803bd5a3ddeb2412493cc1b29ced3853c7b727b22c4e76ecf1e310ef745b760bb987d31be1be81dd559bfe2c79c63df44166ad09537f9be2a1631cf26a3e813 WHIRLPOOL 4fbce385b15d6b7b5a9bbe9c28f1833ba34fa8cf65e2dfb731a9d86f7fecdcd481aa51efd8849f23f1b4a39deb96dad9199d030325c4a8e54e71396953513cbc
 EBUILD oracle-jdk-bin-1.7.0.60.ebuild 10020 SHA256 93ff8dd74bbd9beb6ebbfa2a262448a04dc993ce11101cd9ae643ca9263d0bac SHA512 239f6faec14720f6c906f7dfd756336eb939961fdc9a712fecacaa6297a283e189b9fc63cf4a15672e13ec48097f1caaba352a68b3ee9a0a4b51b9c929832a47 WHIRLPOOL 72e58bba4c3b3860c56d393c4fe8ebf84fd5c4457f14e7c78d4d83fb7e02711c7ce6154edaa5ac53f803077cf53d0c20b9f0d8fd8eebd27c5bb618865692d3bb
-EBUILD oracle-jdk-bin-1.7.0.65.ebuild 10338 SHA256 6ace2c53c25b672ad3ebdc03543321f4364aab484998e08219aa837d8380b31c SHA512 17eb895337035195f800bf04fc874c1d67d480a08b4a71638ccd7f60cbf821c85b4ebdd42f4f46bab087902174d78b4eafa6e2f1c908a86314cec879d3f6e4f0 WHIRLPOOL 1159b306fabbdac4dd61c22516280d4951b48c68d4838aea6e9ac664337155dc181f4069bb95e9a65e2ed48c63efb0eb113e3bf9931cc92f9cdc53941406725d
-EBUILD oracle-jdk-bin-1.8.0.11.ebuild 10128 SHA256 4841790bbe6b1046899b8805cb66c3f67c6b8e384e771fa74248bafb5c5e1318 SHA512 7656941f254ced2e53328e7721b60232a63229e8e0a07c4c05a7575cc14856054231839cb74963dbdb11a88fcb8f1659844d933c4070834a3667f7e33d1faaa6 WHIRLPOOL 8d4425786e222ccda90e0e5763605b18fdc155e2babaf24e29b3032aebc81e9f424d6306dbdfe35eab1175d44bf4b7ccf1984cf04679361ec5cd1551f31a43fb
+EBUILD oracle-jdk-bin-1.7.0.65.ebuild 10241 SHA256 a2180312b76cf69344665761f4b430936cc281487114047d6f2c3400f42c04f2 SHA512 ac98265ea070b8cf29ccacb4ccc84603a783503430db3a0b2034a188eaaf9cac8a23f393cd2de0b84aa77ec3a4038acd16261bf4136dae5723c86113896301a6 WHIRLPOOL 9f7e63bae0f6c3f461f2aaf8d61184b640709425ecc69f6e0b07b625abfded1ef7f4fca7e4548d32000514eccc3269488ac5a8a9a0b07e19ef9d75532fe0c430
+EBUILD oracle-jdk-bin-1.8.0.11.ebuild 10063 SHA256 7857e914a1d0dba0628c1e6ac62a8e20a8600b2d076d29f467aca98d6a8230f0 SHA512 45a6b7859c7ad74b9cac0d48579cc1d7d3cfb90b90b7e54adf3443799b5ceddd475c5910bd016bfd843c92ee13bee6e8a80f1bb7d1444de7aad17aed6945d4f8 WHIRLPOOL 56562f96eafb3b2a3c1b9f830ed9502fce81d82fa9ac665d749c4cc272e50645eae34dd55fe61e9c70f97dda6c1f705acfb0a5e53a97230589a1b67b1c27adc7
 EBUILD oracle-jdk-bin-1.8.0.5.ebuild 10127 SHA256 adfbfb93381f5595a3030b673eb9dd84c0b2861433e16a4508470da918f662fa SHA512 7de7e6bb4f29988d376130124a1a78ee1ea3d22265808ca973a7f3d3dba9b5e73f892eabb88dd7cd07a56093d6e5336cd175e09f496f6b94f65ef5858ac4ecd6 WHIRLPOOL 6b86eec3a5e9a5defe1cb5fe73e3351bef3f955759f3408841ad754c3eb28dde3be02661c783ce7b239c4eff9240c0ee4e266c459ef55a87c49a0088acbf56fd
-MISC ChangeLog 11829 SHA256 fe83f555814061a27a10db3c682761da3f3e4c3bf7cba1a2748d21ed3e24a0f6 SHA512 a4b16a75ea52f29165374b87367612dd6c2e5a73f4226c057aa474fda04ceaef4649f5778d65cf2508420623d9764a3dee1fb41179312a9d474c30d88a05dc91 WHIRLPOOL 661e18e2fb94f6ad56a33b3c897826337f812dfd1b83487bde31a611ccfe3bc7be4866130df34c1bfef96983e72fa65d58c9fd91694cd5a77e4d74736e26782a
+MISC ChangeLog 12025 SHA256 dec8581006c66365c6b7b0c6daaa2815ecfde6249b911afa10a81e75bc8107fe SHA512 47cf39d0c04f1412989e131d1e2bcec76107497e3a4c3ad650ffad1926f40ce7d10a2328879a280fa8a8f9d6af7b3bd2cd47a0e0358f16fddc50b59b1697fc01 WHIRLPOOL a6d8b36e81cf631f0f0b719842d70ae4a7a683e15caac103284d2256efd4aa8ea084cef166b8ddd2dc25a7f5b9da0de29df154c915280eb569a90c2231a43bee
 MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTzDKsAAoJELjwI6Q8XPdaz2sH/ibT+Tjfs5F3IoApBQ7Hf4Lo
-ERZr7/zKumaKKRLvbjTKQZL89zTZYARnrAhDZl6DePBxRVFxYubnNft+ec4j5Y3V
-mqm3KlQzaSYuTPusloFVCl8m9WaMWANCE/dMkyPxXhLOHjQJzBk/QyRd5JYgS9h5
-t8v5gy50wrIGqfuAtnAuKfOtlwlw00D5Z8DcwHYxeKoqwNUdEax90LiGhzLYwlnS
-s6O1vFodpdJTo7mJuvssslNwWPiLl29MH+DqH0EOELdcaZv3r4TQ7ybwdPOAlfRN
-gQt6pMEz9+CLJwEbtcEmt0PbbWjGtBgulxYkc0Y/mo/ogGqW0OmJ5b41++W0T1E=
-=o2g8
+iQEcBAEBCAAGBQJTzFkwAAoJELjwI6Q8XPdaMK0IALoWC7kpmoR1N4KE2v7pH5uN
+Kb073qGFBZEe1NBFpJ8nstr90KoApU7zOfj2eO3Ne4SSuqGEyZfS2gY7LkHCimqM
+wlE7TLUW94bkRcb0yy2irJzYMWo6u7Gon5dVmJ3jJ4iQqueSroktthR0S1yQrW7W
+R8RMsX2cFga9iNJFfBRC3kZJwnktEf+r+ZdCk/7BDQPWTweIcgcSfddA8nc6HBm5
++DSMA+qNBR0l2an6+k/Yub69mjvplUtGc8/wqsLaUEwICVUrECvF261uGj3O5Trk
+KuYLFz/R5gTPcVMvq29FyY2pKvsTJfG9gnQ0KYpkrr0lwzTyqYIhIR0Bn8hQ/eA=
+=QQs9
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild
index b7ee9e50a096..92cdb3460935 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild,v 1.1 2014/07/20 19:53:16 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild,v 1.2 2014/07/21 00:04:54 sera Exp $
 
 EAPI="5"
 
@@ -61,12 +61,14 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.7"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source"
+IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source"
 
 RESTRICT="fetch strip"
 QA_PREBUILT="*"
 
-RDEPEND="
+COMMON_DEP="
+	selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
 	X? ( !aqua? (
 		x11-libs/libX11
 		x11-libs/libXext
@@ -80,7 +82,7 @@ RDEPEND="
 	!prefix? ( sys-libs/glibc )"
 # scanelf won't create a PaX header, so depend on paxctl to avoid fallback
 # marking. #427642
-DEPEND="
+DEPEND="${COMMON_DEP}
 	jce? ( app-arch/unzip )
 	examples? ( kernel_linux? ( app-arch/unzip ) )
 	pax_kernel? ( sys-apps/paxctl )"
@@ -155,36 +157,14 @@ src_prepare() {
 	fi
 }
 
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			bin/java -server -Xshare:dump || die
-			;;
-	esac
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
 
 	# Create files used as storage for system preferences.
 	mkdir jre/.systemPrefs || die
 	touch jre/.systemPrefs/.system.lock || die
 	touch jre/.systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
 
 	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
 	# writable executable segments
@@ -205,20 +185,16 @@ src_install() {
 	dohtml README.html
 
 	dodir "${dest}"
-	cp -R --preserve=links,mode,ownership,timestamps,xattr \
-		bin include jre lib man "${ddest}" || die
+	cp -pPR bin include jre lib man "${ddest}" || die
 
 	if use derby; then
-		cp -R --preserve=links,mode,ownership,timestamps,xattr \
-			db "${ddest}" || die
+		cp -pPR db "${ddest}" || die
 	fi
 
 	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		cp -R --preserve=links,mode,ownership,timestamps,xattr \
-			demo sample "${ddest}" || die
+		cp -pPR	demo sample "${ddest}" || die
 		if use kernel_linux; then
-			cp -R --preserve=links,mode,ownership,timestamps,xattr \
-				"${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
+			cp -pPR	"${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
 				"${ddest}"/javafx-samples || die
 		fi
 	fi
@@ -240,7 +216,7 @@ src_install() {
 	fi
 
 	if use source; then
-		cp src.zip "${ddest}" || die
+		cp -p src.zip "${ddest}" || die
 	fi
 
 	if use !arm && use !x86-macos && use !x64-macos ; then
@@ -271,6 +247,26 @@ src_install() {
 		doins "${T}"/fontconfig.properties
 	fi
 
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
 	# Remove empty dirs we might have copied
 	find "${D}" -type d -empty -exec rmdir -v {} + || die
 
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.ebuild
index 5a88b6e3a885..4a93a1b184bc 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.ebuild,v 1.1 2014/07/20 21:20:33 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.ebuild,v 1.2 2014/07/21 00:04:54 sera Exp $
 
 EAPI="5"
 
@@ -61,12 +61,14 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.8"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source"
+IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source"
 
 RESTRICT="fetch strip"
 QA_PREBUILT="*"
 
-RDEPEND="
+COMMON_DEP="
+	selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
 	X? ( !aqua? (
 		x11-libs/libX11:0
 		x11-libs/libXext:0
@@ -78,14 +80,11 @@ RDEPEND="
 	doc? ( dev-java/java-sdk-docs:${SLOT} )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	!prefix? ( sys-libs/glibc:* )"
-
-DEPEND="
-	jce? ( app-arch/unzip:0 )
-	examples? ( kernel_linux? ( app-arch/unzip:0 ) )"
-
 # A PaX header isn't created by scanelf, so depend on paxctl to avoid fallback
 # marking. See bug #427642.
-DEPEND="${DEPEND}
+DEPEND="${COMMON_DEP}
+	jce? ( app-arch/unzip:0 )
+	examples? ( kernel_linux? ( app-arch/unzip:0 ) )
 	pax_kernel? ( sys-apps/paxctl:0 )"
 
 S="${WORKDIR}/jdk"
@@ -164,36 +163,14 @@ src_prepare() {
 	fi
 }
 
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			bin/java -server -Xshare:dump || die
-			;;
-	esac
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
 
 	# Create files used as storage for system preferences.
 	mkdir jre/.systemPrefs || die
 	touch jre/.systemPrefs/.system.lock || die
 	touch jre/.systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
 
 	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
 	# writable executable segments
@@ -215,17 +192,14 @@ src_install() {
 	dohtml README.html
 
 	dodir "${dest}"
-	cp -R --preserve=links,mode,ownership,timestamps,xattr \
-		bin include jre lib man "${ddest}" || die
+	cp -pPR bin include jre lib man "${ddest}" || die
 
 	if use derby ; then
-		cp -R --preserve=links,mode,ownership,timestamps,xattr \
-			db "${ddest}" || die
+		cp -pPR	db "${ddest}" || die
 	fi
 
 	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
-		cp -R --preserve=links,mode,ownership,timestamps,xattr \
-			demo sample "${ddest}" || die
+		cp -pPR demo sample "${ddest}" || die
 	fi
 
 	if use jce ; then
@@ -245,7 +219,7 @@ src_install() {
 	fi
 
 	if use source ; then
-		cp src.zip "${ddest}" || die
+		cp -p src.zip "${ddest}" || die
 	fi
 
 	if use !x86-macos && use !x64-macos ; then
@@ -276,6 +250,26 @@ src_install() {
 		doins "${T}"/fontconfig.properties
 	fi
 
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
 	# Remove empty dirs we might have copied.
 	find "${D}" -type d -empty -exec rmdir -v {} + || die
 
diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 719d79c82c86..8cf421a29e04 100644
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/oracle-jre-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.59 2014/07/20 20:36:57 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.60 2014/07/21 00:07:03 sera Exp $
+
+  21 Jul 2014; Ralph Sennhauser <sera@gentoo.org>
+  oracle-jre-bin-1.7.0.65.ebuild, oracle-jre-bin-1.8.0.11.ebuild:
+  Fix install with missing xattr support #517626
+  Fix selinux support #515582
 
 *oracle-jre-bin-1.8.0.11 (20 Jul 2014)
 
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index f7e7572a3fd1..e7d4dfdd0898 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -18,19 +18,19 @@ DIST jre-8u5-linux-i586.tar.gz 58156527 SHA256 77a81e63325af682d52875e6699d5edd5
 DIST jre-8u5-linux-x64.tar.gz 57056684 SHA256 de7ba8e27b9e7352c44608969871dc11dedadd26d81865f9a42aabff8dadba2a SHA512 961a3dc49fe8ee3bb51b871c139c65c4c020431b2ff5cbe3532c0af3e2d584a094f2a3b8aee89cf1e803bd0ae2dd3447f31377af3f16c477c0150a281a3f0378 WHIRLPOOL 3503edab4be5d345c0ecb398583420a017e8c33eb6385d7d7844326e77be6962dfb1724867721ff0e96de6cf9b62d6bd0cb6ab34071add1f5e7ff5d01712b02a
 EBUILD oracle-jre-bin-1.7.0.55.ebuild 4956 SHA256 ec5a0c1801bbe6428e757d1eb4a76ab8836f783587cde44ff74a95e4cb9d40d7 SHA512 97073a55620888dd2bb4ecab5c3c5da276832b727e55ca32841cb7ce5026e40c83aca2eb41a2435dfe9016d3b8b75ded0939d4cebb44fb69373cd646d55c23ae WHIRLPOOL f326ac4d59e4a900623a377902269fabc804cc17266120b93739bdd7079b0a4c719d537505a1e2cedd38e941c75117542191bc2e1220b1e20604e2e8872d318c
 EBUILD oracle-jre-bin-1.7.0.60.ebuild 4956 SHA256 903c05cc7a1cb1b68a3da152db20aa05c76923540cd218c008e9d791dd014ec4 SHA512 f57e1058160d38354147ec7c9ee40f394963790b724fe50a358d53dbd41718f0d098d5687753f2c785e8675d8cedc2d155404065a0f2e2e27a08509c4ac052a8 WHIRLPOOL e1edd5bf193ddc8a85d161ec323c5e73f11ac7239f88889da945d0601a5021e2e3080a5bddd0397a2a0160b068eef71823a35980572792129fbaf802717e7061
-EBUILD oracle-jre-bin-1.7.0.65.ebuild 5130 SHA256 3f6944858df32618830bbfcac652e9720b4dca852bc8b0b383b214cc9eaae5f6 SHA512 2875bbb56285eeeb80429c8b680d2d1ce7cd4e861a5fdc8b88c3e5cc0e061e8d17cfe4b2dcd3077a0b6411da79abdf4a39bd5e10b747a42d6ad347e68feb1ba7 WHIRLPOOL 5e33b64d8da04dc2af6b947edc46e05bb124a3b91352e6fff78dda64117660abb0c9dd712df2a2ad22a6579319fcb301404bd593829a93a65e76f33af900622e
-EBUILD oracle-jre-bin-1.8.0.11.ebuild 5554 SHA256 8a98f0b8b25aee0f1d522226ab03a2791619b4c3796b586db472538f64dd5e8b SHA512 a1f4086deaf2891a1b75eaca144c84f95997deff27ff40894c67a8678f2798b406904879af43a7c6e8639e71d7c663c6a4f7133d6a6dfbbd51542ff1189ae800 WHIRLPOOL cb809ae4e8b69d66cd5d8ff14dfa17aef1e86ac181e518afa2d4e56f426913d6a47d7b8ce40f44a697b97a31f7ac47429af07cc3d6f262b44827991244dcb69c
+EBUILD oracle-jre-bin-1.7.0.65.ebuild 5187 SHA256 0d941cc34179d2d4822143245c0070ab2853320339c63056c488c2da8684127d SHA512 2257f09846abc139789711889c14195e4e71fd18e058fc6a051a08b2c15ee88be2de11c768aa2f0c637934ea6954f834f89578efba456b34606222f34d04fa78 WHIRLPOOL a54d893d04972a418cc395da43edccd7abbd9b502ed67a684463dc66437b2c27743a7d06dd23123884704ac5575820c3564d0b6d31ade2264ec727093827da79
+EBUILD oracle-jre-bin-1.8.0.11.ebuild 5610 SHA256 b840d9cba111ee749b00144038169ed9218215f9da504572429ff96368d65be6 SHA512 9eaa3bd01ce51e8a95166d4b6eb099c4c6f3e6eec226bb5aedaf4b36f6f3b57f7561dbfc220c513f2d6017e06e605c042f149427369d54c02beae35b3885e5b2 WHIRLPOOL 1a20c131cb104452f930cb951c506ad903bf9e0d67743f7f90ff078e650305f77a149c814417bb173aa85a29cdd748dd9d74b43a8b16312ac9e46193b091261c
 EBUILD oracle-jre-bin-1.8.0.5.ebuild 5553 SHA256 63d627a6d9368c0a3e0fbb509476ca7f1f375a580bd66209751c36258206076d SHA512 796c98f024fe9799e4ae71381dfca1a8401d8ca5920bf147b00e51f4ecae4d887f35bc84c6d10bc8eb729e6721658a1773e6be0e6f7ec886edd8dd4ea75d3f74 WHIRLPOOL dc39a640546787c7d4bd3a174872f8db526d6d1e5a7e265f20f42a26534af645530532fec50040ea4bb8b27f5eb7160b0d5d809e972ab3c0e338676362295705
-MISC ChangeLog 10106 SHA256 95cbe27d62c7eed6b828bec40ce2976ce1a54dc5cbb9a881e8a6277a04268654 SHA512 ed1cfbe4d29457d91b5a7d0c559b62a1c6ed576565160f0dd703aca9808dbfbb6dda8200936b0458d495398bc0d808109c2a054149f3b1047b9d9bdba58dcbc6 WHIRLPOOL 492e8b38b92f91526d0a375e97a3c6426176571ea6f2b3094035dde48d46ea3eae49ad7c4617fc14dd15a2b112ce71fa0a69a6ad666679411cf9c1cd22c21dae
+MISC ChangeLog 10302 SHA256 e2ba08d7d0963934125a30eb7f5a9a71a0e66c8c3a058e09720be458e193dc94 SHA512 f2795f64f77ec1a3f05f8608c128f816dc794ad64f4095afb40bb760ef3b4248ffa64934b049675082e5501cab24c3c1390b97dce970ccb3fc9347030032e812 WHIRLPOOL 32df0fc2957e10dafd4e99035a3228c215dcf1c834c9cf10365300ec5a6a2e5df0d3fa5fea5de97dd4d2d92c0cb7e3f26e5ff0fba0138650459c1c25dc62b318
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTzChzAAoJELjwI6Q8XPdaKb8IAKP7XMm03gylVuhKuhnJkkbo
-uZ9Q2l6Z+FiPAWFHLB/zWAGSrENEWtX5eW+FxTZ3o0CI+LIfGMbyy9bE3k+MDR79
-VYsn7I0vM43SxNzd7pZJfu/5UmFfRMQUZdDiAYWN6gMdBkCh3kEDOtpWZopxEBth
-vJAIOQvUDFL1UjoJRT/m6k7oyyLCJdVRqYzBzn9Xlg9+b2QZs0LFKT+L5zsFEUeD
-chnpuBgOopjlAkn5UHlin/2GuRwDshZWPU2ybtzsGIIR5ZOr3ooX+vJ0256G7Bh6
-fLEvED7UwTFeGvzs3IBWVA/kctgroJj6NFc5Js1xIBikYw8ezA8WbLzoruwDjeA=
-=YzPP
+iQEcBAEBCAAGBQJTzFm5AAoJELjwI6Q8XPdaVBkH/1IrrzDxqyncDj69dny4nxLI
+yREp5ETh4MjB1zmiBi0v2bWowZKLca3j/WyJRh+wiKzZDp9Kb1Z+HaMlByXfPQ08
+Nv2kqhPZV38XE/sPOjsohlZJ+rFYuG/mtce1uR5gQLLJsJSLX4kKBlBHbtKeb3fZ
+Kd6oKw623t0+dNR7aq1Eym539Q+jR5EzmEPhEDZQy0PXfWRZ/HQpGqFWrz8FWZeJ
+gSXYXrgXO0iBuKKvUTz76BXbJwY0NckcZo4LO6QveWJGLgv9NtKJueEd0XjoJGt4
+D/ADmZILScwc7ZAXX0F06k49UcR6ASKE88acwtl2V1LdK2RBlA/EuqqKoVFrxUc=
+=NO99
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild
index c1746c3fbde2..0fdbdbbd1b78 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild,v 1.1 2014/07/20 20:07:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild,v 1.2 2014/07/21 00:07:03 sera Exp $
 
 EAPI="5"
 
@@ -29,12 +29,14 @@ SRC_URI="
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.7"
 KEYWORDS="~amd64 ~x86"
-IUSE="X alsa fontconfig jce nsplugin pax_kernel"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
 
 RESTRICT="fetch strip"
 QA_PREBUILT="*"
 
-RDEPEND="
+COMMON_DEP="
+	selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
 	X? (
 		x11-libs/libXext
 		x11-libs/libXi
@@ -47,7 +49,7 @@ RDEPEND="
 	!prefix? ( sys-libs/glibc )"
 # scanelf won't create a PaX header, so depend on paxctl to avoid fallback
 # marking. #427642
-DEPEND="
+DEPEND="${COMMON_DEP}
 	jce? ( app-arch/unzip )
 	pax_kernel? ( sys-apps/paxctl )"
 
@@ -77,36 +79,14 @@ src_prepare() {
 	fi
 }
 
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			bin/java -server -Xshare:dump || die
-			;;
-	esac
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
 
 	# Create files used as storage for system preferences.
 	mkdir .systemPrefs || die
 	touch .systemPrefs/.system.lock || die
 	touch .systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
 
 	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
 	# writable executable segments
@@ -124,8 +104,27 @@ src_install() {
 	fi
 
 	dodir "${dest}"
-	cp -R --preserve=links,mode,ownership,timestamps,xattr \
-		bin lib man "${ddest}" || die
+	cp -pPR bin lib man "${ddest}" || die
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
 
 	# Remove empty dirs we might have copied
 	find "${D}" -type d -empty -exec rmdir -v {} + || die
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild
index 9f3bd4e9f021..e6357f23c0ef 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild,v 1.1 2014/07/20 20:36:57 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild,v 1.2 2014/07/21 00:07:03 sera Exp $
 
 EAPI="5"
 
@@ -35,12 +35,14 @@ SRC_URI="
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.8"
 KEYWORDS="~amd64 ~x86"
-IUSE="X alsa fontconfig jce nsplugin pax_kernel"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
 
 RESTRICT="fetch strip"
 QA_PREBUILT="*"
 
-RDEPEND="
+COMMON_DEP="
+	selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
 	X? (
 		x11-libs/libXext
 		x11-libs/libXi
@@ -53,7 +55,7 @@ RDEPEND="
 	!prefix? ( sys-libs/glibc )"
 # scanelf won't create a PaX header, so depend on paxctl to avoid fallback
 # marking. #427642
-DEPEND="
+DEPEND="${COMMON_DEP}
 	jce? ( app-arch/unzip )
 	pax_kernel? ( sys-apps/paxctl )"
 
@@ -92,36 +94,14 @@ src_prepare() {
 	fi
 }
 
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			bin/java -server -Xshare:dump || die
-			;;
-	esac
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
 
 	# Create files used as storage for system preferences.
 	mkdir .systemPrefs || die
 	touch .systemPrefs/.system.lock || die
 	touch .systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest}"
 
 	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
 	# writable executable segments
@@ -139,9 +119,27 @@ src_install() {
 	fi
 
 	dodir "${dest}"
-	cp -R --preserve=links,mode,ownership,timestamps,xattr \
-		bin lib man "${ddest}" || die
+	cp -pPR	bin lib man "${ddest}" || die
 
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
 	# Remove empty dirs we might have copied
 	find "${D}" -type d -empty -exec rmdir -v {} + || die