app-admin/scylla-*: update related packages for 2.0_rc1

3 files changed, 98 insertions, 4 deletions

diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index 706631a..818a2d4 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,2 +1,4 @@
-EBUILD scylla-tools-9999.ebuild 2200 SHA256 38b2009d2beb8d18d49578052a56c0d655d3b5839a1a75460af39973e6a4ce93 SHA512 8a550209ab78de24e931a8c2bac0027e2303efe7e4cc2d53611152ecc8edced948fc255af606fe58f4f0f0b23a1f9db2e20cc4778ad14707adff84fd91ae6a61 WHIRLPOOL 04fcb509092f6bf85ad5ead7eaaee9590f5fece137d7e862ad6ae069263dab20c52eca9b04014ec08b71978fb9cc0fe0fa5842e7b257cd14b97267264c388a8e
+DIST scylla-tools-2.0.rc1.tar.gz 26856246 SHA256 e253b289243394ba079455bd9e0ebaebe85f69df28fcf7b73a33dc2438f9a531 SHA512 ca1b2e9b2873384fdcdfb830924dd4594dd12a1b84ab5e2550654890efbcc8a094ce5cda95a3275b0047278719cb5e96b84f15a8292fab08bbae7e1ed89e9398 WHIRLPOOL 5cc22ab81604db8112cfd919e46486e74ea4a64b611fe3b40e75228720797d73ffde31c1c9a7489b1a912e2098174747378cee95f63517c7479081fd4438f2f0
+EBUILD scylla-tools-2.0_rc1.ebuild 2246 SHA256 9aa48ee35ca48fc0d3cf76589dcb95f670be6d5813452d7c5adf009978c9d103 SHA512 01c447a790b61500533b00efc4844b6217d5eee555445b4bd0818fd5f9c223f261165f63dcdbe126361abbb2e905fe23cf2b1de040635a48dcd892f8a37a4c97 WHIRLPOOL 9a1247fcc8a6510e6c4eeb5bcc10fd4565b1337ea3e590e52f122266a4717c08ea5b9500dd37cd6eb0eb4f6f3a227afa0ce8197545a4b4e39ad30015d3e0a09e
+EBUILD scylla-tools-9999.ebuild 2236 SHA256 2e5c2b173dad3547e64101219b70be988b769b61287f6279a33fe2d041116337 SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216 WHIRLPOOL 97780d7ab406cf4bbb3de3328bc48d182517f92cea088df0d2666a6cee09f16e37181b5012d3920a1c6235615b505407bfc390b83eaeda587378072d8d938d63
 MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-tools/scylla-tools-2.0_rc1.ebuild b/app-admin/scylla-tools/scylla-tools-2.0_rc1.ebuild
new file mode 100644
index 0000000..2bfc1cf
--- /dev/null
+++ b/app-admin/scylla-tools/scylla-tools-2.0_rc1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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-core-${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/scylla-tools-java-scylla-core-${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"
+
+CDEPEND="dev-java/antlr:3.5"
+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
+}
+
+src_install() {
+	default
+
+	# maintainer's note: change/check me on version bumps
+	local origin_version="3.0.8"
+
+	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
+}
diff --git a/app-admin/scylla-tools/scylla-tools-9999.ebuild b/app-admin/scylla-tools/scylla-tools-9999.ebuild
index 11e48e0..25d2fa1 100644
--- a/app-admin/scylla-tools/scylla-tools-9999.ebuild
+++ b/app-admin/scylla-tools/scylla-tools-9999.ebuild
@@ -6,11 +6,12 @@ EAPI=6
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git"
 	inherit git-r3
-	KEYWORDS="~amd64"
 else
-	SRC_URI="https://github.com/scylladb/scylla-tools-java/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
+	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"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/scylla-tools-java-scylla-${PV}"
+	S="${WORKDIR}/scylla-tools-java-scylla-${MY_PV}"
 fi
 
 EANT_BUILD_TARGET="jar"