From 44fb720810860bc2768418b7abbf5726937e7145 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Mon, 4 Feb 2019 22:04:16 +0100 Subject: app-admin/scylla-tools: version bump Package-Manager: Portage-2.3.52, Repoman-2.3.12 Manifest-Sign-Key: F30FAFEE3BD598228B24CB121A3A8C89C56D610B Signed-off-by: Alexys Jacob --- app-admin/scylla-tools/Manifest | 30 +++---- app-admin/scylla-tools/scylla-tools-3.0.1.ebuild | 101 ----------------------- app-admin/scylla-tools/scylla-tools-3.0.2.ebuild | 101 +++++++++++++++++++++++ 3 files changed, 116 insertions(+), 116 deletions(-) delete mode 100644 app-admin/scylla-tools/scylla-tools-3.0.1.ebuild create mode 100644 app-admin/scylla-tools/scylla-tools-3.0.2.ebuild diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest index 9e6aad2..f05c8d6 100644 --- a/app-admin/scylla-tools/Manifest +++ b/app-admin/scylla-tools/Manifest @@ -4,27 +4,27 @@ Hash: SHA256 AUX scylla-tools-3.0_rc1-build.xml.patch 962 BLAKE2B 9a769b53b6dc98ba402089c77f41cf81ae0fa2f1da6ab390e8774e0ec2f5ad45fb738b6d0c9c35e7f27a64b19d7b45ed1354367ce26182a324d79db568169158 SHA512 a983c18c16e8f08b850081c58d20d94f2524a75eaefec8183a2d380d3605ee00de5b5e49f7da2bf7d3ebfc096696a58156d5b895daaf24e21f2e476f8ef7430b DIST jstackjunit.zip 1977804 BLAKE2B 31acda6a249cbd9802e298e1780486b1cef807a5c666c30e59bb4a119a9c1fceb6018ffb8416873ed35b5dba9366cef840c1ca4f56c66dab9828c92a1f7befff SHA512 31b9226e7461399336fff0a66d20a7838f710c5d1264c6b565dabdd5798e8b1603844959b762337691ee3e2c902c1cb94580b83f94d874a2cf7540ea702126f1 DIST scylla-tools-2.3.1.tar.gz 26861494 BLAKE2B 6bec8d052a80493947f814cd1f28d9d93e29d97a610193e679570c657a8a770bb2c4d064a6e85465d0b6812cbb3f47fdad59ca91eec71f7054aea85ab378d265 SHA512 57b0a24941f788c094c72cd9db040a946def2fb3f72a74d17b3b4716a5135a48aa02372d5210e0c13377a94ffec7d3dc848c01b966605154846ad423ece5b8af -DIST scylla-tools-3.0.1.tar.gz 35221459 BLAKE2B a313e59e1cb9d1f4f45d919c25e8c5e9a1145157de93c6419d420c5db84a1f5a16699a248da688f5e7dd4110e7c3b554631fd80c583359e26c6776f27c6270a0 SHA512 883a279bd98949e1abff7747723d4db3c6846628d365ad7b6ddad9c0dd40b6a48ac785dd261378a96858790aaea2d4c74417a8b3a217c9c57ee7a1657666b75f +DIST scylla-tools-3.0.2.tar.gz 35221853 BLAKE2B 5ce6c5677a004057c6733c69997e69870a6fffeb1049b2fec690058caa62414b3f705900704d7891cb88a52c63e7e4cbc1d94a3de4e274fdeb94561f9a1a833f SHA512 e1b7e986e07f7e05d32521d49c04b4fb74787375818e89ac481859a237ba246434f6cd44202cd73d16ad1078b8bea6dfe5d9869ead7d4370f6ffb28d672358d2 EBUILD scylla-tools-2.3.1.ebuild 2233 BLAKE2B 1746e5acc71802c2a65bfbb689e722f86ff3eb3a916f7a847519fcfe5afa460e9fac2bf7fd2a4367d05d034c0aa3988f33a47220a1d9f6ae5e7cf3246c0b6a70 SHA512 9af9137070208ee1f364be831447d5c7ceb22273a9d7581b55164a65111b955714484beb681b86c036cf90c3b353a2b14bc999d2cdb826ba31964ff5a7d434de -EBUILD scylla-tools-3.0.1.ebuild 2439 BLAKE2B 11c0eeb666759f92c84318b6412d678ce16bf2a8573c8ca6d1c218eacc247fe703a263f9fc78a11c6b7fca78c4c96a28869c4de9f0e98f6bbd672a4089f8dc14 SHA512 f768a86071428fc1d76384c3185b628c2e2ac1aed0713006a2b829b5944fa6878519955c43dcf924574860a3c5cbf2c2f97876322ad8087596bfcbd508aad0fe +EBUILD scylla-tools-3.0.2.ebuild 2439 BLAKE2B 11c0eeb666759f92c84318b6412d678ce16bf2a8573c8ca6d1c218eacc247fe703a263f9fc78a11c6b7fca78c4c96a28869c4de9f0e98f6bbd672a4089f8dc14 SHA512 f768a86071428fc1d76384c3185b628c2e2ac1aed0713006a2b829b5944fa6878519955c43dcf924574860a3c5cbf2c2f97876322ad8087596bfcbd508aad0fe EBUILD scylla-tools-9999.ebuild 2259 BLAKE2B f4946dad6610e85795f72eaf0186b8dcc18f12a1673250c7689cd5dd1a581a093f2e07cdb66380969e949920a10da0bc6a015a5d58849018a180890259d7d1a7 SHA512 12a0b0351d420ade531c99ff216d46f97ed6c433c730bbb900798d9a615fdc3ac451b4783f33b4f6d6cd812c98201906301279b94247468730bf9b6369b5b918 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQKTBAEBCAB9FiEE8w+v7jvVmCKLJMsSGjqMicVtYQsFAlxJxFlfFIAAAAAALgAo +iQKTBAEBCAB9FiEE8w+v7jvVmCKLJMsSGjqMicVtYQsFAlxYqM5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYz MEZBRkVFM0JENTk4MjI4QjI0Q0IxMjFBM0E4Qzg5QzU2RDYxMEIACgkQGjqMicVt -YQvxuBAAoYUnIkb1ct0k+B9vYAItTNHGUl+KSo9fQ41avtZ8i5BmIynxv5bvMV9W -/hnswMNlBWD1R9JNi+WS3oj/gYm2J/QdbF3JfMcTSk02/y7u+qwFBzhCBZ9nJ349 -qpIIKh+afAHxVIWLvaApMD/ZNE14tIgyFpBqtUpBWXZ+C5JnTbninZTSQBYDdhGy -asvCjx05tu+GzKdg6Qe4eWYH4j2X5+iHUIwN9Z3pN77rgO/DwtYgN0nRyvLkrcoT -vSdx+68uB0GjewvBi1WEIm/OuvfZ6enyytt4CfjbIRuZEc9Lv3ponfIH7HcW4htc -KQLzB/o4jkHqoCai+AUFL6uDZ4FrVCiwrL4+fHIDaql9BP7XvehRhUIp/dQTZv+F -2OoBLOuseKqCJ+KFitEOt08P99mVMhHDPa8f9jTUgbN2IgiNufDF4d1s7S1Hgg7F -f2alu4mLsc4p4jpAR/od3iYHwSVKjQEuY5neB6bWyLNBQVBBZaFAPnMcD7VctSrV -IjEWtNazeBNHxhnlNKSDkhLJKI2pHL4Ti6Jdykocc2iojAQnepNHMtez55yXZ6on -Yg5fcIWNHGWnqQWNn5gqv3rEuFf88JqwdG1jUWiD6RdypPU7Y8mNFT9zWZ5HuoDp -1Xt3wls5YOz/jUeqjcxOabZ6Fl4hcBws3QkAMVEnX8imacyMyG0= -=I2yn +YQsQcQ/9GMzpD+IuQJE8kY/B7g6HXlra51L991WBXcqI0dIArxEqu+xhdGJswtgM +/SQxzJEsYP+LwiNjm8Z9tQG60qp59jac6AcRNJHhm58xKfo8YJW0sKV6pK+BhlJu +BeoeJfHGYWCOF8fsLLTHaIsvL5AGJ+TxjHU3AreCT6ACgh6RLwiG04ClqQVEtIUF +uQhHzGbaw0frxcmx83i2u+ooDbsNvbOL4ETG3nSRo2IhqYH0HiGV0mLGOp+QtAUy +qD5Qoy3xaBm2zu9y0ZuAhmb2jNdWThoSHYz8KSDJ5y8effFqG0BSOPsgq+q4KN04 +P+I3oSfabwP6Gh1a1nrPCMewOsmRhOzOWf4wpGvhY7iTvPt9pohHbV/2fzhhmtSu +Wl88/dBGx1L1wg99acEwZ5VF9Dk5uvLqz8bmvbr42DGk7hcEExoPVhVMj4rtBbXO +YEiWF8FaE/NC5YjvPzziajwmjAV1x2WKGkynvMKBCSyWqJusNmU7JJkxI4xNewTO +MckdPPkOi2KxyuQF20pmmHv9m89d+8vbits79Zr4y4wK3G2Telm9nApH8Z0868tE +1xCltaeJnHfJJW7tIA4/0Usm+KyBdONNH/gf0UNSQ18838jrfHPDH/3ewbZRGx0c +rzFBLHTo9oJvDdyQtnHWdrCFDtFdBNWEMZHOfnlD/CUvlnsczrc= +=EMnn -----END PGP SIGNATURE----- diff --git a/app-admin/scylla-tools/scylla-tools-3.0.1.ebuild b/app-admin/scylla-tools/scylla-tools-3.0.1.ebuild deleted file mode 100644 index c461c48..0000000 --- a/app-admin/scylla-tools/scylla-tools-3.0.1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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 - https://github.com/krummas/jstackjunit/archive/master.zip -> jstackjunit.zip - " - 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" - -PATCHES=( - "${FILESDIR}/scylla-tools-3.0_rc1-build.xml.patch" -) - -CDEPEND=" - dev-java/antlr:3.5 - >=dev-java/ant-junit-1.9.2 -" -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 - - # 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-3.0.2.ebuild b/app-admin/scylla-tools/scylla-tools-3.0.2.ebuild new file mode 100644 index 0000000..c461c48 --- /dev/null +++ b/app-admin/scylla-tools/scylla-tools-3.0.2.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2019 Gentoo Authors +# 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 + https://github.com/krummas/jstackjunit/archive/master.zip -> jstackjunit.zip + " + 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" + +PATCHES=( + "${FILESDIR}/scylla-tools-3.0_rc1-build.xml.patch" +) + +CDEPEND=" + dev-java/antlr:3.5 + >=dev-java/ant-junit-1.9.2 +" +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 + + # 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 +} -- cgit v1.2.3