Cleanup unused patches.

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

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 8c09f61860e9bd8d71ee088a284b261f1a541dbf..b74e2a269bed5707037e8bfdf90ec8dbe6cabbdd 100644 (file)
--- 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/Manifest b/dev-db/mysql-workbench/Manifest
index 2e33f1b21ea3d3f1b388787285dbc3d6fba9aad7..06cfa0c2a82e4f3b8c7827e482a17d61265e3aaf 100644 (file)
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,8 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
 AUX mysql-workbench-6.1.7-mysql_options4.patch 1141 SHA256 443bda1345796c0545fbf7735ae3b19fda1c5e0f2b960b80cae4dbfd33714ae1 SHA512 c937c857c1093a3d17b319ff1b967fc291ea3e067b0326d8fac24fb419ce337b9db1b59850f7c348d0cd0358a6e71f3825342928c0c3e78d080a58e0d10d3e38 WHIRLPOOL a70ec9af0c67f8b9f8a35b88df62eba22c7fb8645169f0122e523be9cf69a80a6af986ba4191c00738bb7eebefcff2d7445bbb4bc5365e0a5bd74d594afdce1c
@@ -20,22 +18,12 @@ EBUILD mysql-workbench-6.0.9.ebuild 2207 SHA256 61a08c3a7852a9601cfcf895a111c17a
 EBUILD mysql-workbench-6.2.3-r1.ebuild 2588 SHA256 fbb8c1404177b4d9a853c2c4f64512fd39ed3b08ce84a95eeacfca322d916d1b SHA512 60c3d3b1e2a0eebb15d23cb5b99617e72ade2b224d4ab200fe570ff5337e6dc376bd3b7c7331ae812929ffdd41bfe936a5df7f2e1d036c80e0f0d0e881035d23 WHIRLPOOL fc7c2cb41709fc1a8f84c04cafc53c79ca0b1aac86f5430def5a3de89226f4d3e4b577ee2e3311c58e3c8cf3c598ec9aa24804476fb4482c8cb376e73d9605f5
 EBUILD mysql-workbench-6.2.3.ebuild 2499 SHA256 fc2c5f05139545823c646f72b6402a71373d3948b1a58bab245bc1774759457b SHA512 9b84e8eb10ea27f87b17db3ea199b0dd73621e7867e1538557c028b2003346cc33176e90c3f76268b6318ce03e02c7ffb70405f6f1cbb06d2628b560b14dcd75 WHIRLPOOL 1cf8be3f3b2c98cec1f3a954d976a2bd3df3e33416209da5258df514e4eb134977aedea90f10faf44e8eb3ea893dee2e0a78f21e41cf12c604fec2b841889f1e
 EBUILD mysql-workbench-6.2.5.ebuild 2698 SHA256 13a9d5935adc4594f71af831ee340bc58ce1dfdb080e85c4b179d8ead2a30350 SHA512 42c799727d3c31951f0ce62c640c05760d5f8e6b9ca42fb24dec23fa835cb8b8e5f2158e43e4f3488c9d69c0c1cb1e03b7cf01bb33aa30fae623649d6bb3fbdc WHIRLPOOL 5f60497a9d3d54401bb953726cb2c894c388b043d839544679f8b8b2116d930e09ac372f680240a52d487ede31430f7d455f7974d59377a3661d0487e1ea818a
-MISC ChangeLog 19071 SHA256 183761f931ee0cfc3eeeac485ebfaf571950f9f688a1e636f90442b923df1ad0 SHA512 3c801432d899b3d3455dd0e25d97e1558eabfd5fea7d54690198637c23c6aec0c9ccd3a13c26f44b7b151cf1af5fb1b3af2d305b34ca91caf7dc3a31f8864a2c WHIRLPOOL b0059aecda65eb6a74e8e678ec13870f12b9e038068d643c888873723f947c714964dd4b49f031a08ff895b22043f97a62a60e573288e8fca6be0863841d9d9d
+MISC ChangeLog 19240 SHA256 5ec8ba9166c31aaa66704d5578135b2fe2a4389847990f3e5a13c0403ae87ee1 SHA512 daef70db193f9ff2b352ff848ee79ec0b8ea1da665e7afae93bcb0678445448ec8a23b981d9a765b8583173be8e8f3345dcd212888040ce4dd746cb97f0bc106 WHIRLPOOL f311067745f4893cec41921dce13cf78f4009fe92b223d67ed51c6b7ebd733697d16346f673894961a9f26fb2cd5aece6fe55f30b040d51de00d9c7923b1c56b
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVDeRDAAoJEIug43o+kWudbVkP/0ifTWTqDF+oFkYUCnykjryG
-tvTnEBs5tDEU/8LQdsBomEeIf46VRsZJ8CH67eksK9pkGl3C6wwr07QB7heSGhg6
-5D+aatvTkv1O+PCDlTKu0bfitxB4sqUFZKOS+VrfzrPeZMrjJKWjVh1/rrHYw37s
-Ye79nmSe1XYoZNseadEuJJx6YAZssERvksTBOAiKbUcInd7qxc2cpYc7eHi8AIhs
-qUPKWTtO5PwioWVfLduqahu0WY73XyBwuq8xAEGpDdD0CJy00VMOJrucWv6HIGIS
-qtAblcZopgsQ9OEkMcXzdJycxNEDHMXWKbh2tKv/j/eOK/T1X/HwwaYIKcBV0Yll
-GRVFshNDyOOd3jyR4Fg7RejEi8frbmeVBYUUrQErzMVt+bttP0caZifsXC+mlhkH
-cZNnPel9WOdLX4q6O17Y5q5EAPJ8IhMtYCIKzb6P0plFhWj7zQqtEAxM3NleLmyi
-UeWV0L93ccmmgzq4cSoqdL1ycguwG9qIjjZSlO8zjctO8PYc3bqQLuHx93L85qhv
-J0gz8QOiY5V4ysGZ8iLRgNfcLrXBoF+gDXEMbueqBH5j6F5ShHXc8osW5PJsAcAv
-jieKB2WcklgYZXyKHPyoY2JuSnMXyl4RrCLfl1Gjw9nw+ism4szoLB0nlTnJUr0o
-0TeBGqd5i1Bfd6sMACBI
-=uCj2
+iF4EAREIAAYFAlUXn+oACgkQiIP6VqMIqNdYhgD9HPEsqFDYGnxC2qhEj1oLV2Dw
+LuxFJ5Ix+GGnXUIc1IoA/iKdJnqjkFnvou1GytEZ8NhBHXCSJ0g6rdopUgf3pe3j
+=6JgY
 -----END PGP SIGNATURE-----

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 (file)
index 2805ff0..0000000
--- 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 (file)
index f5f189e..0000000
--- 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
-        )
-