gentoo resync : 06.04.2022

3 files changed, 2 insertions, 87 deletions

diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index a1c2c97eac2d..25eb0b45eddb 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -3,6 +3,5 @@ AUX jabref-2.10-skip-failing-tests.patch 14972 BLAKE2B bbe4e6b4b94890cfe0db1c03c
 AUX jabref-2.10-test-jvm-props-args.patch 1846 BLAKE2B 1d278c20ecfea4923d4e28bb8ceb1af35b23b8ca7324d68a1852f289bc29ecf8bed44a483b13d87e9e9d48162ac56d6d09f5cdb42e41b25d7ddedfa20b0cf3fc SHA512 b81aa6b7e2c65409180dedcf4e0e1bdd65f32b64a72ec2588b9fcda1caa31d3dfd82690c975ef1ca39a2040f549b97267643a5b1633812bcddc0a428f9330429
 AUX jabref-2.10-test-prefs.xml 935 BLAKE2B 6429d261893c8388d4f2f5ee8328a649ded5d9756f48187d77a317a97bf20ef4d3c9da5c29a754e40548a774ab59bb9dfc2ef3e2e0d1708f1b9fbd7b3d15fd90 SHA512 e9ab3bb2faa4eda9e2fe8f282c9b669934d94d0461baa0cfbfddfffd3a7abf5c75f7d164ef6d5ad46f54aa7783c560c87ccfba82ec8cc98dc6dc0c6aded029f9
 DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
-EBUILD jabref-2.10-r6.ebuild 1998 BLAKE2B bdc1a0ed3328e781f096fdf6cbceca743b44adefd551386d05d6c2f2ffaae4640fc3f2ce42228f4928bbb51aa4e896d0248a97fb88823dcd605f1c12efedd533 SHA512 ed531c193206bbbd19313b5baafa9942db8e9a9fe9e05abfc12931ea9b23c430fe240875f889bbf9b3e9df8610a72e63740b730db5de9cf72c877ab13e8e0a65
-EBUILD jabref-2.10-r7.ebuild 3935 BLAKE2B 202a442a9381f6e6544db4a31b7b4564d8ca8195de7fe5031b5665b58e3d56ecc7d91aab90a2fa32485029deae3c0efabd8f41363c3d145e29eec9bf7cc5b3fa SHA512 6a5a2910ef854042621d86505aa3b842d0c3ad103fc5f393cf4751e92e88edb27736996041f9fa858728657a641080730e22523528217d6d6c3c3a5174ed9ee3
+EBUILD jabref-2.10-r7.ebuild 3934 BLAKE2B 8cf3addb28717913e11c301cd60a8898e1fdddde3b6e5fa4620c60704c225fa5721bc9a669f1b5717aa476898c61d4f723bf423d6fa42a7236bb7ea0019f63ba SHA512 982e684fb4c89045fed2e06fea786e4f691f7b4a7aeb0e4a2c6fce505a3f20825974ee29033782ec3f6d8cd28a650d0438149542c5bbc3834ae9744f50e571f4
 MISC metadata.xml 538 BLAKE2B 42838a006f22851a46a0327962db710293807bf0a88ada771d14a55109d4b304a3c128547d9e9fcbf98c7d7f4807ce40310f32040109d7531f22c5f2cf93e050 SHA512 6023ce4d2b7ce8165511cc356dc99fcfb2b6f6c16064ea64558c96d83973ae8dd826b8b4a0fedac134f4609739d15fa981a444900b4b281d2f4c85affc5a8087
diff --git a/app-text/jabref/jabref-2.10-r6.ebuild b/app-text/jabref/jabref-2.10-r6.ebuild
deleted file mode 100644
index 6a4ad2464020..000000000000
--- a/app-text/jabref/jabref-2.10-r6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit desktop java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="https://www.jabref.org/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/antlr:0
-	dev-java/antlr:3
-	dev-java/fontbox:1.7
-	dev-java/jempbox:1.7
-	dev-java/log4j:0
-	dev-java/spin:0
-	dev-java/microba:0
-	>=dev-java/glazedlists-1.8.0:0
-	"
-
-DEPEND="
-	virtual/jdk:1.8
-	${COMMON_DEP}"
-
-RDEPEND="
-	virtual/jre:1.8
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# If we cleanup it complains about missing jarbundler
-	# BUILD FAILED
-	# taskdef class net.sourceforge.jarbundler.JarBundler cannot be found
-#	java-pkg_clean
-
-	# Remove bundled dependencies.
-	rm lib/antlr*.jar || die
-	rm lib/fontbox*.jar || die
-	rm lib/jempbox*.jar || die
-	rm lib/spin.jar || die
-	rm lib/microba.jar || die
-	rm lib/glazedlists*.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
-	# Fix license file copy operation for microba bundled lib.
-	sed -i -e 's:^.*microba-license.*::' build.xml
-}
-
-src_compile() {
-	local EXTERNAL_JARS="antlr,antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
-	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
-	eant \
-		-Dgentoo.classpath=${CLASSPATH} \
-		jars \
-		$(usex doc docs "")
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
-	use doc && java-pkg_dojavadoc build/docs/API
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.10-r7.ebuild b/app-text/jabref/jabref-2.10-r7.ebuild
index b2b35d23a70c..2dfca56aca17 100644
--- a/app-text/jabref/jabref-2.10-r7.ebuild
+++ b/app-text/jabref/jabref-2.10-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	dev-java/antlr:0