summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUltrabug <ultrabug@gentoo.org>2020-02-22 21:46:29 +0100
committerUltrabug <ultrabug@gentoo.org>2020-02-22 21:46:29 +0100
commite023340038dbafe3bed78b14b4899112dbf84d18 (patch)
tree20486684a99075ed1848322d98f2a96640453123
parentdev-db/scylla-bin: disable jmx installation (diff)
downloadultrabug-e023340038dbafe3bed78b14b4899112dbf84d18.tar.gz
ultrabug-e023340038dbafe3bed78b14b4899112dbf84d18.tar.bz2
ultrabug-e023340038dbafe3bed78b14b4899112dbf84d18.zip
dev-db/scylla-bin: add scylla-jmx as a dependency
Package-Manager: Portage-2.3.81, Repoman-2.3.20 Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5 Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
-rw-r--r--dev-db/scylla-bin/Manifest19
-rw-r--r--dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild28
2 files changed, 24 insertions, 23 deletions
diff --git a/dev-db/scylla-bin/Manifest b/dev-db/scylla-bin/Manifest
index bae0fcf..be651c9 100644
--- a/dev-db/scylla-bin/Manifest
+++ b/dev-db/scylla-bin/Manifest
@@ -7,22 +7,21 @@ AUX scylla-jmx.initd 585 BLAKE2B 268f2c97d31f101c6911cd2144f9df6068f8fce706d0056
AUX scylla-server.confd 396 BLAKE2B dc522b308985e51c24449a333d793eaa777a74b8b5594f1ff4a092aae003202791019a255ea478c4e794a83ca0e01d2c49aac3d267501624f461fa3edfe1c41f SHA512 51739cdeedaedb1a73a345ec6a4a2761d29fac1b9cf61f02937559aed43f02112109464254213118d40af1fb7e8491c22f8cb88908c9c88523dfe1b78b8430c7
AUX scylla-server.initd 1020 BLAKE2B 99aaf3d265b507cbcc36a1cc55b9ac9cabb7f1f04c006a4cdd1dae0484d3ab96fa0b6895da29c96c93a2416f954bf3dbc837a4de2faa28c0549a4656b77a19ee SHA512 27e423779b6092e0bd50008633d9e92351c1ccce3d33801196f3c43565409afee310ac0fe627a6ce04296731075fe81a1104c7dc3ca32e15315fd1df3f943db4
AUX scylla.sudoers 162 BLAKE2B 9aa0dce391da1f420a070d73d061452eeba60ad268f13a5bb8c0525d714d27dfa438efa9c6871c916b82ebf56f34c507826315de8b1fadc3d0eb5feae663cbcc SHA512 aabdeb3854eaad4b1cf9037a998cf94b8f55b2011e8f81a1778095b71806d89e217f2025e772c636569f833f7df45108e2e30c2c1e70fdb59acf37e6cdf81485
-DIST scylla-bin-3.2_p202002221144-jmx-package.tar.gz 7676117 BLAKE2B 572d5ce1d0114b136181c01ab0105c4b0d954807a6eea75bae86ce628d6da59250dbd5da6ffac9e68b02fc59d42634df292c0b0a80f845a9f887c5b7b4b7019f SHA512 c1c860e7c6be70f669fad65602ddd715ba0edcb0f8cbf9b8e3fa932b9be9c40afaf69871b138bbbcf0461ea29f743596b9d5fad7bdeee5737373e69e75523980
DIST scylla-bin-3.2_p202002221144-package.tar.gz 1033996280 BLAKE2B 20faa9af84bad4585baef16564fc583bfdfc01a2ea94ffc6e9324fa80b62c625838f46eeeb8a47536c36047640fb68ed738492595c458afb9c2146bdbc070a00 SHA512 f7187c5dd843089a352c607b27efa7ee979dfd10634dc1d5299821ed5d8fa36d65d66f803dd1b5c8addbe6a8e9f7f36ae2d111a86a9e90a2c3514dab4a3435ea
DIST scylla-bin-3.2_p202002221144-python3.tar.gz 34258383 BLAKE2B 85d4467448d23ecfeff7319fb478bbc2f24598aaf5380d5a01cb0b8866caf8fa3eb9196cd03fdd79da9147549a868cd6e6259a337bfa848a57981356a5b2cc48 SHA512 87b29858d9b1c63f98548fb796c4811160dcfdc92071e368c81b23d5db6b266a3d9b2f8cd583e99f1545f10425c4bb0dbb895ae5cf8ca97a7b8434d53ed41c17
-EBUILD scylla-bin-3.2_p202002221144.ebuild 3188 BLAKE2B 7a03799af1cffd6e34a4645543378262a882a08baa8fcf8a51c0f9051e0f3865b8f9b42866595d67e49a8b6d82001f99ffa7a551b1d4647cd12497ecb9247a2e SHA512 1644e3d8367c56eaa5d0ce165f576cd9857f40226a171621e493fd172443e4122a738393e4a96d9605fdb7161647c1383c080d0b58f83f8fd49d9883bc2336e8
+EBUILD scylla-bin-3.2_p202002221144.ebuild 3082 BLAKE2B 0ddc8ad6769aad84e63ee55d98fffa09b932a8c3b10b982077e48ed6b39af4cd2d3473bab0d55691c58a715a77b4fb95fbecf9702eba8242ea501a004dbb1364 SHA512 de822f79484d31237122dbb82bd962ea9f96d75d4c47fba006d0ed546d29c21d916078863633963dfba11eeb51842e9faf2295a36b9d1c319de0c617ffdf3277
MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl5RauBfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl5RkwhfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy8RSQf/eHUxGcMnQWNrmITkgOgUbanYdov5srFQIZa2AQLlU0h+CoRLuN9u2GQ7
-1Jdz3B23xT9kTeHSAae4tqvFvZZGTEYEMDMkAgLSo2FlfU8g+CQQqEhQmh+J1nuu
-EfvLJGh98YZfkv/PJE6KUyQD/7b4bE6ckAGqG7BVvzDHybecjimcOUet36Aung4p
-cpm8pdhd+waTRF9NBQvoirE5y+XcsaUaPm2ZlizHJ8q7KIG2J436MrFoUYxv370/
-ug7O0u3qxyrvrTJSCOFglobl3KCgGQYEI3wWfOwWTbKsNdID+RHLwf/W/b5+HeNE
-cxVKiLW2lqZoyiZeRe1FVMvdytg39Q==
-=9jM8
+dy+wtQgAqbmLDeTXR4OhubApKCW+3rRQu0Gmjgd9nBrGMq2Kfp978+NPP5Hsc62C
+KixSV1IFcsVqJYeANH5RvcJQSTjeSDRpckgrKS7DBUmujBNRv8yksrcTBuqa/7pm
+8rQNX4I9pSknoQ8gBbGO3+5jrNE+aI3R5Z/urUG9tZ7cleMXZvXHjSHStwxCvdD4
+/9B/1lsswJeP7l/itbe0mvCZLV8jhGR1r54B+fQ4n+y9PrKjoGUdnL02XKojGeWb
+swIYKCNnvpIo3iyglp5m1H1gkBWewAAaq3hvRBCxA2QGN1OHcIlJuGjbOcuVBVN3
+UOwybk+jZkCH/nvtUyTiXhB1b2abgg==
+=BzC1
-----END PGP SIGNATURE-----
diff --git a/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild b/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild
index e167863..6557bbb 100644
--- a/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild
+++ b/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild
@@ -5,11 +5,11 @@ EAPI=6
MY_PV="${PV/_p//}"
-inherit linux-info unpacker user
+inherit linux-info user
DESCRIPTION="NoSQL data store using the seastar framework, compatible with Apache Cassandra"
HOMEPAGE="https://scylladb.com/"
-SRC_URI="http://downloads.scylladb.com/relocatable/unstable/branch-${MY_PV}/scylla-package.tar.gz -> ${P}-package.tar.gz http://downloads.scylladb.com/relocatable/unstable/branch-${MY_PV}/scylla-python3-package.tar.gz -> ${P}-python3.tar.gz http://downloads.scylladb.com/relocatable/unstable/branch-${MY_PV}/scylla-jmx-package.tar.gz -> ${P}-jmx-package.tar.gz"
+SRC_URI="http://downloads.scylladb.com/relocatable/unstable/branch-${MY_PV}/scylla-package.tar.gz -> ${P}-package.tar.gz http://downloads.scylladb.com/relocatable/unstable/branch-${MY_PV}/scylla-python3-package.tar.gz -> ${P}-python3.tar.gz"
KEYWORDS="~amd64"
LICENSE="AGPL-3"
@@ -17,7 +17,9 @@ SLOT="0"
IUSE="doc"
RESTRICT="strip test"
-RDEPEND=""
+RDEPEND="
+ >=app-admin/scylla-jmx-3.2
+"
DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-3.5
"
@@ -45,11 +47,11 @@ pkg_setup() {
}
src_unpack() {
- for pkg in package jmx-package python3;
+ for pkg in package python3;
do
mkdir "${pkg}" || die
pushd "${pkg}" || die
- unpacker ${P}-${pkg}.tar.gz || die
+ unpack ${P}-${pkg}.tar.gz || die
find . -type f -name "*.pyc" -delete
popd || die
done
@@ -83,14 +85,14 @@ install_python3() {
popd
}
-install_jmx_package() {
- # TODO: not working with icedtea JVM
- pushd jmx-package
- bash install.sh --root "${D}" --sysconfdir /etc/default || die
- newinitd "${FILESDIR}/scylla-jmx.initd" scylla-jmx
- newconfd "${FILESDIR}/scylla-jmx.confd" scylla-jmx
- popd
-}
+#install_jmx_package() {
+# # TODO: not working with icedtea JVM
+# pushd jmx-package
+# bash install.sh --root "${D}" --sysconfdir /etc/default || die
+# newinitd "${FILESDIR}/scylla-jmx.initd" scylla-jmx
+# newconfd "${FILESDIR}/scylla-jmx.confd" scylla-jmx
+# popd
+#}
src_install() {
install_package