scylla: 2.1.0 version bump

4 files changed, 200 insertions, 10 deletions

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 17aff58..b6ae127 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -1,6 +1,8 @@
-AUX scylla-jmx.confd 243 SHA256 31398e8dedcf01a72d5532b0ed30a9c0df5818d372ff5dca78d8e851f4d1f5d8 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402 WHIRLPOOL c5a6009774867aaf4b6896016206d352d0bc2774dcb92389828c00ac5cf792211555a6612abb7e6e90e5d88a4560fae51fec755d5994e40f918088c9f9818e04
-AUX scylla-jmx.initd 592 SHA256 63bdbcf7458e766c04b351aa576efd92fd796840f2469cb85b80d364c492d950 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037 WHIRLPOOL f53e9546d6d73f7109301280529a00fc5360cc4549c3e5985183d2e6d55562cc897bc0cf93d1f267fdf0d7ea587dd25c5b0e72817459d3e17a0366dc651b64d1
-DIST scylla-jmx-2.0.2.tar.gz 98504 SHA256 9cb7b8931b4b7acc7205af2d0926ed0f6b85aaa04c165980326ca1d9d79f7efe SHA512 c7e5ba386a081807dfdefa0526a3ccaf407a1b41aab3360612bd757b745b79f667e9a0027b2554e1d820fa30fdc5c8594c06e919712b5845f70cce06cc8c9e7e WHIRLPOOL a1c2ad75d8ac1d7debf0a70037f251d56eb683d0db93a201dadcf756bea390fa751b2b8402b13c793b8b194699e705cd88fb43bc0e78d4f9b0799257f6f76411
-EBUILD scylla-jmx-2.0.2.ebuild 2355 SHA256 8e37f9c91abf38dfab465a4a36d57aa6c4c60b8f8be91744ec164206742b5bc0 SHA512 325a5807b9839f48a5ecdfcbe1f938bc796475680e0fde29ebf4699cbeec05c83a944d0bc310b546584befd69097eea0560480729e8875a429fe997eed99783e WHIRLPOOL 5ced7309b356a8d48ecdbe00150f752e8c288d7f69b0f66183ad7f5431b9c1b738106a6bfb356eb2bea47730a028f929e3be98440fb290908554438031dea160
-EBUILD scylla-jmx-9999.ebuild 2354 SHA256 dbee5df5ceda3b90cd38a6fb60469ddda558f1efec728defc9eef5f3b5e3cfdb SHA512 29120858692d1404b4a277cd0d807137a7a35d047be4ae5cca521b6d152582a79dce4a45e4189530b6300d54eb53a40e0a8f39ff62ffb1c88386299242f785ab WHIRLPOOL 58471731e127d0b64ed776fe0bfb5d095d77c532267d65436fe5794dc000dd497dbd376ab4c47c44b74190a5f1abe4834c0a6d5af04b02b3bea28ec160b3daab
-MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
+AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6f5a51c9f6656cf0f989c133e8e45b221991800fcc79fd1505b037410dde7d5dfffdf75e0ee6670090 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402
+AUX scylla-jmx.initd 592 BLAKE2B e1492a3da5ab275fbe6f7f1f4f9beaa3129f037fa54523211a8628d479e196a2da711c41c8051416612d34322c3261e95c3370525e68c84eb80c98ac0949ab69 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037
+DIST scylla-jmx-2.0.2.tar.gz 98504 BLAKE2B 3b85f1956cc1085976aa2e0611cf7b2b725476b130161c331c23392e6cfaf2587a054b65f861ef0bdd0e688afaebddb281e1205a35107f1952123d40e9510310 SHA512 c7e5ba386a081807dfdefa0526a3ccaf407a1b41aab3360612bd757b745b79f667e9a0027b2554e1d820fa30fdc5c8594c06e919712b5845f70cce06cc8c9e7e
+DIST scylla-jmx-2.1.0.tar.gz 98645 BLAKE2B 8e1a64190d954e08020b3d2def509e41e113dce308fecac976111020e01c468bb75ab6152885d95a8f659d2062068b1d2423ac301b7f1e95902ee7188ed6e290 SHA512 8d9b6ad52ae5d0d74226757e0029ec58a39038fcafc02334dfad2ce0adec280ca1c28d5ec4e071d5414c38de6d4c5651d47a7d782aab83287b723de20b44218d
+EBUILD scylla-jmx-2.0.2.ebuild 2355 BLAKE2B a4158ba990b977815f0f9d5888fc701ce3bb1ae1ffe34a9600a899df982151b97e05f011168800a71ef57b923216d40397846e6c5821b3035647b02c00d2ba6d SHA512 325a5807b9839f48a5ecdfcbe1f938bc796475680e0fde29ebf4699cbeec05c83a944d0bc310b546584befd69097eea0560480729e8875a429fe997eed99783e
+EBUILD scylla-jmx-2.1.0.ebuild 2355 BLAKE2B a4158ba990b977815f0f9d5888fc701ce3bb1ae1ffe34a9600a899df982151b97e05f011168800a71ef57b923216d40397846e6c5821b3035647b02c00d2ba6d SHA512 325a5807b9839f48a5ecdfcbe1f938bc796475680e0fde29ebf4699cbeec05c83a944d0bc310b546584befd69097eea0560480729e8875a429fe997eed99783e
+EBUILD scylla-jmx-9999.ebuild 2354 BLAKE2B 2dcb7c649f9ed55001cd7c9367911403de1f1afdf05db92d1df9dc32918c073ba775e74b1b0d093c828e38265024ba6ddcd2cd08a4a60353caa56830ec8b3004 SHA512 29120858692d1404b4a277cd0d807137a7a35d047be4ae5cca521b6d152582a79dce4a45e4189530b6300d54eb53a40e0a8f39ff62ffb1c88386299242f785ab
+MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/app-admin/scylla-jmx/scylla-jmx-2.1.0.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.1.0.ebuild
new file mode 100644
index 0000000..ff923aa
--- /dev/null
+++ b/app-admin/scylla-jmx/scylla-jmx-2.1.0.ebuild
@@ -0,0 +1,95 @@
+# 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-jmx.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/.rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/scylla-jmx-scylla-${MY_PV}"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit java-pkg-2 python-r1 systemd user
+
+DESCRIPTION="Scylla JMX"
+HOMEPAGE="https://github.com/scylladb/scylla-jmx"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+CDEPEND="dev-java/maven-bin:3.3"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+	>=virtual/jre-1.8"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup scylla
+	enewuser scylla -1 -1 /var/lib/${PN} scylla
+}
+
+src_prepare() {
+	default
+
+	# fix systemd service config path
+	cp dist/common/systemd/scylla-jmx.service.in dist/common/systemd/scylla-jmx.service || die
+	sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i dist/common/systemd/scylla-jmx.service || die
+
+	# fix symlink runtime error on scylla-jmx script
+	# * scylla-jmx is not available for oracle-jdk-bin-1.8 on x86_64
+	# * IMPORTANT: some Java tools are not available on some VMs on some architectures
+	sed -e 's@"$LOCATION_SCRIPTS"/symlinks/scylla-jmx@/usr/bin/java@g' -i scripts/scylla-jmx || die
+}
+
+src_compile() {
+	mvn -B install || die
+}
+
+src_install() {
+	default
+
+	insinto /etc/default
+	doins dist/common/sysconfig/scylla-jmx
+
+	insinto /usr/lib/scylla/jmx
+	doins target/scylla-jmx-1.0.jar
+
+	# removed because of src_prepare fix
+	#dodir /usr/lib/scylla/jmx/symlinks
+	#dosym /usr/bin/java /usr/lib/scylla/jmx/symlinks/scylla-jmx
+
+	exeinto /usr/lib/scylla/jmx
+	doexe scripts/scylla-jmx
+
+	newinitd "${FILESDIR}/scylla-jmx.initd" ${PN}
+	newconfd "${FILESDIR}/scylla-jmx.confd" ${PN}
+	systemd_dounit dist/common/systemd/*.service
+}
+
+pkg_postinst() {
+	ping -c1 `hostname` > /dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		ewarn
+		ewarn "**************************************************************"
+		ewarn "* WARNING: You need to add hostname on /etc/hosts, otherwise *"
+		ewarn "*          scylla-jmx will not able to start up.             *"
+		ewarn "**************************************************************"
+		ewarn
+	fi
+}
diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index 0a7ad0f..db7b70c 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,4 +1,6 @@
-DIST scylla-tools-2.0.2.tar.gz 26858579 SHA256 ebd2e669aefb80a8198875b01070ad21a592c356dbc59007053810e26a379126 SHA512 f9de384a890cf61facbc24685df969fb40bf98ef1c2855d9ac04dc2213c04d82e0b6bcfd3befee21a973d347f44bf354895ac30f4dc6ab446ea4d32384a4fd53 WHIRLPOOL f992b40ca136f6409571b70b31204f9372c9dd8a80f9e9cf68d6c312d450674214864ee80353f71a7e20c3a5dd79143b800ec6de5814fd4ef55b8e02976393aa
-EBUILD scylla-tools-2.0.2.ebuild 2236 SHA256 2e5c2b173dad3547e64101219b70be988b769b61287f6279a33fe2d041116337 SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216 WHIRLPOOL 97780d7ab406cf4bbb3de3328bc48d182517f92cea088df0d2666a6cee09f16e37181b5012d3920a1c6235615b505407bfc390b83eaeda587378072d8d938d63
-EBUILD scylla-tools-9999.ebuild 2236 SHA256 2e5c2b173dad3547e64101219b70be988b769b61287f6279a33fe2d041116337 SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216 WHIRLPOOL 97780d7ab406cf4bbb3de3328bc48d182517f92cea088df0d2666a6cee09f16e37181b5012d3920a1c6235615b505407bfc390b83eaeda587378072d8d938d63
-MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
+DIST scylla-tools-2.0.2.tar.gz 26858579 BLAKE2B 251bdd1c3cb0ec7ca1a5b23f25923496292fec9c28f71ec0229ea2cbc081287bbcaa99e34eac0b2a37ccc384ada79336c3ee56e117d203adb3b8297667c981ae SHA512 f9de384a890cf61facbc24685df969fb40bf98ef1c2855d9ac04dc2213c04d82e0b6bcfd3befee21a973d347f44bf354895ac30f4dc6ab446ea4d32384a4fd53
+DIST scylla-tools-2.1.0.tar.gz 26859570 BLAKE2B bb9543473bca93588dd66611bd7e64bdd6b5693873d1a50f3af69708c04165e6a781a163d906302a8c353b4d430042c5e4e837dd1d0df00dd79b21453a79b1c1 SHA512 1734a1221bac6ee62d7ebe3a67592dd6376b295fc849987bb85afa6750392d6325ad96110215e91202d25db9c7896a20f0fe22cc13b24fd82d7e62bc4c14f755
+EBUILD scylla-tools-2.0.2.ebuild 2236 BLAKE2B 8b39c7cb5f595ef2b1d1269cfc9e5e70616d265f4c8fb48a1a2044248d7f0351e75fd0a86657fd272848c4e38f7c9a83967129d9190bfca61ce35bc5c2d8f93b SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216
+EBUILD scylla-tools-2.1.0.ebuild 2236 BLAKE2B 8b39c7cb5f595ef2b1d1269cfc9e5e70616d265f4c8fb48a1a2044248d7f0351e75fd0a86657fd272848c4e38f7c9a83967129d9190bfca61ce35bc5c2d8f93b SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216
+EBUILD scylla-tools-9999.ebuild 2236 BLAKE2B 8b39c7cb5f595ef2b1d1269cfc9e5e70616d265f4c8fb48a1a2044248d7f0351e75fd0a86657fd272848c4e38f7c9a83967129d9190bfca61ce35bc5c2d8f93b SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216
+MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/app-admin/scylla-tools/scylla-tools-2.1.0.ebuild b/app-admin/scylla-tools/scylla-tools-2.1.0.ebuild
new file mode 100644
index 0000000..25d2fa1
--- /dev/null
+++ b/app-admin/scylla-tools/scylla-tools-2.1.0.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-${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	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"
+
+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
+}