Version bump, closing bug 490740.

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

4 files changed, 159 insertions, 5 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 3445f1486606..bcc4a8193ba8 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.84 2013/10/19 13:48:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.85 2013/11/09 09:46:15 graaff Exp $
+
+*mysql-workbench-6.0.8 (09 Nov 2013)
+
+  09 Nov 2013; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-6.0.8.ebuild, +files/mysql-workbench-6.0.8-CMakeLists.patch:
+  Version bump, closing bug 490740.
 
 *mysql-workbench-6.0.7 (19 Oct 2013)
 
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index c3f62984f59a..94609209d8f7 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -4,7 +4,9 @@ Hash: SHA256
 AUX mysql-workbench-5.2.44-my_lib.patch 780 SHA256 77d54c50e8112ac1ee716fd10232c492c14e16047eeb54c7fbad159a97aa7cfc SHA512 456c79cb2c955b4265f51a9b5579391a91cb8a3ac033e9cb3f887e5ab3875a7d9e84a5ff6d6fbb237e086a7bcdbc339cc23cf1dd0e4079e005e9ab9434ceef65 WHIRLPOOL 492f641dd539ee3d8cdf1f67a13d132178b7befa49ab2167d7cc753e6f9ed82fb1f105fa7d50b95397c1c3e5d15e0df6dc439a53cc4f242d4e3dae9d274a2e15
 AUX mysql-workbench-6.0.7-CMakeLists.patch 4034 SHA256 5eaff7eb235269110b55cfd89fa57027ac86611451df444448dc394238d5b0e7 SHA512 9f06a260579aab1e60d8ca9a0e252f9ea178ef77de781f46c4ba7966d6dd4bfa41170e5792fd3179126e73169f42c0b9a23691361e558b61756eb8b081684fbd WHIRLPOOL 94dcb0b73bbdc4be795c07e23814aadd7c4d45a2ac27c1c8697458145c20fb1efe34144a9b305b3c7e9c6c4d61bb8197dbcda97f110dbde6a47da37f947cdc6f
 AUX mysql-workbench-6.0.7-PCRE-as_needed.patch 1874 SHA256 ed3330d44c1c73f299450b679b47c284b284a858600a2e3ee128f9b287657b16 SHA512 3aec09be6cdb79d9603cad9b04f9218ac570626c2358efd926a19ad55304a0e734680cdc648e6b89c6e0ae5107a0401544ce53dd56b54632bd32062cd12a9d29 WHIRLPOOL 00cd1443dd449a942da216743da9a620810690a6a2ba09a732c9cfcb48d65555b1112623273fb107c1b9f7768085374385cfd76fd01a926c17efb3c68d11c865
+AUX mysql-workbench-6.0.8-CMakeLists.patch 1805 SHA256 0035ce53c2de7678b15693fbfe8ec33ecd5e5d5175320cde4f07aaae2e1a89e9 SHA512 2e62652f4d2fcdf95cf9e1607d444d855fa98aa49bdc3f9f34de1b85ddf9d16c5c863e2c6202ac22e4df27fa057fd91c355a2543a75940a45d616f1eeddf0897 WHIRLPOOL 833edf5b0b1e6e171515db6000ef33e218610faad1a329099d83560352f44510092b9be7018beb3dc1014ce6413e0bbab3a6ca21f2f7fc089ad9ca350b16d741
 DIST mysql-workbench-community-6.0.7-src.tar.gz 25533775 SHA256 e75c992952822dd91582e7073f4e9b2aa09fb85630b4460b86762da43909f793 SHA512 1db0ab3cd9d9419ebee2682a86e328d1091d703104b854e7e3b6b01389fe4ab91c76d67e00fcc4ed85dab2289f06ddc60afbedcd18a04d4c9455cd602dc3564f WHIRLPOOL c3e281c9f3209ee81dfa73925b798d75689c43a8a6c3a1455b6d1a57331f303e9e354b88dd1a17fb1dc8fe3125488cb6aa08f033af1dbfd177f856f1f1f45633
+DIST mysql-workbench-community-6.0.8-src.tar.gz 24746042 SHA256 2598077e516a2e5e52adc6a83e05f4357fd5f240a97b8bf74e6112aeeefc0242 SHA512 65b9ef77bf1fc1d7f25989675a0cb602d1b86dc5ff708e7fbc4ecbaa85200ac2ce50b2d07cf9e48939e4638ec2f3346bbdb76c4ab5a6c8f28f856a292b236acf WHIRLPOOL 5a20e1f5e170267a21ae7fd00e025246e689fcc10fbf45e97d51d3f289a0b266ef662be55226b3426b71a457ee84cb31f4d70e71175d1a32f758e0ec1ee00d7c
 DIST mysql-workbench-gpl-5.2.45-src.tar.gz 21754261 SHA256 204b66dbe33f9cb6d65cde4d36749b23307abb28f2d915a9923e48109c82bfed SHA512 f19ab2c550d363f14e450eeab82b923d84f6d6ab9ae328555e53fd0e16c70a502b7bd1ad35c1a4866aeb6ac95de119d79a2946bff1690240c5bac6c2febef300 WHIRLPOOL a62ffa0dcc33b9583b72949f4b6fe7ee070e8735993d316d7c9d3a9dc402e276240802a2a80ec0ae381c5a584b343db449c6756167f32ec70143641af61bf425
 DIST mysql-workbench-gpl-5.2.46-src.tar.gz 21885413 SHA256 b409afe822b4959c39331630699360ccd5aa0868944ce51ed5cdf08e6b93b72b SHA512 ac68fc330eb1e964328641769a0e18eb45bdf257b8b9e3f76380a532b4a232dbae61178645a7efe276977ed62072b94a2f48c3f937833d7035562b7e0cf8d01f WHIRLPOOL dfd76d5b0f7bd224c3e4433cd0487e77c138755f8f486c12a055f3d9397de638e49d65f9cdf18c63ac506bf8d1e425cf151824a10f473d202c2e1a1b91b5d3d8
 DIST mysql-workbench-gpl-5.2.47-src.tar.gz 21924533 SHA256 e6928beb157f1e0abbb8885d16544eefe4d25b05f54dc0fb75b8375d8775838c SHA512 0229c1c3e9b7082f1752cd3f95f4372d9af6bd83b89607f7e74b5460ad72b263b5c89c868ebe19e5182878122357113db0a782865042e096a1d4519733569e15 WHIRLPOOL 40455319a8001ae9365cd164702794be17aa134b254a6a79cfc15c2321a42dfbc463b59f6bb7a34d3d0252fca2b81310014928646d0d5d8e929c46b3de470cb5
@@ -13,12 +15,13 @@ EBUILD mysql-workbench-5.2.46.ebuild 2445 SHA256 a4bdd1342d9cd93bdce959f96a3341a
 EBUILD mysql-workbench-5.2.47-r1.ebuild 2566 SHA256 1b38c5c6c0e1668a10babd8eeb5907c90cd2ceed9f137376291cd41277929b8d SHA512 8a5a6d73e44e27c959c536ad78a32210720eb4c11630af1710d77b28e3cfffbd4aaed42155d8ab5fdf47dfc52dd993eeac81d9c2882fbfc6b2144f157d79cf48 WHIRLPOOL 68c6980a22b83dd056502657e3ca766cbd235744de63147c99c8ca09a9fab5d3f2718ff540e4aa976e7eb51ea537e171cae5035900fa142185d4b95034f636de
 EBUILD mysql-workbench-5.2.47.ebuild 2445 SHA256 a172c69c78a0cb243281e0e2e97ecf88b4c570c0961761905702e2c8275d982a SHA512 a1808271dc3e29a1b81a83155762792ebf98cfc87be58b739b8525cd436e922ab42edcbc383599ffd3336f438b5cbe8a6224becff917562fadf35e41ea88bb18 WHIRLPOOL eedb87433946db651de21e4d6f393beb158edf952690942d14469b7ae00d0122b37adf3a79c5de68d973450cc17fcf9b0623b2a55dbbf4c60174c9521d355d6e
 EBUILD mysql-workbench-6.0.7.ebuild 2319 SHA256 fcd5151c19e5a7d64555e136fc2fc975536b17fd182ff827a75c2e750b34066b SHA512 c5ee516fefb47683eac0071a430127b2c226eb57d9b0f4573d9e17ded3b9b8226c45817645c4b85986fe2d265a3e0debea002c27b79bc57e90dc2c418ae48327 WHIRLPOOL c9e755e263ab99f4b3363a7128e52d65c95f102f0ce347c6fc71e552edc4f9d7e8c61b8c2b8ee0baa84daf6803d8eebd9b8b4dabcae371c43bf0b5fc4bb0a9a6
-MISC ChangeLog 15016 SHA256 5df8fffeee71142e88140d083594dcf0ba59cbec11258b030584fa801597909b SHA512 a0b385e15beefbc659ae9684bd9a63537759b74133cfa91aaac213885159e08b6c0e31bfff3a7601499e551b1a51fdc4c93dd1fc88765b3d293887d891b1e3aa WHIRLPOOL 46fd03bfed6df5244c134c3cf7156890b803f5c5436c43dc9914198c335bb91b8c7ce6e432810c1c28fa56fe94445fe6b41324f20c824aac80048e0448b2d539
+EBUILD mysql-workbench-6.0.8.ebuild 2317 SHA256 bff73514b883b4061b2373192e6bf4c224eeffa0ccb7d2f4e54ee56cad567193 SHA512 06b8abb4ce862c90122c821105e4982b6cd691e719526028bda84debd55f8f432f4ad168586ed17c0192e0df3a5b1d8d85e876f7ff014c4ea6df17550f826700 WHIRLPOOL 9803ed2da6f7cd9ed919d2bac825c03079cac5836320c471db6c8f582f8313c84e0aa38cf6f7c12c76f5eb1b5009d5ef8de0cef2868110c37a0056b4c9cfe561
+MISC ChangeLog 15221 SHA256 02fadfd7794a55af6eb9a6b9a5ea21180e7f6003000d6da377ddf8c41b884696 SHA512 facff0c6524aff3e3525ea5b5d21f7c9b39574ccec693f6f1247c3bcde4e15d6163f3dd774edec61e04c714150e6a8cc773eed3c8aed753151c94e989157b3c5 WHIRLPOOL aaa09dc37e0b5553c576b1fb188005eb11c7bad2282e0cf7d14ed341c9811ba6a54f30c3e1839a9dbd26f483780136ae9d3997107e2605bd71c6bde0e9f67569
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJijcsACgkQiIP6VqMIqNca6gD+PRWq06HfVychnFVn53rvXSXp
-CXs/JK/LtKneFh8Ff0kA/1ghlu1rzAp24TzIFWhnhCyXX3qHrlCA2Zk1V2e7I7GN
-=Z7u/
+iF4EAREIAAYFAlJ+BHUACgkQiIP6VqMIqNetfwD/RhfTdIS90nsGErkJJAuzrqBP
+oG4ImjlN3b5yzITMnyMA/iSWjSEoxQpqY39+Lk6uMedR5ZuokM5VgEBkPPU1pEfv
+=nLHi
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.0.8-CMakeLists.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.0.8-CMakeLists.patch
new file mode 100644
index 000000000000..a6c6437e5494
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.0.8-CMakeLists.patch
@@ -0,0 +1,54 @@
+--- 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.6.2 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 ()
+@@ -71,8 +75,8 @@
+ find_package(TinyXML REQUIRED)
+ 
+ if (UNIX)
+-	option(USE_UNIXODBC "Use unixODBC instead of iODBC" OFF)
+-	if (USE_UNIXODBC)
++	option(USE_IODBC "Use iODBC instead of unixODBC" ON)
++	if (NOT USE_IODBC)
+ 		find_package(UNIXODBC REQUIRED)
+ 		set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES})
+ 		set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS})
+@@ -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.0.8.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.0.8.ebuild
new file mode 100644
index 000000000000..d0f970d35a2a
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.0.8.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 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.0.8.ebuild,v 1.1 2013/11/09 09:46:15 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 +iodbc"
+
+# 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.6: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
+		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++
+		!iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
+		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}
+		virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+src_prepare() {
+	## Patch CMakeLists.txt
+	epatch "${FILESDIR}/${PN}-${PV}-CMakeLists.patch"
+
+	## fix breakage with as-needed ld flag and PCRE functions
+	epatch "${FILESDIR}/${PN}-6.0.7-PCRE-as_needed.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)
+		$(cmake-utils_use_use iodbc IODBC)
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	cmake-utils_src_configure
+}