Drop old patches.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

5 files changed, 8 insertions, 81 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 3fe23f4b8333..bbb10ecfef3f 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.46 2011/12/14 19:34:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.47 2011/12/14 19:39:07 graaff Exp $
+
+  14 Dec 2011; Hans de Graaff <graaff@gentoo.org>
+  -files/mysql-workbench-5.2.17-as-needed-modules.patch,
+  -files/mysql-workbench-5.2.17-python-libs.patch,
+  -files/mysql-workbench-5.2.33-cpp.patch,
+  -files/mysql-workbench-5.2.33-gtkmm.patch:
+  Drop old patches.
 
   14 Dec 2011; Hans de Graaff <graaff@gentoo.org>
   mysql-workbench-5.2.36.ebuild:
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch
deleted file mode 100644
index a53b49d37f0c..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/wb.validation/Makefile.am.~1~	2010-04-02 03:26:24.000000000 +0200
-+++ modules/wb.validation/Makefile.am	2010-04-09 16:18:16.703343478 +0200
-@@ -19,6 +19,7 @@
- 
- 
- wb_validation_grt_la_LDFLAGS=-module
-+wb_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@
- #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la 
- 
- wb_validation_grt_la_SOURCES=src/register_plugin.cpp\
---- modules/wb.mysql.validation/Makefile.am.~1~	2010-04-02 03:26:24.000000000 +0200
-+++ modules/wb.mysql.validation/Makefile.am	2010-04-09 16:17:53.991717921 +0200
-@@ -21,6 +21,7 @@
- 
- 
- wb_mysql_validation_grt_la_LDFLAGS=-module
-+wb_mysql_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@
- #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)
- 
- wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch
deleted file mode 100644
index 8fb6b71e91b0..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Use a simpler check for Python's libs that return an actual linker
-invocation (e.g. -lpython2.6) instead of the .so file. This fixes the
-case with forced as-needed where the .so gets re-ordered to the front
-during link.
-
---- configure.in.~1~	2010-04-02 03:26:27.000000000 +0200
-+++ configure.in	2010-04-09 16:06:10.271092660 +0200
-@@ -303,12 +303,7 @@
- dnl 	enable_python=$enableval, enable_python=no)
- 
- AC_MSG_CHECKING(for Python)
--PYTHON_LIBS=[$(python -c "from distutils import sysconfig
--import os 
--cfg=sysconfig.get_config_vars()
--lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY'])
--if os.path.exists(lib):
--    print lib")]
-+PYTHON_LIBS=[$(python -c 'import sys; print("-lpython%s.%s" % sys.version_info[:2])')]
- PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
- print sysconfig.get_python_inc()")]
- PYTHON_CFLAGS="-I$PYTHON_CFLAGS"
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch
deleted file mode 100644
index 879db83ed32d..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- library/base/base/xml_util_functions.h.~1~	2011-03-11 00:03:28.000000000 +0100
-+++ library/base/base/xml_util_functions.h	2011-03-14 18:57:34.571514279 +0100
-@@ -20,10 +20,6 @@
- #ifndef _XML_UTIL_FUNCTIONS_H_
- #define _XML_UTIL_FUNCTIONS_H_
- 
--#ifdef __cplusplus
--extern "C" {
--#endif
--
- #include "base/common.h"
- //#include "util.h"
- 
-@@ -31,6 +27,10 @@
- #include <libxml/tree.h>
- //#endif
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- typedef char base_bool;
- 
- BASELIBRARY_PUBLIC_FUNC xmlDocPtr base_xmlParseFile(const char *filename);
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch
deleted file mode 100644
index c2220bd43025..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Patch to fix compilation with gtkmm-2.24.0. Taken from
-http://bugs.mysql.com/bug.php?id=60603
-
-diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp
---- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46	2011-03-23 16:56:16.000000000 +0100
-+++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp	2011-03-23 17:07:36.000000000 +0100
-@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo
-   }
- 
-   Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns);
--  Gtk::ComboBox *combo= new Gtk::ComboBox(model);
-+  Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr<Gtk::TreeModel> &)model);
- 
-   combo->pack_start(color_combo_columns->image);
-