Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 158 insertions, 17 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index e6985736a037..c6677f4f932d 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.111 2015/04/08 18:45:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.112 2015/04/26 08:43:14 graaff Exp $
+
+*mysql-workbench-6.3.3 (26 Apr 2015)
+
+  26 Apr 2015; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-6.3.3.ebuild,
+  +files/mysql-workbench-6.3.3-mysql_options4.patch:
+  Version bump.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> mysql-workbench-6.0.9.ebuild,
   mysql-workbench-6.2.3-r1.ebuild, mysql-workbench-6.2.3.ebuild,
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 9ed3383cfac7..b675f7c0c232 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -10,32 +10,23 @@ AUX mysql-workbench-6.2.3-ctemplate.patch 1253 SHA256 87e4dd4878b2cabee0534c25ce
 AUX mysql-workbench-6.2.3-glib.patch 1814 SHA256 48c265c32cb4647d5d1ac1bd278a2767c5d1300f7b5e4b71a4c29e6c0232cdbf SHA512 504c069bdf4a797b5a0c46cb901abba3f69d83049802e5ca5350bffa47ae4f032de4c60092df5d3d8db99f344418ed22491e0803f90bcc308b95991fd8a194d0 WHIRLPOOL 6bd2e776020837d7683f135c16a81c1664d81ce4edb47028517a0c7d711c84ab8066c99d79160127b4d9af3b58c39c5ae946fc690f1a2e2406fd75fdd05a167c
 AUX mysql-workbench-6.2.3-paramiko.patch 2119 SHA256 bba8601d15bc2d7d462c156598d1d70b9f0c9374a77c7d3a1c98288aa71b3935 SHA512 66d9da29c936e575638db3b4f21118e4e11b0f6918226224ca69eef37cad3557ee631502e82b2c2fcd66b785e1d256846622470c44462669e7e96c1e14962112 WHIRLPOOL 5e82e35e6f54ead7c393ccc5cf5c4ca22a9d42fb16c4cbae8a3bf97e69111b63f0a3c23499c0c75b88120b5eed0573138a51d61d90e9b58236047bbb88383f04
 AUX mysql-workbench-6.2.5-wbcopytables.patch 492 SHA256 6e78fcaf5d46897ed98e55bb7924445c553349936a537eb71b665dca06b66e62 SHA512 e6e56e259a6037730b7940a6fe22a49f434c01a331f4fdd3d865fd25bd1effaf88e00d5b3f76c847cab1adb38d7764ff705ded5693f51ce9005bc9a1b672fde3 WHIRLPOOL 4fd19f924f9e78d7053195b313ad56c3189cbf5d8dce82f68cbf449f89047d7535559138fa5a5345df0b2347ecddb3b5d60fe46e9874414d52291fad027e7f3f
+AUX mysql-workbench-6.3.3-mysql_options4.patch 1713 SHA256 e47ee64a732ec5b85c32aaa2a54ced4ce1162d954b35c318d07e1574a7e93dd3 SHA512 6371903765be6eb2f489523d10f6662e20903da2dd5755445c2cc8dcdcf07f0b5aa7b694b89fa7b625452d5a3f8b9157bad2278dc875de2b7b6c23daf4438539 WHIRLPOOL a39fd89838637ad801a0a1d2524ef0acb0f54821c05433b199769ea5fff1f15fa51f85115c60f86864c1dddb34863a7c06a6a0280bf310332060e44b1f46d848
 DIST antlr-3.4-complete.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
 DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c
 DIST mysql-workbench-community-6.2.3-src.tar.gz 14576661 SHA256 4caba8cf1f8dc0fc57e98a6170ad4718ba44c8f6622ef2359c7a550d080b3846 SHA512 c7d4130e6aeea842347ebf137502159fa17e2baf28bf36e1cb2d39dacf07671b53cfcb54d4f6559ee01d3945d453bedf81b3e58d5f805df15e63bbf113acee27 WHIRLPOOL 15e7624e29cc1a2cf1a786a50c02c2124cbeeb7577be617dcdb3751613d7bdf1cd26a44a430cc08861d3f0416a46ef7bf82abd7d6b03052f651c6a963b858688
 DIST mysql-workbench-community-6.2.5-src.tar.gz 13037465 SHA256 40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e SHA512 6cc9ba91a9fd4d19bdec157084fd5b510cc274e2851b54855441ad97dd042009064a00aa330a5689c18ed70a0996bf23411be475339ee96ba2ff5252c49d7839 WHIRLPOOL 74de61140edd91ee85c222338c02d3672869a0231bb25eb5f37c43a9cad2e280db521261a4ec6557e237c3f48cab84e92838a100949835fe85db924b5a382cba
+DIST mysql-workbench-community-6.3.3-src.tar.gz 14892631 SHA256 4511d63145b2a979310d84c9f0ca61b7460af2c87b81787b2f2404fd5095f419 SHA512 9736ed4f896b2819d5cde76a000a56b6ce36606262a83b5a0ba8dfc8760476eb43bcda08f258d856297924f3ddca2d89aadf0139fb156beb345f2a6fe5b0bc45 WHIRLPOOL 9e1054b8c18e854918133da62f67cc109f212812cd2509edfc775d4ebbc91b402a7b88b530e540eb67dadba6f6fd3d901b3f7a30b7a03a5a33537c677bbd0024
 EBUILD mysql-workbench-6.0.9.ebuild 2198 SHA256 37e7987b471d7c38092f1720cf51dcea8ee55dcdce7f970963d15f4bed49cb53 SHA512 3489fc7a02e4ee0f43cd0cb23fb1052b9f42d511a0f07c582a7b157db0db474e4b81c7c57c70b565f550c92684e23025e5e5119c5288b09ef6eb13b6ca8b491a WHIRLPOOL 46954975e7ad7e64154eb8cf52311139c578734fc5df22d9680d63ff8df0513e2668f1d3211e59d2ce32948d5a9d1d43b8444eb9a1ce3d36924a2f92493878ea
 EBUILD mysql-workbench-6.2.3-r1.ebuild 2582 SHA256 fc029a54f8913d7c7beed446d3466a9e8e4d1b1796c34bdbdf963a14a698010e SHA512 45881f30c3763ddde7463aa9b6f3808d858e024f19640555c7e8d9a3b011f8f71812f05c82a2cc3220caf5e48b163f3d1a1965b6396f9bc9aa6f713947101f35 WHIRLPOOL ad33a8fb7f1404949312974f7bf596322ba374e908981a9ddf1425a97d02c378764c8996ffe402cf1f26601dad3a31ce63be3bd9b7e0cbb4d506accb62a1f561
 EBUILD mysql-workbench-6.2.3.ebuild 2493 SHA256 ac3281e968498cafe213ffcd6459e3e6066aea98e2a8953507e9c3e5d0ef7260 SHA512 f117a30507bd72d769d640d867427d9835afe43c4de1be2b4aceee3d7e5795bfbea4733af1c687e35aef50ca27007d9f6cbed47cfcc74155fe38ba8f81217dd8 WHIRLPOOL 08c7f95048c6f5d2fc9303408495239506dd62b685a281e36816ed4f61cb8e2a07ea27c43264465eb21493a0a4262e99ff6b8342635e1ac9e09b0b6409d66d44
 EBUILD mysql-workbench-6.2.5.ebuild 2692 SHA256 4ebc1321629765184a5c8e1d885328953bf174c742d7d2f46590be7412abc690 SHA512 e5938349c3c738c78595ed7b2077e3b37e283da518e8b79aa996b393e6fe4fe1d04fbe4ad67d699f93819d58b3fd0efd308e906a1d5d0e91ba0971a404c6e9fe WHIRLPOOL 9a4e14b27a494728ba498ab730cb4e08ec2cfe3a83679d8a2b0c52a96aa81bb6a95b1b4ea3feb7a366a8aa4298a34d9c57d9b72fa4af017a1e505e6d8278db52
-MISC ChangeLog 19452 SHA256 09db36d71c2da3cfaf4466745ccebb9d2db68e13bf2da140cd2f916469a4cbbe SHA512 38b7cfce10bf70c54343ea0c0aa65ec0aa3e153eced60d2dfdbb9b29fc50aac8c165a38c5f2974c94c0819fd6ad1fc4b2fef36863c780e2271aee45e3a036185 WHIRLPOOL b76e5280f2512804a201736e040cc672ad4c99b625a9221afb5d22a10305f514a1d00eda8cd80fc40dd398f16588e12ce85919b6dabf8b9363b3565da28ab14f
+EBUILD mysql-workbench-6.3.3.ebuild 2692 SHA256 74bd7e3f9a15ce3e7284832951823246ba587635bb15fea41db01e45e7c0803c SHA512 8ab771ec7dc9e463f167fd930907b9f7b7954bb044e2b2b34c21bf5bcbdb544a45f22f4c392fd5cfd05833d5bcd01093c8ee491842dffed5f557232e4a6b9b26 WHIRLPOOL db29751598c90c66975e9699add5b088ef6e673b9f1f826ca2d24d13f9a18cafdf91955667f5397067fc316195d1120d37903d1ca02e074f4d37bb88ab50d5fc
+MISC ChangeLog 19643 SHA256 887f23d7784eb91ee439c63afd33cb92324172a32e89edcc114103c98471fa0a SHA512 0fc21c4182c507b9584bbdc880d291ccb9486bb0e9e5470ce702664d75ea75bce1aa4c09b77d26e148daf4ed9a9786ae1c446b2183f1d028453d69368b3886f5 WHIRLPOOL 7041c55abc98a145de080506f7f7b130a19d2289be7c7519816aa88fa37444a0ee24673c75021ea35728e1f00e71422c4e9850665602a71190cca0eabe44cf2a
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJXdPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOwFYP/095lNtTcQN0i8GJPBgXqnEn
-moqgsh59K7lB9QvHFjWKE0Dmhd7kPHn8aFLG4xe019vOSJrRsgCj+5ZaweIOk/ns
-JHkYW65v1PMnKl2ltejg8tc0nY3Jc5+9DYFDFNJDXjkb4X/ZCM1rbZjWsG+XhWME
-yi4eA+T5NqmJb/oUBEccOR4L5sBFWJTaG+jGpdEjpcT6gRrXelfwfOM6KiFE0w3n
-IP8sqeir0Q3DjINtbT1YoqNpN6Vpk/qX8M61LLJuwB7VGOWAWwnA+VDQJtA6E2ly
-WH8MGIpEmtl0NcB9kGVbHKuvbuIyCKXGjp/aKKnP1NC8Jg3lUAsKjrl4/hfn2eLV
-9cqxUXQX9d7/RvpA2EElAHHrDyp6CqGdExEqgGLgMSy9TO6zc2OKPI/Kx8HRwKu6
-Z0rF87+RJJasLHO8FbQTOJEcUugPmy7V05FQnvVuJ4lUcsPptUl8ddwceRn4IcRN
-jNZxXsaEc6IwTB1Dk00/MyCU++3rSXVfaU/Fm7m8h4zEzUen/2s9J/z7MBngDsfj
-uZgnB8HvQtR6fDS9ZXpbbVgpV1Q8HRS58DZlyCiNGhuSfe6spiQ0fxnQLV1/eCuQ
-4gNvJLA7UOAyTig27lhCmc5vr+IVR1g126MpRzbQgVclYgA8hnL6HUCEKp6i5Cpm
-/9+RKuulEw/lV2WIB0Le
-=q3ej
+iF4EAREIAAYFAlU8pTQACgkQiIP6VqMIqNe3XAD+JyZFXYbNhsHMRIoY9Az0yWZX
+mRSr0SmWfIeus6x1288A/1+GUOnvsu2lejq7ZQLq4POiQQRyKcgMXG0G8+4K2B5G
+=tF3F
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch
new file mode 100644
index 000000000000..7fb9c8d57fc5
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch
@@ -0,0 +1,40 @@
+--- plugins/migration/copytable/copytable.cpp.~1~	2015-04-15 15:54:19.000000000 +0200
++++ plugins/migration/copytable/copytable.cpp	2015-04-26 08:53:08.871167725 +0200
+@@ -1920,12 +1920,17 @@
+     _incoming_data_charset = "latin1";
+ 
+   mysql_init(&_mysql);
++/* This is optional has compiled in for MySQL >= 5.6.6
++ * Looks like MariaDB does not support this as supposed,
++ * so disable completly. */
++#ifndef MARIADB_BASE_VERSION
+ #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
+ #if MYSQL_CHECK_VERSION(5,6,6)
+   if (is_mysql_version_at_least(5,6,6))
+     mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str());
+ #endif
+ #endif
++#endif
+ 
+   // _bulk_insert_record is used to prepare a single record string, the connection
+   // is needed to escape binary data properly
+--- plugins/migration/copytable/copytable.cpp.~1~	2015-04-26 08:57:30.444285953 +0200
++++ plugins/migration/copytable/copytable.cpp	2015-04-26 10:16:39.234711324 +0200
+@@ -2875,6 +2875,9 @@
+ 
+   // This function is used to create a legal SQL string that you can use in an SQL statement
+   // This is needed because the escaping depends on the character set in use by the server
++  #ifdef MARIADB_BASE_VERSION
++    length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength);
++  #else  
+   #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
+   #if MYSQL_CHECK_VERSION(5,7,6)
+     if (is_mysql_version_at_least(5,7,6))
+@@ -2885,6 +2888,7 @@
+     length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength);
+   #endif
+   #endif
++  #endif
+ 
+   return true;
+ }
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
new file mode 100644
index 000000000000..58da47d7f9a4
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild,v 1.1 2015/04/26 08:43:14 graaff Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+CMAKE_MIN_VERSION="2.8.11.1"
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="http://dev.mysql.com/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 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+
+# 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-2.14:2.4
+		dev-libs/atk
+		x11-libs/pango
+		>=x11-libs/gtk+-2.20:2
+		gnome-base/libglade:2.0
+		>=x11-libs/cairo-1.5.12[glib,svg]
+		dev-libs/libsigc++:2
+		dev-libs/boost
+		>=dev-cpp/ctemplate-0.95
+		>=dev-libs/libxml2-2.6.2:2
+		dev-libs/libzip
+		>=virtual/mysql-5.1
+		dev-libs/libpcre
+		>=sci-libs/gdal-1.11.1-r1[-mdb]
+		virtual/opengl
+		>=dev-lang/lua-5.1[deprecated]
+		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+		dev-libs/tinyxml[stl]
+		dev-db/mysql-connector-c++
+		dev-db/vsqlite++
+		|| ( dev-db/libiodbc dev-db/unixODBC )
+		gnome-keyring? ( gnome-base/libgnome-keyring )
+			dev-python/pexpect
+			>=dev-python/paramiko-1.7.4
+	"
+
+# lua perhaps no longer needed? Was used via libgrt only
+
+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}"
+
+src_unpack() {
+	unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+	## Patch CMakeLists.txt
+	epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
+		"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
+		"${FILESDIR}/${PN}-6.3.3-mysql_options4.patch"
+
+	## 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() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	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
+}