scylla: version bump to 2.1.1

6 files changed, 6 insertions, 196 deletions

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index b6ae127..4d75b63 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -1,8 +1,6 @@
 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
+DIST scylla-jmx-2.1.1.tar.gz 98654 BLAKE2B b15cb438a02400bc7b6aa0e9597a3605dc85d18a9344aeb469a1efe1c0aa9cbf0bce3193650a3beb168b558ad476ef68899dabbe23674bf14f82fd66f7551a18 SHA512 2390726ee7f1cb3c2c0dc28a8b9301a4641382c98d6a0a9f4cf8e5e1b846845804108279d1dae2b4ccad8416fb6e1a027a173f76ca773e178db852c694b39357
+EBUILD scylla-jmx-2.1.1.ebuild 2355 BLAKE2B f8001c2f7f4c06ec1012d50449294eff4bf3307bfd5439baecc921c7d925324a1c136ef46eb3fe0b0988e9f9582c493819625b9659b334ca5297c21afc7995af SHA512 1e8c37dfdd7bd3fa7c2558d23e1659c65dfccce50d40ab20bdf11794a87e99a5ff6187269dae86922596ca196d0729897147114b9c7060867bea0b6653422d49
 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
deleted file mode 100644
index ff923aa..0000000
--- a/app-admin/scylla-jmx/scylla-jmx-2.1.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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-jmx/scylla-jmx-2.0.2.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.1.1.ebuild
index ff923aa..001ec6f 100644
--- a/app-admin/scylla-jmx/scylla-jmx-2.0.2.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index db7b70c..19e126c 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,6 +1,4 @@
-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
+DIST scylla-tools-2.1.1.tar.gz 26858989 BLAKE2B b84fdf22c9068f38e65e2de939a548aa670f53fdbf9725d84f09693353eca2b318af7225a830b146c485920e1f65149ebb0202c793b0e6ec7c2acfd05de12e79 SHA512 7578920ec94b174286b14cf4b71f36f92919909b7b47515de0316ee3d4bec7d00bf4c61dfd0ba7246409f179a11fe04846564015a986d15009441716a4e25abe
+EBUILD scylla-tools-2.1.1.ebuild 2236 BLAKE2B c86eb2302015b4ef80d18c96edc527751d18039aace4d1f72526d62a642c63fd9a2a21db8fafd57ac75a172bc29d27cc1a9607b0a43cf40b0714d437ed8e1a1c SHA512 b7292387fb742f1a49ba4526b9d33d7b09a1d4d26a63f546ceceb325e2fb9ab45b1bc8f1d0671ee6bba67f726bb56225894a35acb0c26d99f1ce3c787d6441e5
 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
deleted file mode 100644
index 25d2fa1..0000000
--- a/app-admin/scylla-tools/scylla-tools-2.1.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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
-}
diff --git a/app-admin/scylla-tools/scylla-tools-2.0.2.ebuild b/app-admin/scylla-tools/scylla-tools-2.1.1.ebuild
index 25d2fa1..9d41e14 100644
--- a/app-admin/scylla-tools/scylla-tools-2.0.2.ebuild
+++ b/app-admin/scylla-tools/scylla-tools-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6