summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin95666 -> 95667 bytes
-rw-r--r--dev-java/jmh-core/Manifest2
-rw-r--r--dev-java/jmh-core/jmh-core-1.21.ebuild34
-rw-r--r--dev-java/oracle-jdk-bin/Manifest19
-rw-r--r--dev-java/oracle-jdk-bin/metadata.xml1
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild301
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.181.ebuild8
-rw-r--r--dev-java/oracle-jre-bin/Manifest5
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild220
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.181.ebuild2
-rw-r--r--dev-java/protobuf-java/Manifest2
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.6.1.ebuild37
12 files changed, 81 insertions, 550 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 403f1efc99a8..4a291ecce293 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index a9aae37733ea..0643f375be3f 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1,3 +1,5 @@
+DIST jmh-core-1.21.tar.gz 615305 BLAKE2B 1a5cfe9784efe0cd7706382eaa89c8bcce0efcce3c2b802ce0772992dd16f0c6900a47d70b72d1c556584adb8afda442f49267ad4e0b53d04c20026979787210 SHA512 ac51d58d9b746157842a3bc9c4828bbff52c5882582e123e04b5ab6c4bfc1ff3cad1f6023ab1fe1eccfa68c73ffbd21b34388547bba544626af87092852ec166
DIST jmh-core-1.4.1.tar.gz 585746 BLAKE2B ff6e9d3e8b11827042a9ff9983505fa5272d943a8365cf14ac43d940a7815f280c2b82c3ab810f1c22328a932912f6b09b9c5d5f1838a3cb357e6ebe21006e49 SHA512 a33c63b82712deb53218bb8d955c9606e5f393ff0c6256052ac8df022ec45be79bc0ee5ee08ce0d3762594214814bcf1e562717d83daa9ce13c664ca9e7c431b
+EBUILD jmh-core-1.21.ebuild 885 BLAKE2B d71329a17545d899a25a48821f3bfa2c960a914cfc9d055b7b5cd51d1a34a73759985d9965c51dff1d510cb8ff965131059d2cc414f55ee97dfaaa20bf306368 SHA512 00165f788eb323b41db8f8a77fb838663dfe8db751994986f422db89f1fdec5b50885d2afd1e12f41b943c8e760ef2593afbf7c602210f34fe41f4d9a538d2b5
EBUILD jmh-core-1.4.1.ebuild 973 BLAKE2B 7071fed0c19efaf7f06e1d43dce2b76113ed59b4337220c2a34f50802a0ccd9cbb7e1288421918bbe58500a9203bff9a3e1c0e0a080930f5154d9f9d0aeee4eb SHA512 4d33e35a17571595b71bc01c46c2ce2ab7bfb596a61fcf64ddfd0564a014f753591682f1d7456ab006dfb4dc019d2f16c3cb339f4f4750635b18f3554189aceb
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jmh-core/jmh-core-1.21.ebuild b/dev-java/jmh-core/jmh-core-1.21.ebuild
new file mode 100644
index 000000000000..1d8994699b6f
--- /dev/null
+++ b/dev-java/jmh-core/jmh-core-1.21.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Hash of tag, download not available via ${PV}
+MY_PN="jmh"
+MY_PV="f25ae8584db1"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
+HOMEPAGE="http://openjdk.java.net/projects/code-tools/jmh"
+SRC_URI="http://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# jopt *must* be 4.6, see http://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
+CP_DEPEND="
+ dev-java/asm:4
+ dev-java/junit:4
+ dev-java/commons-math:3
+ dev-java/jopt-simple:4.6"
+
+DEPEND=">=virtual/jdk-1.7
+ ${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.7
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/${PN}"
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 291a4f3fc7e3..7b8282c7ab84 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,20 +1,6 @@
AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
AUX oracle-jdk-bin-9.env.sh 497 BLAKE2B 281d53c547c2067359af307846c29f31683cd18c8d7b305de278398eed254d0c3cdcd153b9ae67edfea7f09190f1da5d26f26026c0c4125b5ecbf8a730c9c433 SHA512 e9eee113974c0d570cccaed0a71917dd12d806248db128bafa1fcf744838ff9181f5b53b791e726e178e2164da1b2d901a43eefc37b25a3776288c137231b2d8
AUX oracle-jdk-bin.env.sh 833 BLAKE2B 2e8254aff8d35795f073fb599c1c51dcd2ecb0356b4e90977577b9cd41376c3517a72e634bfb1420c37c8149af89044f48aa374480b26a19c875d4c1b78390eb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8
-DIST jdk-8u172-linux-arm32-vfp-hflt-demos.tar.gz 10423820 BLAKE2B af3c7edab4e0bd3c785914292ac227138af25a948fa580ab466937f169806254bc12476dd1b4b320ce4997f52d41ab4851a7c82c47f33bbd3080cc49c1f8d091 SHA512 8b18204d5bfb8545db71e7b3f5f6fd6d67077116a32c6cf33cbe192a88c768a97082dbd62a436b2c75f45b3d5aac8974f8bf653dd3902121f4881193dff226cb
-DIST jdk-8u172-linux-arm32-vfp-hflt.tar.gz 81781271 BLAKE2B cf69c1964126e6f79324ac5aaca552f6984925a5e2cd1dce8417a6c61792dba908e0cd92127405f8f10fafd2b7b6a33e76d5a4f766e72fe8bc928ffa9612c9e7 SHA512 451b1b4875775ee40c8b9260f1d6437d8f5d14ba12b578eb4bc855a04d061c5dc7a320b9ab962c8f26d9a73c8975122cd31c412b44654dd07e47de8a024f88fd
-DIST jdk-8u172-linux-arm64-vfp-hflt-demos.tar.gz 10438462 BLAKE2B f72f2360b75d35443b5845669cb48d517591ad870253c6ae2a7fc341bcf12f86351125691f973f6cebb6a286d1f1763a93f38e238a00eb3562676cfcdff8b026 SHA512 91cfc64aed933c6760dd32b07609fe27edf13c7974e9ed6e5e9c3eddf47416ed97caec525a028ecdd8cf70d20d8fc2655c250befff9c37f38cba9e338d4c56d8
-DIST jdk-8u172-linux-arm64-vfp-hflt.tar.gz 78538075 BLAKE2B 2dcfe46785c1ba53af5f6f662a323c832eb708c1c1db311e97188850bf34bc543da15af35571cff1163b463770756d405b01d9f0bab8fb62a0714499433d0264 SHA512 762d6cf3e6aef60d75b0d1096c8ff5b92d17141fb5176bf74d294bb8e1921313f0f33d0424e6aa523a9237ed29fb6e7fbd76480326aa55004cea8065b0ac8d47
-DIST jdk-8u172-linux-i586-demos.tar.gz 59159082 BLAKE2B 2e1b9fc6498e49f61294e94e7177239bfc4e714eae552deaaa25211e3b6d0e95b4a0f13cd9cd67adada356697e7958b1853307bdce227228038cc5b9e0b3c3a3 SHA512 01aa66b78f944292ffc890cc7ddb19a8c45dca092e2ed49ac16b2c0ad217e2f7226f1bc48c9709755ab3cc566f086f3271220a66963de7fd184f5abb3704f981
-DIST jdk-8u172-linux-i586.tar.gz 193889453 BLAKE2B 298c81f62df9d65c756245f10d18a914598050d2f68106158c68bb9102fefca563d24706ec99fa78733da0ce29d4ab41c3eb0397603e45a6d82883f34157a5dc SHA512 1b2a8a582e85f0ea6b2ae5358e5392b351a6bb4f1277c15281861387119cce9cc0c0c8efddf483aa79eddc273812874413af24c0bafa9e39281995f9cfa0719e
-DIST jdk-8u172-linux-x64-demos.tar.gz 59218933 BLAKE2B 6569f49ac37d84ee8e086f37db32577a399595f316ceeda2be787c6c0b2f41d42e5b739957b8e9c69a6eae06cd85028dccde39f2d05c50a04be7118c69d5c2d8 SHA512 287fe6a8f1b0efdfb97989cb1364854b914f3d4fca98be395fa4851bde2fef18aee05fede24bb342886dd2d3c55c92d9855bde7472e47ceb71ffc60eacbf21ff
-DIST jdk-8u172-linux-x64.tar.gz 190921804 BLAKE2B f9c85b335432d7572e97ba384fff4e83fe43125f361cc9a357b06e43326cd8350b3fcd608113e8f346a373d50be0f2b86958bda3d99abea6289bad610e734704 SHA512 b098de15802a1053053f955e87a2ad9bc56667f249180eebe70620f6ce0a2ff5377652b72cf99c11f73ed1ab7962ca01e6c4f2f52286c0cefe8fc8bfe1229889
-DIST jdk-8u172-macosx-x64.dmg 259908002 BLAKE2B 7849a02660fbeef008df859c84655e845ffa78e0e0fd343672c8eb0c1f93e9516d777b14bad25711e587ce24d83b63547e2f901c915a0addef6c94b5cf334ac6 SHA512 7d62c294597a76c716446054825741d0ea837ddc98fc95a254e768b3cf618a1e68ca99dfc472cfa3edd2e22796c7bfcef27837abbd159d757ebe5cd63fd4a0eb
-DIST jdk-8u172-macosx-x86_64-demos.zip 59765923 BLAKE2B 127ea9b087d0768c7b6f6812ac58bc32f5edacb49c2f8c80088fba27cb55e34d5c1a5b5ad4c131b7f32ee4ffbe704417e125261d92a87bfdf2b136b8fbc169e1 SHA512 15e49030c4c5459ac6f35f62e146a7fa61a6d25858396ddbfb15d2c49b07a35ffe36720a3e06c3fa4e3f05e58ccdaa00dcc3d065f7c33eff9d6fcf4fc2dbb1ae
-DIST jdk-8u172-solaris-sparcv9-demos.tar.gz 9794438 BLAKE2B 9498f2cf09619a125280964cbbde16f90713826399beac5af0c71b91d62a2f5f74599b78694cb171f46c276beb3636e9c00ada13ac1e01c133e5e001a25d220e SHA512 deae8eb5d3927c848d9350f79d79731b2813d5e3ea5fd7b111f2dee52eb4d4cc2d277329475656ecf801cb7379cdda1d6402e0994207d259335896e7484de2e1
-DIST jdk-8u172-solaris-sparcv9.tar.gz 104179591 BLAKE2B 0d17d4085ba19e5accab1495804799460ef5c327dad603fd8ec00e88558422aa0abbc0b98dc9bd78896eb06745d934c9c784e9697980f8f2fe3533e57d55f0da SHA512 373386058b25abd9f0c6ec3b0de528449e11281e36cdd94f66d7b976d78ccaeb6cf953d41c57552b74f46a21c8ca46489978d82a72748b32d1bc0ad65f2642f9
-DIST jdk-8u172-solaris-x64-demos.tar.gz 9760535 BLAKE2B 7c607f6e716f57adf6b51fc6c8061edbe56c8eef732725bd2175209659e2260084d06355a568fdf1ec57ee5b256bb3204e24d5017a9ed2d9d388bb7b5763af1b SHA512 2bfbf248b6b0948ccb17ee7323168ca8760a29dd5980f917cd5414be7ee4b8aa93158a003ba450592be73fa9ebec29a45d85301bf4ed848468adb13ad53b4b08
-DIST jdk-8u172-solaris-x64.tar.gz 101774902 BLAKE2B eacd050346e9ed3d939cb8ff79cb1c024e6c0adb6f6677fa348461b5661ea90b8d006d799d63fbfaebc6fd71e25ccd06751fb8dc252f06ec56acfee6f7a1cc21 SHA512 7de041389aac89060091b08aac55d713fb99a7805fce94605e9798bbcc228dbc65db265d9dcbac87953d7c82b9773debb26bbe83301cd8a344233cb7045964e4
DIST jdk-8u181-linux-arm32-vfp-hflt-demos.tar.gz 9508321 BLAKE2B cd9b5990ab3faf6b2e1bcee6e141062b1996ec56b468370263fd60d908e0fa944eb3565c375dc2d543b63ed4e5552e226461d2834a2eaf26ad0af15d7acf5312 SHA512 6f7a563a7816019db2120f1e1cadfbd7d6098fa3556470ad2c38b04abf1d86a07f893bf369437ec65c031871c071bf678b51eac012537be26bf8437f7458a8a2
DIST jdk-8u181-linux-arm32-vfp-hflt.tar.gz 76488796 BLAKE2B 444c0c510bcb88a135f3c271e5b224dd1c5d37c42d59afafaef7065090f243649dfb271ce43f0eafd8127f64bda8af7862b821ab6c5cdea1fbf6bef8aa376b53 SHA512 14befd089eeea35cefff6209a57022621431320cf2c4556208cec372a06ca51a6444c42f1fca2322ae8fa5d59cb955778ed20f96f4ba540f9052d1fb84259632
DIST jdk-8u181-linux-arm64-vfp-hflt-demos.tar.gz 9490529 BLAKE2B 0b4c8385c6cfd0c1e86bafed9195ef76cfcba7368b9f719fcd72e7ed2789b7d9f519d60a6d62cfa3992bed4ffd61f424a6691f3828134f28aca1b22533365a9f SHA512 c4647f4f1ad5147fca48f9a37689517a772894d0bc30279208ae93bd11431196272cad3aff36b15116ce174bd8fa16a88ed5f4b0e264ef48a163f7a2b781c517
@@ -32,7 +18,6 @@ DIST jdk-8u181-solaris-x64.tar.gz 96580362 BLAKE2B 03007adadcf89d8c0984fab34d6d5
DIST jdk-9.0.4_linux-x64_bin.tar.gz 354635831 BLAKE2B 6d102ca812c7fcf03b611d95880af51916dde52f09f3a5b972abd6575c73e8cca1855fb50ac00aac3f4643a1e422b5fdb97a746608b5a4235d8664926a061730 SHA512 787addfcf3d4736507ad8fa54b22894a33d39bde01d9d187d5c9f3433b43c9e8b14404a8366d0bc8510faa8936274bbfa304109d3927aa323b3f8a285efaffd6
DIST jdk-9.0.4_osx-x64_bin.dmg 400672048 BLAKE2B 0bcc3643ccbc72cd98aca71823e06fd60068a7e1d72c7ce59f8e4c26bb9461a207f57ef239b244ec05c8f843666f2854b07a5f05841819cfe79ed8fefafb3650 SHA512 34191b5802c2d369f890cb1b563f77ee040b9af6ee4fc8ae81974f46afea675401e2a02803fc4345e11bab1103397dd8b583d68bb81edcdd02902cb3e595cc52
DIST jdk-9.0.4_solaris-sparcv9_bin.tar.gz 217025485 BLAKE2B 6b3d4f4701ff3349f8acce727fcfcb06ce420e54dd32d2e6b91b71aa898a8d6a293375ec2cb0c66f14a5df77a6f5b7016160572b995ad84a593e9d5c6c928184 SHA512 9418a725a33dfbedf7f692abfb92550f23fca594fa8c1b85934d601284261339f177a32af7440e0b09233b2e99b2fd7cef835c54252cec6a645ea322a389de14
-EBUILD oracle-jdk-bin-1.8.0.172.ebuild 8565 BLAKE2B 86b1dd234586f25ade3b9d045774405ab54d9f04951748c4e4020620cbc8d5fec8c35e8292bbcd45245a51ae60a56a4eccc3c90c8c69252df38d5c765df97b80 SHA512 97e116fb81d8ca8efd783c6ff20b223b3770af17b43ae9009d846a4133e2285fb526567571aa705dfad55a7adc7d08afc040d9b4805e198590d3c6013fc80d3a
-EBUILD oracle-jdk-bin-1.8.0.181.ebuild 8567 BLAKE2B b5834ddbdd76f913c1bc9ff010629e554e50ea809154ead4bde05cf10ee8cabac2db1b092629436983184ebc788f56f343167cbe715d353c1a6bed4a4ed0bc12 SHA512 ef491d3422cf4b5cc3ebbaa629bca2f3095942c214f019e7b8b2e83f80fb947de3e9a166fe4c784e09184f46a3358beddf44f4b8488271783fdd8d188a85d199
+EBUILD oracle-jdk-bin-1.8.0.181.ebuild 8502 BLAKE2B 2eecdd0539ad7080ab396b1f5af53fa256ba856d454c88bb6b5af80b8a062467ae3d3adf23987c8476bcb4d21c8a6683237535d74e33dea4549586f6903a68d3 SHA512 35d1b8277cd384a29818f3dd2a08e037c3e3ab1634c02f3f5a52564c86569648c824258dadd16ddfe35f79b85acc71579567e8e2fa4876fc54a15a4c03f454c2
EBUILD oracle-jdk-bin-9.0.4-r2.ebuild 6803 BLAKE2B 8318572886e47fee4b4c94bf795a26203da64746c9a8f5c55f7c6a46305ac8b31792c784bb9d7e17160de8133a60b8a85e4ef5f5c9be89fa050d74e357df5fc8 SHA512 bbe8631108b393c382777df2651c0212efb8a1c532745ae584625a6bc6c918408bafa7bb27de2ec67982c8c33cb20d078de99b79752afed44bfab857afec1556
-MISC metadata.xml 1200 BLAKE2B 3ed6f9dd71a1c26a5292a56f89f8ce8ed72475b0c5139cb03afb47559ae464e0ed64ae4ed5a023bc2a2d316c77805a8820762a4dbfa091f612fd2729fe2f17f5 SHA512 1c104de4d08e61cb3cb14755536e7ed74df233325a673fcd83ca930335d35e77408653a4e2f962de792e186dd7ad9457e3898be159af61842610801ea00b9d9f
+MISC metadata.xml 1132 BLAKE2B 6029eb0374ee0cfeb6f83c56dc8fd5206e297cfad6a799626ccdd2df7cac20e9c97eb7008a3ca210da474a78a26c9052d97b85f04b38aad7367d83ce78bc1c24 SHA512 eeae92c31db1c935fc4b248342428f5a34138e3b6f558927aa75c7f2c9f42ab574083e00b234752a6dcc685e9bd5f1daa2a15571d73a1a7576a35860df90e903
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index 1951d0d61240..081ccd532976 100644
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -8,7 +8,6 @@
<longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription>
<use>
<flag name="commercial">Install features requiring a commercial license for production use</flag>
- <flag name="derby">Install bundled Derby (Java database)</flag>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
<flag name="gtk2">Enable GTK+ 2 support in JavaFX</flag>
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild
deleted file mode 100644
index f71907bd1d48..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils java-vm-2 prefix versionator
-
-KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-
-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}"
-
-declare -A ARCH_FILES
-ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz"
-ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
-ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
-ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz"
-ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg"
-ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz"
-
-for keyword in ${KEYWORDS//-\*} ; do
- case "${keyword#\~}" in
- *-linux) continue ;;
- x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;;
- *) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;;
- esac
-
- SRC_URI+="
- ${keyword#\~}? (
- ${ARCH_FILES[${keyword#\~}]}
- examples? ( ${demo} )
- )"
-done
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-# important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-# under MacOS. It doesn't appear to use many, if any, of the
-# dependencies below.
-#
-RDEPEND="!x64-macos? (
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )
- javafx? (
- dev-libs/glib:2
- dev-libs/libxml2:2
- dev-libs/libxslt
- media-libs/freetype:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXxf86vm
- x11-libs/pango
- virtual/opengl
- )
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- doc? ( dev-java/java-sdk-docs:${SLOT} )
- fontconfig? ( media-libs/fontconfig:1.0 )
- !prefix? ( sys-libs/glibc:* )
- selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip
- examples? ( x64-macos? ( app-arch/unzip ) )"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _ ${S_PV})"
-
-pkg_nofetch() {
- local a
- einfo "Please download these files and move them to your distfiles directory:"
- einfo
- for a in ${A} ; do
- [[ ! -f ${DISTDIR}/${a} ]] && einfo " ${a}"
- done
- einfo
- einfo " http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
- einfo
- einfo "If the above mentioned URL does not point to the correct version anymore,"
- einfo "please download the file from Oracle's Java download archive:"
- einfo
- einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
- einfo
-}
-
-src_unpack() {
- if use x64-macos ; then
- mkdir -p "${T}"/dmgmount || die
- hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
- -mountpoint "${T}"/dmgmount || die
- local jdkgen=$(get_version_component_range 2)
- local uver=$(get_version_component_range 4)
- ( cd "${T}" &&
- xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
- jdk${PV//.}.pkg/Payload ) || die
- zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
- hdiutil detach "${T}"/dmgmount || die
- mv Contents/Home "${S}" || die
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- if [[ -n ${JAVA_PKG_STRICT} ]] ; then
- # Mark this binary early to run it now.
- pax-mark m ./bin/javap
-
- eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
- eqawarn
- eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
- fi
-
- # Remove the hook that calls Oracle's evil usage tracker. Not just
- # because it's evil but because it breaks the sandbox during builds
- # and we can't find any other feasible way to disable it or make it
- # write somewhere else. See bug #559936 for details.
- zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest#/}"
-
- # Create files used as storage for system preferences.
- mkdir jre/.systemPrefs || die
- touch jre/.systemPrefs/.system.lock || die
- touch jre/.systemPrefs/.systemRootModFile || die
-
- if ! use alsa ; then
- rm -vf jre/lib/*/libjsoundalsa.* || die
- fi
-
- if ! use commercial ; then
- rm -vfr lib/missioncontrol jre/lib/jfr* || die
- fi
-
- if use headless-awt ; then
- rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/{javaws,policytool} \
- bin/appletviewer || die
- fi
-
- if ! use javafx ; then
- rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
- jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
- bin/*javafx* bin/javapackager || die
- fi
-
- if ! use nsplugin ; then
- rm -vf jre/lib/*/libnpjp2.* || die
- else
- local nsplugin=$(echo jre/lib/*/libnpjp2.*)
- local nsplugin_link=${nsplugin##*/}
- nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
- dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
- fi
-
- # Even though plugins linked against multiple ffmpeg versions are
- # provided, they generally lag behind what Gentoo has available.
- rm -vf jre/lib/*/libavplugin* || die
-
- # Prune all fontconfig files so that libfontconfig will be used.
- rm -v jre/lib/fontconfig.* || die
-
- # Packaged as dev-util/visualvm but some users prefer this version.
- use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
-
- # Install desktop file for the Java Control Panel. Using
- # ${PN}-${SLOT} to prevent file collision with JRE and other slots.
- if [[ -d jre/lib/desktop/icons ]] ; then
- local icon
- pushd jre/lib/desktop/icons >/dev/null || die
- for icon in */*/apps/sun-jcontrol.png ; do
- insinto /usr/share/icons/"${icon%/*}"
- newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
- done
- popd >/dev/null || die
- make_desktop_entry \
- "${dest}"/bin/jcontrol \
- "Java Control Panel for Oracle JDK ${SLOT}" \
- sun-jcontrol-${PN}-${SLOT} \
- "Settings;Java;"
- fi
-
- dodoc COPYRIGHT
- dodir "${dest}"
- cp -pPR bin include jre lib man "${ddest}" || die
-
- if use derby ; then
- cp -pPR db "${ddest}" || die
- fi
-
- if use examples && [[ ${A} = *-demos.* ]] ; then
- cp -pPR demo sample "${ddest}" || die
- fi
-
- ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
- "${ddest}"/jre/lib/security/ || die
-
- if use source ; then
- cp -v src.zip "${ddest}" || die
-
- if use javafx ; then
- cp -v javafx-src.zip "${ddest}" || die
- fi
- fi
-
- # Only install Gentoo-specific fontconfig if flag is disabled.
- # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
- if ! use fontconfig ; then
- insinto "${dest}"/jre/lib/
- doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
- fi
-
- # Needs to be done before CDS, bug #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
-
- if use x64-macos ; then
- local lib
- for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
- ebegin "Fixing self-reference of ${lib}"
- install_name_tool \
- -id "${EPREFIX}${dest}"/jre/lib/${lib} \
- "${ddest}"/jre/lib/${lib} || die
- eend $?
- done
- fi
-
- java-vm_install-env "${FILESDIR}"/${PN}.env.sh
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- java-vm-2_pkg_postinst
-
- if ! use headless-awt && ! use javafx ; then
- ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
- ewarn "require this and they may fail with a confusing error message."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- java-vm-2_pkg_postrm
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.181.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.181.ebuild
index a188a558727e..4880c941762b 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.181.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.181.ebuild
@@ -5,7 +5,7 @@ EAPI=6
inherit desktop gnome2-utils java-vm-2 prefix versionator
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
if [[ "$(get_version_component_range 4)" == 0 ]] ; then
S_PV="$(get_version_component_range 1-3)"
@@ -43,7 +43,7 @@ DESCRIPTION="Oracle's Java SE Development Kit"
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
SLOT="1.8"
-IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
+IUSE="alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
REQUIRED_USE="javafx? ( alsa fontconfig )"
RESTRICT="fetch preserve-libs strip"
QA_PREBUILT="*"
@@ -216,10 +216,6 @@ src_install() {
dodir "${dest}"
cp -pPR bin include jre lib man "${ddest}" || die
- if use derby ; then
- cp -pPR db "${ddest}" || die
- fi
-
if use examples && [[ ${A} = *-demos.* ]] ; then
cp -pPR demo sample "${ddest}" || die
fi
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 606ad390eb19..c68a2da8d1ab 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,14 +1,11 @@
AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
AUX oracle-jre-bin-9.env.sh 493 BLAKE2B 938985505c591afe17468af2314fd3e15c79205d141eb032055f0dcdb252a4931662d719ac28870ae72c5fd2f0901addb3bb552fa071f637ed674061f313fea2 SHA512 d98fbbcb422258f604489e630d4a3743ab44f9bc9648fdadf62da82ab4a8ff53cf9713e28d448eaa6c9e7fa412158a2fcdb26cb91c4abb3f8100c084d14977dd
AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
-DIST jre-8u172-linux-i586.tar.gz 84306480 BLAKE2B c5763bf5631a5ac246e5bbb6eaec98bac59ece15a9779c2861b474584bc86caafa333575d03fe875c3fcd3c47cbb506b905c274bf2b621f810846411b7619d5d SHA512 a4773fe39b69f22e6a646cd6b8ebdf189252e5b686f4000e43fc418ef133ac1b3e24374693c41eed5b3063849f33bbbf70a3ffe04c52ef9b1b8ac1b8d1d0dd22
-DIST jre-8u172-linux-x64.tar.gz 81182269 BLAKE2B f9c7afc534cc9e8c60458a58a768692ee95cb9401c238974daeb4ada5aa26b45f7a0de2b1785de77fb85ceaefc717b49cf08238f31032437bb620343cd468c30 SHA512 e113138946eb95fb2c9ea8bdc5ca4b8d0c3e9ae35baaf12a04c0f5a0c9af390f181d2e39fa1c71eb8c91d734a944c9239fdc10dcfc9b8a19829dad24dd35447f
DIST jre-8u181-linux-i586.tar.gz 84309787 BLAKE2B 3aa9f47698a35ca91bbc61d2f3ec43f5ee626b74fb913eb11be8e1478d8aad780b5ea672de4dcb6bd6c598058786d26d491d01a45d5f3cb5044d1f48db26c7d6 SHA512 86e4532248e383f6bca875bf039f4f852b79260b4d5affbbd5deb9cf2ea3e585ced9f1fe054526529dcc3dfbe031a829df078a7591dbc3cf3da7913703de7231
DIST jre-8u181-linux-x64.tar.gz 81191893 BLAKE2B c29d638b7dae9cc58d9de6e43f1af397cab04786045e4956d05cd8c3825af1f27e8a77b42a9d4b9d8ab7d15aa5b94349fd8c98ca37fadb271dc0bd868d513491 SHA512 dea7bc79210d23ddc58a7013bea8386169b9ab6c156995a2190dac298919c933641639173cf3426730b248004767449c5a62057d6736f897831d8c86b36c5bed
DIST jre-9.0.4_linux-x64_bin.tar.gz 87045353 BLAKE2B ccf3c0d725ca1431261a0b38cc06851fc10651415982fa2d97f512972c088c2c158ee51710b59e04f89326dd4cbb4c1ef8ecf514af190fbdc2be07cd222fd5d8 SHA512 20310fe68c89d26a89523eb1fe583eb5706fe2458342f5be0dfb4badd1d9df6ba25b00463f080fceb7c22781ff1555a61b29d187d8b02e1f9e165120b8140c3b
DIST jre-9.0.4_osx-x64_bin.tar.gz 74599903 BLAKE2B a1bd4d51ee645347fcb735e46ee3311d34933bb0dbb20b9a668ed7b817be1d0432f4152f53f57a9fc16d6b6b7f38ea4118f5cae86a8b71143db0091c9baf62de SHA512 fc4bc4a062313a7e33943ace27287ba6e551727f0cf81d9a18f9f8c2f57b0ae00bd0d8619a65f596d75d4869fea757fedae3efdd8ba3ced58fa28b7cf93b3a85
DIST jre-9.0.4_solaris-sparcv9_bin.tar.gz 54879298 BLAKE2B fb3ce1eefdb12378b28f5af0f0bbc1d9f3252eee5646be237b2ddc0ead37ed253fb73900475777c3f67d39b47112e0c2db2a18f6a05da7c5c19cd965e5513827 SHA512 709219f51d7455c127a38953babad39b344dee1275ad0fe65a0116e8fb15a10482589ba881ccae7910acff8f00aa7856c726c03daa8f3947d742bbbc09a276dd
-EBUILD oracle-jre-bin-1.8.0.172.ebuild 6054 BLAKE2B e7319d43fc1a84633f7366f3bc1bf691db58aa40de51e163e57cda9be6c23736e35201b01629722d3cd2f35f55c805d7b75abf11db03812e363dfe37e734377e SHA512 8c8d6a0575e4807d74feebaafe10bcf4bff5aceaaf46e2e3bbce261ca4e2613fa2fae915a09a25a22da2e71351c38206ccb62f98dc16ffcfbba29a49309b2c87
-EBUILD oracle-jre-bin-1.8.0.181.ebuild 6056 BLAKE2B 8730c24288491eda0e847db7de2ef48985a12d39e264ae48a347b49f4b7050bf8befd0e2b3e4d0e4c8afcded3ccec13213198822f4dd4e4a8a74a6a309714f8f SHA512 b322401f569e7d76f139c963af76cc41916d1e64de0feee184d44c82b85df2d2bdb01d1387ea5f31499adb8a97b8bfe406654f33b7e3e0921d2b2e67a226f8d2
+EBUILD oracle-jre-bin-1.8.0.181.ebuild 6054 BLAKE2B e7319d43fc1a84633f7366f3bc1bf691db58aa40de51e163e57cda9be6c23736e35201b01629722d3cd2f35f55c805d7b75abf11db03812e363dfe37e734377e SHA512 8c8d6a0575e4807d74feebaafe10bcf4bff5aceaaf46e2e3bbce261ca4e2613fa2fae915a09a25a22da2e71351c38206ccb62f98dc16ffcfbba29a49309b2c87
EBUILD oracle-jre-bin-9.0.4-r1.ebuild 6278 BLAKE2B fb43030f8341cdd68644921776ccc397bd2bccb5d1df0112e14bf33d2c9e6c1414323b13cf566d828ae53f6bd0db5af546bdad7137eb011309a37591a5650d7f SHA512 f52656f65e214e26bf9bdbbf411c75392f41247071d95ce2976fe2eb21ea17b41181376f2bb15a87839745bc76a85bb08a0779dc2702b3ed45bae9e20ffb61d3
MISC metadata.xml 996 BLAKE2B 0ceaf014bbef2817e869d5364997a44f77be90717bd01a09114b18e9318f58b61e3f4048f3b22a7ee8430a1042695f313066e996c15db71ee0775cf73aa7f1ef SHA512 043f1e701ac085678dbbb662994f6b67c78634990d721c65de97b392555e3a2fe5bfaccbe00f48c5dbd7c4e48837c6662d70306bf7cb3485ee3b2efa440b7afe
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild
deleted file mode 100644
index ca2117f3c69b..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils java-vm-2 prefix versionator
-
-KEYWORDS="-* amd64 x86"
-
-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}"
-
-declare -A ARCH_FILES
-ARCH_FILES[amd64]="jre-${MY_PV}-linux-x64.tar.gz"
-ARCH_FILES[x86]="jre-${MY_PV}-linux-i586.tar.gz"
-
-for keyword in ${KEYWORDS//-\*} ; do
- SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
-done
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-# important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-# under MacOS. It doesn't appear to use many, if any, of the
-# dependencies below.
-#
-RDEPEND="!x64-macos? (
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )
- javafx? (
- dev-libs/glib:2
- dev-libs/libxml2:2
- dev-libs/libxslt
- media-libs/freetype:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXxf86vm
- x11-libs/pango
- virtual/opengl
- )
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- fontconfig? ( media-libs/fontconfig:1.0 )
- !prefix? ( sys-libs/glibc:* )
- selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip"
-
-S="${WORKDIR}/jre$(replace_version_separator 3 _ ${S_PV})"
-
-pkg_nofetch() {
- einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
- einfo "your distfiles directory:"
- einfo
- einfo " http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
- einfo
- einfo "If the above mentioned URL does not point to the correct version anymore,"
- einfo "please download the file from Oracle's Java download archive:"
- einfo
- einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
- einfo
-}
-
-src_prepare() {
- default
-
- # Remove the hook that calls Oracle's evil usage tracker. Not just
- # because it's evil but because it breaks the sandbox during builds
- # and we can't find any other feasible way to disable it or make it
- # write somewhere else. See bug #559936 for details.
- zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-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
-
- if ! use alsa ; then
- rm -vf lib/*/libjsoundalsa.* || die
- fi
-
- if ! use commercial ; then
- rm -vfr lib/jfr* || die
- fi
-
- if use headless-awt ; then
- rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
- bin/{javaws,policytool} || die
- fi
-
- if ! use javafx ; then
- rm -vf lib/*/lib*{decora,fx,glass,prism}* \
- lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
- fi
-
- if ! use nsplugin ; then
- rm -vf lib/*/libnpjp2.* || die
- else
- local nsplugin=$(echo lib/*/libnpjp2.*)
- local nsplugin_link=${nsplugin##*/}
- nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
- dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
- fi
-
- # Even though plugins linked against multiple ffmpeg versions are
- # provided, they generally lag behind what Gentoo has available.
- rm -vf lib/*/libavplugin* || die
-
- # Prune all fontconfig files so that libfontconfig will be used.
- rm -v lib/fontconfig.* || die
-
- # Install desktop file for the Java Control Panel. Using
- # ${PN}-${SLOT} to prevent file collision with JDK and other slots.
- if [[ -d lib/desktop/icons ]] ; then
- local icon
- pushd lib/desktop/icons >/dev/null || die
- for icon in */*/apps/sun-jcontrol.png ; do
- insinto /usr/share/icons/"${icon%/*}"
- newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
- done
- popd >/dev/null || die
- make_desktop_entry \
- "${dest}"/bin/jcontrol \
- "Java Control Panel for Oracle JRE ${SLOT}" \
- sun-jcontrol-${PN}-${SLOT} \
- "Settings;Java;"
- fi
-
- dodoc COPYRIGHT
- dodir "${dest}"
- cp -pPR bin lib man "${ddest}" || die
-
- ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
- "${ddest}"/lib/security/ || die
-
- # Only install Gentoo-specific fontconfig if flag is disabled.
- # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
- if ! use fontconfig ; then
- insinto "${dest}"/lib/
- doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
- fi
-
- # Needs to be done before CDS, bug #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
-
- java-vm_install-env "${FILESDIR}"/${PN}.env.sh
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- java-vm-2_pkg_postinst
-
- if ! use headless-awt && ! use javafx ; then
- ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
- ewarn "require this and they may fail with a confusing error message."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- java-vm-2_pkg_postrm
-}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.181.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.181.ebuild
index ca11616b0bc2..ca2117f3c69b 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.181.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.181.ebuild
@@ -5,7 +5,7 @@ EAPI=6
inherit desktop gnome2-utils java-vm-2 prefix versionator
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
if [[ "$(get_version_component_range 4)" == 0 ]] ; then
S_PV="$(get_version_component_range 1-3)"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 5196fab3c2dc..26dfa785156d 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -2,8 +2,10 @@ DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
+DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
EBUILD protobuf-java-3.4.1.ebuild 2094 BLAKE2B a0a5f55af03a0ddbb447c00a407318e704518d2202b93d8cff929fb8bc9b5954d31e148ea0fbff642e6279b71552034aaf8d3e655f839e510a3520e2f6bd38a7 SHA512 c2646fff280006c14db9fc3fca89375137723d7fe3001b7a76825963af5e822cadc32e99fe66540f6471f99757800158a04bb0607169f17b970763c33333e38c
EBUILD protobuf-java-3.5.1.1.ebuild 2091 BLAKE2B 3bef86c71300d1e06e603a43c15beef0a9fdf66d052923720b060422344741b6f49366b67782db63bcf2e41261163ff9720c0bf1b7d9b660034963f08b7a4792 SHA512 92aaecdf9edd8e1b6980f7279928ae7dffaa4f3716e2af21c65c501445d633d8a8da9c154fed0dc2253c8a04d69952d99d379417d6e992afa56e32f464d029d0
EBUILD protobuf-java-3.5.2.ebuild 1810 BLAKE2B f6e5af06878a4c3eb03e9fb9dd86903c9de483cb6e8fd162d30161dbe55264743e32f8d2fffc76e0e674b94ab9627e023caf498a15a1b925474d38399fb5fd8a SHA512 2e50f06a9fe16aba53b05d364e112d72625266fae494ef40a1b66e3977b0acd28a9574c3b0ba9a90448830384864599f090793d5eccfb4ab45b96bcf73234a4a
EBUILD protobuf-java-3.6.0.1.ebuild 1108 BLAKE2B d014cfd67c18770561a8a4a7abb45da69daa579b4f25224f9d904585ae419b75bb27493e3f736cc61fe8c9a359bb3498944b667d18361a6a0be685708b609ac4 SHA512 2e9818c35adc7e42448af1eaaa7e9acd072344d3b2caa6a8e473b83d198e55d3822337d3a3635ed2db369af9ccb519a63b8d20ec445d0555aa8a13be346cf556
+EBUILD protobuf-java-3.6.1.ebuild 1108 BLAKE2B 0118b97e8a317b599c87984997d77a2278c99748b450ccf94e42bf4676cd7f4ce7dd70156b9941ff35a41836208cc6d4d53098a72aa33cc1b4d73fbd2bf34a92 SHA512 c5db6f6557a8630ee7229470be54c2c5f573b45642f6a77dea5b3647978fa7a4ead236fc8de5f539aa6dc9e3873cf2bb9ff865ca58477e1fe78f1eebd5651173
MISC metadata.xml 796 BLAKE2B 730596798d9434732683c07bf8f4df861e3a2a4f0b681b642f6226e749729cbba260623c3d116e0dcc059fcce12df365e7ef1890139a570de37bf5d994d9035d SHA512 10479327785c7afbb86288465782b3c4af5b8901a5d63c7989bdebdecdda2ea44990b99cf74e0a1ed87d686e74991b65237a1e3e04b6b87bee510c70e810503b
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
new file mode 100644
index 000000000000..b616b3196431
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="~dev-libs/protobuf-${PV}
+ >=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+ !<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+src_prepare() {
+ default
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ "${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+ JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+ JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}