Version bump. Thanks to H.Habighorst in bug 482156 for providing initial ebuilds and later improvements, and for the other people in that bug for testing.

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

4 files changed, 220 insertions, 1 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 1f0b7c604dae..3445f1486606 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,15 @@
 # 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.83 2013/09/01 13:10:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.84 2013/10/19 13:48:58 graaff Exp $
+
+*mysql-workbench-6.0.7 (19 Oct 2013)
+
+  19 Oct 2013; Hans de Graaff <graaff@gentoo.org>
+  +mysql-workbench-6.0.7.ebuild, +files/mysql-workbench-6.0.7-CMakeLists.patch,
+  +files/mysql-workbench-6.0.7-PCRE-as_needed.patch:
+  Version bump. Thanks to H.Habighorst in bug 482156 for providing initial
+  ebuilds and later improvements, and for the other people in that bug for
+  testing.
 
   01 Sep 2013; Agostino Sarubbo <ago@gentoo.org>
   mysql-workbench-5.2.47-r1.ebuild:
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-CMakeLists.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-CMakeLists.patch
new file mode 100644
index 000000000000..f5f189e3bb09
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-CMakeLists.patch
@@ -0,0 +1,81 @@
+--- 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,6 +104,9 @@
+ 			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)
+@@ -230,18 +238,18 @@
+ install(FILES ${CMAKE_BINARY_DIR}/mysql-workbench.desktop DESTINATION ${WB_INSTALL_SHARED_DIR}/applications)
+ install(FILES ${CMAKE_BINARY_DIR}/mysql-workbench.conf DESTINATION ${WB_INSTALL_ETC_DIR}/ld.so.conf.d)
+ 
+-if (EXISTS COPYING)
+-    install(FILES README COPYING DESTINATION ${WB_INSTALL_DOC_DIR})
+-    install(FILES build/debian/mysql-workbench-community.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
+-    install(FILES build/debian/mysql-workbench-community.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
++if (EXISTS ${PROJECT_SOURCE_DIR}/COPYING)
++    install(FILES ${PROJECT_SOURCE_DIR}/README ${PROJECT_SOURCE_DIR}/COPYING DESTINATION ${WB_INSTALL_DOC_DIR})
++    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-community.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
++    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-community.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
+ else ()
+-    install(FILES README LICENSE.mysql DESTINATION ${WB_INSTALL_DOC_DIR})
+-    install(FILES build/debian/mysql-workbench-commercial.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
+-    install(FILES build/debian/mysql-workbench-commercial.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
++    install(FILES ${PROJECT_SOURCE_DIR}/README ${PROJECT_SOURCE_DIR}/LICENSE.mysql DESTINATION ${WB_INSTALL_DOC_DIR})
++    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-commercial.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
++    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-commercial.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
+ endif ()
+ 
+-install(FILES build/build_freetds.sh
+-              samples/models/sakila_full.mwb
++install(FILES ${PROJECT_SOURCE_DIR}/build/build_freetds.sh
++              ${PROJECT_SOURCE_DIR}/samples/models/sakila_full.mwb
+         DESTINATION ${WB_PACKAGE_SHARED_DIR}/extras
+        )
+        
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-PCRE-as_needed.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-PCRE-as_needed.patch
new file mode 100644
index 000000000000..d1c7059bb1e8
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-PCRE-as_needed.patch
@@ -0,0 +1,38 @@
+--- library/base/CMakeLists.txt	2013-08-09 17:32:49.000000000 +0200
++++ library/base/CMakeLists.txt	2013-08-26 00:10:45.695132307 +0200
+@@ -2,6 +2,6 @@
+ 
+ add_library(wbbase util_functions.cpp sqlstring.cpp file_functions.cpp file_utilities.cpp threaded_timer.cpp string_utilities.cpp geometry.cpp notifications.cpp ui_form.cpp config_file.cpp drawing.cpp log.cpp threading.cpp profiling.cpp)
+ 
+-target_link_libraries(wbbase ${CAIRO_LIBRARIES} ${GLIB_LIBRARIES} ${GTHREAD_LIBRARIES})
++target_link_libraries(wbbase ${CAIRO_LIBRARIES} ${GLIB_LIBRARIES} ${GTHREAD_LIBRARIES} ${PCRE_LIBRARIES})
+ 
+ install(TARGETS wbbase DESTINATION ${WB_INSTALL_LIB_DIR})
+--- backend/wbprivate/CMakeLists.txt	2013-08-09 17:32:50.000000000 +0200
++++ backend/wbprivate/CMakeLists.txt	2013-08-26 00:24:34.762132208 +0200
+@@ -6,6 +6,7 @@
+     ${GRT_INCLUDE_DIRS}
+     ${ANTLR3C_INCLUDE_DIRS}
+     ${MYSQLCPPCONN_INCLUDE_DIRS}
++    ${PCRE_INCLUDE_DIRS}
+     ${PROJECT_SOURCE_DIR}
+     ${PROJECT_SOURCE_DIR}/library/grt/src 
+     ${PROJECT_SOURCE_DIR}/library/base
+@@ -97,6 +98,7 @@
+     ${SIGC++_LIBRARIES}
+     ${LIBZIP_LIBRARIES}
+     ${TINYXML_LIBRARY}
++    ${PCRE_LIBRARIES}
+ )
+ 
+ #install(TARGETS wbprivate DESTINATION ${WB_INSTALL_LIB_DIR})
+--- backend/wbpublic/CMakeLists.txt	2013-08-09 17:32:53.000000000 +0200
++++ backend/wbpublic/CMakeLists.txt	2013-08-26 00:24:09.226132211 +0200
+@@ -176,6 +176,6 @@
+ #	)
+ #endif()
+ 
+-target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc ${VSQLITE_LIBRARIES} wbscintilla mysqlparser ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${CTEMPLATE_LIBRARIES} ${OPENGL_LIBRARIES})
++target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc ${VSQLITE_LIBRARIES} wbscintilla mysqlparser ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${CTEMPLATE_LIBRARIES} ${OPENGL_LIBRARIES} ${PCRE_LIBRARIES})
+ 
+ install(TARGETS wbpublic DESTINATION ${WB_INSTALL_LIB_DIR})
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.0.7.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.0.7.ebuild
new file mode 100644
index 000000000000..468a9b2bb882
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.0.7.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.7.ebuild,v 1.1 2013/10/19 13:48:58 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}-${PV}-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
+}