app-admin/scylla-tools: version bump

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Manifest-Sign-Key: F30FAFEE3BD598228B24CB121A3A8C89C56D610B
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

2 files changed, 119 insertions, 13 deletions

diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index 75d77dd..5f6d1a4 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -5,26 +5,28 @@ AUX scylla-tools-3.0_rc1-build.xml.patch 962 BLAKE2B 9a769b53b6dc98ba402089c77f4
 DIST jstackjunit.zip 1977804 BLAKE2B 31acda6a249cbd9802e298e1780486b1cef807a5c666c30e59bb4a119a9c1fceb6018ffb8416873ed35b5dba9366cef840c1ca4f56c66dab9828c92a1f7befff SHA512 31b9226e7461399336fff0a66d20a7838f710c5d1264c6b565dabdd5798e8b1603844959b762337691ee3e2c902c1cb94580b83f94d874a2cf7540ea702126f1
 DIST scylla-tools-3.0.6.tar.gz 35222543 BLAKE2B 993ead2e1057f6244c3455dfa016cb6ed9bccc3c6a4413b8378da417397a587b7dcaf8602ffed5b58c8d09ae5f025a0e2ec13ad9af60cf3b0d92c86f0c1b160f SHA512 5369bc0ef05d12e9d822a61ba7ed4943d54f120634813c9c5b4b3f6fc69d9a9df25b4e2fd11371fff3cd91155d84bd572ef6057ec83ae8c0a082a23c594f077b
 DIST scylla-tools-3.0.8.tar.gz 35223682 BLAKE2B d92aa4e82bda6e03eb9bab6e8fd7f02d7e4dd2892d014c4fbb4f77c842ea38ade8b3c36bd102eb2f1aeb4f5715f4af7a23781b6c358672250005e0edae6d61c3 SHA512 dbdb93050367ac742ea83fbb2ac707584e5c0a82c9c056739e1551ed3ccfd1ae9ad29bf6d838021599f5a478373dee5d3c5a2571e373d7332074f1c5482cf475
+DIST scylla-tools-3.0.9.tar.gz 35222090 BLAKE2B a374b7cf6a588f41bf97ce7a896cf419cfee66b2155539c04d74f6767eccea12af41dcc5e5b296f9e89f13eaba9527ffb9289226f44d254ccae18792cb25f651 SHA512 617cccca9bdc7d9f20e732c8f1a200f935d71d167dcecf86ac5d776117146a56cf12c5a921df28b0d9daa996e7a8c336aaf3d8b05a3a24b29fe1e91f39efad0c
 EBUILD scylla-tools-3.0.6.ebuild 2559 BLAKE2B 32d4314e6795f874cb46e8a544c293f94b0fd7e4ea3d8519de08b5b75f2c817144bd84881298c465442ad956779a8392a8508ea8f786bd1961398dee6ef5f365 SHA512 28a38d026f051610dba2d59454078a30f4fb837c336659e213fa7503a67d4f111c523591781b658d8f4550b41ac9ab605b10f84300c28d0aed17424d63b64316
 EBUILD scylla-tools-3.0.8.ebuild 2559 BLAKE2B 32d4314e6795f874cb46e8a544c293f94b0fd7e4ea3d8519de08b5b75f2c817144bd84881298c465442ad956779a8392a8508ea8f786bd1961398dee6ef5f365 SHA512 28a38d026f051610dba2d59454078a30f4fb837c336659e213fa7503a67d4f111c523591781b658d8f4550b41ac9ab605b10f84300c28d0aed17424d63b64316
+EBUILD scylla-tools-3.0.9.ebuild 2559 BLAKE2B 32d4314e6795f874cb46e8a544c293f94b0fd7e4ea3d8519de08b5b75f2c817144bd84881298c465442ad956779a8392a8508ea8f786bd1961398dee6ef5f365 SHA512 28a38d026f051610dba2d59454078a30f4fb837c336659e213fa7503a67d4f111c523591781b658d8f4550b41ac9ab605b10f84300c28d0aed17424d63b64316
 EBUILD scylla-tools-9999.ebuild 2379 BLAKE2B 3f43765f1f837d2e9eb1a225a7c2aa4dace17a8ed6adae512b995f35ddff11a97def3dbe291b03521a6efd1054b87c4c4cf5e36fbc412cf6939148dd27da43b0 SHA512 c5858bf28c776d3af5f978aaa7cf010e2537a151e41e2733d79be26df9303eb8f1c5c6585c4d09275f381b6c0c018126f1ec9d0177865f35ff9f1a1db813db04
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl0cyEFfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl1Jp8tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB
 MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o
-hkKQ9A/+JGykZ12/q1cyLMbq+d2075umjUSMeL0SyC6h6kS6ovww7FCZ4lf48oZh
-yR3zy/k0Ny73256n3OnsgLdCDbw6zHoG3PY9tBvuUTKOI0v+XjZFkpQLEBDetj3F
-gl5c9FOpZP/rDRoIai7182bkWic1aaYpzZpFj3eVyUeO/Kq52oRenSwvcMmZsk3U
-4EMZ09JXCMc53I+RVxsmu7jzMaN9tFDMjzT7WhoZtBC4BujCh3nqEBY5ZFhpG7yL
-vJP8fyizNEKieMDkULrmjrlhAbYwP3l/qg8XKHN9t9SokpzjDYh7nS6FMJG00+rW
-/Co62DaVq3wXtjPQIFQttFD6fj3DzBfj7slUQF3OqqwAXYt3VGRoxY/qNkGiZurK
-CsAkpLi5Mazv+Dl/RviQOVHGfb5WBjX72t14WLxMHVIjCx/fwijrNNKYp+CUXhqC
-FcMBdHc2WIsr7GOIiWAkh/5YIFYK1M30Bh05Ip3kPYn/ZOrN2ocw/18iF90Zp2G2
-nzozdF6YlFjklHmaDf5d4tilnXOHjz45FaSXyWldQRyimP3d/VXUWiXiY6l1Ic+f
-lrLqsyac6W9UOiZAepYz9Wa/Yroc1c4hxhHDjpbtGjbz5CCaGsFpRbdc9V3CFC+X
-/DkZlLNZ3lNs4mwUL2iePOER7O6ZAFtC6axq2O5lDUeOYoS3+aA=
-=Hq/s
+hkJU+A//dJW/t8FCj8L3QjjnKqDQEYJ+Tjh4HQ+BBv++vkRT2cYmrdsZrj/C+pHe
+Illzv0eaoVmvSddQhCUCpPtfB/RpObPG7g8tZ93TeYxafkUjgAdgOtmIy0TD+VPE
+yFaowQWg2Mf8D+tXjO6DrF0dbKa+17Cg0+opu9JvtsQDYKMSDQK8442XlmErWHTU
+osDaaZGzk97AO8LI506bSoa/QGJDifuJkgK5joF+Za43IWbs4FIZxmrRp38uAgWf
+W4jdXt+qreUHmv/cpRFGzAXtlCsrGDTCILteIHFHLP1PWgH/inZMsE6Ma2vwvV4j
+yoAIIwgdlEpKFT8Mb13kPzs0KL9A8iQL8yNYGTbCbmHBQjBMZkcNuYN585y8LWP2
+mXkDBmQNFc12A12q3hk0LdRnEq44zNklXXVpwBFVin8DGpJM1hjmgoAJtbzTQJlK
+y+jMh+v0taHeaaX047IkMmXUkKiSsaj7I2aPB7SWCf09qC4L3FOr0lXUTCXvoCHL
+5YonIkND2Z77tlrEzO0+/kjdzQgwKKs0g9tXl9+hMXpZ25af0IU/9ZxauunPjL3g
+n5dnMumPi3gmeaV6j0CdOsB7rx9iXcqAvI7mgaxSjlBBUrhgw7o7XkqD9xfZLRbW
+t619ybwFvGFaWnDtrLjBcuMBELZSRfm4GvNrHc9C3u3qtgVcSss=
+=gCHf
 -----END PGP SIGNATURE-----
diff --git a/app-admin/scylla-tools/scylla-tools-3.0.9.ebuild b/app-admin/scylla-tools/scylla-tools-3.0.9.ebuild
new file mode 100644
index 0000000..28a085a
--- /dev/null
+++ b/app-admin/scylla-tools/scylla-tools-3.0.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/.rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="
+		https://github.com/scylladb/scylla-tools-java/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz
+		https://github.com/krummas/jstackjunit/archive/master.zip -> jstackjunit.zip
+	"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/scylla-tools-java-scylla-${MY_PV}"
+fi
+
+EANT_BUILD_TARGET="jar"
+PYTHON_COMPAT=( python2_7 )
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-ant-2 python-single-r1
+
+DESCRIPTION="scylla tools (Java part)"
+HOMEPAGE="https://github.com/scylladb/scylla-tools-java"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/scylla-tools-3.0_rc1-build.xml.patch"
+)
+
+CDEPEND="
+	dev-java/antlr:3.5
+	>=dev-java/ant-junit-1.9.2
+"
+RDEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+	>=virtual/jre-1.8"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	find examples -type f -name \*.xml -exec rm -v {} \; || die
+	if has network-sandbox ${FEATURES}; then
+		die "Please set '-network-sandbox' when defining the FEATURES variable"
+	fi
+}
+
+src_install() {
+	default
+
+	# find out version
+	local origin_version=$(grep '"base.version"' build.xml | sed 's/.*value="\(.*\)".*/\1/g')
+
+	python_setup 2.7
+	python_domodule pylib/cqlshlib
+
+	dodoc -r lib/licenses
+
+	insinto /etc/scylla/cassandra
+	doins conf/cassandra-env.sh
+	doins conf/logback.xml
+	doins conf/logback-tools.xml
+	doins conf/jvm.options
+
+	insinto /etc/bash_completion.d
+	doins dist/common/nodetool-completion
+
+	dobin bin/nodetool
+	dobin bin/sstableloader
+	dobin bin/cqlsh
+	dobin bin/cqlsh.py
+
+	dobin tools/bin/cassandra-stress
+	dobin tools/bin/filter_cassandra_attributes.py
+	dobin tools/bin/cassandra_attributes.py
+	dobin tools/bin/cassandra-stressd
+	dobin tools/bin/sstabledump
+	dobin tools/bin/sstablelevelreset
+	dobin tools/bin/sstablemetadata
+	dobin tools/bin/sstablerepairedset
+
+	insinto /usr/share/scylla/cassandra
+	doins dist/common/cassandra.in.sh
+	doins "build/apache-cassandra-${origin_version}-SNAPSHOT.jar"
+	doins "build/apache-cassandra-thrift-${origin_version}-SNAPSHOT.jar"
+	doins "build/scylla-tools-${origin_version}-SNAPSHOT.jar"
+	doins build/tools/lib/stress.jar
+	#
+	dosym /usr/share/scylla/cassandra/apache-cassandra-${origin_version}-SNAPSHOT.jar /usr/share/scylla/cassandra/apache-cassandra.jar
+
+	insinto /usr/share/scylla/cassandra/lib
+	doins lib/*.jar
+	doins lib/*.zip
+}