gentoo resync : 01.08.2021

10 files changed, 106 insertions, 4 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 51f69a4c4cae..0edf9d64d9d2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index 120cc4e239de..4db8c301d779 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,4 +1,6 @@
 AUX jansi-1.11-build.xml 14529 BLAKE2B ea9358a4a64e077ba9173f6f0d0548647489980cff2626760b6c92df9774117bc6ff32f4647c8b89b21b4e37722f018e4f1fd0ca2cfa5915a83e253f9c18d250 SHA512 cc60a9f48f220ee13a22ed814409126524d22f2329c574e61974e26fd70b9a53f703ade06bb6921c13f370016be79c00d111368018132abee20780e99096c0a5
 DIST jansi-1.11.tar.gz 252095 BLAKE2B 72b22392fa6731f49ebb5c2e94cdf7918ca37d5c73ccb14d8810402c9ec120b1220a739e54516eeb5355ad4dd74d01ae398a6003679c60b1dd6f1648691b2efa SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1
+DIST jansi-1.13.tar.gz 253219 BLAKE2B 89fc81710bc0860c717241c97fe2e7a148ccbaa5fb1e7db30b978aa69cddccbc9ea45a0e30ef384c42a741d707f5eab73ce8b2a76e1095c66a2c95f9088f28f0 SHA512 9c4bb0b7435c102068718e039900828994f1ba60ed44307eb726eb91a2884bc406688c2747635b9353f3bd68a6bf0e7c082a4069343b59efffc900f59c563fde
 EBUILD jansi-1.11-r2.ebuild 1151 BLAKE2B 6b7c02eb60055900d4ae9a2364e0615d70f8b4945e0b15a001dfd35db22d6c59fe1867f0ac4982bfe9b713006a9a8c0f9e01a0526d7836ce07ba1fc534828331 SHA512 aba4591b29d248fb320ccd8736c1b16ee67ee79b8608dad3acd7a44afeab1d75e562072741fe35d361bfc7e14bc7af94306d9f8871093a92015fe78ec5684949
+EBUILD jansi-1.13.ebuild 945 BLAKE2B 64ba4a11b95ff51520604bcd8fa306d9ebd89c78c817285aa90158a8acb18a7e9a46a4160f245536246d8ab76c3e6cd17e63718f3e04c1e48741c05d01d87cdb SHA512 4df74ce98dc044b91a51970384248f295364860b23d7c63bd5764b18722a0725943e9c6d7f6879843a5981d4ce6cea065da347829ef058c8f842a2afc1bf59ad
 MISC metadata.xml 491 BLAKE2B 57979797604525188358a5e2bbf92bd7cc40e9513710d9907302df960f0fb0961b3c8eca15bc09b53cae259dbe3b512d149a4e9fb2bb5e3b1ad6a13700af3c4b SHA512 46a12388363e4b59001bf8cf67923a4f38d8a4409fe158a813c9403e0da6067a8aff418cda7e0d02dc905e38591ded15e46b8f8095acb62d0a83a65146550669
diff --git a/dev-java/jansi/jansi-1.13.ebuild b/dev-java/jansi/jansi-1.13.ebuild
new file mode 100644
index 000000000000..f570a1b7b6da
--- /dev/null
+++ b/dev-java/jansi/jansi-1.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.fusesource.jansi:jansi:1.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
+HOMEPAGE="https://fusesource.github.io/jansi/"
+SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/jansi-native:0"
+
+DEPEND="${CDEPEND}
+	test? (
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/jansi-jansi-project-${PV}/jansi"
+
+JAVA_GENTOO_CLASSPATH="jansi-native"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index f2d6a1b313b9..89b0b90f944e 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,3 +1,5 @@
 DIST jdbc-mysql-8.0.25-sources.jar 1556319 BLAKE2B 75eb4837f6916247650a925f87d52e49848e3bc52cfa683a149624e4b749c3c4b3a7336a5659dd0c894f0285254c915364d9ffd7b4779c87e0894053a2854a5c SHA512 c4384213845c43a494360131dcb7b9b424473237b65504d5ed4a7929cb8bb7b4b3c7cce6fde2c20a7026891751e76c78ea64af746a053ca42567a7e68782280e
+DIST jdbc-mysql-8.0.26-sources.jar 1578978 BLAKE2B c42e22ea50b6c3890aaf51ec8bfe53918c680ea54b314cee80ecdd2be122f031000fdb70b895807a0d22e5841df6fe5a76ec49b2e3097749fb8eabff4afca68a SHA512 8bf73a2cd0b5348d79e81da9c96da625258066b0b40d05d085b3978538dad75f4540a2b8414f005d90b8b87303c357e762bbf81dd2d8e68ff51c18a92124b7ae
 EBUILD jdbc-mysql-8.0.25.ebuild 1569 BLAKE2B bc43d39641921dccf2d4bf61124d1c37fc0f89f98b581fc233ed82bedf833e09d295fdf52ce98436ef26edf850a53263ef603d18298866420a230bc8d5553e86 SHA512 cfdf865113f68213f45970553eb47f6d81bcb0811182d789589079759902c848f7c1eb5ad06fe316da0ae0b613017ee3394d0c8ffc5082fd8dc7c74389ef4a5f
+EBUILD jdbc-mysql-8.0.26.ebuild 1570 BLAKE2B 2eee88021a2628474dd7a292654fa0867d9f574125c40f7f51f711a6a680f6bbad93b33e5fdbb555a9c80dc6a2f49e9d920d7aa95e4b14e95de3f8c15602594d SHA512 da4f8168e9485b820049fcac840be52b00c3ae5d11663440b2365a16cfa5d36d868fde641e40e49d0e9afd82b0580f14b3e6d1dcb453de4a39bc5aa39e83538b
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild
new file mode 100644
index 000000000000..f943332913c4
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom mysql-connector-java-8.0.25.pom.xml --download-uri https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25-sources.jar --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-mysql-8.0.25.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="mysql:mysql-connector-java:8.0.26"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JDBC Type 4 driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
+SRC_URI="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${PV}/mysql-connector-java-${PV}-sources.jar -> ${P}-sources.jar"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: mysql-connector-java-${PV}.pom.xml
+# com.google.protobuf:protobuf-java:3.11.4 -> !!!groupId-not-found!!!
+
+CDEPEND="dev-java/c3p0:0
+	dev-java/protobuf-java:0
+	dev-java/slf4j-api:0"
+DEPEND=" ${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND=" ${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+DOCS=( META-INF/README )
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="c3p0,protobuf-java,slf4j-api"
+
+JAVA_SRC_DIR="com"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	default
+	mkdir --parents "${JAVA_RESOURCE_DIRS}" || die
+	cp -r "${JAVA_SRC_DIR}" "META-INF" "${JAVA_RESOURCE_DIRS}"
+	find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + || die
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 250711591871..fcd7070be5dd 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -19,5 +19,5 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
 EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
 EBUILD swt-4.10-r1.ebuild 4628 BLAKE2B 91201a8ef41b011d1727120b2bcd32daf3c7dd3e042f88e391b982234932751150425ff2cc119a82e0c5d58e4b9544f1e6568ce36f3a8a7ea69b522bbb2cf7d9 SHA512 826f37b9d626e79f22011a3f2dd64701a1899a9dc3009cac3fdbce2cf4ba0159133ec9355205eece0cc0ae6a6e6c6c98acd873a54fbf4a3080f00d92cc117cd0
-EBUILD swt-4.10-r2.ebuild 4528 BLAKE2B 31af6057258ccc6af0f8f5557f8a538bb9977cbd6f0815975e87530ce1b55d5910075d984c1e3643f5a05ac0e8f8cdf71443bf2fbd8345e16ce6885c981883e8 SHA512 11e03fc361c60a38149e9a9c2e063eb6429311934cb35a7b8dcfc74f740187fe4cece4d80bd0173bd524cbe29bca6177c76644ece05aa9fbaeb3b08b91e9785e
+EBUILD swt-4.10-r2.ebuild 4527 BLAKE2B 9f2d0c3eb9bf1903c9f14376a31d4e7e9e7dd0122dc4f8938f4bc38bf8bec5aaeb9257d90c3259257f666f48257176f9a98dd5ea10201a793a6c36a4b305ac61 SHA512 1aa4bba24a5dabcc1173cea8bf930a380eabab23ac26b89a564e683d711287fd6811bdfa7b114480951c914f4a533b4c8c9fda4db6f7377ee2074b1764e3c06c
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild
index 4387c8f78a32..ec723d8e5d5e 100644
--- a/dev-java/swt/swt-4.10-r2.ebuild
+++ b/dev-java/swt/swt-4.10-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.10"
-KEYWORDS="~amd64 ppc64"
+KEYWORDS="amd64 ppc64"
 IUSE="cairo opengl webkit"
 
 COMMON_DEP="
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 845c06bf18d9..6a4efe469aca 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,6 +1,6 @@
 AUX zstd-jni-1.5.0.4-filter-flags.patch 369 BLAKE2B d79c3f5bee1e8faafb96a6d87c03c1cf5d1f292697fef1d7724394b9a415a30d9912946a612003e93a278648e4e5b1cc532e28d2c296c90b683eb7e0e769ac9c SHA512 fb56c386c6db387aa2c27a722d3c417813c427425d0dc6fb350ca02bee3f261efbb639eefbcc5dd58107f33c0211dba1b5bc696680e111a6338d0a67381ab533
 DIST zstd-jni-1.4.9.1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
 DIST zstd-jni-1.5.0.4.tar.gz 9296353 BLAKE2B 1b4011cc7876d3d4ca2636d9872b1127d3a700f4cc6b159a36dbff5e73a2ec3af91d4a27965123c9dbb9f017200bb68bf7e078806d25d7e395243c2251936891 SHA512 2d83a1e4ff6c25ef301dc25343dcfd4f2dda7f8c44aae2d1d5da2159affb6d0c2885693022dd5cbd2d360540092bebfe0635b61c899fc7ce8dc496a96ba6f017
-EBUILD zstd-jni-1.4.9.1.ebuild 1175 BLAKE2B 05110ee23b299827046cf47a18734131394944a6495701c71fdc486df616e6b1ebb2348407500000a4e0669343b3f02774d78ef5171de8ca1bbf533ed7155ba8 SHA512 2c858cf1079cbf408d8623fecaf010ca38a019d9d9364fbd538e7b21fc76f2c7cc9242e4a6e168777c4b0d9d8edbe26689f10269fa1681b721230f8b1eb9b232
-EBUILD zstd-jni-1.5.0.4.ebuild 1511 BLAKE2B 63a3a04987337af882ed5cec2b8ca0e3a9506faaa1dbb2cb611a7277715aababf8d83050f88bd95df0bf9bf9cef2f5689e5f2cfe62731115fadf32b99f0958f8 SHA512 beba7076a1a96f16f82b604a88dd1dbdc69397b58f608e83d3c125de116ef53d902471e6ca708dec8f521ef3f66a6dbcb77f1fd1d8d4575591bf7a38dea985aa
+EBUILD zstd-jni-1.4.9.1.ebuild 1284 BLAKE2B 08339e911cfff20e9e6581b446cc3f1a1c991900bce23171f9bf524e6c7d8d3868bd0cd63dac6e8732d648bc3d5d3c43aed06d0c730d04e93a7cf66d8c990c06 SHA512 0ed4f88409699665962e9ea34394c98413d90de77e7ee856f89b52a545b57f773395c2533e7b801dea7360043fc4cfc536d81e4e9ac35a6d800442582bbcdf6c
+EBUILD zstd-jni-1.5.0.4.ebuild 1620 BLAKE2B 39e16bf814663b196ad731b6f4aac1ca444bb66776e61e1607eb522a65a3a2934c4c5ea8a63ddbf6702c9eabe0dedf74d6de3ed5608618e435cf24b995028e9d SHA512 0d4550d8c99d2c7012d7f94f2a223e7956efdf5be646084ec50e4d59ab2c160d716fccf22eaa61e0287d05e67d40a0e872c493f5abd2d533f5231290ef4bf762
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
index 6428adfaaec3..91f20179a562 100644
--- a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
@@ -26,6 +26,9 @@ JAVA_SRC_DIR="src/main/java"
 src_configure() {
 	local mycmakeargs=(
 		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+		# Resolve bug #776910
+		# Reference: https://stackoverflow.com/a/51764145
+		-DJAVA_AWT_LIBRARY="NotNeeded"
 	)
 	cmake_src_configure
 }
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
index 116244dc24e7..d978a25ba299 100644
--- a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
@@ -37,6 +37,9 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+		# Resolve bug #776910
+		# Reference: https://stackoverflow.com/a/51764145
+		-DJAVA_AWT_LIBRARY="NotNeeded"
 	)
 	cmake_src_configure
 }