summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin96501 -> 96499 bytes
-rw-r--r--dev-java/ant/Manifest2
-rw-r--r--dev-java/ant/ant-1.9.2-r1.ebuild2
-rw-r--r--dev-java/bcpg/Manifest2
-rw-r--r--dev-java/bcpg/bcpg-1.50-r2.ebuild73
-rw-r--r--dev-java/bcpg/bcpg-1.52-r2.ebuild73
-rw-r--r--dev-java/boilerpipe/Manifest2
-rw-r--r--dev-java/boilerpipe/metadata.xml5
-rw-r--r--dev-java/gnu-classpath/Manifest2
-rw-r--r--dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild4
-rw-r--r--dev-java/icedtea/Manifest2
-rw-r--r--dev-java/icedtea/icedtea-3.7.0.ebuild7
-rw-r--r--dev-java/java-sdk-docs/Manifest6
-rw-r--r--dev-java/java-sdk-docs/java-sdk-docs-1.8.0.172.ebuild (renamed from dev-java/java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild)2
-rw-r--r--dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild4
-rw-r--r--dev-java/json-simple/Manifest2
-rw-r--r--dev-java/json-simple/json-simple-1.1-r1.ebuild30
-rw-r--r--dev-java/lucene/Manifest4
-rw-r--r--dev-java/lucene/lucene-3.5.0-r2.ebuild2
-rw-r--r--dev-java/lucene/lucene-3.6.2-r2.ebuild2
-rw-r--r--dev-java/oracle-jdk-bin/Manifest32
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild (renamed from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild)2
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild2
-rw-r--r--dev-java/oracle-jre-bin/Manifest8
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild (renamed from dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162-r1.ebuild)2
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild2
-rw-r--r--dev-java/protobuf-java/Manifest8
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild67
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.0.2.ebuild68
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.1.0.ebuild68
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.3.0.ebuild68
-rw-r--r--dev-java/swt/Manifest6
-rw-r--r--dev-java/swt/swt-3.7.2-r2.ebuild2
-rw-r--r--dev-java/swt/swt-3.8.2-r2.ebuild2
-rw-r--r--dev-java/swt/swt-4.2-r3.ebuild4
-rw-r--r--dev-java/tapestry/Manifest2
-rw-r--r--dev-java/tapestry/tapestry-3.0.4-r3.ebuild2
37 files changed, 233 insertions, 338 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7dc6f917fa7c..19d3f86c9783 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index a9046abfba23..a33b9c825658 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,3 +1,3 @@
-EBUILD ant-1.9.2-r1.ebuild 2027 BLAKE2B 3de868dbb21fa1a69de1948ba00661fc7027feb5bb57056757b2e5b0a8a73b9b1c17f9eb64aea4a87a4d49682481a522b4bec2e4a2b87793d889aba77849c26f SHA512 2b0188c2770cd020fd258043a9f8f3aff7e9df970f0f86a30ba1b39eb3edfa79dc831b12183f8b70bf928dd1c68e553dc7a21d74a164d817fc6e78ce146cd7a3
+EBUILD ant-1.9.2-r1.ebuild 2026 BLAKE2B 3dec8cbf5fca57f24f3e001a97a36167ca3df2e767cee501aff84406398fe952126b8e106dc8531e6df57804677c1ca1e8641e5fa5bdc23214786aa605544ff7 SHA512 e77efd2309dd0acec5334fecbc8b40240b647d7758abccd6b736877968cc2baaea910f6c5d9fb4e306e4b6b64279adc24b9c67e297d0aec9927ca9b9c1e7dc33
EBUILD ant-1.9.2.ebuild 2102 BLAKE2B e024fddb5059511959821e2a1b56e5da26ac1a9d07708cc70ffb0425118294c7418d59d362ed56ebfb61166c8315f8f81006148a99beb2d5611e9e5f95dddab2 SHA512 e384f395421d69568246bdb370d7b3e40a06f4d96c727a090ce64997b20fec585680e36176507c132b74b44716d72559a781d8acb71c86dc749deafe48785bb9
MISC metadata.xml 1159 BLAKE2B 393c61676e20af2acd08d2ecee954ea68ddb794f3aaf52bb576f72049b8807b25b8122919254d41cc249c88b375283d459193fe2c05dda46ae344e6774674ca2 SHA512 daa64360ccca2ae691a7d47b980cc35eb0c4577fd99493b235c4931861edc60a0bce1c7da5d360fd58c3c426421a7bbf41a8d9b463783e212dbae91f32a06a49
diff --git a/dev-java/ant/ant-1.9.2-r1.ebuild b/dev-java/ant/ant-1.9.2-r1.ebuild
index 8985d241e917..6f0a35eeecd3 100644
--- a/dev-java/ant/ant-1.9.2-r1.ebuild
+++ b/dev-java/ant/ant-1.9.2-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://ant.apache.org/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+jsch +log4j +oro +regexp +resolver testutil"
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index 5d8e52dc919e..b21ac5d01952 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,5 +1,7 @@
DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
DIST bcpg-jdk15on-152.tar.gz 748424 BLAKE2B f847fa95ae4eff6c9c95f23ad318d3b967bd224a5dbaea20f8e904a50173076e16723519e8985d4afd2ac02c6a7fe83399e0c6005971bd460b41055c4866a506 SHA512 1619a8cd4024129876266415406882ac5df3dd84fd3e01d7593304874ad641fe72ae95150d0e4414b294e2e5ca8eb39e41a25658f9502b4cd9622fbf0f3d45a0
EBUILD bcpg-1.50-r1.ebuild 1515 BLAKE2B 25e57aba985350e8922eb0edf9f6a12dbc8f5a2750e4d45c1cb9eb0df0b9ba909ac1eb8d2aa151bdaaa123e7e6accce4eb6182fdd9105c39a2414de9eda46c07 SHA512 eddecb8d3365fe745bf132119d52a46d12a835973e5c9e3e0121822f53b525e8ee24a2b3a6c98920082c24cdc7daf2da6d9d27784abcc424dc41dfbd6a185558
+EBUILD bcpg-1.50-r2.ebuild 1536 BLAKE2B 00122a19f7a787b43507a1a73ae345bd1783efca518818511ea8d8717b42706a2c30f9af202811be5ca60317e3e18250459aa9dd82564daff4e7cd27e36207af SHA512 ad42a74689b4012041e201121ccd134af357b6296f32a4bcba1faad79b03c4ed17579e0e514bdd8c9bcf7f628ad9602a1d8de0f0ff52841a984c408f3ed858cb
EBUILD bcpg-1.52-r1.ebuild 1515 BLAKE2B 72b4bf72e59b56261b478537c5a29ac660a1504ba824c69c17355d61bdc9284b90e4aaac577856c145576eceff0ed1d453fad2fd22f6fffa70b2c4ec0f00cd3d SHA512 fe5f38bbb296c0217acf3564e403b184dae5e3e87f7a782b55a19e316869fd41853e9c8d7825e51a6825020965c5a7f30c884ba36ccfbb030555d5ddcc948814
+EBUILD bcpg-1.52-r2.ebuild 1536 BLAKE2B e98881a8414cd34669bbe93ef2e2d70b5cf6c69ed1233b1eb6e7f019cc2e3162d6564087c1c594222eb1a9c7c18e88f8d52331ef00ca42a4803c5bf62529f3b5 SHA512 992062b60f1d753f497739101032404483e86af1a1f01121d541d17b6b122f6c16b2e5ab553e67a6292b3644b69137a8c1ff38d7551d36b22bc490f4d8d2a95c
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpg/bcpg-1.50-r2.ebuild b/dev-java/bcpg/bcpg-1.50-r2.ebuild
new file mode 100644
index 000000000000..6a89f6e93494
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.50-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but
+# since bcprov is not slotted, this can cause conflicts. Needs further
+# investigation; though, only a small part has tests and there are no tests for
+# bcpg itself.
+RESTRICT="test"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+
+src_unpack() {
+ default
+ cd "${S}" || die
+ unpack ./src.zip
+}
+
+src_prepare() {
+ default
+ if ! use test; then
+ local RM_TEST_FILES=(
+ org/bouncycastle/openpgp/test
+ org/bouncycastle/openpgp/examples/test
+ )
+ rm -rv "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ local cp="${PN}.jar:bcprov.jar:junit.jar"
+ local pkg="org.bouncycastle"
+ java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+ grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+ einstalldocs
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcpg/bcpg-1.52-r2.ebuild b/dev-java/bcpg/bcpg-1.52-r2.ebuild
new file mode 100644
index 000000000000..a819a8dcd7e9
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.52-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.52"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but
+# since bcprov is not slotted, this can cause conflicts. Needs further
+# investigation; though, only a small part has tests and there are no tests for
+# bcpg itself.
+RESTRICT="test"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+
+src_unpack() {
+ default
+ cd "${S}" || die
+ unpack ./src.zip
+}
+
+src_prepare() {
+ default
+ if ! use test; then
+ local RM_TEST_FILES=(
+ org/bouncycastle/openpgp/test
+ org/bouncycastle/openpgp/examples/test
+ )
+ rm -rv "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ local cp="${PN}.jar:bcprov.jar:junit.jar"
+ local pkg="org.bouncycastle"
+ java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+ grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+ einstalldocs
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/boilerpipe/Manifest b/dev-java/boilerpipe/Manifest
index febd2b0c2407..2be1d12df8c2 100644
--- a/dev-java/boilerpipe/Manifest
+++ b/dev-java/boilerpipe/Manifest
@@ -1,3 +1,3 @@
DIST boilerpipe-1.2.0-src.tar.gz 46279 BLAKE2B 21e146bc772b6025dd22939fab64777bbbb55b3016ccb9627dfb7c1c4d3eb2fd61243aae2e22cd973e77a11eccba45b9a5837f08db265edb703779a46f08abe3 SHA512 db9349213debab932d2470e46f1e80366d6a6ca99e016b6f9ed4887881eecd4132e9aef29b8e4fe8282d1375d60b88a99d9aa43e249d6b673739ec017d2472a6
EBUILD boilerpipe-1.2.0.ebuild 800 BLAKE2B 52acc306bf9782794dfd21beb710851a8a59df3be8ab1c990bb6bd6d8c6f45295b518ff9a7eb186da525c8285639b9b9aff7cd261ae7d89feaa2d8d675d6682c SHA512 13826a7c84190fabb2ffeed05e9fee0e3dcfaa63ea1f0f6e9cb70db9433ed803f0da87f5731853bb73ff744b9e9b6c2f3c65cc4422c47842120c192be4167e19
-MISC metadata.xml 342 BLAKE2B 2da17b16dd8d6a358db58857d9b76f195c736dffe067aa8df906e1a711a47a08792ff797c00cec9fc66078436e15ada131d8b40a636a605c63b1fc8a1db5b581 SHA512 0fa0852735c9d0230bbaf00cf2dd09c1d65a0d31e0a763ca0687387f1f8bbba3356d7aac6b70f63b55c80d2700f4158c0d504e1ac04abcef70b12398f43165bd
+MISC metadata.xml 255 BLAKE2B 287d65f3a6609362260b1406a0226c14b3be2b9ed17b5c4f422e718693a57b37c871914d2e8c60609eddf7339e4aba2fc257585e4a58c174f07395077a1a7485 SHA512 d11126781bff8c65605f533936f2817d35cfd1d88e89b33cc37ffa5af1d2b93bf22987c822b710719e9a0c0839563990acf4082ee30a5a0af6b0df3f8377ab62
diff --git a/dev-java/boilerpipe/metadata.xml b/dev-java/boilerpipe/metadata.xml
index 010ffb802f85..07ba689dd861 100644
--- a/dev-java/boilerpipe/metadata.xml
+++ b/dev-java/boilerpipe/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>ercpe@gentoo.org</email>
- <name>Johann Schmitz (ercpe)</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">kohlschutter/boilerpipe</remote-id>
</upstream>
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index d47b68e51b22..4ca56d385d18 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,4 +1,4 @@
AUX gnu-classpath-0.98-freetype-2.5.3-support.patch 1192 BLAKE2B 18a8c2a6516def598c614a50c7c260c13ba7304a1d189ef0d0d7ffbea37b2c8972fdb0449eacfe49deb58c3aaaac44b36593d2b3df745066f64889a957e08d51 SHA512 5832a27caf0a064a29fb00a186d116193af98c0f2a97ef868be7ca0cab1aa51bd32df90f32ee43f9ecdbda52ea3b264f6f3bbd48d8b8f7cb4d1e0a1444f716fb
DIST classpath-0.98.tar.gz 11021342 BLAKE2B 8bd0c55153569b34dfde767233ed48f6ebf0f507d34d991a410b0e40a2ddfbd20d4568697265f8544823337f568a916288e92c096b39fcd5c67afc82ddfc3cc3 SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f
-EBUILD gnu-classpath-0.98-r6.ebuild 2955 BLAKE2B 022765bb548d587fae93c3bb4b2d4294877b6593831e7d889b6e73500e039d3f0720d042c85d984e4cea1ec2682693752eaaaef029cb58e20f256829239852c0 SHA512 01f28c3370f304f3a7dc0c9cb847b859fd61857fc40d2a0539d5e2ec62740ec2106953eb384e080be70b5406a82b109c8d20153cb709917552588d54ba30504a
+EBUILD gnu-classpath-0.98-r6.ebuild 2958 BLAKE2B 2a2e72edc149a07ac7175888989a5257dd8f9fb48c719f2570bf18ac429622bf23480b9bf29104482ab08234e38f239e2aca14624f8e4e74a819193fff546f2b SHA512 590dfe5b99b2b61d6123d33795599f02d02fafc02ef6e033d1dcba667e211024db7771165f90ead624a779c9c2816d5af3932a583e9e212a977d065748a1cb15
MISC metadata.xml 703 BLAKE2B 221917dd1d999eb06d4cd4d896f1ae60f06f425442c27cea566c2f19a4366064fc45545e43dd72983ae3810cb8c8753c128f3b690a5234910828dcda2f03131e SHA512 e97e2eb0800c588b0b50a108559cc164df1ae33f626b089c5ed93476e69ce0dc9d47f043988beed9db9c79e6bc9479f0923f8dfbd61c4a6c619dacc8d7863865
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
index 465018f8f624..9229206c5f76 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -39,9 +39,9 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
DEPEND="app-arch/zip
gtk? (
+ x11-base/xorg-proto
x11-libs/libXrender
>=x11-libs/libXtst-1.1.0
- x11-proto/xproto
)
>=virtual/jdk-1.5
${RDEPEND}"
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index a4920e5f2ff6..18eba43df41b 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -13,5 +13,5 @@ DIST icedtea-3.7-shenandoah-773364cde857.tar.xz 6948788 BLAKE2B 16dcc546ee7e0201
DIST icedtea-3.7.0.tar.xz 1487360 BLAKE2B efef75c5ac615c21310f16f50fc425c5a760767e581004e7f545749f67cd1e0b238de735787a01e5a85ca6b72c351ee32a7c8f0aa3ec34d6dfe6a8e2e024ca06 SHA512 f2dc2464139d18385d4734e6380d7c4efc69f0e5b507218397032e0ea1b2e0d96688c88979de90a1fcd453809a4b1d6081ce2970f4e3cc73a236bd2d17bcc704
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.7.0.ebuild 13880 BLAKE2B 1f9bbc40b20810a1bdc39e874d46be54c719558a8d3d82ba293e7f38469effb1ebe8e16d826d2387a966e4ec86fcae34ae5044bea6575c734dcd5f541eea37cb SHA512 bf9f05f87920ed36721efc1934f706185520c05f2e0f7752256c70721744672d78f1c0b92e25701cacebf761e789ede5af38d3f3a391904a994cdd5829aacb84
+EBUILD icedtea-3.7.0.ebuild 13807 BLAKE2B 93daeaf425e9f5e2f9d8cff2ee860f0c6ecea434fd1a3bfab16c2beacc14cb03c4582740dce1631a0ddcd6f14045114ba6369763cd9ab78dee15ece8c1e35c91 SHA512 db5020fe05c94030a71a98aa3cadf11e78388c37f31b5709103d61c910bddea4ec2e29fdf5573d270473fff0efdb425432cc88bddb3b272bebbb7c8dc9da6335
MISC metadata.xml 1957 BLAKE2B 46e8fcdad93fb80f91e0af3b2cabfaecca347a17537ce9dac81b76dcd85e5b1532cb63bea6dad6d1d5d9423c1a08315c43ca54b559370e44c413ab92a5ec5649 SHA512 cbfb9a87cee0ab7d7245f758840c96b320bd8f50567d9181830155d849dc411fb17f2e0dde6ecbb840fe48268f5bc09840e3cce25edb73224286c854ae38db1e
diff --git a/dev-java/icedtea/icedtea-3.7.0.ebuild b/dev-java/icedtea/icedtea-3.7.0.ebuild
index be3cb438b0bc..8605d13cd9d0 100644
--- a/dev-java/icedtea/icedtea-3.7.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.7.0.ebuild
@@ -86,13 +86,10 @@ X_COMMON_DEP="
>=x11-libs/libXtst-1.0.3
x11-libs/libXcomposite"
X_DEPEND="
+ x11-base/xorg-proto
>=x11-libs/libXau-1.0.3
>=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
- x11-proto/inputproto
- >=x11-proto/xextproto-7.1.1
- x11-proto/xineramaproto
- x11-proto/xproto"
+ >=x11-libs/libXinerama-1.0.2"
# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
COMMON_DEP="
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 6fbde8398194..73c60c6f432d 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,5 +1,5 @@
-DIST jdk-8u162-docs-all.zip 93476221 BLAKE2B bf871623cbf3bebd123edf73844d574cb9b88b4117a1c3a976654693e923c1a34249b5ef0c6c7812be29ed8581a1699b53536550583e666f844239ba554a1225 SHA512 944b93db6a2b471c2507786c45c50715222ad904c0f537c0e3cdf47a4b05ce560f8543377fe1c2217a79e064453aefdd70fafd32534131da2f246f6e39e60ebb
+DIST jdk-8u172-docs-all.zip 93491812 BLAKE2B 7d670aa054a73c9711b78b6094a8e4f8c8b8b774543a9b067acce7cb2e572d6536ad0c525d1ac112f2585a648b3209ac63df0d3ac85bf8c23ec91937b70add01 SHA512 6b1157822fd7d25bd4bb56394e8243e3e315ce772a908bb05fe260b5f1d6506f336b8afca6febef7caafcbf9463b4713fb27b657726ee4b6578d2e6732b9a2fe
DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
-EBUILD java-sdk-docs-1.8.0.162.ebuild 1429 BLAKE2B 5ab8d1f6cc59a75b23c2c80a46161f1cf5c0b2c631f59e5d33d3717ec02f76818a6f8bb0d48c60430ee4187d10c581c1dd8b9661a431ab88ed87b62804713001 SHA512 bfc0d55bba0e3789b2e77258de3c9be899e8a043aa1e247f53e6bc853cfef0a2aca589504c70656d44f9f1d29f314772b41d409322a8d5ac9092d9a2e30f895f
-EBUILD java-sdk-docs-9.0.4.ebuild 1262 BLAKE2B 54e63b3bb06bc674183f6cdfa1b123b187736521975b3c5758ff56c5c1c698ce73e185b851cd5437053d9613b19b5396ef762028afb9f430ab94663522bf2a2a SHA512 0f9c868a0da7f2f7ee482f1b2b606cd95ae382431779038b4376813ae6f1561bc62406d2ea9506c271cf0c12326ddbf92aacbff6c4fcac0b845a61bc3d362ba2
+EBUILD java-sdk-docs-1.8.0.172.ebuild 1444 BLAKE2B ac3a3567183b958e4c4d56ba8ea0e61ca844ffecd76d19f536f3fb1598f987173fe3075ad2b015f2763406f59700cdf5b82b2e33ded6d49f917084b83d591592 SHA512 208368ba6143f60dbcce2d7e0098be90294470d5c539a69c3003ca9e514e35755ec6c3f50b4dec590fe11eb77ca3b7e2f082530e32b11c3146eb0a2a11e4cbe9
+EBUILD java-sdk-docs-9.0.4.ebuild 1277 BLAKE2B 0e2610b8541e0470b9ca4d093ffdf46dd244694b13f23aa5ad7e139a9b5085795efba9553bf1cbfe68b64ff1bed3b8eec51b27c1f106da69b964aaa17fb8d84e SHA512 7772dd3232e6ed790570c82cf23a67006944cdd7676d4e4d6ce69e19ee9f8f3c4cf4fc18cff85bb68c0f50173bc92bb5442ac0050b73aebe662b819e7866d532
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.172.ebuild
index 49c3f8aaeb78..1791bdf62037 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.172.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/docs"
pkg_nofetch() {
einfo "Please download ${SRC_URI} from"
einfo "${DOWNLOAD_URL}"
- einfo "by agreeing to the license and place it in ${DISTDIR}"
+ einfo "by agreeing to the license and place it in your distfiles directory."
einfo ""
einfo "If you find the file on the download page replaced with a higher"
einfo "version, please report it in bug #67266 (link below)."
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
index 865ee06d1665..35edb42957fb 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,7 +20,7 @@ S="${WORKDIR}/docs"
pkg_nofetch() {
einfo "Please download ${SRC_URI} from"
einfo "${DOWNLOAD_URL}"
- einfo "by agreeing to the license and place it in ${DISTDIR}"
+ einfo "by agreeing to the license and place it in your distfiles directory."
einfo ""
einfo "If you find the file on the download page replaced with a higher"
einfo "version, please report it in bug #67266 (link below)."
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index fc920768141f..b4f317d14642 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1,4 +1,6 @@
AUX json-simple-1.1-extra-constructors-from-azureus.patch 1943 BLAKE2B 61ae7ffc7ab463eb6375395447318c3d07695f50f4b7fb288855479a4c20ee49e946dc8016000cb93dd7de7615a69749065fcb0edcd5f1351dc5c72d232a6018 SHA512 603d6f580e4e546a0eb230b521416b7d5409ec896359f4ccf5755adf79bd666da9cb0b1496b58439323b1c8cc18ebf5f550e3c1fd4894ba85b89aa2854584380
+DIST json-simple-1.1.tar.gz 22154 BLAKE2B 594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570 SHA512 f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
DIST json_simple-1.1-all.zip 44814 BLAKE2B 09a1bf3213c6724d167a514c47e9a4084c217687633f075d0a1019be253d3b37e1a26c7e291570f73a5942c5d7e586d4a8ce78e938e755cb3d8150f82dd0306d SHA512 02a5300456dbe2a1b5331b247ad964237d11d2281b35351f1f7bed6867eaf5bb6fb07ca1a50f87e30cd93221c5119e8b5f6f273357ab5fcfeda164ec119c0404
+EBUILD json-simple-1.1-r1.ebuild 591 BLAKE2B 5dd45bf8dead68b43cd9c28a2a55ad9e13a46d14956edb95b6560d6f0c07b4c960a55b71ddff8fe99898fe812272b01ee7b8bb27dcc468234afbdee964b0a846 SHA512 e1f5bfaa2d7ae6cb525cd1c129d10661e62a702362f3a6ad8977c409094feab9d90be0268b50050310665003e4dc6d4defa60a01655300b2db1028d792c52ac8
EBUILD json-simple-1.1.ebuild 1003 BLAKE2B c0e9bb5eedd357e034bb3803d5a03cc6289e98ccba17b3c9e12263405e45d530dfc0239e236ffba354e0c5d041a442a9f543a2528bb48731155489888677c8f2 SHA512 2db813f156311abcf75e6c518cb96e1396c8a27ea9c0de11615ca860be88e211ebc137b772d01cb39b6a5087c4621f316c2289a2db0221ce194b98151316aade
MISC metadata.xml 884 BLAKE2B 93c8109aa04543cfda3354252a56ffd6520106daae5eaca5c428e6a001a8b2d87a3ce3d416c70fb06fb28e22f2b399be0d0911ee59856a9feaa26614f39c0ef5 SHA512 c62d038f6913bb8beb903930ed6d354c89b9b5fa231d9096690d263ee35812aad52696a3d15d74c83d99c02392f5ed3ab997bc6e9d2532cbb4ea12cbaab1ebe9
diff --git a/dev-java/json-simple/json-simple-1.1-r1.ebuild b/dev-java/json-simple/json-simple-1.1-r1.ebuild
new file mode 100644
index 000000000000..a91c4fbc828d
--- /dev/null
+++ b/dev-java/json-simple/json-simple-1.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="tag_release_1_1_1"
+
+DESCRIPTION="Simple Java toolkit for JSON"
+HOMEPAGE="http://www.json.org"
+SRC_URI="https://github.com/fangyidong/json-simple/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+
+src_prepare() {
+ default
+ rm -rv src/test || die
+}
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index f29db909d031..38e84a13b53a 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -5,7 +5,7 @@ DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40a
EBUILD lucene-1.4.3-r4.ebuild 981 BLAKE2B c506d4a98402026bca8e4c968bb9d56ecaf5ab5f37891834b587db8069c32bc41ac2d8f75a7c63f26a4eb80929a3fe9b6310ba3577bad32cf505809971cbd568 SHA512 abcbbadabe7dd9dccd2fa59c8888b6871e0104d803139a53549341f2a691975de2a3e9092c7dd4c2738dd89038fa154fd32dc91c293a8373bd012408bf2d1d69
EBUILD lucene-2.4.1-r2.ebuild 1804 BLAKE2B 09b9ec3959dce0cd93fe8db4f091c4734c61bad7efb0717db0816a357945f310c866d732054920f86755a63849b500d0739f8c7f3f804a3b90d3244baccd560f SHA512 c8558fe7bb43e2bbe40daca7a05fbe5de006ab8aa8eac810e1528a12b5de84e030dbdf724382cfd6667a0c8c456e9b86ff66e8cfa15f5efc9a7a3cb8a6b84e35
EBUILD lucene-3.5.0-r1.ebuild 3514 BLAKE2B 4e944c04e995278521268166d300e292c21b477969505de26f56d2450c2461e2fe76040d52ab81218176ac52a1104de7de37f7f05e942975789710b5304e2b08 SHA512 c1cd0378af15f5c555cbb9459415552e10861738107a321b3023ce57b569b8733d6779cdb87bcc75ff1f2f526f8cc87a74aab8402fbc3d2ffdedab5a93c805db
-EBUILD lucene-3.5.0-r2.ebuild 3513 BLAKE2B 3ea6625ecccbe40f891cac43caf2551c68f9736d6ea9c42bdf583a2e222ba8e4a55ba01f56b2749b87745c64bfed1bcff8395b51239e62763c166ff472177ac9 SHA512 1fdfc456521cab5d8c8c28f7553997968bb030682496fa8f46bc095446341cea2bb5361ea44cbcb901c575fe35d7635f9643cd8baab414532ed9ea30efa393df
+EBUILD lucene-3.5.0-r2.ebuild 3512 BLAKE2B 9f30115ea1ce8570213517a3e841675c761654e23d81cdb5c30a0111dad97b2ed41bcd3fbb316bc8716836f82fc14f4dc6c30012ec7fb41e8fd5bcca3637af9d SHA512 f7bc1e244f8f4f19d2c8674a17382fc425ef34cb2957489e8216d4ddc009ebce77b191ee1357f60719158020d098a8d0fe7239648f96014126e68111a22f10e8
EBUILD lucene-3.6.2-r1.ebuild 5555 BLAKE2B ab16e0833ee520598e3590a98379fd51ea01eb09d46e04e69b350e86fa51c52b329967081a844a33505494ffc953b08420418faf9ef41a994748e900d71649e7 SHA512 c47459c094fa94f22a79c1623a4a9fa3c4edec4de72520d641d21f054eb1089b2949de0666678407dcb0ac9bc3114126a8651b9ddf7ae5729c8b789736513098
-EBUILD lucene-3.6.2-r2.ebuild 5554 BLAKE2B e3f2d8ed61f3f028ae1eeb60045cb60e9e8910a6b1f2a4f589b961b02265f97b95f08d0b75f35a848f7ac599fb8c0600cb230fd2b3dea997d4ac2b6c069ecd88 SHA512 2b24e24c308fb1b43b58f7d77deccfed49d69cc0d3b94b84228c788213d803fe908f6ada388f568f6a88733de95b224d0468a559d71d4e90fab11372139b7734
+EBUILD lucene-3.6.2-r2.ebuild 5553 BLAKE2B 4602e1ddf43e0fc5b71093bbc88069fe7f016187e78b61fd7a1fbd7ed03f1ce54b1dcf42e918f128c3bb58cc7eadfdd4fcb3ba455d5567788a9866834c805db4 SHA512 92d2a8aa60347ae964ed8d99e50c57addb4b3621fee34262a865565c6280f381dfc9f14792ddb330d89a1b7fbaaf07d4031bf6cbbd2ddfffa62634fd84779b49
MISC metadata.xml 462 BLAKE2B 2f93e0f1a5f130d6e17e1431764c6492bb1c66200ab79175a54f8ecb3311b8edc9fc6ce1c7e062bc7357d2f48c4155829c34d719a780b373336a2c95d52d70e8 SHA512 611e91130a53366e58e7a628f1eb63317064eff25cc9921e3f4c0c649e7e140a5478667fed236da8c10c52d3c4a70cf0f3d87445d6e82f052910b6b35550036f
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
index a5b2c1d755bf..6d0031e124b3 100644
--- a/dev-java/lucene/lucene-3.5.0-r2.ebuild
+++ b/dev-java/lucene/lucene-3.5.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
LICENSE="Apache-2.0"
SLOT="3.5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="
dev-java/junit:4
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
index 00ad0d23efec..091821750c1b 100644
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="
dev-java/ant-ivy:2
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index e437db8ed9df..ca27f0ffe5c5 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,23 +1,23 @@
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-8u162-linux-arm32-vfp-hflt-demos.tar.gz 10432598 BLAKE2B 49e8ac44c52b41851ccc96d41f77eddc92304e0ebb7b62da6bf393d73aadbd94e67d92b87bd13f7a2ccdedfbc0fc7c6ef7dd5cd2595860ee8d1776dad308e341 SHA512 00576347ec158f4f996db1aface6067b7df99a9e125bb2c22980b11ab84660cd2a3997d9519db3302fa31cbaaf98c01c5b3967b51daa5469926ca48037ef60e0
-DIST jdk-8u162-linux-arm32-vfp-hflt.tar.gz 81719419 BLAKE2B be6bd2ec7114e313e6abbd040aa9b29fe415cc15ce93b5c6fa350b0964faa7a1a3c0882c303596156065f9ea79a08bf8542757c5a8a16170d31f9cee5d7dd426 SHA512 86b835c388010f2bafd05114813ab84b4cd13334244891e9a65ae140fb65c9ad4436380043255fab36d44a91df9210ffe0858d89e48fc4efe2e460ae62928134
-DIST jdk-8u162-linux-arm64-vfp-hflt-demos.tar.gz 10434399 BLAKE2B 528476df75ec63acbe66dc58aad87e21633f34407e147352d048e76cc48c34afccf3d407229dd95ebd51bf2b5864d5b2626ddbd4a6b0d07142ce290fad58e786 SHA512 4ac7f4485c7290321221874fcac695cc47199e7ef76a0270a2d4b381bf42311a2d3dc0d325c1a50cbc0e79a82f9b876f5481a717425a7919d53e97b11d3f0a29
-DIST jdk-8u162-linux-arm64-vfp-hflt.tar.gz 78519170 BLAKE2B f8c083aba14ed5a7d70ab5c7eaaba7854a55c467608f38eec389489cbfae0a3abca3a2c9297a100eef7328c5e1d78f751dbbb11947a191fde94a428ca9e7737b SHA512 f713b174193abcf5a7cdbef2ff75a77c953f3369cdd9dd80a3633e9024c1386bed10d3889bb1ea0617ae5764fee7e70cf487c6a1a4c8c46dc92c2e27704b0d9d
-DIST jdk-8u162-linux-i586-demos.tar.gz 55100252 BLAKE2B 437dcb25306fedfda9fbda12533790d4df6b3be999ee5dafc2012e5277abc2736856f0ca028827420ff4b9aba920d8bc3f6933ead0e80e03c055e43fb7f1db71 SHA512 a867c08716874646e8073a1850f40d46f2d7b8bb1fa37ced7e95c11852ae169011fa8364055d07437cc1750974a984150eed8171b13d3bff03460cdea4b1567f
-DIST jdk-8u162-linux-i586.tar.gz 192733880 BLAKE2B e4e00ff4ca48c9de65ba7493fbd9f9ba04304d03dfb67f0130db977d2a3f244b22b6092115345e701ed60fa56e3cfc3787a6292ba29d46a082ff8205809793ad SHA512 f6b84e3fbfe741851e109908b394dd65e68e1214a049f47754dc88f4c223d217e597f7c6a6f34c94fb8fa9d78be59861475612289269b34789223519badb0a2f
-DIST jdk-8u162-linux-x64-demos.tar.gz 55164558 BLAKE2B a442bb0b9e75a61952ac8f588eef3d66f5bfe987cef982a621e12dc65e487cd49c95b9a92a5595d2d03337a07fb9d2cc4e0afbd0a041614a15a87751be525966 SHA512 a24668b4e2acb493e73ab4e0e1c8c2b60650675fe424c113514771e7ab6464bb40e839ff5b37c8e0019624160d7d3aacfc30c0049b851f34be816e13ea861db9
-DIST jdk-8u162-linux-x64.tar.gz 189815615 BLAKE2B ae4f9cac86aab3dfd528f9e8930bfecdb42fbeea8a6394c9589303766d47127083cff13567927125756c4ea174d7ee338da115266d01a3613380333022a65101 SHA512 55349e0400f2fa77144af1977b7487f38631a404b23411a294f3ab55c2190fd3db1447fe788490834a03c2093421e06ed3e2db8434f8c4f417f58763881402f6
-DIST jdk-8u162-macosx-x64.dmg 259123815 BLAKE2B 6c41876e7b9e54bbb7c14563f98825d6f41ea0cf30fbd914b4e75622f772c554a62d97b5e13f441de92428d945e985d3c32cbb285a85d5ae2ca15ff3883c97d9 SHA512 2c03129c5334ae7471a15722e70b872a3d8450d400b56333e42a663de71409b30161cd86764c8b9af7f0d49ef613ceac7d1507d821a84fb8544e53695ae6ea29
-DIST jdk-8u162-macosx-x86_64-demos.zip 55705634 BLAKE2B 088884279396ff53b69721ba8f3870a67b6d846c94d7a21e713e270f31a6366d5b1b00f371d334da264824c33ad33a1b146890888074e09af31060e8e3cac011 SHA512 939da23bc935a7c089dce9f7fcf87f4df8be911282a4a7fca6cb8b9325cdbc85632721ee596dc2f4014c81ab5d9e18a56369b46bf7ed2547dfac553a6962c1fd
-DIST jdk-8u162-solaris-sparcv9-demos.tar.gz 9799694 BLAKE2B e6812e0771cfde50ccb2623e645a114d668812656d4dc151a14f952a93f70dcbd7325c691637979eda95f2cc7892dd0e4ad75605eb72b2bdda4e1ea2bb2f9011 SHA512 b4d1a410b68b48eab66cab179274cf03f8dda1c49f155eb31bf6a91640f5ae4a9f750591d3d7327221c47d27e9fc6adc793414d1b63e404d5eb08cad2fac424b
-DIST jdk-8u162-solaris-sparcv9.tar.gz 104118900 BLAKE2B 8aa9e54e1cc189517caab4b799d2a0cb2ad8f5a5796058cb18bcdca0dd03b1dbfe927a88cb7bc257c79412a0a2594762e083e1979ee4fd21662f152c79b6b445 SHA512 10249be011c526ee707dfc1f293351d60892b64f1b9160b70583d94b17989e6705a69d6502b477a960b7826cadbb214e52aae3ce36aa4bcb3b6ddf8d06fb90eb
-DIST jdk-8u162-solaris-x64-demos.tar.gz 9752263 BLAKE2B 50e28f56df39b355587fc5894edb065eca115ef6f71c9afcef0c2640b9cd2dc8df9bb315a85219dbce96a59ab24304b429f0c756548b7a9fe26155f50916a11a SHA512 173c887650fa92f5c515fe5f7973c488301253344161ede7b1003a7fae0b5404c81fe450235c485846cb262ae82684500e249ac134f248889bea9ad05048cc1c
-DIST jdk-8u162-solaris-x64.tar.gz 101741152 BLAKE2B 9e01659aa83b11b20e47842b7ef5c23b3e376540023d92a1e2350083037d45872cb15138fcd37ad62ea05ed5d47a716b0c8dc792f415ecd18ada6ed9b075aea4 SHA512 9755a4b9af4b5aa7e904748e5d627ebffb2ff290748d28aac9b494b372815a6ca3ee219c140ed43698a341f495ccffe5f9cae3bea0ad94e1e14fefa84d287783
+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-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.162-r1.ebuild 8551 BLAKE2B aff05cbba22ad15d1231161b5bde3e92203527a269793d7f49acd22259948e8d28cdd7af85b3a3ace37a39ca1df0183d935f2a8e2d595ab11ffe069172080baa SHA512 e48a79a686607552b3d62f5f256a6c04d731f1d3e1bbd76f1c184d72f527a0307b3b9b96ea169c4145f8119ce135c19560bcf004a1a402d43cb4817f81672031
-EBUILD oracle-jdk-bin-9.0.4-r2.ebuild 6789 BLAKE2B 8ddbcd1a8ee268cadf470471fa657c75c619d4415eca88b597e1fb98834ee1e437e229eed96a8c941b07431b95072dfb466a57cb663043c395f1fc1bfc95bd6b SHA512 fb2edb8ade89e88d24526c5dc4bec42f74464f752a1356178ba115cdc91e1072737cb4c8ab9fa4694be42c8c683f335ecb7063f503528c9b15b5e3cf3d365c16
+EBUILD oracle-jdk-bin-1.8.0.172.ebuild 8565 BLAKE2B 86b1dd234586f25ade3b9d045774405ab54d9f04951748c4e4020620cbc8d5fec8c35e8292bbcd45245a51ae60a56a4eccc3c90c8c69252df38d5c765df97b80 SHA512 97e116fb81d8ca8efd783c6ff20b223b3770af17b43ae9009d846a4133e2285fb526567571aa705dfad55a7adc7d08afc040d9b4805e198590d3c6013fc80d3a
+EBUILD oracle-jdk-bin-9.0.4-r2.ebuild 6803 BLAKE2B 8318572886e47fee4b4c94bf795a26203da64746c9a8f5c55f7c6a46305ac8b31792c784bb9d7e17160de8133a60b8a85e4ef5f5c9be89fa050d74e357df5fc8 SHA512 bbe8631108b393c382777df2651c0212efb8a1c532745ae584625a6bc6c918408bafa7bb27de2ec67982c8c33cb20d078de99b79752afed44bfab857afec1556
MISC metadata.xml 1200 BLAKE2B 3ed6f9dd71a1c26a5292a56f89f8ce8ed72475b0c5139cb03afb47559ae464e0ed64ae4ed5a023bc2a2d316c77805a8820762a4dbfa091f612fd2729fe2f17f5 SHA512 1c104de4d08e61cb3cb14755536e7ed74df233325a673fcd83ca930335d35e77408653a4e2f962de792e186dd7ad9457e3898be159af61842610801ea00b9d9f
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild
index 8da2c3466faf..f71907bd1d48 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.172.ebuild
@@ -95,7 +95,7 @@ S="${WORKDIR}/jdk$(replace_version_separator 3 _ ${S_PV})"
pkg_nofetch() {
local a
- einfo "Please download these files and move them to ${DISTDIR}:"
+ einfo "Please download these files and move them to your distfiles directory:"
einfo
for a in ${A} ; do
[[ ! -f ${DISTDIR}/${a} ]] && einfo " ${a}"
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
index 272910669d9b..d728121913c1 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
@@ -79,7 +79,7 @@ RDEPEND="!x64-macos? (
pkg_nofetch() {
einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
- einfo "${DISTDIR}:"
+ einfo "your distfiles directory:"
einfo
einfo " http://www.oracle.com/technetwork/java/javase/downloads/jdk9-downloads-3848520.html"
einfo
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 89aa84a2320f..80a32fe808d5 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,11 +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-8u162-linux-i586.tar.gz 83185844 BLAKE2B 0739e0e272e19560554976d993d229e0bfd6df11389f6dc8e8292717620fdb8e2786128890667375b5399f96d696ec7fb2ac2369d1edea82753d8c6e659c0aeb SHA512 154af4397163c68266e963280bdc4794ca088e207f9426213035e06bbfc4f024ec5c20c89d8d58323e56ace6af4e89d2f08a80fd436c70fc712ed0401772d213
-DIST jre-8u162-linux-x64.tar.gz 80107578 BLAKE2B 28b86729414cfd58290b01990a57b7a87cba1b4ff6361df45988433b90b6c29878abe120c6b90e6c31cbd306960bb75139ea054544f109d863cdad723fd4f0fb SHA512 dbda4346d76925f47ffd288fe9ad21cb2235f55da380945d6cfed8d94322ba97cf8832d3d328f0622c6175620f1682b93e9e380403db3f2d4804062fb7832e66
+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-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.162-r1.ebuild 6040 BLAKE2B 58088e0f7052ae986280592e562bf9b3fece26e0dba28e1f9f134af11bae4cd3fd3449a8f93cbf7b8f357f308e7d412ee7ad25d18447e75228c35c261f07684b SHA512 d1cb03d9b602a625ed57bab13c3422e1063b8c7775cee467380bc88a0efd20f30f9fc320fa691f91250effcc3185e896eaaf4c4089498663f6fb4ea59a9bd136
-EBUILD oracle-jre-bin-9.0.4-r1.ebuild 6264 BLAKE2B 709b7614539ea1fd3e3555a0316dd34d83863a08498d1b72e95c8fbcb29cdb8862988e3927a64daf2a08e4695a2e4a4a15d4289e16dd2f8e25bf3aa7b45c9bed SHA512 3eca1ba3cff07e85702b3b99892e8d624ce9a8f2e3f0c56dfd993029b140d00fcf23818c8030015d7f8e3093188af8e97ff99439150444c6e551aab82f5075af
+EBUILD oracle-jre-bin-1.8.0.172.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.162-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild
index 517737cee4d1..ca2117f3c69b 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162-r1.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.172.ebuild
@@ -77,7 +77,7 @@ S="${WORKDIR}/jre$(replace_version_separator 3 _ ${S_PV})"
pkg_nofetch() {
einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
- einfo "${DISTDIR}:"
+ einfo "your distfiles directory:"
einfo
einfo " http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
einfo
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild
index f95added7c38..1b3a1f76ccf3 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4-r1.ebuild
@@ -75,7 +75,7 @@ RDEPEND="!x64-macos? (
pkg_nofetch() {
einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
- einfo "${DISTDIR}:"
+ einfo "your distfiles directory:"
einfo
einfo " http://www.oracle.com/technetwork/java/javase/downloads/jre9-downloads-3848532.html"
einfo
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index dbce9317ad56..e96fa38a36e5 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,14 +1,6 @@
-DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 BLAKE2B 44c6d0e42e92a822230b41fa732b58816d18e92e8466a59bb21de98cbb6cb3bcf6db29a7c5842ff8c754231c44626a95fd768f514f49bbb2ffc098618c7a50a2 SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b
-DIST protobuf-3.0.2.tar.gz 3917853 BLAKE2B 542beb7b16de0da2cdc6f7981381b6de1ff2c01f229005727a74b4e5ff16db3f44e91c026eed323ccb1a2a2b3f834afa3686df80ff5f90d54f5f030cbaf601cf SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2
-DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a
-DIST protobuf-3.3.0.tar.gz 4336596 BLAKE2B 381b2961fe1de8a86225903d0cfe4c98c238336b8782e5191c57c6fcf60cf321f39163d50864bf9c119a90bd7796269dc7e34168a158f7affa7fa295ce5deae0 SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636
DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
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
-EBUILD protobuf-java-3.0.0_beta3_p1.ebuild 2137 BLAKE2B dc8edf716225da54804ab5da414ab70a1526bdef0a3e24d4f4c93443c8bcdebc0eb6be87a54114e22d0084176a5291822614431377f008d0472682a413e41792 SHA512 dab6d0ae27b18777a305d0921757acb92727d17fce7d8c17eeff1cc09298f85f3fa6f39bb51bd6a531b462060fecf20d691e417ec33cd181f0bbda665baf8e3b
-EBUILD protobuf-java-3.0.2.ebuild 2150 BLAKE2B 0cd4177700cbe9a7850bffb6dc6c4c224e2d210659a58127313b284ab21c982cddbc9d4ba3ed0d3bf504f8ca6afdeba9288651029b1ef39e0519f469a62ecdf0 SHA512 a8b0ad7f72a64e9fe13ff7a8b64f04660f16865c35f6af6c58f81c1b2b13aa5388135685e6a506dc1c0a5edc8c6a8ec6968735d1c8710f3ad6acb8cb2c95286b
-EBUILD protobuf-java-3.1.0.ebuild 2147 BLAKE2B 51dd234d7873b295094ab1910a66d6be1db1b64e67680ad3abaca224d4b87eb5043afd4f080d06a7a7fe4dec15f2a46f81d6d26ab547bb83e342bc012ecca840 SHA512 fdec0f920fd80526440ea4909b8fcea86fec0d56f4ca8f5773d3d8747b49e747f7836c1714036a9815402af9f19f46581ed8332266baf93e8e9cef87258a4b87
-EBUILD protobuf-java-3.3.0.ebuild 2153 BLAKE2B 0d7fdf2a46cbfc78402339259d879952f92f6ade17667197040970b35d4f9b3e5f3d49c17d7d8d7d5a7c1a5006ba2f23774f815b86a6e8fb9abebff68246381b SHA512 1895a3f22215ce2cf3c57fcdc94375f3e18801499ff51ca1374ff2af15b821e8207b3c50267b4f9748aca5ddb85106c087e692120a2bec3e7c315f5ae942ddb2
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 1813 BLAKE2B d46d3e2830806281fd67d804e13c2d88a090733270383f7c1e449b2b66f4ff012e15f0c62fa36a3ce32cd254f7b65f8f7a6849c8265e12fda2f6a9c5bd157c52 SHA512 c8f393561a64baa471ebabab77f8300837f548d9a2c03cd616a596f746fd0061599a9cedd642855f697f3b3e812b3cf789a76c03b875a900016f9fa6bcf77771
diff --git a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
deleted file mode 100644
index 605460511993..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10b3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depend on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
- >=dev-libs/protobuf-3"
-RDEPEND=">=virtual/jre-1.7
- !<dev-libs/protobuf-3[java(-)]"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-src_prepare() {
- epatch_user
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- pushd "${S}/java" >/dev/null || die
- einfo "Compiling Java library ..."
- /usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- JAVA_JAR_FILENAME="protobuf.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- if use nano; then
- einfo "Compiling Java Nano library ..."
- pushd "${S}/javanano" >/dev/null || die
- /usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/javanano/src/main/java"
- JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
- JAVA_JAR_FILENAME="protobuf-nano.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- if use nano; then
- JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
- JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
- fi
- mv "${S}/java/target" . || die
- if use nano; then
- cp -Rvf "${S}/javanano/target" . || die
- fi
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
deleted file mode 100644
index f774a37f4ff3..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 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
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
- >=dev-libs/protobuf-3"
-
-RDEPEND=">=virtual/jre-1.7
- !<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${MY_PV}"
-src_prepare() {
- default
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- pushd "${S}/java" >/dev/null || die
- einfo "Compiling Java library ..."
- "${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- JAVA_JAR_FILENAME="protobuf.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- if use nano; then
- einfo "Compiling Java Nano library ..."
- pushd "${S}/javanano" >/dev/null || die
- "${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/javanano/src/main/java"
- JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
- JAVA_JAR_FILENAME="protobuf-nano.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- if use nano; then
- JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
- JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
- fi
- mv "${S}/java/target" . || die
- if use nano; then
- cp -Rvf "${S}/javanano/target" . || die
- fi
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
deleted file mode 100644
index 567e5a226588..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 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
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
- >=dev-libs/protobuf-3"
-
-RDEPEND=">=virtual/jre-1.7
- !<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${MY_PV}"
-src_prepare() {
- default
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- pushd "${S}/java" >/dev/null || die
- einfo "Compiling Java library ..."
- "${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- JAVA_JAR_FILENAME="protobuf.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- if use nano; then
- einfo "Compiling Java Nano library ..."
- pushd "${S}/javanano" >/dev/null || die
- "${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/javanano/src/main/java"
- JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
- JAVA_JAR_FILENAME="protobuf-nano.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- if use nano; then
- JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
- JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
- fi
- mv "${S}/java/target" . || die
- if use nano; then
- cp -Rvf "${S}/javanano/target" . || die
- fi
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
deleted file mode 100644
index 31b8a5d0896a..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 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
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
- ~dev-libs/protobuf-${PV}"
-
-RDEPEND=">=virtual/jre-1.7
- !<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${MY_PV}"
-src_prepare() {
- default
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- pushd "${S}/java" >/dev/null || die
- einfo "Compiling Java library ..."
- "${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- JAVA_JAR_FILENAME="protobuf.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- if use nano; then
- einfo "Compiling Java Nano library ..."
- pushd "${S}/javanano" >/dev/null || die
- "${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/javanano/src/main/java"
- JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
- JAVA_JAR_FILENAME="protobuf-nano.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- if use nano; then
- JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
- JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
- fi
- mv "${S}/java/target" . || die
- if use nano; then
- cp -Rvf "${S}/javanano/target" . || die
- fi
- java-pkg-simple_src_install
-}
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 5a7f0d770189..7553c8e7b68e 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -17,7 +17,7 @@ DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f6
DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
-EBUILD swt-3.7.2-r2.ebuild 4607 BLAKE2B a6801ff0d23257f51bf41c78412d27dbf2a8cbf450919b5b04a4a23efb8662ed87a7cdf4a82f0eb4680438e0da7ab52cff99f1956c35799a3e44b6931dc0e968 SHA512 b1df60b8cba4e09338d06f1a8aa809495a58f1a16878b522dfdaa381abd7f69a3c66dc97fe46bc6285cf2ad6741850a7b3e769eff6cd159f637eb7d805325121
-EBUILD swt-3.8.2-r2.ebuild 4438 BLAKE2B 59f9d1843bd0679e7c9192eb5fd569e3fa9c86de0d735d9a54e824c52477e9df9438ec6e5d9c66ecc6a87dd12afe761271659a396642a67fab706d23a58ac676 SHA512 b8315c756dbeb3b47ba2c12b1d0e5f2588952fce9f422ef18315380ea8dc260b3841bac4e1493641b16c247bbf074d7f78d8b60fde3a8d3962c064354a1f42ec
-EBUILD swt-4.2-r3.ebuild 4683 BLAKE2B e2b9275589302ad282abbdf275441e9c53386e8e4d20c48e88010cf545e5e053045a29c508b46277401cf33a49a674e811c4447f268d1876c1a3276755b8c95d SHA512 8eefff1037692f3bed036627346ea91db6ab61c68c91be6f7a517774c2983024a0b7994bea1e4c359a9a082d813a2c9f692b4d63f7b1d9ae99b0ab13b94e7a13
+EBUILD swt-3.7.2-r2.ebuild 4606 BLAKE2B 9d782b21565f93a1d69e83f3f65ade694bbc1034f24ac2b1a59ceaa1c2da0defcd00e27d43c43907e04661b3a29094282dfca952caa99d4ece750b72491f28ec SHA512 6ca872bd210d5823d369abc031d3e412a3e3f869f541c37f4fcfc084bedefb1e3144f3aeb7d1bfc039b0337641c1582bcde76a279a5a0f6a2b5b0f5c4232495d
+EBUILD swt-3.8.2-r2.ebuild 4437 BLAKE2B 19f84cd5506ca1306754a26f601d9a1a18b6e3f3091e7f38fb768db833621c741502794417ab7099a1edec0546ba6c79785c918bb26aa0acfb3bdc5dc788b860 SHA512 c4e25e86c66d29d74d5bc100d97214b3742369ab7bbf96f38fd95ed28c7c03838f3260dcd45f755c90a07ba4f0f0a066702f7f8b2396e66569fe6f513770ab28
+EBUILD swt-4.2-r3.ebuild 4682 BLAKE2B 1e47fc517f3eba4ff626129f5b4810dba8930da995aa03788806d324192443e56570c280e3e732f4a58b6b3aad125574b22e8d024de11b56cced051675cb382c SHA512 15ffbb9e0cdaca5bc782327052d049efce05686d2a27ab84f44c9388e82a2f83ce42adab9e2c8110580b7572b18b111d5dcdf5ab601021cc2a321a84ffeca130
MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild
index 63f3c11299f2..aa38b1de0654 100644
--- a/dev-java/swt/swt-3.7.2-r2.ebuild
+++ b/dev-java/swt/swt-3.7.2-r2.ebuild
@@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
+ x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
>=x11-libs/libXtst-1.1.0
- x11-proto/inputproto
virtual/pkgconfig
${COMMON}"
diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r2.ebuild
index 72289d111711..64b28cc018f3 100644
--- a/dev-java/swt/swt-3.8.2-r2.ebuild
+++ b/dev-java/swt/swt-3.8.2-r2.ebuild
@@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
+ x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
>=x11-libs/libXtst-1.1.0
- x11-proto/inputproto
virtual/pkgconfig
${COMMON}"
diff --git a/dev-java/swt/swt-4.2-r3.ebuild b/dev-java/swt/swt-4.2-r3.ebuild
index 40625a0c8c8b..fdfce91451a6 100644
--- a/dev-java/swt/swt-4.2-r3.ebuild
+++ b/dev-java/swt/swt-4.2-r3.ebuild
@@ -42,11 +42,11 @@ DEPEND="${COMMON_DEP}
>=virtual/jdk-1.4
app-arch/unzip
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
- >=x11-libs/libXtst-1.1.0
- x11-proto/inputproto"
+ >=x11-libs/libXtst-1.1.0"
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.4"
diff --git a/dev-java/tapestry/Manifest b/dev-java/tapestry/Manifest
index a607b1bb1eb3..df4ef38dc00d 100644
--- a/dev-java/tapestry/Manifest
+++ b/dev-java/tapestry/Manifest
@@ -3,5 +3,5 @@ AUX build.properties 1141 BLAKE2B 02c5b606d35bf1e94b147f04da4f6c626276fd85e86345
AUX common.properties 2850 BLAKE2B e1745cd8c7cc162f3c8d8d797b88ecbc1fa4e35831d581639fbab512c31311793f8beee3f147c267d675e0960f0a753c3f5e74230f825551973d58c9367b0623 SHA512 a00b28fde7e90100c017238150fd7c830cacc4bc6a24e7a9bd90fbd32bd6bf8a3787a8a178f6ed78033621a47503b1517e9485ffc60d5ffbfe5752254713283b
DIST Tapestry-3.0.4-src.zip 1174780 BLAKE2B 2f2ad5e3860ed6852962b282431df15ae4f6f17f0d08e4246dcef69bcdd033acafe881ea3ba33bd38c2dcf8843caf37fb0b46da84c5b107c2d1c4a0d77aaf89a SHA512 ab94cee9745fceeecbc98a27ace90567b3bc8ab880408da0a32526ba3a68b24f90daeca5d2ea0180b5693ae4fd12f01f0db98e78f176cdc0a0370b5554aa9d10
EBUILD tapestry-3.0.4-r2.ebuild 1659 BLAKE2B e1776a2e35e394ebae18a34eb246f14433e16aeb6adee63d54904c6abd674aee10cd5f506c00455ddda2c0b8dfec86b8780dd89295cee157cd3a30988aefede2 SHA512 34c5834afda5d462ed8d39d7f6309fec21e8f6c1038bb633e02832ff9d353f933e829f723732f7536a911ca5134d4684f4ce493e115758b956e50aba1d4d6317
-EBUILD tapestry-3.0.4-r3.ebuild 1684 BLAKE2B 39c69889882d01bbbce5197c4d4599b5f33b48af073b408d6021f3f6d8de04888b9d72bf9edf9e6436830f110ec1013369af9fb0317df320c13a0c1f1be447f8 SHA512 18c88cf1c86c4891e3b53214db36afa6a3483f93b92a726c66c6eca08b1d9ed1e377c6119292499c3a8a36df4df528d32ae5bc353f8bc0061d49f40d8ab546da
+EBUILD tapestry-3.0.4-r3.ebuild 1683 BLAKE2B e921c3f2c0941d673980b5feecf12aee3de03b661f3b34bf8193bb556d7e82d411e635245bb37cd98d0a445dcabe79ecbb318b7bcbb585db0d3b703d419e8539 SHA512 a1fc2c507a330c0469902627b56ff7884901ca957645c4dc582dd9c3784b0eb0640b584ea656e49bb6d2e419b2f26667f2fd64a2c50ed51649c3c59793b393ee
MISC metadata.xml 750 BLAKE2B 57a35e8c3abe2476a1d35896ef702db76748f91065a68fca93b8f9f5117c7bc6d3ad9a100bf9c4164e2aea8e2f51db5ae77debe651e5a915d48aa6b120c19f4e SHA512 65e251c97e3c5fff6f3bd40910a5ee7b2e5152a86d3638aeb870283f8e415c833da3666647fc25add19e96c0534d5fac39090646cccc9cc10a2b07f5bcc5885f
diff --git a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
index 2c4e880bfbce..19824e4645a7 100644
--- a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
+++ b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
@@ -14,7 +14,7 @@ IUSE="${JAVA_PKG_IUSE}"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="
dev-java/bsf:2.3