From 3cf39964059c69c4870732f3d6289821f7aa1f44 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Thu, 5 Oct 2017 18:24:36 +0200 Subject: scylla: v2.0.0 --- app-admin/scylla-jmx/Manifest | 4 +- app-admin/scylla-jmx/scylla-jmx-2.0.0.ebuild | 90 +++++++++++++++++++++ app-admin/scylla-jmx/scylla-jmx-2.0_rc3.ebuild | 90 --------------------- app-admin/scylla-tools/Manifest | 4 +- app-admin/scylla-tools/scylla-tools-2.0.0.ebuild | 91 ++++++++++++++++++++++ app-admin/scylla-tools/scylla-tools-2.0_rc3.ebuild | 91 ---------------------- 6 files changed, 185 insertions(+), 185 deletions(-) create mode 100644 app-admin/scylla-jmx/scylla-jmx-2.0.0.ebuild delete mode 100644 app-admin/scylla-jmx/scylla-jmx-2.0_rc3.ebuild create mode 100644 app-admin/scylla-tools/scylla-tools-2.0.0.ebuild delete mode 100644 app-admin/scylla-tools/scylla-tools-2.0_rc3.ebuild (limited to 'app-admin') diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index 1b14263..d7ce837 100644 --- a/app-admin/scylla-jmx/Manifest +++ b/app-admin/scylla-jmx/Manifest @@ -1,6 +1,6 @@ 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.rc3.tar.gz 98489 SHA256 cd18c587dc7c7e5e2a61f747cee9ebbf770a97f960c234e695584c40bc6f2bc3 SHA512 41572d61e7ffd167bbae7864587d79f6e1e6898dfab380beca19e649c31b6ef7bfed401a9f49ff5ee97af7bb030a24fe1eb5a582b300ec378fe90e1cad47f92a WHIRLPOOL 24a81b95f0786c4e34562b48b43cb6853aaa1fdaf0f9f65ae4d7ae3a935628d5b06c994f11acafae17c9e27a3cb9a29bebf92166bde282cb87a117a422488616 -EBUILD scylla-jmx-2.0_rc3.ebuild 2303 SHA256 3062fe2e2e1fd21814b93f383321becde22a9c1394bf58c948921869780c62ad SHA512 8b48edd4c8ba7e8739596b0531fe570f7b40565b90f0778f339bf523d14edb706f751913018553ef6dd89d6f66306143c0f6a2f6ae493352e9cec7d62208f810 WHIRLPOOL 41f0a4dc70eb530b98e8950b8ef7cfdd1ce3e8303665c229d109bcc3db2473724f466e53a5f514dfcf4b6332ee1e8b98eb4415b8b15cc44790903140a10c57bf +DIST scylla-jmx-2.0.0.tar.gz 98505 SHA256 1d9866cdac795492802b9a020080248f631b010b1ba22ee7a74ffa4ae682e113 SHA512 35f5ed31c081656a83bdf6ada0969fec77c954f4c568816a592c0936e8faa855e888578de2b885e9ba6a84ffe5c3da2fe4125ab3c0c1eca760e8bd134a8a7588 WHIRLPOOL fd6c15d04c245981565367357df109b0193b120eaf75a0a567f66fa83b5c0efd7e4028d3ed5b0ef57864e3ea360d3cee43b7453d3e6d086f52b79e2ab8b7f713 +EBUILD scylla-jmx-2.0.0.ebuild 2303 SHA256 3062fe2e2e1fd21814b93f383321becde22a9c1394bf58c948921869780c62ad SHA512 8b48edd4c8ba7e8739596b0531fe570f7b40565b90f0778f339bf523d14edb706f751913018553ef6dd89d6f66306143c0f6a2f6ae493352e9cec7d62208f810 WHIRLPOOL 41f0a4dc70eb530b98e8950b8ef7cfdd1ce3e8303665c229d109bcc3db2473724f466e53a5f514dfcf4b6332ee1e8b98eb4415b8b15cc44790903140a10c57bf EBUILD scylla-jmx-9999.ebuild 2303 SHA256 3062fe2e2e1fd21814b93f383321becde22a9c1394bf58c948921869780c62ad SHA512 8b48edd4c8ba7e8739596b0531fe570f7b40565b90f0778f339bf523d14edb706f751913018553ef6dd89d6f66306143c0f6a2f6ae493352e9cec7d62208f810 WHIRLPOOL 41f0a4dc70eb530b98e8950b8ef7cfdd1ce3e8303665c229d109bcc3db2473724f466e53a5f514dfcf4b6332ee1e8b98eb4415b8b15cc44790903140a10c57bf MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841 diff --git a/app-admin/scylla-jmx/scylla-jmx-2.0.0.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.0.0.ebuild new file mode 100644 index 0000000..3bae0e9 --- /dev/null +++ b/app-admin/scylla-jmx/scylla-jmx-2.0.0.ebuild @@ -0,0 +1,90 @@ +# 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 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-2.0_rc3.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.0_rc3.ebuild deleted file mode 100644 index 3bae0e9..0000000 --- a/app-admin/scylla-jmx/scylla-jmx-2.0_rc3.ebuild +++ /dev/null @@ -1,90 +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 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-tools/Manifest b/app-admin/scylla-tools/Manifest index 9755311..1dec4fe 100644 --- a/app-admin/scylla-tools/Manifest +++ b/app-admin/scylla-tools/Manifest @@ -1,4 +1,4 @@ -DIST scylla-tools-2.0.rc3.tar.gz 26859546 SHA256 887c6417faf973fc8a17435d193b50b29001e2831fff807c2893f49314e075fa SHA512 19a554ecf85ba4a055514b4649c8482293c859495557acf3069777c6372a10eddf065b3071a28873168de169e04ce9d664d0dc66f8ccd7bdd35439dc6cab8928 WHIRLPOOL 501b3399eec40a79563c68b3dfa73ccca72a0fd0de46037faae2c14831b09417dbf018f134ddce4ccb3d33d924fc176b95d528462e71f3e7ac45d36e744a8e6d -EBUILD scylla-tools-2.0_rc3.ebuild 2236 SHA256 2e5c2b173dad3547e64101219b70be988b769b61287f6279a33fe2d041116337 SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216 WHIRLPOOL 97780d7ab406cf4bbb3de3328bc48d182517f92cea088df0d2666a6cee09f16e37181b5012d3920a1c6235615b505407bfc390b83eaeda587378072d8d938d63 +DIST scylla-tools-2.0.0.tar.gz 26858778 SHA256 042b35175c75eb54ff724c25e93e77b0ae59b8ad90a120156be6e465829419c1 SHA512 ccaab2a64d817bddff7b863b6fd3aeda23d05da001b8a9a404d954b048cc05d967ed0bd30ac601512a076b7616db955176cfa2c19d4b53c1067d5a821decafce WHIRLPOOL c65d4530321b774a707e4fd3417d8f49f10747dcc6844483222f48d20730f76f6032189fcefb771a052954e19ad53a8b1152ac65973b744fb42f4e734f9de6d6 +EBUILD scylla-tools-2.0.0.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 diff --git a/app-admin/scylla-tools/scylla-tools-2.0.0.ebuild b/app-admin/scylla-tools/scylla-tools-2.0.0.ebuild new file mode 100644 index 0000000..25d2fa1 --- /dev/null +++ b/app-admin/scylla-tools/scylla-tools-2.0.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 +} diff --git a/app-admin/scylla-tools/scylla-tools-2.0_rc3.ebuild b/app-admin/scylla-tools/scylla-tools-2.0_rc3.ebuild deleted file mode 100644 index 25d2fa1..0000000 --- a/app-admin/scylla-tools/scylla-tools-2.0_rc3.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 -} -- cgit v1.2.3-65-gdbad