Version bump, closing bug 490740.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

3 files changed, 152 insertions, 1 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/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
+}