gentoo resync : 02.08.2019

3 files changed, 11 insertions, 12 deletions

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 453061757eb4..7dc7abf73093 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -3,9 +3,9 @@ AUX mysql-workbench-6.3.10-i386-json.patch 7167 BLAKE2B 44a6e2446b24cd2f7f096d51
 AUX mysql-workbench-6.3.9-mariadb-json.patch 2320 BLAKE2B 9dcf7ca5091109ab71a201a68aa16259402dae85d4ea1135fbce476dbc0d4f49ad154005a6fe6195ce86ffba49ebf3d03de8ac94b6adcda2a297600b1ac6d0d3 SHA512 23e4135ee5c8b7cc7b70cc6b5170209c9a6350cfc7e8450d29a1098c31472b68494147ec4f1286365f7802af72570f4822b0078ae269affbbaf98e3ad9e99eb4
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4 SHA512 fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71
-DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43 SHA512 f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055
 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9 SHA512 e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
+DIST mysql-workbench-community-8.0.17-src.tar.gz 15777302 BLAKE2B ba1aebfc5f9b55e88529bdbc5ebe42da594fce1da0ea64bd0153294293fe4c2533bbc00aac9c1ba0942577eff90c1b522ef1af803e56edf0c361876ac5dea764 SHA512 c7b5f68e4a2fe30d33fde5f18a03342e034a8c10edc2506278dc09751f264884f1dba3d68c430594ac09d26b692465409d2189c2b2a440d80aca7ad00188a39f
 EBUILD mysql-workbench-8.0.14.ebuild 2718 BLAKE2B 4abd1c59b13bf3ce319c9959c8caabd4121a34ca4718aa08e7f508ff5f28326f7a2023d38ed5380666382f25255f831f869e8aca12b9fe70a5110ef86365ada8 SHA512 bd43c28ec80e357841aa9775dfc83367cc9f972f877b30097aa930ca8a03cbfd50376d30a13739cdbcc4ba2960215b209a979249d8365dca867891c70efe755c
-EBUILD mysql-workbench-8.0.15.ebuild 2720 BLAKE2B b226b0dbdd20925395c3f98be1377688b9cd320463a16ce8f169627632acdd41c19edd140b74d1273aea1ae00c1f1fd2fb3da8c7e2f31bfdebfae3435ff19b2e SHA512 4654925e83b481f0e47c65319165b18b55965c43db2ea056e5a576d55381ecd76335a33c6c81d8d7113fa1a20cf9d1ba8503f83f3595b1c462a33b5d86111473
-EBUILD mysql-workbench-8.0.16.ebuild 2639 BLAKE2B 6c098dd06091de5bfbd409adf57157675b6fad999fb4f3e2384a940233d7d1bfd5c0801edf6cd58089a86e9a319da612b95d4a8b46fd1dee58711f187bb47ca1 SHA512 275b70d0bda900f19e36b51d067d9e2078860c85eb071302567ed734d3bc04fe026fcdc57f3ba97a5103e0889002ee5e0acbf97da6ce64590b6bfa8333a41600
+EBUILD mysql-workbench-8.0.16.ebuild 2637 BLAKE2B 3b51c37e36967fcb2b88693953c18729ef3932ef2c8af677fb36ec9a9fce324d2897364b07cae56753fd4c793b832e55096935959019e8c23446a4a3ed886763 SHA512 a4ca773c4f10e60d3413244f0f7599dce9ce740e3e39bffd4bd150b8a5bcbe30f038f85cd4dee05d9495bf9fb69658867a926f5c15415f2647fa18f7c8bf510c
+EBUILD mysql-workbench-8.0.17.ebuild 2626 BLAKE2B f35131ede307c0084de78b4b2c0f131ec9c5e2d01c0a1fb61aa41536333a9605c7f5185c7a9800bfcdf37480632d5240e94b77f986e42f5b546bbbce8e2dd26a SHA512 3a17d3f41be4e6244db474139d76d8a993053df0c57fc0001eb1ed7a43a85c750931a905b5955e99cf2ac64db83b61e5151504a95c9bd115f2f96099afdc9ef2
 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
index d08ef942bec5..fefdda53c4cd 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://www.antlr
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
index c5dfe62875e0..885387e35cc7 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
@@ -7,13 +7,15 @@ GCONF_DEBUG="no"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+ANTLR_VERSION=4.7.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake-utils
 
 MY_P="${PN}-community-${PV}-src"
 
 DESCRIPTION="MySQL Workbench"
 HOMEPAGE="https://www.mysql.com/products/workbench/"
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz http://www.antlr.org/download/antlr-4.7.1-complete.jar"
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,7 +33,7 @@ CDEPEND="${PYTHON_DEPS}
 		>=dev-cpp/glibmm-2.14:2
 		dev-cpp/gtkmm:3.0
 		dev-libs/atk
-		>=net-libs/libssh-0.7.3[server]
+		>=net-libs/libssh-0.8.5[server]
 		x11-libs/pango
 		x11-libs/gtk+:3
 		gnome-base/libglade:2.0
@@ -42,7 +44,7 @@ CDEPEND="${PYTHON_DEPS}
 		>=dev-libs/libxml2-2.6.2:2
 		dev-libs/libzip
 		dev-libs/libpcre[cxx]
-		>=sci-libs/gdal-1.11.1-r1[-mdb]
+		>=sci-libs/gdal-1.11.1-r1
 		virtual/opengl
 		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
 		dev-libs/tinyxml[stl]
@@ -75,9 +77,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \
-		modules/db.mysql.sqlparser/CMakeLists.txt
-
 	## remove hardcoded CXXFLAGS
 	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
 	## And avoid -Werror
@@ -95,7 +94,7 @@ src_configure() {
 	fi
 
 	append-cxxflags -std=c++11
-	ANTLR_JAR_PATH="${DISTDIR}/antlr-4.7.1-complete.jar"
+	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
 	local mycmakeargs=(
 		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
 		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"