From d294cdfc48844c03873f38bf1db795c9d8648b93 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Tue, 21 Jan 2020 10:26:36 +0100 Subject: app-admin/scylla-tools: version bump Package-Manager: Portage-2.3.81, Repoman-2.3.20 Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5 Signed-off-by: Alexys Jacob --- app-admin/scylla-tools/Manifest | 18 ++-- app-admin/scylla-tools/scylla-tools-3.2.0.ebuild | 102 +++++++++++++++++++++ app-admin/scylla-tools/scylla-tools-3.2_rc3.ebuild | 96 ------------------- 3 files changed, 111 insertions(+), 105 deletions(-) create mode 100644 app-admin/scylla-tools/scylla-tools-3.2.0.ebuild delete mode 100644 app-admin/scylla-tools/scylla-tools-3.2_rc3.ebuild diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest index 88e6ae6..3b5a62c 100644 --- a/app-admin/scylla-tools/Manifest +++ b/app-admin/scylla-tools/Manifest @@ -14,20 +14,20 @@ EBUILD scylla-tools-3.0.9.ebuild 2559 BLAKE2B 32d4314e6795f874cb46e8a544c293f94b EBUILD scylla-tools-3.1.0.ebuild 2339 BLAKE2B 79fdf7ea2308ecca2a610a65d240c5467f9416e91eb89a4cc3f6753992778549fa0cf8cd638ea84a6f12eb66db5717cab9f48efb9b3cc8dac8b40eef5b490990 SHA512 4a65e6c33e0a5ee7e81571498f08c828836948bdf7eb3cf7d7c0bd61ba6a460115c490653b939b3c0b636ae486a5c498acf1bd436f3b53d65f1b50e66e0e3890 EBUILD scylla-tools-3.1.1.ebuild 2339 BLAKE2B 79fdf7ea2308ecca2a610a65d240c5467f9416e91eb89a4cc3f6753992778549fa0cf8cd638ea84a6f12eb66db5717cab9f48efb9b3cc8dac8b40eef5b490990 SHA512 4a65e6c33e0a5ee7e81571498f08c828836948bdf7eb3cf7d7c0bd61ba6a460115c490653b939b3c0b636ae486a5c498acf1bd436f3b53d65f1b50e66e0e3890 EBUILD scylla-tools-3.1.2.ebuild 2390 BLAKE2B 6e80f8820bc4d5a9683ced70548126c4699f022daed70604ce1732afa61aeb644b3a1e8b03f7d4455e3f9b474fb98e7e9a92a3386572e72e9fc9920498caf334 SHA512 71f34d307555d2f6f45d6fc31fea6f4379725868a5aeb35b9e1a635f8d42d54e22c4c180c5d9eb3c36d5af6b6623b9e02057a1f30b4a9bd910e208e724fdb7d0 -EBUILD scylla-tools-3.2_rc3.ebuild 2387 BLAKE2B 7ed4b60f48d02958ee23eb6de2c7052cd88e34e9aeccbe832828c079dc44dac33dcfffd9241ad4f159e064a06e3c21d98b04563c04c01632ddf8a7a85ea4ece5 SHA512 97cda4f5e41dce97960722bbb91ae37cfe43d9fd1ce780bdf0022f4e2040f312aa671d47bee5d9f65d5fefcbcd0f48e24e7c181c79fb1fb239353a3a7316a8f4 +EBUILD scylla-tools-3.2.0.ebuild 2583 BLAKE2B 451990b0c3df9b31ba9894723e26a52900b9e99a5f703059809bd9d977aca2332660058f1bacc3f0aa034f48c4d1e182618b05297d2b843fddd4e10e14b00922 SHA512 55c1509f5709f19e66cbefa1eaee74f7fec1ac8439bfabdd954fcc3557e1d1eb2b5add5e7fb0d496771ba8f0107874f09fd0aa85efbf98caad5a2d6f09b457af EBUILD scylla-tools-9999.ebuild 2286 BLAKE2B a5bb2d8dbfc077f95508e895b2fda990ed8ab7184c63227b7dae47873b473db2dd1ce8836625ae313c581dcce5b852845209f60af33de35dde129104a37267db SHA512 8d9a91f61c62caf5d7a5cb61a80314cec733089f9f94a250a1a328a2cbab7fe051f43177902d9c7ff7a4a14e713ee19fef0ad19147ff0f32b41bd24505205883 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl37WQxfFIAAAAAALgAo +iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl4mw7FfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX -dy9FbwgAz/5K4axvOsX3bseb1YzoeMhOtuOjZ8mlt7DjJZuh3dIVouEJKk9ZCaLf -6MVCXpMDPI5yemIB4H1j/eXFwmPa/i+9GFCIy0LkU9NsJvgzNCCg5fvip3LwUSpb -VwS8iA4FEyNVh1q0NFQ/0m+RHWJekjRwkMcoo/7exoZ58xRIK+lJ5p3ZiF3QXy5N -Kws7FOer7KkoQ6E7au7eImHKWSt5SELVRY49Zp4yUXx9WnQFXslFDqRcKzBYOB3l -Doo103arSJICa/efj/AflM+mkDGkYblkccdQ585JKPJIIL/9Lmv6Q2VctgiRZPoW -qqXjzn/gG5uOtL9955KKTxfal/ae0g== -=5C4Y +dy+GfwgAtl+ct1tfxLoVJpdiKeIwnSnZ4OpbZpTv6BrTSZfodpN4UGBRo7w0Wil7 +ckC5kESLu1G5Tzs3IG+uSOqV0saCGA0sHl0cJr7hHiNbmMQeMYeWHK4FtTe6zMzf +kIWBQuBWvobAf7eqWcdG8sSGPxnxMk0iTjv+CfSukrYWKZf+PqUZ9vZVDASlpfW/ +Kh4D4R6m6fStB66i8EYsvbrlEiJSXZADDJtQbzbCsNZF16QoZ56jnjlrz/jH0gAP +f5X9LaRpwCXSkVxop8aGiSh6aB48lvImiwEmjpxADiH7Dhk/Q67DtkojkkgepdGe +Xbs9mS2u8Q7XHSdj9yKv+yGraM1Qcg== +=Yqdx -----END PGP SIGNATURE----- diff --git a/app-admin/scylla-tools/scylla-tools-3.2.0.ebuild b/app-admin/scylla-tools/scylla-tools-3.2.0.ebuild new file mode 100644 index 0000000..d1f507b --- /dev/null +++ b/app-admin/scylla-tools/scylla-tools-3.2.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PV="${PV/_/.}" +EGIT_CLONE_TYPE="mirror" +EGIT_COMMIT="scylla-core-${MY_PV}" +EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git" +inherit git-r3 + +EANT_BUILD_TARGET="jar" +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} ) +JAVA_PKG_IUSE="source doc" + +inherit java-pkg-2 java-ant-2 python-r1 + +DESCRIPTION="scylla tools (Java part)" +HOMEPAGE="https://github.com/scylladb/scylla-tools-java" + +KEYWORDS="~amd64" +LICENSE="Apache-2.0" +SLOT="0" + +CDEPEND="dev-java/antlr:3.5" +RDEPEND=" + ${CDEPEND} + ${PYTHON_DEPS} + >=dev-java/ant-junit-1.10.5 + >=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 + + # https everything + sed -e 's@http://@https://@g' -i build.xml build.properties.default || die + + # fix bad cert HTTPS URL + sed -e 's@repo2.maven.org@repo.maven.apache.org@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 "python2.7" + python_optimize pylib/cqlshlib + 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-3.2_rc3.ebuild b/app-admin/scylla-tools/scylla-tools-3.2_rc3.ebuild deleted file mode 100644 index 347190d..0000000 --- a/app-admin/scylla-tools/scylla-tools-3.2_rc3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_/.}" -EGIT_CLONE_TYPE="mirror" -EGIT_COMMIT="scylla-core-${MY_PV}" -EGIT_REPO_URI="https://github.com/scylladb/scylla-tools-java.git" -inherit git-r3 - -EANT_BUILD_TARGET="jar" -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} ) -JAVA_PKG_IUSE="source doc" - -inherit java-pkg-2 java-ant-2 python-r1 - -DESCRIPTION="scylla tools (Java part)" -HOMEPAGE="https://github.com/scylladb/scylla-tools-java" - -KEYWORDS="~amd64" -LICENSE="Apache-2.0" -SLOT="0" - -CDEPEND="dev-java/antlr:3.5" -RDEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} - >=dev-java/ant-junit-1.10.5 - >=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 "python2.7" - python_optimize pylib/cqlshlib - 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-18-g5258