gentoo resync : 29.12.2022

3 files changed, 2 insertions, 77 deletions

diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
index 4cb04babc780..59a31cf161cf 100644
--- a/dev-util/weka/Manifest
+++ b/dev-util/weka/Manifest
@@ -1,5 +1,4 @@
 AUX weka-3.8.0-build.xml.patch 568 BLAKE2B 777233f959ec5adcfffb0e12042e11c0dce154a1ab8d54068a6a4d3bffcc059102ebbd96776c24488159230b4b6426a6d7ed7c55810cd98fe95347d340ec010c SHA512 8b1cd5ff6867bf5d43ec1b95d98288f1d035f37878c8fd99f33bb6389dd24e29ba8112f718c02b25cfbae6ed67f02c22643af39cae06e3a2d58081600a918c39
 DIST weka-3-8-0.zip 50550487 BLAKE2B 85d7e68155c02f89e296ea1a4ee6e544287458135a941a4f618807f5c5b3e88edc6952fbdf632cfb642ef08fafcb7084dda3bda9269629610e8c532dd63d165e SHA512 7e38646a59e3d3d5fa314d269747ed7c526605253339e20f24bae55684a6cd77eeefb267b05825d8de44ae0e827873ba11ce6759b1d78a1a1975d100fd910b33
-EBUILD weka-3.8.0-r1.ebuild 1668 BLAKE2B 28ee3f510057b17b2ac4427522852948916248373f5eef20d6bba70107bb850886993a9572e78ccac2011848084e19a2cf249b381ebbc96d1c0670a1a3072579 SHA512 ba4c069dcd80d803f63a96c628f9203271ae0c1ac2522a21bf0d4996d286d2e3974042f94abb06eb9592dce73f3a7c7fad163248a2e22c2ea5db35c2877b410b
-EBUILD weka-3.8.0.ebuild 1771 BLAKE2B 073161608febfc2558c8c0be594de5c78c9e9354f8faff2fddbf6576c1bd3435f44b523bd00575ac233ad544bad133dab80496d9c7b4f8c665dee60cfe4e4408 SHA512 4138be27eddd1b14019a2e29a973f044d5b9800c09d85bc0c32deb377d74c42860fe5476a920cfba0f385055e7f36f05b83570093a9a688bc5a9d173370de72d
+EBUILD weka-3.8.0-r1.ebuild 1666 BLAKE2B 00901142323a317f65b7ff619ec3b558457727104132635c449b38eb726ba600c7d0d7ccebc88e46831568834020b21d9011bb2a0ec92fe17de5352c66dd61b6 SHA512 668890144b2af564f45d480b1a84b43a917e7ded6105669ee0f411602544b1718d8b07d3e6211510286bd7cb4611ece86d90db4c200246a9d64312c4ce596721
 MISC metadata.xml 389 BLAKE2B 9b270710fd1ce5f8e0fb94fe524c8f197d73c796f7279e50cbc653251b147f7f3fe0eb14bcd70841a27dac14f68edebf1b1aad30f9db5c464d5f6ea831cace6d SHA512 4863d852d095b72a3854acf3d70492e2a77ed17ff079273e24b91a9a148f1d2ddedb11d387affeab69b5f00ad09eb73cbbeaae95455ff7ef62a4e0be4c694565
diff --git a/dev-util/weka/weka-3.8.0-r1.ebuild b/dev-util/weka/weka-3.8.0-r1.ebuild
index 09faaa18dc62..cc3a1d1e946a 100644
--- a/dev-util/weka/weka-3.8.0-r1.ebuild
+++ b/dev-util/weka/weka-3.8.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/weka/weka-3-8/${PV}/weka-${PV//./-}.zip"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="virtual/jdk:1.8
 	dev-java/javacup:0"
diff --git a/dev-util/weka/weka-3.8.0.ebuild b/dev-util/weka/weka-3.8.0.ebuild
deleted file mode 100644
index e5bc75967bf2..000000000000
--- a/dev-util/weka/weka-3.8.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# 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.7
-	app-arch/unzip
-	>=dev-java/javacup-0.11a_beta20060608:0"
-RDEPEND=">=virtual/jre-1.7
-	>=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/*
-}
-
-pkg_postinst() {
-	elog "If you are upgrading from weka 3.7 to later"
-	elog "and your package manager does not start please delete"
-	elog "file installedPackageCache.ser from packages folder"
-	elog "in wekafiles located in your user home."
-	elog
-	elog "rm \${HOME}/wekafiles/packages/installedPackageCache.ser"
-}