From 813f55785b844afd4eab6181667c053949f16197 Mon Sep 17 00:00:00 2001
From: Ultrabug <ultrabug@gentoo.org>
Date: Tue, 4 Dec 2018 15:46:19 +0100
Subject: app-admin/scylla-tools: version bump

Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
---
 app-admin/scylla-tools/Manifest                    |   4 +
 .../files/scylla-tools-3.0_rc1-build.xml.patch     |  22 +++++
 app-admin/scylla-tools/scylla-tools-3.0_rc1.ebuild | 101 +++++++++++++++++++++
 3 files changed, 127 insertions(+)
 create mode 100644 app-admin/scylla-tools/files/scylla-tools-3.0_rc1-build.xml.patch
 create mode 100644 app-admin/scylla-tools/scylla-tools-3.0_rc1.ebuild

(limited to 'app-admin/scylla-tools')

diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index e735f42..a1de31b 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,4 +1,8 @@
+AUX scylla-tools-3.0_rc1-build.xml.patch 962 BLAKE2B 9a769b53b6dc98ba402089c77f41cf81ae0fa2f1da6ab390e8774e0ec2f5ad45fb738b6d0c9c35e7f27a64b19d7b45ed1354367ce26182a324d79db568169158 SHA512 a983c18c16e8f08b850081c58d20d94f2524a75eaefec8183a2d380d3605ee00de5b5e49f7da2bf7d3ebfc096696a58156d5b895daaf24e21f2e476f8ef7430b
+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.rc1.tar.gz 35220269 BLAKE2B 06bf0163fc492c57f05bfd66002e45618d3c7a598a721ee2898ccc989a2fd4c61b93fdadb2351a22a59f26c1eb167afc5644963e9533ca333e6ac4b86193a5c5 SHA512 12d868610af55576cf94662bcc34ccdee1b788ec8f1762836f69593e7b87aa10cf55ef5ce60aada190b8b0f3657e79828052119893ccec7c142b1a13d0eac243
 EBUILD scylla-tools-2.3.1.ebuild 2233 BLAKE2B 1746e5acc71802c2a65bfbb689e722f86ff3eb3a916f7a847519fcfe5afa460e9fac2bf7fd2a4367d05d034c0aa3988f33a47220a1d9f6ae5e7cf3246c0b6a70 SHA512 9af9137070208ee1f364be831447d5c7ceb22273a9d7581b55164a65111b955714484beb681b86c036cf90c3b353a2b14bc999d2cdb826ba31964ff5a7d434de
+EBUILD scylla-tools-3.0_rc1.ebuild 2414 BLAKE2B d23e6d403c57bfaf2950b6ded5f67392c56e52ffef181c68191c677acfcb36529ff48cc1bef8058b251144e12dd3f58d80563bfa68e77de35c68fdeba198f77c SHA512 779788e30afc7a9f1a25680441114538f9a543841de478271fea4efe0b3e901f2b65d84ab4d272e6ad51ec07f8f281552ec13bf823eda78d2b34e05c33e9b025
 EBUILD scylla-tools-9999.ebuild 2233 BLAKE2B 1746e5acc71802c2a65bfbb689e722f86ff3eb3a916f7a847519fcfe5afa460e9fac2bf7fd2a4367d05d034c0aa3988f33a47220a1d9f6ae5e7cf3246c0b6a70 SHA512 9af9137070208ee1f364be831447d5c7ceb22273a9d7581b55164a65111b955714484beb681b86c036cf90c3b353a2b14bc999d2cdb826ba31964ff5a7d434de
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/app-admin/scylla-tools/files/scylla-tools-3.0_rc1-build.xml.patch b/app-admin/scylla-tools/files/scylla-tools-3.0_rc1-build.xml.patch
new file mode 100644
index 0000000..1efcde4
--- /dev/null
+++ b/app-admin/scylla-tools/files/scylla-tools-3.0_rc1-build.xml.patch
@@ -0,0 +1,22 @@
+--- a/build.xml	2018-10-31 10:12:05.000000000 +0000
++++ b/build.xml	2018-12-04 14:25:22.987724149 +0000
+@@ -910,7 +910,7 @@
+         The jar target makes cassandra.jar output.
+     -->
+     <target name="jar"
+-            depends="build, build-test, stress-build, write-poms"
++            depends="build, stress-build, write-poms"
+             description="Assemble Cassandra JAR files">
+       <mkdir dir="${build.classes.main}/META-INF" />
+       <mkdir dir="${build.classes.thrift}/META-INF" />
+@@ -1227,8 +1227,9 @@
+       </jar>
+   </target>
+ 
+-    <!-- use https://github.com/krummas/jstackjunit to get thread dumps when unit tests time out -->
++    <!-- use https://github.com/krummas/jstackjunit to get thread dumps when unit tests time out
+   <taskdef name="junit" classname="org.krummas.junit.JStackJUnitTask" classpath="lib/jstackjunit-0.0.1.jar"/>
++  -->
+ 
+   <target name="build-test" depends="build" description="Compile test classes">
+     <javac
diff --git a/app-admin/scylla-tools/scylla-tools-3.0_rc1.ebuild b/app-admin/scylla-tools/scylla-tools-3.0_rc1.ebuild
new file mode 100644
index 0000000..d98d2bf
--- /dev/null
+++ b/app-admin/scylla-tools/scylla-tools-3.0_rc1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 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
+}
+
+src_install() {
+	default
+
+	# maintainer's note: change/check me on version bumps
+	local origin_version="3.11.3"
+
+	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
+}
-- 
cgit v1.2.3