gentoo resync : 16.01.2021

4 files changed, 3 insertions, 87 deletions

diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
index 63c57626a111..c88d49905779 100644
--- a/dev-util/weka/Manifest
+++ b/dev-util/weka/Manifest
@@ -1,7 +1,4 @@
-AUX weka-3.7.13-build.xml.patch 576 BLAKE2B aa7535a003410f9ec6aa091e3fd98918206803b1cba85684739648790ace23b4de82f5f07911983deebc91f64ed2882254179eaba490516c1fc11d537f5e180f SHA512 7d187da1ebd6f2e774ff8441d742eed37c9e804da2b9f6df905c02ceea2a5fdc2c210b7a195b052e7b4eeb062225b8bed315ad38ac9323adf8a3cf11fc29e143
 AUX weka-3.8.0-build.xml.patch 568 BLAKE2B 777233f959ec5adcfffb0e12042e11c0dce154a1ab8d54068a6a4d3bffcc059102ebbd96776c24488159230b4b6426a6d7ed7c55810cd98fe95347d340ec010c SHA512 8b1cd5ff6867bf5d43ec1b95d98288f1d035f37878c8fd99f33bb6389dd24e29ba8112f718c02b25cfbae6ed67f02c22643af39cae06e3a2d58081600a918c39
-DIST weka-3-7-13.zip 42159458 BLAKE2B ede4e225dac3d2eb875eaddfee8209a8c50b0095a885c4c9384703aa476d75ec9f1bc4dfcdc2e2874b623f0cf4090f281fe77d8363c1fb5300409c4a6e119f44 SHA512 aa15b857d3b3b35720468206e42a157cc8c63d6bf3f4fdda93845da7e4e4ffca0201b2b92056486a2245681f7e0052dc75959194be954d84b391e812bd49ce5e
 DIST weka-3-8-0.zip 50550487 BLAKE2B 85d7e68155c02f89e296ea1a4ee6e544287458135a941a4f618807f5c5b3e88edc6952fbdf632cfb642ef08fafcb7084dda3bda9269629610e8c532dd63d165e SHA512 7e38646a59e3d3d5fa314d269747ed7c526605253339e20f24bae55684a6cd77eeefb267b05825d8de44ae0e827873ba11ce6759b1d78a1a1975d100fd910b33
-EBUILD weka-3.7.13.ebuild 1461 BLAKE2B 4b43783512a70d6b67d3b042914ff3a6f0188fed3244808aa373cf2ff12b356ceab0366bc9ee7844ac843b0b576cbb9f1fe6327b4ec9ecabccaa03c9a88f798d SHA512 d6fa3b52b23adbf22c4cbd9e8fec9ef6a113ac83a68a98ca77f489dd364500670a93f21b570ae748437c0cb5d77ee017d9d8d9f608bd7352fd3ebf3a5f67ee9c
-EBUILD weka-3.8.0.ebuild 1776 BLAKE2B 233d1f1d2e51086bc78a5b8c6d2b99dea0eef5a998f8ba99a6c5ceccf22e99b243cae5c171fb69acac04a751d1115fe398615c51c2bdfd37d0348e44820c552c SHA512 f684824f58f527210c932662124d3ab3e3ff77398c4e592bf5e238a3caf57329d8536155a1a54e0efe14a9def8306325ef524ee5d00c1703d6bf1dc7448d80b1
+EBUILD weka-3.8.0.ebuild 1771 BLAKE2B 073161608febfc2558c8c0be594de5c78c9e9354f8faff2fddbf6576c1bd3435f44b523bd00575ac233ad544bad133dab80496d9c7b4f8c665dee60cfe4e4408 SHA512 4138be27eddd1b14019a2e29a973f044d5b9800c09d85bc0c32deb377d74c42860fe5476a920cfba0f385055e7f36f05b83570093a9a688bc5a9d173370de72d
 MISC metadata.xml 389 BLAKE2B 9b270710fd1ce5f8e0fb94fe524c8f197d73c796f7279e50cbc653251b147f7f3fe0eb14bcd70841a27dac14f68edebf1b1aad30f9db5c464d5f6ea831cace6d SHA512 4863d852d095b72a3854acf3d70492e2a77ed17ff079273e24b91a9a148f1d2ddedb11d387affeab69b5f00ad09eb73cbbeaae95455ff7ef62a4e0be4c694565
diff --git a/dev-util/weka/files/weka-3.7.13-build.xml.patch b/dev-util/weka/files/weka-3.7.13-build.xml.patch
deleted file mode 100644
index 05da33df23d6..000000000000
--- a/dev-util/weka/files/weka-3.7.13-build.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/build.xml	2016-04-11 16:45:18.592385569 +0200
-+++ b/build.xml	2016-04-11 16:48:01.756389582 +0200
-@@ -603,13 +603,6 @@
-          <include name="**/*.default"/>
-        </fileset>
-     </copy>
--    <rmic base="${build}/classes"
--       classname="weka.experiment.RemoteEngine"/>
--    <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
--      <patternset>
--        <include name="java_cup/runtime/**/*"/>
--      </patternset>
--    </unzip>
-     <unzip src="${lib}/packageManager.jar" dest="${build}/classes">
-       <patternset>
-         <include name="org/**/*"/>
diff --git a/dev-util/weka/weka-3.7.13.ebuild b/dev-util/weka/weka-3.7.13.ebuild
deleted file mode 100644
index 3b118c2f74e3..000000000000
--- a/dev-util/weka/weka-3.7.13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-$(replace_all_version_separators '-')"
-DESCRIPTION="A Java data mining package"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	>=dev-java/javacup-0.11a_beta20060608:0"
-RDEPEND=">=virtual/jre-1.6
-	>=dev-java/javacup-0.11a_beta20060608:0"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${P}-build.xml.patch)
-
-EANT_BUILD_TARGET="exejar"
-EANT_DOC_TARGET="docs"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-
-weka_get_max_memory() {
-	if use amd64; then
-		echo 512m
-	else
-		echo 256m
-	fi
-}
-
-src_prepare() {
-	unzip -qq "${PN}-src.jar" -d . || die "Failed to unpack the source"
-	rm -v weka.jar || die
-	rm -rf doc || die
-	java-pkg_jar-from --into lib javacup
-
-	sed -i -e "s/256m/$(weka_get_max_memory)/g" build.xml || die
-	default
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher weka --main "${PN}.gui.GUIChooser"
-
-	# Really need a virtual to list all available drivers and pull the ones
-	# instaled
-	java-pkg_register-optional-dependency hsqldb,jdbc-mysql,mckoi-1
-
-	use source && java-pkg_dosrc src/main/java/weka/
-
-	dodoc README
-
-	dodir /usr/share/${PN}/data/
-	insinto /usr/share/${PN}/data/
-	doins data/*
-}
diff --git a/dev-util/weka/weka-3.8.0.ebuild b/dev-util/weka/weka-3.8.0.ebuild
index 134f1ad611ba..e5bc75967bf2 100644
--- a/dev-util/weka/weka-3.8.0.ebuild
+++ b/dev-util/weka/weka-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND=">=virtual/jdk-1.7
 	app-arch/unzip
 	>=dev-java/javacup-0.11a_beta20060608:0"