Version bump, fixing bug 528582.

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

4 files changed, 155 insertions, 5 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 816d1a1af1e6..9653b71e8c1c 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.97 2014/08/25 19:34:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.98 2014/11/09 10:31:31 graaff Exp $
+
+*mysql-workbench-6.2.3 (09 Nov 2014)
+
+  09 Nov 2014; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-6.2.3.ebuild, +files/mysql-workbench-6.2.3-CMakeLists.patch:
+  Version bump, fixing bug 528582.
 
   25 Aug 2014; Hans de Graaff <graaff@gentoo.org> mysql-workbench-6.1.7.ebuild,
   +files/mysql-workbench-6.1.7-mysql_options4.patch:
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 4d4ef2e2bd65..ab6129ee6e92 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -7,21 +7,24 @@ AUX mysql-workbench-6.0.7-PCRE-as_needed.patch 1874 SHA256 ed3330d44c1c73f299450
 AUX mysql-workbench-6.0.8-CMakeLists.patch 1805 SHA256 0035ce53c2de7678b15693fbfe8ec33ecd5e5d5175320cde4f07aaae2e1a89e9 SHA512 2e62652f4d2fcdf95cf9e1607d444d855fa98aa49bdc3f9f34de1b85ddf9d16c5c863e2c6202ac22e4df27fa057fd91c355a2543a75940a45d616f1eeddf0897 WHIRLPOOL 833edf5b0b1e6e171515db6000ef33e218610faad1a329099d83560352f44510092b9be7018beb3dc1014ce6413e0bbab3a6ca21f2f7fc089ad9ca350b16d741
 AUX mysql-workbench-6.1.7-mysql_options4.patch 1141 SHA256 443bda1345796c0545fbf7735ae3b19fda1c5e0f2b960b80cae4dbfd33714ae1 SHA512 c937c857c1093a3d17b319ff1b967fc291ea3e067b0326d8fac24fb419ce337b9db1b59850f7c348d0cd0358a6e71f3825342928c0c3e78d080a58e0d10d3e38 WHIRLPOOL a70ec9af0c67f8b9f8a35b88df62eba22c7fb8645169f0122e523be9cf69a80a6af986ba4191c00738bb7eebefcff2d7445bbb4bc5365e0a5bd74d594afdce1c
 AUX mysql-workbench-6.1.7-wbcopytables.patch 359 SHA256 a7434308630d9f1b37bc83e35dc362e04ecf6b18e15dc1f6a6a925cdcf98605f SHA512 dece825489a2a1ec6f36122ca0e624f3844d3ea9e715e9e6afba9c392631fcfaee6690c9a0e653ab87f6c52622de996f7670eaa52a0f64c9969aaa456bc438ac WHIRLPOOL de72248451b5f8bd46b33dadeabc32201cb27888a2210d37728e6c6d5452f968c3d9622832ead454476a7b71a35476df1140cdfd78013392ac0eed47257a0d7e
+AUX mysql-workbench-6.2.3-CMakeLists.patch 1455 SHA256 9587f436d73ab366e77109b19e2b21099e0b0003db88662c113a1686e847839b SHA512 8a38b0fa7be0ac982b1d501964727fcb6bd0c7ab5179e2a69a1926c1abe56e2f30c6d9a046b48cdcaaec948d5c9deadb62e14331d52cf39e91f26ee90104c812 WHIRLPOOL 89235917ab608876b916933259f1970ad2c01fd1e51c57781def880291280bd4a3095014b69ec97e07cf6d97a34b4a5cd5ae9c4e89587803f2a2f7d2159808a9
 DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c
 DIST mysql-workbench-community-6.1.6-src.tar.gz 24430390 SHA256 d9fb8364784f75426c0f9c10421e272fefa1fe1994ae933eca54c637a3e769de SHA512 d2955756997b3e8121f0da095ca057407337d0c0257f94ae9b096b95996d260f569f473ffb35a68908649cdc20ca4b3438b3a4b1fabd1b1cd0bb365b3b076c3f WHIRLPOOL 55eac43876e545d0bf8ac4d05f3ad46673695f49590920620e6bb4cf5662628fcce1980f875bcb30315e0823e421a49735b032cd416db5c099f6825c5a39763c
 DIST mysql-workbench-community-6.1.7-src.tar.gz 24750696 SHA256 06ac657f7f86f012f75fcf8fa59fc1d422134135485b887a4abd6c9ac2408898 SHA512 d5a4d1f6c6ade06ba775d25f40a7933ba75d87a78f19227e1f9be1c9de85d8ffbbe381161db44c05fa875b6d9f933885e542a3fb829bcedef1305190c6b60984 WHIRLPOOL 15147a2df7b64779b5955b77fe53a4c4fcef74e8d6cb3d925841892144a6256df0a8f41b2fef6c43bc4a3196beb211e393e43c057749d983883b9b857f2ac079
+DIST mysql-workbench-community-6.2.3-src.tar.gz 14576661 SHA256 4caba8cf1f8dc0fc57e98a6170ad4718ba44c8f6622ef2359c7a550d080b3846 SHA512 c7d4130e6aeea842347ebf137502159fa17e2baf28bf36e1cb2d39dacf07671b53cfcb54d4f6559ee01d3945d453bedf81b3e58d5f805df15e63bbf113acee27 WHIRLPOOL 15e7624e29cc1a2cf1a786a50c02c2124cbeeb7577be617dcdb3751613d7bdf1cd26a44a430cc08861d3f0416a46ef7bf82abd7d6b03052f651c6a963b858688
 DIST mysql-workbench-gpl-5.2.47-src.tar.gz 21924533 SHA256 e6928beb157f1e0abbb8885d16544eefe4d25b05f54dc0fb75b8375d8775838c SHA512 0229c1c3e9b7082f1752cd3f95f4372d9af6bd83b89607f7e74b5460ad72b263b5c89c868ebe19e5182878122357113db0a782865042e096a1d4519733569e15 WHIRLPOOL 40455319a8001ae9365cd164702794be17aa134b254a6a79cfc15c2321a42dfbc463b59f6bb7a34d3d0252fca2b81310014928646d0d5d8e929c46b3de470cb5
 EBUILD mysql-workbench-5.2.47-r1.ebuild 2566 SHA256 1b38c5c6c0e1668a10babd8eeb5907c90cd2ceed9f137376291cd41277929b8d SHA512 8a5a6d73e44e27c959c536ad78a32210720eb4c11630af1710d77b28e3cfffbd4aaed42155d8ab5fdf47dfc52dd993eeac81d9c2882fbfc6b2144f157d79cf48 WHIRLPOOL 68c6980a22b83dd056502657e3ca766cbd235744de63147c99c8ca09a9fab5d3f2718ff540e4aa976e7eb51ea537e171cae5035900fa142185d4b95034f636de
 EBUILD mysql-workbench-5.2.47.ebuild 2439 SHA256 e91ee188f56a775c8e21eb08b91cdd8eab524d389cc203816fd2dd7c237cebfa SHA512 4bbacf5419c9c64dd950f55ee1be777d6ed80574667d96e87a069bcb9873dfbb1e2c18c3e416c278c7ffe42a74c5a5f25884656596ae5d6584868df6e17ec044 WHIRLPOOL 8905c429eb645643f0fe84bca269c79f5dd54a160c4e3ed105f1c0c42e8571aea872a7077f729079f0626d96abb83f62149d3cb14209c2a56f49cd525ae7a281
 EBUILD mysql-workbench-6.0.9.ebuild 2202 SHA256 877f81db2c7c14bf50216f49e18a2db889e71d5c3c53e523e080ff93f84e6921 SHA512 968fac7ac984695857f3b2bb08679f45c9ef6e765d9bf76a2ec99b5c5960e1691f0928300ec08dd7dbe7b2a4088408604818507c8b1a1d856c8f32c0319fa0b3 WHIRLPOOL 8f67b1d6d0d788cfeed4899f1e05f30c75f9c962677493055ddbf534ba4455c758ce5d379ce2026fd26cfd542a6171e9c29e9eccab87073cb3d78fd98b2df107
 EBUILD mysql-workbench-6.1.6.ebuild 2315 SHA256 7dc84e5b20f428c05861b5ec9cf90eaf7c5c83de3356d1f3342034a3e0c1e8e7 SHA512 b2d999d97ac5aa748734181e44113340334bfc9b589df2cfb2d87f02b31181f40325d3768d2ff7910dca25d62ea18b99c1fc180699cba646cea21a89074faee4 WHIRLPOOL 4982055444624d1c6ff9afcf1d8ce0fa1a1fba0e89ef6fb3fd7881b1376945f99afd4e59bc6ee7722b399721195eaa237f1d7515ac279699e8e30d04cdd675e8
 EBUILD mysql-workbench-6.1.7.ebuild 2401 SHA256 0b5758c3e89d4c84e714321b042206b1faa7772b530860d84a3433c56d83c131 SHA512 5415049ea1621031f3532ff3a055eba136ba7ae6a643d43f9940b1bd17624e92049abc8b5a5f945b9ba112318965506f5cbc95f5a7bc87c2ecc63875568f57f9 WHIRLPOOL a8d0b661d5f3eb42e7b8a90c2241ed548adafe384a06c32927542b76de7bbf5f50232b835ed492df0e03d922f535fa775ffa0a3c3fab7eac1b3071a129e3c579
-MISC ChangeLog 16988 SHA256 51da79424ad91f0349ee6471accc435ff67792c8668436430e3a9c72977cf2f6 SHA512 bdbde58164a38618799e2f7c9687c1b40966a9d575b331bdfcceb4ff7dff521dbf80f1f921805e803bfa1c780764981cf321f8cc8391006101146df16b36dbd0 WHIRLPOOL e331146d937e61ac344aac03aa2fe20da4deb4ce843f8f8797b4d23bfea4e4d49a4183cf1eef49ade183a938a7328b16941612baa86a10301e349008419116b9
+EBUILD mysql-workbench-6.2.3.ebuild 2442 SHA256 eb21b8bf7b68081754dfa1e9d3a117ebe6fa1dc5ef1ab72fd8f11e50775c9446 SHA512 1c424a4db6ea74bbbf1a704d46aef8836e35640bda24d2083e08c5bd39a415a2eec512c300bf955fd7063dd0cad898cbdfbbfc749e3ab1cf092a604c5a80767f WHIRLPOOL 8b2630110eb0ebdd9790daa3f6e52b6f4a5d26fec14efa0d1725ae2f3acddd8dd98a0babd6d6db4db405ab045c7c297d3906663bdf163cf70ca2ef38312731ee
+MISC ChangeLog 17192 SHA256 4b8ceb74f6c5b7b18b3a88ef7db91aa1ef393ae9d614b44aa5dd9fc4c3189475 SHA512 ca49b71fdccaf47e241ba1cc398be7656b229e6f71c839479f7f8b3869110d8372ab6bce9b745032ba646995d542683dd4df333049b1fa1e732c9e102c3a7b14 WHIRLPOOL abc9271e7240d09104e6b1b88cfa5d070d5e5a470c0441d1b78e3dd69889a6950b3966edc58e3a94eefa8041097d6b52022dcb20bc4276731bbc8f53f598e067
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlP7j7oACgkQiIP6VqMIqNdeBAD/dur7uUDZYYK0RLixmlw3hXYt
-U3GV4tVtH3R0ikY4baMA/jWOw11QzKi/7gycSeq1JtJZjVfNqgkoMXuK1vkvv2Z2
-=5dsP
+iF4EAREIAAYFAlRfQooACgkQiIP6VqMIqNcSzgD+NwVtdw1ZSta7vMcqTSV+6LKY
+shiCuHyZzAJjuVVWnDwA/1l/XVsaLtOEAo+XVcYXoOovx/d5gCVHNnf4x2TBInk/
+=dD+T
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch
new file mode 100644
index 000000000000..6e9a4d5e1410
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch
@@ -0,0 +1,43 @@
+--- mysql-workbench-community-6.0.7-src/CMakeLists.txt	2013-08-30 18:05:12.000000000 +0200
++++ mysql-workbench-community-6.0.7-src/CMakeLists.txt	2013-09-08 11:41:18.723838826 +0200
+@@ -18,6 +18,9 @@
+ find_package(PkgConfig REQUIRED)
+ 
+ find_package(GTK2 2.20 REQUIRED gtk gtkmm)
++if (NOT GTK2_FOUND)
++	message( FATAL_ERROR "Not all GTK2 components were found!" )
++endif()
+ pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
+ pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
+ set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS})
+@@ -32,7 +35,8 @@
+ endif ()
+ 
+ # All known publicly available versions of Antlr3C are buggy
+-
++# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973
++# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too
+ if (SKIP_BUNDLED_ANTLR)
+   find_package(Antlr3C)
+ endif ()
+@@ -89,7 +93,8 @@
+ pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
+ pkg_check_modules(UUID REQUIRED uuid)
+ pkg_check_modules(LIBZIP REQUIRED libzip)
+-if (UNIX)
++
++if (UNIX AND USE_GNOME_KEYRING)
+ 	pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
+ 	if (GNOME_KEYRING_FOUND)
+ 		set(KEYRING_DEFINITION     "HAVE_GNOME_KEYRING")
+@@ -99,7 +104,10 @@
+ 			set(KEYRING_DEFINITION     "HAVE_OLD_GNOME_KEYRING")
+ 		endif()
+ 	endif()
++	if (NOT GNOME_KEYRING_FOUND) 
++		message( FATAL_ERROR "Gnome keyring libraries could not be found" )
++	endif()
+ endif()
+ 
+ include (CheckFunctionExists)
+        
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.2.3.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.2.3.ebuild
new file mode 100644
index 000000000000..740e5aa2c3c7
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.2.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 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.2.3.ebuild,v 1.1 2014/11/09 10:31:31 graaff Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python{2_6,2_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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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
+		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/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+src_prepare() {
+	## Patch CMakeLists.txt
+	epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
+		"${FILESDIR}/${PN}-6.1.7-wbcopytables.patch" \
+		"${FILESDIR}/${PN}-6.1.7-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)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Work around parallel build issues, bug 507838
+	cmake-utils_src_compile -j1
+}