scylla: realized that 1.7 does not have the gentoo patches yet... stick with live ebuild for now

6 files changed, 4 insertions, 183 deletions

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 31ef205..3c863b2 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -1,6 +1,4 @@
 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-1.7.4.tar.gz 96913 SHA256 0b13e8ceeb17e95b690921bd61ac38948440493304f3f6ae386912bcdb4b7435 SHA512 aa9704eb4683f2633b7fc4fa02701049d5554af8c8ca34013819d6c0a8ca308ea71e48b8333e42dad5b25f555d07a40a3c43482b709933da48a5571b0caf1e5c WHIRLPOOL 20c7d68d050eb847ccef5542d28592522be026bd1039fdca84ffc1e13b8426c48ac0f126bf320b392b95476332cf34126eecccfc11ba59ca3cba81c097def00f
-EBUILD scylla-jmx-1.7.4.ebuild 2248 SHA256 ebf6d25dc00af6373672119c510b9f9e76aad90304f6dcaf3bfd33c52d65d1d6 SHA512 68ef5b2e6edbcedcbe522b96983cf928c255d12f3f3b163ef18f6e6ddb5378cbc23a41f5aca16767f5f03c9f85a2ab72b55d326a59d88add39a91f88cd35124e WHIRLPOOL 576b9d0ce5bec15f37d4111a7425e3321d0c794897764385478d1825c99571a38d5841c79914366f107e2d2b83ca1794c68aa8223ea2de3f5475ed26da3dca18
-EBUILD scylla-jmx-9999.ebuild 2248 SHA256 ebf6d25dc00af6373672119c510b9f9e76aad90304f6dcaf3bfd33c52d65d1d6 SHA512 68ef5b2e6edbcedcbe522b96983cf928c255d12f3f3b163ef18f6e6ddb5378cbc23a41f5aca16767f5f03c9f85a2ab72b55d326a59d88add39a91f88cd35124e WHIRLPOOL 576b9d0ce5bec15f37d4111a7425e3321d0c794897764385478d1825c99571a38d5841c79914366f107e2d2b83ca1794c68aa8223ea2de3f5475ed26da3dca18
+EBUILD scylla-jmx-9999.ebuild 2267 SHA256 70680ae370cad1dfc7a87ca78e05bf6905987c4b29a1b093f5d9820df1a92648 SHA512 f96cc056c5e320dda111bb9ecd7375281b12acf71b3d76147da5336f089d69670888f82de257bfec3e8e130cb0dd25e01675c4a875bacfe314b9807c95ab04c8 WHIRLPOOL e0c3b82a0f1e3411ac71de3b0c3be2842365cc371b51c194407b6904b22177488ae405f0b304877118ab059a7f29f39eada94adbb50dd48708d9bd095b9dd85b
 MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild b/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild
deleted file mode 100644
index ec6206c..0000000
--- a/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild
+++ /dev/null
@@ -1,88 +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
-	SRC_URI="https://github.com/scylladb/${PN}/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/scylla-jmx-scylla-${PV}"
-fi
-PYTHON_COMPAT=( python2_7 )
-
-inherit java-pkg-2 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"
-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-9999.ebuild b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
index ec6206c..c819465 100644
--- a/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/scylladb/scylla-jmx.git"
 	inherit git-r3
+	KEYWORDS="~amd64"
 else
 	SRC_URI="https://github.com/scylladb/${PN}/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index 70075fa..706631a 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,4 +1,2 @@
-DIST scylla-tools-1.7.4.tar.gz 26856201 SHA256 0c42fb22a905dfc4cd707e6ab8e4720a213cd527417b358bdf03df913e09c4c6 SHA512 39b05ff7469cff5ffbd8560a96cfd0f8a1f5b93834aa5044da79fbc4024c70cb302583af57ec270a15ee32136a0b0dd1fa6e6a6ee72e3aa4c9b92f9fab1476a9 WHIRLPOOL 89737f5547ba938db6f90882b44167a9e2fbaf99f110152ae4044b3b2c6c346b149cdbcd53763cab3a30453156c2e67d10b0d1a3097adde26209ea9d2a0feebf
-EBUILD scylla-tools-1.7.4.ebuild 2181 SHA256 c49d27d4c7ccf7b5b36e54a9c984e159f0b4878eebeca04ba181090280e58312 SHA512 4b4d840def46ec906522aab8933cd1503ccddfa2ce0c66f8fc6bec1c0e59de1f9ed5f9e72672b59ff5e2b45dc8da3185fd624e42cedf163e08c8514673e8ca8a WHIRLPOOL aef3410fce450823c8a34a685f0aa0ea43b2d8384e4630a759de8740022243c120840f39bf2e2a22c6dd0b74fc094a4d8da15efb2019b449340b6f3c2cf356dd
-EBUILD scylla-tools-9999.ebuild 2181 SHA256 c49d27d4c7ccf7b5b36e54a9c984e159f0b4878eebeca04ba181090280e58312 SHA512 4b4d840def46ec906522aab8933cd1503ccddfa2ce0c66f8fc6bec1c0e59de1f9ed5f9e72672b59ff5e2b45dc8da3185fd624e42cedf163e08c8514673e8ca8a WHIRLPOOL aef3410fce450823c8a34a685f0aa0ea43b2d8384e4630a759de8740022243c120840f39bf2e2a22c6dd0b74fc094a4d8da15efb2019b449340b6f3c2cf356dd
+EBUILD scylla-tools-9999.ebuild 2200 SHA256 38b2009d2beb8d18d49578052a56c0d655d3b5839a1a75460af39973e6a4ce93 SHA512 8a550209ab78de24e931a8c2bac0027e2303efe7e4cc2d53611152ecc8edced948fc255af606fe58f4f0f0b23a1f9db2e20cc4778ad14707adff84fd91ae6a61 WHIRLPOOL 04fcb509092f6bf85ad5ead7eaaee9590f5fece137d7e862ad6ae069263dab20c52eca9b04014ec08b71978fb9cc0fe0fa5842e7b257cd14b97267264c388a8e
 MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-tools/scylla-tools-1.7.4.ebuild b/app-admin/scylla-tools/scylla-tools-1.7.4.ebuild
deleted file mode 100644
index ab3b74c..0000000
--- a/app-admin/scylla-tools/scylla-tools-1.7.4.ebuild
+++ /dev/null
@@ -1,89 +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
-	SRC_URI="https://github.com/scylladb/scylla-tools-java/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/scylla-tools-java-scylla-${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 ab3b74c..11e48e0 100644
--- a/app-admin/scylla-tools/scylla-tools-9999.ebuild
+++ b/app-admin/scylla-tools/scylla-tools-9999.ebuild
@@ -6,6 +6,7 @@ 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"
 	KEYWORDS="~amd64"