From b29d6cda359358e60f57ec563b269e7252f2d9c0 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Mon, 12 Aug 2019 23:09:48 +0200 Subject: app-admin/scylla-tools: master and 3.1 version bump Package-Manager: Portage-2.3.71, Repoman-2.3.17 Manifest-Sign-Key: F30FAFEE3BD598228B24CB121A3A8C89C56D610B Signed-off-by: Alexys Jacob --- app-admin/scylla-tools/Manifest | 29 +++---- .../scylla-tools/scylla-tools-3.1_beta.ebuild | 93 ++++++++++++++++++++++ app-admin/scylla-tools/scylla-tools-9999.ebuild | 18 ++--- 3 files changed, 116 insertions(+), 24 deletions(-) create mode 100644 app-admin/scylla-tools/scylla-tools-3.1_beta.ebuild diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest index 5f6d1a4..a9ea176 100644 --- a/app-admin/scylla-tools/Manifest +++ b/app-admin/scylla-tools/Manifest @@ -9,24 +9,25 @@ DIST scylla-tools-3.0.9.tar.gz 35222090 BLAKE2B a374b7cf6a588f41bf97ce7a896cf419 EBUILD scylla-tools-3.0.6.ebuild 2559 BLAKE2B 32d4314e6795f874cb46e8a544c293f94b0fd7e4ea3d8519de08b5b75f2c817144bd84881298c465442ad956779a8392a8508ea8f786bd1961398dee6ef5f365 SHA512 28a38d026f051610dba2d59454078a30f4fb837c336659e213fa7503a67d4f111c523591781b658d8f4550b41ac9ab605b10f84300c28d0aed17424d63b64316 EBUILD scylla-tools-3.0.8.ebuild 2559 BLAKE2B 32d4314e6795f874cb46e8a544c293f94b0fd7e4ea3d8519de08b5b75f2c817144bd84881298c465442ad956779a8392a8508ea8f786bd1961398dee6ef5f365 SHA512 28a38d026f051610dba2d59454078a30f4fb837c336659e213fa7503a67d4f111c523591781b658d8f4550b41ac9ab605b10f84300c28d0aed17424d63b64316 EBUILD scylla-tools-3.0.9.ebuild 2559 BLAKE2B 32d4314e6795f874cb46e8a544c293f94b0fd7e4ea3d8519de08b5b75f2c817144bd84881298c465442ad956779a8392a8508ea8f786bd1961398dee6ef5f365 SHA512 28a38d026f051610dba2d59454078a30f4fb837c336659e213fa7503a67d4f111c523591781b658d8f4550b41ac9ab605b10f84300c28d0aed17424d63b64316 -EBUILD scylla-tools-9999.ebuild 2379 BLAKE2B 3f43765f1f837d2e9eb1a225a7c2aa4dace17a8ed6adae512b995f35ddff11a97def3dbe291b03521a6efd1054b87c4c4cf5e36fbc412cf6939148dd27da43b0 SHA512 c5858bf28c776d3af5f978aaa7cf010e2537a151e41e2733d79be26df9303eb8f1c5c6585c4d09275f381b6c0c018126f1ec9d0177865f35ff9f1a1db813db04 +EBUILD scylla-tools-3.1_beta.ebuild 2285 BLAKE2B 5af94b5886a54d8e59961ae255e384b54c51ce825b06e5b0b6623e044d64f646bd6d854ca91da64c374c6edd93816677720b5a4d5457cde7cf71ded189d13891 SHA512 18f5081a815476cb5ee50743a42ba703dcba9b5f8408151c723bf18f88b16bf4c45231e43908f7601968edd3f9e867567e8fefd0432d479c8f091652e1428ebd +EBUILD scylla-tools-9999.ebuild 2257 BLAKE2B 29bbf261acb7bfcdc4946fbe1b8385900eae163f218e706e893e9b72fc51ff0bf5248a6128cab71ec6fd621c8af9ec31e9b4a22627b584678f607d47a0b1cd3f SHA512 9683aa0f252efa09f7b23879198c58654fdb4c123fd2e75106dfd898b07935be1a328aef95d764f068900be8ef16859c23e6ff374f3f82ba410cb4c64b203596 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl1Jp8tfFIAAAAAALgAo +iQKTBAEBCAB9FiEEGiPLJcoPPNcvDvnY9mwK1B9ohkIFAl1R1ZpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFB MjNDQjI1Q0EwRjNDRDcyRjBFRjlEOEY2NkMwQUQ0MUY2ODg2NDIACgkQ9mwK1B9o -hkJU+A//dJW/t8FCj8L3QjjnKqDQEYJ+Tjh4HQ+BBv++vkRT2cYmrdsZrj/C+pHe -Illzv0eaoVmvSddQhCUCpPtfB/RpObPG7g8tZ93TeYxafkUjgAdgOtmIy0TD+VPE -yFaowQWg2Mf8D+tXjO6DrF0dbKa+17Cg0+opu9JvtsQDYKMSDQK8442XlmErWHTU -osDaaZGzk97AO8LI506bSoa/QGJDifuJkgK5joF+Za43IWbs4FIZxmrRp38uAgWf -W4jdXt+qreUHmv/cpRFGzAXtlCsrGDTCILteIHFHLP1PWgH/inZMsE6Ma2vwvV4j -yoAIIwgdlEpKFT8Mb13kPzs0KL9A8iQL8yNYGTbCbmHBQjBMZkcNuYN585y8LWP2 -mXkDBmQNFc12A12q3hk0LdRnEq44zNklXXVpwBFVin8DGpJM1hjmgoAJtbzTQJlK -y+jMh+v0taHeaaX047IkMmXUkKiSsaj7I2aPB7SWCf09qC4L3FOr0lXUTCXvoCHL -5YonIkND2Z77tlrEzO0+/kjdzQgwKKs0g9tXl9+hMXpZ25af0IU/9ZxauunPjL3g -n5dnMumPi3gmeaV6j0CdOsB7rx9iXcqAvI7mgaxSjlBBUrhgw7o7XkqD9xfZLRbW -t619ybwFvGFaWnDtrLjBcuMBELZSRfm4GvNrHc9C3u3qtgVcSss= -=gCHf +hkJi8RAAkVdDXs3gUuTcTTtQGKZzBVO9ycGvTiOTI8dPYWCBgGqXTfn0QWLmkkYj +tJTzbSUHhyUkkjFqVXN4XmgAVaUd/BTJAeIBYpG3AIp24R9Skqbd/YnsZZsjET6D +vnDCtpfY6RJyznsnnOyUK/JVtglvhgep09EVM1ccr3nCUyo9/+JT0+XhtXhS2Ptu +zSz4THK3WB/XQfBChLahMuI0d/1m7gU4FRxWiQ6RDyUaBbJViyRx5v1Nn/pMACNg +ukoE9Vza01f7Cutg7TIxKGxx6OQ0Dr6eALBsT+wMKYDzoD7bppyzZkqnkozqGnSO +Qq3X5SAIV8uo+CA7RLPlkI8TCOX0pNIGVMf0S4eao7uqMsqebl4fxHqbmu5umFCX +HCaaCQCjI1yjMXniFeDbXeiBENDncA8N98J4gPTHe2hx2egDYReuGb3TWxW2kaz6 ++EUCDlC373OjwPpTRiUddtdETweunyf5vczoP6I25jJWtlq1p7m4qXvR3MWpr1m+ +0AGv8bWGncp+G9eb8cN343OOvRNSyBOMe/Ke+6pJQe2g+MBde8DCdPjZIzmhEEPh +dgQ5bzn6mRJxI9q5QKekZlAG1jjs3aduzEuYN2G7G8g8cttUeuuSMs/GBKBXnohQ +LGuhHmOF1DhiSIicpBcc31/OabVJQ52tJdG2bDBy/pGmPABN/Lw= +=srib -----END PGP SIGNATURE----- diff --git a/app-admin/scylla-tools/scylla-tools-3.1_beta.ebuild b/app-admin/scylla-tools/scylla-tools-3.1_beta.ebuild new file mode 100644 index 0000000..535964c --- /dev/null +++ b/app-admin/scylla-tools/scylla-tools-3.1_beta.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PV="${PV/_beta/}" +EGIT_CLONE_TYPE="mirror" +EGIT_COMMIT="next-${MY_PV}" +EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git" +inherit git-r3 + +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 + + # remove "build-test" from the "jar" target + sed -e 's/ build-test,//g' -i build.xml || die + + if has network-sandbox ${FEATURES}; then + die "Please set '-network-sandbox' when defining the FEATURES variable" + fi +} + +src_install() { + default + + # find out version + local origin_version=$(grep '"base.version"' build.xml | sed 's/.*value="\(.*\)".*/\1/g') + + 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 359d1df..e55006b 100644 --- a/app-admin/scylla-tools/scylla-tools-9999.ebuild +++ b/app-admin/scylla-tools/scylla-tools-9999.ebuild @@ -3,16 +3,10 @@ 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 +EGIT_CLONE_TYPE="mirror" +EGIT_COMMIT="master" +EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git" +inherit git-r3 EANT_BUILD_TARGET="jar" PYTHON_COMPAT=( python2_7 ) @@ -40,6 +34,10 @@ RESTRICT="test" src_prepare() { default find examples -type f -name \*.xml -exec rm -v {} \; || die + + # remove "build-test" from the "jar" target + sed -e 's/ build-test,//g' -i build.xml || die + if has network-sandbox ${FEATURES}; then die "Please set '-network-sandbox' when defining the FEATURES variable" fi -- cgit v1.2.3-65-gdbad