Revbump to move src.zip to right location, while still symlinking from previous location, bug #2241. Also adds examples USE flag to install demos to be in sync with other JDK's; remove unused revision.

Package-Manager: portage-2.1.2.8

4 files changed, 44 insertions, 54 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 760897565588..a48dd7dd9111 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.117 2007/05/21 07:53:09 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.118 2007/05/26 10:50:01 caster Exp $
+
+*blackdown-jdk-1.4.2.03-r16 (26 May 2007)
+
+  26 May 2007; Vlastimil Babka <caster@gentoo.org>
+  -blackdown-jdk-1.4.2.03-r14.ebuild, +blackdown-jdk-1.4.2.03-r16.ebuild:
+  Revbump to move src.zip to right location, while still symlinking from
+  previous location, bug #2241. Also adds examples USE flag to install demos
+  to be in sync with other JDK's; remove unused revision.
 
   21 May 2007; Christian Faulhammer <opfer@gentoo.org>
   blackdown-jdk-1.4.2.03-r15.ebuild:
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index 1cd54f2a24c2..7d4dd153d7b2 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,38 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX blackdown-jdk-1.4.2.env 916 RMD160 499ca9b989c5276713248d4f23482bff9d9f63bd SHA1 ce2e5954895047c74e634d547aea3383b72ed1e6 SHA256 f81ba9d5b8f5e03d68426241a578337223d8e309f2625bd2cddce20349733f5d
 MD5 88a91f74fc3f38762ec8a9ca9eac66c1 files/blackdown-jdk-1.4.2.env 916
 RMD160 499ca9b989c5276713248d4f23482bff9d9f63bd files/blackdown-jdk-1.4.2.env 916
 SHA256 f81ba9d5b8f5e03d68426241a578337223d8e309f2625bd2cddce20349733f5d files/blackdown-jdk-1.4.2.env 916
 DIST j2sdk-1.4.2-03-linux-amd64.bin 33997205 RMD160 de0e4ad5201315f99e9d1f26e5b2827ced37b9f5 SHA1 e3be6bc1c31691123a396351478b58e1b09e9489 SHA256 1810ffc356d7a10d773de003d074050de3c7322ca480ec0344e2b8798498f1dd
 DIST j2sdk-1.4.2-03-linux-i586.bin 34375872 RMD160 47e06e37867237106caf8e5a2c635055a5203d90 SHA1 1d7dd1b91ece6f9a9895bb03986eb865934716ea SHA256 728f661fdf9510de3c01a79259d492a98d9b636034d14e1c930118280dba9df9
-EBUILD blackdown-jdk-1.4.2.03-r14.ebuild 4338 RMD160 bd62cf2171e92e90c081a7514d59adefbd7bc4ac SHA1 2c1001f18056e5505be1674d7c272ae6bfe70119 SHA256 60ff3c99d8a1abe1c555a5ecc42053ab6dc1e95d8ccae7077ea30a3f63af0fbd
-MD5 c08fe8fe97d72d4212bd5a13dcef2575 blackdown-jdk-1.4.2.03-r14.ebuild 4338
-RMD160 bd62cf2171e92e90c081a7514d59adefbd7bc4ac blackdown-jdk-1.4.2.03-r14.ebuild 4338
-SHA256 60ff3c99d8a1abe1c555a5ecc42053ab6dc1e95d8ccae7077ea30a3f63af0fbd blackdown-jdk-1.4.2.03-r14.ebuild 4338
 EBUILD blackdown-jdk-1.4.2.03-r15.ebuild 3599 RMD160 5fb1336d16bd59e3f8d6af95036e6b4345b24955 SHA1 dbf39858418a74571067f86c657d8cbaabb3adac SHA256 3f0fe865edefb3c0843c43e79da782ee03f0d6c866e7acee7d8befe7d41c40bf
 MD5 bbf6875bb04c4c65a94b74c0224e163a blackdown-jdk-1.4.2.03-r15.ebuild 3599
 RMD160 5fb1336d16bd59e3f8d6af95036e6b4345b24955 blackdown-jdk-1.4.2.03-r15.ebuild 3599
 SHA256 3f0fe865edefb3c0843c43e79da782ee03f0d6c866e7acee7d8befe7d41c40bf blackdown-jdk-1.4.2.03-r15.ebuild 3599
-MISC ChangeLog 21159 RMD160 26b1af413750cb6ab80f0e1583bad192a7042851 SHA1 1447dd147d4eda2157117920ab5347095846bd21 SHA256 8bc457f41ffce2e8a5334f26c2a3bbd34207108e555fdeb9b8f5710ec9bfeec1
-MD5 8ffa04bed345adc0fe85689f5aa54848 ChangeLog 21159
-RMD160 26b1af413750cb6ab80f0e1583bad192a7042851 ChangeLog 21159
-SHA256 8bc457f41ffce2e8a5334f26c2a3bbd34207108e555fdeb9b8f5710ec9bfeec1 ChangeLog 21159
+EBUILD blackdown-jdk-1.4.2.03-r16.ebuild 4120 RMD160 a44227f7881f90eef8f9f0551f67caad3ecc7ab1 SHA1 0ef48e8b4626143c6fa9267b282ff290e147518c SHA256 2d2504b08a3f455675325787ebe7784e950760c3035851065fff307e46b68d29
+MD5 dc2582858c0d6ee5cd6e838c63b3a109 blackdown-jdk-1.4.2.03-r16.ebuild 4120
+RMD160 a44227f7881f90eef8f9f0551f67caad3ecc7ab1 blackdown-jdk-1.4.2.03-r16.ebuild 4120
+SHA256 2d2504b08a3f455675325787ebe7784e950760c3035851065fff307e46b68d29 blackdown-jdk-1.4.2.03-r16.ebuild 4120
+MISC ChangeLog 21537 RMD160 f21d592509e571081df704a3c8340a3bfb7d0234 SHA1 11b671322286656b8ad71f26d7b41aff71c85de4 SHA256 ab90f240cf55882904587ded444fa1fa27951f6028cc3ea5475b8f325e85cf95
+MD5 ca8d2505e3b2e6224c183a4abb07fece ChangeLog 21537
+RMD160 f21d592509e571081df704a3c8340a3bfb7d0234 ChangeLog 21537
+SHA256 ab90f240cf55882904587ded444fa1fa27951f6028cc3ea5475b8f325e85cf95 ChangeLog 21537
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 ae61c188f91254c44a84db78bec9bd92 files/digest-blackdown-jdk-1.4.2.03-r14 551
-RMD160 1445c9fe67ddfd01bbaf5f90811dc19d90cb52fd files/digest-blackdown-jdk-1.4.2.03-r14 551
-SHA256 c8d2e3d696ae765965e2ac3b6e03d7483d01075b1293e4b8a25981a1de8fd73a files/digest-blackdown-jdk-1.4.2.03-r14 551
 MD5 ae61c188f91254c44a84db78bec9bd92 files/digest-blackdown-jdk-1.4.2.03-r15 551
 RMD160 1445c9fe67ddfd01bbaf5f90811dc19d90cb52fd files/digest-blackdown-jdk-1.4.2.03-r15 551
 SHA256 c8d2e3d696ae765965e2ac3b6e03d7483d01075b1293e4b8a25981a1de8fd73a files/digest-blackdown-jdk-1.4.2.03-r15 551
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGUU/0NQqtfCuFneMRAi5JAJ9eKwjJ/0KfhYHudvN1I/2YjLvKxwCZAVGa
-Bxjg5FmV+1lmRpq9igEmVjA=
-=UQiA
------END PGP SIGNATURE-----
+MD5 ae61c188f91254c44a84db78bec9bd92 files/digest-blackdown-jdk-1.4.2.03-r16 551
+RMD160 1445c9fe67ddfd01bbaf5f90811dc19d90cb52fd files/digest-blackdown-jdk-1.4.2.03-r16 551
+SHA256 c8d2e3d696ae765965e2ac3b6e03d7483d01075b1293e4b8a25981a1de8fd73a files/digest-blackdown-jdk-1.4.2.03-r16 551
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r14.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r16.ebuild
index b751999fd3fc..6d4f56062833 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r14.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r16.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r14.ebuild,v 1.1 2007/05/20 20:53:23 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r16.ebuild,v 1.1 2007/05/26 10:50:01 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 versionator
+inherit java-vm-2 versionator pax-utils
 
 JREV=$(get_version_component_range 4- )
 JV=$(get_version_component_range 1-3 )
@@ -17,11 +17,10 @@ HOMEPAGE="http://www.blackdown.org"
 
 SLOT="1.4.2"
 LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* amd64 x86"
-IUSE="doc nsplugin"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc examples nsplugin"
 
-DEPEND=">=dev-java/java-config-1.2.11
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+DEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
 
 JAVA_PROVIDE="jdbc-stdext"
 
@@ -82,12 +81,21 @@ unpack_jars() {
 src_install() {
 	typeset platform
 
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark m $(list-paxables ${S}{,/jre}/bin/*)
+
 	dodir /opt/${P}
 
 	cp -pPR ${S}/{bin,jre,lib,man,include} ${D}/opt/${P} || die "failed to copy"
 
-	dodir /opt/${P}/share/java
-	cp -pPR ${S}/{demo,src.zip} ${D}/opt/${P}/share || die "failed to copy"
+	dodir /opt/${P}/share/
+	if use examples; then
+		cp -pPR ${S}/demo ${D}/opt/${P}/share/ || die "failed to copy"
+	fi
+
+	cp -pPR ${S}/src.zip "${D}/opt/${P}/" || die "failed to copy"
+	dosym "../src.zip" /opt/${P}/share || die "failed dosym"
 
 	dodoc README
 	dohtml README.html
@@ -124,28 +132,12 @@ pkg_postinst() {
 	# Set as default system VM if none exists
 	java-vm-2_pkg_postinst
 
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version "sys-apps/chpax"
-	then
-		echo
-		elog "setting up conservative PaX flags for jar and javac"
-
-		CHPAX_CONSERVATIVE_FLAGS="pemrxs"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/blackdown-jdk-1.4.1/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		ewarn "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
+	elog ""
+	elog "Starting with 1.4.0.03-r16 demos are installed only with USE=examples"
+	elog ""
+	elog "Starting with 1.4.0.03-r16 the src.jar is installed to the standard"
+	elog "location. It is still symlinked to the old location (/opt/${P}/share)"
+	elog "but it will be removed if there will ever be a version bump."
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241"
+	elog "for more details."
 }
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r14 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r16
index 204505d2d344..204505d2d344 100644
--- a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r14
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r16