gentoo resync : 20.11.2017

2 files changed, 105 insertions, 0 deletions

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index d909151d95a5..9fb37add3f78 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -5,8 +5,10 @@ AUX mysql-workbench-6.3.4-cxx11.patch 1550 SHA256 53f63681ece9f2efaf45782ac816f7
 AUX mysql-workbench-6.3.4-gtk.patch 1190 SHA256 82376441bc452d2afe7ce55dc66edd69e8ccdc218f094c50ad30e5e906257618 SHA512 81af1d9dbe40b0ad04e9d8e317a1b47832b864071e26ab954237f850685bdb53ad84fedf4aa546e83f4dd122e368d1bc90e46e9b6261104b86998607b7830d33 WHIRLPOOL 7af06b97839a5e2a561649be0c5d67db5b7c57201ac57febc54e5d645194eec9c4e02ed93ef52e9af1078e1f23e00e48c0773bef3d61f30df14fcba102631b65
 AUX mysql-workbench-6.3.9-mariadb-json.patch 2320 SHA256 f176881b7f75db8fdcb3bf523116132b57a2cbf07c41b22b4f7a97855cf68f1c SHA512 23e4135ee5c8b7cc7b70cc6b5170209c9a6350cfc7e8450d29a1098c31472b68494147ec4f1286365f7802af72570f4822b0078ae269affbbaf98e3ad9e99eb4 WHIRLPOOL 5b19c530ceeaf0273db116881ecd2ff4abbf9b2e8ddc28ccb05f108004efb20013bb7f351feafc892610d286fc7452f913d0db4604ff22cba23dd51fcee7b794
 DIST antlr-3.4-complete.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
+DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 SHA256 b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3 SHA512 f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d WHIRLPOOL e5d589a15a41a63861ad479a56b8d843487cf739fe9c3422796ddfac1577e7535e6c8c3531ee01595fb7780c524dd186371740ae36ed2d508b36fc7d9e764874
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f WHIRLPOOL 9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5
 DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 SHA256 607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951 SHA512 a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901 WHIRLPOOL 654eaa76d6f132e50ca904aae54c07a7d2aabe746e519f5c6c8cd5d40529ebe022616d5ef28be8dd322aba19e589dc8d9dd2bb4c5f2356fa7b5698a84190208e
+EBUILD mysql-workbench-6.3.10.ebuild 2621 SHA256 c894ad19d032f22379c090f943c149b9b21ac527093cd01c7b5a5bcf169f3ebd SHA512 26f05929ce84c1e64e5d3aadf95d19431ba129528bff947646a9b952a155887f773370caca1d44d68f7d09d7b0b9184d77d44ef3eb6ceb016976a549369bc1cb WHIRLPOOL 60ef55be7f05c59b34ce988e5e086182fe29feb753eae69f52f1c93635b887e68695211f987c4e045df277abcd7047c3a096835f8ff7c413dbfee2f06b8c87a4
 EBUILD mysql-workbench-6.3.4-r1.ebuild 2823 SHA256 866fff18e03b405280508bf8c84223e74742bdd5d5d5c4f70dfe7b0d2f284ead SHA512 b3865e92b552dbaedb60989602401608fd792908f6abf9cdc44786242b765120e36029a86e6169aef8c87c3ed0392ca1655596603fb06591931717da942d3ccc WHIRLPOOL 1b8ec2a2209b934133de3fe535e936429cccdda8394f730671dcdb8a4cdbd8cc5fa215896fedcb833e888fc4fd5d549d1ddba159b7e02478ecccc0c13e7e66b2
 EBUILD mysql-workbench-6.3.4-r2.ebuild 2644 SHA256 4841553433623e4e17c50636e21dcfb497f8c3dc95102835862fa2907a19ef08 SHA512 18873a92067d037bfcf2f69e95acda490968a8ca752bc34a83c925f29c894a2c721d01418046b983827b93aeb7cbf7695fe4ff5563a33e60b1775a8280fe1f3e WHIRLPOOL 5c0058348e671a5d2ac527f68e39a009511ff32f9b15e64aa095fd5b96cf4e28aa12e62e9ca842db1ebe2a93d0a9b92cc899e13e6627d2370b003e4464cf7b50
 EBUILD mysql-workbench-6.3.9.ebuild 2621 SHA256 c894ad19d032f22379c090f943c149b9b21ac527093cd01c7b5a5bcf169f3ebd SHA512 26f05929ce84c1e64e5d3aadf95d19431ba129528bff947646a9b952a155887f773370caca1d44d68f7d09d7b0b9184d77d44ef3eb6ceb016976a549369bc1cb WHIRLPOOL 60ef55be7f05c59b34ce988e5e086182fe29feb753eae69f52f1c93635b887e68695211f987c4e045df277abcd7047c3a096835f8ff7c413dbfee2f06b8c87a4
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
new file mode 100644
index 000000000000..efa53cd769f5
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome2 eutils 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 https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+		dev-libs/glib:2
+		dev-cpp/atkmm
+		dev-cpp/pangomm
+		>=dev-cpp/glibmm-2.14:2
+		dev-cpp/gtkmm:3.0
+		dev-libs/atk
+		x11-libs/pango
+		x11-libs/gtk+:3
+		gnome-base/libglade:2.0
+		>=x11-libs/cairo-1.5.12[glib,svg]
+		dev-libs/libsigc++:2
+		>=dev-libs/boost-1.55.0[nls]
+		>=dev-cpp/ctemplate-0.95
+		>=dev-libs/libxml2-2.6.2:2
+		dev-libs/libzip
+		>=virtual/mysql-5.6
+		dev-libs/libpcre[cxx]
+		>=sci-libs/gdal-1.11.1-r1[-mdb]
+		virtual/opengl
+		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+		dev-libs/tinyxml[stl]
+		>=dev-db/mysql-connector-c++-1.1.8
+		dev-db/vsqlite++
+		|| ( dev-db/libiodbc dev-db/unixODBC )
+		gnome-keyring? ( gnome-base/libgnome-keyring )
+			dev-python/pexpect
+			>=dev-python/paramiko-1.7.4
+	"
+
+RDEPEND="${CDEPEND}
+		app-admin/sudo
+		>=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+		dev-lang/swig
+		virtual/jre
+		virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+	"${FILESDIR}/${PN}-6.3.9-mariadb-json.patch"
+)
+
+src_unpack() {
+	unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+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
+
+	## package is very fragile...
+	strip-flags
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	local mycmakeargs=(
+		-DUSE_GNOME_KEYRING="$(usex gnome-keyring)"
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
+	)
+	ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure
+}
+
+src_compile() {
+	# Work around parallel build issues, bug 507838
+	cmake-utils_src_compile -j1
+}