diff options
| -rw-r--r-- | app-admin/scylla-jmx/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/scylla-jmx/scylla-jmx-2.0_rc1.ebuild | 90 | ||||
| -rw-r--r-- | app-admin/scylla-jmx/scylla-jmx-9999.ebuild | 7 | ||||
| -rw-r--r-- | app-admin/scylla-tools/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/scylla-tools/scylla-tools-2.0_rc1.ebuild | 91 | ||||
| -rw-r--r-- | app-admin/scylla-tools/scylla-tools-9999.ebuild | 7 |
6 files changed, 195 insertions, 8 deletions
diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest index 3c863b2..53460c2 100644 --- a/app-admin/scylla-jmx/Manifest +++ b/app-admin/scylla-jmx/Manifest @@ -1,4 +1,6 @@ AUX scylla-jmx.confd 243 SHA256 31398e8dedcf01a72d5532b0ed30a9c0df5818d372ff5dca78d8e851f4d1f5d8 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402 WHIRLPOOL c5a6009774867aaf4b6896016206d352d0bc2774dcb92389828c00ac5cf792211555a6612abb7e6e90e5d88a4560fae51fec755d5994e40f918088c9f9818e04 AUX scylla-jmx.initd 592 SHA256 63bdbcf7458e766c04b351aa576efd92fd796840f2469cb85b80d364c492d950 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037 WHIRLPOOL f53e9546d6d73f7109301280529a00fc5360cc4549c3e5985183d2e6d55562cc897bc0cf93d1f267fdf0d7ea587dd25c5b0e72817459d3e17a0366dc651b64d1 -EBUILD scylla-jmx-9999.ebuild 2267 SHA256 70680ae370cad1dfc7a87ca78e05bf6905987c4b29a1b093f5d9820df1a92648 SHA512 f96cc056c5e320dda111bb9ecd7375281b12acf71b3d76147da5336f089d69670888f82de257bfec3e8e130cb0dd25e01675c4a875bacfe314b9807c95ab04c8 WHIRLPOOL e0c3b82a0f1e3411ac71de3b0c3be2842365cc371b51c194407b6904b22177488ae405f0b304877118ab059a7f29f39eada94adbb50dd48708d9bd095b9dd85b +DIST scylla-jmx-2.0.rc1.tar.gz 98498 SHA256 151ca228081b0a57984db5f5aaaf25d022a16a5e4666ca0d670a44ea79364e12 SHA512 3df4304d4000fb8c6ebf631fed456ec1970b3f8d5c777499643437cf48c919af233e8d0237635c8ae69c65a120c4a7a11562710f412c1cd2f3b9475f8776a212 WHIRLPOOL 46c9b00c6c0a1f1684fc26843f81a8d5dde2ec759d14e1ec7fdc0b0c3070fa5fd1d24a1ec101db78adbd49d9a92ffbada0721f119d1c3b45e0376f06142bcda4 +EBUILD scylla-jmx-2.0_rc1.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_rc1.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.0_rc1.ebuild new file mode 100644 index 0000000..3bae0e9 --- /dev/null +++ b/app-admin/scylla-jmx/scylla-jmx-2.0_rc1.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-9999.ebuild b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild index c819465..3bae0e9 100644 --- a/app-admin/scylla-jmx/scylla-jmx-9999.ebuild +++ b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild @@ -6,11 +6,12 @@ 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" + 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-${PV}" + S="${WORKDIR}/scylla-jmx-scylla-${MY_PV}" fi PYTHON_COMPAT=( python2_7 ) diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest index 706631a..818a2d4 100644 --- a/app-admin/scylla-tools/Manifest +++ b/app-admin/scylla-tools/Manifest @@ -1,2 +1,4 @@ -EBUILD scylla-tools-9999.ebuild 2200 SHA256 38b2009d2beb8d18d49578052a56c0d655d3b5839a1a75460af39973e6a4ce93 SHA512 8a550209ab78de24e931a8c2bac0027e2303efe7e4cc2d53611152ecc8edced948fc255af606fe58f4f0f0b23a1f9db2e20cc4778ad14707adff84fd91ae6a61 WHIRLPOOL 04fcb509092f6bf85ad5ead7eaaee9590f5fece137d7e862ad6ae069263dab20c52eca9b04014ec08b71978fb9cc0fe0fa5842e7b257cd14b97267264c388a8e +DIST scylla-tools-2.0.rc1.tar.gz 26856246 SHA256 e253b289243394ba079455bd9e0ebaebe85f69df28fcf7b73a33dc2438f9a531 SHA512 ca1b2e9b2873384fdcdfb830924dd4594dd12a1b84ab5e2550654890efbcc8a094ce5cda95a3275b0047278719cb5e96b84f15a8292fab08bbae7e1ed89e9398 WHIRLPOOL 5cc22ab81604db8112cfd919e46486e74ea4a64b611fe3b40e75228720797d73ffde31c1c9a7489b1a912e2098174747378cee95f63517c7479081fd4438f2f0 +EBUILD scylla-tools-2.0_rc1.ebuild 2246 SHA256 9aa48ee35ca48fc0d3cf76589dcb95f670be6d5813452d7c5adf009978c9d103 SHA512 01c447a790b61500533b00efc4844b6217d5eee555445b4bd0818fd5f9c223f261165f63dcdbe126361abbb2e905fe23cf2b1de040635a48dcd892f8a37a4c97 WHIRLPOOL 9a1247fcc8a6510e6c4eeb5bcc10fd4565b1337ea3e590e52f122266a4717c08ea5b9500dd37cd6eb0eb4f6f3a227afa0ce8197545a4b4e39ad30015d3e0a09e +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_rc1.ebuild b/app-admin/scylla-tools/scylla-tools-2.0_rc1.ebuild new file mode 100644 index 0000000..2bfc1cf --- /dev/null +++ b/app-admin/scylla-tools/scylla-tools-2.0_rc1.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-core-${MY_PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/scylla-tools-java-scylla-core-${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-9999.ebuild b/app-admin/scylla-tools/scylla-tools-9999.ebuild index 11e48e0..25d2fa1 100644 --- a/app-admin/scylla-tools/scylla-tools-9999.ebuild +++ b/app-admin/scylla-tools/scylla-tools-9999.ebuild @@ -6,11 +6,12 @@ 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" + 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-${PV}" + S="${WORKDIR}/scylla-tools-java-scylla-${MY_PV}" fi EANT_BUILD_TARGET="jar" |