11 files changed, 185 insertions, 38 deletions
diff --git a/dev-db/scylla-bin/Manifest b/dev-db/scylla-bin/Manifest
index cec659d..dc058c2 100644
--- a/dev-db/scylla-bin/Manifest
+++ b/dev-db/scylla-bin/Manifest
@@ -2,10 +2,10 @@
 Hash: SHA256
 
 AUX 10-scylla.conf 64 BLAKE2B 31ce1b2173214bcac351b71cf19e5506ab08cefbca446ce23ad753c98c5e4fd7fbb89b0f79703ea4dcf1f6233e7929268365eeaab1b4e2e7b31553aa7928a969 SHA512 c24b3ec2f0ea3b1ad0792c05a8eb044b3a157862b59759e020586ae872f9789a558d423fe1dff1a8c6d8342049cf4d919faf31a1439a6a1c69af915365b4ec82
-AUX scylla-jmx.confd 243 BLAKE2B a056f7c70df3ff6c903a182f352aa34ca9d23eed458b7c6f5a51c9f6656cf0f989c133e8e45b221991800fcc79fd1505b037410dde7d5dfffdf75e0ee6670090 SHA512 18b5f550c2e0616f4c0da123adfda3fb959bec5711b6be57df3e316613cfa154467353e65504b6b68852911f8faa21f1acccf3fa51970a132b639c1e6d1ea402
-AUX scylla-jmx.initd 585 BLAKE2B 268f2c97d31f101c6911cd2144f9df6068f8fce706d005698c208d862936435e5d8d80527bdf676611ef7c976d8e6bded890ff2c30a3d4cc6d8b0c49db6299d1 SHA512 b1104bb8bfb1d276c21d5865e7aacf1ba64cc509d40efee88fc4c8ebb9a1be5dbf343b8d68b1c977dd0ad66bcd63a4ff60c5a3a34092ab45b0eae28871869bae
+AUX scylla-jmx.confd 219 BLAKE2B 0fba44d1256d11ab0ce3fbfcec3fb63c05038233fbc5c415315dbf3395858a2338afd87e958b56835d7f29251cd1a74adb93a76936cbfc740cc2ab6e40d719bf SHA512 9f5964a2e076b62db1e84c42aafda0f3cb6f1639c0269adadcfb947d427af9757656a3a2d50f13f775e54ee376669cc627dabd8035513a2f7f4bffbc45d574c4
+AUX scylla-jmx.initd 605 BLAKE2B 25d81b38782ec9b704b9643f52f05ca33a92c2e70334cf3594a860afc2202c295c465e0e3ceddd33ab76b091394429fe1f21438dc237f1e8b584d0143ac4c979 SHA512 a8e3372e0d74c6f071d37ae154479bf7e63122f4508b8cba4791c7bf37613ca373a4df7e873b3a5e65ee3069455c14359c6c68c0499f9aad636a1582ba87bde4
 AUX scylla-server.confd 396 BLAKE2B dc522b308985e51c24449a333d793eaa777a74b8b5594f1ff4a092aae003202791019a255ea478c4e794a83ca0e01d2c49aac3d267501624f461fa3edfe1c41f SHA512 51739cdeedaedb1a73a345ec6a4a2761d29fac1b9cf61f02937559aed43f02112109464254213118d40af1fb7e8491c22f8cb88908c9c88523dfe1b78b8430c7
-AUX scylla-server.initd 1113 BLAKE2B e8cfc55773c66ab14d6f9eb98df03b763fcf63bb419a33c2c7cf725042a097f6a0d270504d91a12ed92c7e2fcb080c594949c809469180922487cdfba9326991 SHA512 e609c63a810f28a6acbe5597dfd3e719cde72c82ec9e81b6fd12d2c5704f8662e109ffe7f410a9b2f445cf9c8a197af52ef230fbfcbfb4df41cf83d614166d24
+AUX scylla-server.initd 1130 BLAKE2B eae62c3e4ebad1342401e5d37b28ab3eeb581e8b73e96b27f16da2786c62ef65403ba79e522a8d0d83d5da4e51e9735d76581abd577a25ae439bfbd7ed485421 SHA512 7f893e969e8caf310d8c0ab97361ed6a483c11a0acb4062934691d7e0723ae19f5601a3d3939fdd152c452a9c7431d58812283491edb660cc669a4ad725ca7f4
 AUX scylla.sudoers 162 BLAKE2B 9aa0dce391da1f420a070d73d061452eeba60ad268f13a5bb8c0525d714d27dfa438efa9c6871c916b82ebf56f34c507826315de8b1fadc3d0eb5feae663cbcc SHA512 aabdeb3854eaad4b1cf9037a998cf94b8f55b2011e8f81a1778095b71806d89e217f2025e772c636569f833f7df45108e2e30c2c1e70fdb59acf37e6cdf81485
 DIST scylla-bin-3.1_p259-package.tar.gz 1112368776 BLAKE2B 593f9bed2cccf1dacdc79eb309f5f6533d6c15ae9f34198835283bd4cbefaa6241dcbb11b161e24d031a912a121e11cba65eb2952e0df5d544c5febec105e272 SHA512 edd96df8ee8035a48876750bd2e380f03e51b58dc4a81e262bad2bf32d8f6dcd8aaf9de94c6d9501782470a7928d378ec239e4880d9583052dd5ca81fb791712
 DIST scylla-bin-3.1_p259-python3.tar.gz 29292188 BLAKE2B 169a67b487244b2a391aacc995155a749b0746cfbd342c387423106abda4f361a45a7d5bfbba020e1f32014ead148d5363c4c58bb35eb6147f992b7040ff17c4 SHA512 5883c34c79d8e09ecbefa612c37875383cb4e45d429599a5b0b74a048fd93fc4a672d7b9a2335eb0fefdc05d08edc5a0a72dc2d3fb77485dd1146fd48899936b
@@ -17,26 +17,33 @@ DIST scylla-bin-3.2_p202002221144-package.tar.gz 1033996280 BLAKE2B 20faa9af84ba
 DIST scylla-bin-3.2_p202002221144-python3.tar.gz 34258383 BLAKE2B 85d4467448d23ecfeff7319fb478bbc2f24598aaf5380d5a01cb0b8866caf8fa3eb9196cd03fdd79da9147549a868cd6e6259a337bfa848a57981356a5b2cc48 SHA512 87b29858d9b1c63f98548fb796c4811160dcfdc92071e368c81b23d5db6b266a3d9b2f8cd583e99f1545f10425c4bb0dbb895ae5cf8ca97a7b8434d53ed41c17
 DIST scylla-bin-3.2_p202003162053-package.tar.gz 1034202869 BLAKE2B ca68cbfebe56976ce4a4034b5a059b439f7eca6a23745425b75560d201d916901d5bdc104d03e1b2ecec589537bdc5b53b2f2ebb0f1693f3f4c2cea4e2b3c7d3 SHA512 a24fcb1bd80503d2980885ddf2a47a098a146da4dd2ec5b4f53ca9bd5d6684ca032e4cff1927e70d0725160dedcc49b3e19712ea871d90cd8019c5554f319c02
 DIST scylla-bin-3.2_p202003162053-python3.tar.gz 34293296 BLAKE2B e3b326b655b5bc6f35fe020b88561bee5193818fc265581725526fe7144581cea153a529c10abd489a8e69862af6f811bc963cb86e66b638bcb9d341cb62200b SHA512 0d965b2a10e4b7d6f448321cef051a2db1e9af413b7cd2a653857f769931f27e51b8f39d95278498aa86d8cdc15c939b194659247d27529decdd1dabdf68fdab
+DIST scylla-bin-3.2_p202004222203-jmx.tar.gz 7676018 BLAKE2B 9583f925f7c470e5d3c29ef6f4b125cbe65f55946e540245efaecb1c58552c15fa74028f4d7d303f04a9d6497a746c85a0697784e61b5d54a2568f27aa2033e7 SHA512 ab37f737465b137bb6a6ebdcc9ffaf0b847841bb107075c53ed1e04c9dd73375a99ccda7159b9f51500a13c27492f314e6221f15754dcfab05bddc9352063c27
 DIST scylla-bin-3.2_p202004222203-package.tar.gz 1034049721 BLAKE2B 6c25f519cd8d68fc5c57c15eb72dbf0e6024badc03f5c3269c0b7996a23daf301f556371cfc7eb059e318b7ed4b1deeb2274ea8ca405b3d8ff68598a6891c123 SHA512 0a95c282dcc80727ffd36ad20ed54e4cbffbc9062c27ba114da1eae47289615b9506ecc5ffd6f086115fe5a979d4622714384b18bfcc6dff6cdbb8c268cfede6
 DIST scylla-bin-3.2_p202004222203-python3.tar.gz 34294614 BLAKE2B 34035d5d72c36c275bcf29b157717c87cfa9d41585bac05df8062cafe9ce00a17bca1c6a1cfad5f58877e89f01a84c2424f035482ca057c04a8b3970dab6ed4f SHA512 39a6ab5e3711f82b6584cbf8ea2952f47b2e25dfe5bdcaa3b31894cde91c7674f207f9172ecc4e607e6c45a494ef4349eb53cbc389eda2e80dd5fced0434af5e
-EBUILD scylla-bin-3.1_p259.ebuild 3576 BLAKE2B c518749676fe53d03aeb42ad7e2523af94bae6aac778f45f69831decde56222dafb8291b7bc7f78361c2003086005a0fd5e61b085f7040b5fea66bbf7e4fc583 SHA512 e2d5801bfa4e8e1231cabe3ef9832f5299ec06209aa077186d4a1022aa8c6bba493691dcc23ac7c81f3244a08b0a10464476a9a05a8c0b1b1b870fd90f030995
-EBUILD scylla-bin-3.1_p263.ebuild 3576 BLAKE2B c518749676fe53d03aeb42ad7e2523af94bae6aac778f45f69831decde56222dafb8291b7bc7f78361c2003086005a0fd5e61b085f7040b5fea66bbf7e4fc583 SHA512 e2d5801bfa4e8e1231cabe3ef9832f5299ec06209aa077186d4a1022aa8c6bba493691dcc23ac7c81f3244a08b0a10464476a9a05a8c0b1b1b870fd90f030995
-EBUILD scylla-bin-3.1_p999.ebuild 3528 BLAKE2B 434132bb9ce41486b9b6812e914104922a775542315138cbfae9f7a926de1139367ff3b57aa0f82cb227014c141ba7e5c1e90743d60881d1ec46aea3fb7d5f9a SHA512 68f42cac52b9f77c319585213eb50d520d6cb934402338a5c693dfd42dcfb33a212b99f39c92127b8b67098cc0a2ca78acd44187b59a9b60d99d6ede859eb2de
-EBUILD scylla-bin-3.2_p202002221144.ebuild 3149 BLAKE2B 31aa2fbb0c57e2481813beb96c384d863014da40b68da3f2d2dba10e980c0c5e1b03d10afd24d7f06a4b41a98eec39528fb31c2d76ffd8ae92fa2689822cb528 SHA512 87468eb7519857586c2948eb7555a427e4a790d8072f9975566f46eff9726edf1d31b2d4f69c7e601022ffaba40939a8ca2a64080471053cbcb03061aa6c1467
-EBUILD scylla-bin-3.2_p202003162053.ebuild 3149 BLAKE2B 31aa2fbb0c57e2481813beb96c384d863014da40b68da3f2d2dba10e980c0c5e1b03d10afd24d7f06a4b41a98eec39528fb31c2d76ffd8ae92fa2689822cb528 SHA512 87468eb7519857586c2948eb7555a427e4a790d8072f9975566f46eff9726edf1d31b2d4f69c7e601022ffaba40939a8ca2a64080471053cbcb03061aa6c1467
-EBUILD scylla-bin-3.2_p202004222203.ebuild 3149 BLAKE2B 31aa2fbb0c57e2481813beb96c384d863014da40b68da3f2d2dba10e980c0c5e1b03d10afd24d7f06a4b41a98eec39528fb31c2d76ffd8ae92fa2689822cb528 SHA512 87468eb7519857586c2948eb7555a427e4a790d8072f9975566f46eff9726edf1d31b2d4f69c7e601022ffaba40939a8ca2a64080471053cbcb03061aa6c1467
+DIST scylla-bin-3.2_p202004222203-tools.tar.gz 32518600 BLAKE2B af84e4439a56b976f7bf367593de9d56ac63a0eb613ed9ea231df301cc4ba484e4702d59413f80bbd8bc9e5ab6f3ec408ed3f2a154d1f23a7fb684ca9b56ab8c SHA512 0acbde80c5ad7317341082d84269cd5f57975b43cfa2edb15d1d5fa41628a8375ff79964d01b6cf6454ee200b68a5b2d41f14527371b7265d39ea75e952f9d62
+DIST scylla-bin-4.1.3-jmx.tar.gz 7676083 BLAKE2B 5bcac8ef7d5dd91e87e77eac55ad0112397b5b0bfbce19f60d906bc3c56d1b0d265601599d59a2f0b122beb018168b78ff574e07c6af9ba91cda484e54c69608 SHA512 78ece03ff4aaeb19ed43f7c489c5c09f129a0d946342cd5900e67de2b2415e08513539f7a35bf73f249a98d2dbabbbeee9f74ffd454c5395a16161e03b532b59
+DIST scylla-bin-4.1.3-package.tar.gz 805676832 BLAKE2B 6e8a00d49b80130cfd793d03d26a7992c002728a1496d68709053321164edd907bd3de2dc0e2686c0c560d5e971d28603dc35d835c2070686745b5a8c5c64b28 SHA512 01416e38bec7167f7a53173d618e1a0bc72e252f26878ae9c38e2cb480a77234372aa70ad412323ad3697e5aea6dd78f3a7cb68f8f28839bcb790611b603b637
+DIST scylla-bin-4.1.3-python3.tar.gz 36105535 BLAKE2B 3d36bda21eb4ba07838e0e1c43c2831496e6b337037def241a0c3209b88711b5a690ffef33f9e114d31ba835d9832dcf6f156868c483b010f79a3adb4174edd5 SHA512 16f75c5b26ad1d8b28b06704608e9537e9364f1d55bee48187b525ed77da2781b8e8daa8d0f2ee16a3a6125b6900bd8c5f83949e75c3d99fffed8f9684aab286
+DIST scylla-bin-4.1.3-tools.tar.gz 33860192 BLAKE2B 02239d1b2f2275395cf15197efe69b1fb72b481b06058a7b3be2354db6c76e37d61340566d2f90e3fb0cebbfb8e5ef1e235342e8aad6b50f7ca7d10f53110020 SHA512 a73c120557ef7678867612e5cdc2eeb4f981c6d68a1751b80f99e77dfd1fe7d2b12a3aa1cf74aee2b42d6ce2a161e9979b246511ec87819098555575d5a6d1cd
+EBUILD scylla-bin-3.1_p259.ebuild 3555 BLAKE2B 77b1167f8dbe1c53b005b908b509eb7854c51e4474401711c5ecb8cb02e3bdc7340013b4efad05e6f93b4fd6dd875cd8de352e1c41daddc6c0c9fb9d1113c2f8 SHA512 42cdab4202bd8591f04d7c23be6907c1eb6656d4c902626782daa47588dad2e98003d6398469bc4b913656f7cb26ce2231da817fa8ef76ba0bbe5151891db521
+EBUILD scylla-bin-3.1_p263.ebuild 3555 BLAKE2B 77b1167f8dbe1c53b005b908b509eb7854c51e4474401711c5ecb8cb02e3bdc7340013b4efad05e6f93b4fd6dd875cd8de352e1c41daddc6c0c9fb9d1113c2f8 SHA512 42cdab4202bd8591f04d7c23be6907c1eb6656d4c902626782daa47588dad2e98003d6398469bc4b913656f7cb26ce2231da817fa8ef76ba0bbe5151891db521
+EBUILD scylla-bin-3.1_p999.ebuild 3507 BLAKE2B fba692ca9d6c521f2a26843aaf1ca5dda81e7b9dda127687880bc0cbefbdfd725a003adf99892a4778eee3c83f4230c2effd851f893a49c285a45ef08b406ff3 SHA512 3abf3ed8d49318cd52b64211917f9b657c409122ca9183d6a57b7fa58f67ca476eca0bc56d1c0313601d266627b8c2f504df2bdfb51d76c4c9afb8f4b3444ce3
+EBUILD scylla-bin-3.2_p202002221144.ebuild 3128 BLAKE2B 3c43d9d9df3a2fec764054be3249ee9158d51ad87c4ea65a1727902b1ff30d919be6e498facc27ea3def8bad0a4238622a2a63a88ea90869cac5331843315e70 SHA512 782182801aff432a8fddf005fabb883c6bde8cab6b62d265bec4c2f22b129b3c19a9effc6cb78178331db5db16fbfe2e28ffe548f123370ca414e37add541dc4
+EBUILD scylla-bin-3.2_p202003162053.ebuild 3128 BLAKE2B 3c43d9d9df3a2fec764054be3249ee9158d51ad87c4ea65a1727902b1ff30d919be6e498facc27ea3def8bad0a4238622a2a63a88ea90869cac5331843315e70 SHA512 782182801aff432a8fddf005fabb883c6bde8cab6b62d265bec4c2f22b129b3c19a9effc6cb78178331db5db16fbfe2e28ffe548f123370ca414e37add541dc4
+EBUILD scylla-bin-3.2_p202004222203.ebuild 4422 BLAKE2B 747a8b8ba7020a8c864725a7a11aea5b6343284e2b77b5aa014132bf5771ab9922b588bf40c154850b9aeb116679e1818d369f9cf57f08b404a1d972fbc4ddeb SHA512 641fc805ae0f30ae89d4746a884778a68766f8db96f2cd534fa620515b6dbcce60930b9927f450b007a568b9c3a5c21eb918004562a2a6072347bfb46fc70f36
+EBUILD scylla-bin-4.1.3.ebuild 3693 BLAKE2B ebb887489c5b6afa587844dc9fbdebdd03d6d277256f9228559adec13f1476fdcf5522bd9b677883ae40da5f5ce7c246ef9401c519018c7ce9d26da93742265c SHA512 0fd6a975b93cd1697eacefa23f9cbbe8d0b93a40c5c8802ea108a6fa7c787858939821b276b05e18a8d1006db95ad9350acfff97e7314fbd4352d326a9f935ad
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl6jNh9fFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl8pnBRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy+e+Af9GiSLj0OrpOuoop+nMIc4HWuGa+rT0wOYRWRQcMl/3duYqBtlaD+8YPu2
-eFvfgp4fxd4dqT/k4qTPIuyOBS+Q6Mc44R1p39bmCYfGmXUdB7hhdRWZa4aFc2qp
-OVphbJSZC4zJWhhwd0NXqrfIy+C+3h/7yQYe5/L/fDjCuU0e/SfsLsYpIQVfjCq+
-nuA9YAmTnggi1xVdOX6ekn4E94U3yup7S/ZJ5Kn7huveNVbbMhLS31WyqYWypSNM
-Ni+HwrArs9S5lc+rxO21v6mg+Iuq168DkVWxAOilTd6akgaOnR0eeD3e9W5sWTru
-hBtIcPbLVQ0/JWuCiX5scT1ajs4cnw==
-=wXkd
+dy/dkwgA5IChETfkut6IwS+uYkXsyK3A7wfL24subs7OdBk8bg4ClTDO4uZk2jnl
+7zwQ3huNWAPgQxUhexrddWyR/kTAeMjVlxgylZu9BlC2/TT5j6rdtSHdDdiFQTKp
+SXu5AQxG3vGD7uC9ktsNHt3ifKZ7gezVRUH5eYb9+qqg5MA+aTi/LqIbq2RXjwIN
+zaknX3EoiWhQjGzTQtDpH9sNm8eXU9PN5D699OfOoSwkC4TyeZeJROjL0jydD37U
+9wLVUbRhrnatIcpWxeqXj/ZXJ44cypdIg0zcQ8G4h6FLHO+aRppQ0WrjvkEK3ezU
+mZu/jUaDYQRh5nv9ce7tDFYPbydn6w==
+=kH0J
 -----END PGP SIGNATURE-----
diff --git a/dev-db/scylla-bin/files/scylla-jmx.confd b/dev-db/scylla-bin/files/scylla-jmx.confd
index 8177e13..43a5bba 100644
--- a/dev-db/scylla-bin/files/scylla-jmx.confd
+++ b/dev-db/scylla-bin/files/scylla-jmx.confd
@@ -5,5 +5,3 @@
 
 # source scylla default env
 source /etc/default/scylla-jmx
-
-rc_need="scylla-server"
-\ No newline at end of file
diff --git a/dev-db/scylla-bin/files/scylla-jmx.initd b/dev-db/scylla-bin/files/scylla-jmx.initd
index 71d90dd..15010da 100644
--- a/dev-db/scylla-bin/files/scylla-jmx.initd
+++ b/dev-db/scylla-bin/files/scylla-jmx.initd
@@ -16,6 +16,7 @@ start_stop_daemon_args="--user ${user} --group ${group} --wait 2000 --make-pidfi
 
 depend() {
 	use net localmount logger
+	provide scylla-jmx
 }
 
 start_pre() {
diff --git a/dev-db/scylla-bin/files/scylla-server.initd b/dev-db/scylla-bin/files/scylla-server.initd
index 59caf81..9e233b7 100644
--- a/dev-db/scylla-bin/files/scylla-server.initd
+++ b/dev-db/scylla-bin/files/scylla-server.initd
@@ -18,6 +18,7 @@ start_stop_daemon_args="--chdir ${chdir} --user ${user} --group ${group} --wait
 
 depend() {
 	use net localmount logger
+	want scylla-jmx
 }
 
 start_pre() {
diff --git a/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild b/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild
index 20cb906..6092f13 100644
--- a/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild
+++ b/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild
@@ -19,7 +19,6 @@ RESTRICT="strip test"
 
 RDEPEND="
 	!dev-db/scylla
-	dev-python/pystache
 	>=app-admin/scylla-jmx-3.1
 	>=app-admin/scylla-tools-3.1
 "
diff --git a/dev-db/scylla-bin/scylla-bin-3.1_p263.ebuild b/dev-db/scylla-bin/scylla-bin-3.1_p263.ebuild
index 20cb906..6092f13 100644
--- a/dev-db/scylla-bin/scylla-bin-3.1_p263.ebuild
+++ b/dev-db/scylla-bin/scylla-bin-3.1_p263.ebuild
@@ -19,7 +19,6 @@ RESTRICT="strip test"
 
 RDEPEND="
 	!dev-db/scylla
-	dev-python/pystache
 	>=app-admin/scylla-jmx-3.1
 	>=app-admin/scylla-tools-3.1
 "
diff --git a/dev-db/scylla-bin/scylla-bin-3.1_p999.ebuild b/dev-db/scylla-bin/scylla-bin-3.1_p999.ebuild
index 670bc92..7b5ec61 100644
--- a/dev-db/scylla-bin/scylla-bin-3.1_p999.ebuild
+++ b/dev-db/scylla-bin/scylla-bin-3.1_p999.ebuild
@@ -19,7 +19,6 @@ RESTRICT="strip test"
 
 RDEPEND="
 	!dev-db/scylla
-	dev-python/pystache
 	>=app-admin/scylla-jmx-3.1
 	>=app-admin/scylla-tools-3.1
 "
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 4968dde..e12b428 100644
--- a/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild
+++ b/dev-db/scylla-bin/scylla-bin-3.2_p202002221144.ebuild
@@ -19,7 +19,6 @@ RESTRICT="strip test"
 
 RDEPEND="
 	!dev-db/scylla
-	dev-python/pystache
 	>=app-admin/scylla-jmx-3.2
 	>=app-admin/scylla-tools-3.2
 "
diff --git a/dev-db/scylla-bin/scylla-bin-3.2_p202003162053.ebuild b/dev-db/scylla-bin/scylla-bin-3.2_p202003162053.ebuild
index 4968dde..e12b428 100644
--- a/dev-db/scylla-bin/scylla-bin-3.2_p202003162053.ebuild
+++ b/dev-db/scylla-bin/scylla-bin-3.2_p202003162053.ebuild
@@ -19,7 +19,6 @@ RESTRICT="strip test"
 
 RDEPEND="
 	!dev-db/scylla
-	dev-python/pystache
 	>=app-admin/scylla-jmx-3.2
 	>=app-admin/scylla-tools-3.2
 "
diff --git a/dev-db/scylla-bin/scylla-bin-3.2_p202004222203.ebuild b/dev-db/scylla-bin/scylla-bin-3.2_p202004222203.ebuild
index 4968dde..8bbd69d 100644
--- a/dev-db/scylla-bin/scylla-bin-3.2_p202004222203.ebuild
+++ b/dev-db/scylla-bin/scylla-bin-3.2_p202004222203.ebuild
@@ -9,7 +9,7 @@ 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"
+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-tools-package.tar.gz -> ${P}-tools.tar.gz http://downloads.scylladb.com/relocatable/unstable/branch-${MY_PV}/scylla-jmx-package.tar.gz -> ${P}-jmx.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="AGPL-3"
@@ -18,10 +18,9 @@ IUSE="doc"
 RESTRICT="strip test"
 
 RDEPEND="
+	!app-admin/scylla-jmx
+	!app-admin/scylla-tools
 	!dev-db/scylla
-	dev-python/pystache
-	>=app-admin/scylla-jmx-3.2
-	>=app-admin/scylla-tools-3.2
 "
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-3.5
@@ -50,7 +49,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	for pkg in package python3;
+	for pkg in package python3 tools jmx;
 	do
 		mkdir "${pkg}" || die
 		pushd "${pkg}" || die
@@ -88,19 +87,43 @@ 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() {
+	pushd jmx
+	# 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 scylla-jmx || die
+	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_tools() {
+	pushd tools
+	find . -type f -name '*.bat' -delete || die
+	for e in nodetool cqlsh sstableverify sstableutil sstableupgrade sstablescrub scylla-sstableloader debug-cql; do
+		sed -e "2i export CASSANDRA_INCLUDE=/opt/scylladb/bin/cassandra.in.sh" -i "bin/${e}" || die
+		sed -e "2i export CASSANDRA_HOME=/opt/scylladb/" -i "bin/${e}" || die
+	done
+	insinto /opt/scylladb
+	for f in bin conf doc lib pylib tools; do
+		doins -r "${f}"
+	done
+	for e in nodetool cqlsh sstableverify sstableutil sstableupgrade sstablescrub scylla-sstableloader debug-cql; do
+		fperms +x "/opt/scylladb/bin/${e}"
+		dosym "/opt/scylladb/bin/${e}" "/usr/bin/${e}"
+		sed -e "2i export CASSANDRA_INCLUDE=/opt/scylladb/bin/cassandra.in.sh" -i "bin/${e}" || die
+		sed -e "2i export CASSANDRA_HOME=/opt/scylladb/" -i "bin/${e}" || die
+	done
+	popd
+}
 
 src_install() {
 	install_package
 	install_python3
-	#install_jmx_package
+	install_tools
+	install_jmx
 }
 
 pkg_postinst() {
diff --git a/dev-db/scylla-bin/scylla-bin-4.1.3.ebuild b/dev-db/scylla-bin/scylla-bin-4.1.3.ebuild
new file mode 100644
index 0000000..74e7b00
--- /dev/null
+++ b/dev-db/scylla-bin/scylla-bin-4.1.3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="4.1/2020-08-01T08:26:42Z"
+
+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-tools-package.tar.gz -> ${P}-tools.tar.gz http://downloads.scylladb.com/relocatable/unstable/branch-${MY_PV}/scylla-jmx-package.tar.gz -> ${P}-jmx.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="doc"
+RESTRICT="strip test"
+
+RDEPEND="
+	!app-admin/scylla-jmx
+	!app-admin/scylla-tools
+	!dev-db/scylla
+"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.5
+"
+
+# Discussion about kernel configuration:
+# https://groups.google.com/forum/#!topic/scylladb-dev/qJu2zrryv-s
+CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE"
+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)."
+
+# NOTE: maybe later depending on upstream energy, support DPDK
+# For DPDK, removed HUGETLBFS PROC_PAGE_MONITOR UIO_PCI_GENERIC in favor of VFIO
+# CONFIG_CHECK="~NUMA_BALANCING ~SYN_COOKIES ~TRANSPARENT_HUGEPAGE ~VFIO"
+# ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
+
+DOCS=( README.md NOTICE.txt SCYLLA-PRODUCT-FILE SCYLLA-RELEASE-FILE SCYLLA-RELOCATABLE-FILE SCYLLA-VERSION-FILE )
+PATCHES=( )
+S=${WORKDIR}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	enewgroup scylla
+	enewuser scylla -1 -1 /var/lib/${PN} scylla
+}
+
+src_unpack() {
+	for pkg in package python3 tools jmx;
+	do
+		mkdir "${pkg}" || die
+		pushd "${pkg}" || die
+		unpack ${P}-${pkg}.tar.gz || die
+		find . -type f -name "*.pyc" -delete
+		popd || die
+	done
+}
+
+install_package() {
+	pushd package
+
+	bash install.sh --root "${D}" --sysconfdir /etc/default --packaging || die
+
+	for x in /var/lib/scylla /var/lib/scylla/{data,commitlog,hints,coredump,hints,view_hints} /var/lib/scylla-housekeeping /var/log/scylla; do
+		keepdir "${x}"
+		fowners scylla:scylla "${x}"
+	done
+
+	insinto /etc/sudoers.d
+	newins "${FILESDIR}"/scylla.sudoers scylla
+
+	insinto /etc/rsyslog.d
+	doins "${FILESDIR}/10-scylla.conf"
+
+	newinitd "${FILESDIR}/scylla-server.initd" scylla-server
+	newconfd "${FILESDIR}/scylla-server.confd" scylla-server
+
+	popd
+}
+
+install_python3() {
+	pushd python3
+	bash install.sh --root "${D}" || die
+	popd
+}
+
+install_jmx() {
+	pushd jmx
+	# 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 scylla-jmx || die
+	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_tools() {
+	pushd tools
+	bash install.sh --root "${D}" || die
+	popd
+}
+
+src_install() {
+	install_python3
+	install_package
+	install_tools
+	install_jmx
+}
+
+pkg_postinst() {
+	elog "You should run 'emerge --config dev-db/scylla' to finalize your Scylla installation."
+}
+
+pkg_config() {
+	elog "Running 'scylla_setup'..."
+	scylla_setup
+}