dev-db/scylla: bump to version 2.3.0

4 files changed, 10 insertions, 10 deletions

diff --git a/app-admin/scylla-jmx/Manifest b/app-admin/scylla-jmx/Manifest
index 96a7b9c..a469109 100644
--- a/app-admin/scylla-jmx/Manifest
+++ b/app-admin/scylla-jmx/Manifest
@@ -1,6 +1,6 @@
 AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6f5a51c9f6656cf0f989c133e8e45b221991800fcc79fd1505b037410dde7d5dfffdf75e0ee6670090 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402
 AUX scylla-jmx.initd 592 BLAKE2B e1492a3da5ab275fbe6f7f1f4f9beaa3129f037fa54523211a8628d479e196a2da711c41c8051416612d34322c3261e95c3370525e68c84eb80c98ac0949ab69 SHA512 8bf35201a2dd240b1e74d35c3153251f2c15878f2454a8ed05f006ad35679a85d08de413dc8ce8b53aaa2b8e367a806a76d56d63d9b691f4bac569b647764037
-DIST scylla-jmx-2.2.0.tar.gz 98666 BLAKE2B bb024576bf3eff4188b4aa8654932cb6521ff492f4d227c43b810c70b0df26ea7a76ec8eacadb1d82c1d79e1ee887b03ab12ad55b4fb3bddcc0dccfaeefcdfd0 SHA512 b1bd6906930504d887a804c81af748318e0e84482669ef69b8ed795d7047e66064eb6d69bc2fd786c303252ca78599e23b483b1c740e00540e34d932afde7f83
-EBUILD scylla-jmx-2.2.0.ebuild 2355 BLAKE2B f8001c2f7f4c06ec1012d50449294eff4bf3307bfd5439baecc921c7d925324a1c136ef46eb3fe0b0988e9f9582c493819625b9659b334ca5297c21afc7995af SHA512 1e8c37dfdd7bd3fa7c2558d23e1659c65dfccce50d40ab20bdf11794a87e99a5ff6187269dae86922596ca196d0729897147114b9c7060867bea0b6653422d49
+DIST scylla-jmx-2.3.0.tar.gz 103133 BLAKE2B 4ccac783156e0fcc0c9e24e7e5a949db2aac6a5f60ad0335b66242969063a9c5795164f6b862fcbc731da8fdc22525adcd2f7a59e3961c1fa06556e79d2f8575 SHA512 3fc158daf11625ecf2cd600b05d08f3f1457a8db6d2feb52c3ab55616976f6c24ad7129186bee143b5889b5ad31ab2a985d0cb1fbabb8b9266d876fe1a94214b
+EBUILD scylla-jmx-2.3.0.ebuild 2303 BLAKE2B 938bff52beba93b9a8b22e1fb7fc470ad44ec0140393b0e62753b80fa204d1c5e2d309e5ae820044f45e36bda95b9f05565e057413dc47615551a3f1dba920f5 SHA512 227f871e5620956f0070a83a3d18d4f2e703160df46de7fca5b63c3742291d342ba6d71d5cc81adbaacaea56d4e7315acc99b707840be852fe54092d7d0e3471
 EBUILD scylla-jmx-9999.ebuild 2354 BLAKE2B 2dcb7c649f9ed55001cd7c9367911403de1f1afdf05db92d1df9dc32918c073ba775e74b1b0d093c828e38265024ba6ddcd2cd08a4a60353caa56830ec8b3004 SHA512 29120858692d1404b4a277cd0d807137a7a35d047be4ae5cca521b6d152582a79dce4a45e4189530b6300d54eb53a40e0a8f39ff62ffb1c88386299242f785ab
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild b/app-admin/scylla-jmx/scylla-jmx-2.3.0.ebuild
index 001ec6f..9c936ee 100644
--- a/app-admin/scylla-jmx/scylla-jmx-2.2.0.ebuild
+++ b/app-admin/scylla-jmx/scylla-jmx-2.3.0.ebuild
@@ -35,7 +35,8 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.8"
+	>=virtual/jdk-1.8
+	dev-python/pystache[${PYTHON_USEDEP}]"
 
 RESTRICT="test"
 
@@ -47,10 +48,6 @@ pkg_setup() {
 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
@@ -79,7 +76,10 @@ src_install() {
 
 	newinitd "${FILESDIR}/scylla-jmx.initd" ${PN}
 	newconfd "${FILESDIR}/scylla-jmx.confd" ${PN}
-	systemd_dounit dist/common/systemd/*.service
+
+	local MUSTACHE_DIST="\"debian\": true"
+	pystache dist/common/systemd/scylla-jmx.service.mustache "{ $MUSTACHE_DIST }" > scylla-jmx.service
+	systemd_dounit scylla-jmx.service
 }
 
 pkg_postinst() {
diff --git a/app-admin/scylla-tools/Manifest b/app-admin/scylla-tools/Manifest
index a90b9a2..e10105e 100644
--- a/app-admin/scylla-tools/Manifest
+++ b/app-admin/scylla-tools/Manifest
@@ -1,4 +1,4 @@
-DIST scylla-tools-2.2.0.tar.gz 26860019 BLAKE2B f06311a5faae7ca9d03a073e18e3a1db21d35910a4edd1ac06e28a42710d605acd5cdf99735e5c9055940defaffa8be06e4b82089225f14bb396a12b1b14f597 SHA512 a7fda34bcfe60eabc741de8cae4f50bada2d59510d9ddb4a030f95fe05b352eaea7d496dac39e9c8f1a45d877f14e36b41e01448cfb8573ca0acedf6bf1a1a4f
-EBUILD scylla-tools-2.2.0.ebuild 2236 BLAKE2B c86eb2302015b4ef80d18c96edc527751d18039aace4d1f72526d62a642c63fd9a2a21db8fafd57ac75a172bc29d27cc1a9607b0a43cf40b0714d437ed8e1a1c SHA512 b7292387fb742f1a49ba4526b9d33d7b09a1d4d26a63f546ceceb325e2fb9ab45b1bc8f1d0671ee6bba67f726bb56225894a35acb0c26d99f1ce3c787d6441e5
+DIST scylla-tools-2.3.0.tar.gz 26861426 BLAKE2B bba08b98cf499ae74e80a72c0a6e17bb7e8ce8e45800d1f9bd9ecd9d63c157b8ccf95f654febfc42e003d20e0bd702fddd80b46848202fd47caaa636c8aa56d5 SHA512 348817cf08fa2b55fabd8360725a95bbb139b2758137cca95bb4733dcb3f4d1224a7aa705d508ecf11012bb68cbba868fbab2b4c1b78ea6b6ead2f4455b2a6fd
+EBUILD scylla-tools-2.3.0.ebuild 2236 BLAKE2B c86eb2302015b4ef80d18c96edc527751d18039aace4d1f72526d62a642c63fd9a2a21db8fafd57ac75a172bc29d27cc1a9607b0a43cf40b0714d437ed8e1a1c SHA512 b7292387fb742f1a49ba4526b9d33d7b09a1d4d26a63f546ceceb325e2fb9ab45b1bc8f1d0671ee6bba67f726bb56225894a35acb0c26d99f1ce3c787d6441e5
 EBUILD scylla-tools-9999.ebuild 2236 BLAKE2B 8b39c7cb5f595ef2b1d1269cfc9e5e70616d265f4c8fb48a1a2044248d7f0351e75fd0a86657fd272848c4e38f7c9a83967129d9190bfca61ce35bc5c2d8f93b SHA512 4f521a960fccc072a4c570eac9ad96946bbc3f6bbaff0158aa15bd0bc86cc315fb83d1331548a8f28478f251fc7845a9b16fe4532e5d76452ec3d456351bf216
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
diff --git a/app-admin/scylla-tools/scylla-tools-2.2.0.ebuild b/app-admin/scylla-tools/scylla-tools-2.3.0.ebuild
index 9d41e14..9d41e14 100644
--- a/app-admin/scylla-tools/scylla-tools-2.2.0.ebuild
+++ b/app-admin/scylla-tools/scylla-tools-2.3.0.ebuild