dev-db/scylla-bin: drop old, bump to 4.1.8

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

2 files changed, 42 insertions, 39 deletions

diff --git a/dev-db/scylla-bin/Manifest b/dev-db/scylla-bin/Manifest
index 2fd2886..5449867 100644
--- a/dev-db/scylla-bin/Manifest
+++ b/dev-db/scylla-bin/Manifest
@@ -7,8 +7,6 @@ AUX scylla-jmx.initd 605 BLAKE2B 25d81b38782ec9b704b9643f52f05ca33a92c2e70334cf3
 AUX scylla-server.confd 396 BLAKE2B dc522b308985e51c24449a333d793eaa777a74b8b5594f1ff4a092aae003202791019a255ea478c4e794a83ca0e01d2c49aac3d267501624f461fa3edfe1c41f SHA512 51739cdeedaedb1a73a345ec6a4a2761d29fac1b9cf61f02937559aed43f02112109464254213118d40af1fb7e8491c22f8cb88908c9c88523dfe1b78b8430c7
 AUX scylla-server.initd 1130 BLAKE2B eae62c3e4ebad1342401e5d37b28ab3eeb581e8b73e96b27f16da2786c62ef65403ba79e522a8d0d83d5da4e51e9735d76581abd577a25ae439bfbd7ed485421 SHA512 7f893e969e8caf310d8c0ab97361ed6a483c11a0acb4062934691d7e0723ae19f5601a3d3939fdd152c452a9c7431d58812283491edb660cc669a4ad725ca7f4
 AUX scylla.sudoers 162 BLAKE2B 9aa0dce391da1f420a070d73d061452eeba60ad268f13a5bb8c0525d714d27dfa438efa9c6871c916b82ebf56f34c507826315de8b1fadc3d0eb5feae663cbcc SHA512 aabdeb3854eaad4b1cf9037a998cf94b8f55b2011e8f81a1778095b71806d89e217f2025e772c636569f833f7df45108e2e30c2c1e70fdb59acf37e6cdf81485
-DIST scylla-bin-3.1_p999-package.tar.gz 1112442916 BLAKE2B 6366601e9b865ac843c7417b883e5995ac6ab40db5dde3ec20c8012558058930bf5e8956c511e17fa37434cf6b4c6fee9c198eccdea160005ea4cff044369678 SHA512 4964b526a2146069164ba8762ceee4e42173432927830783780c845a822b18a378f3f77fa8a59c788d5c19256c4d5f97b082417d616a7802dc1c6fbc9fe876e9
-DIST scylla-bin-3.1_p999-python3.tar.gz 29315191 BLAKE2B 043102bb9c3328c1d133ec05067dc3e3bb4c0b0720023f68abe0839b8b5afcea8270f789db7be09186f8a9b5ded779310d337ee4ce9df0f1e6a68e949f8632bb SHA512 b3a590c60a137918f2a65d51cda8b7fde3013280c24abb2009150cf184062a64394f6f9312ba6464311da0a0b7e7b4900f8f74ff3e556e693115775c67cb0b3e
 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
@@ -33,25 +31,29 @@ DIST scylla-bin-4.1.3-jmx.tar.gz 7676083 BLAKE2B 5bcac8ef7d5dd91e87e77eac55ad011
 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_p999.ebuild 3507 BLAKE2B fba692ca9d6c521f2a26843aaf1ca5dda81e7b9dda127687880bc0cbefbdfd725a003adf99892a4778eee3c83f4230c2effd851f893a49c285a45ef08b406ff3 SHA512 3abf3ed8d49318cd52b64211917f9b657c409122ca9183d6a57b7fa58f67ca476eca0bc56d1c0313601d266627b8c2f504df2bdfb51d76c4c9afb8f4b3444ce3
+DIST scylla-bin-4.1.8-jmx.tar.gz 7676133 BLAKE2B 5a919eceeaab4c44afab65b35039365aa5c15ac0bd485ed116e4805ecdd11591d15ec3af5b004bb1c4993686df2c0bda3a62476bec82f364c9d955a72a336cdd SHA512 e22e378e7c2289afe7ccccae76a47b0422016a00c967cae14474f8ffff54e97f8da5ca3a87b34eb76a417cb351fd0967e02de081d5565547d4d4471c6e4f0616
+DIST scylla-bin-4.1.8-package.tar.gz 808934528 BLAKE2B 2107764f33ad48a588f9231edd9540c22b785f7bc28f376ce1e0fd5ee91ad87a4b01700965c7f82e3b0b6bf5c12ce912792a41f322ce61de3ccf35f0f4ea3003 SHA512 3b0c27ffae2b9da2ba0b68b267083c2a9bac4256b172d52403c4fa0bdd27823456e69dd92821343fad56ba642e884ede79a10112737222272ca6205d9c8283fd
+DIST scylla-bin-4.1.8-python3.tar.gz 36067975 BLAKE2B c9669d413e4fd7913b9cb66c626e7df43d56f0d1da7ae0ea7b63a48d58914d55f07cdd9e1ee915d37762cb492507f62bef104bab7176939fb6fde3f4a04629f0 SHA512 8a1b96701d1d57da6a9b099c89b4af586c737cb131d700c738feee8c351eabdec8a8dbf0f08e2be21715e3916e3cecaaaea1b5ec4e721d9edf08cb4deb97ddce
+DIST scylla-bin-4.1.8-tools.tar.gz 33862685 BLAKE2B a449ffed48cd5ed2559db81d46d3c5660230f72f9ab5e443f449ba9a3314c75c8931f4a5c544697c8e7a942b75293df9b669544b1ae777efed852c063d2f2303 SHA512 f410557eb947b348d6f50100328039974bd6dcb20e9c78877e342159db531705ad9bcfafd81a4b6149796dfa19fb6425dbf3ad68aaa8af2d91b606afa208e31d
 EBUILD scylla-bin-3.2_p202004222203.ebuild 4422 BLAKE2B 747a8b8ba7020a8c864725a7a11aea5b6343284e2b77b5aa014132bf5771ab9922b588bf40c154850b9aeb116679e1818d369f9cf57f08b404a1d972fbc4ddeb SHA512 641fc805ae0f30ae89d4746a884778a68766f8db96f2cd534fa620515b6dbcce60930b9927f450b007a568b9c3a5c21eb918004562a2a6072347bfb46fc70f36
 EBUILD scylla-bin-3.2_p20201008.ebuild 4393 BLAKE2B f40b2db7459da877394169fa61b8b9562e4fc0b2a27fd37fd2f4e08ae9352b136b36ccf13a97b5c4d5a1ee86eedcf21d132f930f51a41e976e9ff68559b13a5b SHA512 fbbfc2bb498bef65a28cc1a00e15b6207174ad0f2624f7d9b7b234bd4c2d8de62f0c52587497b1746541c02589697167143a0b0c40b1d84eac8c94d682dcba85
 EBUILD scylla-bin-3.2_p20201009.ebuild 4412 BLAKE2B 09ec3b51a434e24fd0b3df0c630810b314b6e0116243b8f2443c4a76257d028551604358ae92ad1288be5babb4b1fad8ddf9aba640aac16c534fb098d54c3cba SHA512 5738fb63b5e480ed12ffebb7fe2d8aa586c222b2dc952264a38e0eb22b02555dc7a373c3eca3491a486cd467498a1255c8e2fedf66fd4c1dba6d9e699a8c8288
 EBUILD scylla-bin-3.3_p202006160043.ebuild 4615 BLAKE2B 66dfb66d70a71cefa38c4cdcbd9eee4919221aceab279622f8f8394bd1fdbc49a1ae20374a8d4892d68d61fb9f903a847e5424487c5205a0014842e748a91455 SHA512 8d066f1df43a4ea9350fbc65430c008429438fafd8d9f715fa26529c20523e52feb1b52f9208f2f4cca536d2373da1aba01110246607c8111eb602f95ddee803
 EBUILD scylla-bin-4.0.8.ebuild 4068 BLAKE2B 79fbbe320cc8651aa2f84db166ad1df85d4a14cfa4016a5953686ab82b52743738c8a453166e1cad53963b3683b2d6dbad9363901021e55a111d48cd5e0d80d9 SHA512 531f8e834b8c87c60171953f69fddc4883e39b95b67a1cefc371883667dbb530637c349a83059df966a4a302ecda51de5387e2e9d8add9f3a7f32aac0ca3c767
 EBUILD scylla-bin-4.1.3.ebuild 3710 BLAKE2B ae927512db6ae431cdc73a1f1bbe46daf7500cbebd4f4a614cf8c724bea224ed370c30815733bcaa82a457ec8c7de6daf9d969ce54ef7d68bd4f09b9238c2dde SHA512 04c6d2a66ea2b2580367066fc9ca06fb97fdcb0eb82b9b71e1f2dc1e94985dcaa901d0216bda199a0a33de2ed019a268bb8d505eb794a652f552cd400d23c8ed
+EBUILD scylla-bin-4.1.8.ebuild 3929 BLAKE2B 961c8eb3b40f15bc298777bb7b85008e3855f63671c0eac8c198a0ee154cfc818158d334d110cdddb0df53ba34ed910f2ebb8678f279c5f50f9bfe2e224c206c SHA512 99d4ec487308549f1bb7a535f355e94d1a2a888ae007c6becbd452456a4c0c1ed3fac42ac435e24896e0103e32222175002886e8791347321a632ed14cb91ab4
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl9/heNfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl+FvlZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy+x5Af9HpnM7rPudIjbKrsUYGAf2r3ZBxvH4cgRo1xQktDVmr4z2q9/iIA4i4Vg
-9Bf1VejmT67TfcQwC2Lb0IrxoG7Hfrv7LIPnqZy7jWzTeFaWJu4FwJlOUTL2aW/h
-KJojrdPjf4k3nC8sa7hYnegXlw92C6RtD2MzUiO5UGZcpRMyTGe84x62Nq0y33jn
-xV2TpIi74zD47huqcHMrR8ZjR7rVxGoLoyGxJh57Y6T2HKokagLL9NmkyzVymrVO
-yXM68KoVSLHZIOVVop2w4oeKVl+5HInvTXItl226Zqhqgvhkrae0sCpwkrsgNdil
-F5keG6wU51uogjHwoiDY8o3Yjwq0AA==
-=KKIY
+dy/G0ggApreX6xiJ4ic0jXp7vM6A9I1x4OlFGUlpFpRUB7xeSIPgr7a2+ajw6AbE
+jJf016gZMu22E91XokGRGDw1+2PSEcSf3yczgGyVT2raEyaypYTQrRpBA0MFN/SS
+3+6BH0VF33Du9VszZ3gAjGIp2CrNDykYzvDJ/PW0Q2BojXZGXPMMuIv2OOOZzpsz
+2+vQtsRJcdXJnOcQbaTqWneXSXlDjAkvRPDf6ExtHAsEPR2mqMwjxnIwL1SNRvBG
+yc95Elm7EsXMuhPrIuFeatnRahZ0TVTgGMjQRSaUDMMuvwny48Aac/6DNUn0DPDv
+IcyXGCnYNezujvnPdsaFa/2yDV5meA==
+=UQl+
 -----END PGP SIGNATURE-----
diff --git a/dev-db/scylla-bin/scylla-bin-3.1_p999.ebuild b/dev-db/scylla-bin/scylla-bin-4.1.8.ebuild
index 7b5ec61..4758a0c 100644
--- a/dev-db/scylla-bin/scylla-bin-3.1_p999.ebuild
+++ b/dev-db/scylla-bin/scylla-bin-4.1.8.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=6
 
-MY_PV="${PV/_p//}"
+MY_PV="4.1.8-0.20201002.6c43a0dc29"
 
-inherit linux-info user
+inherit linux-info user versionator
 
 DESCRIPTION="NoSQL data store using the seastar framework, compatible with Apache Cassandra"
 HOMEPAGE="https://scylladb.com/"
-SRC_URI="http://scratch.scylladb.com/lubos/numberly/scylla-package.tar.gz -> ${P}-package.tar.gz http://scratch.scylladb.com/lubos/numberly/scylla-python3-package.tar.gz -> ${P}-python3.tar.gz"
+SRC_URI="http://downloads.scylladb.com/downloads/scylla/relocatable/scylladb-$(get_version_component_range 1-2 ${PV})/scylla-package-${MY_PV}.tar.gz -> ${P}-package.tar.gz http://downloads.scylladb.com/downloads/scylla/relocatable/scylladb-$(get_version_component_range 1-2 ${PV})/scylla-python3-package-${MY_PV}.tar.gz -> ${P}-python3.tar.gz http://downloads.scylladb.com/downloads/scylla/relocatable/scylladb-$(get_version_component_range 1-2 ${PV})/scylla-tools-package-${MY_PV}.tar.gz -> ${P}-tools.tar.gz http://downloads.scylladb.com/downloads/scylla/relocatable/scylladb-$(get_version_component_range 1-2 ${PV})/scylla-jmx-package-${MY_PV}.tar.gz -> ${P}-jmx.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="AGPL-3"
@@ -18,9 +18,10 @@ IUSE="doc"
 RESTRICT="strip test"
 
 RDEPEND="
+	!app-admin/scylla-jmx
+	!app-admin/scylla-tools
 	!dev-db/scylla
-	>=app-admin/scylla-jmx-3.1
-	>=app-admin/scylla-tools-3.1
+	virtual/jdk:1.8
 "
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-3.5
@@ -49,7 +50,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	for pkg in package python3;
+	for pkg in package python3 tools jmx;
 	do
 		mkdir "${pkg}" || die
 		pushd "${pkg}" || die
@@ -59,19 +60,10 @@ src_unpack() {
 	done
 }
 
-src_prepare() {
-	default
-	sed -e 's@/etc/sysconfig@/etc/default@g' -i package/install.sh || die
-	sed -e 's@retc"/sysconfig@retc"/default@g' -i package/install.sh || die
-	sed -e 's@retc/sysconfig@retc/default@g' -i package/install.sh || die
-	sed -e "s@/share/doc@/share/doc/${P}@g" -i package/install.sh || die
-	find package/dist -type f -exec sed -e 's/yaml.load(/yaml.safe_load(/g' -i {} \+ || die
-}
-
 install_package() {
 	pushd package
 
-	bash install.sh --root "${D}" --target debian || die
+	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}"
@@ -92,24 +84,33 @@ install_package() {
 
 install_python3() {
 	pushd python3
-	insinto /opt/scylladb/python3
-	doins -r bin dist lib64 libexec licenses
+	bash install.sh --root "${D}" || die
 	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
+	bash install.sh --root "${D}" || die
+	popd
+}
 
 src_install() {
-	install_package
 	install_python3
-	#install_jmx_package
+	install_package
+	install_tools
+	install_jmx
 }
 
 pkg_postinst() {