gentoo resync : 20.03.2022

3 files changed, 3 insertions, 70 deletions

diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index f8b55fa7ca4c..e3b78da2fbe4 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,4 +1,3 @@
 DIST checkstyle-7.2.tar.gz 3359817 BLAKE2B 45cb74f6d2ff49cc218537cb9b5f95764a61a506f3aad8e265c809a0fecf9da47e8902ccc3afc312cddf3260d763b9d98a7e148c9382ed4107931cd189841170 SHA512 ee99d96d99a3f75097297cfda46e3647e57213bcb8b78098251a21c3fe0b4bb774393848d444f721d4bea83173581c89377a9d250157d6e6a225239da81d955f
-EBUILD checkstyle-7.2-r1.ebuild 1607 BLAKE2B 91ab17ba02744861cc951737fc2acc30de7bcb36e74a1aaa27c076efa7d369b052172611c5c207126963fb607b1f1e9bc98ec785a15f41f1dded10dcc5f73b61 SHA512 e65dec529bac6e8406db9781e161ed00d065c5ac057c04f9e65a971694ebb1086d281971452026b4e04d298ac22f350c8724a2235372cfd1c4146429739ea43c
-EBUILD checkstyle-7.2.ebuild 1586 BLAKE2B 786694e31b2025a30ad90c501c7cd52d57d13b727283cd1c63b85dfbd726e4d09427fbba9775505342d6bbd602ae12bbc882ed796d2ceb222199b86cd120c006 SHA512 0a918b177c245804165596a152d7e7e7bb44a265d62ba64968b250672508c97aae51f13563df661da1ed9ae2f8adc13b3b27ae004bc2a7a43e7af3cb51b9566d
+EBUILD checkstyle-7.2-r1.ebuild 1605 BLAKE2B 173380eef8f493ba97153e13b142669885ed12dea97db709747d584e583ff2604851a8dca3f9948d4d09f0d51b69d2e43e2820b0ee48081ba52539830ee7987f SHA512 88fad58d31b9f8375fad19e241164ca8b5aa71183e5cb9750b6249fbcd3b323fa7541778c749c5dd77a1ea265c9e12628bc155a0310fca95562e95a78d0f7801
 MISC metadata.xml 378 BLAKE2B fc372cc19e520a1601a1418680407b6de80ad490d6b217a500c43de7b1b43e1e94e1808e9435b1ec419812e78e3c3f8ff052944c831d8c038ba2f2f4a5e33bca SHA512 b4b76dd90841cf4d828a76b7005d6dc7cd7d4d18ea07d9d9964f8919dc882f279fa1bf13aa386f15ea2ea6913e1cc516ee0308608890f6f389b06e89388807f8
diff --git a/dev-util/checkstyle/checkstyle-7.2-r1.ebuild b/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
index 5411c86efbbd..564d30830696 100644
--- a/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/checkstyle/checkstyle"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CP_DEPEND="
 	dev-java/ant-core:0
diff --git a/dev-util/checkstyle/checkstyle-7.2.ebuild b/dev-util/checkstyle/checkstyle-7.2.ebuild
deleted file mode 100644
index 9d19d64351b2..000000000000
--- a/dev-util/checkstyle/checkstyle-7.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Development tool to help write Java code that adheres to a coding standard"
-HOMEPAGE="https://github.com/checkstyle/checkstyle"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CP_DEPEND="
-	dev-java/ant-core:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/antlr:4
-	dev-java/commons-beanutils:1.7
-	>=dev-java/commons-cli-1.3:1
-	dev-java/commons-logging:0
-	dev-java/guava:20
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="${S}/src/main/java"
-
-src_configure() {
-	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-config --tools)
-}
-
-src_compile() {
-	local PKG
-
-	PKG=com/puppycrawl/tools/checkstyle/grammars
-	cd "${S}"/src/main/resources/${PKG} || die
-	antlr -o "${JAVA_SRC_DIR}"/${PKG} java.g || die
-
-	PKG+=/javadoc
-	cd "${S}"/src/main/resources/${PKG} || die
-	antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} JavadocLexer.g4 || die
-	antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} JavadocParser.g4 || die
-
-	cd "${S}" || die
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-
-	java-pkg_dolauncher ${PN} \
-		--main com.puppycrawl.tools.checkstyle.Main
-
-	java-pkg_dolauncher ${PN}-gui \
-		--main com.puppycrawl.tools.checkstyle.gui.Main
-}