diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog index cd359a0..618a8cd 100644 --- a/dev-java/oracle-jdk-bin/ChangeLog +++ b/dev-java/oracle-jdk-bin/ChangeLog @@ -1,48 +1,255 @@ # ChangeLog for dev-java/oracle-jdk-bin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.48 2013/12/25 13:36:21 grobian Exp $ - 27 Oct 2013; Mario Fetka + 25 Dec 2013; Fabian Groffen oracle-jdk-bin-1.7.0.45.ebuild: - add proper split for domo dir + Add support for Mac OS X, bug #492996 - 26 Oct 2013; Mario Fetka - oracle-jdk-bin-1.7.0.45.ebuild: - use right jdk for the arch + 27 Oct 2013; Tom Wijsman oracle-jdk-bin-1.7.0.45.ebuild: + Bump samples tarball version number; reported by TheMadMan, permitted by ago. -*oracle-jdk-bin-1.7.0.45 (26 Oct 2013) + 19 Oct 2013; Agostino Sarubbo + -oracle-jdk-bin-1.7.0.25.ebuild, -oracle-jdk-bin-1.7.0.40.ebuild: + Remove old - 26 Oct 2013; Mario Fetka - +oracle-jdk-bin-1.7.0.45.ebuild, -oracle-jdk-bin-1.7.0.21.ebuild: - Bump + 19 Oct 2013; Agostino Sarubbo oracle-jdk-bin-1.7.0.45.ebuild: + Stable for x86, wrt bug #488210 - 18 Apr 2013; Mario Fetka - oracle-jdk-bin-1.7.0.21.ebuild: - correct package layout + 19 Oct 2013; Agostino Sarubbo oracle-jdk-bin-1.7.0.45.ebuild: + Stable for amd64, wrt bug #488210 -*oracle-jdk-bin-1.7.0.21 (18 Apr 2013) +*oracle-jdk-bin-1.7.0.45 (16 Oct 2013) - 18 Apr 2013; Mario Fetka - +oracle-jdk-bin-1.7.0.21.ebuild, -oracle-jdk-bin-1.7.0.10.ebuild: - Bump Oracle-jdk-bin + 16 Oct 2013; Tom Wijsman +oracle-jdk-bin-1.7.0.45.ebuild: + Version bump to 1.7.0.45, fixes bug #488174. -*oracle-jdk-bin-1.7.0.10 (20 Feb 2013) + 21 Sep 2013; Agostino Sarubbo oracle-jdk-bin-1.7.0.40.ebuild: + Stable for x86, wrt bug #485528 - 20 Feb 2013; Mario Fetka - +oracle-jdk-bin-1.7.0.10.ebuild, -oracle-jdk-bin-1.7.0.6.ebuild: - Bump + 21 Sep 2013; Agostino Sarubbo oracle-jdk-bin-1.7.0.40.ebuild: + Stable for amd64, wrt bug #485528 - 17 Oct 2012; Mario Fetka - oracle-jdk-bin-1.7.0.6.ebuild: - no Desktop files +*oracle-jdk-bin-1.7.0.40 (11 Sep 2013) - 17 Oct 2012; Mario Fetka - oracle-jdk-bin-1.7.0.6.ebuild: - Dumping a shared archive is not supported on the Server JVM. + 11 Sep 2013; Tom Wijsman +oracle-jdk-bin-1.7.0.40.ebuild: + Version bump to 1.7.0.40, fixes bug #484568; ARM now has soft and hard float + support. -*oracle-jdk-bin-1.7.0.6 (16 Oct 2012) + 29 Jun 2013; Tom Wijsman -oracle-jdk-bin-1.7.0.17.ebuild, + -oracle-jdk-bin-1.7.0.21.ebuild, oracle-jdk-bin-1.7.0.25.ebuild: + Drop old insecure versions; stabilized 1.7.0.25 after building, testing and + running some Java software. Permitted by ago. - 16 Oct 2012; Mario Fetka - +oracle-jdk-bin-1.7.0.6.ebuild, +files/oracle-jdk-bin-1.7.env, + 26 Jun 2013; Andreas Schuerch + oracle-jdk-bin-1.7.0.25.ebuild: + x86 stable, see bug 473980 + +*oracle-jdk-bin-1.7.0.25 (22 Jun 2013) + + 22 Jun 2013; Tom Wijsman +oracle-jdk-bin-1.7.0.25.ebuild, + oracle-jdk-bin-1.7.0.17.ebuild, oracle-jdk-bin-1.7.0.21.ebuild: + Version bump to 1.7.0.25 for security bug #473980 reported by Hypnos, fixes 40 + CVEs. + + 23 Apr 2013; Agostino Sarubbo oracle-jdk-bin-1.7.0.21.ebuild: + Stable for x86, wrt bug #466212 + +*oracle-jdk-bin-1.7.0.21 (17 Apr 2013) + + 17 Apr 2013; Ralph Sennhauser + -oracle-jdk-bin-1.7.0.10.ebuild, -oracle-jdk-bin-1.7.0.15.ebuild, + +oracle-jdk-bin-1.7.0.21.ebuild: + Security bump. #466212 + arm has no server vm. #464974 + + 07 Mar 2013; Agostino Sarubbo oracle-jdk-bin-1.7.0.17.ebuild: + Stable for x86, wrt bug #460360 + +*oracle-jdk-bin-1.7.0.17 (06 Mar 2013) + + 06 Mar 2013; Ralph Sennhauser + -oracle-jdk-bin-1.7.0.13.ebuild, +oracle-jdk-bin-1.7.0.17.ebuild: + Security bump. #460360 + + 24 Feb 2013; Ralph Sennhauser + oracle-jdk-bin-1.7.0.15.ebuild: + Mark stable for x86 wrt #458444 + +*oracle-jdk-bin-1.7.0.15 (20 Feb 2013) + + 20 Feb 2013; Ralph Sennhauser + -oracle-jdk-bin-1.7.0.9.ebuild, -oracle-jdk-bin-1.7.0.11.ebuild, + +oracle-jdk-bin-1.7.0.15.ebuild: + Security bump #458444 + + 14 Feb 2013; Agostino Sarubbo oracle-jdk-bin-1.7.0.13.ebuild: + Stable for x86, wrt bug #455174 + +*oracle-jdk-bin-1.7.0.13 (03 Feb 2013) + + 03 Feb 2013; Ralph Sennhauser + +oracle-jdk-bin-1.7.0.13.ebuild: + Security bump. #455174 + +*oracle-jdk-bin-1.7.0.11 (14 Jan 2013) + + 14 Jan 2013; Ralph Sennhauser + +oracle-jdk-bin-1.7.0.11.ebuild: + Security bump. Arm and all demos missing ... #451206. + +*oracle-jdk-bin-1.7.0.10 (19 Dec 2012) + + 19 Dec 2012; Ralph Sennhauser + -oracle-jdk-bin-1.7.0.5-r1.ebuild, -oracle-jdk-bin-1.7.0.5-r2.ebuild, + -oracle-jdk-bin-1.7.0.6.ebuild, -oracle-jdk-bin-1.7.0.7.ebuild, + +oracle-jdk-bin-1.7.0.10.ebuild: + Version bump. #447248 + Remove vulnerable. + + 23 Oct 2012; Andreas Schuerch + oracle-jdk-bin-1.7.0.9.ebuild: + x86 stable, see bug 438706 + +*oracle-jdk-bin-1.7.0.9 (17 Oct 2012) + + 17 Oct 2012; Ralph Sennhauser + +oracle-jdk-bin-1.7.0.9.ebuild: + Security bump. #438706 + Make ebuild more resistent against Oracles whims. + Use QA_PREBUILT instead of individual variables. + Fix desktop files for newer standard. + + 13 Sep 2012; Pawel Hajdan jr + oracle-jdk-bin-1.7.0.7.ebuild: + x86 stable wrt bug #433094 + + 31 Aug 2012; Vlastimil Babka + oracle-jdk-bin-1.7.0.7.ebuild: + Fix download URL, bug #433553. + +*oracle-jdk-bin-1.7.0.7 (31 Aug 2012) + + 31 Aug 2012; Vlastimil Babka + +oracle-jdk-bin-1.7.0.7.ebuild: + Version bump, security bug #433094. + +*oracle-jdk-bin-1.7.0.6 (19 Aug 2012) + + 19 Aug 2012; Vlastimil Babka + -oracle-jdk-bin-1.7.0.3.ebuild, -oracle-jdk-bin-1.7.0.4.ebuild, + -oracle-jdk-bin-1.7.0.5.ebuild, +oracle-jdk-bin-1.7.0.6.ebuild: + Version bump, bug #431692. Version 1.7.0.5 is no longer officially + available... + +*oracle-jdk-bin-1.7.0.5-r2 (23 Jul 2012) + + 23 Jul 2012; Ralph Sennhauser + +oracle-jdk-bin-1.7.0.5-r2.ebuild, metadata.xml: + Oracle also changed the distfiles of the demos. #427534. + Add fontconfig support. + Use paxctl for pax marking as the fallback won't create the headers. Thanks + to blueness. #427642 + Add BSD license for examples. + + 14 Jul 2012; Jeff Horelick + oracle-jdk-bin-1.7.0.5-r1.ebuild: + marked x86 per bug 421073 + +*oracle-jdk-bin-1.7.0.5-r1 (12 Jul 2012) + + 12 Jul 2012; Vlastimil Babka + +oracle-jdk-bin-1.7.0.5-r1.ebuild: + Revbump because upstream changed contents of the distfiles (not saying what + exactly). You will have to redownload them, sorry. + + 09 Jul 2012; Jeff Horelick oracle-jdk-bin-1.7.0.5.ebuild: + marked x86 per bug 421073 + +*oracle-jdk-bin-1.7.0.5 (14 Jun 2012) + + 14 Jun 2012; Ralph Sennhauser + +oracle-jdk-bin-1.7.0.5.ebuild: + Security bump. #421073 + +*oracle-jdk-bin-1.7.0.4 (05 May 2012) + + 05 May 2012; Ralph Sennhauser + +oracle-jdk-bin-1.7.0.4.ebuild: + Version bump. #414775 + + 05 May 2012; Ralph Sennhauser + oracle-jdk-bin-1.7.0.3.ebuild: + Add QA_FLAGS_IGNORED. #405639 + + 18 Feb 2012; Pawel Hajdan jr + oracle-jdk-bin-1.7.0.3.ebuild: + x86 stable wrt bug #404071 + +*oracle-jdk-bin-1.7.0.3 (16 Feb 2012) + + 16 Feb 2012; Ralph Sennhauser + -oracle-jdk-bin-1.7.0.1-r1.ebuild, -oracle-jdk-bin-1.7.0.1-r2.ebuild, + -oracle-jdk-bin-1.7.0.2.ebuild, +oracle-jdk-bin-1.7.0.3.ebuild: + Security bump. #404071 + Use relative path for desktop file icon. #403139 + Make installation of src.zip optional as for other JDKs. + Unzip is build only dependency. + Remove vulnerable. + + 27 Jan 2012; Ralph Sennhauser + oracle-jdk-bin-1.7.0.2.ebuild: + Add basename to dosym target + + 18 Dec 2011; Ralph Sennhauser + oracle-jdk-bin-1.7.0.2.ebuild: + Fix USE=examples + +*oracle-jdk-bin-1.7.0.2 (18 Dec 2011) + + 18 Dec 2011; Ralph Sennhauser + +oracle-jdk-bin-1.7.0.2.ebuild: + Version bump. #394581 + + 15 Dec 2011; Fabian Groffen + oracle-jdk-bin-1.7.0.1-r2.ebuild: + Add support for Solaris, added Prefix keywords + + 21 Nov 2011; Ralph Sennhauser + oracle-jdk-bin-1.7.0.1-r1.ebuild, oracle-jdk-bin-1.7.0.1-r2.ebuild: + Use java-vm-2.eclass to set PaX markings + +*oracle-jdk-bin-1.7.0.1-r2 (17 Nov 2011) + + 17 Nov 2011; Vlastimil Babka + +oracle-jdk-bin-1.7.0.1-r2.ebuild, files/oracle-jdk-bin-1.7.env: + Revbump to make the LDPATH variable useful for building JNI libraries (as + used by lwjgl) instead of the bogus directories in java.library.path. + + 12 Nov 2011; Ralph Sennhauser -oracle-jdk-bin-1.7.0.ebuild, + -oracle-jdk-bin-1.7.0.1.ebuild: + Remove old/vulnarable + + 12 Nov 2011; Ralph Sennhauser + oracle-jdk-bin-1.7.0.1-r1.ebuild: + Use java-vm_sandbox-predict for installing the controle file + +*oracle-jdk-bin-1.7.0.1-r1 (04 Nov 2011) + + 04 Nov 2011; Vlastimil Babka + +oracle-jdk-bin-1.7.0.1-r1.ebuild: + Revbump to add sandbox.d addpredict file, bug #388127. + +*oracle-jdk-bin-1.7.0.1 (21 Oct 2011) + + 21 Oct 2011; Vlastimil Babka + +oracle-jdk-bin-1.7.0.1.ebuild: + Version bump, security bug #388055. + +*oracle-jdk-bin-1.7.0 (08 Sep 2011) + + 08 Sep 2011; Vlastimil Babka + +oracle-jdk-bin-1.7.0.ebuild, +files/oracle-jdk-bin-1.7.env, +files/fontconfig.Gentoo.properties, +metadata.xml: - change to only support arm + New package, successor of sun-jdk for Java7. Moved from java-experimental + overlay, with many thanks to sera and Serkan. Bug #376779. diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index 300887e..951a740 100644 --- a/dev-java/oracle-jdk-bin/Manifest +++ b/dev-java/oracle-jdk-bin/Manifest @@ -1,10 +1,25 @@ AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6 -AUX oracle-jdk-bin-1.7.env 1000 SHA256 a10be01ee79265a932214698958b3be88404f8ba7fa4a83f7409de795225aa1e SHA512 6d40bebc6f7f2758a87654a1e8f74d02f9cb09b8f4b6e2b270896df1ba7d1740c5c8f4d7fddb48b0ff35c3b8167e1c8ebce8612a93ce4cceb31f0a54b4dcc657 WHIRLPOOL 434d2c219c41481f736276ee511e774a8f2b8de20c1f78a81638a2df8af5d8377782f7b1580dca508cccbd0f68d1951897a752f893560a2b04f9c7f5457b08b8 +AUX oracle-jdk-bin-1.7.env 1000 SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f SHA512 3bab31d62740b959fcf028b94d5db31f682eadff2497dafbd945aed3464a6e5dd6a6ac8b5bb62cb41c901aadefc5314f9b7fb451a46449f5c2fc818d8c88fa6f WHIRLPOOL 74dccbc5c880721d4347b631b3af9368440f20112ac1e70764ff732289c1cef24e6fb4a4a7eb3ca2f5afedab83d6db4dc324c508922de47f8f435048c4884b2a DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac +DIST javafx_samples-2_2_45-linux.zip 21220755 SHA256 85d42e18a81e982164fc49a98856a37ad657aa0dfdae1dd6292d107f8df42def SHA512 547e4ba1b6ff05bc00d20b641724e6294a549ce441e75ca3f9752b7e34e1ee14b54bd0fc7eec279da78e3b19bcca8b8a23ff75f695d63d4354f7e67d3b435923 WHIRLPOOL 3a5e3da3b45bfc3820a4e0c19f7899c7c56529e83a11b48302e7aaf11f5d96fd75d11479f03fc7866c966a75c310011a06fde0b303a6cb0da578d30ca9826efb DIST jdk-7u45-linux-arm-vfp-hflt-demos.tar.gz 10371355 SHA256 b88466c36ef71ab33220d98cc62bc182b238f3df051fe3c33fb685a6ad477d2c SHA512 220086b60d7d574eba762dc15adb753aff5153de4579ce8dae8fe93b657ffed1102280a911baaecd7b572991cd854ba59320c51faa90ee69118253d7a1e0a24b WHIRLPOOL 5ce88519608f166693a601c130ec533ca88424335f02a795a9e4a3911ab7b76fe934fd3d1d12c83d4e3ce4560995dcce918a0388bab15081c98058a38432069a DIST jdk-7u45-linux-arm-vfp-hflt.tar.gz 70954665 SHA256 97d8994f94e891540901271a889539dcb7addc52264b025ee5d4cbcec3e0ad0b SHA512 94ae079d1b2f987bbe412b95660cbaab51722fc58099b8e7c458b804eb4f3e84b716efb3c659fd11c5499535d644171c80566fdc74bea4f09e7fd6a0367997cb WHIRLPOOL 5d521731c31b1bb3c0bcd841b525cb522bf4eb6ba1026dba0b4118f8008887a0858a99ca32dc8b580d7c288164a11a78a1653edbebdc5dbc627599e0f6787194 DIST jdk-7u45-linux-arm-vfp-sflt-demos.tar.gz 10216305 SHA256 bb2f7afc6aee473bfff3c1c2965d77fdf94354d28a1c1fe142fbeec17cc58711 SHA512 31c459e56b4e73a451d109256b0392e94597ec574b1acab9dbabc2f100bdcc5032d1c748f2195cfdbe4eb06d9444f459bedaa4d971792ddb1cde66e9e72ff505 WHIRLPOOL dc96144fe5a39d0324e977750748dd69b97d8ae6a8fc9240f85c6c227663b8f4be2aa8169d0b36ea22117acc0bfc0093eb5c37c3c02620e6fb68f83f0ff54cab DIST jdk-7u45-linux-arm-vfp-sflt.tar.gz 70969771 SHA256 5026a8f2eea8d350ea6ed7cfb8496b571ec9c1e43db82750a3ca8dc02569076e SHA512 c18b9acabd784bc7d34686cc4afaef7fec999c5cc3a8a381f442edda66068d643acd46a004380f0989c2c43ce98c8054db2fad2dbfdc4d7fe0a675f13b201a01 WHIRLPOOL f4dbeeefed2eb898e9d19d897eb929ba55bd45a9ab941946adc9c0bb9d2b032a5f5a2b1d4d7ca1c8905917fecd6d9bc7fa1378826e2b14c6a44b645fedcf1e0a -EBUILD oracle-jdk-bin-1.7.0.45.ebuild 11658 SHA256 386898f1ea536aa97074d5451a51a23bd807d31eb09dc7ce6161fd9367867211 SHA512 1a0a55253c97a78d4528279da08e0a3c59fdcd9cf6a39b55cdc7d2df29766c9850b931d4512162a9c491f891656014dd54790ccd5653be5fb37772b3d79d3fc0 WHIRLPOOL d1da00b0d6850244fa3ba4052eff9282b8ba22e103ffccb7ceb9c4d3369d23b212fe7e788b4096858cd7469cd1cfa581ef6054177c8b7cefdc1e62f51364e0d7 -MISC ChangeLog 1473 SHA256 5bb13060e812e81cb53b2fdcbd5c00a9a1d623dc9701c0e9bb48aa5ebff860c1 SHA512 6107287e375088655bebb350672d5645264f7203b08a4c269cd8e53cba8e9aa11dc2efeab530cad267fa995103ee6bc8ae3a182b9d84af626a6ad0c0b4afc273 WHIRLPOOL 3da86001e9dae748647695b8801c0028eed858023e5c37706bec8da08143be8c3972c7f140044be0774a88f25cfd43bab7c375ef80a6d34e115d56e4e8e032ff +DIST jdk-7u45-linux-i586-demos.tar.gz 17379832 SHA256 193c9c26c905abc4c156e9be5e420bc6ad8d7f45b9be508836b47ad4d5a3a729 SHA512 307efadb02e198cc3ab08b692510004d50ae93acc0db81e4d899bc864942845e14a5cacf8032aee9b31dd1762378f813f5eee7f64995c741a5564e4e8ee1fd87 WHIRLPOOL 84012800456f5882656ee487c4cad23e0a0c7d14565c2220c161a73b1180b45b74fcb990488b96f6186378e3df7b5b7767351ce67f59fc68544de163970f42e8 +DIST jdk-7u45-linux-i586.tar.gz 139360512 SHA256 4acbdc25d0acad7c765b65c13cda44150200c33507bfe8b5ce6cabcab3e016e0 SHA512 7a1f92191c2ec3a3a27ec578ad9e161db449130b85afa81d69d1b92cb41f07cb7adfc8c7e1b45c9559e77a4ef73144aaaa4847a13585efc608c456403350825e WHIRLPOOL 010211276c53e04064a5e4b7451845acb990a5c429fa04c2c104989bebb66ff9af0b2065560de2c59d29661ea80af3e0d2e8e351f2e24ea0ff71adc755257870 +DIST jdk-7u45-linux-x64-demos.tar.gz 17450505 SHA256 98c8da0b8508958b7480744b46a137c7aa1a92a571bdab3075872d366c0797fc SHA512 b0f9d2143a1ccc20ad94226da0210595627895ea9df42306374b866793c8ca2c63f11118b48a290afc650d57fb4b6b6b29b15bbb475796578f332b5b18473a66 WHIRLPOOL ce40f67eabef4cce0babab315348ffdc0f88e56fcc599804aa91b9a9a1a9a45d1544ee100ede9564a7745c0ded4c741e14f6903d4dda0465fb3ce6295687f6af +DIST jdk-7u45-linux-x64.tar.gz 138094686 SHA256 f2eae4d81c69dfa79d02466d1cb34db2b628815731ffc36e9b98f96f46f94b1a SHA512 fe524d8b369cc26960e657db7e8bcb14c23e54f9a2078c2da49b74bf7dc8b4126d23e5dfeaddb61e549542a8f24ced93842358f6a8548b39795099b809f420f9 WHIRLPOOL c9a25ff2c470e98a24b10ef8c49e02bd7d2deb90adf99bef9039510c4a8349e577203089d3ca88f9f72f06a4f920a7f2802b7820a4a42e5b23f1c4bf4bc4be6a +DIST jdk-7u45-macosx-x64.dmg 192766805 SHA256 841c4700ca55d199f7ad90fdb487a81ee59d77dabbb14f6e40f9d3bec7a34824 SHA512 50de7692aff17d141662e069288861533a34827405c0193d0b7340b74222a57ed50cafae1e34a4695fff767ec684535d67b580fbb0c1983adb8dbe8f22e8fb6e WHIRLPOOL c38429779fcc1d465702078c3dcc8c2226d033379c84f1d7c37e1554afeef5a7de14556ec4db5f579b1342d3720837cbd04dbd39ca3cc9497743f691b650687c +DIST jdk-7u45-macosx-x86_64-demos.tar.gz 16042987 SHA256 77fc302983b8988a74545ac58aa4b4c419a791a29c3689c73e1e0d46f5ac97b6 SHA512 a8369bf2b6a370e195baf623001d91da200aa39d941a0bdfe4acad9b6bbaf85805ce5559a58a92b17fa5a08283bfe101312946fc0b9c0428944a15ce910281b5 WHIRLPOOL 690be16754b11f0cc622463ef994ba1a8d044d964b09d408592afef53b47fa37b5fb9515e64cbd312a6f06d5827b3d2a92823f98b94263cbd1b9e6b5130407fe +DIST jdk-7u45-solaris-i586-demos.tar.gz 16739928 SHA256 6088624a971c01ed218ae18d62f8f7c6e90f25593dbbf47e44e762803ab5d6d1 SHA512 8f615dc9df482dcab57b1da59c3badeda928c31feb611ebc2ac051665d13f242bbc40ead7948e8bca79e0d7e405f6784e48f6fb6e6fb82a6f78f1be3522a82cd WHIRLPOOL 3b620dedadc56d9d361690b9ed6f60f4ce46cd971c5df667a3105384d9bfed01417b5366f914ccd64974b671394b99a2457144b86f9599ed696817cb7ff56938 +DIST jdk-7u45-solaris-i586.tar.gz 99635203 SHA256 6e42252e60a4408aaf99bc9286f56c44f4b53f218b54da1b0161836cd52c6319 SHA512 00c4288344cd40d9d140e5b70d1da001cdc5a2980b91dfbdee5fc58f5af5fc38f79eb0fb6f44a2b9ed6ab79b7d0755ca00501c2af28a7a6a53e8be2ed1c9622f WHIRLPOOL c375e0106a140dbb8bc6cd912a31e48af0ef5930a465e914b938067ea279727c6ee5ea31b9f5497342551002e530170e2b4c41cdedeeca648531564ae117770c +DIST jdk-7u45-solaris-sparc-demos.tar.gz 16770744 SHA256 8825e475e3d245b1d73f4000b961bc1f2a969db8d54d42bb4d315caa29688c7b SHA512 1204daee2dba3fb9d9cfbaa15f7f6afda8e8cbbd2e9d00dc262a4dcd843140aaef366cbc9b5ab53dcf0e2a47deea985bdf7c493b95f5c77d823fd2ff5a18d155 WHIRLPOOL f6dcc3eee6095497efbb0a5b1f92d2a803ae491d713cad92749a6d79014037a9573c518968b9e248c6900e12a5d2496cbedfaa0971b5b71c3b70e0534a1215f8 +DIST jdk-7u45-solaris-sparc.tar.gz 102943380 SHA256 26c8b7e3166cfd8feb354659985dd09080f961574d5e11f2d0839e581c8288b8 SHA512 4c706b979009db0d3a3abf068678ca2655f803c41891b50930af258daed2a628b13809e8752e43940e11d993806f9b9efb907b709979260fd7831558faaa3bba WHIRLPOOL 874a07f42be9c886e5d3f548635b226d159847adec47ecb78776ba489d8e13809a08209dd108486157409b4f9e653b825d8e7aa37be3098bea7e44fc127ad7e8 +DIST jdk-7u45-solaris-sparcv9-demos.tar.gz 905609 SHA256 81032b71f1ad80e87c82ffea37a8272d0a174f0ed3aa514ca686f9a04116944e SHA512 a602a93f76ef892fe4f1f634b514adf6e1abcee8edddfce4e7ceeca64d48f979fcff2043e522ba3275de3821fd0f2102b7cd76a884120c1e3f9fa787c2b4777f WHIRLPOOL 8b9f34f62d30903700112716a3b3a028428b0f2b081835986d1f674c9c0cf9b8d9747f58ce4025acc36047e27d768fc7face5deb2431e7f85a2266dea4c5513a +DIST jdk-7u45-solaris-sparcv9.tar.gz 19145011 SHA256 db249eaa309e253b7f42966690a2c2489ffe7c56754931dec8e2f610d4e5e425 SHA512 3c54a98f92155b57bfdfaa2c8aa329e2f2f7085b9967d830f430983f61d6b774a3335619cf83a79f1a530388615661e70425f8d69f9f964e7b0e7593c4c1725e WHIRLPOOL 6fb7892047d4be97a4df9233019df83ffe67156a0c5b092841c315d5b66ad81eab0f66391c16634fc093f7756eda37df687dbe98283a11feadb49b9f1a8a8cfc +DIST jdk-7u45-solaris-x64-demos.tar.gz 864994 SHA256 303da56d863604d989cef60ceb896e569484dcdae8cd41b443ef5ef74f1fe97c SHA512 642571d753952a4058d69b358a4ec156a37aebf5045242c7a7150fbf85ad4280b263b3caf8df21795f81c282384d0ab047dc7cac17d22145f40dc5682dc91974 WHIRLPOOL 031d47e4fb9b7a68cf5ea1eb7d3c346f6ff214fe728ce2aa44e58d89943545d9012ceaba5bd4cb29394eda4f80ad6c0b1d52f32a2b3f4ca60923f30887d31ebf +DIST jdk-7u45-solaris-x64.tar.gz 17020495 SHA256 fc221d822ab835e94e2ac5749a46f4669971b4cce69df199044858da51ff202d SHA512 ad6ef58f5fbc6e9003812ca6e628c97796de9d7c97afb81d998a87eab7e86618f63d40cff2686eac4f305ec5e57326a53557c1853883b77ad7bbb10be5225b1e WHIRLPOOL c16d7a00c99e63f88a6d34fe29cc446a5383ca6eb91d376c14a42daa6a7f6b508726e2562dd3a875b2f7910652b5d192ee4b13045bb466d078609ea883ce250b +EBUILD oracle-jdk-bin-1.7.0.45.ebuild 10551 SHA256 0de102727fb8f3f7af3084857d6279e3d011733ad83cce3a05b59611c0e69e59 SHA512 5c765163bde9ae9c7eea5f64a9084c27d296382836afe1d7cf0cb7c0185c90add8375f75c0e346512b613eb00aaccad5fa3f1b0547dd99f2975513c4d971f2a6 WHIRLPOOL be5b03eae047c8f39a72653e69f1d086942a2b95246280108086d7ad63e1f98840e66a8ee63342a0a38b1634dc340f5d5819a0700c2a7cd7eee68542053be843 +MISC ChangeLog 8785 SHA256 e2fc16832ec4fc62c7796480576e6837101cafb1cdbcb19e7f22b64ef3a68da7 SHA512 20bdc53bb057c98b3c1e2dc7baabd152aedb706e7aeb6d6fdf25f5fc4ee4f10c7fc42c9bd4cb9ca5ce554b726828b79dfcef85dcdfca1378182249f521fff2de WHIRLPOOL c8fd05be51095d030d5e67a07c747b5775812c1bdec1bf144edd24c38ad0416e8c6181e42abb4b14f784f020d720ed8dd1e003714f4c55b602a739ca940f5e1b MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env index 13b671c..4b4091b 100644 --- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env +++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env,v 1.2 2011/11/17 22:49:56 caster Exp $ diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.45.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.45.ebuild index 395033a..3d4d6c1 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.45.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.45.ebuild @@ -1,57 +1,79 @@ # Copyright 1999-2013 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.6.ebuild,v 1.1 2012/08/19 17:59:31 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.45.ebuild,v 1.5 2013/12/25 13:36:20 grobian Exp $ -EAPI="4" +EAPI="5" -inherit java-vm-2 eutils prefix versionator +inherit eutils java-vm-2 prefix versionator # This URIs need to be updated when bumping! -JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1637583.html" +JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html" JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" +# This is a list of archs supported by this update. +# Currently arm comes and goes. +AT_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) +# Sometimes some or all of the demos are missing, this is to not have to rewrite half +# the ebuild when it happens. +DEMOS_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos ) +FX_VERSION="2_2_45" -UPDATE="$(get_version_component_range 4)" -MY_PV="$(get_version_component_range 2)u${UPDATE}" -S_PV="$(get_version_component_range 1-3)_${UPDATE}" +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" -SUFFIX=".tar.gz" -ARMV5_AT="jdk-${MY_PV}-linux-arm-vfp-sflt${SUFFIX}" -ARMV6_SF_AT="jdk-${MY_PV}-linux-arm-vfp-sflt${SUFFIX}" -ARMV6_HF_AT="jdk-${MY_PV}-linux-arm-vfp-hflt${SUFFIX}" -ARMV7_SF_AT="jdk-${MY_PV}-linux-arm-vfp-sflt${SUFFIX}" -ARMV7_HF_AT="jdk-${MY_PV}-linux-arm-vfp-hflt${SUFFIX}" +AT_x86="jdk-${MY_PV}-linux-i586.tar.gz" +AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz" +AT_arm="jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz" +AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz" +AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz" +AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz" +AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz" +AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg" +AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg" -ARMV5_DEMO="jdk-${MY_PV}-linux-arm-vfp-sflt-demos${SUFFIX}" -ARMV6_SF_DEMO="jdk-${MY_PV}-linux-arm-vfp-sflt-demos${SUFFIX}" -ARMV6_HF_DEMO="jdk-${MY_PV}-linux-arm-vfp-hflt-demos${SUFFIX}" -ARMV7_SF_DEMO="jdk-${MY_PV}-linux-arm-vfp-sflt-demos${SUFFIX}" -ARMV7_HF_DEMO="jdk-${MY_PV}-linux-arm-vfp-hflt-demos${SUFFIX}" +FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip" + +DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz" +DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz" +DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz" +DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz" +DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz" +DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz" +DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz" +DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz" +DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz" JCE_DIR="UnlimitedJCEPolicy" JCE_FILE="${JCE_DIR}JDK7.zip" DESCRIPTION="Oracle's Java SE Development Kit" HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -SRC_URI=" - arm? ( ${ARMV5_AT} ${ARMV6_SF_AT} ${ARMV7_SF_AT} ${ARMV6_HF_AT} ${ARMV7_HF_AT} - examples? ( ${ARMV5_DEMO} ${ARMV6_SF_DEMO} ${ARMV7_SF_DEMO} ${ARMV6_HF_DEMO} ${ARMV7_HF_DEMO} ) ) - jce? ( ${JCE_FILE} )" +for d in "${AT_AVAILABLE[@]}"; do + SRC_URI+=" ${d}? (" + SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")" + if has ${d} "${DEMOS_AVAILABLE[@]}"; then + SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )" + fi + SRC_URI+=" )" +done +unset d +SRC_URI+=" jce? ( ${JCE_FILE} )" LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" SLOT="1.7" -KEYWORDS="~arm" +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 derby doc examples +fontconfig jce nsplugin pax_kernel +source" RESTRICT="fetch strip" +QA_PREBUILT="*" RDEPEND=" - X? ( + X? ( !aqua? ( + x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst - x11-libs/libX11 - ) + ) ) alsa? ( media-libs/alsa-lib ) doc? ( dev-java/java-sdk-docs:1.7 ) fontconfig? ( media-libs/fontconfig ) @@ -60,76 +82,86 @@ RDEPEND=" # marking. #427642 DEPEND=" jce? ( app-arch/unzip ) + examples? ( kernel_linux? ( app-arch/unzip ) ) pax_kernel? ( sys-apps/paxctl )" -S="${WORKDIR}/jdk${S_PV}" +S="${WORKDIR}"/jdk${S_PV} + +check_tarballs_available() { + local uri=$1; shift + local dl= unavailable= + for dl in "${@}"; do + [[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}" + done + + if [[ -n "${unavailable}" ]]; then + if [[ -z ${_check_tarballs_available_once} ]]; then + einfo + einfo "Oracle requires you to download the needed files manually after" + einfo "accepting their license through a javascript capable web browser." + einfo + _check_tarballs_available_once=1 + fi + einfo "Download the following files:" + for dl in ${unavailable}; do + einfo " ${dl}" + done + einfo "at '${uri}'" + einfo "and move them to '${DISTDIR}'" + einfo + fi +} pkg_nofetch() { - if use arm; then - AT="${ARMV5_AT} ${ARMV6_SF_AT} ${ARMV7_SF_AT} ${ARMV6_HF_AT} ${ARMV7_HF_AT}" + local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") ) + if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then + distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") ) fi + check_tarballs_available "${JDK_URI}" "${distfiles[@]}" - if use arm; then - DEMOS="${ARMV5_DEMO} ${ARMV6_SF_DEMO} ${ARMV7_SF_DEMO} ${ARMV6_HF_DEMO} ${ARMV7_HF_DEMO}" - fi - - einfo "Please download ${AT} from:" - einfo "${JDK_URI}" - einfo "and move it to ${DISTDIR}" - - if use examples; then - einfo "Also download ${DEMOS} from:" - einfo "${JDK_URI}" - einfo "and move it to ${DISTDIR}" - fi - - if use jce; then - einfo "Also download ${JCE_FILE} from:" - einfo "${JCE_URI}" - einfo "and move it to ${DISTDIR}" - fi + use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}" } - src_unpack() { - einfo "Unpacking for arch ${CHOST/-*/}" - - if [[ ${CHOST/-*/} = "armv5tel" ]]; then - unpack ${ARMV5_AT} - if use examples; then - unpack ${ARMV5_DEMO} - fi - elif [[ ${CHOST/-*/} = "armv6j" ]]; then - if [[ ${CHOST} = *hardfloat* ]]; then - unpack ${ARMV6_HF_AT} - if use examples; then - unpack ${ARMV6_HF_DEMO} + # Special case for ARM soft VS hard float. + if use arm ; then + if [[ ${CHOST} = armv5* ]]; then + unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz + use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz + elif [[ ${CHOST} = armv6* ]]; then + if [[ ${CHOST} == *-hardfloat-* ]] ; then + unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz + use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz + else + unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz + use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz fi - else - unpack ${ARMV6_SF_AT} - if use examples; then - unpack ${ARMV6_SF_DEMO} + elif [[ ${CHOST} = armv7* ]]; then + if [[ ${CHOST} == *-hardfloat-* ]] ; then + unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz + use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz + else + unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz + use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz fi fi - elif [[ ${CHOST/-*/} = "armv7a" ]]; then - if [[ ${CHOST} = *hardfloat* ]]; then - unpack ${ARMV7_HF_AT} - if use examples; then - unpack ${ARMV7_HF_DEMO} - fi - else - unpack ${ARMV7_SF_AT} - if use examples; then - unpack ${ARMV7_SF_DEMO} - fi - fi - fi - if use jce; then - unpack ${JCE_FILE} + use examples && unpack javafx_samples-${FX_VERSION}-linux.zip + use jce && unpack ${JCE_FILE} + elif use x86-macos || use x64-macos ; then + pushd "${T}" > /dev/null + mkdir dmgmount + hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ + -mountpoint "${T}"/dmgmount + xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg + hdiutil detach "${T}"/dmgmount + zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv + mv Contents/Home "${S}" + popd > /dev/null + else + default fi } - src_prepare() { if use jce; then mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die @@ -142,10 +174,18 @@ src_compile() { # see bug #207282 einfo "Creating the Class Data Sharing archives" - if use arm; then - bin/java -client -Xshare:dump || die - fi - # bin/java -server -Xshare:dump || die + case ${ARCH} in + arm|ia64) + bin/java -client -Xshare:dump || die + ;; + x86) + bin/java -client -Xshare:dump || die + bin/java -server -Xshare:dump || die + ;; + *) + bin/java -server -Xshare:dump || die + ;; + esac # Create files used as storage for system preferences. mkdir jre/.systemPrefs || die @@ -159,19 +199,22 @@ src_install() { # We should not need the ancient plugin for Firefox 2 anymore, plus it has # writable executable segments - if use arm; then - rm -vf {,jre/}lib/arm/libjavaplugin_oji.so \ - {,jre/}lib/arm/libjavaplugin_nscp*.so - rm -vrf jre/plugin/arm + if use x86; then + rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ + {,jre/}lib/i386/libjavaplugin_nscp*.so + rm -vrf jre/plugin/i386 fi # Without nsplugin flag, also remove the new plugin local arch=${ARCH}; - use arm && arch=arm; + use x86 && arch=i386; if ! use nsplugin; then rm -vf {,jre/}lib/${arch}/libnpjp2.so \ {,jre/}lib/${arch}/libjavaplugin_jni.so fi + dodoc COPYRIGHT + dohtml README.html + dodir "${dest}" cp -pPR bin include jre lib man "${ddest}" || die @@ -179,16 +222,14 @@ src_install() { cp -pPR db "${ddest}" || die fi - if use examples; then + if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then cp -pPR demo sample "${ddest}" || die + if use kernel_linux; then + cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \ + "${ddest}"/javafx-samples || die + fi fi - # Remove empty dirs we might have copied - find "${D}" -type d -empty -exec rmdir {} + || die - - dodoc COPYRIGHT - dohtml README.html - if use jce; then dodir "${dest}"/jre/lib/security/strong-jce mv "${ddest}"/jre/lib/security/US_export_policy.jar \ @@ -209,17 +250,22 @@ src_install() { cp src.zip "${ddest}" || die fi - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. - # make_desktop_entry can't be used as ${P} would end up in filename. - #newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - # sun-jcontrol-${PN}-${SLOT}.png || die - #sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ - # -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - # -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \ - # jre/lib/desktop/applications/sun_java.desktop > \ - # "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - #domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + if use !x86-macos && use !x64-macos ; then + # Install desktop file for the Java Control Panel. + # Using ${PN}-${SLOT} to prevent file collision with jre and or + # other slots. make_desktop_entry can't be used as ${P} would + # end up in filename. + newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ + sun-jcontrol-${PN}-${SLOT}.png || die + sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ + -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ + -e "s#Application;##" \ + -e "/Encoding/d" \ + jre/lib/desktop/applications/sun_java.desktop \ + > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die + domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + fi # Prune all fontconfig files so libfontconfig will be used and only install # a Gentoo specific one if fontconfig is disabled. @@ -232,130 +278,36 @@ src_install() { doins "${T}"/fontconfig.properties fi + # Remove empty dirs we might have copied + find "${D}" -type d -empty -exec rmdir -v {} + || die + + if use x86-macos || use x64-macos ; then + # fix misc install_name issues + pushd "${ddest}"/jre/lib > /dev/null || die + local lib needed nlib npath + for lib in \ + libJObjC libdecora-sse libglass libjavafx-{font,iio} \ + libjfxmedia libjfxwebkit libprism-es2 ; + do + lib=${lib}.dylib + einfo "Fixing self-reference of ${lib}" + install_name_tool \ + -id "${EPREFIX}${dest}/jre/lib/${lib}" \ + "${lib}" + done + popd > /dev/null + for nlib in jdk1{5,6} ; do + install_name_tool -change \ + /usr/lib/libgcc_s_ppc64.1.dylib \ + $($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.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 + set_java_env java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter } - -QA_TEXTRELS_arm=" - opt/${P}/jre/lib/arm/client/libjvm.so - opt/${P}/jre/lib/arm/server/libjvm.so" -QA_FLAGS_IGNORED=" - /opt/${P}/bin/appletviewer - /opt/${P}/bin/apt - /opt/${P}/bin/extcheck - /opt/${P}/bin/idlj - /opt/${P}/bin/jar - /opt/${P}/bin/jarsigner - /opt/${P}/bin/java - /opt/${P}/bin/javac - /opt/${P}/bin/javadoc - /opt/${P}/bin/javah - /opt/${P}/bin/javap - /opt/${P}/bin/javaws - /opt/${P}/bin/jcmd - /opt/${P}/bin/jconsole - /opt/${P}/bin/jdb - /opt/${P}/bin/jhat - /opt/${P}/bin/jinfo - /opt/${P}/bin/jmap - /opt/${P}/bin/jps - /opt/${P}/bin/jrunscript - /opt/${P}/bin/jsadebugd - /opt/${P}/bin/jstack - /opt/${P}/bin/jstat - /opt/${P}/bin/jstatd - /opt/${P}/bin/keytool - /opt/${P}/bin/native2ascii - /opt/${P}/bin/orbd - /opt/${P}/bin/pack200 - /opt/${P}/bin/policytool - /opt/${P}/bin/rmic - /opt/${P}/bin/rmid - /opt/${P}/bin/rmiregistry - /opt/${P}/bin/schemagen - /opt/${P}/bin/serialver - /opt/${P}/bin/servertool - /opt/${P}/bin/tnameserv - /opt/${P}/bin/unpack200 - /opt/${P}/bin/wsgen - /opt/${P}/bin/wsimport - /opt/${P}/bin/xjc - /opt/${P}/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so - /opt/${P}/demo/jvmti/gctest/lib/libgctest.so - /opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so - /opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so - /opt/${P}/demo/jvmti/hprof/lib/libhprof.so - /opt/${P}/demo/jvmti/minst/lib/libminst.so - /opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so - /opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so - /opt/${P}/demo/jvmti/waiters/lib/libwaiters.so - /opt/${P}/jre/bin/java - /opt/${P}/jre/bin/java_vm - /opt/${P}/jre/bin/javaws - /opt/${P}/jre/bin/keytool - /opt/${P}/jre/bin/orbd - /opt/${P}/jre/bin/pack200 - /opt/${P}/jre/bin/policytool - /opt/${P}/jre/bin/rmid - /opt/${P}/jre/bin/rmiregistry - /opt/${P}/jre/bin/servertool - /opt/${P}/jre/bin/tnameserv - /opt/${P}/jre/bin/unpack200 - /opt/${P}/jre/lib/jexec - /opt/${P}/lib/jexec - /opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so - /opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so" -for java_system_arch in amd64 arm; do - QA_FLAGS_IGNORED+=" - /opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so - /opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so - /opt/${P}/jre/lib/${java_system_arch}/libattach.so - /opt/${P}/jre/lib/${java_system_arch}/libawt.so - /opt/${P}/jre/lib/${java_system_arch}/libcmm.so - /opt/${P}/jre/lib/${java_system_arch}/libdcpr.so - /opt/${P}/jre/lib/${java_system_arch}/libdeploy.so - /opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so - /opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so - /opt/${P}/jre/lib/${java_system_arch}/libhprof.so - /opt/${P}/jre/lib/${java_system_arch}/libinstrument.so - /opt/${P}/jre/lib/${java_system_arch}/libioser12.so - /opt/${P}/jre/lib/${java_system_arch}/libj2gss.so - /opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so - /opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so - /opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so - /opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so - /opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so - /opt/${P}/jre/lib/${java_system_arch}/libjava.so - /opt/${P}/jre/lib/${java_system_arch}/libjawt.so - /opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so - /opt/${P}/jre/lib/${java_system_arch}/libjdwp.so - /opt/${P}/jre/lib/${java_system_arch}/libjfr.so - /opt/${P}/jre/lib/${java_system_arch}/libjpeg.so - /opt/${P}/jre/lib/${java_system_arch}/libjsdt.so - /opt/${P}/jre/lib/${java_system_arch}/libjsig.so - /opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so - /opt/${P}/jre/lib/${java_system_arch}/libjsound.so - /opt/${P}/jre/lib/${java_system_arch}/libkcms.so - /opt/${P}/jre/lib/${java_system_arch}/libmanagement.so - /opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so - /opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so - /opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so - /opt/${P}/jre/lib/${java_system_arch}/libnet.so - /opt/${P}/jre/lib/${java_system_arch}/libnio.so - /opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so - /opt/${P}/jre/lib/${java_system_arch}/libnpt.so - /opt/${P}/jre/lib/${java_system_arch}/librmi.so - /opt/${P}/jre/lib/${java_system_arch}/libsaproc.so - /opt/${P}/jre/lib/${java_system_arch}/libsctp.so - /opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so - /opt/${P}/jre/lib/${java_system_arch}/libsunec.so - /opt/${P}/jre/lib/${java_system_arch}/libt2k.so - /opt/${P}/jre/lib/${java_system_arch}/libunpack.so - /opt/${P}/jre/lib/${java_system_arch}/libverify.so - /opt/${P}/jre/lib/${java_system_arch}/libzip.so - /opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so - /opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so - /opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so - /opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so" -done diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest index 1cdacc1..68f25bc 100644 --- a/dev-java/oracle-jre-bin/Manifest +++ b/dev-java/oracle-jre-bin/Manifest @@ -7,6 +7,6 @@ DIST ejre-7u45-fcs-b15-linux-arm-vfp-hflt-client_headless-26_sep_2013.tar.gz 330 DIST ejre-7u45-fcs-b15-linux-arm-vfp-sflt-client_headful-26_sep_2013.tar.gz 36281417 SHA256 58e73027d7a449fb76c361e6feb496442e591d5eb282c2cfbfd8720d0df15371 SHA512 643e16770c05fed2d88f56f1b01c02e59b4e28a3317400382adccc1152fab08f9c734cff57e142089e72f31dbbd3b81100d5d3b1edf7f465a3b71c0fb196bc4d WHIRLPOOL a47f34e243d565b02d469b8da844a270b21e86aa306670139f36e094c9022329111331d9d8ce4f71c927ecf055847516f5746c21c958e51ee3f7d253bfde1967 DIST ejre-7u45-fcs-b15-linux-arm-vfp-sflt-client_headless-26_sep_2013.tar.gz 33172360 SHA256 f3a8bdbb77af38462492ca58cf6d32407ef33b5098c41a297e86e51e3e77f64d SHA512 f11bca20e9a496024604bbb9541ceb930a85bdaae4c216ab571e55b9679b974255a2316561b431b3f5d8a7f53fda00eae781664651385c1b5308b499ddfc229c WHIRLPOOL 46c6434f95a47e7d71f4105a8545e852357439f408de56f72888345e19be431d8d2c3a4dde91c0d3bf2b859de2ea3705ceaacf0dc284756bc639b5bc008e4c2f DIST ejre-7u45-fcs-b15-linux-i586-headless-26_sep_2013.tar.gz 33111288 SHA256 a8ff26dec2227f04070ba519606412c13fcf2d7f6ab6d92a1152394562f3225e SHA512 10ba9b204ea1a09a6b98a2e7b6bfc3eef27ca0970fa77e125ebf1f79059b24c6bf884a5ebdca65dd56c85d971db34585a1a3dffc36cf6cf5b1a71f997c51cb49 WHIRLPOOL c5e5c19eb9dd1ad3972a94a69a2f8254f0191057b74c0623b28e4e9e3da2458742d26bf19895317534983289bd5aa5bf6d5e9b866c6e428204ed46039816daf7 -EBUILD oracle-jre-bin-1.7.0.45.ebuild 6027 SHA256 1c641236623745127f30078c7c85be8b943f1e495a0c9f08cc89540010d9aea0 SHA512 14c605c4deff7e7893090b1f613f3fca740a989baa9b02ddacda2b5dc6397c9cf330bc917d396eb004c01db28381e78fc98bf67a21f7c33bc48394632f5ea928 WHIRLPOOL 3834b3a4a1e2986ff5d5b443bc01ad2ae14ecde28e2069652a05f093ced4dd59133c68d2f5c4c5302de09953c6d0acdac42a369a0f08f93d5fd9f9887cfc7dbc +EBUILD oracle-jre-bin-1.7.0.45.ebuild 4825 SHA256 e4900f994d67aede9fb2f05a437ad7c9e6e8b4522b3592b4aed3f1476c32cc66 SHA512 a6f8183de4b3eb3db652216a627f1a274edbbbcb07e1fbd33b34162f1244c99b6af9abc0710dffd3b8edc3532844d4e31d0a88de8ceeac2a447fa56131ecc87d WHIRLPOOL c6d55d528241277eceeadc2cf049ce7497f707972caf93ddeac3e33cfc186ff7aa6f79cd51116945988adf91ed78691e9280c516c49686955b253fc40e171a51 MISC ChangeLog 3013 SHA256 4537af0201e0c7422874032457fc86891c3cfabf95cb830f9343e7eae63781f8 SHA512 a6856baa6a4801562f9ddc229af43eb3f4b3ed80267c6340bd771b0465e3b90a6e74577790708bc276d2af305d56422eacc594feccec4f66a61432e88a8d164e WHIRLPOOL fc458d30654fd6777b3cd194be63e308568c55f3e774fca2f81ba7d9be864a80cdb694c46b9c7728e75b3cf4a5e616970ba7f257f354392a808c10dc9a5d54a9 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.45.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.45.ebuild index bf1c720..f0b919c 100644 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.45.ebuild +++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.45.ebuild @@ -36,7 +36,7 @@ SRC_URI=" LICENSE="Oracle-BCLA-JavaSE" SLOT="1.7" KEYWORDS="arm x86" -IUSE="X alsa fontconfig jce nsplugin pax_kernel" +IUSE="X alsa fontconfig jce pax_kernel" RESTRICT="fetch strip" QA_PREBUILT="*" @@ -119,7 +119,6 @@ src_compile() { ;; x86) bin/java -client -Xshare:dump || die - bin/java -server -Xshare:dump || die ;; *) bin/java -server -Xshare:dump || die @@ -136,28 +135,13 @@ 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 - if use x86; then - rm -vf lib/i386/libjavaplugin_oji.so \ - lib/i386/libjavaplugin_nscp*.so - rm -vrf plugin/i386 - fi - # Without nsplugin flag, also remove the new plugin - local arch=${ARCH}; - use x86 && arch=i386; - if ! use nsplugin; then - rm -vf lib/${arch}/libnpjp2.so \ - lib/${arch}/libjavaplugin_jni.so - fi - dodir "${dest}" - cp -pPR bin lib man "${ddest}" || die + cp -pPR bin lib "${ddest}" || die # Remove empty dirs we might have copied find "${D}" -type d -empty -exec rmdir -v {} + || die - dodoc COPYRIGHT README + dodoc COPYRIGHT README THIRDPARTYLICENSEREADME.txt if use jce; then dodir ${dest}/lib/security/strong-jce @@ -171,24 +155,6 @@ src_install() { "${dest}"/lib/security/local_policy.jar fi - if use nsplugin; then - install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so - fi - - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. - # make_desktop_entry can't be used as ${P} would end up in filename. - newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - lib/desktop/applications/sun_java.desktop > \ - "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - # Prune all fontconfig files so libfontconfig will be used and only install # a Gentoo specific one if fontconfig is disabled. # http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html