dev-db/scylla: version bump

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

2 files changed, 21 insertions, 17 deletions

diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index f068bc8..6ef9e0c 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -19,20 +19,20 @@ EBUILD scylla-3.1.1-r2.ebuild 7622 BLAKE2B 404ab3d8e42898a7379aa9872eb710aa183ca
 EBUILD scylla-3.1.1.ebuild 7497 BLAKE2B 9f9a71a22eecababea0ec5c4f156b50d2c858f3c764acaedb77eb159d0e4c6c9f8ce4c4efde856d04edce0a89d40759ed56bea62c7f693e44e489d3d69f8f6fa SHA512 b6fee615043cce8801f9d84d0599a6e6fb6ded7553b04b1b38bc7b560576ac918b20e542a8064d54ae9615bafa2fe7e854069bb749d0fd332c3c4584104a05a3
 EBUILD scylla-3.1.2-r1.ebuild 7672 BLAKE2B 7249eb175499b7aa9ac0a5df43ffb4a573eca25d5f1b23c79935bd444320d977d7c2b3953c4569a606ded4a15028dc09c8374d1a0df8ce6dd45471a23fd2c662 SHA512 0e5ebf4b64ce7f4496ab94c87a3f8c432f762909f35b03501a4c84e6f6a7f780c35b947ececf0fd8e32a0a13dd011b8b074a955994cb46342336c2edb0e348c5
 EBUILD scylla-3.1.2.ebuild 7075 BLAKE2B 6b690c242e061b69eb60d954cdbc00adc87651961cab3864b54b861b0349588110e4ba2c254076ae86a924e8f334937af9b60c11ca23a8f84553c11f920703cc SHA512 9a568b06f7b12ba8a09919c9f0a8f08c954a7a339eb1568026b6b2f8a8f5e8438f468c195ed6617402a2ef78aca42310f8388ce39312fb1b71bc09ea6c88990f
-EBUILD scylla-3.2_rc3.ebuild 7006 BLAKE2B 192ae36f361fec9bfeddf69400f698ae6dbdeb3ebba230da8f769e1f363353dace59deac4a8c81502865e91f39281700522dea070371e43288d91a7d8beddabe SHA512 78368f630eaf5131a2d06e37c43be51a19daf4ff146c2cb5618c18c253bf34c810b2467d56e8bb9065d275025aa9e0881247ce1c96291ea3f31b64068c62faf8
+EBUILD scylla-3.2.0.ebuild 7108 BLAKE2B 81fc59431ecbba0d05882bc754f0678a7b8aaf0f5276169acc2564790d0f2f4e8cef77c7c4911ed409cebc3691ee0047212bdf01c0f067116e62b99fea295e8d SHA512 e710853f409914e25f98c19064cae43451f05c8338f272dd4f1206569e206e96ccdeb0e5a7f6a63d386372bcb1c5591a694fae89754c68fb6b314672e2620bb5
 EBUILD scylla-9999.ebuild 6403 BLAKE2B 4e176d656ed4224cf625562ffe89f422124bd05ae39f0d5d9b4e68093362bd8f4f44dd71f66e81d28c39c741ff4b9ba62c72fb237799a630d41e9d41b73ad250 SHA512 e04b414ee51c1b3ffea859c25f4ee40f75447d16b0494f25b1ca3bf756d7cce5823c9cb4d19be90dace91248edee826c20be608393eada09fda8913efe25c11b
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl4UdxZfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl4mw95fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy+sLgf/RTefGFD91xrmBFsxa1Pcm095trtsaf/wLb1AmS5zmhJyNtcwWoxRs+6c
-szmVEWePePT2eom++rlvFqKaUoqaadVSh8qQA17sOB6TpZ20UqasYSsYZd4tOclR
-922MgGpG4OTu6J54FW1V4U/LSaUM6pdBqS5CNt07cM2YKnz3z850Gys8F60awxan
-LdLNohLI4VQzp6kWRQ2hRe/kl5QcGX/onx94XLr2wJZ04jpNAKrhVtGZk84XV+zH
-wz0Gz4XcmYXe9EN9eyc1JIhEccUSX3toUuMmLRtWFaSeQMFAIJyPI6doM0DbnyP9
-SjZbCgCPp981pTIitgIFgNMAaFWsfA==
-=XOvm
+dy/qgAgArTNEPkfP25b7k72LFmcSa9+khxDfPYrVKFgYJwgS7NlE/IO+Chfdblix
+MxfvA5vbenOdSRwbriFAboVqxE6ou9zOggLXORFF0uqCU9G7oDNCAeJRPcKd0Wfq
+VGHCnucnzg8Wf0Huk6n+KbLxCdIuxxzfjS5yBiB7unLxKXXUCasf0xD3Jx1q9mGr
+4tPE5LxbCAuGBP5QHJxe5o2TEHikgJVYfOX18qFuFtI/+UEdeiKrmD0R6VQezXPA
+jSuvacYNRt3sK4OrslCQJwYiCE74soNDrOulC0bAYDwQhJcF40KbppUt4IaKPspb
+viloguxvJn38jFHQE6IOp6eM+0/TVA==
+=+/8u
 -----END PGP SIGNATURE-----
diff --git a/dev-db/scylla/scylla-3.2_rc3.ebuild b/dev-db/scylla/scylla-3.2.0.ebuild
index af14772..ad26ee6 100644
--- a/dev-db/scylla/scylla-3.2_rc3.ebuild
+++ b/dev-db/scylla/scylla-3.2.0.ebuild
@@ -31,11 +31,11 @@ IUSE="doc systemd"
 RESTRICT="test"
 
 RDEPEND="
-	>=dev-libs/thrift-0.11.0
 	<dev-util/ragel-7.0
 	<sys-apps/hwloc-2.0.0
-	~app-admin/scylla-jmx-${PV}
-	~app-admin/scylla-tools-${PV}
+	>=dev-libs/libfmt-3.2.1
+	>=dev-libs/thrift-0.11.0
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=virtual/jdk-1.8.0:*
 	app-arch/lz4
 	app-arch/snappy
@@ -47,7 +47,6 @@ RDEPEND="
 	dev-libs/crypto++
 	dev-libs/jsoncpp
 	dev-libs/libaio
-	>=dev-libs/libfmt-3.2.1
 	dev-libs/libxml2
 	dev-libs/protobuf
 	dev-libs/rapidjson
@@ -55,7 +54,6 @@ RDEPEND="
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/pystache[${PYTHON_USEDEP}]
 	dev-python/pyudev[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-util/systemtap
@@ -66,8 +64,10 @@ RDEPEND="
 	sys-libs/libunwind
 	sys-libs/zlib
 	sys-process/numactl
-	x11-libs/libpciaccess
 	systemd? ( sys-apps/systemd )
+	x11-libs/libpciaccess
+	~app-admin/scylla-jmx-${PV}
+	~app-admin/scylla-tools-${PV}
 "
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-3.5
@@ -125,8 +125,8 @@ src_prepare() {
 	# dist/common/scripts/scylla_blocktune.py
 	# dist/common/scripts/scylla_util.py
 	# dist/common/scripts/scylla_config_get.py
-	find "${S}/dist" -type f -exec sed -e 's/yaml.load(/yaml.full_load(/g' -i {} \+ || die
-	sed -e 's/yaml.load(/yaml.safe_load(/g' -i seastar/scripts/perftune.py || die
+	# find "${S}/dist" -type f -exec sed -e 's/yaml.load(/yaml.full_load(/g' -i {} \+ || die
+	# sed -e 's/yaml.load(/yaml.safe_load(/g' -i seastar/scripts/perftune.py || die
 
 	# fix /opt/scylladb/scripts
 	sed -e 's@/opt/scylladb/scripts@/usr/lib/scylla@g' -i dist/common/scripts/* || die
@@ -219,6 +219,10 @@ src_install() {
 	fperms +x /usr/lib/scylla/scyllatop/scyllatop.py
 	dosym /usr/lib/scylla/scyllatop/scyllatop.py /usr/sbin/scyllatop
 
+	for util in $(ls dist/common/sbin/); do
+		dosym /usr/lib/scylla/${util} /usr/sbin/${util}
+	done
+
 	insinto /etc/sudoers.d
 	newins "${FILESDIR}"/scylla.sudoers scylla