gentoo resync : 28.04.2021

7 files changed, 4 insertions, 176 deletions

diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 234539ad1778..5842744a8397 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,21 +1,12 @@
-DIST asm-3.3.1.tar.gz 854626 BLAKE2B e8738aeda26f72c4630d33f1696188501022b4764f9f93d5fe9c74dd94459107c3bf72752e6d53850807a75d057757968b859d5453e8c61e54a5fa56f2db81f4 SHA512 b0dffde873dcdfd8328736cfaeb8a3fca2e0788fa642d3af0c995d55c6ca4b1847e35c24100277a453b518305c5fe234d1935fa8de9b25bddd5dee5f1d4a4d44
-DIST asm-4.0.tar.gz 752187 BLAKE2B 00795e18a65d1c3d17ddb722fad20c0c7b01101ffc766a0d5f82da83ce0763401c36857780ee82267d18fa67993314069645ffc188207e4628e99626b3409a07 SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db
-DIST asm-5.0.3.tar.gz 781742 BLAKE2B a2d3f0e59244d27c090be8cfab67f86369a6dae0c49a3526ee25b7c4454c93df1efee461c9a4be33b414161b66d0df65b935ff06850ad8fa6a48fdbc178e77c1 SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af
-DIST asm-5.1.tar.gz 791417 BLAKE2B 90ee3e28b20ce649763c43cf1b0bb495995dcfc31a534d774c727d201a913b8ae25f4c015e580c9d73b6f3a847ce32720a0c2b0ea61eab8b35e92be4beaab2fe SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e
-DIST asm-ASM_3_3_1.tar.gz 14406355 BLAKE2B 4f2634f1cefa3d7342682eba41ac035b0c2ad60457cd976ad194d9a3b728f0ea904ae4f35620116fa81e0095c40d7a30bd95f4f317a118b79fe2a80e1708f16a SHA512 24a48b5a84baeae64dbc587ca4acc2c9a37993a17e0651cdd4881e73567be79b87b50057fa4d0eb2ad5dcdd975566fddf426749ca560ce0453c444aacff3592e
 DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e
 DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
 DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff
 DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b
 DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-3.3.1-r1.ebuild 870 BLAKE2B e51b652599a40b8845d5c35ba37d6f20202c92092fab393040dfc7f9fbd17834d8afc73869065956bb4b2bf2d14b62f3d0c200b3dc8524bd029d4d98c244db8a SHA512 55384ff316829c25d191ec5d6280a487627ae2354436ff9ebd7ad0d10efb32d734a9dd33bb6cfa0cf823bf4d4b84b7651605cf3ea7b2a6022aba848f849afb43
-EBUILD asm-3.3.1-r2.ebuild 925 BLAKE2B b8d162ad54bfd93b1e1784ea36211251241f8ec669a8031a9118a9000b02176e99643ef56822c521f5eca6b40be0053a58f15f5c05b87ddf32339577bcd02985 SHA512 80a89ac921c28bb5fbc4bcdc5e330cfceee17c17ac15514f9f9cac5f9aaef8a668fc023d79b2f17e659bb5fd66d716fce23c88bc961dd70aaf6454f920139b95
-EBUILD asm-5.0.3.ebuild 1209 BLAKE2B 79453429c1e78192909435ae7247f0e11e4464ed38f4a0d2d1c2cfe5714ec1e433aed16ad5f0433abb07bee40369a5b5b135d644bbcf36719336d658937343e5 SHA512 3c03125070730ce4d554d163afde459b1f862235fddbff7788fb50556772c8709107c84eb56948c5c4d2bb2e86c9e98be18417ea70b573e562efac971f97003e
-EBUILD asm-5.1-r1.ebuild 1284 BLAKE2B cd9ba7ce9846795d6aed159bd8273e786098736d29343fd7e4599726f11cfc46dd84512604a6b979cbde94c0a3223e8297f2ae69f47703fbf270678ebfa8508c SHA512 dfcafbdf2b442e3a2fc602ed9445ad7a2d2852de8bcfb859f62a1e74925d30372c6a23722217a8d92356990ca817225244282e0947c2e8355d794459114a0153
-EBUILD asm-5.1.ebuild 1209 BLAKE2B 55f774cbe303d63d983a31937babd7e15f04273ea4c1d4052aae21aff2a150919abb490127b7bd8371979120a1b6a793f75ec0ef5f93e1082408d0e800a62a59 SHA512 010768d998a2d406d7ea90492e51bb1056fb4797bebd939aa3f7d776f4a5a599143615fc4471340f8d500345830975c6a48bc1a3191bd5e984e14cac26d57805
+EBUILD asm-5.1-r1.ebuild 1281 BLAKE2B 4b96ddb02de5c1fddf23646db0133774464554bf2957161e1d83c3bab9c3c9bc8fdbeeec67c04b2e2d83438fee807f44d8fb535baf750e6e4e413410a5045582 SHA512 fccc9bd86fe9e41469e2002c2c5ff9cb3bd53b6ba3d935195d92bb8ab771091290b3db0bfa3ce5a685480511a364d3c17a0f74ee08f6be16a1779b6e25f081df
 EBUILD asm-6.2.1.ebuild 568 BLAKE2B 32971b777f8b654ad23e36ec2e15e9ce1dc2e0724dbed9baa3ffd1a508deee565b95031352813f6bddb6bd5f147e2d013e7022cb3b149a50e88bfb5a993db423 SHA512 13492f12664ba269f2ab8cb331bdba728279feaa29dc6c1315164ca16c2de12778958fead17eb827095ef61f273045be6d9efbdd07772e177a10e5b379dd35dc
 EBUILD asm-7.3.1.ebuild 568 BLAKE2B 5813e8eda936a34f77c9647583b92e7ae845b52aa6c9a74408cf096a4b1badfad8fa1b075429bd75ac0d3aea2fe0b9adefca15265869d981dc18a29453d25d40 SHA512 5619c7922bab5b984283968749a46fce73903ebe4db57589f37b2c21a0f242ef03498e753dd0464aa68e66d798db07e3656e30d86ad015799dd1b6e668612bd7
 EBUILD asm-8.0.1.ebuild 568 BLAKE2B 5861690e7bb9868484dbf18e6bd1dd62efd3e779aa63a35364e832db79b4d01d799d583b5c8fcf4967c5815d45baf836b6c2557f597b54deb12b9558790d91ca SHA512 847fcfa188a7028850fb66ebb9f1d615a0f645a0b845276eb0d1c2abdbb5d02d6e9b411d633887d655f9dcbfd9a75670e33d2dc5346330f765b47a21bb8466a3
-EBUILD asm-9.1.ebuild 568 BLAKE2B fb9ac711d6adce8911b558a5558be89dbb2eeb25d37112c506f6797328424c7c966163bcbd266d79403237de21527a2f4b14c0623ac1e1d2179c90d0063f293f SHA512 c6599e31d0522123145c51e3dc9972940d6ced2173156fd4c3f0eaef93b97b087412ce2267f613de64df14f3dff23d7a140d3341c15d56d5ec9a1ee44146b5d2
+EBUILD asm-9.1.ebuild 564 BLAKE2B 26b31a92001b6a04925ab4fcccd999d86c17a2623aa91ccf587ec04f0f0b70da39a6f18dfb9f0889535ddd24fdaa171f8b32a8ce94cb9bc856f15cc66e9b5366 SHA512 dbfbeb8921791c282faedeaabda397a08c3967749eb4191d654a2140682d1372eb01258a52996045235338f561cbdcd561aac9b3773e102c9ff108cd436c6f46
 MISC metadata.xml 1230 BLAKE2B a71da4c461c9ba0e7092f9c16916b0a72359fa198654c7ddabd4544efa0eb17c52378712dfe4bad27f5dcd14b289999d899dac0e89a7fd19350afe951de27839 SHA512 91a6876a431249ac794c998ab741eb4c8e3bef302e090402fd7b84dd6ebfb7734a4dfcf85fdd1ab3cedbf1d746f60ec7aa4444be44a8e316e01b8d1d45fcee5d
diff --git a/dev-java/asm/asm-3.3.1-r1.ebuild b/dev-java/asm/asm-3.3.1-r1.ebuild
deleted file mode 100644
index e37a56ad9fdd..000000000000
--- a/dev-java/asm/asm-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_ANT_TASKS="ant-owanttask"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="3"
-IUSE=""
-KEYWORDS="amd64 ppc64 x86 ~sparc-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-# Needs deps we don't have yet
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this property is not set
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar"
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar ${x} $(basename ${x/-${PV}})
-	done
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-3.3.1-r2.ebuild b/dev-java/asm/asm-3.3.1-r2.ebuild
deleted file mode 100644
index b67557484231..000000000000
--- a/dev-java/asm/asm-3.3.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_ANT_TASKS="ant-owanttask"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~sparc-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/asm-${MY_P}"
-
-# Needs deps we don't have yet
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this property is not set
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar"
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar ${x} $(basename ${x/-${PV}})
-	done
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-5.0.3.ebuild b/dev-java/asm/asm-5.0.3.ebuild
deleted file mode 100644
index 6bd00d55c4a1..000000000000
--- a/dev-java/asm/asm-5.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-OLD_P="${PN}-4.0"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.ow2.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
-	http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz"
-LICENSE="BSD"
-SLOT="4"
-IUSE=""
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-# Needs dependencies we don't have yet.
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this objectweb.ant.tasks.path is not set.
-# Java generics seem to break unless product.noshrink is set.
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
-
-java_prepare() {
-	# Borrow some ant scripts from an old version to avoid requiring
-	# bndlib and friends. This may not work forever!
-	cp -vf "../${OLD_P}/archive"/*.xml archive/ || die
-}
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
-	done
-
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-5.1-r1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild
index b53de05f70d8..cae7bdcc920f 100644
--- a/dev-java/asm/asm-5.1-r1.ebuild
+++ b/dev-java/asm/asm-5.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz htt
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
 
 CDEPEND=""
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild
deleted file mode 100644
index 0b38eae33728..000000000000
--- a/dev-java/asm/asm-5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-OLD_P="${PN}-4.0"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.ow2.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
-	http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz"
-LICENSE="BSD"
-SLOT="4"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-# Needs dependencies we don't have yet.
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this objectweb.ant.tasks.path is not set.
-# Java generics seem to break unless product.noshrink is set.
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
-
-java_prepare() {
-	# Borrow some ant scripts from an old version to avoid requiring
-	# bndlib and friends. This may not work forever!
-	cp -vf "../${OLD_P}/archive"/*.xml archive/ || die
-}
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
-	done
-
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-9.1.ebuild b/dev-java/asm/asm-9.1.ebuild
index 73bac3be0c6f..671695dc8120 100644
--- a/dev-java/asm/asm-9.1.ebuild
+++ b/dev-java/asm/asm-9.1.ebuild
@@ -12,7 +12,7 @@ MY_P="ASM_${PV//./_}"
 SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
 RESTRICT="test"
 
 CDEPEND=""