gentoo resync : 11.07.2019

9 files changed, 15 insertions, 14 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index db089b438d8e..b4d223ce14a6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index a1e91216d8df..e14bf46d5341 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -38,4 +38,4 @@ DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2
 EBUILD icedtea-3.10.0.ebuild 12819 BLAKE2B 760968745fa9ee52eb0a701266a0706f57560a3fa16f2a03dd85fdb6f1fe85c9285245f83958ba6dacfbcbcdd01b5fd4500aca93572bdf561b1db9c741acf37c SHA512 73a1a50541898495cd9af6fe5205c94779eed69a54a52a2141b533b6a01aafd08a5ed4603bdfb1d1d2dffc3d4778800928e62567b6614b8ab6a06ce28c63e5d2
 EBUILD icedtea-3.11.0.ebuild 12631 BLAKE2B 1568d3d47b2b53c3247a260bd35cd27d56038c965291ad93eac7ebb8896ddf1160f6f9ae0fc4f3c2c3844123fe5f2c11bccdd835625212100647e1ce17e8a153 SHA512 27850e65cb95734a04fe59070ea5e7366fbe5b8cb0b5d38f29d326f5bc7f897f041c4949e9d2c6516d5c397ba3c7261009a7fececbeb87ba734ade0c06f2c1be
 EBUILD icedtea-3.12.0.ebuild 12703 BLAKE2B e68b86f187b7e3f0359689baf5bea1f521ca2707c0de12b422485bfd1e87606cde37960851e262ab43e993153847ff0f4c1be5b44a9c19fd980fe4a19d41d29d SHA512 42db9f45424aa96f8e7f5c03954bea3d239ffd3c859f88910e7cdcd1a34e2c202b311f061d6ff87449089edd8286faef8fa40eb349be9a998e3545cafaf99c8a
-MISC metadata.xml 2332 BLAKE2B d27aa216aaf2e93f1a939198433d9c3dfffb2426e7ae777cbbe13e353a2f0366d35fc7b3008d9e9c7f6eaa90c3d4a2dd76259e5b8856ca0a5417c1fb6eb2c59b SHA512 ccbd1a4530b69231625896171aceee756d4ecc262b095140ced6cee35f2e844e0dcbd6f6888c4f0356dca91f7eb257e911ae28adbcc33645ea76e7953a272035
+MISC metadata.xml 2330 BLAKE2B 79df3d9d5ea26e632be7a497833e2ce0db5ded49770ab45d2235fe6a66b9daf56e0f476dced9aa9dc61288f88a1860a8c3f1e0f549101f5c7ce19dcf0c1044ff SHA512 fb47b5ae495ad4fc070877eca0bd2428e3cbc25cf35c39ec0116ff7f2243e9b6dba6e31fab50d2d6c5de010026645f92217337f64359f884a2badb89aa2b3664
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index ea0ab250ad5a..6fa2d0cd3632 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata
-  SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 	<maintainer type="person">
 		<email>gnu_andrew@member.fsf.org</email>
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 3f68c985d0c0..52641bd9b2c6 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,5 +1,5 @@
 DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
 DIST json-20160212.zip 52295 BLAKE2B a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
-EBUILD json-20150729.ebuild 708 BLAKE2B d3a14a757874cf3fb1d1c89bea956f3b98f9ff7b85877ee6bcbba4381d3dc007b3baed77f3b2330eb5037d2b62b4446d2457194d4e3a4355aa409d94b1cf9865 SHA512 c844bf4315d1bf805d85692429080260e3fc6dbb53240891bafef307b2d11e8099566ea17425918916b27aa940c2fe47ebc52651b06408a1046f46ac34c54b41
-EBUILD json-20160212.ebuild 701 BLAKE2B d3942025ffd549fa10739ff5c302d0baf3c2f8a3224d64d8fda0e2965ee9054670ed556f4227eacea4dcfa946f9ffa2300c09532fec72babedc8c382c1abef77 SHA512 8560f39e1389819ad9f822007786c3cb9577fd47469ceba7c0bf95853631808f43d98f1836066d6ad0615a7e77cb96c016e43fce2515b7fbbc6aea64d826fe51
+EBUILD json-20150729.ebuild 707 BLAKE2B 28408eea2bf597c5166803173627a123d8a4a2e06bc763b2c6855473f0eef8ab69057d677baff597aa1ab4fc2d55655ff729dfbd8547abb6848dd3f691a43c4d SHA512 8c7db885fc7f7646669f5c428d43cbf3857b8b750fada516c7faa3d4e766f2c4bb1664c2e3e00871ef5e1744ecc2bf892b7c3f41ecb77ffd62cc267428e58dba
+EBUILD json-20160212.ebuild 700 BLAKE2B 982fb6fc37f874641f6984877eef6ea42a5b106fcfc59080f85737ed2ccc61df3834c7ef5d974a155ff822bdcf55d91dc8503eec38d7229178b2b4b51fb84be4 SHA512 23df25d4363faa278ab84475c26b992374f61a39ed816868f8695567f66e0bfae4e54c6021bca5c38dc87110206146576cd14b02d713ca576d2c6d60f8cc38b4
 MISC metadata.xml 454 BLAKE2B 866e5582e539c06b6bd26785ff62c97b178aacf82888963aac47489844ad3a8d98fc00bba667ed43d3e527fb3e04bfb05c7c644eeb0cfc4c408bd45cdcdc0e7f SHA512 18ba78f62a286b7a86d2dd7f2f407b145946e5b79df2554d3252706f38162e562f176105746dd028ec46f50dfe07e00fdbc6a37ca31a7ea3d1093e069192b2b3
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 6af44fe16dae..1a1e7bda2a30 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
 HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
-LICENSE="BSD"
+
+LICENSE="JSON"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
index 09e93dc08282..e0a506eb6468 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,8 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
 HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
-LICENSE="BSD"
+
+LICENSE="JSON"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 3f0f7662f971..9beeb14c1bec 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,5 @@
-DIST tomcat-native-1.2.19-src.tar.gz 418183 BLAKE2B cab8621bca4dc41e87ebf6418337da8a86d56a0717aacd62c6e4fb2d039e413cb29e8f169abbd353719ce083d302613d3e0f64cd54f1bc8e57f26a523a828025 SHA512 7d69acd5dd684eee9a85c08357b7288a9f083c15a12a9524ba6344f1b9dcdc6ccc512a37b64b9f15b0e697609833e6c68591a60976dcfecce124ec29eb532dba
 DIST tomcat-native-1.2.21-src.tar.gz 418909 BLAKE2B f7559f204941cd8f8383bda7591e167c247062b4f79c507a5a449715a5554194197c4d34197f30622cbcbd81952597ae757623c903f11959dc8b4fa81234e127 SHA512 7f43f815785e5bc3e43f5b2e9ad1c90576a3c1528d57230328b7175bf475eb5f4e1f91b66fae74ad32cd76f044d7705f98a79109f6f84e5af75dc32bc8830b29
-EBUILD tomcat-native-1.2.19.ebuild 1151 BLAKE2B 8420a566f91395dbcfb2eda52e1d2690d28d9eeb3da1591f331b479589b01a6303e5280f4ff5eee914c5207b3aa433be5779209b5550cb4b68401206a0d89a5c SHA512 384a632497f10dae1e481f0aeead04997f4742b32f00f53514d2851d0218e0b4cca519bb2340bc258935e5afb94f206bb5b790737f877f2708fc8b62e3e479b8
-EBUILD tomcat-native-1.2.21.ebuild 1152 BLAKE2B 04e90bd80d600dd27976d82caba2147d02926a26ebb701546eae0a8af8d07947dd9fac5af647f8644606cb8d00826786b4171a8f50f9e3ba1bddd0987fae29b2 SHA512 45e1bc65c3376b5f7c74f0d9df7a24a9be8648041852e4a3f7d8335bb335502ee598fa773c37b18901a3add1a3584895e1850a5be63c1a43da2967a801d9fbd3
+DIST tomcat-native-1.2.23-src.tar.gz 419428 BLAKE2B b8e0584d3e42c33158c4edf0432b029ee924a509b00625af6a34af3d580fec510fa0222367ea8679a20b51cb5a7c55198f5a2d4ec60d0fa9dbec3a0a22a11b52 SHA512 89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
+EBUILD tomcat-native-1.2.21.ebuild 1151 BLAKE2B 8420a566f91395dbcfb2eda52e1d2690d28d9eeb3da1591f331b479589b01a6303e5280f4ff5eee914c5207b3aa433be5779209b5550cb4b68401206a0d89a5c SHA512 384a632497f10dae1e481f0aeead04997f4742b32f00f53514d2851d0218e0b4cca519bb2340bc258935e5afb94f206bb5b790737f877f2708fc8b62e3e479b8
+EBUILD tomcat-native-1.2.23.ebuild 1152 BLAKE2B 04e90bd80d600dd27976d82caba2147d02926a26ebb701546eae0a8af8d07947dd9fac5af647f8644606cb8d00826786b4171a8f50f9e3ba1bddd0987fae29b2 SHA512 45e1bc65c3376b5f7c74f0d9df7a24a9be8648041852e4a3f7d8335bb335502ee598fa773c37b18901a3add1a3584895e1850a5be63c1a43da2967a801d9fbd3
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
index 0db3cc71d61c..fb46a0bf4e2e 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
index fb46a0bf4e2e..0db3cc71d61c 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"