dev-db/scylla: version bump, ebuild cleanup

4 files changed, 7 insertions, 56 deletions

diff --git a/app-admin/scylla-tools/scylla-tools-1.6.4.ebuild b/app-admin/scylla-tools/scylla-tools-1.6.4.ebuild
deleted file mode 100644
index 87f5fa8..0000000
--- a/app-admin/scylla-tools/scylla-tools-1.6.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="scylla tools (Java part)"
-HOMEPAGE="https://github.com/scylladb/scylla-tools-java"
-SRC_URI="
-	https://github.com/scylladb/${PN}-java/archive/${MY_P}.tar.gz -> ${P}.tar.gz
-	https://repo1.maven.org/maven2/net/nicoulaj/compile-command-annotations/compile-command-annotations/1.2.1/compile-command-annotations-1.2.1.jar
-	https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
-	https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-core/0.20.2/hadoop-core-0.20.2.jar
-	https://repo1.maven.org/maven2/org/apache/pig/pig/0.8.0/pig-0.8.0.jar
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="dev-java/antlr:3.5"
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8"
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/${PN}-java-scylla-${PV}"
-
-EANT_BUILD_TARGET="jar"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	find examples -type f -name \*.xml -exec rm -v {} \; || die
-	cp -v "${FILESDIR}/${P}-build.xml" "${S}/build.xml" || die
-	cp -v "${DISTDIR}"/*.jar lib || die
-}
-
-#src_install() {
-#	java-pkg_newjar "build/apache-cassandra-clientutils-2.1.8.jar" "apache-cassandra-clientutils.jar"
-#	java-pkg_newjar "build/apache-cassandra-thrift-2.1.8.jar" "apache-cassandra-thrift.jar"
-#	java-pkg_newjar "build/apache-cassandra-2.1.8.jar" "apache-cassandra.jar"
-#}
diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index 085386b..a35570f 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -1,6 +1,6 @@
 AUX 10-scylla.conf 64 SHA256 47a2a3b9d581f289ad5bfaa78f92cc01e7f12ddc6e66ee08ceb27463ec0dbcc5 SHA512 c24b3ec2f0ea3b1ad0792c05a8eb044b3a157862b59759e020586ae872f9789a558d423fe1dff1a8c6d8342049cf4d919faf31a1439a6a1c69af915365b4ec82 WHIRLPOOL 0d5a3cae1ae3f29e77d58c010284c3dcadf556c2a5ec67624c010b18b43b3aac477eab5abe9dd70fdaabba02287a01d56cac65929528fe6541b6c8b268d23cf9
 AUX scylla-server.confd 386 SHA256 b0da01117d51478b8cf0e0bc77829c7dab0bd8aeadef100f25ebf098d050b3d0 SHA512 5d3c55933a02d3b16837013b37110f6669c14e01599532f30935b5dc29871a5bed897c9eb01a6e89469eab7d645c9231745a06c2ef827f6700e13c8faa9cdb87 WHIRLPOOL 7c0a17760ae83b34384f17abf81e1cd8e9da54c764102320fe237f74fcf94de9396ca1fd8e6576c72c54d7c504cf6daa54847db548cd7900069bdd972efe5676
 AUX scylla-server.initd 964 SHA256 b99672314a6e236939fcb19d37c89f98098e34227ea77ff79cb2ce01873408a8 SHA512 e72b817e8a42d843f6766b0cd25c33b8231efbd223f4ad31bca9a2610f670b3980c1be256343f5e3b0fe0f54ba460713f6db8de92c27cf67653140794299f760 WHIRLPOOL 89c88dddfedbc317046ad441a5a4bd2c3a8dde92ca4e81001da47909a4d05f74eb3296141c2f9fd02f57317a02e286f159c53c4909d3f0e2b0594d5cac1be14c
-EBUILD scylla-1.7.2.ebuild 5058 SHA256 9f1b28b3032da5b0330fec6172dfb040ce652e1220a816411528d9b03ea75ddd SHA512 28e0f0cd5f869975a9178d32fbe3dd89b3ebceec8f5b9632c0237ede61a25822ea525712be6c72505553cd730fc06f3521d6508bafc5fac562ee976bf45a6f59 WHIRLPOOL 3e3fce1c0b49737bcc0ee1c4ac2a2e535716b3d1a884e5b4e3e9a5095849a7401d38e5a6c858051f3fb334df5ceabe2a2a6e88da0c66edde3081c2926c799f31
-EBUILD scylla-9999.ebuild 5059 SHA256 29c46afc0e9ed43735d3166f465fa97f4efa941c004f083ef71636e2f04efdbd SHA512 b7b4d149594b65f26f4c835a473bd4169d153a1d768ceb7af4ca1503d9c94a4fa7e885e7659d069bb101f776573459b9e0c55c10bd4c966963b4f3df0b0fb5c5 WHIRLPOOL 7a177d88db7ba6ad506b45fa33635e85b5e65bf52b0531964a6e53de932cf00062c70c6e1f68d4f17416802f2a88a97caa9b01f61993cb546a585817abe121cd
+EBUILD scylla-1.7.4.ebuild 5058 SHA256 9f1b28b3032da5b0330fec6172dfb040ce652e1220a816411528d9b03ea75ddd SHA512 28e0f0cd5f869975a9178d32fbe3dd89b3ebceec8f5b9632c0237ede61a25822ea525712be6c72505553cd730fc06f3521d6508bafc5fac562ee976bf45a6f59 WHIRLPOOL 3e3fce1c0b49737bcc0ee1c4ac2a2e535716b3d1a884e5b4e3e9a5095849a7401d38e5a6c858051f3fb334df5ceabe2a2a6e88da0c66edde3081c2926c799f31
+EBUILD scylla-9999.ebuild 5109 SHA256 d3c17a4c8c4a38bc2fc7eeb15db8a8a9198ad9b2e219515ca90fb513391162b6 SHA512 cfa81a1a8b7402189dc4ed3245ce4824971e5905905a82d60d5edb77df4a2022089330dd482e38433827c16e0b17743d34b610b03c9c57fd4b2d9dcd7845a025 WHIRLPOOL 107a74ba134898fc3b58321a8604488eaa74febabf58e2858555c452d2c51424945b21032f7d758a359086d394b87556fd57c78f565b143958a142c670295c80
 MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/dev-db/scylla/scylla-1.7.2.ebuild b/dev-db/scylla/scylla-1.7.4.ebuild
index 6e2a97e..6e2a97e 100644
--- a/dev-db/scylla/scylla-1.7.2.ebuild
+++ b/dev-db/scylla/scylla-1.7.4.ebuild
diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild
index 64d01d9..9af7af3 100644
--- a/dev-db/scylla/scylla-9999.ebuild
+++ b/dev-db/scylla/scylla-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://github.com/scylladb/scylla.git"
 #EGIT_COMMIT="scylla-${PV}"
+EGIT_REPO_URI="https://github.com/scylladb/scylla.git"
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit git-r3 linux-info python-r1 toolchain-funcs systemd user
@@ -17,8 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc systemd"
 
+RESTRICT="test"
+
 RDEPEND="
 	app-admin/collectd
+	app-admin/scylla-tools
+	app-admin/scylla-jmx
 	app-arch/lz4
 	app-arch/snappy
 	dev-cpp/antlr-cpp:3.5
@@ -71,7 +75,6 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	eapply_user
 
 	# set version
 	local git_commit=$(git log --pretty=format:'%h' -n 1)