app-admin/scylla-tools: version bump

Package-Manager: Portage-2.3.65, Repoman-2.3.12
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 7236eeb..3908990 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-2.3.1.tar.gz 26861494 BLAKE2B 6bec8d052a80493947f814cd1f28d9d93e29d97a610193e679570c657a8a770bb2c4d064a6e85465d0b6812cbb3f47fdad59ca91eec71f7054aea85ab378d265 SHA512 57b0a24941f788c094c72cd9db040a946def2fb3f72a74d17b3b4716a5135a48aa02372d5210e0c13377a94ffec7d3dc848c01b966605154846ad423ece5b8af
 DIST scylla-tools-3.0.5.tar.gz 35222656 BLAKE2B cf2371b089b40a741359e53d25b13f6e4c06eb811a90eac620a6121c028b811e22184388627bfcd87a9420cde39f69962e7d5d12a692a4b522252327340a0968 SHA512 036380482b4ac313dd91753e2f37fede871030b2d02c98f923a93d20b026918e05c5016a5b65880a8a9a793159aaf2027506d8ce891106c4c8c833237e6d0a62
+DIST scylla-tools-3.0.6.tar.gz 35222543 BLAKE2B 993ead2e1057f6244c3455dfa016cb6ed9bccc3c6a4413b8378da417397a587b7dcaf8602ffed5b58c8d09ae5f025a0e2ec13ad9af60cf3b0d92c86f0c1b160f SHA512 5369bc0ef05d12e9d822a61ba7ed4943d54f120634813c9c5b4b3f6fc69d9a9df25b4e2fd11371fff3cd91155d84bd572ef6057ec83ae8c0a082a23c594f077b
 EBUILD scylla-tools-2.3.1.ebuild 2233 BLAKE2B 1746e5acc71802c2a65bfbb689e722f86ff3eb3a916f7a847519fcfe5afa460e9fac2bf7fd2a4367d05d034c0aa3988f33a47220a1d9f6ae5e7cf3246c0b6a70 SHA512 9af9137070208ee1f364be831447d5c7ceb22273a9d7581b55164a65111b955714484beb681b86c036cf90c3b353a2b14bc999d2cdb826ba31964ff5a7d434de
 EBUILD scylla-tools-3.0.5.ebuild 2559 BLAKE2B 32d4314e6795f874cb46e8a544c293f94b0fd7e4ea3d8519de08b5b75f2c817144bd84881298c465442ad956779a8392a8508ea8f786bd1961398dee6ef5f365 SHA512 28a38d026f051610dba2d59454078a30f4fb837c336659e213fa7503a67d4f111c523591781b658d8f4550b41ac9ab605b10f84300c28d0aed17424d63b64316
+EBUILD scylla-tools-3.0.6.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
 
-iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAly27wdfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAlzSvOlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB
 MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o
-hkJnIhAAqb0InAPPlVNYUBixUPi2o4tOOlzSg71vC8//jvOoc19C/WLuGIBStE37
-99yNmeJRMw3pkWq/svu0AInG9vNSCt13pEMWw4QK7Gbl4maO7UDnIT84jON2vw+u
-z5iTsNjms5Mq/g49Dq8KpXz9C8JVnR1lgz3oZbK7pbynUBvykEdH9cNqXryPYxuP
-ZI/2WSR+kEe9c8Y4SlCMu1NasolKH4GcVTcrXa9rks3A1GulnpheIt95fEKGLCIE
-4yd3S96WIqBUvwrUc4rh5myMSCBCE2zTi92g6wHOKKg+LEs/26HNBpZO/GNaF4MN
-6Yqw3EyQVJGzJjuQ1OTS7mPfbIy2mLIcXQoo2FilipTn7e+99O0kYpIq6624Qya8
-k+b6XKF63uGWOX1u+BLFvuob6F/hYnAUMd9T0eNsD96FJqHzbRh/qu8QokdBJZOe
-X4CWy1etwwSea+XLDIm4Ekv7R6lon1759eqDO5MbqUjaXHXsVErTcL07NzgsQEQU
-dvIiw1Jb3VDQVwV4YPI6GH2C2bwtZHedDrc3UmQ3JDGY8KrCvU/usXCeIEXSzG/v
-uz6IVHl0E5zwosTiaGF8sExtXQ0DJx9IYBRUMrjN5Mf/F2Br369yzt8mq0erAso/
-qw4aaNgpnNJR/+T/oXNNAma8xwPFCL4OCp91VFQdzZ9LRTxjowM=
-=Kn+d
+hkJJNg/+KMS/99y0AffBP3Nc/i1Miu6vCdMQ+qrevS+dpk9xqyLHxI9zon3ZmB0g
+bCR1UmTP3TQ3cNJXGCVnvbzm7f7ep5Rq9CRqeuNXfjf6HWZfCxfX0tbqbhBS0Ens
+L2fYPhrk1fvkOnP1MzS0OEwW4dPlIeVCOAGJ2gjWbFWNNbZng+P7Lp3GwUoWw+6v
+mBpzYMZQ8aT3YTFUvSviUi81I+gxdxr5+DkODJfIHZLCd6OYLtWoR0MUcrjr2Zw5
+QsL6tQ8a31r9QeYGbn3+7mdYn8GCjIqwQew2J97M5koeQzxvnUOuto/sB5JfrbLK
+Om4lC2Li0cA3C3RoV1thMQWFIHQuGLYV7ma8bd0wkgAmu90H+IJVcZl5mgdi8rlp
+f7/waPmCHjDWS6zVgvveWFPnSq430OBTxZOn47Uc2s+9sjqFdMTHg+dPDmknj53p
+zm4AC+r1gIBWvEHp1/yOKh/82n8lunsBoqXZiJSwUHUq0HlJ9dxb7UjVpqudsLX7
+v0oi5WcPejYuv6yE/wmJm93WZRkPbGKcPCNTsUssm4Fp1vA37mFHu047mVcHf7/q
+qMIX5pFsTovJ1RuO9gIDIueNdpROoHJhLdkR1Wry+c/IOhFoPqNiBI7Dy2DtUevo
+s9IMESie1dPsYmRIV/eAb/+sZV0ojc0Dj4oMF7Yu61Ucwz5dcxE=
+=qp0X
 -----END PGP SIGNATURE-----
diff --git a/app-admin/scylla-tools/scylla-tools-3.0.6.ebuild b/app-admin/scylla-tools/scylla-tools-3.0.6.ebuild
new file mode 100644
index 0000000..28a085a
--- /dev/null
+++ b/app-admin/scylla-tools/scylla-tools-3.0.6.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
+}