gentoo resync : 23.03.2018

15 files changed, 94 insertions, 16 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3f1d7b03d850..09b9fe2146fb 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/cdegroot-db/Manifest b/dev-java/cdegroot-db/Manifest
index e0569290f338..3a22b2c24068 100644
--- a/dev-java/cdegroot-db/Manifest
+++ b/dev-java/cdegroot-db/Manifest
@@ -2,5 +2,5 @@ AUX build.xml 1612 BLAKE2B 2480ba7774db6f2e20b70b3cfd2ffd3a690c86a7d1d12c521faab
 AUX cdegroot-db-0.08-gentoo.patch 7914 BLAKE2B 6139fd7ffcf65bc04ebe03f35919ba28debf86b732dcbfcc8b37192c424ae7cc1f8863556f111c23bd1327cba94e1ffd7d79787ff850b0b99a4933badf9d8ca8 SHA512 f24f13acb265f75408e6cae2a432cbcebbcad912f77ce2883159dc93743ad85c636e5656f21478914712fe393c84a6fe11600c9394b81ce128403c8f59e521cf
 DIST com.cdegroot.db-0.08.tar.gz 154705 BLAKE2B a267d402d1741f701e0fc1a99fa765c0f86a9b13ccca20f4a592661472a31e85a4da49d6fb8be07ef1800cbd0fbb123366def29e30667448484ba419a0938684 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1
 EBUILD cdegroot-db-0.08-r1.ebuild 864 BLAKE2B e3a38203c2fe58a6266e2c98c99b6abe34ed6606256478a2c8238a1b07b48d01c9fe047f7fd7c680f26ccb5ca4311ddd89fe99c2453b30d595e316ff521f5124 SHA512 685922ae9b839edc402286835e2e0c2fe91662106f532435986667040db3fa1a42e687c2da9620f19bf375f10c3893b59ba48a4d05a043aba4de6108a0256949
-EBUILD cdegroot-db-0.08-r2.ebuild 856 BLAKE2B b8707015c13fb3108f645792b9ecf807f23e875bb469f02deba3198868555a985586ee1e5fb464a59c63a1a342fc59ee59205093cbce9bd858eb7eb6e2c5cd96 SHA512 fb052a28fc963e9bb2ed18aefa0ece7076054dce7923e0fb780becb314a3317649e066fb20360777ac05ffb2504e6b39c4aa2ffe408591ec7ea7bfe4ea9377e1
+EBUILD cdegroot-db-0.08-r2.ebuild 855 BLAKE2B e5d7ee7b418937d4f351db8e0597d6aab90dd5d48f4ece08f128d34a20998ed9316ea48261d13d9b4364a61361fc141ea9528c12c0592f0276e0127325c3a22f SHA512 13f181df64f56a1dacabd3cd440dc10add66f40dc886263a98faf07a4cf9615c9ec847f5f08e8af8e8d92ae0f208002c3d4b1bb50c07dc834db04abb9433f9e6
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
index 4df2e8c05870..e6c249f3a034 100644
--- a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.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
@@ -13,7 +13,7 @@ SRC_URI="http://www.cdegroot.com/software/db/download/com.${P/-/.}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 05f5178b6920..702491bd50be 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-EBUILD java-config-2.2.0-r3.ebuild 976 BLAKE2B ee79892df5bed49e30ce894fe39be3188376243a921e4c105efafc24db797032461ba8e702669ec03af15811e2ea14ed4027700930fdd0af81ccdf1bef6f7434 SHA512 ab20a3da89b55a79dd960a7468316def7433b5927094be6f26a008ea02fa6071e0b2ebdafc11f0eab0ef53cc722f3ed55feae0a4e8a15da5b3120982b6cf2b9d
+EBUILD java-config-2.2.0-r4.ebuild 1090 BLAKE2B 70acd02e5f352e21994971306284950949791531f979751daef89e270d7f7709e3e119d39adf0ab0e1673b17b23f38171a897c8baf197ed56118ce2fb51b2f77 SHA512 046161fcc2afe66dcd832e86f37fc44fcb268410d3b01cf0f424214142df1dbd4a9ca8c83bf94c3468c33a60c68b53e862a3c3c3fc56c7d8469f8a264a5f51c0
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 62b5da6dd713..2d0a08658067 100644
--- a/dev-java/java-config/java-config-2.2.0-r3.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -17,13 +17,21 @@ SLOT="2"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="test"
 
-DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)"
 
 # baselayout-java is added as a dep till it can be added to eclass.
 RDEPEND="
 	!dev-java/java-config-wrapper
 	sys-apps/baselayout-java
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch )
 
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 91b8c325801b..cacc20afdbe0 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,5 @@
+DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
 DIST javahelp2-src-2.0.05_svn63.zip 3747088 BLAKE2B 80f0fd45741d313fd47ccb9874d31636d12f452ff012dc010de2879bf67a22bd58f6fbde7df86117f463a949f7897ec5e1e3721b1fdd1ee0fc794f30152e188f SHA512 ed795dad98f8d80f4cd4cda40b6aea0978cda621b131b1563016c1ddc02afeb37f3626a28003dac26d7fe996274fb9a97e741a500b15d06b1e5a93342020abc3
+EBUILD javahelp-2.0.05_p20170719.ebuild 1655 BLAKE2B 89a5b83544a0f67cb6bd3d1c3e643e10bcd1f3eab1440912dc289d3178230f21b892be91d32022e73063ec1da4e00d631f3bf6b9f27030969c65a8f2bffd3d26 SHA512 f4990cd1d7078879be9cf087883156fe3c72d2d46f8ff9c296057383fde59e29d286f32c6d2b8879c3386f0780e065e3a5a44e0e3550db97ca39d7eef1987453
 EBUILD javahelp-2.0.05_p63.ebuild 2285 BLAKE2B 360be60aba7c50cb0b7235fa7dd970b5ee1dcf456c9cd40098da59a2d9d97c4c7519cc9c1e80b255f0ba70800b740dc4605d05d303243a30b0e5dda3c6585b05 SHA512 d79e0278aad0ac421036c44d9c748c854b6e2ce03abbd51e4b71ec183b1536636fc267a57f724bbe2f35f3b113bc269a0b9683fbb3b7f883926c0f0d9f946b49
 MISC metadata.xml 624 BLAKE2B 0c06c71189c699c3baf3f8d307f8b077ec8e6e03acb4e0ede09c7537354ab6b7bc043824fa6052be49ccbd6f0debc1cbf2b1e46f42f69a95a1906be6e43639b8 SHA512 bd475a0c41855b34bb58ae6d6a3e2d164abbb97348d809f2fc305e77ca80495bccb4d71ad0aeb0b5586565c71649c6e3775b83c92272dbe8518949864120f484
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
new file mode 100644
index 000000000000..5c067b1698f7
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
+JAVA_PKG_IUSE="examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javaee.github.io/javahelp/"
+SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+CDEPEND="java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+_eant() {
+	local \
+		servlet_jar=$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar) \
+		jsp_jar=$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)
+
+	eant \
+		-f javahelp_nbproject/build.xml \
+		-Dfile.reference.servlet-api.jar="${servlet_jar}" \
+		-Dfile.reference.jsp-api.jar="${jsp_jar}" \
+		-Dservlet-jar="${servlet_jar}" \
+		-Djsp-jar="${jsp_jar}" \
+		-Dservlet-jar-present=true \
+		-Djsp-jar-present=true \
+		-Dtomcat-zip-present=true \
+		${@}
+}
+
+src_compile() {
+	_eant release
+}
+
+#Does not actually run anything
+#src_test() {
+#	_eant test
+#}
+
+src_install() {
+	java-pkg_dojar javahelp_nbproject/dist/lib/*.jar
+
+	java-pkg_dolauncher jhsearch \
+		--main com.sun.java.help.search.QueryEngine
+	java-pkg_dolauncher jhindexer \
+		--main com.sun.java.help.search.Indexer
+
+	use source && java-pkg_dosrc \
+		jhMaster/JSearch/*/com \
+		jhMaster/JavaHelp/src/*/{javax,com}
+
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
diff --git a/dev-java/jgoodies-binding/Manifest b/dev-java/jgoodies-binding/Manifest
index 275697fcf3b3..69c7bfb82374 100644
--- a/dev-java/jgoodies-binding/Manifest
+++ b/dev-java/jgoodies-binding/Manifest
@@ -1,6 +1,6 @@
 DIST binding-1_1_2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
 DIST jgoodies-binding-1.1.2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
 EBUILD jgoodies-binding-1.1.2-r1.ebuild 939 BLAKE2B fcbef0baeee3151064fcb88c194dd5e4f537992f9be5c135497e312077d358ac7282d79c89af3c17043471321fcc80795a70d10953ec1ca8547dd99e0c4b2231 SHA512 1dcf0acc99204a24da3979d2dc6cd5bd4d6127fc9ee976520a51d4ffb1ab58b70c079d81cd4036f510f46f0f5012afd92bd9d9d037f4804e13d881f67670dfd6
-EBUILD jgoodies-binding-1.1.2-r2.ebuild 729 BLAKE2B 869b985ecc1b5ea5b533d35e844a401d78d8d7c136e2bb138d78c734ecaa8f9ee44d270d6ec74a5e74ba6aedd4c9320a5ba9ec9c3828d3f7b26ce6df9bfa225d SHA512 6c789a90fa223c2253433e035e64ca5631104d1ff277ab7bd08661e35e0c8b7db20d9014ee874a5b08b9a8957078dd5677661abaa4544e57a20838c89bfcd76a
+EBUILD jgoodies-binding-1.1.2-r2.ebuild 728 BLAKE2B 90a6b304e60209ca95ba7ba361f37d88c1c4b37441f179c11f780c6028d9ad79162bad24593c884f6f4d586c9572ad82051def6d2b6fc0e27efb7d1827988cda SHA512 1b7022a299178bbdc5418ed74cabbbaebe801fd5a7fdefb6be67f0629fa40b532873990fa99fd3f9566b2e51cea98f27033c8130ef2a7b5b64b92535f41ed940
 EBUILD jgoodies-binding-1.1.2.ebuild 1295 BLAKE2B 512361bc27c3a0b548d6d19c487dcc5612ad0fb1677ea88b96b70deae011fce0fa824f2cef747e42e017cb29f5e7a8e101e72726ab925a0ff03c9a37f8e9b3bb SHA512 0eda77fd71e65f2109a4d2ae7995e92469320a9af6cbbb6f402ede96cc6d6320e6bd6d7b9b90fdd4d826580046a91648e75652b1b5b99be957286260559f3aeb
 MISC metadata.xml 341 BLAKE2B df75f028a7f38b32d21a20cd1cf3d17f298bf92e99187d95f525d30be00e7a02ca1d0f04dc4e6dcefd028be89b83069e6db326bdc4d1e8eefdd84aa523e4fb5e SHA512 ca7c045eb07e88e8cdb6c6639ec651b038159d824df55dcb5f0819dae264edb8873e4dadf94fd6bf71879ddd64a75e44820fe2b6cf485df18ca743b264c9f267
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
index c135a628f182..b9d838d99233 100644
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/binding-${MY_V}.zip -> ${P}.zip"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/sun-jaf/Manifest b/dev-java/sun-jaf/Manifest
index 3c7063a23a54..ff9faf9c39ff 100644
--- a/dev-java/sun-jaf/Manifest
+++ b/dev-java/sun-jaf/Manifest
@@ -1,4 +1,4 @@
 DIST sun-jaf-1.1.1.tar.bz2 125305 BLAKE2B bf7676f3b47e9cf4c169a7625160604c7973d2bb8f6a087f7a7759c924efc0c24fbc6d59f03fb89dc874b2ad03e311b5029fc066fe5083c1accdc73fa9666ea6 SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001
-EBUILD sun-jaf-1.1.1-r1.ebuild 606 BLAKE2B 917d999c4f7d9f64aaf795124219f6f4b4e61e3de2382fcb9ca89a466d8b67940b5b7daee9455c496da0479de8bdd558204166d003602469d5f639fbb88b10fc SHA512 a7c23859097d46faf220d5836e22deb737b16bd0a42efa5c33b785fa560d73bdae974159a03ab2dfa7d4fd3d04b21d789d99254306c13e14ec0f2560f1f5f6bf
+EBUILD sun-jaf-1.1.1-r1.ebuild 605 BLAKE2B 102c1c5d402089ba6183ac0788451dfb366bc310d1717af92b9c221022dc32f284a1ec88fbe4a26658a3a7bc03214ac2290e76a6727fd837a1cff3b1db33d475 SHA512 a30f17d74cca3440139610c750264a6852dd80478e5b3671c99f55d31e062042c18a7dcfc7f2b761361f859030603fcbbc0981658b3360b29043c27ef356959b
 EBUILD sun-jaf-1.1.1.ebuild 1266 BLAKE2B 1a17eb9a250e2674871ef5cd4d76e38e5a19316eea75f2ef6f13544a8e94c3e0993f9908246e5a8a40a6510aa5ccbd58989579d4c514790fc6f0a780e0051cbd SHA512 355d421f1146d4b3d3e4dac18eb586b3000bf74943330a9617be9d0ce49d7a03e4c338a6708e8f44985e8d2100988be7460b13adc844575298509d198004572f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
index e5a06cb99e8e..12ce2187ba9f 100644
--- a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Sun's JavaBeans Activation Framework (JAF)"
 HOMEPAGE="http://java.sun.com/products/javabeans/glasgow/jaf.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-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"
 LICENSE="CDDL"
 SLOT="0"
 
diff --git a/dev-java/swarmcache/Manifest b/dev-java/swarmcache/Manifest
index 8bc021f2e051..7cf8a138be9a 100644
--- a/dev-java/swarmcache/Manifest
+++ b/dev-java/swarmcache/Manifest
@@ -1,4 +1,4 @@
 DIST swarmcache-1.0_pre20050106.tar.bz2 34632 BLAKE2B c33ac3c27e7a034a375fe64c6df044aa65c15ef5d926243d5ffa20a831ee70980b6116eef0c333138f4488509bfa1c96cbeb7cf9a815079ba6830a2baa066be0 SHA512 21c05d83a6e05f3c31a1785e0286d2f584375e3aa97e9fa2dd18a0aca5f3678817a6a019524e6b55c2f047547296cec83c9e108c9272401b592ea0f8338878d7
 EBUILD swarmcache-1.0_pre20050106-r1.ebuild 1012 BLAKE2B b888bf09339a1e2c3fb407f9bd8a70a8c5cdac66c2c55d1c6a5df6f3f57ad603be2be3966c24805725d845f9eee021c1ba2d11abe88972bfee9a4f32d7878ed9 SHA512 c721a879525592ad6720ee15dc4334009c74a6277ad890881775672cb8f188555aed44877c0ea9490027bbc475d6d1a4549c1ecc77c5fdea47c5be346d8c3df4
-EBUILD swarmcache-1.0_pre20050106-r2.ebuild 676 BLAKE2B efcde5419da6fc7741718a79c4d5e6b12019a5aa82b412c5fa29e6b337ecaf6d19b8e4f2eb4a512a4c591a3ce280d5294f9e7a19c3a5330f2df4ec28de7e770a SHA512 0eb423f5df1cd0b84932299d2f12f6946e343ecabe52ad7be05878e40241c8f6eca3c3ff79097e09874df4dca4830cb1566f62856a5fa1f27a1769180aef8eaa
+EBUILD swarmcache-1.0_pre20050106-r2.ebuild 675 BLAKE2B 989d9e0502b5eb71804b9d108ad146019daee44549a2e7f91e40d8374efb4c72cfa6ab9b0c7cc943368f33f8ceaa6511ce7113ae865ac16093905f5d0e6081da SHA512 827d0c43bfde5a1d3bd57cf8b12742ccb9053fa6cb161f764563986531c4a973d9d8951c927873aad2215225fc745374a651efb3949760ec723c0a6d75e91e9f
 MISC metadata.xml 316 BLAKE2B 6adc8bc24794557402b5e1eed5f33c8e420791de51dbc0d97b6d6110f4a39b7b5b28eb625f2b64062d743e8dc204961063bc66f5b4d63a0ff46a9dab8dc96cfb SHA512 77c639a56c22f43f936a864153af61bfb55ddc9738a76451bc337e08371ee5947c5cee2ee41674e480a74d9d78b69054400671c329511be499250c16b35a57d9
diff --git a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild
index 7459c425a271..4d6d9b6cbd40 100644
--- a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild
+++ b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.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
@@ -11,7 +11,7 @@ DESCRIPTION="Cluster-aware Caching for Java"
 HOMEPAGE="http://swarmcache.sourceforge.net"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 LICENSE="LGPL-2"
 SLOT="0"
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index f68a8f3ce1bd..edc89562a861 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -38,7 +38,7 @@ EBUILD tomcat-servlet-api-8.0.48.ebuild 964 BLAKE2B 1b68372c27f23b04a1c042e7f689
 EBUILD tomcat-servlet-api-8.0.49.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
 EBUILD tomcat-servlet-api-8.0.50.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
 EBUILD tomcat-servlet-api-8.5.11.ebuild 1004 BLAKE2B c60fa1af6d8f0aa830b231315a425dc5388ef69916e583387d266da060ae18a4c9d9896b5cd39d2d99788ebac2bb1e60811e70e24077fd789991c23a9fa5e4d8 SHA512 867a52e39a6a74e8504d42deb6506842f1f87f3a70b0639b89fc2073f10b16d4dd6d3a375fde1ee5a91611acd70b04c4feeb02932289e39fdbb092041a4b7d63
-EBUILD tomcat-servlet-api-8.5.23.ebuild 1011 BLAKE2B 1e3d6f70bb2d80a52db97755b123aee55a26d22c0a6c44549fb54065d09da823155295f1f4a498e92b6f8e19086bcf11af84eec68319fa94b4199fdeaacbfef5 SHA512 34ccdf6994076a8f9d25adb7b3b908e84a1b9c8ba1346b6db034d22f8ae647a3f27f2ecf2ed8167293d1ce71501bb6dac04be4a48df797308a0e4e5feb6d45d6
+EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
 EBUILD tomcat-servlet-api-8.5.24.ebuild 1012 BLAKE2B 9b0a3428cace85369df81f0396d28a6d1a616be8d47702bd8a86fdaea6f97add9ebfd005e9834b39c48ab27767a2284bc2dc9d4299c80bc6f3b249639c593d39 SHA512 5f9c4742f04f8d607e54a7abd01d4dcaacd461a0751785f5c153d8547b20a70fe6c5d243a9d4f8c8f84c7d4230c05d66f4c8041940d7e00741afa11a952619f7
 EBUILD tomcat-servlet-api-8.5.27.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
 EBUILD tomcat-servlet-api-8.5.28.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
index e9d9db39df04..df5d6f08c21c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"