Cleanup unused patches.

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

3 files changed, 6 insertions, 94 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 8c09f61860e9..b74e2a269bed 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,11 @@
 # 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.109 2015/03/21 21:38:10 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.110 2015/03/29 06:47:05 graaff Exp $
+
+  29 Mar 2015; Hans de Graaff <graaff@gentoo.org>
+  -files/mysql-workbench-5.2.44-my_lib.patch,
+  -files/mysql-workbench-6.0.7-CMakeLists.patch:
+  Cleanup unused patches.
 
   21 Mar 2015; Andreas Schuerch <nativemad@gentoo.org>
   mysql-workbench-6.0.9.ebuild:
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch
deleted file mode 100644
index 2805ff03a864..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.44-my_lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: mysql-workbench-gpl-5.2.44-src/modules/db.mysql.sqlparser/Makefile.am
-===================================================================
---- mysql-workbench-gpl-5.2.44-src.orig/modules/db.mysql.sqlparser/Makefile.am
-+++ mysql-workbench-gpl-5.2.44-src/modules/db.mysql.sqlparser/Makefile.am
-@@ -64,6 +64,7 @@ db_mysql_sqlparser_grt_la_SOURCES=\
- 	$(top_srcdir)/library/sql-parser/source/myx_statement_parser.cpp\
- 	$(top_srcdir)/library/sql-parser/source/myx_unicode_scanner.cpp\
- 	$(top_srcdir)/library/sql-parser/source/sql_parser_symbols.cpp\
-+	$(top_srcdir)/library/sql-parser/source/my_lib.cpp\
- 	$(top_srcdir)/library/sql-parser/source/my_messnc.cpp\
- 	$(top_srcdir)/library/sql-parser/source/my_static.cpp\
- 	$(top_srcdir)/library/sql-parser/source/my_strtoll10.cpp\
\ No newline at end of file
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
deleted file mode 100644
index f5f189e3bb09..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-CMakeLists.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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
-        )
-