summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/Manifest.gzbin21953 -> 21959 bytes
-rw-r--r--dev-db/etcd/Manifest6
-rw-r--r--dev-db/etcd/etcd-3.2.12.ebuild (renamed from dev-db/etcd/etcd-3.2.10.ebuild)2
-rw-r--r--dev-db/etcd/etcd-3.2.9.ebuild63
-rw-r--r--dev-db/mongodb/Manifest3
-rw-r--r--dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch35
-rw-r--r--dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch302
-rw-r--r--dev-db/mongodb/files/mongodb-3.4.6-no-boost-check.patch11
-rw-r--r--dev-db/mycli/Manifest4
-rw-r--r--dev-db/mycli/mycli-1.15.0.ebuild28
-rw-r--r--dev-db/mycli/mycli-9999.ebuild5
-rw-r--r--dev-db/mysql-workbench/Manifest2
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild2
-rw-r--r--dev-db/postgis/Manifest3
-rw-r--r--dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch23
-rw-r--r--dev-db/postgis/postgis-2.4.2.ebuild3
16 files changed, 67 insertions, 425 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index fdad901b4a57..d940015ef7f5 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
Binary files differ
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 63f0b7fe9751..656ad9c82bad 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -5,11 +5,9 @@ AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12
AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
DIST etcd-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a81d3430c3f7c2c828d90318db3b01a2faea0c7075078096ce74302f2be7444245047534749f49d13a927851e SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc
-DIST etcd-3.2.10.tar.gz 3016954 BLAKE2B d957914e2bb14219531f4d44e01150045c92b27afbf2a3f1a6b09a2a97771c1ae9822925e69feacd2f761f6b0a8e3a2cf09adb3f2783d7f80cea5f9fd8d7cd67 SHA512 6d00bd47b8c76332e4d1eaa12d8db6052c19bad5e99402860875ba1d6590e0b4aa1afc7cfeb25128125d0195c408c5f4d782b75a0132fc6a8f5cfff673faab75
DIST etcd-3.2.11.tar.gz 3016255 BLAKE2B b57d70ab50e9b8c7bf11920c0bf18789975af7f4f1d66b0afb17ba1d4830250972ba2e276de4d67b80bec317cf9d35eac7f63f8ca7c7c25fce2947807dcc42f8 SHA512 e0a71d43d6595c0a08a6068addcf13c98d3d8bd6873c9b5ac39b6183daea34191c1b81a2c81f5c7ec98d587c85f3b1af8cd584d7a0857668f77fb80151858fdb
-DIST etcd-3.2.9.tar.gz 2889569 BLAKE2B 27f2e7db1518317484f850bbc5f350adc249c90423efc9379f69050ac0300ce687ef5eeb804520ddd577594080c5bffc0e32eba12edfa8b49775aa4861946647 SHA512 c194365e388fda8f796af70ff4b575b6ccabac0ca9ae3d84d55718e3914b927d5a6ba10b48eddc897139918880fcfa29d7a329463d20ce72f62115a0a41b6d4d
+DIST etcd-3.2.12.tar.gz 3046578 BLAKE2B 7b7a071c6856a7f1b5b7ceb68a4efbac74fde6ed1211dabda7d715ea79cd4dc9c10b0f1345d70b8a21e52cb3ac6adfc37c232ea28ff88e5f401212b5a8610d73 SHA512 b672a35ba62efccffa09be6b3d2a84b99e8abcae87093539c705d82e13c0f985a9f07a3d885af7386595f12d433756176db107739749c301e7e5d096e85d018b
EBUILD etcd-2.3.8.ebuild 1379 BLAKE2B a6bff7dcfef244a2de25f4bf9168eb41552e394edf4a5e573a5b7dcea580debc3a87008b9d77d717b31b0fe27dcc08cdee76f855865455cde2fd26c16aee00e4 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3
-EBUILD etcd-3.2.10.ebuild 1474 BLAKE2B bcddd25f09f10fa85d1199f2e9c295aa3ac66721a8c660e2ca22cba8d881393fcf5bc289c7141b4fa10e94a25deedc65c37fa5b384747fc1f1a9fcdaa8aa3c19 SHA512 21daa3a43edf7cdce091e376302967ca86bf3d3d09babab7bb331b7efed065c6b2d74b7eeb74e010b2d4d84595776befb037dc78391b37e5c7bab8e67b5d7cd5
EBUILD etcd-3.2.11.ebuild 1474 BLAKE2B bcddd25f09f10fa85d1199f2e9c295aa3ac66721a8c660e2ca22cba8d881393fcf5bc289c7141b4fa10e94a25deedc65c37fa5b384747fc1f1a9fcdaa8aa3c19 SHA512 21daa3a43edf7cdce091e376302967ca86bf3d3d09babab7bb331b7efed065c6b2d74b7eeb74e010b2d4d84595776befb037dc78391b37e5c7bab8e67b5d7cd5
-EBUILD etcd-3.2.9.ebuild 1474 BLAKE2B bcddd25f09f10fa85d1199f2e9c295aa3ac66721a8c660e2ca22cba8d881393fcf5bc289c7141b4fa10e94a25deedc65c37fa5b384747fc1f1a9fcdaa8aa3c19 SHA512 21daa3a43edf7cdce091e376302967ca86bf3d3d09babab7bb331b7efed065c6b2d74b7eeb74e010b2d4d84595776befb037dc78391b37e5c7bab8e67b5d7cd5
+EBUILD etcd-3.2.12.ebuild 1475 BLAKE2B 362f159043caf3e4eeb86dc6f986d20944ee0f6dcb056348e3cfb2ea91d7ac2e3cf8b7cc9f9453046e17fd1613edc6e327c0b21c77d523664a79926058b46bc0 SHA512 b7b1a31797590cde253eb3df3d891620c812456159aeaf5fb0ea332b91517b898604d7c57c3c78c9515ee2e72750794450c40e54a1852ea0a5dfda9c0d346fad
MISC metadata.xml 614 BLAKE2B be58143e8f3c7adfefa4be2af02a57738eb30bad4ccc63bb7756585cc71b5d40a705d0f16d61fe263f3858e53b965e3611386dcea04bba985a0bb09eb95231f0 SHA512 92fbd483e5a757d09c07c392cc6d54a5448b6ca02177fbc48ff9f1b4f558af4755e4590e3d7192dbc3e5a32d5bf797289a7b1067e585dd295e3e890b88af9cb2
diff --git a/dev-db/etcd/etcd-3.2.10.ebuild b/dev-db/etcd/etcd-3.2.12.ebuild
index 9de03c3233bf..c4f9f1d45765 100644
--- a/dev-db/etcd/etcd-3.2.10.ebuild
+++ b/dev-db/etcd/etcd-3.2.12.ebuild
@@ -49,7 +49,7 @@ src_install() {
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
dodir /var/lib/${PN}
fowners ${PN}:${PN} /var/lib/${PN}
- fperms 755 /var/lib/${PN}
+ fperms 0700 /var/lib/${PN}
dodir /var/log/${PN}
fowners ${PN}:${PN} /var/log/${PN}
fperms 755 /var/log/${PN}
diff --git a/dev-db/etcd/etcd-3.2.9.ebuild b/dev-db/etcd/etcd-3.2.9.ebuild
deleted file mode 100644
index 9de03c3233bf..000000000000
--- a/dev-db/etcd/etcd-3.2.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/coreos/etcd"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.8:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
- default
- sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
- -i "${S}"/src/${EGO_PN}/build || die
-}
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_compile() {
- export GOPATH=${S}
- pushd src/${EGO_PN} || die
- ./build || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- insinto /etc/${PN}
- doins "${FILESDIR}/${PN}.conf"
- dobin bin/*
- dodoc README.md
- use doc && dodoc -r Documentation
- systemd_dounit "${FILESDIR}/${PN}.service"
- systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- dodir /var/lib/${PN}
- fowners ${PN}:${PN} /var/lib/${PN}
- fperms 755 /var/lib/${PN}
- dodir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
- fperms 755 /var/log/${PN}
- popd || die
-}
-
-src_test() {
- pushd src/${EGO_PN} || die
- ./test || die
- popd || die
-}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index dd0ff5496933..2b836f89aaee 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,7 +1,6 @@
AUX mongodb-2.4-fix-v8-pythonpath.patch 439 BLAKE2B c21bad3d269eee2c93ff2192166054e9ddcb2c415aaa1763c95e63c56d1af05bdc1b629136f23468fc6f08a4990474e00ca9dbb37a6ac236dea7bc0b1b03e9a1 SHA512 8d8a73eaf605cac50fe429c7141500bbc0e4f308c35b36b4ec48b4123f3241b6f5dc2670725bc7caba5769949b254874e9c36871142635c552a4c2d05a339d2c
AUX mongodb-2.6.10-fix-boost-1.57.patch 482 BLAKE2B 933b6ab35e1a82238bf0f59140693368f897ef7f0a39b5a0620b089bd4c9c8ddf0489fbb646ca4987eb83fddf06c694a4f491512011fe01c6a55ba0637602c90 SHA512 23ce6b7c7b1d297ed45789e0b6486e699e2353bd4d3c7c0249b6df4efeb06695224e68f198f5a3c424e60fb20cb3f3d0b5d34f3ccc3ebcb9f964683acc5a4a5c
AUX mongodb-2.6.2-fix-scons.patch 1448 BLAKE2B f96ea6b01ace8b8f92a4d8622c6f0f432a63ae2297630e905ed6469e2a1136c838e437a65ef920067bb996ba79c9421736d18529255f7921c5311ba4756684c9 SHA512 acda6ee27bf2b9a75bb2a1484fa8754e4dc700e5bd835e9f48b528a89e46a6236c38b68d42d58be6bd504d6287f673e6d71d07807e42c93fd0bd4d492387b8a6
-AUX mongodb-3.0.0-fix-scons.patch 1455 BLAKE2B 3473107735b375bd3da870ceec5dc6eded5b21bddf6b28cec009aba97c082239c04a8c68c57179841138b4a3ff08820bbeb2c345a3766077065e6fe9d5a2c0b9 SHA512 2dcf2679a520028babda9dd05a593dcb8c935b7232477cb31bb6f3c4240de333f8b463134a27776bd1fe1ac346fe7a44a559d65c47885712b20620ef70654a92
AUX mongodb-3.0.14-fix-scons.patch 1419 BLAKE2B da2aaf46a04a1fb345b8e44ca950d8e1b0de8e1699d47bf146e879f6461b8329a5900265a97710df5a8195283d21007dc9a1bd2b3ecebb113f718d0fd0ed74ba SHA512 2cf591ee25d33adf98ca6baeb086fb8677720809bc3e2b9398bba6ae84548b2aa3dfd57216e185fc6aa0aa185c9a906fe2a1b97bc81942560f02903b24f7bd25
AUX mongodb-3.0.14-fix-std-string.patch 2341 BLAKE2B ae22f1c03e9230ee8dac8bacefcbd3dd193d8776dd2e86a761d5b0fe3bba823c3c1c8f9a0d2b91ff4aea0860c01289d7bc4b12fb91c02db72d0e4a755f40172f SHA512 1c1d46f4d058685371914ac70c8ad36fba387e9a140ddfd5650cf0411a73776d7b8ef6108a778eaeaa5ba22eba0e16b2301d257a47250a67e7e013d7bb402e47
AUX mongodb-3.2.0-fix-scons.patch 1738 BLAKE2B 0e85c39637900a67c7a04396963624e9e53cc5d482eb177e7845e10817ce51bc0bec32f91c7ba31bc953d26f9b28f05dbf3ee2423e058c4ea49ac101ece95434 SHA512 04f95586b46960405b7b1906ea3c3c75d37d6831a458f619347ac028c77db5744131cb7bf39cdf62bf564500b1f6785e25b9a0c0526f126bf2072269385afe45
@@ -9,8 +8,6 @@ AUX mongodb-3.2.10-boost-1.62.patch 702 BLAKE2B fb3822a1a212aae30f6fbb33a4a87f5f
AUX mongodb-3.2.16-Replace-string-with-explicit-std-string.patch 12636 BLAKE2B 21f04acd87242a11577a20cadde11a9cc994172532b933efba6e3f96ae6bb1aaa64ab271aaf7d286f84e77ae13a688682d19e815820d5ee3c64d8a605226adea SHA512 43a610b0c37c74576ef3e3df3734c4d9d904271dd3853003ff439f61099666a356ed5d4f046573a753c652dfe1e1c1607b1abe041482b740fe828f543272646c
AUX mongodb-3.2.4-boost-1.60.patch 3352 BLAKE2B c008120ace4dc5507fd0de68caf12a79465f61345a68be8a98a0dc84fe457bc7f04d0f99b9eab6644df34ac79efad1e7b77134cd7a29c65485568bce9e2b59cc SHA512 260c3edc3a04f3fae9f18fb73b3ae027709aa019751627d1a24b2ee40a72f91ef9de64606aff32c0890861fc56ae3c80341ba87cd16fffdd009b4fa5089c70db
AUX mongodb-3.4.0-fix-scons.patch 1411 BLAKE2B 6e5975b70ec7f281ea2cd101b16ee2849762fa1dd8427522eb3b01cd1738e60ece013bf23d07c180c58af024aebd141ca7fdf80bc240701f48556da46d3787ab SHA512 2e29c91a22663259d2f5413fbb2652702bceb122899e50a8969fb82d74a64a78649e79b005e20e6640740c089b1cee19080890eb8d9344c2ce355a977146b770
-AUX mongodb-3.4.4-Replace-string-with-explicit-std-string.patch 14244 BLAKE2B 83697815275b7018d5362664c0a207d369a5154de2d12fb7e99a6043ec52414b9d6de65bffdb8f1496581c3967f454b342e379f0575bdc84c379a095c0fedc10 SHA512 2f01729c2121fdad368c1bc157e4648ff933673107f3d1fb7de1a65e2bfc3a41c678eff345a5060bf26d45636947337cf2b5136a69ca06c012574a91a57d959a
-AUX mongodb-3.4.6-no-boost-check.patch 617 BLAKE2B ddcbcc0ff97a6df41305da7f8615ccdc75de70b582139a045717255ef5fd98610fc8a9bb7fbbb5e054555fa3e5c6ecbbdfd939baf5e2f1badb04f3182cd2d370 SHA512 a7047a0099ff5d0cab7efe60b6980df51b360a6b9750b8c6b4f6b841d9c98f0cc16f8d322de675ec9e97126d03081d4e574abd9b87c6a6c8b34481d9f57c7eb5
AUX mongodb-3.4.6-sysmacros-include.patch 1419 BLAKE2B f07ab093f13ea2b9675538dc99e2e58f85019edffad05bbbf3032f85f8ef881020cc9bf25bc62ca13344e7b8b7dd3b04954c76974c512a41ea5a7a2045de2b34 SHA512 ab269ec003b74848f981021f5eb09e38216d75dd9d1b8a155068b2a335d9ec9d1f5f575028ae9b4b0d8745d15e464cb05b70aabc6c28c984115574c6747afc05
AUX mongodb-3.4.7-no-boost-check.patch 641 BLAKE2B 0dc3a426b28cd80d7b3361ff9c6747aff64dd27c1bc01a9717c2dd1c160b66f53feb72fd2ead385c220ebe92a8c7b8fa6b04fb3fa8437dba17d5f8346665f6b8 SHA512 812eaaadb6f265cfc904e8f3a7ae8276e42e3968529914179efab5e44f1951ab46ac3bbcfb259f924b20a8ca61d2ebcf72b7103ea9d5f25594ff8e9e3e85836b
AUX mongodb.conf 246 BLAKE2B 6187573d7ac6da911030b215ef98173f4317d3f056ae9a2dfe7ce22d4d329355f49d373c253949048ad7a20d54750f0df95ade83c50bba0af5242b41cb8d40a9 SHA512 05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c
diff --git a/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch
deleted file mode 100644
index b7378d8ac416..000000000000
--- a/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- SConstruct.orig 2015-02-05 16:33:41.000000000 +0000
-+++ SConstruct 2015-02-18 08:21:23.120134258 +0000
-@@ -1008,7 +1008,6 @@
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fPIC",
- "-fno-strict-aliasing",
-- "-ggdb",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -1016,13 +1015,13 @@
- "-Winvalid-pch"] )
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- if linux or darwin:
-- env.Append( CCFLAGS=["-pipe"] )
- if not has_option("disable-warnings-as-errors"):
- env.Append( CCFLAGS=["-Werror"] )
-
- env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
-- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
- env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-
- # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
- # startup.
-@@ -1039,7 +1038,7 @@
- if not darwin:
- env.Append( LINKFLAGS=["-rdynamic"] )
-
-- env.Append( LIBS=[] )
-+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
-
- #make scons colorgcc friendly
- for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch b/dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch
deleted file mode 100644
index da33d47df7ff..000000000000
--- a/dev-db/mongodb/files/mongodb-3.4.4-Replace-string-with-explicit-std-string.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 9df9837299ab952d4d30db2427beef667e608f79 Mon Sep 17 00:00:00 2001
-From: Steven Green <steven@greenius.co.uk>
-Date: Mon, 17 Jul 2017 13:05:44 +0100
-Subject: [PATCH] SERVER-30166 Replace string with explicit std::string.
- Enables compulation when using --use-system-pcre which presusably used to do
- 'using std::string' in an earlier version of pcre
-
- https://github.com/mongodb/mongo/pull/1166
-
----
- src/mongo/db/dbwebserver.cpp | 1 +
- src/mongo/db/matcher/expression_leaf.cpp | 4 ++--
- src/mongo/db/repl/master_slave.cpp | 40 ++++++++++++++++----------------
- src/mongo/shell/bench.cpp | 14 +++++------
- src/mongo/util/net/miniwebserver.cpp | 1 +
- 5 files changed, 31 insertions(+), 29 deletions(-)
-
-diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
-index b202e0500b9..02556135240 100644
---- a/src/mongo/db/dbwebserver.cpp
-+++ b/src/mongo/db/dbwebserver.cpp
-@@ -67,6 +67,7 @@ namespace mongo {
- using std::map;
- using std::stringstream;
- using std::vector;
-+using std::string;
-
- using namespace html;
-
-diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp
-index d562bff141e..b96a36d543f 100644
---- a/src/mongo/db/matcher/expression_leaf.cpp
-+++ b/src/mongo/db/matcher/expression_leaf.cpp
-@@ -202,7 +202,7 @@ void ComparisonMatchExpression::debugString(StringBuilder& debug, int level) con
- }
-
- void ComparisonMatchExpression::serialize(BSONObjBuilder* out) const {
-- string opString = "";
-+ std::string opString = "";
- switch (matchType()) {
- case LT:
- opString = "$lt";
-@@ -884,7 +884,7 @@ void BitTestMatchExpression::debugString(StringBuilder& debug, int level) const
- }
-
- void BitTestMatchExpression::serialize(BSONObjBuilder* out) const {
-- string opString = "";
-+ std::string opString = "";
-
- switch (matchType()) {
- case BITS_ALL_SET:
-diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp
-index 05faad12599..042350465c6 100644
---- a/src/mongo/db/repl/master_slave.cpp
-+++ b/src/mongo/db/repl/master_slave.cpp
-@@ -168,7 +168,7 @@ BSONObj ReplSource::jsobj() {
-
- BSONObjBuilder dbsNextPassBuilder;
- int n = 0;
-- for (set<string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
-+ for (set<std::string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
- n++;
- dbsNextPassBuilder.appendBool(*i, 1);
- }
-@@ -177,7 +177,7 @@ BSONObj ReplSource::jsobj() {
-
- BSONObjBuilder incompleteCloneDbsBuilder;
- n = 0;
-- for (set<string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
-+ for (set<std::string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
- n++;
- incompleteCloneDbsBuilder.appendBool(*i, 1);
- }
-@@ -188,7 +188,7 @@ BSONObj ReplSource::jsobj() {
- }
-
- void ReplSource::ensureMe(OperationContext* txn) {
-- string myname = getHostName();
-+ std::string myname = getHostName();
-
- // local.me is an identifier for a server for getLastError w:2+
- bool exists = Helpers::getSingleton(txn, "local.me", _me);
-@@ -378,10 +378,10 @@ class HandshakeCmd : public Command {
- }
-
- virtual bool run(OperationContext* txn,
-- const string& ns,
-+ const std::string& ns,
- BSONObj& cmdObj,
- int options,
-- string& errmsg,
-+ std::string& errmsg,
- BSONObjBuilder& result) {
- HandshakeArgs handshake;
- Status status = handshake.initialize(cmdObj);
-@@ -398,7 +398,7 @@ class HandshakeCmd : public Command {
- } handshakeCmd;
-
- bool replHandshake(DBClientConnection* conn, const OID& myRID) {
-- string myname = getHostName();
-+ std::string myname = getHostName();
-
- BSONObjBuilder cmd;
- cmd.append("handshake", myRID);
-@@ -450,7 +450,7 @@ void ReplSource::forceResync(OperationContext* txn, const char* requester) {
- BSONElement e = i.next();
- if (e.eoo())
- break;
-- string name = e.embeddedObject().getField("name").valuestr();
-+ std::string name = e.embeddedObject().getField("name").valuestr();
- if (!e.embeddedObject().getBoolField("empty")) {
- if (name != "local") {
- if (only.empty() || only == name) {
-@@ -481,7 +481,7 @@ Status ReplSource::_updateIfDoneWithInitialSync() {
- return Status::OK();
- }
-
--void ReplSource::resyncDrop(OperationContext* txn, const string& dbName) {
-+void ReplSource::resyncDrop(OperationContext* txn, const std::string& dbName) {
- log() << "resync: dropping database " << dbName;
- invariant(txn->lockState()->isW());
-
-@@ -531,13 +531,13 @@ void ReplSource::resync(OperationContext* txn, const std::string& dbName) {
-
- static DatabaseIgnorer ___databaseIgnorer;
-
--void DatabaseIgnorer::doIgnoreUntilAfter(const string& db, const Timestamp& futureOplogTime) {
-+void DatabaseIgnorer::doIgnoreUntilAfter(const std::string& db, const Timestamp& futureOplogTime) {
- if (futureOplogTime > _ignores[db]) {
- _ignores[db] = futureOplogTime;
- }
- }
-
--bool DatabaseIgnorer::ignoreAt(const string& db, const Timestamp& currentOplogTime) {
-+bool DatabaseIgnorer::ignoreAt(const std::string& db, const Timestamp& currentOplogTime) {
- if (_ignores[db].isNull()) {
- return false;
- }
-@@ -627,7 +627,7 @@ bool ReplSource::handleDuplicateDbName(OperationContext* txn,
-
- // The database is present on the master and no conflicting databases
- // are present on the master. Drop any local conflicts.
-- for (set<string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
-+ for (set<std::string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
- ___databaseIgnorer.doIgnoreUntilAfter(*i, lastTime);
- incompleteCloneDbs.erase(*i);
- addDbNextPass.erase(*i);
-@@ -826,10 +826,10 @@ void ReplSource::_sync_pullOpLog_applyOperation(OperationContext* txn,
- }
-
- void ReplSource::syncToTailOfRemoteLog() {
-- string _ns = ns();
-+ std::string _ns = ns();
- BSONObjBuilder b;
- if (!only.empty()) {
-- b.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
-+ b.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
- }
- BSONObj last = oplogReader.findOne(_ns.c_str(), Query(b.done()).sort(BSON("$natural" << -1)));
- if (!last.isEmpty()) {
-@@ -877,7 +877,7 @@ class ReplApplyBatchSize
- */
- int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
- int okResultCode = restartSyncAfterSleep;
-- string ns = string("local.oplog.$") + sourceName();
-+ std::string ns = std::string("local.oplog.$") + sourceName();
- LOG(2) << "sync_pullOpLog " << ns << " syncedTo:" << syncedTo.toStringLong() << '\n';
-
- bool tailing = true;
-@@ -897,7 +897,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
- BSONElement e = i.next();
- if (e.eoo())
- break;
-- string name = e.embeddedObject().getField("name").valuestr();
-+ std::string name = e.embeddedObject().getField("name").valuestr();
- if (!e.embeddedObject().getBoolField("empty")) {
- if (name != "local") {
- if (only.empty() || only == name) {
-@@ -921,7 +921,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
- if (!only.empty()) {
- // note we may here skip a LOT of data table scanning, a lot of work for the master.
- // maybe append "\\." here?
-- query.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
-+ query.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
- }
- BSONObj queryObj = query.done();
- // e.g. queryObj = { ts: { $gte: syncedTo } }
-@@ -940,7 +940,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
-
- // show any deferred database creates from a previous pass
- {
-- set<string>::iterator i = addDbNextPass.begin();
-+ set<std::string>::iterator i = addDbNextPass.begin();
- if (i != addDbNextPass.end()) {
- BSONObjBuilder b;
- b.append("ns", *i + '.');
-@@ -984,7 +984,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* txn, int& nApplied) {
- BSONObj op = oplogReader.nextSafe();
- BSONElement ts = op.getField("ts");
- if (ts.type() != Date && ts.type() != bsonTimestamp) {
-- string err = op.getStringField("$err");
-+ std::string err = op.getStringField("$err");
- if (!err.empty()) {
- // 13051 is "tailable cursor requested on non capped collection"
- if (op.getIntField("code") == 13051) {
-@@ -1152,7 +1152,7 @@ int ReplSource::sync(OperationContext* txn, int& nApplied) {
-
- // FIXME Handle cases where this db isn't on default port, or default port is spec'd in
- // hostName.
-- if ((string("localhost") == hostName || string("127.0.0.1") == hostName) &&
-+ if ((std::string("localhost") == hostName || std::string("127.0.0.1") == hostName) &&
- serverGlobalParams.port == ServerGlobalParams::DefaultDBPort) {
- log() << "can't sync from self (localhost). sources configuration may be wrong." << endl;
- sleepsecs(5);
-@@ -1297,7 +1297,7 @@ static void replMain(OperationContext* txn) {
- if (s) {
- stringstream ss;
- ss << "sleep " << s << " sec before next pass";
-- string msg = ss.str();
-+ std::string msg = ss.str();
- if (!serverGlobalParams.quiet)
- log() << msg << endl;
- ReplInfo r(msg.c_str());
-diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp
-index 040002f5c6e..338477ebe56 100644
---- a/src/mongo/shell/bench.cpp
-+++ b/src/mongo/shell/bench.cpp
-@@ -674,7 +674,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
- invariant(bsonTemplateEvaluator.setId(_id) == BsonTemplateEvaluator::StatusSuccess);
-
- if (_config->username != "") {
-- string errmsg;
-+ std::string errmsg;
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
- uasserted(15931, "Authenticating to connection for _benchThread failed: " + errmsg);
- }
-@@ -918,7 +918,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
-
- if (!result["err"].eoo() && result["err"].type() == String &&
- (_config->throwGLE || op.throwGLE))
-- throw DBException((string) "From benchRun GLE" +
-+ throw DBException((std::string) "From benchRun GLE" +
- causedBy(result["err"].String()),
- result["code"].eoo() ? 0 : result["code"].Int());
- }
-@@ -984,7 +984,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
-
- if (!result["err"].eoo() && result["err"].type() == String &&
- (_config->throwGLE || op.throwGLE))
-- throw DBException((string) "From benchRun GLE" +
-+ throw DBException((std::string) "From benchRun GLE" +
- causedBy(result["err"].String()),
- result["code"].eoo() ? 0 : result["code"].Int());
- }
-@@ -1031,7 +1031,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
-
- if (!result["err"].eoo() && result["err"].type() == String &&
- (_config->throwGLE || op.throwGLE))
-- throw DBException((string) "From benchRun GLE " +
-+ throw DBException((std::string) "From benchRun GLE " +
- causedBy(result["err"].String()),
- result["code"].eoo() ? 0 : result["code"].Int());
- }
-@@ -1133,7 +1133,7 @@ void BenchRunWorker::run() {
- try {
- std::unique_ptr<DBClientBase> conn(_config->createConnection());
- if (!_config->username.empty()) {
-- string errmsg;
-+ std::string errmsg;
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
- uasserted(15932, "Authenticating to connection for benchThread failed: " + errmsg);
- }
-@@ -1165,7 +1165,7 @@ void BenchRunner::start() {
- std::unique_ptr<DBClientBase> conn(_config->createConnection());
- // Must authenticate to admin db in order to run serverStatus command
- if (_config->username != "") {
-- string errmsg;
-+ std::string errmsg;
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
- uasserted(
- 16704,
-@@ -1201,7 +1201,7 @@ void BenchRunner::stop() {
- {
- std::unique_ptr<DBClientBase> conn(_config->createConnection());
- if (_config->username != "") {
-- string errmsg;
-+ std::string errmsg;
- // this can only fail if admin access was revoked since start of run
- if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
- uasserted(
-diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp
-index 5f4165d42f4..7a7d0714934 100644
---- a/src/mongo/util/net/miniwebserver.cpp
-+++ b/src/mongo/util/net/miniwebserver.cpp
-@@ -47,6 +47,7 @@ namespace mongo {
- using std::shared_ptr;
- using std::stringstream;
- using std::vector;
-+using std::string;
-
- MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx)
- : Listener(name, ip, port, ctx, false, false) {}
diff --git a/dev-db/mongodb/files/mongodb-3.4.6-no-boost-check.patch b/dev-db/mongodb/files/mongodb-3.4.6-no-boost-check.patch
deleted file mode 100644
index 2abde5ef08e0..000000000000
--- a/dev-db/mongodb/files/mongodb-3.4.6-no-boost-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SConstruct.orig 2017-06-27 19:02:43.000000000 +0000
-+++ SConstruct 2017-07-07 11:33:13.252639289 +0000
-@@ -2798,8 +2798,6 @@
- if use_system_version_of_library("boost"):
- if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
- myenv.ConfError("can't find boost headers")
-- if not conf.CheckBoostMinVersion():
-- myenv.ConfError("system's version of boost is too old. version 1.49 or better required")
-
- # Note that on Windows with using-system-boost builds, the following
- # FindSysLibDep calls do nothing useful (but nothing problematic either)
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index e087f2340dc6..6d64e8389c56 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,6 +1,8 @@
DIST mycli-1.10.0.tar.gz 272722 BLAKE2B f2a4d7b76684718167fb6bb4f90a96a31b669cf1f35c266ed544d00b4fe4f9b0cb2c6d81e161d41f1df785e2dcf79056a675857f8400d8cd7811199ea00064b7 SHA512 d66866fd23ee2be3f1bb47d1414b8151c2b50e8844a2553e139f753ae55dd010d1c23aae7c5863891ea4f347b124145405dc7894efc27fc8fcb74127c14261f8
+DIST mycli-1.15.0.tar.gz 275065 BLAKE2B 47ae049a7a669d18fc2bb467dd4ee6d1bbe23a86115db6d1965c48c93a2a1be9bb8b4427b377f8ce935b957c854c1c4bf4a87fdea07f27329a13fd6a28b59559 SHA512 7a7d98220c4a679340dbf3c3c9fb3eaab7698f7abbe3e62835a03df10b59c79f0dfd916e9f7b39f12215063849ecadf9d08d086d14b00666b67bac1d092609f2
DIST mycli-1.7.1.tar.gz 266597 BLAKE2B 8fc6006dbb85a7053d67040d492ba12619507160efd240fdb89125794a01fbb439756bdeb420c306a883db925f6ec7ae0c36657c4c4b2197cfb702fc77babcb1 SHA512 5c61fe67f3205dd1123ed8d38441cda0574db04dd46b7e075d216f7aa8cd856a2f06a1b4bf7dbe9fd0b07f3e91c151fe3f885d10d3db488b6c306e0ce9ac9e7c
EBUILD mycli-1.10.0.ebuild 821 BLAKE2B 49aeb85ed7281c5aaa1fd973e81d3daa2e0a27b38452b55a9ac8b9b97c99ee9aeb6f47a3fba83c35e6e8391b7bebd3b6c48d4bbb6d1392eb43cf25613b2764ae SHA512 16df33c8943ccc83bb5e22f4207490d5850ce3d38d252c5f7035c066a906481a3ece64ec185c15fb5945d34a4ca1b88189c2233fb3f44eb0c1c89b3f2734bd1e
+EBUILD mycli-1.15.0.ebuild 901 BLAKE2B 4bf9e1310bff73b0b9583510d656b592028d6f4a81750b91b68275ebf82c696ab09679c43cf4f6811e7d04935bb8d7bcea861c3e152eb89ea921bda1b0dc1d10 SHA512 55d9537211a79d416cffab3212c1c00d6649760cf6f129807783a2e92f9b3a70a71e2fd4def6b915d1b111f53c51dee8fbcea27a844de8ecaad71e40aaf18378
EBUILD mycli-1.7.1.ebuild 939 BLAKE2B 1a3f30af359d528c8bd882c44857ba58e24db4618ead1d741de4ed2fa0ad1574b6489a4c2d97fec1279142cc2e2af7b7a3de55b3ab4cd050c1f05e2305c38633 SHA512 75c6921589218796a539089db1c06e107efd506809d1e7337bddfe98d1491fc13e80500b0d0fa6364aad7ee751ed69e0a040339a918239b3a5268c0886fa4a03
-EBUILD mycli-9999.ebuild 850 BLAKE2B 5ea1389445f679d85e264498fc68307e550f3b4ac3313c05397407a96eb7098f477644270a49f8ba88a806d722e2fa807237e4ecefec3686183777a509007008 SHA512 943c12d1b8536b231bed08837a9260ed45d12f9794e16fe5f8de333ea49e00cc6335040e2f60589871072bf9406254683df29d75ad81a65eab1fdc4f3f6f661e
+EBUILD mycli-9999.ebuild 881 BLAKE2B 9f864204cbf3697a29477c5fdcf5e1b2742c226db8f635675d3894f3cede78cda874c1a8b17b348499549a3bcdcdc3cc4f42110bf82ba7da3d64e68a6a6fad02 SHA512 97f0726752da1cca2ea7ab970d0d8bfc49c40f78f849f8529f6a7d3b03cb7a5be809abf7847b531944fb9a448f12bb515a2ae68b05ab585a42b6bda087df40b9
MISC metadata.xml 322 BLAKE2B 16f308194537f996ff6a54d92c996267e2ea37d78d9377d3d3b5a6246ebf511c9dae536f03627a32885753a2d3943554a9748513a036ef6e10b952e5281ecfbe SHA512 ae5215f13b457aa43dc95d67bacc371292f0c8f6540dcb49633f0120232dbde7fe12479c3ff16c203b20ac96700be12c187444a768f50e319320684553509dd1
diff --git a/dev-db/mycli/mycli-1.15.0.ebuild b/dev-db/mycli/mycli-1.15.0.ebuild
new file mode 100644
index 000000000000..8db9aeb27412
--- /dev/null
+++ b/dev-db/mycli/mycli-1.15.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+
+HOMEPAGE="http://mycli.net"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+ >=dev-python/click-4.1[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
+ !>=dev-python/prompt_toolkit-1.1.0
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+ !>=dev-python/python-sqlparse-0.3.0
+"
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index e58d1eb05b00..3deef04e91b4 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -17,12 +17,13 @@ KEYWORDS=""
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
- >=dev-python/cli_helpers-0.1.0[${PYTHON_USEDEP}]
>=dev-python/click-4.1[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
+ !>=dev-python/prompt_toolkit-1.1.0
>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
>=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+ !>=dev-python/python-sqlparse-0.3.0
"
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 0df5e68aa1bc..78ad97b61fd6 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -8,7 +8,7 @@ DIST antlr-3.4-complete.jar 2388361 BLAKE2B 561c1dffe464bbc387075df6d95bbdcab273
DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325 SHA512 f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 BLAKE2B 54941a760cc44b745039a59d0ad88e109605c47285b34098d7ebc9e7a32758027c07219f7b8dc96fad198fbc68086582ccfa5ba7e7a35fa1fff8ff57b467f91f SHA512 8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 BLAKE2B 0991036cedc3198e789369a40641cc318fdc4230c2b6242b923e836c50248e3e1f5b891c1ce7465d132c30e482ef5458a19ed8b9e4a9865719be8eda61eeb1dc SHA512 a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901
-EBUILD mysql-workbench-6.3.10.ebuild 2621 BLAKE2B 1a2583c3a0cf268ab0c0d52203773612fa115a1c6096d4a4571ca40bedbeff4cf3fe95bccf75512705d4c3eed7cf72a0358b1dd6acccbb95fa1e1eb2d6c154ef SHA512 26f05929ce84c1e64e5d3aadf95d19431ba129528bff947646a9b952a155887f773370caca1d44d68f7d09d7b0b9184d77d44ef3eb6ceb016976a549369bc1cb
+EBUILD mysql-workbench-6.3.10.ebuild 2690 BLAKE2B cbea5b68d89b90e9806e55ee8166f6a3a9528a4b883267e70617e2e54bbb9a3ff2479e6b6a97551d5315f4b87cf41bae7576f142a32c108260b5536f9f4a56c8 SHA512 7199940aabe6f2b90a3f9999fdaff72bfd52115cbb3a25f4a2b611e6962490c93fd384fd0d7de4fc54ceb95730ad5d9fa124f8221210822b05c3fdcb0f3dac81
EBUILD mysql-workbench-6.3.4-r1.ebuild 2823 BLAKE2B e0982f34995ce56ba191c6b19492757438171b628aecf12641192bfc84a94d226ac745916b12d3b27fc8537e040e3a72bd4ae572b0c18c71f032ae4f0f2222c4 SHA512 b3865e92b552dbaedb60989602401608fd792908f6abf9cdc44786242b765120e36029a86e6169aef8c87c3ed0392ca1655596603fb06591931717da942d3ccc
EBUILD mysql-workbench-6.3.4-r2.ebuild 2644 BLAKE2B 1f00d454567aa281b7535a4eaba509b094f4a00010718a78913eb2bd1f55b83d6d622767d0b66d15450ea1586e3d1919bb2af0ca139ea946be6cfeae7412aa6b SHA512 18873a92067d037bfcf2f69e95acda490968a8ca752bc34a83c925f29c894a2c721d01418046b983827b93aeb7cbf7695fe4ff5563a33e60b1775a8280fe1f3e
EBUILD mysql-workbench-6.3.9.ebuild 2621 BLAKE2B 1a2583c3a0cf268ab0c0d52203773612fa115a1c6096d4a4571ca40bedbeff4cf3fe95bccf75512705d4c3eed7cf72a0358b1dd6acccbb95fa1e1eb2d6c154ef SHA512 26f05929ce84c1e64e5d3aadf95d19431ba129528bff947646a9b952a155887f773370caca1d44d68f7d09d7b0b9184d77d44ef3eb6ceb016976a549369bc1cb
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
index efa53cd769f5..178a44ec3f9c 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -78,6 +78,8 @@ src_prepare() {
## remove hardcoded CXXFLAGS
sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+ ## And avoid -Werror
+ sed -i -e 's/-Werror//' CMakeLists.txt || die
## package is very fragile...
strip-flags
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index c820c542e065..5485a8d54c47 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -2,6 +2,7 @@ AUX postgis-2.0-arflags.patch 539 BLAKE2B 5e2e9c332aaaaaab6b5e80e1e4cc43b743bd49
AUX postgis-2.1-ldflags.patch 1367 BLAKE2B aa604884a3f6ad9996fa0fa0ffdd912eba1036a2cb0ef44a257c5bb38aa95bfdafcd730af5961c7505562f2ce1ee32315fdb05da7ae6dc3e8fac92bab3d6be4f SHA512 7bfce943698b8ba41fea5606c1a3dc43b2cc11daeb8e81e432701c2cebf300984ff54e8c8817e245ec4195a85b8d28bcfc6b30d111bd6c05341c93e7c769ab35
AUX postgis-2.1.4-pkgconfig-json.patch 4276 BLAKE2B 9b0d05ec5ad7b6e2d74aeb4ca0109994395d404f42be6b2cc7b7261cd0ee4bf0e865dba081db1f582314cd230c6edaf066436e0737a83a1580343c7070d494e1 SHA512 7439b2221bee6e3940485b1964edda10d320493b3dc8b86e1579824a9f0c6b5ff21a3d444077fa331096a9e0e4442df2c792d8a51c79dcf6c680404cbebf9275
AUX postgis-2.2.0-arflags.patch 535 BLAKE2B 6420573e9623d4e2115ed3616bc3b8648ae7782bf4624ee60d3827a4d61cbdac1dc62b4937f36113ed6d0856af4728f5cc1b544d502512e88dd87a7b590135ab SHA512 7f8b92a582dd11b3040832278b75e65036315ca0e438cb9b19cc5b63a7b5c5bcae8ec274a487a29abadfbbc31cdfacf6c668e46f249d4bf88c09607501cacf66
+AUX postgis-2.4.2-jsonc_0.13.patch 786 BLAKE2B c55fd81f28b9a4db965ef3f4bb3ca6fcf2cd6ba44d4f7a93c35ade90ffdcb195325ce219348aa6dc3645f6822214b4bc75263c02fc316f3dd9b4369114eb5493 SHA512 9088304bb77db2d86dd077510f94ae8b3796474a02377f1f076476c739d9506f0b7c7c6dcf6e90ad51e84bc528302a6ecda4bedc6eac42dfeba3a71c0144a399
AUX postgis_dbs 2096 BLAKE2B 97ff57e264e6a6ddd68ff0e87fcb1a3646c54f953cb370eef95bcc237ed550b494df2a1ea9a023c9be1d794003b71a9e10a3c9aa4fb1a8074b2f0eb4ced749f5 SHA512 5a11a3ce0153461f363d1b9a393dd10392e123c7b18b20610a5e26f2c7c6ed258a1517082a244c6ab5de40d439bc8a370848a0177c3c2ffcffc67a24fca8e66a
DIST postgis-2.1.8.tar.gz 6811272 BLAKE2B f39debafea797fec2595b1ba2256ce3ed19875f15e57829f3480b15ec82ddfbc51702bb29513a9b1cd381696ee0b0857c34e79395a1f627f38a1e41344485ba7 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4
DIST postgis-2.3.3.tar.gz 11342032 BLAKE2B d50eb0b43f56c31768c40083677e54f547e183287feaab6b21d223b49bb19c3599031f186f0f783b9c9c948e7ed0bcd4a0918e65e61babad35f6c37eacc8f981 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c
@@ -10,6 +11,6 @@ DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 116bb5d1c8f6066d537cac950254923a681ba
EBUILD postgis-2.1.8-r1.ebuild 7355 BLAKE2B 2558aea2a69722d1d2c67713fdd839991dd8530af69d9fcc6c109dfce8a164efd57bfcfbe0423accc243a3d826152d5c9e9062789712dd8bd569c715a69361e6 SHA512 e9d76347fe6962406190a4005fa8b17e7c9d02e58c0374de25441014def93923e726c6943e0e482a3992b9c3f42a36186ba486d00a60ff64e4d4051471ac554a
EBUILD postgis-2.3.3.ebuild 2736 BLAKE2B 73c2720eefa27ee1f4443ac028b0552d8686d78e6f493d6f1c8cb32dd68a373256151a2898d1c08dff597b7a42c09b027e7a320288bc6e42746be5523b072e90 SHA512 1f0dc5ad11cddbe1ac8c9a361180aa224cc7709e67ea94cf0e14338014221d2838055f45b3fbf91cac1e0c7f330209f026f66b1d1c10bec789caf98fa38e5a27
EBUILD postgis-2.4.0.ebuild 2739 BLAKE2B fef6b6ce675926a548d124386eedabe6e509412ed053ad02fd56dbb39798de1e100f24153875a9a78641c21b43642cd97bb79d23cd775db9a3842598527f91a5 SHA512 e22ddc46b7c604909375b9ca4ec6eae5b986690ac3e9b2df276a0c9b900692df6d9d7287d11efd51ad97e6706bcdf940aff91d3c9116e499c9c67d20f26300b1
-EBUILD postgis-2.4.2.ebuild 3060 BLAKE2B c9775cc4ccf349c31d7902969cef84779955b13d8499f02f457d3ea67a2c232b65ebcc196cea9d85018314950133787911e044b189e999abe3eab799ed6c464e SHA512 b33106a8c0f6f84ff103bb039dce95f69bf5836362b121f00b08737499c44e28c238b85e80b52407786bf6e5b76838f30ade1bf15f5349b1b5a1f809441c3925
+EBUILD postgis-2.4.2.ebuild 3112 BLAKE2B 3f63e7cec38fe350d605c261aedbff2fc729e2d5e38e42c7daf0d507a5f404599f135d00d778640f135db9a1eaad8861427653a431c431c4da386f183306f0f4 SHA512 51e0ebb4de30214753166bbd878dbca38fffc3f83960e0be69bb97dadac759b06ea09caa3b69ce9fd2cb1d82ceba6c0eeedcfc73921fea8b94d14aeb2f8932db
EBUILD postgis-9999.ebuild 2647 BLAKE2B b379c0ebfd30c407817139b72264bbb70c0cae3ba281b2f2ffda38c61c851bb363266e2675437e32dd3ffc80a6c1dca4608e34833d7a729cbd6997eb2501411d SHA512 4b654b604752b9e30ea0662e89429e0deb74e1ce6cfb8beef34f8bf33ea2aeb28e07398828fc5ddc3d27a520258313cb552b7ef24069ca5b9001a4db7aaa1cec
MISC metadata.xml 779 BLAKE2B 9dfbc86514c5f6e0c859dc41a46890e4f518f23c572786bf340112eadf21b35f5f583a3835f6ba58bef8c99a7ef8483f3a98898d372d1c0e5cc537bb9ecc2b12 SHA512 33ad2ddabf49e97af2cf188f2c0f72e1a936c228b43d8d3637230c43be0df82ec2aa20b63cb5f2385e936c215263fcd009332afe504bc5f30746a387b9b37ada
diff --git a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch b/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch
new file mode 100644
index 000000000000..b980e77333d6
--- /dev/null
+++ b/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch
@@ -0,0 +1,23 @@
+diff -Naur postgis-2.4.2.old/liblwgeom/lwin_geojson.c postgis-2.4.2/liblwgeom/lwin_geojson.c
+--- postgis-2.4.2.old/liblwgeom/lwin_geojson.c 2017-12-21 22:52:40.422802160 +0100
++++ postgis-2.4.2/liblwgeom/lwin_geojson.c 2017-12-21 22:55:36.605430945 +0100
+@@ -31,13 +31,19 @@
+
+ #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */
+
++#define JSON_C_VERSION_013 (13 << 8)
++
+ #ifdef HAVE_LIBJSON_C
+ #include <json-c/json.h>
++#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
+ #include <json-c/json_object_private.h>
++#endif
+ #else
+ #include <json/json.h>
++#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
+ #include <json/json_object_private.h>
+ #endif
++#endif
+
+ #ifndef JSON_C_VERSION
+ /* Adds support for libjson < 0.10 */
diff --git a/dev-db/postgis/postgis-2.4.2.ebuild b/dev-db/postgis/postgis-2.4.2.ebuild
index dca731bcd115..52c149a6122f 100644
--- a/dev-db/postgis/postgis-2.4.2.ebuild
+++ b/dev-db/postgis/postgis-2.4.2.ebuild
@@ -61,7 +61,8 @@ MAKEOPTS+=' -j1'
QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
src_prepare() {
- eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+ eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" \
+ "${FILESDIR}/postgis-2.4.2-jsonc_0.13.patch"
local AT_M4DIR="macros"
eautoreconf
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 19:58:14 +0000