summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUltrabug <ultrabug@gentoo.org>2017-08-11 12:30:22 +0200
committerUltrabug <ultrabug@gentoo.org>2017-08-11 12:30:22 +0200
commit8fdf0d1a60800a3cc670edc833f7577dea5c57da (patch)
tree7342a1dda541a4b79b97a7c2b2a666002e4faba0
parentremove all obsolete distutils based ebuilds wrt #613086 (diff)
downloadultrabug-8fdf0d1a60800a3cc670edc833f7577dea5c57da.tar.gz
ultrabug-8fdf0d1a60800a3cc670edc833f7577dea5c57da.tar.bz2
ultrabug-8fdf0d1a60800a3cc670edc833f7577dea5c57da.zip
scylla: realized that 1.7 does not have the gentoo patches yet... stick with live ebuild for now
-rw-r--r--app-admin/scylla-jmx/Manifest4
-rw-r--r--app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild88
-rw-r--r--app-admin/scylla-jmx/scylla-jmx-9999.ebuild1
-rw-r--r--app-admin/scylla-tools/Manifest4
-rw-r--r--app-admin/scylla-tools/scylla-tools-1.7.4.ebuild89
-rw-r--r--app-admin/scylla-tools/scylla-tools-9999.ebuild1
-rw-r--r--dev-db/scylla/Manifest10
-rw-r--r--dev-db/scylla/scylla-1.7.4.ebuild237
-rw-r--r--dev-db/scylla/scylla-9999.ebuild1
9 files changed, 6 insertions, 429 deletions
diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 31ef205..3c863b2 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -1,6 +1,4 @@
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-1.7.4.tar.gz 96913 SHA256 0b13e8ceeb17e95b690921bd61ac38948440493304f3f6ae386912bcdb4b7435 SHA512 aa9704eb4683f2633b7fc4fa02701049d5554af8c8ca34013819d6c0a8ca308ea71e48b8333e42dad5b25f555d07a40a3c43482b709933da48a5571b0caf1e5c WHIRLPOOL 20c7d68d050eb847ccef5542d28592522be026bd1039fdca84ffc1e13b8426c48ac0f126bf320b392b95476332cf34126eecccfc11ba59ca3cba81c097def00f
-EBUILD scylla-jmx-1.7.4.ebuild 2248 SHA256 ebf6d25dc00af6373672119c510b9f9e76aad90304f6dcaf3bfd33c52d65d1d6 SHA512 68ef5b2e6edbcedcbe522b96983cf928c255d12f3f3b163ef18f6e6ddb5378cbc23a41f5aca16767f5f03c9f85a2ab72b55d326a59d88add39a91f88cd35124e WHIRLPOOL 576b9d0ce5bec15f37d4111a7425e3321d0c794897764385478d1825c99571a38d5841c79914366f107e2d2b83ca1794c68aa8223ea2de3f5475ed26da3dca18
-EBUILD scylla-jmx-9999.ebuild 2248 SHA256 ebf6d25dc00af6373672119c510b9f9e76aad90304f6dcaf3bfd33c52d65d1d6 SHA512 68ef5b2e6edbcedcbe522b96983cf928c255d12f3f3b163ef18f6e6ddb5378cbc23a41f5aca16767f5f03c9f85a2ab72b55d326a59d88add39a91f88cd35124e WHIRLPOOL 576b9d0ce5bec15f37d4111a7425e3321d0c794897764385478d1825c99571a38d5841c79914366f107e2d2b83ca1794c68aa8223ea2de3f5475ed26da3dca18
+EBUILD scylla-jmx-9999.ebuild 2267 SHA256 70680ae370cad1dfc7a87ca78e05bf6905987c4b29a1b093f5d9820df1a92648 SHA512 f96cc056c5e320dda111bb9ecd7375281b12acf71b3d76147da5336f089d69670888f82de257bfec3e8e130cb0dd25e01675c4a875bacfe314b9807c95ab04c8 WHIRLPOOL e0c3b82a0f1e3411ac71de3b0c3be2842365cc371b51c194407b6904b22177488ae405f0b304877118ab059a7f29f39eada94adbb50dd48708d9bd095b9dd85b
MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild b/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild
deleted file mode 100644
index ec6206c..0000000
--- a/app-admin/scylla-jmx/scylla-jmx-1.7.4.ebuild
+++ /dev/null
@@ -1,88 +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
- SRC_URI="https://github.com/scylladb/${PN}/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
- S="${WORKDIR}/scylla-jmx-scylla-${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 ec6206c..c819465 100644
--- a/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-9999.ebuild
@@ -6,6 +6,7 @@ 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"
KEYWORDS="~amd64"
diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index 70075fa..706631a 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,4 +1,2 @@
-DIST scylla-tools-1.7.4.tar.gz 26856201 SHA256 0c42fb22a905dfc4cd707e6ab8e4720a213cd527417b358bdf03df913e09c4c6 SHA512 39b05ff7469cff5ffbd8560a96cfd0f8a1f5b93834aa5044da79fbc4024c70cb302583af57ec270a15ee32136a0b0dd1fa6e6a6ee72e3aa4c9b92f9fab1476a9 WHIRLPOOL 89737f5547ba938db6f90882b44167a9e2fbaf99f110152ae4044b3b2c6c346b149cdbcd53763cab3a30453156c2e67d10b0d1a3097adde26209ea9d2a0feebf
-EBUILD scylla-tools-1.7.4.ebuild 2181 SHA256 c49d27d4c7ccf7b5b36e54a9c984e159f0b4878eebeca04ba181090280e58312 SHA512 4b4d840def46ec906522aab8933cd1503ccddfa2ce0c66f8fc6bec1c0e59de1f9ed5f9e72672b59ff5e2b45dc8da3185fd624e42cedf163e08c8514673e8ca8a WHIRLPOOL aef3410fce450823c8a34a685f0aa0ea43b2d8384e4630a759de8740022243c120840f39bf2e2a22c6dd0b74fc094a4d8da15efb2019b449340b6f3c2cf356dd
-EBUILD scylla-tools-9999.ebuild 2181 SHA256 c49d27d4c7ccf7b5b36e54a9c984e159f0b4878eebeca04ba181090280e58312 SHA512 4b4d840def46ec906522aab8933cd1503ccddfa2ce0c66f8fc6bec1c0e59de1f9ed5f9e72672b59ff5e2b45dc8da3185fd624e42cedf163e08c8514673e8ca8a WHIRLPOOL aef3410fce450823c8a34a685f0aa0ea43b2d8384e4630a759de8740022243c120840f39bf2e2a22c6dd0b74fc094a4d8da15efb2019b449340b6f3c2cf356dd
+EBUILD scylla-tools-9999.ebuild 2200 SHA256 38b2009d2beb8d18d49578052a56c0d655d3b5839a1a75460af39973e6a4ce93 SHA512 8a550209ab78de24e931a8c2bac0027e2303efe7e4cc2d53611152ecc8edced948fc255af606fe58f4f0f0b23a1f9db2e20cc4778ad14707adff84fd91ae6a61 WHIRLPOOL 04fcb509092f6bf85ad5ead7eaaee9590f5fece137d7e862ad6ae069263dab20c52eca9b04014ec08b71978fb9cc0fe0fa5842e7b257cd14b97267264c388a8e
MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/app-admin/scylla-tools/scylla-tools-1.7.4.ebuild b/app-admin/scylla-tools/scylla-tools-1.7.4.ebuild
deleted file mode 100644
index ab3b74c..0000000
--- a/app-admin/scylla-tools/scylla-tools-1.7.4.ebuild
+++ /dev/null
@@ -1,89 +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
- SRC_URI="https://github.com/scylladb/scylla-tools-java/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
- S="${WORKDIR}/scylla-tools-java-scylla-${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 ab3b74c..11e48e0 100644
--- a/app-admin/scylla-tools/scylla-tools-9999.ebuild
+++ b/app-admin/scylla-tools/scylla-tools-9999.ebuild
@@ -6,6 +6,7 @@ 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"
KEYWORDS="~amd64"
diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index 41efa99..2f5bca0 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -1,13 +1,5 @@
AUX 10-scylla.conf 64 SHA256 47a2a3b9d581f289ad5bfaa78f92cc01e7f12ddc6e66ee08ceb27463ec0dbcc5 SHA512 c24b3ec2f0ea3b1ad0792c05a8eb044b3a157862b59759e020586ae872f9789a558d423fe1dff1a8c6d8342049cf4d919faf31a1439a6a1c69af915365b4ec82 WHIRLPOOL 0d5a3cae1ae3f29e77d58c010284c3dcadf556c2a5ec67624c010b18b43b3aac477eab5abe9dd70fdaabba02287a01d56cac65929528fe6541b6c8b268d23cf9
AUX scylla-server.confd 386 SHA256 b0da01117d51478b8cf0e0bc77829c7dab0bd8aeadef100f25ebf098d050b3d0 SHA512 5d3c55933a02d3b16837013b37110f6669c14e01599532f30935b5dc29871a5bed897c9eb01a6e89469eab7d645c9231745a06c2ef827f6700e13c8faa9cdb87 WHIRLPOOL 7c0a17760ae83b34384f17abf81e1cd8e9da54c764102320fe237f74fcf94de9396ca1fd8e6576c72c54d7c504cf6daa54847db548cd7900069bdd972efe5676
AUX scylla-server.initd 964 SHA256 b99672314a6e236939fcb19d37c89f98098e34227ea77ff79cb2ce01873408a8 SHA512 e72b817e8a42d843f6766b0cd25c33b8231efbd223f4ad31bca9a2610f670b3980c1be256343f5e3b0fe0f54ba460713f6db8de92c27cf67653140794299f760 WHIRLPOOL 89c88dddfedbc317046ad441a5a4bd2c3a8dde92ca4e81001da47909a4d05f74eb3296141c2f9fd02f57317a02e286f159c53c4909d3f0e2b0594d5cac1be14c
-DIST c-ares-fd6124c74da0801f23f9d324559d8b66fb83f533.tar.gz 1643982 SHA256 fceaa0d2644e94422e56e66d6198cf391626b4faa3544701ae4684e2d1140c06 SHA512 5848f480574e41dfd44a65085c7141233f1575f650bc704f92ac5f30f1a27f423d26c76969f84d2b27411660909428449c7bc593f756ee9a1f68991318fc961b WHIRLPOOL a9e562c284806b137dfc1925d31acadab12d34db8911da85c88113b4342a327a65436b14e5bd5c908e3ef48f0781851afd84c2df763e0c2bc7711817c7e0c0b6
-DIST dpdk-af56afcd99004edfc9dd53d162ab3dadf1ac03d7.tar.gz 10873177 SHA256 cf1ab6413bbd32a7c52ba0896bc0b1c2672501822802577bad2837bbff654e51 SHA512 7b441a8fc967cf975d53b87f81b59c92b27c9d7f65498d42d2fc09b4a429d5445115da7b14fa3c52a8fc3b97898cf2b7bdf78b3df5e22401fddec07ccf90d362 WHIRLPOOL a4b4f175c8ce448a996886fe62b56a5c3e1821df3d64a9f1b37ea8bcac2675a8bb3fc4f6af81901a78cb32ce403eade1f9daa09ca3c74fad6ab5857f45e79bb2
-DIST fmt-0a2032577d18afa12e426ec9637e81d5dd50a9ac.tar.gz 608445 SHA256 c18b9f2494cc822be3c14ded3e200df4c7814a09fae50b23dd26284de29a553c SHA512 02bcec0484bc688f7deb4246a50cffbcb64a78bbd5dd360fca4300a0282f28433386cce67365144d9279f28911614ce6684036bf44a38777c073c7b1d7a10bdf WHIRLPOOL 4dca07a8b00112f28f19f5a29636ba0b6578098ec88937ada85a2afb3ecc0d79e611003a5a1b78f98c4bdac1bcf225e8cc5c8591e7f095a6adb562e07afdf10c
-DIST scylla-1.7.4.tar.gz 2245888 SHA256 2232bd8c56de69e34adb799eb0bd168afb4248aed51a16cfec14de4458165f40 SHA512 5dde95adccaf1af17968f3311ac11ff5d72437aca54344aad1139cae0bcf3cc59baf49b30f4a1ca43a2f662aa3eb8c2065f65622032c29dc528f8a79f04c255b WHIRLPOOL 1d7851acfc721624651ba88e0d96cb13a04189cac3b7c0961e4f086c753a1f61021b6c8f872eb278d6d8dad7abfe0520ac20c863c4e8b82aaed6f43cd9d0fa46
-DIST scylla-ami-407e8f37cac3dc46bbf50e798efaa96bce072e0a.tar.gz 9479 SHA256 75c67f7ffdfb215cfdfd382630fb7b5b7b84529b5149b32718133c94207fc77d SHA512 4f8262d2282838445a8c926191f97dc5b6dc8a50757e03f6c86df9c27343520864fc96ce06da1a1970b456b9228ddf7af2e9179b6a96565c53e41906c59c1332 WHIRLPOOL 175a1ac4befdfac4622283c49712a628736d1373c98551642993b484f389c1871ab572444eaf9592a9017331fd3ab6654e9c6140f8ff3777da7c9e93dea4ca69
-DIST scylla-seastar-8d9fd92d5dc215b1fef9d3af0630d5929e8ea488.tar.gz 693687 SHA256 0a788b1b59ca9fedf3508896b3b9b5977476d8fef015a4ea42ccac5fa0b8173e SHA512 9b543d8f7bfee58c03aa47d261924cd22e0daabb1ada1369f48e2774e859348dff81da93c09a082ec14b25e7c510c12af0a5e64202198f63c4601788903e1a84 WHIRLPOOL 0d897720b9184de4d1a07119d5bdf8ffebf41a97a130ffabda26c4ded334f475d82940fdd898b786f09c2ea00032d4464e514960be01a72db17d4eb1200342e7
-DIST scylla-swagger-ui-1b212bbe713905aac22af1edb836f5cf8cc39cc2.tar.gz 1372033 SHA256 ea8589de7031945bb9a378708486d0e641ebbfab1c1cedb1a77215437db2ba8b SHA512 c726a4dac73d3e9d16624727f4f0703688b7205783c627dd7b88b688b165c9055a1884cf7e9987d8c235d3fa470578852a951e34819431aec12059988394da99 WHIRLPOOL ca3387d1703bbcc854750d6b67102e16bab185265b762d4fe2ae0a0fbc6f4545ef6ea1495be68a8933b7717f03799fc96ac91715c2472f3806660fff37b7c19c
-EBUILD scylla-1.7.4.ebuild 6861 SHA256 b6ad18d7e817145065194f39ee8d6b90c9fd7329a83d5a10c0b034223940f543 SHA512 f314c8da22646d8350a7f044bb54412e50212dd8fca8dae57d7edb877f4dfb0df49e05f9ccdf2218e73d956d4d54735c7b81daf8d1c2ea95e8d0f6e0ff4abb5d WHIRLPOOL 0786de74ff6062e22502609f05bf2ebb93d4f31015581a52e9d2c1e2397115b5b278c16403701a861a73f99bcaf7ced0cc6fc76bf51109a455933d756bfefaeb
-EBUILD scylla-9999.ebuild 6708 SHA256 6c2105e75c08191cb7167ea6dcce47f05f1de04a25cd183831c3848821376758 SHA512 090f8e0651cea7cdf654e340a2be776302b3f2cabeb599e7e5857e44ba612a0a83dc27ef21f198d93cd254b047d86f4a236b5ba614e5eee3cbb4df3902f5da6e WHIRLPOOL 9c5e06b08c77ca0a3a2486a1fcb7ed8d196749670bb56a777f160032519b97fc57ddbe50a536dece522db74846644d2629f8e967889cdfd87a7019e4d1bd910b
+EBUILD scylla-9999.ebuild 6727 SHA256 6eaf45fe1e01933624de74694e44a3010cdab0308e129e06e1df2cc564cb280d SHA512 87adc92a90f65f660b3560e36899f4f9d980bd119a43fd04d69e26040d43776800b29a1221b13e640e77197f36190b6883b57eeaf515e1a731163a7c1271ae2d WHIRLPOOL da5b44c15538f5363ac5b2bb56665eb29e45e61ed3e2a04cb5126a2701daa390f9f63a760795368e8b867946621089ca422ba306021e52669631727afb9bc9f9
MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
diff --git a/dev-db/scylla/scylla-1.7.4.ebuild b/dev-db/scylla/scylla-1.7.4.ebuild
deleted file mode 100644
index 301a1ec..0000000
--- a/dev-db/scylla/scylla-1.7.4.ebuild
+++ /dev/null
@@ -1,237 +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.git"
- inherit git-r3
-else
- AMI_COMMIT="407e8f37cac3dc46bbf50e798efaa96bce072e0a"
- C_ARES_COMMIT="fd6124c74da0801f23f9d324559d8b66fb83f533"
- DPDK_COMMIT="af56afcd99004edfc9dd53d162ab3dadf1ac03d7"
- FMT_COMMIT="0a2032577d18afa12e426ec9637e81d5dd50a9ac"
- SEASTAR_COMMIT="8d9fd92d5dc215b1fef9d3af0630d5929e8ea488"
- SWAGGER_COMMIT="1b212bbe713905aac22af1edb836f5cf8cc39cc2"
- SRC_URI="
- https://github.com/scylladb/${PN}/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/scylladb/scylla-seastar/archive/${SEASTAR_COMMIT}.tar.gz -> scylla-seastar-${SEASTAR_COMMIT}.tar.gz
- https://github.com/scylladb/scylla-swagger-ui/archive/${SWAGGER_COMMIT}.tar.gz -> scylla-swagger-ui-${SWAGGER_COMMIT}.tar.gz
- https://github.com/scylladb/dpdk/archive/${DPDK_COMMIT}.tar.gz -> dpdk-${DPDK_COMMIT}.tar.gz
- https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz
- https://github.com/scylladb/c-ares/archive/${C_ARES_COMMIT}.tar.gz -> c-ares-${C_ARES_COMMIT}.tar.gz
- https://github.com/scylladb/scylla-ami/archive/${AMI_COMMIT}.tar.gz -> scylla-ami-${AMI_COMMIT}.tar.gz
- "
- KEYWORDS="~amd64"
- S="${WORKDIR}/scylla-${P}"
-fi
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools linux-info python-r1 toolchain-funcs systemd user
-
-DESCRIPTION="NoSQL data store using the seastar framework, compatible with Apache Cassandra"
-HOMEPAGE="http://scylladb.com/"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="doc systemd"
-
-RESTRICT="test"
-
-RDEPEND="
- app-admin/collectd
- app-arch/lz4
- =app-admin/scylla-tools-${PV}
- =app-admin/scylla-jmx-${PV}
- app-arch/snappy
- dev-cpp/antlr-cpp:3.5
- dev-cpp/yaml-cpp
- dev-java/antlr:3.5
- dev-libs/boost
- dev-libs/crypto++
- dev-libs/jsoncpp
- dev-libs/libaio
- dev-libs/libxml2
- dev-libs/protobuf
- =dev-libs/thrift-0.9.1
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyudev[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- <dev-util/ragel-7.0
- dev-python/urwid[${PYTHON_USEDEP}]
- dev-util/systemtap
- net-libs/gnutls
- net-misc/lksctp-tools
- sys-apps/hwloc
- sys-fs/xfsprogs
- sys-libs/libunwind
- sys-libs/zlib
- sys-process/numactl
- x11-libs/libpciaccess
- systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-3.5
- dev-util/ninja
-"
-
-# Discussion about kernel configuration:
-# https://groups.google.com/forum/#!topic/scylladb-dev/qJu2zrryv-s
-# For DPDK, removed HUGETLBFS PROC_PAGE_MONITOR UIO_PCI_GENERIC in favor of VFIO
-CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE ~VFIO"
-ERROR_NUMA_BALANCING="${PN} recommends support for Memory placement aware NUMA scheduler (NUMA_BALANCING)."
-ERROR_SYN_COOKIES="${PN} recommends support for TCP syncookie (SYN_COOKIES)."
-ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage (TRANSPARENT_HUGEPAGE)."
-ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
-
-DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md README-DPDK.md )
-PATCHES=()
-
-pkg_setup() {
- linux-info_pkg_setup
- enewgroup scylla
- enewuser scylla -1 -1 /var/lib/${PN} scylla
-}
-
-src_prepare() {
- default
-
- # replace git submodules by symlinks
- if [[ ${PV} == "9999" ]] ; then
- # set version
- local git_commit=$(git log --pretty=format:'%h' -n 1)
- echo "${PV}-${git_commit}" > version
- else
- rmdir seastar || die
- mv "${WORKDIR}/scylla-seastar-${SEASTAR_COMMIT}" seastar || die
-
- rmdir seastar/dpdk || die
- mv "${WORKDIR}/dpdk-${DPDK_COMMIT}" seastar/dpdk || die
-
- rmdir seastar/c-ares || die
- mv "${WORKDIR}/c-ares-${C_ARES_COMMIT}" seastar/c-ares || die
-
- rmdir seastar/fmt || die
- mv "${WORKDIR}/fmt-${FMT_COMMIT}" seastar/fmt || die
-
- rmdir swagger-ui || die
- mv "${WORKDIR}/scylla-swagger-ui-${SWAGGER_COMMIT}" swagger-ui || die
-
- rmdir dist/ami/files/scylla-ami || die
- mv "${WORKDIR}/scylla-ami-${AMI_COMMIT}" dist/ami/files/scylla-ami || die
-
- # set version
- echo "${PV}-gentoo" > version
- fi
-
- # fix slotted antlr3 path
- sed -e 's/antlr3 /antlr3.5 /g' -i configure.py || die
-
- # fix jsoncpp detection
- sed -e 's@json/json.h@jsoncpp/json/json.h@g' -i json.hh || die
-
- # fix systemd service config path
- mkdir build || die
- cp dist/common/systemd/scylla-server.service.in build/scylla-server.service || die
- sed -e "s#@@SYSCONFDIR@@#/etc/sysconfig#g" -i build/scylla-server.service || die
-
- # fix seastar -Werror crashing build
- # sed -e 's/ -Werror//g' -i seastar/configure.py || die
-
- # run a clean autoreconf on c-ares
- pushd seastar/c-ares
- eautoreconf || die
- popd
-}
-
-src_configure() {
- # TODO: --cflags "${CFLAGS}"
- ./configure.py --mode=release --with=scylla --enable-dpdk --disable-xen --compiler "$(tc-getCXX)" --ldflags "${LDFLAGS}" || die
-}
-
-src_compile() {
- # force number of parallel builds because ninja does a bad job in guessing
- # and the default build will kill your RAM/Swap in no time
- ninja -v build/release/scylla build/release/iotune -j4 || die
-}
-
-src_install() {
- default
-
- insinto /etc/default
- doins dist/common/sysconfig/scylla-server
-
- insinto /etc/security/limits.d
- doins dist/common/limits.d/scylla.conf
-
- insinto /etc/collectd.d
- doins dist/common/collectd.d/scylla.conf
-
- insinto /etc/scylla.d
- mv conf/housekeeping.cfg dist/common/scylla.d/
- doins dist/common/scylla.d/*.conf
-
- insinto /etc/sysctl.d
- doins dist/common/sysctl.d/*.conf
-
- insinto /etc/modprobe.d
- doins dist/common/modprobe.d/*
-
- insinto /etc/scylla
- doins conf/*
-
- systemd_dounit build/*.service
- systemd_dounit dist/common/systemd/*.service
- systemd_dounit dist/common/systemd/*.timer
-
- newinitd "${FILESDIR}/scylla-server.initd" ${PN}-server
- newconfd "${FILESDIR}/scylla-server.confd" ${PN}-server
-
- exeinto /usr/lib/scylla
- doexe dist/common/scripts/*
- doexe seastar/scripts/*
- doexe seastar/dpdk/tools/dpdk-devbind.py
- doexe scylla-blocktune
- doexe scylla-housekeeping
-
- dobin build/release/iotune
- dobin build/release/scylla
- dobin dist/common/bin/scyllatop
-
- dodoc -r licenses
-
- insinto /usr/lib/scylla/swagger-ui
- doins -r swagger-ui/dist
-
- insinto /usr/lib/scylla/api
- doins -r api/api-doc
-
- insinto /usr/lib/scylla/scyllatop
- doins -r tools/scyllatop/*
- fperms +x /usr/lib/scylla/scyllatop/scyllatop.py
-
- for util in $(ls dist/common/sbin/); do
- dosym /usr/lib/scylla/${util} /usr/sbin/${util}
- done
-
- for x in /var/lib/${PN}/{data,commitlog,coredump} /var/lib/scylla-housekeeping /var/log/scylla; do
- keepdir "${x}"
- fowners scylla:scylla "${x}"
- done
-
- insinto /etc/sudoers.d
- doins dist/debian/sudoers.d/scylla
-
- insinto /etc/rsyslog.d
- doins "${FILESDIR}/10-scylla.conf"
-}
-
-pkg_postinst() {
- elog "You should run 'emerge --config dev-db/scylla' to finalize your ScyllaDB installation."
-}
-
-pkg_config() {
- elog "Running 'scylla_setup'..."
- scylla_setup
-} \ No newline at end of file
diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild
index 216a824..7c08387 100644
--- a/dev-db/scylla/scylla-9999.ebuild
+++ b/dev-db/scylla/scylla-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=6
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/scylladb/scylla.git"
inherit git-r3
+ KEYWORDS="~amd64"
else
AMI_COMMIT=""
C_ARES_COMMIT=""