gentoo resync : 24.06.2021

13 files changed, 27 insertions, 402 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b652c7ad0394..b100fdf00010 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 8514f348ff79..dd041b81f783 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,7 +1,5 @@
 DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
 DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57
-DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
 EBUILD commons-lang-2.6-r1.ebuild 869 BLAKE2B 014e28d08de2cd8bd5ca9dd2d5492566f14864a00ac86cf4e262953396a74aef22882704c2c136c23070758bc5d832a0986c478e1fc0f141b9e4f5727841ebc5 SHA512 6575b1287b05a662f34d80bba40fad7b75f357331f4723900c0e2a5c6294a308acccb2664d9ce0dec0bec87fc0c819efb31f667dc242c22cc18ce508bee5388f
-EBUILD commons-lang-3.1.ebuild 825 BLAKE2B 828fefecb0daecd2c0dee1da07be43d676a55e152ff630e967626fa74e6a58abd6918a6e558e8bf6120435c62b64956aa6e9c05fdd0c44917dbe0241ad4a33a4 SHA512 7d2158fabad2919520b3fe56c78c6b6fe584711fbb0a2f21335f785bc82f842ab947078c0c93a7e641918f3c6d8c0152c41e2f2e09d43524aee44afb5900915b
 EBUILD commons-lang-3.12.0.ebuild 1036 BLAKE2B 23160f04bf20a6431d0b569a93c56bbdd08a4ea5ea3a135d1da55c52800fda51524877c507ac244e8e0cba93c7cae8d9210e13df1590ab5021cd2b0e01b9e706 SHA512 530f95c61531f1a1dd96e15dfc48e1224908bb76cb2d1e1edd3b6cf7ab629a8c482344f0a78b28a74bc196fc8606a838e5a86f9c3061620f1d49174ab7b26097
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-3.1.ebuild b/dev-java/commons-lang/commons-lang-3.1.ebuild
deleted file mode 100644
index 7c135f524ce8..000000000000
--- a/dev-java/commons-lang/commons-lang-3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}3-${PV}"
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz"
-
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND=">=virtual/jre-1.5"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_newjar target/${MY_P}.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt NOTICE.txt
-
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index e6dafa6d4945..c9451b0d8a86 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,3 +1,3 @@
 DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
 EBUILD gradle-bin-6.3.ebuild 985 BLAKE2B 5108b1a0ec969d79b2a27256b8c9ba5430f4d4326bd0e692cebeb31c9f09830592c3b856b19376fc6eef2d14069bf3c804b11f8054e7464a5a88c2b6b81cfd58 SHA512 c04c5d989701292ee4cd269e61ba989b5dfb818822b8c92f274c808216fadea75014ca21359ccdc859f29cc62812f3bc45c4a6db71a0f800f25575587373b583
-MISC metadata.xml 449 BLAKE2B b675645687a94a13762df0ee0607f6e9bbab7fcae1a7570c0648d3d574f640b3460ec3b2dc6ed8554026a70287abc349bb2a3f601e534d370cd6ad08c2f791ad SHA512 0393173c9476820673d65582c827868e2b16e346d07be73d8be2f37e1599c3e643e4c16d2fff37ef1ae1d3b8dd667492c2f166a352d382ba4a6334134af41354
+MISC metadata.xml 467 BLAKE2B bb2f586cab99d5a2b27ff6c13d1ea88ae50561a7b9d0c57451616d28b9f651b9899be8b6653b508616e6e8adfeaef5ba099f666855b514feb168050f48bd9d29 SHA512 243a28ef037ec2041d0440d624ddb2d9cb7546f048e9b9f0971af542a41af33c30e561eb76ab24803fe541935d983c7b1f52f52bd005490e77c9d6a8d96d2de8
diff --git a/dev-java/gradle-bin/metadata.xml b/dev-java/gradle-bin/metadata.xml
index f9d3fac87a16..ea6293a4bf8d 100644
--- a/dev-java/gradle-bin/metadata.xml
+++ b/dev-java/gradle-bin/metadata.xml
@@ -5,8 +5,9 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
-  <maintainer type="person" proxied="yes">
-    <email>flo@geekplace.eu</email>
+  <maintainer type="person">
+    <email>flow@gentoo.org</email>
+    <name>Florian Schmaus</name>
   </maintainer>
   <maintainer type="project">
     <email>java@gentoo.org</email>
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 6afbdddcfcf6..e41929813986 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,13 +1,5 @@
 AUX jdbc-postgresql-9.4_p1201-remove-osgi.patch 1629 BLAKE2B f358ab6ac9296ade9eb7603dc03367f984622207c259df68c3029464197b47e052b69a369889e174cc0543d51a1d07c4134e8530bab0e80de4d5f38e79557486 SHA512 dcb831f6828980b5ada1158cb80c2e5c8d6921b24b69cd0f40faec9b8d41bdaa468ca995e4a804282b816ab8b0120e371e5f21a2aff7fee6068f13affc6b097a
 AUX jdbc-postgresql-9.4_p1204-remove-sspi.patch 6853 BLAKE2B 243b64279b501b417a5570d41010decd4edb55ca11a14c1a927698ee3795b2d7e7fc9c5c6fcd95b6210bd26c3938795fcbbce1b1c4dafe259197b0db8eb60701 SHA512 17d6a1514fc824008c8f0464c4af30d038a379ade44120dc24d8f9a4f495393c6e75e82f8e9da1e51c6d22c2301ec83a842d0db6e22842661b4dda97b8335dc6
-DIST postgresql-jdbc-9.2-1003.src.tar.gz 1843082 BLAKE2B 35f6e4738e5340373ccb3cbe516f2e8f4a391b6e200b88c6adff7112b28f077c6e4108329c962b98dd2ee21e9e3db81521a324b036cc5d0d6ec9859f660bce60 SHA512 f91d9617726722998a51275c625f6ea89dfe0ac7ce415cc6fa76302b13762bcf825cd61ec69d25d0199ca21de8a24286eeffb843ad59c06fd3049a289ac2b702
-DIST postgresql-jdbc-9.2-1004.src.tar.gz 1842921 BLAKE2B 4cf0cb6da5749a9da194b9174db82289c3521edb7b7fd57d112883c185e0b80fd6feb70852eb54d7fe53d439817643bc608e9cdb3a9d9b2d43fd134031c770e9 SHA512 6e218b7df3d772e4fb9053672f5f77f6012fe6e652a536dfe171408e957465520b05994d4fa13c4d478b595a55b8068da663b9f3dcb544a46fcf91d71ba8fdf5
-DIST postgresql-jdbc-9.3-1100.src.tar.gz 1852465 BLAKE2B a81f385ff23679a1e6b268b53ea72dda744c50d043d02fe50a88421c43561a8fc63c849a974e84e1f1caa93ab20c01cc58cc9abe96f5567f5ac626263f402126 SHA512 43968a62f9443739721016ede186b2f41fa6db2d1ef319cd65059f8715e90eda7c7f568995b293578c39e04d43085cfdfece587500f99ed1a49964c12d8c747a
-DIST postgresql-jdbc-9.4-1205.src.tar.gz 2028968 BLAKE2B d4f55bc7c173795202f9eed58a67effba747b56f8dc5aaeeb2941532b3d0ce3f66ed113c38af9c2c40998191fd15d2828d05a1b693eb13a78a3d39b9fe6667b5 SHA512 ebb46c0cfcabc34083e6f481bc97536fba98d082462670d39efdd75e6463f1286db6fa07cd35546c749e456f1c06fb1d022cbc9f5cace2a1b968fab76a57d281
 DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae350407fafeb23d9d4bdb130c17996373b4211e0d56d1a76bc5737401dc6fc6618d2a891943d096b0f60f0770ff6ce859ade3e7a178d SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd
-EBUILD jdbc-postgresql-9.2_p1003.ebuild 1978 BLAKE2B 16e40127eb5113a26752cb5d1cf2fa3fe2894dca80ebaf892fd61793622b89f44aee644b238e9b4e643ec7abb6d7056bbbd9082bb409dc14c193dd7f92e47a52 SHA512 38cba94f33f11c6c22b68cd759e7514f1013a4c247f489e8239f3eed56051b8295604a5bfeaefe76a5aca6226cba32c4033b6761c5efcc1632cb20714218d8d8
-EBUILD jdbc-postgresql-9.2_p1004.ebuild 1981 BLAKE2B 2ccb65c367ac2e25fc03dc69d85e403482ce409352b3aa4b1218ef7849b121b3e989bc0d4029c7129a0fa2ec90731bcb81f3a2a5e8c6a135ab369290bfd188d0 SHA512 d010e27b8d0f51fe5802116e2c27f97940d94228b16e5b4a118f0293008db55b0650cb1aedb3b3097cdca2101d7fddfc62bf3b87ede36e655491018948145f12
-EBUILD jdbc-postgresql-9.3_p1100.ebuild 1981 BLAKE2B 2ccb65c367ac2e25fc03dc69d85e403482ce409352b3aa4b1218ef7849b121b3e989bc0d4029c7129a0fa2ec90731bcb81f3a2a5e8c6a135ab369290bfd188d0 SHA512 d010e27b8d0f51fe5802116e2c27f97940d94228b16e5b4a118f0293008db55b0650cb1aedb3b3097cdca2101d7fddfc62bf3b87ede36e655491018948145f12
-EBUILD jdbc-postgresql-9.4_p1205.ebuild 3124 BLAKE2B 8b5b72bfbbba3782ff4a0aabe03541ea05ace2f3e3b7d35f20e97a9c4e2fcb5a2e30b50154d735d34c3c551859b21db60113774f60e38a46d5c80c269e384513 SHA512 54b5fbe624175d7a236deb5e9628dee50a55d15f0892dbd52655a3cd02f8a5dcf43c418427bf239e591e5e53cf9eb93a64db729ac071892d08d5dec96ce2c9f5
-EBUILD jdbc-postgresql-9.4_p1206.ebuild 3121 BLAKE2B bd1845f1b0531fc35514783f37047221d836363144981b45c86bdcbe75ccf3edc2bbbdb0587f747052a8b6083cb4684a1b000a8da9cb75372dadcad824b6302c SHA512 d14f17263ec87a5a70978b6c53be2612777dadd20800c6c1e08da803f9fbba471906d868bb516c3e337155dc0461efa721795adcddd5fd006674e9931eeac829
+EBUILD jdbc-postgresql-9.4_p1206-r1.ebuild 3412 BLAKE2B 96f494807dcc52edbe1475d49af9a951873ad01647f44132ae0c370d84b9cd623091a2177ed99d25dec3a78252ea57c1e31b98da68ba6eb9e301cd2e8ea319b7 SHA512 bd1a037439f9e6995fe525a5a5ee6b2f89ff727e1741c92d9798676960aa6777c1d80d0046cac6557291a700c6a10c9de46729b0f878f20af5d55aac19d274e4
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
deleted file mode 100644
index 49c60a72aeab..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="https://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		dev-java/ant-junit
-		dev-db/postgresql[server]
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
-
-java_prepare() {
-	find -name "*.class" -type f -exec rm -v {} + || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_DOC_TARGET="publicapi"
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc"
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml"
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'password'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
-}
-
-src_install() {
-	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html
-	fi
-
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
deleted file mode 100644
index e5cff42377a1..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="https://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		dev-java/ant-junit
-		dev-db/postgresql[server]
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
-
-java_prepare() {
-	find -name "*.class" -type f -exec rm -v {} + || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_DOC_TARGET="publicapi"
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc"
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml"
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'password'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
-}
-
-src_install() {
-	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html
-	fi
-
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
deleted file mode 100644
index e5cff42377a1..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="https://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		dev-java/ant-junit
-		dev-db/postgresql[server]
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
-
-java_prepare() {
-	find -name "*.class" -type f -exec rm -v {} + || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_DOC_TARGET="publicapi"
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc"
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml"
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'password'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
-}
-
-src_install() {
-	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html
-	fi
-
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
deleted file mode 100644
index d7200bc01043..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="https://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		>=dev-db/postgresql-9.3[server]
-		dev-java/ant-junit
-		dev-java/junit:4
-		dev-java/xml-commons
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-RESTRICT="test" # Requires external postgresql server setup
-
-S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_DOC_TARGET="publicapi"
-
-java_prepare() {
-	# Strip build.xml of maven deps
-	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
-	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
-	sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
-	sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
-	sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
-
-	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
-	sed -i -e '/<include.*sspi/c\' build.xml || die
-	rm -vrf org/postgresql/sspi || die "Error removing sspi"
-	epatch "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
-
-	# FIXME @someone who cares: enable through osgi flag?
-	sed -i -e '/<include.*osgi/c\' build.xml || die
-	sed -i -e '/<test.*osgi/c\' build.xml || die
-	rm -vrf org/postgresql/osgi || die "Error removing osgi"
-	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
-	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
-
-	java-pkg_clean
-}
-
-src_compile() {
-	EANT_BUILD_TARGET="release-version jar"
-	java-pkg-2_src_compile
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc" || die
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml" || die
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'test'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "junit-4,xml-commons")
-}
-
-src_install() {
-	java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html
-	fi
-
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild
index cb6986cc6773..b5bfb41864b6 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
-inherit epatch java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_PN="postgresql-jdbc"
 MY_PV="${PV/_p/-}"
@@ -20,28 +20,36 @@ SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
+# it does not compile with jdk 11, newer versions should be fine
+# BUILD FAILED
+# /var/tmp/portage/dev-java/jdbc-postgresql-9.4_p1206-r1/work/postgresql-jdbc-9.4-1206.src/build.xml:197: Unknown JDK version.
 DEPEND="
-	>=virtual/jdk-1.6
+	virtual/jdk:1.8
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
 	)
 	test? (
-		>=dev-db/postgresql-9.3[server]
-		dev-java/ant-junit
+		dev-db/postgresql[server]
+		dev-java/ant-junit:0
+		dev-java/hamcrest-core:1.3
 		dev-java/junit:4
-		dev-java/xml-commons
+		dev-java/xml-commons-resolver:0
 	)"
-RDEPEND=">=virtual/jre-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
 
 RESTRICT="test" # Requires external postgresql server setup
 
 S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
 
+HTML_DOCS=( build/doc/pgjdbc.html )
+
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_DOC_TARGET="publicapi"
 
-java_prepare() {
+src_prepare() {
+	default
+
 	# Strip build.xml of maven deps
 	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
 	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
@@ -52,14 +60,14 @@ java_prepare() {
 	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
 	sed -i -e '/<include.*sspi/c\' build.xml || die
 	rm -vrf org/postgresql/sspi || die "Error removing sspi"
-	epatch "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
+	eapply "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
 
 	# FIXME @someone who cares: enable through osgi flag?
 	sed -i -e '/<include.*osgi/c\' build.xml || die
 	sed -i -e '/<test.*osgi/c\' build.xml || die
 	rm -vrf org/postgresql/osgi || die "Error removing osgi"
 	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
-	epatch "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
+	eapply "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
 
 	java-pkg_clean
 }
@@ -87,7 +95,7 @@ src_test() {
 	einfo "You can find a general info on how to perform these steps at"
 	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
 
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "junit-4,xml-commons")
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "hamcrest-core-1.3,junit-4,xml-commons-resolver")
 }
 
 src_install() {
@@ -95,7 +103,7 @@ src_install() {
 
 	if use doc ; then
 		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html
+		einstalldocs
 	fi
 
 	use source && java-pkg_dosrc org
diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
index f9496faaced1..15ec06da79e0 100644
--- a/dev-java/miglayout/Manifest
+++ b/dev-java/miglayout/Manifest
@@ -1,4 +1,4 @@
 DIST miglayout-4.0-sources.jar 194675 BLAKE2B 9d0a4fce1b76e49f4a2962fccf323676172fc9fa084060d8b3507031635b7979d8b29ce598a0a484e3707eefdf90721162e67d36be5702e9309ef067fd39aab3 SHA512 27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f
 EBUILD miglayout-4.0-r1.ebuild 1274 BLAKE2B 8d7d2db7d2fe14b4a827ff1f089083476fee8daf84c5ce96cae6ebc886d37234e106da7d8f72693d77a321d5675c6b6e99ba58d2f06ac7cfeeea0f71e4862ee9 SHA512 a51a700c956e4693eded18a36c848da2b8e6582c5527b75ada686f00fb8ad95b313f6fcd3de725d46f113bfacdcc9d62b7e06f3e7e7f6c5d920cd0b02ec5d572
-EBUILD miglayout-4.0-r2.ebuild 1139 BLAKE2B fb03d2d32ebae5e306c67ed7a2b382ad44abd64bd505d3440251c5860e1d895fae0e28943c4b5c5fd5a8627f5a77a412612abc245f3fcfb6d4395c0f0b61fe32 SHA512 bf163dbf9aa64bd8d5c8d5f0ea5422f9c014d5d3d0de94431d175b813f0f32c28e1c4e7dbbe04c1f3c57c09ba1302d75a6c37bfe7941cd06b2f22c40a3381af8
+EBUILD miglayout-4.0-r2.ebuild 1138 BLAKE2B 96a5f9e8f8d4de652e0c91e3fdaf1ad2fc7468128fe4469cba58f30691d029eaeb3bc642c94adfe96c8cc742dd9ea5e5d256a29bcd9f14230421513c7c3c3b72 SHA512 9a365cff4aca8c56c553a85376f21b868963812520caafc4329b8612809fc0a1e64fcc292e0f6351948c2cb14be5dc616f00b1e11aa3c32c9c68bd3875ce4a0b
 MISC metadata.xml 751 BLAKE2B 2fdfc28e91176b4c7e1dcc4a1d61c491c1e7a5d835fb1bdc89e340db57dcabbf951da958ac0ae728658fffcc6aada76194745282245a066adc8d9c792ac09a49 SHA512 b097936cfa00fa8468489722f2d9557ee93efdf0d9ac852fbcf745814d35b294d0a8b5f559c4aecc62480c6f59e8329013e133a7dc7618c4f665b79c3b03375d
diff --git a/dev-java/miglayout/miglayout-4.0-r2.ebuild b/dev-java/miglayout/miglayout-4.0-r2.ebuild
index d65b8a08ff17..c27929b85db7 100644
--- a/dev-java/miglayout/miglayout-4.0-r2.ebuild
+++ b/dev-java/miglayout/miglayout-4.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="swt"
 
 COMMON_DEPEND="swt? ( dev-java/swt:4.10 )"