Install JavaFX sources as well as JVM sources. Document source USE flag. Fix

bug 544478.

Signed-off-by: monsieurp@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x93491BB8

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index d6b5a5188948476b44e331eb02ba133bfad9c156..22c85cb8d63f920ba5653cbe75a80d3cf3bab0b2 100644 (file)
--- 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.88 2015/03/03 23:46:58 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.89 2015/03/26 15:52:34 monsieurp Exp $
+
+  26 Mar 2015; Patrice Clement <monsieurp@gentoo.org> metadata.xml,
+  oracle-jdk-bin-1.8.0.40.ebuild:
+  Install JavaFX sources as well as JVM sources. Document source USE flag. Fix
+  bug 544478.
 
 *oracle-jdk-bin-1.8.0.40 (03 Mar 2015)
 

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 75ff69274166527db18bea6ffb8bdfa200f426fc..81746a922d1900a94642ac91bb959daa2df241ff 100644 (file)
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -52,25 +52,17 @@ DIST jdk-8u40-solaris-x64-demos.tar.gz 9737226 SHA256 8240f6e2816dcf3e7669fe3134
 DIST jdk-8u40-solaris-x64.tar.gz 94276101 SHA256 d84da462b1214947038336e967371e3a818ef30f2e2c5ae35600c5803862712d SHA512 84a98a89343beeaab6d5f4985cbeeb57443a7b7cccd936b40350ecd9a1334a14bcd06f6a67df172406e76efdea5236986bec38833350a8547e15e14926370b4c WHIRLPOOL 5b3656cded7616f8b6a11c04447fd503ba48752866313d1fbf0824c14a312c2b4c04dfe7c0175ba3a7a6dd01301f892569856e84c16dd6d6f5a17c8784812caa
 EBUILD oracle-jdk-bin-1.7.0.60.ebuild 9910 SHA256 ba9f626a5e86a9860fa995debef6c60b5a0842d6bee5384f7bf64112026fa232 SHA512 1261a52e8dfb9112dab4e5f03b47cdb5552a99fa8929db6f527f937110320da535fc97914d4be655b78b64f82c0c477ab6bd5bb273c34e1aa27a0e289d8bcda8 WHIRLPOOL 0a3424b4d9cc3e10c5649bd3e45774b63b9acaec6cf03bf5dfabd49324487d9a3fba9dd6bb572167ccbf5495a391aeff14feb629fc448880e0315ddd91478cf8
 EBUILD oracle-jdk-bin-1.7.0.76.ebuild 10594 SHA256 7db1e102db082bfd98059f6ee2b36e97f307885d1ee129ea3148d5ec72a35877 SHA512 e4d4fce0cb16fd24dad6c9b7381e73bce5ffff5ebba8d6fc346128b5d6d559999342cfd9a5889ae00237cfb50bd881918fa9f3a489df58ee836c0201247645f0 WHIRLPOOL f432fb61efac033c4ab56d25d3e9d1c895b1b620be7efb74d585a4277ddb0ed3c093a48ddc4043bfb7b6ad769e221bd4243122bb849fd3420248892652aa3ea2
-EBUILD oracle-jdk-bin-1.8.0.40.ebuild 10352 SHA256 cf96e4b6fdc90a35217afacac3ffcca83cfbdf6409cf8b2e713b4d974940bb09 SHA512 8ca21dd2a921c9a38d7f66533d9675199c6dfbae52a6edaa2e5de86c4a88ab3ed37d15b763133de65b4bef6dbca2fb7da8550d7b2dfc735df79cb4ea57404c2a WHIRLPOOL 67a7b5bfbf85c60a68c06e0a9fe869b306622d5bcdf21e1bb8a901bf1ec3cdfbfcc340d2b4f9cecc37b4cacb90b139f077b783681b6fe8207b645ba876ab569d
-MISC ChangeLog 15522 SHA256 fb139f1e98a4fe5342e5560fe41c9482e8d1cfa2eff2cf7f231439d0601e1f7a SHA512 6139fedfd388cc1c85c9c1b6c4cac44a167eb5b6f2a4cbbd085321eaa045435be2f01e6a9dfa4446fea9ae6d9132406a6321276b63a34c44589f0cf5d3ce2a88 WHIRLPOOL eae87de7181a6294a5bfe2aa2c02b1fb2074cebc4d8b87197b294fbe39453e09a6bb4c099dd947969e4dae416719f5c4eaedc4d1413962678dbb1c70e541b20a
-MISC metadata.xml 519 SHA256 09f12b427ac321fdbb2a0ae4d54259bf2fea4100abe33062bd65f27364ccf30e SHA512 b9d20b3da530304f3b9996411a7a6df83e60645057aef2c6706534ff238889e7ae771fd42ff37fef797df50033ec14edc594450fce73144f5c05d31c57e2ce7e WHIRLPOOL 2a5251448873eb66f624d227e3b203b74ab5f92672390478d5b36120181982a004af801e98008fdd701f15cfc53bd74334a82fa8f519c727791b4b29920510aa
+EBUILD oracle-jdk-bin-1.8.0.40.ebuild 10477 SHA256 207ef07b9f8395f6eadea52f43b5365612e073bfc6ea791841a17be7fd6dd553 SHA512 45b515ddb88a75d48f2679cf48e81d1b9dcd32f439cb0a79ffec2f34b5e534c609059b5ac960f4e1c9c13f2f269ab00a4a27a760846ec2c12fa13e009a3867ed WHIRLPOOL 8335e29de9a4c7f576cc16ff1e517007e13ef7b692b5da6cabef31d3f9118b776b804135f04de58b5e4a8e06ca49f9e0f8f911402f446e131c8955b7ff65e65a
+MISC ChangeLog 15722 SHA256 118a8936847a7f8914b2bc24067b44a6f6103d22ea80b5892e3cb39645f6439a SHA512 0557b5feb24d2646779b6c42872454e76e85a5504eb706f72e13dd374f3dc9437bf6895f271cebc41cc143577c0b00b1eff293b09d2d36af581db15fb054ba57 WHIRLPOOL cb8a37d0d2692733097bd2aa4e35f85ee4e9393a1d099f4a7ae569d1772217d59267b02ce811946815580ff76f7c0360d88ddcc639eb889c409cac4a160cac16
+MISC metadata.xml 582 SHA256 2115f948949343a0508b93b9664bed54d6cf051f70f26b33dd5a759b556b03a7 SHA512 4afb2242de1f65646e1fce1e46f64b4ba34c507f9eeba967127d55fd192f104633e3f126c1ce99834e7d154eabcbf6db8c1442649001734c58156d55c572c9cd WHIRLPOOL e6ea5237dd342d2acc868eda5a564c3d48f1114359763cb1037e408ff98555213bdb2c555cedc6d0ec5de3f02cf6caaf17c8f1562ccd6cb4f8b4cca562db5316
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVA1h3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k3hYP/388NAvpHe/UzigGVERnGbWX
-X9E+y2DWVaa0oY9+ThXk0S1FpZlYQusKYQJRe9Jl/W+ev8tOr3tfe5/Q6j3b2LqQ
-g/0T5j6DXMYWEFDfDh73Z0ZcDFbUm6ZCeUrXZFMD8bDkZWml0mYgnUlC9s0soabl
-MCOJL6WZyJdnLHLSVxfc5YYPbNuph3HQ/Z7goBGwVqfTPPHBQYurg2ZS6rymbmyg
-pL7qcegLgoq4w8tSQadaUFlI0HhoofQ8ngX1aNM4wkRt6hbPbStTCVuwxpYBLYJ6
-CM18jY/FLP1Uo4peRr6dy+ejYjWNmGYZ1safT97+BJx0Mn9wmwcjOEDNOWZHGbJH
-t15diziJKho1pJ4QkXk+ttDmrFmu+Dv5eoW43AeZWruA8vJwTjwRb0W0hmvpLFGc
-detbHtn2XEXl7bB93dC3goqBBhJH5NT3cgvIpka6TIXrYpkIYd087E1c03yqAlBA
-RfHW7M7YOD6VnrN7nCyXKwOtVJMqkCgeF8k559GDvoKxZhBzUgRLfEUfP4Up27kl
-vR7tEmvMPkl6RrbB3lj2yvRVHcopJ/UtdKSLT1roHAC9baHhbqC4oy+YMujAgpw+
-CFir4l2HmbyZfi1++vsBsI1wCi2bdcezm6wqM3sXa+YxF5c2Z0jJOpRODp/N01BX
-WcoJw6plo71oR9drohu5
-=2ANr
+iQEcBAEBCAAGBQJVFCt/AAoJEJGRpfGTSRu4WH8IAINP+Dk8khXkvfXGZE4wpUvO
+nQ7gtnQq+RHkbanlkfF1zzqRW8VWKcfWljXjLN1LB7EH3pxyIBXYyuAh8a9T2vLW
+Z/roJsovFI7q66cj71MRD3LoP2p4dvhq/YHdgrsg8PB2P/HgjKnUSxUtex/O6ADt
+OC6qHuT+d4m6vCf/16rXOyM+kYOkHLSCN6WY8zer6PgwGYtOFVJbmtbeTSJqbjpG
+aGjYv/lViFsKeP+YXfrCBh7BOmB7JrNIMsRbeRwpoqR296KJHjALx4Hv5wbO1V3M
+nHupBLtWPN+1O8agoTgLFrjGkKgVPqIWYJEb725yQR8qCGNLxnBVFzuzRR+w5fk=
+=3ojG
 -----END PGP SIGNATURE-----

diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index 208e5a1b26ffe2a1241753b1de6d96843e5aa917..01f0a3e330dc9a58d511420f2eaab52190400804 100644 (file)
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -7,5 +7,6 @@
     <flag name="derby">Enable Installation of Bundled Derby (Java DB)</flag>
     <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
     <flag name="pax_kernel">Use paxctl to mark the JVM binaries.</flag>
+    <flag name="source">Install JVM and JavaFX sources.</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild
index b2c672079ae15bad72b6b11609327bfaee67a398..a7a662a547896383f6009e3dfc9038d1396d4c77 100644 (file)
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.40.ebuild,v 1.1 2015/03/03 23:46:58 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild,v 1.2 2015/03/26 15:52:34 monsieurp Exp $
 
 EAPI="5"
 
@@ -224,7 +224,12 @@ src_install() {
        fi
 
        if use source ; then
-               cp -p src.zip "${ddest}" || die
+               for mysrc in src javafx-src; do
+                       mysrc="${mysrc}.zip"
+                       ebegin "Copying source file ${mysrc}"
+                       cp -p "${mysrc}" "${ddest}" || die
+                       eend $?
+               done
        fi
 
        if [[ -d jre/lib/desktop ]] ; then