Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

9 files changed, 346 insertions, 51 deletions

diff --git a/dev-java/java-sdk-docs/ChangeLog b/dev-java/java-sdk-docs/ChangeLog
index 3418c0818a71..ca45c6efdf0c 100644
--- a/dev-java/java-sdk-docs/ChangeLog
+++ b/dev-java/java-sdk-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/java-sdk-docs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.121 2015/04/08 12:32:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/ChangeLog,v 1.122 2015/04/15 22:21:33 chewi Exp $
+
+*java-sdk-docs-1.8.0.45 (15 Apr 2015)
+
+  15 Apr 2015; James Le Cuirot <chewi@gentoo.org>
+  +java-sdk-docs-1.8.0.45.ebuild:
+  Version bump.
 
   08 Apr 2015; Agostino Sarubbo <ago@gentoo.org> java-sdk-docs-1.8.0.40.ebuild:
   Stable for x86, wrt bug #545570
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 30446f1b8631..8a95ad6c65d1 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -5,26 +5,30 @@ DIST jdk-1_5_0-doc-r1.zip 46191338 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e2
 DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
 DIST jdk-7u76-docs-all.zip 61127655 SHA256 a60ed730a3e9fc7126273ffd2670f905f07b1d97b48884477a0116a3d210ba74 SHA512 6bd6e158a2e1691b88dc48944430c581948da55161addc7152aa5707747d360e925ba6a9edfcd6c03fad1e2c7d2ec7d01bcf2d3e2868f1dc5fff94322d7d68ff WHIRLPOOL 0eb1abfeca20f8c59b333e96c520589a67c627996f2032cddb1e253710c4d2e1ba3eef93b3d662a39bfde83382c779e9510799e2b6edbeb95fb0beea478cd5bc
 DIST jdk-8u40-docs-all.zip 92224691 SHA256 72fa379013ea0139a9840137ae062d2f6bbc4f31914519d2cbabb678929b4d93 SHA512 c66260fab072a7920b462bdaca6f0fdbe64eb77bc7be1994c990eac5782c3bc64dd4d18ab5663da9e5e54b5b3d9562d743bfcb99ca505c482a03443d47d6dd19 WHIRLPOOL 2dba709f242f151a304dbbe0c5a9bc92cde4b5c9d9e5bef9b07cb789193357cff25ec26f1c3f8971272c6381abdc9dd9a37f343a4f7f98dc26c6dfe71a87cd06
+DIST jdk-8u45-docs-all.zip 92214205 SHA256 bc83053e6730779a97077cf1246e7c57e46600294357ab37675555c1c6a11cbc SHA512 b4f15bab3b7d28f78e19c72bf8266d3f53b43b8b413903a03bcd141af5adcbd3031053d532c886288048e5b887f7d712d4dc422eb5e9395d7c8fc85adcda119f WHIRLPOOL 879de168fe76531345059f5e2be9efa99105181ef928823f6b6448c60094afbab44c920034aa26c0cc81edefc4bfc01985ec68ba29403feba30cd58ec4beb18c
 EBUILD java-sdk-docs-1.5.0-r1.ebuild 1586 SHA256 e36befc28935b01a628d745f40bd342819643b6b9ea281c75fb80305783bc87e SHA512 ec4be077de6377c425f7daa334cb0520f638f0e720c98a85722af994534e96fc47333ee8b6106eea7984ab1f52f58fe8c6773752c9aee102cecb407263fba14f WHIRLPOOL 496aa76d5790c1d8f9ef6c280d26412a3f4dc03076e7f0efb494f2a82a76b915437c5bae325ece24ac0da74c79d927ad8105d2d30ba1ffd74a7674e842ec629a
 EBUILD java-sdk-docs-1.6.0.30.ebuild 1564 SHA256 389c2cd0367d619a2ea660b5b5a9c5e370c6043486470bf9c1a7127e84aa32da SHA512 bf84b5458071f61798b819ad1186ac15f623df19bf39eb33c1ab29e2e4633c53fee762396de47d03ee51e6990f4886f7a0572e7c7cf6f2ece37444687fa9a8c7 WHIRLPOOL ab8654edcb87a6ebdd91457552c404e9020fc1cfdef00c3b7c0c5d2cd4c2cc61a5b7c7cac6ea6b92c0e7a4e6cad4f3a80cd153ba9dfc52fc43b86758beca4132
 EBUILD java-sdk-docs-1.7.0.76.ebuild 1554 SHA256 7d45d992905b6ef9d4e2430730cda6e5e8b7f15e52912c9fa6c4f815034a742c SHA512 593eb8c1dbb2ac82a9d11e2d7341d5dbb43b3035d87871275195bc00f9d788463d6ca85166a8f927d871cc87bebe54753ef042d7cf6036bb51ddaeb22a1e1b42 WHIRLPOOL 5f07089c73e6a17391ec290e570a6cd1ace825ef1441da4e172cf190a437eb6d531dd5c5c3d129008434ae325c4baa5bdd85c8612db28256d5270245024a7b6e
 EBUILD java-sdk-docs-1.8.0.40.ebuild 1591 SHA256 2e6bf173295401849564f062cb22650de3514f5c44ac0bd7cdecb54d3379c0ef SHA512 50dbf652675bbc9c2df5758079f3e0de7fd67f3087ef475d6528aa22fd18eb1e83de4aa58a7ac846141cb8df513ce0ca0966fda5e1fd38e913ba4fe94628b20e WHIRLPOOL 447a75648bc454b3249a7a3752c776d288dfb4e824c4bc083518bdbddc947b4b8d3fcd7ee3e61e143e02a7eeca2d78d378ae4798289ae304886d81ef8b6e3872
-MISC ChangeLog 18507 SHA256 8500944cb1118fc3831a9a5f9cc33af6048eabacd577a1db2e4d8371c14c88c1 SHA512 149a07fcf6314bec28a7d91e465ac806b03f718054aa71650c564498691a4c4ee9fb22974ce6fc1cdce7915b7887e7d014cb2e84101d46dbf11dae08a26008b2 WHIRLPOOL 02a8509f95fce890aaed00834cc27aaf1da5b77818860a039d40f3bc7ea0a08c5c4aee644d4a2fed87e6b36ad213e4d75e4c26ec402c253be7a717fa1b324742
+EBUILD java-sdk-docs-1.8.0.45.ebuild 1595 SHA256 686d0346e2dcd194c2a11456eb05ce40dccfcaee04ca17dc9f365346198f117a SHA512 0ea7184bb66da03d8c26443906708d18e3dfaaa577dbd8952714d9e27fe2f28dabcb8b1f42745e653c11f417296998e4ce21ae05d78d463d28e8d2eaacecd324 WHIRLPOOL 10c15fc4a0ab33d70220002bd50e9108028632901a659e84fd82a01f6ac3c2fdf1f647ecc02d6de86fc8636f07f3879c110fba9fbf4c9de6b1d0b8655b21c62a
+MISC ChangeLog 18649 SHA256 19996f46ca97c9f4856d1818c837a9317ad77ecfcf5062600143c3c0956a6df9 SHA512 5a2ab880987c4678d4b619a7a58b8c861b7db8bb5c33a579ce29408199fbb4bbfaf2e613f7f1b6c1de61f57926de7dc047d4415984c2431d9be887644fc7c796 WHIRLPOOL bbaf2fd036dab883702a9ceccb9ca369f5d67df45f3679ba83c470e202add7df27d82ed608ba85e50f2fa3471e47d392428cd4bdfa57ae796a872de65f4a8339
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVJR/dAAoJELp701BxlEWfbkQQAK7qLCcNc4oxBA6lnSRFNG2B
-v4sVxFwhatzCCUbZWardZNTuT06BFnjx6A8zULWXHmybcX0A7OOMFilYUBsJkZif
-z+pi+asI0FQN7BgfBlAU9WDRE1UVoh2aS37MsX+IPTzbBF84VX6xrsCYSOKgxNxk
-dykqE1767Y9gpEFVp1ou6UJxNT3lSQFVkRkn1X2VJK9rc05gzHMgfq3HkEDN3tL/
-hQntNC/PLaCx3VnxTEnnDZ4Jbm+UhkX4JwEcE5klPdEcAZFqg3h0pnbrA9BsfCz0
-xUU+LMCWF5CKIL6kcLdgO7dBIhbPbA7F77ON8EwzFB1lzpk/LLS8TWOD2UoMSL6V
-W5W+3WQ94trLNsx7O5c3Gw+jNCnXlh07GGz5ehslIzb5YpuNmxzVVnpTEdZ2jV2t
-+N6FGao9TjQmOW8LIisOb40j8np/2PGS3fiEMoI9v2ckmJmRefzCpd//FpqEEURj
-Y5gbsUgko+gVyL0gfZQAio/t5e4N1L3QBeDA8Q+IHpzpwIIrXclwUHoJHsoB0TJ6
-Ubnjz824yi0JCbT+SMuL2QdOOY0zWGO0zP1Vthee73ynHfpvh9x99Km/M8Kr8wkz
-YuQeiSsNTHK1vs504rGsXKs4OJi70Mr0SUGIWYczibwOotR1g3ecgzesileVVw8s
-KGQn+wB2Q7OHUNKWyFgF
-=yNNc
+iQJ8BAEBCABmBQJVLuRzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kaRUP/iYIcrprskDTm6PoqtDqzouG
+Q8JCYW1L2kS6suoiwxjzMB0ar2ULmYBEQ6dl5+YCtjEdfYfns8+yCvA8iGIqfnKI
+EjMq9xNHpDsgNn5aKLUMAcI+GDIXM3/3/1b5LfcBKYjXLHifZTquy3uTpJUIS/nX
+NyMUBKrb3qv3HEgBXT611RmMYpnXZKODng840r64zJNTaQcBVUmzdBKDFbo/ga8E
+ZBVnM5cCZxB3wy7AclGxWVHSsbmay7RRTkSpmU8CRAJuDr9iiSoIjRvNrFPhZhiH
+lisYS9GJ6ON3JL/CtA4Sl7K9UcdXKX/lmDIlUdPW4CMDsZU2+C/g84Mc88mKuuXe
+jbaK59gaGNJenEJoZzn+VMLs/jsqs9mno1BlhaonHNMVYBEjlDLvRnQvpzuL1OMd
+RCe1BGHlhjdSPShoEqHF9aPhHvI+G6c/n3UeTSg0hlKwSCGef64gDzL8evDp1iN8
+xA5ygVV1TBCszx9i7EY4GrMy7obFee9+KblP0a/vgZM9Jg2IVTsrHGtaujROJaOn
+xXwX1ofb3UXhQFBB8XzCSaJSKBuXYI+DyTGgCSySzSvJpTFcEUhVAuEgJ77OZve2
+bJwJoZWhl8QqJ8hsg/qDIGlZCbQC9476zqdUBXmMlsk7XHj++e+LL3IwePzEFI+w
+TNXTOLXC4i6TTIskS8lA
+=M2UD
 -----END PGP SIGNATURE-----
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.45.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.45.ebuild
new file mode 100644
index 000000000000..956dc94e7649
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.45.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.45.ebuild,v 1.1 2015/04/15 22:21:33 chewi Exp $
+
+EAPI="5"
+
+inherit versionator
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-doc-downloads-2133158.html"
+
+[[ "$(get_version_component_range 4)" == 0 ]] \
+	|| MY_PV_EXT="u$(get_version_component_range 4)"
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+ORIG_NAME="jdk-${MY_PV}-docs-all.zip"
+
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/8/docs/"
+SRC_URI="${ORIG_NAME}"
+
+LICENSE="oracle-java-documentation-8"
+SLOT="1.8"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="app-arch/unzip:0"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${ORIG_NAME} from "
+	einfo "${DOWNLOAD_URL}"
+	einfo "(agree to the license) and place it in ${DISTDIR}"
+
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report to the bug 67266 (link below)."
+	einfo "If emerge fails because of a checksum error it is possible that"
+	einfo "the upstream release changed without renaming. Try downloading the file"
+	einfo "again (or a newer revision if available). Otherwise report this to"
+	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install(){
+	insinto /usr/share/doc/${P}/html
+	doins index.html
+
+	for i in *; do
+		[[ -d $i ]] && doins -r $i
+	done
+}
diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index efaa732d1cf4..2a2abbd5c932 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.92 2015/04/08 12:32:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.93 2015/04/15 22:23:08 chewi Exp $
+
+*oracle-jdk-bin-1.8.0.45 (15 Apr 2015)
+
+  15 Apr 2015; James Le Cuirot <chewi@gentoo.org>
+  +oracle-jdk-bin-1.8.0.45.ebuild, -oracle-jdk-bin-1.8.0.40.ebuild:
+  Version bump.
 
   08 Apr 2015; Agostino Sarubbo <ago@gentoo.org>
   oracle-jdk-bin-1.8.0.40-r1.ebuild:
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 381ef2fce0bd..742212541ef9 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -50,26 +50,38 @@ DIST jdk-8u40-solaris-sparcv9-demos.tar.gz 9772302 SHA256 c9cd866144a6fa050e93f2
 DIST jdk-8u40-solaris-sparcv9.tar.gz 103476691 SHA256 2c40728263ff1e56b00b695b9cf8c59e94b50c8df3199b0a6e39ecf96d28b058 SHA512 1a6b6ee144626514297f5500d77cbcdcb1d1edcc6206e5878fe9f31314d334fe9b1d50fe0fb4e73ca3e833e329e6cc106834be4707f04c118ea3a8711d0b358c WHIRLPOOL 906c030205258cabfb967e4bb8b1b47ebbf6d752b0e1bbeb8701fb300ed1255f0ed056cb071440ad78a6ab1206172937dcd715ff55b6c476a68ccb2f8f6528bc
 DIST jdk-8u40-solaris-x64-demos.tar.gz 9737226 SHA256 8240f6e2816dcf3e7669fe313470570b022aea54235b8eb918043a33a1f762b1 SHA512 a3059e741051682733ed6ac50c3c3259f3da0e617a9e3b124bf402b898cd8c8da2928ee377d3842908de9703e60f2b6179d5c9b9f76cc829bed2725b87d27f6c WHIRLPOOL 4c9bdbe41f26c1d6228705b7c752a7508502b859d72fa0c834dff723a628f86cc11ad81cbec2982f06bfa517e1227f522f477cf5c93b064e01a5319cf6144d04
 DIST jdk-8u40-solaris-x64.tar.gz 94276101 SHA256 d84da462b1214947038336e967371e3a818ef30f2e2c5ae35600c5803862712d SHA512 84a98a89343beeaab6d5f4985cbeeb57443a7b7cccd936b40350ecd9a1334a14bcd06f6a67df172406e76efdea5236986bec38833350a8547e15e14926370b4c WHIRLPOOL 5b3656cded7616f8b6a11c04447fd503ba48752866313d1fbf0824c14a312c2b4c04dfe7c0175ba3a7a6dd01301f892569856e84c16dd6d6f5a17c8784812caa
+DIST jdk-8u45-linux-i586-demos.tar.gz 54792586 SHA256 f24e2ba5c12865d8191322db1687ac56e4792b17682dfc64c540893ff5db8703 SHA512 b35ccb9de4587efee360c8f0f9eefed2c9e2108a54e506188c3f37f449ea242b6873145761f99d8f7eff29c79428408a5b1ce59fd1929eec4908093c1bb0b232 WHIRLPOOL 79ee60185b914e0b0762c273a881e27670c19eaf1ecad2c1bae794b989cc826ace42b417a2270d8f9677facad1fac8645efd2306459c078893919fe76b541b11
+DIST jdk-8u45-linux-i586.tar.gz 174985642 SHA256 ed20cab122486b16ac467f35c791e2c44c94e51701429049d85f85d67cf53ff8 SHA512 74b467e5a36028993aa91903e17bfaf305a0122fdc60efbb9174e33e35ab52813df3b39869b36bfb32441ae3874e89eb523f155573fae5eced1875ebdd08d53f WHIRLPOOL eaa862dd67ac2d2096cd770f995f5a82fa00712786db1db5019c8738fdf5b203f3789da7a5923fc8bb39ad9a7b7bfc76a258c1e5e35c3cd582f5ca7910bb72d3
+DIST jdk-8u45-linux-x64-demos.tar.gz 54867124 SHA256 c0c523b46c9d1ec82b9cd166a8bab34403cd466b09643e0bb772ac447d237a30 SHA512 73e72098b1c4d2ac15e0bd1fbb39dc745774402ad07a3cb465ee3b3f3ff79d2d793e88d2143c300c44b3d5d870d9d822c7052b46076e6a8f95c34eab4fe4c4bb WHIRLPOOL 44ca0c5ccccd450677412e7deafee3f470fc3200abbd17ab725faf5139271c6b9731df6953f39f49c7025f324a0f9b1d3cdc768f773d1c721999ed3a45e2aa54
+DIST jdk-8u45-linux-x64.tar.gz 173271626 SHA256 f298ca9239051dfddf8642fcc9e264f7fe5af10adb67027feb3a0ed0a1a2316d SHA512 f8fa6690609ee93f7e40f69998e97e02566808a50ec146163c7aa24e596a0d98e8d4ad438bc9d4799cb31aad9b403c3d4ada6cc0db66d2b22be8c639d992a027 WHIRLPOOL a7b0bc6a5a4a8357ff5edef17182efebdcde26e8a6acfc742d820120845c3c139e5fc137b7c38262bd28bd54c03691fd8ed8338d4e3e77efde8064ed6613ae2b
+DIST jdk-8u45-macosx-x64.dmg 232764982 SHA256 1a87665a5d1055ad2d804615446ab4877a4eb2c993b1acddd6c80d0d7028a5b2 SHA512 79612ac3830dc64b90954027d403ac3b709cafa3de02d49649b0abacbd89b208b0038c886273db4a60ebe24205483642e54896229753bb9ff833d64e58d8623d WHIRLPOOL 5e0798d8157f5c8e71064482141bd2888e9e46ae9515e30d0b0e2dd70a7f48e75b598273c36045cf66f72b321d5a4fe4552cbc2d19e412f0ebd6882ebff4a1f2
+DIST jdk-8u45-macosx-x86_64-demos.zip 55361354 SHA256 bbbc6848a6d802d915da229120c94d7077ca0a53c28f4751e4f220c2a6bdf8c8 SHA512 00eb1aacae95af794cc4c0098763576de74856a4b322d9ff8a49c2b168a006bb43c5b47d97c184f99a7a9113043cbdf821eee6e120c4206bb26258cd1dd689e9 WHIRLPOOL fb25d13434d80272bcb64cd6461b42616775f1b363d9fb9e8bfa4d116e82f187871fc6b6465975637591a621b59a8db29a244a0ed334636462184ee72805669f
+DIST jdk-8u45-solaris-sparcv9-demos.tar.gz 9763046 SHA256 d1956f094a56198f0fa20ca40567388ffdc6cf9e740b162a31d6af2c656a1a61 SHA512 0861340c43f75723f2147595ab428ae6de33afaf051d7187d959c1cab920bca72f81dd5aabfb4bb500ada7c323a27d6f3db2ad2a603d2cd73525d4696a38928e WHIRLPOOL c0f02b0fc3d98d9b295900abd24fce7af9ba7577b078ad85919b6e84635e9d4a76c99b9f384faa1a7687d91d1ba054330ec6f8b832f774eba6118789ddaa8f76
+DIST jdk-8u45-solaris-sparcv9.tar.gz 97416052 SHA256 594cc2f3c00e783e7bac6ce2cc292f8fffd7d3508b521d156bc620a6cdb93f9d SHA512 551c8ae4efa24b837ee01ccd15156248cc7d4891ec0b95847a78b6969dfb84e44c068caf6ba6eb1130677c8ed14abd81b9dd82517f00d855c2cceb33e22045c0 WHIRLPOOL 56a44913b447b123232e09becd21d83c95f02d4020af582ed20a9c1a7fbed7f9c3a564b74e700d3449efe2a19c5bf3d7995fad3534ae5d59c24c25154c2443bc
+DIST jdk-8u45-solaris-x64-demos.tar.gz 9716106 SHA256 736bcb3ec38cff5977c4bd58794d6b846e57903826a0404d3615ac3ed0e813f2 SHA512 2b0ba65017fa888dcaf237bb29876164e7b939ae70fe7a5081995b4f38e228fe31fd349360f8f8c25d61d6fce8cacfa54fb725265f045b43a20c8fb5366860c7 WHIRLPOOL 0162e96e28246e38a8e2e9dd5b250439a4f7d863e87d984e9091181171ac5914435852c3373add1d181d0dd49aa79945a391a14356ceb2c60192dc20b1e7ddfd
+DIST jdk-8u45-solaris-x64.tar.gz 100537403 SHA256 2b66ac9b7eef7087077add605a1b94364c954b007587b44641c4b6725669fe43 SHA512 cf6a9303e81a1c11a5994d91f21bd05e0f9057587339c5d2366f19f67f90f08c2afc92bb6872428f916498c95fdf4ef27da8f182754c1994044b7981c2990a80 WHIRLPOOL 5c0b003d872e2e0e9524a38181cb38ce974643942c4759a639d2a8aae97bba62dc2c432708368de81722dba7593bd920ec4841905dfbe458f1dc5d46e3a0c51d
 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-r1.ebuild 10472 SHA256 e8ddf9943ec3eb9f18ed6d6e26337d4af5bd6510d785c0232a8758f078f4a570 SHA512 7614856ec4317926c05af1f18b8326511ef2090d307f16b3ba2ad04e831217536d422339dd6e66e83a61a23d21d9c66aae2608c546e2363358e566f87b7cf3cf WHIRLPOOL e6d51c4a9c53f40516b96d377247b0a5d7fa2845643b8ba6c554f916c25255567c1657bbc358923900c1689316fe01f146faedabc69ce8f26edc32d67d9e02b9
-EBUILD oracle-jdk-bin-1.8.0.40.ebuild 10359 SHA256 e69e217d8309f93a3ce86fc82954c7dd5f642bbd1bcff9cc7cf041f9e525868e SHA512 b64a5769c26ca8261f54b58cd8d1349deb13959ee69a4675b30635c5359b6aa0421b0ae9d5c75bbfe545c66b9a8b162149e45fd7c8f84ee1c0c28f46006ecd19 WHIRLPOOL f07d65638d9e1e96ee51e203b659f75e4449ed0f40e5ef9e480a597c0f888ad81a3834820dc1bac7a80f8d16b6bbc4c19c99286646b2e96f400889f03365f189
-MISC ChangeLog 16183 SHA256 94d924bd6e2cc6e40e29d355e100ba6486dafaa673943f4389a5214bf4971467 SHA512 7c1ca3429d3760043cd2f0ec2abe9e5a83716b15b546e6396daed240f24e5f87b666d74b765f7823bd97c5cb0590f3ec1d6d7e129b7e2c26bae86822832d1209 WHIRLPOOL 3aa49e9277fe5d2fae34b166e6fc63b10d940628ab78e60c3a13860fcb36d64b91c2ed979fc2ac3875512532d8469f71d0f6fd5adc5798f5fce9b94abc96fe9f
+EBUILD oracle-jdk-bin-1.8.0.45.ebuild 10473 SHA256 9f91f5a6e7f68e67a79afb863ec8179690a48f0d3c894a54fafc54f4a81f0541 SHA512 ba5316b7f436d345a8cbe454466ce5c51bd2d3daae5dae8f2ffbc95029f13c6004a1affd46965f6512ce4f984bff45e617077be65a3508b46bfdf4a6e7a57282 WHIRLPOOL 66ca31d3965e73d4c3ee7159fa22bddc949bb5be9d578714a842f038762b4bfd27fd7e24a035de33f809546719e903b87b1612f7c09b779b87f020f8114561af
+MISC ChangeLog 16360 SHA256 6be595fe663f659ec4eef7d18dd6784f29731a35280a629b956fef88f150980c SHA512 f2c52676593820992637e8846bf2bea4bb52f1807dc7ab4b7a51da367080e603abc0db0fc18e64ec65e671169e007bb7b0ae5881993448b537fb7b74c98234c6 WHIRLPOOL 600d978ff892962fb81ea9b6bbf143ab85f0cc1a6549f54ac26fd8cb5eb60649d8fb41696859e41b5d7560347edc1985ef566a98fbe958d24050276a0110b941
 MISC metadata.xml 582 SHA256 2115f948949343a0508b93b9664bed54d6cf051f70f26b33dd5a759b556b03a7 SHA512 4afb2242de1f65646e1fce1e46f64b4ba34c507f9eeba967127d55fd192f104633e3f126c1ce99834e7d154eabcbf6db8c1442649001734c58156d55c572c9cd WHIRLPOOL e6ea5237dd342d2acc868eda5a564c3d48f1114359763cb1037e408ff98555213bdb2c555cedc6d0ec5de3f02cf6caaf17c8f1562ccd6cb4f8b4cca562db5316
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVJR/iAAoJELp701BxlEWfASsP/2yjrDZUO3Nt2JlAjIjZzlAy
-jH07cUSplInN+vZl/GbmlsT+X8VRYqIpqou8MM+TQX4P9PUudvMnhX7hCAbAH0Gu
-iMZ0k2b07kTCanh3j3R3MPJTsk7mNTGvw5iNjUfn5ur6gQ7T0NUnM9K4JwZyJIya
-wjofdT2iaGilMc9KtXoQMMYVBMNfT8gi8yU9biuYAPyQ7dI1fZTVAq5/ME7LcvWW
-/dCmTu98SxCOI7fSDEkc5wxWhQAWegQquF14bCq5vpqeX71WY1MLazelvrwsWKqg
-HxOevnNoRYbqknr1FGOTPMEM3wK3DSvhj20V5bsTXPC322PzOfGCPT8gfAqlK1cX
-ax+WwkdJ8tZQ7GtinmbUrUQ33+mddxgwiKKtBE3PY0AtgzhXZxMgWWIfCsMWrdC5
-EKkS4mGGpIxfKKJli7bcePqCGxdGSFIgZGx+bSAnNzl6e+fnEUST1pqdk9epugT0
-DLgld8arCCS2sHObjKniaKJosPyc+4Ft7xWxEAOrFhVJTo0raf2IWQzTOjUvLYP4
-wtonfYmmtaqBBJl3pNYXJYRGUWjrn6MDyzdemM1TbuGl9+6efuQ6TPyNiFSk4MYj
-G40ow6zD8+DeFLXht3YiClOOEgruI+Kk6AErsJ1HrAbRdI599CMVF0beZ7qvKHfI
-1sENJIkkXr6K+D7pPn6I
-=oeoK
+iQJ8BAEBCABmBQJVLuTNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kxd8P/2iedbcLyuvqBw5+0yZpWhuU
+pSvmPvwHn+DAqh0Ezm3rou6n687E6scpWN5tXXjoacXnWJDyrqNHhpXu4ZO5W2xz
+zGDrX/pda5L59T8FjSSQdmCfBlyiOSpEkp8F/oURMX3ZDhrwiMgDRqvE/DnIpuDS
+UNfJDuMQ5jKwf2vqwxvXXfUAgVEjPXXdlSWHvUHj7BlMJzQeWS9nMpA8rCoHjlOX
+XJi6yq8yzLep7w71K8JPOjM3mP5k2/X7NxhOKqgXpgYkV3dyfNyqXL08J9Z2FS9G
+cbOQ2obfJVIXkGFkBJwv1htVShStMimrdZACNNBNF4EXh2QkmTq3b7T/essPaQno
+oPRZAfBH2V9XYEuL8FhI/qKS6UP9LjdNxmDBM1FdxaUQAv08JwWuOcuAlOvKZyri
+whxxjCh6dM31ZyIh5Mwj9jXt93Y2wbnRyJuQFrS2nn1EGrDOdmSIIEAK7t6UzEtQ
+GYYRRMYqDSeD4Q+iMzVtSiHmdwl+THr4uzbDNZW7Mk9yQ1jigKh58IMuxwyaVvUe
+dCy8A3COfPTES/K1y2vHd4sSP5IONAGRJ3ODdL4XqxGDzYgGbqjR4gOnamFrpMKL
+fLdEjR/ntAR8UmMJZRPKKsgxPZAPF08Me+rlS7GvZTNSgmKqe2U4dhD5MEN7qowb
+HsSWwdqndOHUlQVleH/A
+=rnc1
 -----END PGP SIGNATURE-----
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.45.ebuild
index 9d9e88e15174..2a479bf31d0a 100644
--- 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.45.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.3 2015/03/26 16:06:11 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.45.ebuild,v 1.1 2015/04/15 22:23:08 chewi Exp $
 
 EAPI="5"
 
@@ -224,7 +224,12 @@ src_install() {
 	fi
 
 	if use source ; then
-		cp -p "${mysrc}" "${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
diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index cf9dc8b8f399..4bc7e70bbb9d 100644
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/oracle-jre-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.80 2015/04/08 12:32:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.81 2015/04/15 22:24:19 chewi Exp $
+
+*oracle-jre-bin-1.8.0.45 (15 Apr 2015)
+
+  15 Apr 2015; James Le Cuirot <chewi@gentoo.org>
+  +oracle-jre-bin-1.8.0.45.ebuild:
+  Version bump.
 
   08 Apr 2015; Agostino Sarubbo <ago@gentoo.org> oracle-jre-bin-1.8.0.40.ebuild:
   Stable for x86, wrt bug #545576
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 77cbfa281ddf..bbbe8bc9f63e 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -10,24 +10,29 @@ DIST jre-7u76-linux-i586.tar.gz 48501515 SHA256 38aecf5f6c8706f293b40db0133fca0a
 DIST jre-7u76-linux-x64.tar.gz 47058747 SHA256 22808ec8c747409858e952c124bbc05734feff057ead402be2b2a7fa5852e4d9 SHA512 b4101ade8c0f9a7891f01b62740e53873db410637663fda02f4a6ecddc8ade0db2650162654eb9514811fafc640925ff780b5b7a9e3f2a58df207ff97d954aef WHIRLPOOL 21aac95873276ed0cec72ec80ccad226e47c5894324c925e1d1bd9b7c0d15f03e41e50a6bca5fd36d0d4c5caa079a11774b756e8ccffacffb5ea99ae49ee334a
 DIST jre-8u40-linux-i586.tar.gz 65652483 SHA256 1a5c90e36bfa8117aa4764f8d1ef7b61607d694af2b6ab4ceb27cdeb65c46d01 SHA512 614bd56bbe94cc08c182d36c1bb0846fda08c7834b9d063e941cd7043137aa68ec2458a6c804226332dbf0bdb5acaaa30fb2e2d96985d24f4264b7075317f990 WHIRLPOOL a1ace57317f3023d4b0ad2c7d475a0f2de5e561db0497a6d574ba3080d3553313fe61f6d4fc3ca009cace23e1dae47659d66e0be2311195ecb31c7585ddde515
 DIST jre-8u40-linux-x64.tar.gz 63777545 SHA256 17f4e8df5082b0df63dfb962e2e3da0f98e45850aebf5e4a91f0471d2cde7d4a SHA512 01c0b40f538282eb232970fe70e244680725522c73d81226f872f066db435db7756f1d9256bf8f22f29edd78aef5a88a51957ba8143a01e32bcf40e3b5c0ae77 WHIRLPOOL 25b869e385887b311e99b9de525c16295a24f4dd2c56500a7775a02dd81241f80b80766992d65b74a5bb6074510e6195b28919d5712f8c8da019e26b1325577f
+DIST jre-8u45-linux-i586.tar.gz 65672226 SHA256 2f0bfecaae5afe296f42064d9725100698341f87bc46dc2c71cb0a4f03ba1574 SHA512 91b4b959ed7198feb26bb5f38eb9018ec621392c968c5011914295502e417b0af032fd69602d4cf79d5ba20ccb6c1166ae8a7a8ab4cc3aa95d1c678422b894df WHIRLPOOL 327b8c99c1662d29370d9777664862cc3dfac9e07ad98c9a1f0d237efb4b48e1b9c5c89015f52b918f453f10c64099b8e3cac193a1b3f018ea206939790639b6
+DIST jre-8u45-linux-x64.tar.gz 63822322 SHA256 c156128cd92eb91e9320f61a8f36305b3382043afe3467304c6abd044d27da0a SHA512 c70d9ae5d1f2d47aab1943e4123155c10973b26d951fb220978097c676850c37c7ed48c643784989292c766f8afa141740614704ec6901d1f4882096f1c67789 WHIRLPOOL c965868d17307f8454a2acab6bbb3d86c19c059b89c72dc9b823844d0a4e2acad7674fa7297979d9e056663e31a83ac32409deca97125117632f8d20171a14cc
 EBUILD oracle-jre-bin-1.7.0.76.ebuild 5513 SHA256 5f148e84104bbda33340b8cb43f9759e819336b80859e155fee7301c2ab61f7e SHA512 8487980da92d283f2963eefec9027452e0f930f7a52fcdcb732ae22aca9698855e27a8a1a9aee52a925e29bb393d0b5a4b638602028c031f99dc8e4be703c138 WHIRLPOOL e9f41da039717a17b5b406eedf2607294935c940cdccb5c3ddbb54068a366f5b76141f75f5be845d21a0b154e81b8c1b54247483dfabbd3f59623f57cb270bbd
 EBUILD oracle-jre-bin-1.8.0.40.ebuild 5907 SHA256 e5f831ba908628fcb66bf2bfe014cd3b5e801e98b8918b1311634a4dda8b2a79 SHA512 2ca2cb8048bf5ef3d9aa70bb91b92cf618ad344381135041f2e5d390ffebe5e3939ba17beb682efab7a0a42f894b9f988ae130b6d886fc4a4ef3cbf94bdce326 WHIRLPOOL 628e201b5d10ac71ef86bbf507a2c0c07e9ab34d92c7b5156a1463c3708e307ed02b840ad7100c5f5b3920fa6e8f490a084ad845b6fbafb3cc3998695e622103
-MISC ChangeLog 13454 SHA256 1861de286dd50d6cc19d5f363bcec17c0c37bec5f8e3b0af3644f918d44bd87c SHA512 f1cb56aaf0e1e7a3825f17a07542c129f29995d783c466d4088f3d895b56cab7ca4c1ae6540d337cc3f24584cc56e6576515fe774f42d512d6b784c77734c47f WHIRLPOOL 0ec1f06e9ef53dfc1561489483b7a1115871d2a1045f9fcfc5934bbd434288f06fc4c765dc065363b24f3961e34fc2ef11b66ed972b0c74e363219ca591c799d
+EBUILD oracle-jre-bin-1.8.0.45.ebuild 5911 SHA256 bba480fd96fe53c32af13f2bd23ee0f00c4e9b7177553bdd3d23ed0b2f2a9386 SHA512 0931a033ff741b6cd447e392a6c5e6af3cb8cb45965dce5ad8510098f84658096cba5a2538fe48224e66bbe060880595018875361ea79b9800d5d6b3423bcc3b WHIRLPOOL 9ecf1873218371a7997c14c916f9c8dcd60821b4e1189124cd7edaa255bbff61dbcc87b7db0ff93f7dad79e7b37c5463de3f60683012e812c6ec6143b1e8184c
+MISC ChangeLog 13598 SHA256 e890c5fbd63c09a21ace1f99c0815d2dcb2f881e3d971eb5541fca680af5064b SHA512 117063defd11ab123b922d9d075a34fa213f098e0940e458c40a70783fbf0ece30a439057f340e265229e739c32dcd74e6181685209b1b19714ce8e29cef3681 WHIRLPOOL 7323cedd43c5dcba21fe641e9350a2436dd5434ad77a6dc0f1ad8f5efe21a08f2f0eee356e61c5e4f366a8b5abfac80d73c9b099c7953724c6a8da5276d6f2e1
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVJR/VAAoJELp701BxlEWfTdQP/14UP+VQ0czaxEK+GHjQdKSm
-84zncFwCHv9cu1msjuRPv1M3GS7vgq1OxlUygPsT4tmEC97WtIJ1JOHv+587QX7p
-oFzyAuSOkbPUlvc/PTnUENNtv5GhtS+shHYJqqiQwoIhIJWuD4o4fKYeGspn9MOH
-PzcIv1Ezx9UEqmk8w0Re5iY6l+qyIZ6rp0tgH4NPcWOP1pmGXGHIIaflfGTXnfe2
-u7NITlRBD9Wb8/WH/3cMdrSZ1Qgvul81D/xJpIJzJlyturI1MtAAR9qwoCpld06t
-T6IYv5xvHJ3rJkG91IHDb02MJEbU8AmCEVSyRUk6MnW0++7Ug5czGzDoGsdyP44r
-bGVQKggdneiq4Ga2Y/Chw7RT64TWngGmRIpvqsQ3Sexu0XOtpzxra+NoKqQ3y9P1
-BELyVJUW21uyaiLfbPw6bS0JeHl6TmmZrPiQlmm/7bGsgrCixSYINi0+fGFxwS+u
-hjBjf2BniL7LqbEDkDTGo1KD3Mdb1/k9HUC2fcY0NoIlwgSBkrMkfE9liqySMSzY
-/0CWgkzD3YPPWSA2oEmUpNiT27wj8RQRrgFlLJnJrKvFK1kNC5io64Z0VeLnqDep
-Mxp6SJeAvqSpvbHdeoS3qtYPlt7a2RAAoggMrJ0d4BbeWhnb6JukgKhpSz/ZCd4E
-7sx2c9DIx7gWOwot3rkY
-=KHKD
+iQJ8BAEBCABmBQJVLuUUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kmxcP/36EZ2UKAE1D+KP/e72U5tH7
+woWGmOI7rnDyeFTuQpNgl1UHtYjH5VqrHx+KBmjP3hIqA1/Xdl+0ad3zhKpDMgNH
+0LfUJ6PyXswjFru/As1ilPWZEejotFx2I9g6LM9fEJZJ5tT2eR2oK4zcAN4Bta06
+ZPC+XUbw9BUub02NGh8gG6c3uuZkTkMiRSTw7LfBw5UFrn+jZHimJ2LPmxJvbq4s
+dbD8GcwZ5hg+hHFnppRl7F0VBMXtm2piKhQY1M6kzUnSEeoaGd/3Rwerlm2z+b6K
+h0K/O6buGmhQvWpvp56zVA9Fffk6pXD+61CPMCjObuo0Eit5dgx3FyYgp5t0mCE+
+TXw6k/PDDsOwUjaX8hv/XFBEDW5zBSNXeJ1rmHN9WcoXVsSFOACIWLjg8ogo4590
+Jnwfm1m1mIg3f8w/8Ddian4orKRGYH3fNRbxMJp/ipT0FbtZibJJphtWgoa3NYEX
+QIrHXoEHRpOIj73RzE6dMSZLQeVyawq2DOdMTRQke4L3+/h4Zg1jjUXOCBdQy71r
+E/5DkqHCF922LH8Mnx/PD53cGzoa5frYOdVsWMooRjV5ZDm6hPmxhTGGkQUe4jQB
++MGAU5DVR0uXPGmpoXiqGwYSKXwqlmlZDjv7cAcJjKeT3LJay+72dLnOSgj8moxe
+NabI3GVnQthtyipmq+2p
+=uR5e
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.45.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.45.ebuild
new file mode 100644
index 000000000000..75a5ac1175e0
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.45.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2015 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.45.ebuild,v 1.1 2015/04/15 22:24:19 chewi Exp $
+
+EAPI="5"
+
+inherit java-vm-2 eutils prefix versionator
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
+AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
+
+# This URIs need updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	x86? ( ${X86_AT} )
+	amd64? ( ${AMD64_AT} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+KEYWORDS="~amd64 ~x86"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+COMMON_DEP=""
+RDEPEND="${COMMON_DEP}
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	alsa? ( media-libs/alsa-lib )
+	fontconfig? ( media-libs/fontconfig )
+	!prefix? ( sys-libs/glibc )
+	selinux? ( sec-policy/selinux-java )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="${COMMON_DEP}
+	jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	fi
+
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
+
+	if use jce; then
+		einfo "Also download '${JCE_FILE}' from:"
+		einfo "'${JCE_URI}'"
+		einfo "and move it to '${DISTDIR}'"
+	fi
+
+	einfo
+	einfo "If the above mentioned urls do not point to the correct version anymore,"
+	einfo "please download the files from Oracle's java download archive:"
+	einfo
+	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
+	einfo
+
+}
+
+src_unpack() {
+	default
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
+	mv "${WORKDIR}"/jre* "${S}" || die
+}
+
+src_prepare() {
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
+	fi
+}
+
+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
+
+	# 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
+
+	# 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
+
+	dodoc COPYRIGHT README
+
+	if use jce; then
+		dodir ${dest}/lib/security/strong-jce
+		mv "${ddest}"/lib/security/US_export_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		mv "${ddest}"/lib/security/local_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
+			"${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
+	rm "${ddest}"/lib/fontconfig.* || die
+	if ! use fontconfig; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}