netbeans: netbeans-platform and netbeans-javadoc switched to jdk 1.8

Package-Manager: portage-2.2.24

4 files changed, 13 insertions, 15 deletions

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 71fed8ffe..c3a9de7ca 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -28,7 +28,7 @@ DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b7
 DIST netbeans-trunk-nightly-201511050002-src.zip 208737487 SHA256 86f4bd2b25363a6893ae9ec91352e93be7d6d707b8d4d0c573ab6634554499c2 SHA512 50d06f779cfdd7bbbffb91844010e93f94339c505e38b3af7a9066bc9f4a35db6dcbc8a9737e436904ea1bc18267e6139656f8dc1a82356d9b48ab442f420ec0 WHIRLPOOL 05c392e0151f0348dd5d51796262f503c312b73a4166b92d24a9598f490da6567e8b76c52ab7cefb957b34e3e0622b3e5cc3888e3a9c6cb88a18a1e917b95314
 DIST netbeans-trunk-nightly-201511080002-src.zip 208751101 SHA256 27523f666ce10cbdfb9a63ada56d1bed5eb90fa62310292320c90506756778f2 SHA512 6c54272c017f421f634d5ecc1682c5121da66b8ebfe1df2559c4458b4885c27c5a59aa31460a2bd020eb721a2074dfb5790d9b3722f05c54c0b821048215bd4a WHIRLPOOL a3c748e2de936ee3ce62ff89849aca180ea2f4008844b8914e9614e06e0ca32c01b7a20adbf51b0292ca0820560e1cbefb24d274b904b5a4c7cfe415060d9a15
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
-EBUILD netbeans-javadoc-8.1.ebuild 6182 SHA256 3f756c1f490d9e2c6c3f561f5b6f0c489a32e5e5f946f271b59f2581aa612a1e SHA512 ee8dbf284615899306de711d92e7c22f6631603b2ac833d79c4b6e543af3a6009c212a6b58f33fc1abaefd8b470f1e451f7cfc6650b6f25165ae0f60469a72b5 WHIRLPOOL aec46780041aba3b7f3a56691bb6a45789367a9188a3bb1e7eb726455ebfd62543b7b2a9f225e421bd4ffe27eae8db2b19712b6e6fa0007cda9e8a8790ebd24f
+EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-9999_p20151003.ebuild 6228 SHA256 699e9a51f3f2f67cd645c26e3e71473e173e86bc65fec4f79f322359b0fda501 SHA512 4c3126c9007b76c676720357671bdc04bad90c56de7d0b568c9de3ae17f348fd96c0176deb36531f2eb832d649c544e056ffecf4e19e25127d9640bb542026ea WHIRLPOOL 42dd2ce70c6c823a3fbeb93dbcf623a49bd4d2d10beda37e862a932ca625813bfe0685e0a0c637a3ad40ac547823d94a5f19c7d26112b177f4287cce12869760
 EBUILD netbeans-javadoc-9999_p20151004.ebuild 6228 SHA256 aeee0edbb37ff7feda48809509e0817726f12a03095c831188d0dc697a0d03ca SHA512 9daec0d7d018fdfeb5423ebefbd3bc35d3e392b5d264b86f4e075a6fcf617faccfe2f8cb4e1ff72946a24b55fd2766458719dbe97e2857c9d58e38f3f39a18df WHIRLPOOL c8fcaaaa314958390aae2faf643cde43ce6b90d9d08833700646780c627a02c659a8cef83f0d83e7f646b14e4a103723a435e2d7541325ca0a8db291cd4e97fb
 EBUILD netbeans-javadoc-9999_p20151006.ebuild 6228 SHA256 f760645f1a3153daf67150731ab0db32eed2bf4c325902d7feeff29961a141f8 SHA512 b83437b70058c1e114b9b1d099373c7fca03403aad70dedb6def6b8468a00f096d7a1022b4b12c1a3e608aa2d3f543e392de86a1ab01a4e637d2e601abc8a7ab WHIRLPOOL 6e5abef383be306d9476c5fad35d2fdda8ba3e2c0ff8109a8210cc69cd4bb0751362ea93bd9a00c7005a09dee5eb376c2d8b170f972382bd04e0fadfc8364a41
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
index 8e138756c..10100c733 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
-# oracle-jdk-bin is needed because other jdks do not contain jre/lib/ext/jfxrt.jar
-DEPEND="dev-java/oracle-jdk-bin:1.7
+# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
 	app-arch/unzip
 	dev-java/javahelp:0
 	dev-java/junit:4
@@ -42,7 +42,7 @@ DEPEND="dev-java/oracle-jdk-bin:1.7
 RDEPEND=""
 
 JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
 JAVA_PKG_WANT_SOURCE="1.7"
 JAVA_PKG_WANT_TARGET="1.7"
 
@@ -158,8 +158,8 @@ src_prepare() {
 }
 
 src_compile() {
-	eant -f nbbuild/build.xml bootstrap || die
-	ANT_OPTS="-Xmx1536m" eant -f nbbuild/javadoctools/build.xml build-javadoc
+	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
 }
 
 src_install() {
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 56a53978d..5855d43d1 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -43,7 +43,7 @@ DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b7
 DIST netbeans-trunk-nightly-201511050002-src.zip 208737487 SHA256 86f4bd2b25363a6893ae9ec91352e93be7d6d707b8d4d0c573ab6634554499c2 SHA512 50d06f779cfdd7bbbffb91844010e93f94339c505e38b3af7a9066bc9f4a35db6dcbc8a9737e436904ea1bc18267e6139656f8dc1a82356d9b48ab442f420ec0 WHIRLPOOL 05c392e0151f0348dd5d51796262f503c312b73a4166b92d24a9598f490da6567e8b76c52ab7cefb957b34e3e0622b3e5cc3888e3a9c6cb88a18a1e917b95314
 DIST netbeans-trunk-nightly-201511080002-src.zip 208751101 SHA256 27523f666ce10cbdfb9a63ada56d1bed5eb90fa62310292320c90506756778f2 SHA512 6c54272c017f421f634d5ecc1682c5121da66b8ebfe1df2559c4458b4885c27c5a59aa31460a2bd020eb721a2074dfb5790d9b3722f05c54c0b821048215bd4a WHIRLPOOL a3c748e2de936ee3ce62ff89849aca180ea2f4008844b8914e9614e06e0ca32c01b7a20adbf51b0292ca0820560e1cbefb24d274b904b5a4c7cfe415060d9a15
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
-EBUILD netbeans-platform-8.1.ebuild 9336 SHA256 da7e8c38fe94016db0895e2a8c1f670e38c2e1de36394d1f326f33caf2d8e758 SHA512 ee7260973cd1f80285556f8de3191969397984557690db24cc7bc847d660ac8707dfa0eb8507c5f0c5b04cb5df3154c1e2dc7abf55114e459bd31d0896a131a1 WHIRLPOOL d76b0b1438cdfdc50a1fb3de31f5e83c57f9aeb6e47d912d2c9402a5a369f440d2ab3fb43d4f724b664ea2282a619546486ef94653149b878d39dcf155c59d05
+EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
 EBUILD netbeans-platform-9999_p20151003.ebuild 9382 SHA256 712a25e3f8b9e514688ef851c975e4577d291be80ea238f104774bec7bd8eb88 SHA512 0ddf1f958cbfdbf9e8500450625df7ab3ef1a452b5272c23e80d38f1c40de246276edd6da3fb3198d8b0a8c7d5e6a375776f99269336e71e87018577f0d24c7c WHIRLPOOL 4616082e1d8f0d97e104d23b49aac0dcf3b28d5d46997031b95533a9779b05f4020fdedbfac0f341e79ff04b78723ae99663aea2a9fd713959ac0f33c1141097
 EBUILD netbeans-platform-9999_p20151004.ebuild 9382 SHA256 9446ced2c5ddcc870d743f425677fe6b2b519c2184251f733a2165497e711e07 SHA512 9acfda937d7b9648040f23b506b05924fbb35848940a1c235bb9df5c819a9ec17c97f99325b29084abe8d15d772ece42b80ab9b1f32a5f54e36aa1bd4621483b WHIRLPOOL e04d50131da498a184297125fffdd9d1faf2b94be34b1d9e2e8866da15a729ae95ece0cfc703a2a6bd107960c21c0aa3ad4ba5a9ac7b3efde06629a19939b171
 EBUILD netbeans-platform-9999_p20151006.ebuild 9382 SHA256 4ceb1ee11888cc1e68ecabd4cab6f9f1f35e5694d12922553680a68a0545d066 SHA512 7e4bbd1197e421430560ed8fd058c41f391b0402e5205f50d589b29cbfcd9626ec6d0470d8e9ea09e56299e0e688e30ca5470652b0b83d6ce3ae0d7d7e896397 WHIRLPOOL 84baf8d6e8de18a6d1887710972298b1dae40056418d4723f3fc0231ad3c6a2e3533b31496a2e42ed3429958b9fee864662ebd3d999a2a18d136cb5c69722787
diff --git a/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
index 89b8b9381..c452bab51 100644
--- a/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
@@ -30,6 +30,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
 CDEPEND="dev-java/hamcrest-core:1.3
 	dev-java/javahelp:0
 	>=dev-java/jna-3.4:0
@@ -38,13 +42,7 @@ CDEPEND="dev-java/hamcrest-core:1.3
 	dev-java/osgi-compendium:0
 	dev-java/swing-layout:1[source]
 	dev-java/testng:0"
-# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
-# the error:
-#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
-#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
-#  [nbmerge] Failed to build target: all-api.html4j
-
-DEPEND="dev-java/oracle-jdk-bin:1.7
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
 	app-arch/unzip
 	${CDEPEND}"
 RDEPEND=">=virtual/jdk-1.7
@@ -57,7 +55,7 @@ EANT_BUILD_TARGET="rebuild-cluster"
 EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
 EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
 JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
 JAVA_PKG_WANT_SOURCE="1.7"
 JAVA_PKG_WANT_TARGET="1.7"