scylla: version bump to 2.1.1

11 files changed, 28 insertions, 476 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
diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index 485abc5..0e5b733 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -2,17 +2,12 @@ AUX 10-scylla.conf 64 BLAKE2B 31ce1b2173214bcac351b71cf19e5506ab08cefbca446ce23a
 AUX scylla-server.confd 386 BLAKE2B e075e8f5cac2ac373a43a637a4080fde5cbd402b5bef2a3865980f3f9d123366315d994ebf9abbd749167db6e1fa9c840295171add7c5507120be70020aaefa1 SHA512 5d3c55933a02d3b16837013b37110f6669c14e01599532f30935b5dc29871a5bed897c9eb01a6e89469eab7d645c9231745a06c2ef827f6700e13c8faa9cdb87
 AUX scylla-server.initd 964 BLAKE2B 46ec149dc24f33773bba1f5edd36d4cab8f4248346e56752ba6fd4b149d056d28cf3297e889adcc0c776da46cd347d25d4b16bb91f545779dc14f59bd8dfcc5d SHA512 e72b817e8a42d843f6766b0cd25c33b8231efbd223f4ad31bca9a2610f670b3980c1be256343f5e3b0fe0f54ba460713f6db8de92c27cf67653140794299f760
 DIST c-ares-fd6124c74da0801f23f9d324559d8b66fb83f533.tar.gz 1644001 BLAKE2B ee3f919dbb7de3f489a9027cf89b8db1dd36d9d5068e80f6e3851366c7a6fa532c67cf8ebf0d15e01b26a8ec5bb4e49e7844ec46b605f997fac1e961dcc436f1 SHA512 52b929e4d2615338d8ee4ce7c32f006f18e54ef2db9fbe2534c4e99cd3684d86661a6674d2659acb714592f439fac9c4f0ae6337d9d68c1ec3463d4d16572310
-DIST dpdk-10a8b45350c9af0c2d7731a2f058b0983a0c845a.tar.gz 11653100 BLAKE2B 3f8e983058afc54d861286ff6adf1f95dd9df82e91c9f542361898a610d754ed526bc5385797b23ab65d23c22144d34b20dab674b5fb35b2e9a7a6c054aa3b9b SHA512 5bec70e2a69010aa02dd51cca84df399c7a12173dd2797e471008d429ad83a7d52368c62b66fa1d14447b0e58a202d74d9fde44c74695dc351ff558d84f7ad40
 DIST dpdk-8aa1d694919fb63211ed625539250008f5d7df9a.tar.gz 12197171 BLAKE2B 7888e11329403d44d3ccd30b7c3616b4e13b59931a2755e9451c011e1da951d74d713052ddf01a9f4ede6e8d82b8df7b08584aae540b214bdd117e2f23a2d150 SHA512 b5e41140c87100cb74196bdd9991eae660ef40c2bbad5c530cc7de7e0aeb523383d35df14214af941f86df36f22cabcf86eec013f127a578ffdf110c2c80f1d3
 DIST fmt-f61e71ccb9ab253f6d76096b2d958caf38fcccaa.tar.gz 616708 BLAKE2B e71c4ff6d494490366e490307b83fb0619b29228e06650d3abb0a97797009cd6205c23af777a348622eb4c4a08203a0e41c5475ab95c437d0f0c382967e2491f SHA512 d234a58af428e238e559ceec1599ff449fbfbe4ecc212ed00c82ef3f057a3351a9eb59906d3b6f7efeec76188645a49376507d7a78dd68d61806cd63d0fbb3a0
-DIST scylla-2.0.2.tar.gz 2445978 BLAKE2B aed6de1e85ea43e12f800ad1d3de8979f6bb74a50bddc68ace86808bd591790793ff83cddbed5909f984aa36fda902f3238cc5e780f924acd4238e8228a668a6 SHA512 4d1a15e10828b921600d370d57869a7ff8e58ef8fee9293c1abe93c19dc3c9ca5fe10f7357998275351ec52ba8b2f6241e080244ddb6e5c81ad9c44696eb98c7
-DIST scylla-2.1.0.tar.gz 2520865 BLAKE2B 1ce8dd67322441b3862e21869876afcc18943ed1897289eb57ce49323daaab5184069370fa0441e62ebf98ac6afe8a377932de5adea81776381b2864cce4dc62 SHA512 713b5246b0323c8bf7203c71feef411deb37ca536b89bb3b7f40d4c58692c5f5d2dbd84adc65b4a34da8e6182de4eab6017bbf8053cdd6899bce8716570062f0
-DIST scylla-ami-be90a3fb9f985b2d0773d4ad328ec3cd4c4a146b.tar.gz 9853 BLAKE2B ce67d2ceb0478e43dbd80184a59c0e1abedd16becc1a2a9b49d3bb1bed4656a8af83fccae17ed0fabf9fa9e6653c76aaed309f4f82535608ab33fd37ffb88441 SHA512 7e12b7de82eb1fb95b8e0ff01f74e04cba45ec2be65b70f44a19772f39e2eba3350993183513db36ef5d919cf81da3834939652d38baccf1dbdda98720b6be15
+DIST scylla-2.1.1.tar.gz 2524208 BLAKE2B 76795fe78dd89c2574ff83edc290f293d1be34f05cf77f859722ce0a7e2f296bc51eb5fe8cbc9c0f4ef81db8fa2342d8472c35e501f503e2f1258d6d75483a25 SHA512 9e9f6294039101e55e6835b8aa9c576e11ceba5deefd3570e0f3c79ba23aa0996237189a7b9af394479afba33254b71a09f2d0792a39512b8400d234140c5cc3
 DIST scylla-ami-c5d9e9645b71561c44451a58d33333a6c96bb2ed.tar.gz 9862 BLAKE2B 519736563aadbf177e727dfeae2971b61fb499334e19c6bd7fb67d850ce0338d8796c67eb8ce86e371683925d06896582319774331c30c1d2acde314815c144f SHA512 75a5bbed050b0ccc7f740b0a09789c0c099a03e9d70c58d3385b197b676be7bfd45c3a728ccdddd780a79c3c2fc8a0506d84da961f438b9d8e63a4b3143a43a9
-DIST scylla-seastar-0dbedf03dcca824b35cd7c2c4fdc8769a041a21f.tar.gz 723792 BLAKE2B 06742b949ad2047cf9902146558881df8d95a80b19208aa2e26c149f9c5aa864e97ee660be3d45ec570434a376eb05bd8998bb5d25a06ecece754527c505a7b3 SHA512 19a1fbd6bb199fe0d5d02552a9e2c6dea1c8b62e908dcb1b486126511fe6c231462c2e940b288013b35addcc105f33941ebad3f49ce3cf3bb518b73bae3b4252
 DIST scylla-seastar-af1b78985579b7e707458188d17419e9412abe95.tar.gz 759551 BLAKE2B 29b2b515542213976e8b5b5ecfa09fd521e475748f0580306baea5e1f97a00bdae5aa0003c262fdbb9d3f18f21651f4df71edceee795ca76dc2a0fb103a464f2 SHA512 ce232adc944caf3d15c72991c40d8921499526ceb3c49614ac9f7913122da39be6aec0646e68b85b8f781c52b9345de3829443636d157c9f8dfb444edd6686d8
 DIST scylla-swagger-ui-1b212bbe713905aac22af1edb836f5cf8cc39cc2.tar.gz 1372033 BLAKE2B 5f358f44051a2fa9a10d83fce9cab9e57b56505c4270f089a4d12aaa4e9c45a205665b342a0abb5cf314a9fd24b4186f3a176c58328cc627edc73cc854a30079 SHA512 c726a4dac73d3e9d16624727f4f0703688b7205783c627dd7b88b688b165c9055a1884cf7e9987d8c235d3fa470578852a951e34819431aec12059988394da99
-EBUILD scylla-2.0.2.ebuild 7612 BLAKE2B b3a7ec95ce4a0d134da28389291479008ae8002500557dab89477b9b48441289c970ffed422cb3f90880f2e8c79f10102ab7f1ffa18067989f738d76a95c2168 SHA512 d36b90484e1743b3b3e8a4bfbbb6255f962d5b2746704694951403037facfd03836190200ba14e66899efb35ed30dac66f00a1202eb3224324fe61199a7163b4
-EBUILD scylla-2.1.0.ebuild 7819 BLAKE2B 84867b35aa3fa636d78a5b5b2421b2aef67c3144c8f8385e3bb5fdf86cacf3837fd6362d42fd55f83b9e0c364e94bb961504007aab380ac8f88cf6c8803e01ad SHA512 ffcdf6194c5e7d73830c344d6f985df6a6ae272f8c66c08a3b2788db596cdf791c5f55684c7b4e2594821bf0a5416b3f08c53d300a3ffa796439f684379ad91f
-EBUILD scylla-9999.ebuild 7553 BLAKE2B c9993bb12569444c7c43d19df201a8593a1e070a2bd98a3a9e5ac4e8b0bb396b1436c988c07c81c64f0f18bfced1876c255ef26fbbaf2147d6875076678ccc35 SHA512 3abf9537beee066205e6ccc461efc48c9dd993be192dbe2c048df7bc9fdbb40297f38bbc1b4be04655e60e41550e410ac617f53fc99fa9811a1cee330e41fca5
-MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
+EBUILD scylla-2.1.1.ebuild 7903 BLAKE2B 39ae28c1c6219f63173be7a8a07af104049179cb0a640c07097f1d338dd80b31f6ea0c086a07b8c9b005abd700761e52c06140e63aeaba08a07013d4d5dad01e SHA512 398c8a4339270f349e0bb72e775f20248ac4cc373d472cc82c8a081487f06aa6eb7baa17725632cadcce4ca194f80955af243712d2b6f624f2e4ddebe2fad1a2
+EBUILD scylla-9999.ebuild 7609 BLAKE2B 7348f6e2dd2351b405abfd97d09b34c4f2913b28ddf942ab31c087f16fa2005699ea98cd932467d4ff4967a3ac2273288efc86531640757d7cbd7b0e059fe83e SHA512 5416f39326433592d29495282f4b3d7da849a5ebcd07542c91a300dc5d4d678feaeaf97c9bfbb25cd129a30189d037cdc36ecdf54707fcd143a012b26dd2d384
+MISC metadata.xml 362 BLAKE2B 233a4e81e481316723b29ce80ff2b45e492f5d040bbfc8b99f36b418b19af807e5570e720e1ae0a995fd31cb0b8e24d4c05d9fbe69920daeb50565f66ef7c454 SHA512 611d9b41d70a9bf5dd8a68efac896cab6f4af2fea5a129c2e1f33379a5e128786d0c2d7517b6f178d56316b32fb549111788736f067411b8a34795f28ce88769
diff --git a/dev-db/scylla/metadata.xml b/dev-db/scylla/metadata.xml
index f4e95c6..619c88b 100644
--- a/dev-db/scylla/metadata.xml
+++ b/dev-db/scylla/metadata.xml
@@ -5,4 +5,7 @@
     <email>ultrabug@gentoo.org</email>
     <name>Ultrabug</name>
   </maintainer>
+  <use>
+    <flag name="collectd">install (obsolete) <pkg>app-metrics/collectd</pkg> dependency.</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-db/scylla/scylla-2.0.2.ebuild b/dev-db/scylla/scylla-2.0.2.ebuild
deleted file mode 100644
index 658db76..0000000
--- a/dev-db/scylla/scylla-2.0.2.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2018 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.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/.rc}"
-	MY_P="${PN}-${MY_PV}"
-	AMI_COMMIT="be90a3fb9f985b2d0773d4ad328ec3cd4c4a146b"
-	C_ARES_COMMIT="fd6124c74da0801f23f9d324559d8b66fb83f533"
-	DPDK_COMMIT="10a8b45350c9af0c2d7731a2f058b0983a0c845a"
-	FMT_COMMIT="f61e71ccb9ab253f6d76096b2d958caf38fcccaa"
-	SEASTAR_COMMIT="0dbedf03dcca824b35cd7c2c4fdc8769a041a21f"
-	SWAGGER_COMMIT="1b212bbe713905aac22af1edb836f5cf8cc39cc2"
-	SRC_URI="
-		https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz
-		https://github.com/scylladb/scylla-seastar/archive/${SEASTAR_COMMIT}.tar.gz -> scylla-seastar-${SEASTAR_COMMIT}.tar.gz
-		https://github.com/scylladb/scylla-swagger-ui/archive/${SWAGGER_COMMIT}.tar.gz -> scylla-swagger-ui-${SWAGGER_COMMIT}.tar.gz
-		https://github.com/scylladb/dpdk/archive/${DPDK_COMMIT}.tar.gz -> dpdk-${DPDK_COMMIT}.tar.gz
-		https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz
-		https://github.com/scylladb/c-ares/archive/${C_ARES_COMMIT}.tar.gz -> c-ares-${C_ARES_COMMIT}.tar.gz
-		https://github.com/scylladb/scylla-ami/archive/${AMI_COMMIT}.tar.gz -> scylla-ami-${AMI_COMMIT}.tar.gz
-	"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/scylla-${MY_P}"
-fi
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools flag-o-matic linux-info python-r1 toolchain-funcs systemd user
-
-DESCRIPTION="NoSQL data store using the seastar framework, compatible with Apache Cassandra"
-HOMEPAGE="http://scylladb.com/"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="doc systemd"
-
-# NOTE:
-# if you want to debug using backtraces, enable the 'splitdebug' FEATURE:
-# https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Backtraces
-#
-# then check out:
-# https://github.com/scylladb/scylla/wiki/How-to-resolve-backtrace
-
-RESTRICT="test"
-
-RDEPEND="
-	app-admin/collectd
-	app-arch/lz4
-	=app-admin/scylla-tools-${PV}
-	=app-admin/scylla-jmx-${PV}
-	app-arch/snappy
-	dev-cpp/antlr-cpp:3.5
-	dev-cpp/yaml-cpp
-	dev-java/antlr:3.5
-	dev-libs/boost
-	dev-libs/crypto++
-	dev-libs/jsoncpp
-	dev-libs/libaio
-	dev-libs/libxml2
-	dev-libs/protobuf
-	<dev-libs/thrift-0.11.0
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	<dev-util/ragel-7.0
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-util/systemtap
-	net-libs/gnutls
-	net-misc/lksctp-tools
-	sys-apps/hwloc
-	sys-fs/xfsprogs
-	sys-libs/libunwind
-	sys-libs/zlib
-	sys-process/numactl
-	x11-libs/libpciaccess
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.5
-	dev-util/ninja
-"
-
-# Discussion about kernel configuration:
-# https://groups.google.com/forum/#!topic/scylladb-dev/qJu2zrryv-s
-# For DPDK, removed HUGETLBFS PROC_PAGE_MONITOR UIO_PCI_GENERIC in favor of VFIO
-CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE ~VFIO"
-ERROR_NUMA_BALANCING="${PN} recommends support for Memory placement aware NUMA scheduler (NUMA_BALANCING)."
-ERROR_SYN_COOKIES="${PN} recommends support for TCP syncookie (SYN_COOKIES)."
-ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage (TRANSPARENT_HUGEPAGE)."
-ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
-
-DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md README-DPDK.md )
-PATCHES=()
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup scylla
-	enewuser scylla -1 -1 /var/lib/${PN} scylla
-}
-
-src_prepare() {
-	default
-
-	# replace git submodules by symlinks
-	if [[ ${PV} == "9999" ]] ; then
-		# set version
-		local git_commit=$(git log --pretty=format:'%h' -n 1)
-		echo "${PV}-${git_commit}" > version
-	else
-		rmdir seastar || die
-		mv "${WORKDIR}/scylla-seastar-${SEASTAR_COMMIT}" seastar || die
-
-		rmdir seastar/dpdk || die
-		mv "${WORKDIR}/dpdk-${DPDK_COMMIT}" seastar/dpdk || die
-
-		rmdir seastar/c-ares || die
-		mv "${WORKDIR}/c-ares-${C_ARES_COMMIT}" seastar/c-ares || die
-
-		rmdir seastar/fmt || die
-		mv "${WORKDIR}/fmt-${FMT_COMMIT}" seastar/fmt || die
-
-		rmdir swagger-ui || die
-		mv "${WORKDIR}/scylla-swagger-ui-${SWAGGER_COMMIT}" swagger-ui || die
-
-		rmdir dist/ami/files/scylla-ami || die
-		mv "${WORKDIR}/scylla-ami-${AMI_COMMIT}" dist/ami/files/scylla-ami || die
-
-		# set version
-		echo "${MY_PV}-gentoo" > version
-	fi
-
-	# fix slotted antlr3 path
-	sed -e 's/antlr3 /antlr3.5 /g' -i configure.py || die
-
-	# fix jsoncpp detection
-	sed -e 's@json/json.h@jsoncpp/json/json.h@g' -i json.hh || die
-
-	# fix systemd service config path
-	mkdir build || die
-	cp dist/common/systemd/scylla-server.service.in build/scylla-server.service || die
-	sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i build/scylla-server.service || die
-
-	# fix seastar -Werror crashing build
-	# sed -e 's/ -Werror//g' -i seastar/configure.py || die
-
-	# fix dpdk for >=glibc-2.25
-	# https://github.com/scylladb/dpdk/issues/3
-	sed -e '42i #include <sys/sysmacros.h>' -i seastar/dpdk/lib/librte_eal/linuxapp/eal/eal_pci_uio.c || die
-
-	# run a clean autoreconf on c-ares
-	pushd seastar/c-ares
-	eautoreconf || die
-	popd
-}
-
-src_configure() {
-	python_setup
-
-	# native CPU CFLAGS are strongly enforced by upstreams, respect that
-	replace-cpu-flags "*" "native"
-
-	${EPYTHON} configure.py --mode=release --with=scylla --enable-dpdk --disable-xen --compiler "$(tc-getCXX)" --ldflags "${LDFLAGS}" --cflags "${CFLAGS}" --python ${EPYTHON} || die
-}
-
-src_compile() {
-	# force number of parallel builds because ninja does a bad job in guessing
-	# and the default build will kill your RAM/Swap in no time
-	ninja -v build/release/scylla build/release/iotune -j4 || die
-}
-
-src_install() {
-	default
-
-	insinto /etc/default
-	doins dist/common/sysconfig/scylla-server
-
-	insinto /etc/security/limits.d
-	doins dist/common/limits.d/scylla.conf
-
-	insinto /etc/collectd.d
-	doins dist/common/collectd.d/scylla.conf
-
-	insinto /etc/scylla.d
-	mv conf/housekeeping.cfg dist/common/scylla.d/
-	doins dist/common/scylla.d/*.conf
-
-	insinto /etc/sysctl.d
-	doins dist/common/sysctl.d/*.conf
-	doins dist/debian/sysctl.d/*.conf
-
-	insinto /etc/modprobe.d
-	doins dist/common/modprobe.d/*
-
-	insinto /etc/scylla
-	doins conf/*
-
-	systemd_dounit build/*.service
-	systemd_dounit dist/common/systemd/*.service
-	systemd_dounit dist/common/systemd/*.timer
-
-	newinitd "${FILESDIR}/scylla-server.initd" ${PN}-server
-	newconfd "${FILESDIR}/scylla-server.confd" ${PN}-server
-
-	exeinto /usr/lib/scylla
-	doexe dist/common/scripts/*
-	doexe seastar/scripts/*
-	doexe seastar/dpdk/usertools/dpdk-devbind.py
-	doexe scylla-blocktune
-	doexe scylla-housekeeping
-
-	dobin build/release/iotune
-	dobin build/release/scylla
-	dobin dist/common/bin/scyllatop
-
-	dodoc -r licenses
-
-	insinto /usr/lib/scylla/swagger-ui
-	doins -r swagger-ui/dist
-
-	insinto /usr/lib/scylla/api
-	doins -r api/api-doc
-
-	insinto /usr/lib/scylla/scyllatop
-	doins -r tools/scyllatop/*
-	fperms +x /usr/lib/scylla/scyllatop/scyllatop.py
-
-	for util in $(ls dist/common/sbin/); do
-		dosym /usr/lib/scylla/${util} /usr/sbin/${util}
-	done
-
-	for x in /var/lib/${PN}/{data,commitlog,coredump} /var/lib/scylla-housekeeping /var/log/scylla; do
-		keepdir "${x}"
-		fowners scylla:scylla "${x}"
-	done
-
-	insinto /etc/sudoers.d
-	doins dist/debian/sudoers.d/scylla
-
-	insinto /etc/rsyslog.d
-	doins "${FILESDIR}/10-scylla.conf"
-
-	insinto /etc/cron.d
-	newins dist/debian/scylla-server.cron.d scylla_delay_fstrim
-}
-
-pkg_postinst() {
-	elog "You should run 'emerge --config dev-db/scylla' to finalize your ScyllaDB installation."
-}
-
-pkg_config() {
-	elog "Running 'scylla_setup'..."
-	scylla_setup
-}
\ No newline at end of file
diff --git a/dev-db/scylla/scylla-2.1.0.ebuild b/dev-db/scylla/scylla-2.1.1.ebuild
index ab4dc3a..845545b 100644
--- a/dev-db/scylla/scylla-2.1.0.ebuild
+++ b/dev-db/scylla/scylla-2.1.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# TODO: node_exporter pkg name change to report upstream
+
 EAPI=6
 
 if [[ ${PV} == "9999" ]] ; then
@@ -37,7 +39,7 @@ HOMEPAGE="http://scylladb.com/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-IUSE="doc systemd"
+IUSE="-collectd doc systemd"
 
 # NOTE:
 # if you want to debug using backtraces, enable the 'splitdebug' FEATURE:
@@ -49,10 +51,11 @@ IUSE="doc systemd"
 RESTRICT="test"
 
 RDEPEND="
-	app-admin/collectd
-	app-arch/lz4
-	=app-admin/scylla-tools-${PV}
+	<dev-libs/thrift-0.11.0
+	<dev-util/ragel-7.0
 	=app-admin/scylla-jmx-${PV}
+	=app-admin/scylla-tools-${PV}
+	app-arch/lz4
 	app-arch/snappy
 	dev-cpp/antlr-cpp:3.5
 	dev-cpp/yaml-cpp
@@ -63,12 +66,10 @@ RDEPEND="
 	dev-libs/libaio
 	dev-libs/libxml2
 	dev-libs/protobuf
-	<dev-libs/thrift-0.11.0
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/pyudev[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	<dev-util/ragel-7.0
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-util/systemtap
 	net-libs/gnutls
@@ -79,6 +80,7 @@ RDEPEND="
 	sys-libs/zlib
 	sys-process/numactl
 	x11-libs/libpciaccess
+	collectd? ( app-metrics/collectd )
 	systemd? ( sys-apps/systemd )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild
index 858b483..82ff6a1 100644
--- a/dev-db/scylla/scylla-9999.ebuild
+++ b/dev-db/scylla/scylla-9999.ebuild
@@ -38,7 +38,7 @@ HOMEPAGE="http://scylladb.com/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-IUSE="doc systemd"
+IUSE="-collectd doc systemd"
 
 # NOTE:
 # if you want to debug using backtraces, enable the 'splitdebug' FEATURE:
@@ -50,10 +50,11 @@ IUSE="doc systemd"
 RESTRICT="test"
 
 RDEPEND="
-	app-admin/collectd
-	app-arch/lz4
-	=app-admin/scylla-tools-${PV}
+	<dev-libs/thrift-0.11.0
+	<dev-util/ragel-7.0
 	=app-admin/scylla-jmx-${PV}
+	=app-admin/scylla-tools-${PV}
+	app-arch/lz4
 	app-arch/snappy
 	dev-cpp/antlr-cpp:3.5
 	dev-cpp/yaml-cpp
@@ -64,12 +65,10 @@ RDEPEND="
 	dev-libs/libaio
 	dev-libs/libxml2
 	dev-libs/protobuf
-	<dev-libs/thrift-0.11.0
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/pyudev[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	<dev-util/ragel-7.0
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-util/systemtap
 	net-libs/gnutls
@@ -80,6 +79,7 @@ RDEPEND="
 	sys-libs/zlib
 	sys-process/numactl
 	x11-libs/libpciaccess
+	collectd? ( app-metrics/collectd )
 	systemd? ( sys-apps/systemd )
 "
 DEPEND="${RDEPEND}
@@ -101,7 +101,7 @@ PATCHES=()
 
 pkg_pretend() {
 	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) -lt 7 ]] ; then
+		if [[ $(gcc-major-version) -lt 7 && $(gcc-minor-version) -lt 3 ]] ; then
 				die "You need at least sys-devel/gcc-7.0"
 		fi
 	fi