summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUltrabug <ultrabug@gentoo.org>2020-03-04 13:46:09 +0100
committerUltrabug <ultrabug@gentoo.org>2020-03-04 13:46:09 +0100
commit339587e8ddb105baef237a5ef6e513ec4ddc4a0a (patch)
tree7b64f129b719d3159ab2210006a263af54c383d0
parentdev-db/scylla-bin: 3.1 requires scylla-jmx 3.1 (diff)
downloadultrabug-339587e8ddb105baef237a5ef6e513ec4ddc4a0a.tar.gz
ultrabug-339587e8ddb105baef237a5ef6e513ec4ddc4a0a.tar.bz2
ultrabug-339587e8ddb105baef237a5ef6e513ec4ddc4a0a.zip
dev-db/scylla-bin: fix yaml.load on 3.1
Package-Manager: Portage-2.3.89, Repoman-2.3.20 Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5 Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
-rw-r--r--dev-db/scylla-bin/Manifest18
-rw-r--r--dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild1
2 files changed, 10 insertions, 9 deletions
diff --git a/dev-db/scylla-bin/Manifest b/dev-db/scylla-bin/Manifest
index cfebde4..65b3886 100644
--- a/dev-db/scylla-bin/Manifest
+++ b/dev-db/scylla-bin/Manifest
@@ -11,20 +11,20 @@ DIST scylla-bin-3.1_p259-package.tar.gz 1112368776 BLAKE2B 593f9bed2cccf1dacdc79
DIST scylla-bin-3.1_p259-python3.tar.gz 29292188 BLAKE2B 169a67b487244b2a391aacc995155a749b0746cfbd342c387423106abda4f361a45a7d5bfbba020e1f32014ead148d5363c4c58bb35eb6147f992b7040ff17c4 SHA512 5883c34c79d8e09ecbefa612c37875383cb4e45d429599a5b0b74a048fd93fc4a672d7b9a2335eb0fefdc05d08edc5a0a72dc2d3fb77485dd1146fd48899936b
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.1_p259.ebuild 3457 BLAKE2B 035ea35e6baad6b957f97ed0437ac7e34d4d2daaace8c5c79b77f58f4d4df692b46bcee5b18f9999a50984b8aa0e54ad3e7bdf717d1b1627a3b90edc14528e51 SHA512 b344101ddd8e81f0f7d3722a89e718571037b496b71477933cbaead6d4530412af48b5e4981267c2e08df2896ddcebf7b89380fea40f77e89efc758631a4a4d0
+EBUILD scylla-bin-3.1_p259.ebuild 3546 BLAKE2B f592fc3a1865ae2bd417e31e497546b71c725682153a3d1b12abfbcc5b4516c67bfa4b8394da9a4d3374c60e41db4726dafdc0f89bd727cac52cc0d2bb50d42f SHA512 d6accb29556785bc82db1627316a7a7e06658b491002ae0157fec25953e4bff2c83e70930a287b1832d251bfdecef5fc3d6787466e5791a9e88b823bb851aaea
EBUILD scylla-bin-3.2_p202002221144.ebuild 3119 BLAKE2B 9ac009d042a3721bbc005e18c5a667e7fd071824fb15b9899b225cc9adcfe12f35afbe1c24f6e28dd128b4215c4dad0026ff2cf859f5a4cc65f3af46b8969045 SHA512 b4863d066304534830f3f951c79845e61345ab57d0f0f327b67693ff22e92c2ff83cc592defacfd33e19ffb54a030e0e62cd4451d8276dbc409291862251dd39
MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl5fnrBfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl5fovVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy9bSgf/SxC6J8tu989oWjK9HvfJCoeT1WrP1HSso70jeZHfEYqEP64dhmaFLqAX
-q1wd0OCN74LnLZkxn0wUTeBKn3M7KMWhRwTZkdAwHDAlJYGD7K5P6gczuGEafRBa
-8YvbAUbVmutKNls3Wt2COmivMom8YaVnepySCYr2k0zs6/8tazDTflSGkFy64CPR
-LnTXdJcPvQuo3ZS1htd/4zSywtwNl6zdjYJKCslym3V3AukjkLDjrmdTngfs0I3L
-d2GrFhCKWye3Ud/ZNfNCCDpjRhQkpQS6uWceUf4khLSecq7LkKAJ8zWkx9rg51H1
-cNnHaZb5giUmGIO92YugdaqV72Vycw==
-=OMnJ
+dy9cFAf/b+n53mA7nwyiQm7wi4yA12Uu6V2a0E5gJMm55zLO6KpiL/02/0vr+qME
+dTty/X9Xy4mqH1FHq4fNijQgeCQt/JW/wMotg6Dg9nqvNkgN/TRzUsgAHRvy8dBD
+SwLtfIR5mvjagA9+QnCEsTCXJB2NUlk60e76TEf8xzw0F3xucv5QZFRAzV1zEgiO
+JnRXKXO8ieD0ozC7ywI182F0Dx7STUGJm5VcicAKsGXi4rO9mBlKSZ1xZdbIg/cN
+yrB713HsasVJnW6OQrY1yeqArzo5LylsnpdeMPk2jr7DBfgF8KevObI0Yi17cVpt
+D/wk6kz2ej0woPqenrFy7DtJGIP+Lw==
+=n0ij
-----END PGP SIGNATURE-----
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 e6592d2..733bea3 100644
--- a/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild
+++ b/dev-db/scylla-bin/scylla-bin-3.1_p259.ebuild
@@ -65,6 +65,7 @@ src_prepare() {
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() {