[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2024-02-23 Thread Hans de Graaff 
commit: ce17e11ed31c7700286e18af7e6779a789d9aaef
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Feb 23 10:35:40 2024 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Feb 23 10:35:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce17e11e

dev-db/mysql-workbench: drop 8.0.34, 8.0.34-r1

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench-8.0.34-r1.ebuild   | 116 -
 .../mysql-workbench/mysql-workbench-8.0.34.ebuild  | 116 -
 3 files changed, 233 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index de095a7d88aa..89f6c6141073 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,2 @@
 DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 
24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b
 SHA512 
a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
-DIST mysql-workbench-community-8.0.34-src.tar.gz 27906155 BLAKE2B 
3a05e1763eddba5c72242eb3d79100fee43915a96fc0198ad5624f14f5228cc11040d424ccd484ee312d8bcd2372c5197ae0136e8d33f3fd45b3ed429ff9ee20
 SHA512 
e031f6a0cadab528d64160113539535e93aea4631e0139256f6b3e812fa6d12a35c71f16f78d60ceeb004edb3a67bbd4db6ac3e5c286df23491d3f0b410f1c77
 DIST mysql-workbench-community-8.0.36-src.tar.gz 27419906 BLAKE2B 
47ab5c64b5beee712c9227cdb5c46a6863d830ef75983e0e56702e0b08370b9118b301d0c34ba95180bef2fe0b01ae24791337c9e1922cd412a37f057906027a
 SHA512 
953f072414abb8c236ffccb8a4439dcd4c5eb76ff07f5ca276c35e8cf6102ef73292412fc70113a167f34bd998603ef22b59038ae06cf84d2f0440769c1d9689

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.34-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.34-r1.ebuild
deleted file mode 100644
index 8c7923b9a050..
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.34-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.11.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   >=dev-cpp/antlr-cpp-4.11.1:4
-   dev-cpp/atkmm:*
-   dev-cpp/pangomm:1.4
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.9.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   >=x11-libs/cairo-1.5.12[glib,svg(+)]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   dev-libs/boost[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1:=
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-8.0.27-r1[legacy(-)]
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   >=virtual/jre-11
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-   "${FILESDIR}/${PN}-8.0.33-gcc13.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-   ## And avoid -Werror
-   sed -i -e 's/-Werror//' CMakeLists.txt || die
-   ## Fix doc install directory
-   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-
-   ## package is very fragile...
-   strip-flags
-
-   cmake_src_prepare
-}
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2024-02-20 Thread Ionen Wolkens 
commit: 9b3d41e64c99557e8a2b8dd71469b8e4765d4004
Author: Matoro Mahri  matoro  tk>
AuthorDate: Thu Feb 15 19:44:45 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb 20 20:58:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b3d41e6

dev-db/mysql-workbench: Stabilize 8.0.36 amd64, #923396

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
index 2f2d812652f4..bb6113df89ed 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/

2024-01-29 Thread Hans de Graaff 
commit: d6c21bdac617b6b07cbeb7e8b17fa91ae90f0b55
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Jan 29 09:45:45 2024 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jan 29 13:02:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c21bda

dev-db/mysql-workbench: fix build with >=libxml2-2.12

Closes: https://bugs.gentoo.org/923020
Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Hans de Graaff  gentoo.org>

 ...sql-workbench-8.0.36-libxml2-2.12-support.patch | 33 ++
 .../mysql-workbench/mysql-workbench-8.0.36.ebuild  |  1 +
 2 files changed, 34 insertions(+)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
new file mode 100644
index ..e3ee9aa099f0
--- /dev/null
+++ 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/923020
+https://github.com/mysql/mysql-workbench/pull/43
+
+From 8f8917671ab5a06f842a340f31c6d4ec7634147a Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Sat, 27 Jan 2024 22:51:15 +0200
+Subject: [PATCH] Fix support for libxml2-2.12 with its api and header changes
+
+Signed-off-by: Alfred Wingate 
+--- a/library/grt/src/grt.h
 b/library/grt/src/grt.h
+@@ -34,6 +34,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include "base/threading.h"
+ #include 
+--- a/library/grt/src/unserializer.cpp
 b/library/grt/src/unserializer.cpp
+@@ -401,7 +401,11 @@ ValueRef 
internal::Unserializer::unserialize_xmldata(const char *data, size_t si
+   xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT);
+ 
+   if (!doc) {
++#if LIBXML_VERSION >= 21200
++const xmlError* error = xmlGetLastError();
++#else
+ xmlErrorPtr error = xmlGetLastError();
++#endif
+ 
+ if (error)
+   throw std::runtime_error(base::strfmt("Could not parse XML data. Line 
%d, %s", error->line, error->message));

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
index c8e0352d19f7..2f2d812652f4 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
"${FILESDIR}/${PN}-8.0.33-gcc13.patch"
+   "${FILESDIR}/${PN}-8.0.36-libxml2-2.12-support.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2024-01-17 Thread Hans de Graaff 
commit: f0690aa0dbca517ce68f345be2e3d9ac1044639d
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jan 17 13:15:38 2024 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jan 17 13:16:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0690aa0

dev-db/mysql-workbench: add 8.0.36

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.36.ebuild  | 115 +
 2 files changed, 116 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index b6ff93357857..de095a7d88aa 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,2 +1,3 @@
 DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 
24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b
 SHA512 
a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
 DIST mysql-workbench-community-8.0.34-src.tar.gz 27906155 BLAKE2B 
3a05e1763eddba5c72242eb3d79100fee43915a96fc0198ad5624f14f5228cc11040d424ccd484ee312d8bcd2372c5197ae0136e8d33f3fd45b3ed429ff9ee20
 SHA512 
e031f6a0cadab528d64160113539535e93aea4631e0139256f6b3e812fa6d12a35c71f16f78d60ceeb004edb3a67bbd4db6ac3e5c286df23491d3f0b410f1c77
+DIST mysql-workbench-community-8.0.36-src.tar.gz 27419906 BLAKE2B 
47ab5c64b5beee712c9227cdb5c46a6863d830ef75983e0e56702e0b08370b9118b301d0c34ba95180bef2fe0b01ae24791337c9e1922cd412a37f057906027a
 SHA512 
953f072414abb8c236ffccb8a4439dcd4c5eb76ff07f5ca276c35e8cf6102ef73292412fc70113a167f34bd998603ef22b59038ae06cf84d2f0440769c1d9689

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
new file mode 100644
index ..c8e0352d19f7
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{10,11} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.11.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   >=dev-cpp/antlr-cpp-4.11.1:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   >=net-libs/libssh-0.9.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   >=x11-libs/cairo-1.5.12[glib,svg(+)]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   dev-libs/boost[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1:=
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-8.0.27-r1[legacy(-)]
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=virtual/jre-11
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+   "${FILESDIR}/${PN}-8.0.33-gcc13.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+   ## Fix doc install directory
+   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
+
+   ## package is very fragile...
+   strip-flags
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   if has_version dev-db/libiodbc ; then
+   IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+   fi

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-11-27 Thread Andreas Sturmlechner 
commit: 7b4a9881717e74e991f530e63f36abcd13e22ed9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 15 19:11:45 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 27 15:43:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b4a9881

dev-db/mysql-workbench: drop 8.0.33

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench/mysql-workbench-8.0.33.ebuild  | 116 -
 2 files changed, 117 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index a868b842c79f..b6ff93357857 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,2 @@
 DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 
24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b
 SHA512 
a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
-DIST mysql-workbench-community-8.0.33-src.tar.gz 27900614 BLAKE2B 
fd1fd53eec882c1cdc42ac1f56bfec034e1e3266768f12d41306464e87e81008008b5a467bbad251f49d2c3c9e7737440c4c9d9a00020a7fa603c6f5c5fbe107
 SHA512 
cd251d7eb6aa0e1d8a1ee5c5cd7c7422979172b333420fbd30c626b1acc9563e34cf537374888365e3001277b4dcd7adffbb2f14f0dccc219ba1ef5f2d44b292
 DIST mysql-workbench-community-8.0.34-src.tar.gz 27906155 BLAKE2B 
3a05e1763eddba5c72242eb3d79100fee43915a96fc0198ad5624f14f5228cc11040d424ccd484ee312d8bcd2372c5197ae0136e8d33f3fd45b3ed429ff9ee20
 SHA512 
e031f6a0cadab528d64160113539535e93aea4631e0139256f6b3e812fa6d12a35c71f16f78d60ceeb004edb3a67bbd4db6ac3e5c286df23491d3f0b410f1c77

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
deleted file mode 100644
index 5a4074147d36..
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.11.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   >=dev-cpp/antlr-cpp-4.11.1:4
-   dev-cpp/atkmm:*
-   dev-cpp/pangomm:1.4
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.9.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   >=x11-libs/cairo-1.5.12[glib,svg(+)]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   dev-libs/boost[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-8.0.27-r1
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   >=virtual/jre-11
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-   "${FILESDIR}/${PN}-8.0.33-gcc13.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-   ## And avoid -Werror
-   sed -i -e 's/-Werror//' CMakeLists.txt || die
-   ## Fix doc install directory
-   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-
-   ## package is very fragile...
-   strip-flags
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   if has_version dev-db/libiodbc ; then
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-09-23 Thread Hans de Graaff 
commit: d365b3714beef4e36216824510f026d093c1d7b8
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Sep 23 06:36:02 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Sep 23 07:07:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d365b371

dev-db/mysql-workbench: stabilize 8.0.34 for amd64

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.34.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.34.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.34.ebuild
index f2473fcbfa84..be2ff26905e2 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.34.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.34.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-07-18 Thread Hans de Graaff 
commit: 26b75dac7be210d0887a71a7bd8d6fef698eed12
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jul 19 05:44:02 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jul 19 05:49:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b75dac

dev-db/mysql-workbench: add 8.0.34

Closes: https://bugs.gentoo.org/829876
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.34.ebuild  | 116 +
 2 files changed, 117 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 12dacd5cabb0..a868b842c79f 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,2 +1,3 @@
 DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 
24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b
 SHA512 
a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
 DIST mysql-workbench-community-8.0.33-src.tar.gz 27900614 BLAKE2B 
fd1fd53eec882c1cdc42ac1f56bfec034e1e3266768f12d41306464e87e81008008b5a467bbad251f49d2c3c9e7737440c4c9d9a00020a7fa603c6f5c5fbe107
 SHA512 
cd251d7eb6aa0e1d8a1ee5c5cd7c7422979172b333420fbd30c626b1acc9563e34cf537374888365e3001277b4dcd7adffbb2f14f0dccc219ba1ef5f2d44b292
+DIST mysql-workbench-community-8.0.34-src.tar.gz 27906155 BLAKE2B 
3a05e1763eddba5c72242eb3d79100fee43915a96fc0198ad5624f14f5228cc11040d424ccd484ee312d8bcd2372c5197ae0136e8d33f3fd45b3ed429ff9ee20
 SHA512 
e031f6a0cadab528d64160113539535e93aea4631e0139256f6b3e812fa6d12a35c71f16f78d60ceeb004edb3a67bbd4db6ac3e5c286df23491d3f0b410f1c77

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.34.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.34.ebuild
new file mode 100644
index ..f2473fcbfa84
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.34.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.11.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   >=dev-cpp/antlr-cpp-4.11.1:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.9.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   >=x11-libs/cairo-1.5.12[glib,svg(+)]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   dev-libs/boost[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1:=
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-8.0.27-r1
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=virtual/jre-11
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+   "${FILESDIR}/${PN}-8.0.33-gcc13.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+   ## Fix doc install directory
+   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
+
+   ## package is very fragile...
+   strip-flags
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   if has_version dev-db/libiodbc ; then
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/, dev-db/mysql-workbench/files/

2023-07-08 Thread Hans de Graaff 
commit: 9b58cf14be1dd0bf854e93ed326074d0b7464d18
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Jul  8 08:58:44 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Jul  8 08:58:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b58cf14

dev-db/mysql-workbench: fix gcc13 compilation

Thanks to Alex D-Bug for the patch.

Closes: https://bugs.gentoo.org/905758
Signed-off-by: Hans de Graaff  gentoo.org>

 .../files/mysql-workbench-8.0.33-gcc13.patch   | 40 ++
 .../mysql-workbench/mysql-workbench-8.0.33.ebuild  |  1 +
 2 files changed, 41 insertions(+)

diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.33-gcc13.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.33-gcc13.patch
new file mode 100644
index ..7fbbc145d4bf
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.33-gcc13.patch
@@ -0,0 +1,40 @@
+--- mysql-workbench-community-8.0.33-src/library/forms/mforms/mforms.h.orig
2023-06-30 14:43:47.056539087 +0300
 mysql-workbench-community-8.0.33-src/library/forms/mforms/mforms.h 
2023-06-30 14:44:11.500537735 +0300
+@@ -61,6 +61,7 @@
+  *
+  */
+ 
++#include 
+ #include "mforms/view.h"
+ #include "mforms/form.h"
+ #include "mforms/button.h"
+--- 
mysql-workbench-community-8.0.33-src/library/cdbc/src/driver_manager.h.orig 
   2023-06-30 14:51:19.804514044 +0300
 mysql-workbench-community-8.0.33-src/library/cdbc/src/driver_manager.h 
2023-06-30 14:51:30.333513462 +0300
+@@ -27,6 +27,7 @@
+ #include "cppdbc_public_interface.h"
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+--- mysql-workbench-community-8.0.33-src/library/forms/mforms/treeview.h.orig  
2023-06-30 17:08:50.534057671 +0300
 mysql-workbench-community-8.0.33-src/library/forms/mforms/treeview.h   
2023-06-30 17:10:33.945051951 +0300
+@@ -23,6 +23,7 @@
+ 
+ #pragma once
+ 
++#include 
+ #include 
+ 
+ /**
+--- 
mysql-workbench-community-8.0.33-src/backend/wbpublic/sqlide/sqlide_generics_private.h.orig
2023-06-30 17:51:48.242915090 +0300
 
mysql-workbench-community-8.0.33-src/backend/wbpublic/sqlide/sqlide_generics_private.h
 2023-06-30 17:52:26.461912976 +0300
+@@ -24,6 +24,7 @@
+ #ifndef _SQLIDE_GENERICS_PRIVATE_H_
+ #define _SQLIDE_GENERICS_PRIVATE_H_
+ 
++#include 
+ #include "wbpublic_public_interface.h"
+ #include 
+ #include 

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
index c7a1e0a6bc79..5a4074147d36 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
@@ -70,6 +70,7 @@ S="${WORKDIR}"/"${MY_P}"
 PATCHES=(
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+   "${FILESDIR}/${PN}-8.0.33-gcc13.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-06-15 Thread Hans de Graaff 
commit: c6ba1aaf31fe16e83c376c279e8e923c6feb69dc
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jun 15 12:08:29 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jun 15 12:08:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ba1aaf

dev-db/mysql-workbench: fix unixODBC compilation

The mysql-workbench code already was changed to work with the latest
unixODBC release. Revert the workaround and require the latest version.

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
index 8d82780756f3..c7a1e0a6bc79 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
@@ -51,7 +51,7 @@ CDEPEND="${PYTHON_DEPS}
dev-libs/tinyxml[stl]
>=dev-db/mysql-connector-c++-8.0.27-r1
dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
+   || ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
dev-python/pexpect
>=dev-python/paramiko-1.7.4
 "
@@ -83,8 +83,6 @@ src_prepare() {
sed -i -e 's/-Werror//' CMakeLists.txt || die
## Fix doc install directory
sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-   ## Look for an existing header file
-   sed -i -e 's/unixodbc.h/unixodbc_conf.h/' 
build/cmake/Modules/FindUNIXODBC.cmake || die
 
## package is very fragile...
strip-flags

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-06-15 Thread Hans de Graaff 
commit: 360a6fde9a91c16cfacc25918f42f673d4a02cae
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jun 15 11:37:05 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jun 15 11:38:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=360a6fde

dev-db/mysql-workbench: require new enough jre

Closes: https://bugs.gentoo.org/907184
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
index 81d3bf1c8edf..8d82780756f3 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
@@ -62,7 +62,7 @@ RDEPEND="${CDEPEND}
 
 DEPEND="${CDEPEND}
dev-lang/swig
-   virtual/jre
+   >=virtual/jre-11
virtual/pkgconfig"
 
 S="${WORKDIR}"/"${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-05-27 Thread Pacho Ramos 
commit: a5e94cb68c1dc3f727edabc9f592a0e0869d4817
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat May 27 15:04:44 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat May 27 15:04:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e94cb6

dev-db/mysql-workbench: drop 8.0.32

Closes: https://bugs.gentoo.org/889534
Signed-off-by: Pacho Ramos  gentoo.org>

 dev-db/mysql-workbench/Manifest|   2 -
 .../mysql-workbench/mysql-workbench-8.0.32.ebuild  | 110 -
 2 files changed, 112 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 3d9cbad5978e..12dacd5cabb0 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,4 +1,2 @@
 DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 
24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b
 SHA512 
a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
-DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
-DIST mysql-workbench-community-8.0.32-src.tar.gz 19353724 BLAKE2B 
0ae8b7cfa0c73b4637ea62bdb46ff4102a374a6dc0b84eed8df414c07277763c61312996a011da82af668c6600bb76f723be60995509b7108ec184fde514f7b0
 SHA512 
368f9874a996efa782b6e0e6cf8b8919aacd2d7d4ad273f8ab5ed1ac6c9490e2c37bc1413867c5ed85169f04773bafcea7d513c8fc12323ba225cdb411b9ff05
 DIST mysql-workbench-community-8.0.33-src.tar.gz 27900614 BLAKE2B 
fd1fd53eec882c1cdc42ac1f56bfec034e1e3266768f12d41306464e87e81008008b5a467bbad251f49d2c3c9e7737440c4c9d9a00020a7fa603c6f5c5fbe107
 SHA512 
cd251d7eb6aa0e1d8a1ee5c5cd7c7422979172b333420fbd30c626b1acc9563e34cf537374888365e3001277b4dcd7adffbb2f14f0dccc219ba1ef5f2d44b292

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild
deleted file mode 100644
index 865ff1995aa0..
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   =dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.9.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   >=x11-libs/cairo-1.5.12[glib,svg(+)]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   dev-libs/boost[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-8.0.27-r1
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-   ## And avoid -Werror
-   sed -i -e 's/-Werror//' CMakeLists.txt || die
-   ## Fix doc install directory
-   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-
-   ## package is very fragile...
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-05-24 Thread Arthur Zamarin 
commit: 2bfea4e094e943fb6b2080dea51710edbf493d82
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed May 24 18:53:48 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed May 24 18:53:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bfea4e0

dev-db/mysql-workbench: Stabilize 8.0.33 amd64, #905401

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
index f22506106d34..81d3bf1c8edf 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-04-21 Thread Hans de Graaff 
commit: 46f3bd39426c87164007c8b519a8f69437bf86e7
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Apr 21 08:44:04 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Apr 21 08:45:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f3bd39

dev-db/mysql-workbench: add 8.0.33

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   2 +
 .../mysql-workbench/mysql-workbench-8.0.33.ebuild  | 117 +
 2 files changed, 119 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 8778f13f73b3..48abf8566b4b 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,5 @@
+DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 
24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b
 SHA512 
a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B 
eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548
 SHA512 
7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a
 DIST mysql-workbench-community-8.0.32-src.tar.gz 19353724 BLAKE2B 
0ae8b7cfa0c73b4637ea62bdb46ff4102a374a6dc0b84eed8df414c07277763c61312996a011da82af668c6600bb76f723be60995509b7108ec184fde514f7b0
 SHA512 
368f9874a996efa782b6e0e6cf8b8919aacd2d7d4ad273f8ab5ed1ac6c9490e2c37bc1413867c5ed85169f04773bafcea7d513c8fc12323ba225cdb411b9ff05
+DIST mysql-workbench-community-8.0.33-src.tar.gz 27900614 BLAKE2B 
fd1fd53eec882c1cdc42ac1f56bfec034e1e3266768f12d41306464e87e81008008b5a467bbad251f49d2c3c9e7737440c4c9d9a00020a7fa603c6f5c5fbe107
 SHA512 
cd251d7eb6aa0e1d8a1ee5c5cd7c7422979172b333420fbd30c626b1acc9563e34cf537374888365e3001277b4dcd7adffbb2f14f0dccc219ba1ef5f2d44b292

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
new file mode 100644
index ..f22506106d34
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.11.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   >=dev-cpp/antlr-cpp-4.11.1:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.9.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   >=x11-libs/cairo-1.5.12[glib,svg(+)]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   dev-libs/boost[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-8.0.27-r1
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-04-21 Thread Hans de Graaff 
commit: dced8e29d7fe9d8d09f3b3b0278060b7c05fa2db
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Apr 21 08:44:23 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Apr 21 08:45:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dced8e29

dev-db/mysql-workbench: drop 8.0.31-r1

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench-8.0.31-r1.ebuild   | 110 -
 2 files changed, 111 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 48abf8566b4b..3d9cbad5978e 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,5 +1,4 @@
 DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 
24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b
 SHA512 
a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
-DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B 
eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548
 SHA512 
7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a
 DIST mysql-workbench-community-8.0.32-src.tar.gz 19353724 BLAKE2B 
0ae8b7cfa0c73b4637ea62bdb46ff4102a374a6dc0b84eed8df414c07277763c61312996a011da82af668c6600bb76f723be60995509b7108ec184fde514f7b0
 SHA512 
368f9874a996efa782b6e0e6cf8b8919aacd2d7d4ad273f8ab5ed1ac6c9490e2c37bc1413867c5ed85169f04773bafcea7d513c8fc12323ba225cdb411b9ff05
 DIST mysql-workbench-community-8.0.33-src.tar.gz 27900614 BLAKE2B 
fd1fd53eec882c1cdc42ac1f56bfec034e1e3266768f12d41306464e87e81008008b5a467bbad251f49d2c3c9e7737440c4c9d9a00020a7fa603c6f5c5fbe107
 SHA512 
cd251d7eb6aa0e1d8a1ee5c5cd7c7422979172b333420fbd30c626b1acc9563e34cf537374888365e3001277b4dcd7adffbb2f14f0dccc219ba1ef5f2d44b292

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
deleted file mode 100644
index 865ff1995aa0..
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   =dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.9.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   >=x11-libs/cairo-1.5.12[glib,svg(+)]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   dev-libs/boost[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-8.0.27-r1
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//'

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-04-02 Thread Arthur Zamarin 
commit: 97d2ddfe2f2aa90b721a3e778298d8acab60fe87
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr  2 19:30:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr  2 19:30:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d2ddfe

dev-db/mysql-workbench: Stabilize 8.0.32 amd64, #894488

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild
index 9b199f066c5a..865ff1995aa0 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-02-18 Thread Andreas Sturmlechner 
commit: b80a6dee350ab88ac15355e2bc49dd3073837893
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 18 13:03:16 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 18 13:55:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80a6dee

dev-db/mysql-workbench: drop 8.0.31-r0

Broken by current stable dev-cpp/antlr-cpp.

Bug: https://bugs.gentoo.org/889534
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../mysql-workbench/mysql-workbench-8.0.31.ebuild  | 110 -
 1 file changed, 110 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
deleted file mode 100644
index 5c00881d295a..
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm:*
-   dev-cpp/pangomm:1.4
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.8.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   >=x11-libs/cairo-1.5.12[glib,svg(+)]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   dev-libs/boost[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-8.0.27-r1
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-   ## And avoid -Werror
-   sed -i -e 's/-Werror//' CMakeLists.txt || die
-   ## Fix doc install directory
-   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-
-   ## package is very fragile...
-   strip-flags
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   if has_version dev-db/libiodbc ; then
-   IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
-   fi
-
-   append-cxxflags -std=c++11
-   ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
-   local mycmakeargs=(
-   -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
-   -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-   -DIODBC_INCLUDE_PATH="/usr/include/iodbc"
-   ${IODBC}
-   -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-   -DPYTHON_LIBRARY="$(python_get_library_path)"
-   -DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
-   )
-   cmake_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-02-10 Thread Hans de Graaff 
commit: 493c17531889bd871722f3f52075f1eeec0e2c2a
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Feb 10 08:14:00 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Feb 10 08:14:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493c1753

dev-db/mysql-workbench: stabilize 8.0.31-r1 for amd64

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
index 9b199f066c5a..865ff1995aa0 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-01-20 Thread Hans de Graaff 
commit: b09897c884bae9d5c00d7ccbd549a97410a1f0fb
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jan 20 08:26:14 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jan 20 08:31:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b09897c8

dev-db/mysql-workbench: add 8.0.32

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.32.ebuild  | 110 +
 2 files changed, 111 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 6522ac420c3c..8778f13f73b3 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,2 +1,3 @@
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B 
eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548
 SHA512 
7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a
+DIST mysql-workbench-community-8.0.32-src.tar.gz 19353724 BLAKE2B 
0ae8b7cfa0c73b4637ea62bdb46ff4102a374a6dc0b84eed8df414c07277763c61312996a011da82af668c6600bb76f723be60995509b7108ec184fde514f7b0
 SHA512 
368f9874a996efa782b6e0e6cf8b8919aacd2d7d4ad273f8ab5ed1ac6c9490e2c37bc1413867c5ed85169f04773bafcea7d513c8fc12323ba225cdb411b9ff05

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild
new file mode 100644
index ..9b199f066c5a
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   =dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.9.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   >=x11-libs/cairo-1.5.12[glib,svg(+)]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   dev-libs/boost[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-8.0.27-r1
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+   ## Fix doc install directory
+   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
+
+   ## package is very fragile...
+   strip-flags
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   if has_version dev-db/libiodbc ; then
+   IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+   fi
+
+   append-cxxflags -std=c++11
+   ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
+   local mycmakeargs=(
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-01-08 Thread Hans de Graaff 
commit: cee5dba7eb4c5c237ead73115dd95c9f0040cf49
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Jan  8 10:37:25 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Jan  8 10:38:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee5dba7

dev-db/mysql-workbench: update dependencies

mysql-workbench fails to compile with newer antlr-cpp versions and
requires a newer libssh.

Bug: https://bugs.gentoo.org/889534
Closes: https://bugs.gentoo.org/832688
Signed-off-by: Hans de Graaff  gentoo.org>

 .../mysql-workbench-8.0.31-r1.ebuild   | 110 +
 1 file changed, 110 insertions(+)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
new file mode 100644
index ..c7a0d71a3016
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   =dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.9.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   >=x11-libs/cairo-1.5.12[glib,svg(+)]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   dev-libs/boost[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-8.0.27-r1
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+   ## Fix doc install directory
+   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
+
+   ## package is very fragile...
+   strip-flags
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   if has_version dev-db/libiodbc ; then
+   IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+   fi
+
+   append-cxxflags -std=c++11
+   ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
+   local mycmakeargs=(
+   -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
+   -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+   -DIODBC_INCLUDE_PATH="/usr/include/iodbc"
+   ${IODBC}
+   -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+   -DPYTHON_LIBRARY="$(python_get_library_path)"
+   -DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2023-01-08 Thread Hans de Graaff 
commit: 1200e83673fd1d2fa9e0f83ce7feaafe31489da7
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Jan  8 08:08:38 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Jan  8 08:33:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1200e836

dev-db/mysql-workbench: drop 8.0.29-r1

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench-8.0.29-r1.ebuild   | 111 -
 2 files changed, 112 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 56ea1faaeb9c..6522ac420c3c 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,2 @@
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
-DIST mysql-workbench-community-8.0.29-src.tar.gz 19353576 BLAKE2B 
7562da75534261e128e990e64dbdbe7486bbf7a5d3c777f505178be9f33c6266e2e5c3efcad2cb14fdb53878fc485bbc13dce7f37bc0aaaf114d41e9c86335a7
 SHA512 
f2ce224154c35ee7076d044ec0db3d23bec466f22361ed5d0cd1f49a34a4aeb963405db6d9bd1923bd176163652a54f0501b53ad34c5c0a999f6a39f137bce3e
 DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B 
eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548
 SHA512 
7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.29-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.29-r1.ebuild
deleted file mode 100644
index efc97d50ee5f..
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.29-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm:*
-   dev-cpp/pangomm:1.4
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.8.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg(+)]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   dev-libs/boost[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-   ## And avoid -Werror
-   sed -i -e 's/-Werror//' CMakeLists.txt || die
-   ## Fix doc install directory
-   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-
-   ## package is very fragile...
-   strip-flags
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   if has_version dev-db/libiodbc ; then
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-12-02 Thread Hans de Graaff 
commit: 45c3f6245bfed29baa59febb10acb658c0886f99
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Dec  2 08:10:54 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Dec  2 08:30:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c3f624

dev-db/mysql-workbench: drop 8.0.28-r1, 8.0.30-r1

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   2 -
 .../mysql-workbench-8.0.28-r1.ebuild   | 111 -
 .../mysql-workbench-8.0.30-r1.ebuild   | 111 -
 3 files changed, 224 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 077605c3b94c..56ea1faaeb9c 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,5 +1,3 @@
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
-DIST mysql-workbench-community-8.0.28-src.tar.gz 19275374 BLAKE2B 
31930e181888dba0b5dd54509ffa58a9328d12ac2ad080a27715bbcd7fbf347d892175323632e5e7edc2926836427499be5a040ad9c731d9ad5b165a36065d4e
 SHA512 
373f829c6f4ab5e97d277476166144f70f76e32b7443cd5d403dffc10f4fa80ad4dc27bb88b2c564f7c39e5f32045be94eb2b1b9ee2bf560f22d9c4d7fce53e1
 DIST mysql-workbench-community-8.0.29-src.tar.gz 19353576 BLAKE2B 
7562da75534261e128e990e64dbdbe7486bbf7a5d3c777f505178be9f33c6266e2e5c3efcad2cb14fdb53878fc485bbc13dce7f37bc0aaaf114d41e9c86335a7
 SHA512 
f2ce224154c35ee7076d044ec0db3d23bec466f22361ed5d0cd1f49a34a4aeb963405db6d9bd1923bd176163652a54f0501b53ad34c5c0a999f6a39f137bce3e
-DIST mysql-workbench-community-8.0.30-src.tar.gz 19349201 BLAKE2B 
aea468a2952b45edec4405094a1fbea6c1dd67831222a9255f1b9ce3ce35095dc45946fb6908d1ec60876d592d4f64cc0ebc952bfe81477c4258628ead8b5dab
 SHA512 
195f7dceeb9a0c596c49a3ea6c3a9647763671676bae52e4d21a4dd85eb7d5ca05f78158bfe31bca9217e3cf868d8f335cad0ae3f68357937e951525c5fbf4f0
 DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B 
eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548
 SHA512 
7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.28-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.28-r1.ebuild
deleted file mode 100644
index efc97d50ee5f..
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.28-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm:*
-   dev-cpp/pangomm:1.4
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.8.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg(+)]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   dev-libs/boost[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-12-02 Thread Arthur Zamarin 
commit: f4b66bacaecd981e9d21130209e33d1c2bd9a6c6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 08:02:13 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 08:02:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4b66bac

dev-db/mysql-workbench: Stabilize 8.0.31 amd64, #878909

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
index 8fceb5a83513..628991e78d22 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-10-22 Thread Hans de Graaff 
commit: 9a12ee9809b2d5d7d1556d3a61f9e5d20d855e57
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Oct 22 05:01:01 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Oct 22 06:25:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a12ee98

dev-db/mysql-workbench: drop unused dependency

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
index 84d63f05fb5a..8fceb5a83513 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
@@ -37,7 +37,6 @@ CDEPEND="${PYTHON_DEPS}
>=net-libs/libssh-0.8.5[server]
x11-libs/pango
x11-libs/gtk+:3
-   gnome-base/libglade:2.0
>=x11-libs/cairo-1.5.12[glib,svg(+)]
>=dev-libs/rapidjson-1.1.0
dev-libs/libsigc++:2

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-10-18 Thread Hans de Graaff 
commit: 854ae166c610086206e3f954223ccdcc0bdebc62
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Oct 18 15:28:22 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Oct 18 15:29:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854ae166

dev-db/mysql-workbench: add 8.0.31

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.31.ebuild  | 111 +
 2 files changed, 112 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 528af0af025a..077605c3b94c 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -2,3 +2,4 @@ DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1
 DIST mysql-workbench-community-8.0.28-src.tar.gz 19275374 BLAKE2B 
31930e181888dba0b5dd54509ffa58a9328d12ac2ad080a27715bbcd7fbf347d892175323632e5e7edc2926836427499be5a040ad9c731d9ad5b165a36065d4e
 SHA512 
373f829c6f4ab5e97d277476166144f70f76e32b7443cd5d403dffc10f4fa80ad4dc27bb88b2c564f7c39e5f32045be94eb2b1b9ee2bf560f22d9c4d7fce53e1
 DIST mysql-workbench-community-8.0.29-src.tar.gz 19353576 BLAKE2B 
7562da75534261e128e990e64dbdbe7486bbf7a5d3c777f505178be9f33c6266e2e5c3efcad2cb14fdb53878fc485bbc13dce7f37bc0aaaf114d41e9c86335a7
 SHA512 
f2ce224154c35ee7076d044ec0db3d23bec466f22361ed5d0cd1f49a34a4aeb963405db6d9bd1923bd176163652a54f0501b53ad34c5c0a999f6a39f137bce3e
 DIST mysql-workbench-community-8.0.30-src.tar.gz 19349201 BLAKE2B 
aea468a2952b45edec4405094a1fbea6c1dd67831222a9255f1b9ce3ce35095dc45946fb6908d1ec60876d592d4f64cc0ebc952bfe81477c4258628ead8b5dab
 SHA512 
195f7dceeb9a0c596c49a3ea6c3a9647763671676bae52e4d21a4dd85eb7d5ca05f78158bfe31bca9217e3cf868d8f335cad0ae3f68357937e951525c5fbf4f0
+DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B 
eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548
 SHA512 
7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
new file mode 100644
index ..84d63f05fb5a
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg(+)]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   dev-libs/boost[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-8.0.27-r1
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-10-08 Thread Sam James 
commit: dea4061f772fc4fa50966b955fa041c732a56123
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 18:18:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 18:25:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea4061f

dev-db/mysql-workbench: fix MissingUseDepDefault on cairo

Closes: https://bugs.gentoo.org/875905
Signed-off-by: Sam James  gentoo.org>

 .../{mysql-workbench-8.0.28.ebuild => mysql-workbench-8.0.28-r1.ebuild} | 2 +-
 .../{mysql-workbench-8.0.29.ebuild => mysql-workbench-8.0.29-r1.ebuild} | 2 +-
 .../{mysql-workbench-8.0.30.ebuild => mysql-workbench-8.0.30-r1.ebuild} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.28-r1.ebuild
similarity index 98%
rename from dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild
rename to dev-db/mysql-workbench/mysql-workbench-8.0.28-r1.ebuild
index a64c297e9618..efc97d50ee5f 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.28-r1.ebuild
@@ -38,7 +38,7 @@ CDEPEND="${PYTHON_DEPS}
x11-libs/pango
x11-libs/gtk+:3
gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=x11-libs/cairo-1.5.12[glib,svg(+)]
>=dev-libs/rapidjson-1.1.0
dev-libs/libsigc++:2
dev-libs/boost[nls]

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.29-r1.ebuild
similarity index 98%
rename from dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild
rename to dev-db/mysql-workbench/mysql-workbench-8.0.29-r1.ebuild
index a64c297e9618..efc97d50ee5f 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.29-r1.ebuild
@@ -38,7 +38,7 @@ CDEPEND="${PYTHON_DEPS}
x11-libs/pango
x11-libs/gtk+:3
gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=x11-libs/cairo-1.5.12[glib,svg(+)]
>=dev-libs/rapidjson-1.1.0
dev-libs/libsigc++:2
dev-libs/boost[nls]

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.30.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.30-r1.ebuild
similarity index 98%
rename from dev-db/mysql-workbench/mysql-workbench-8.0.30.ebuild
rename to dev-db/mysql-workbench/mysql-workbench-8.0.30-r1.ebuild
index ff30b5600626..de5f67463f1a 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.30.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.30-r1.ebuild
@@ -38,7 +38,7 @@ CDEPEND="${PYTHON_DEPS}
x11-libs/pango
x11-libs/gtk+:3
gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=x11-libs/cairo-1.5.12[glib,svg(+)]
>=dev-libs/rapidjson-1.1.0
dev-libs/libsigc++:2
dev-libs/boost[nls]

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-07-28 Thread Sam James 
commit: 7aec11fd42faea814c0ae6d55e008cc95c000a96
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 29 02:38:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 29 02:42:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aec11fd

dev-db/mysql-workbench: update upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-db/mysql-workbench/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/metadata.xml 
b/dev-db/mysql-workbench/metadata.xml
index 5afcc9dfd017..2ad1914fcf6c 100644
--- a/dev-db/mysql-workbench/metadata.xml
+++ b/dev-db/mysql-workbench/metadata.xml
@@ -5,6 +5,6 @@
 gra...@gentoo.org
   
   
-antlr/website-antlr3
+mysql/mysql-workbench

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-07-27 Thread Hans de Graaff 
commit: c552a172495de9dcc810a474840d5a402f533c49
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jul 27 08:34:23 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jul 27 09:43:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c552a172

dev-db/mysql-workbench: add 8.0.30

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.30.ebuild  | 111 +
 2 files changed, 112 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index fa11c03ac401..528af0af025a 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,4 @@
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.28-src.tar.gz 19275374 BLAKE2B 
31930e181888dba0b5dd54509ffa58a9328d12ac2ad080a27715bbcd7fbf347d892175323632e5e7edc2926836427499be5a040ad9c731d9ad5b165a36065d4e
 SHA512 
373f829c6f4ab5e97d277476166144f70f76e32b7443cd5d403dffc10f4fa80ad4dc27bb88b2c564f7c39e5f32045be94eb2b1b9ee2bf560f22d9c4d7fce53e1
 DIST mysql-workbench-community-8.0.29-src.tar.gz 19353576 BLAKE2B 
7562da75534261e128e990e64dbdbe7486bbf7a5d3c777f505178be9f33c6266e2e5c3efcad2cb14fdb53878fc485bbc13dce7f37bc0aaaf114d41e9c86335a7
 SHA512 
f2ce224154c35ee7076d044ec0db3d23bec466f22361ed5d0cd1f49a34a4aeb963405db6d9bd1923bd176163652a54f0501b53ad34c5c0a999f6a39f137bce3e
+DIST mysql-workbench-community-8.0.30-src.tar.gz 19349201 BLAKE2B 
aea468a2952b45edec4405094a1fbea6c1dd67831222a9255f1b9ce3ce35095dc45946fb6908d1ec60876d592d4f64cc0ebc952bfe81477c4258628ead8b5dab
 SHA512 
195f7dceeb9a0c596c49a3ea6c3a9647763671676bae52e4d21a4dd85eb7d5ca05f78158bfe31bca9217e3cf868d8f335cad0ae3f68357937e951525c5fbf4f0

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.30.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.30.ebuild
new file mode 100644
index ..740ae76efe99
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.30.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+   ## Fix doc install directory
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-07-20 Thread Hans de Graaff 
commit: c6ce5b5a5bc79ce273ad7967511fb9c0d802fe3c
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jul 20 06:12:39 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jul 20 06:12:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ce5b5a

dev-db/mysql-workbench: stabilize 8.0.29 for amd64

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild
index 740ae76efe99..9af8e05bfb22 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-06-12 Thread Hans de Graaff 
commit: 68096faad7f9d53d99a41cb107674f89107d6613
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Jun 13 05:29:16 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jun 13 05:29:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68096faa

dev-db/mysql-workbench: cleanup

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench/mysql-workbench-8.0.27.ebuild  | 111 -
 2 files changed, 112 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index a9792bd09796..fa11c03ac401 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,4 +1,3 @@
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
-DIST mysql-workbench-community-8.0.27-src.tar.gz 19282580 BLAKE2B 
53069dbf26f1ba5975a9b28cf96cae660db8654dd60e5f7cdf112db48e7d4fd41beeb74a9ff870ae38b2d651de4ed7edffec32ba3eb8914bb329ff414ec7e7d4
 SHA512 
827d7abb8e04b0ec4a730eac163b4e2b62f5cde25d7326b4cb95b5f924b1e7c5bc87b1a8ca64dbab59232f4dd042b41cb1e53b97a9484549d0d6c2b7c8a14741
 DIST mysql-workbench-community-8.0.28-src.tar.gz 19275374 BLAKE2B 
31930e181888dba0b5dd54509ffa58a9328d12ac2ad080a27715bbcd7fbf347d892175323632e5e7edc2926836427499be5a040ad9c731d9ad5b165a36065d4e
 SHA512 
373f829c6f4ab5e97d277476166144f70f76e32b7443cd5d403dffc10f4fa80ad4dc27bb88b2c564f7c39e5f32045be94eb2b1b9ee2bf560f22d9c4d7fce53e1
 DIST mysql-workbench-community-8.0.29-src.tar.gz 19353576 BLAKE2B 
7562da75534261e128e990e64dbdbe7486bbf7a5d3c777f505178be9f33c6266e2e5c3efcad2cb14fdb53878fc485bbc13dce7f37bc0aaaf114d41e9c86335a7
 SHA512 
f2ce224154c35ee7076d044ec0db3d23bec466f22361ed5d0cd1f49a34a4aeb963405db6d9bd1923bd176163652a54f0501b53ad34c5c0a999f6a39f137bce3e

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
deleted file mode 100644
index 273419842bc6..
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm:*
-   dev-cpp/pangomm:1.4
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.8.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-   ## And avoid -Werror
-   sed -i -e 's/-Werror//' CMakeLists.txt || die
-   ## Fix doc install directory
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-06-12 Thread Agostino Sarubbo 
commit: dd83237ad1c5f639243e7ffc4f52ed9dac5c9329
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 12 08:28:08 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 12 08:28:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd83237a

dev-db/mysql-workbench: amd64 stable wrt bug #850310

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild
index 740ae76efe99..9af8e05bfb22 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-05-21 Thread Hans de Graaff 
commit: caff4c4fd4c9f84bbde06d9311ff26493aeaf911
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun May 22 05:29:08 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun May 22 05:29:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caff4c4f

dev-db/mysql-workbench: add 8.0.29

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.29.ebuild  | 111 +
 2 files changed, 112 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 7b0c4ddb1851..a9792bd09796 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,4 @@
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.27-src.tar.gz 19282580 BLAKE2B 
53069dbf26f1ba5975a9b28cf96cae660db8654dd60e5f7cdf112db48e7d4fd41beeb74a9ff870ae38b2d651de4ed7edffec32ba3eb8914bb329ff414ec7e7d4
 SHA512 
827d7abb8e04b0ec4a730eac163b4e2b62f5cde25d7326b4cb95b5f924b1e7c5bc87b1a8ca64dbab59232f4dd042b41cb1e53b97a9484549d0d6c2b7c8a14741
 DIST mysql-workbench-community-8.0.28-src.tar.gz 19275374 BLAKE2B 
31930e181888dba0b5dd54509ffa58a9328d12ac2ad080a27715bbcd7fbf347d892175323632e5e7edc2926836427499be5a040ad9c731d9ad5b165a36065d4e
 SHA512 
373f829c6f4ab5e97d277476166144f70f76e32b7443cd5d403dffc10f4fa80ad4dc27bb88b2c564f7c39e5f32045be94eb2b1b9ee2bf560f22d9c4d7fce53e1
+DIST mysql-workbench-community-8.0.29-src.tar.gz 19353576 BLAKE2B 
7562da75534261e128e990e64dbdbe7486bbf7a5d3c777f505178be9f33c6266e2e5c3efcad2cb14fdb53878fc485bbc13dce7f37bc0aaaf114d41e9c86335a7
 SHA512 
f2ce224154c35ee7076d044ec0db3d23bec466f22361ed5d0cd1f49a34a4aeb963405db6d9bd1923bd176163652a54f0501b53ad34c5c0a999f6a39f137bce3e

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild
new file mode 100644
index ..740ae76efe99
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+   ## Fix doc install directory
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-05-21 Thread Hans de Graaff 
commit: f9b0a371e70c47eb8711ded5e5366ea0735407e6
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat May 21 09:19:09 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat May 21 09:20:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b0a371

dev-db/mysql-workbench: add 8.0.28

Closes: https://bugs.gentoo.org/845630
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.28.ebuild  | 111 +
 2 files changed, 112 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 2bb31331d042..7b0c4ddb1851 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,2 +1,3 @@
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.27-src.tar.gz 19282580 BLAKE2B 
53069dbf26f1ba5975a9b28cf96cae660db8654dd60e5f7cdf112db48e7d4fd41beeb74a9ff870ae38b2d651de4ed7edffec32ba3eb8914bb329ff414ec7e7d4
 SHA512 
827d7abb8e04b0ec4a730eac163b4e2b62f5cde25d7326b4cb95b5f924b1e7c5bc87b1a8ca64dbab59232f4dd042b41cb1e53b97a9484549d0d6c2b7c8a14741
+DIST mysql-workbench-community-8.0.28-src.tar.gz 19275374 BLAKE2B 
31930e181888dba0b5dd54509ffa58a9328d12ac2ad080a27715bbcd7fbf347d892175323632e5e7edc2926836427499be5a040ad9c731d9ad5b165a36065d4e
 SHA512 
373f829c6f4ab5e97d277476166144f70f76e32b7443cd5d403dffc10f4fa80ad4dc27bb88b2c564f7c39e5f32045be94eb2b1b9ee2bf560f22d9c4d7fce53e1

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild
new file mode 100644
index ..740ae76efe99
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+   ## Fix doc install directory
+   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
+
+   ## package is very fragile...
+   strip-flags
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   if has_version dev-db/libiodbc ; then
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-05-21 Thread Hans de Graaff 
commit: e44825026ad8226da13bf15a3e091b6bce10a9a0
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat May 21 06:53:02 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat May 21 09:20:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4482502

dev-db/mysql-workbench: drop 8.0.26-r1

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench-8.0.26-r1.ebuild   | 111 -
 2 files changed, 112 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 45aa0fa826bf..2bb31331d042 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,2 @@
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
-DIST mysql-workbench-community-8.0.26-src.tar.gz 19282576 BLAKE2B 
4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c
 SHA512 
33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c
 DIST mysql-workbench-community-8.0.27-src.tar.gz 19282580 BLAKE2B 
53069dbf26f1ba5975a9b28cf96cae660db8654dd60e5f7cdf112db48e7d4fd41beeb74a9ff870ae38b2d651de4ed7edffec32ba3eb8914bb329ff414ec7e7d4
 SHA512 
827d7abb8e04b0ec4a730eac163b4e2b62f5cde25d7326b4cb95b5f924b1e7c5bc87b1a8ca64dbab59232f4dd042b41cb1e53b97a9484549d0d6c2b7c8a14741

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.26-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.26-r1.ebuild
deleted file mode 100644
index 1dd1c744a64d..
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.26-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm:*
-   dev-cpp/pangomm:1.4
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.8.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-   ## And avoid -Werror
-   sed -i -e 's/-Werror//' CMakeLists.txt || die
-   ## Fix doc install directory
-   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-
-   ## package is very fragile...
-   strip-flags
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   if has_version dev-db/libiodbc ; then
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2022-03-21 Thread Agostino Sarubbo 
commit: f8ee0d1324e8ac0a00b4a7e01bc7fb90ecf696a6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 21 07:46:30 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 21 07:47:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ee0d13

dev-db/mysql-workbench: amd64 stable wrt bug #834440

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
index 6ce9aed7c684..273419842bc6 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-10-21 Thread Hans de Graaff 
commit: 1ff58331ac3c3bf5016b8c8b2c6d13746903be4e
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Oct 22 05:49:54 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Oct 22 05:50:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff58331

dev-db/mysql-workbench: add 8.0.27

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.27.ebuild  | 111 +
 2 files changed, 112 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 6862491e60b..45aa0fa826b 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,2 +1,3 @@
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.26-src.tar.gz 19282576 BLAKE2B 
4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c
 SHA512 
33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c
+DIST mysql-workbench-community-8.0.27-src.tar.gz 19282580 BLAKE2B 
53069dbf26f1ba5975a9b28cf96cae660db8654dd60e5f7cdf112db48e7d4fd41beeb74a9ff870ae38b2d651de4ed7edffec32ba3eb8914bb329ff414ec7e7d4
 SHA512 
827d7abb8e04b0ec4a730eac163b4e2b62f5cde25d7326b4cb95b5f924b1e7c5bc87b1a8ca64dbab59232f4dd042b41cb1e53b97a9484549d0d6c2b7c8a14741

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
new file mode 100644
index 000..6ce9aed7c68
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+   ## Fix doc install directory
+   sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; 
/WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
+
+   ## package is very fragile...
+   strip-flags
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   if has_version dev-db/libiodbc ; then
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2021-09-21 Thread Conrad Kostecki 
commit: 15a9b4dc14c337d16f7182c7077a9fe8d9861bde
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Sep 21 17:01:09 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Sep 21 18:25:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a9b4dc

dev-db/mysql-workbench: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22355
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/mysql-workbench-8.0.23-findlibssh.patch | 11 ---
 1 file changed, 11 deletions(-)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch
deleted file mode 100644
index 3f250d78140..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/build/cmake/Modules/FindLibSSH.cmake.~1~ 2020-12-17 06:22:25.0 
+0100
-+++ b/build/cmake/Modules/FindLibSSH.cmake 2021-02-21 10:38:52.773491295 
+0100
-@@ -51,7 +51,7 @@
-   find_library(LibSSH_LIBRARY NAMES ${LibSSH_NAMES})
- endif()
- 
--set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh.h)
-+set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh_version.h)
- file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MAJOR REGEX "#define 
LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
- if (LibSSH_VERSION_LINE_MAJOR)
-   file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MINOR REGEX "#define 
LIBSSH_VERSION_MINOR[ ]+[0-9]+")

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-09-20 Thread Andreas K. Hüttel 
commit: 44635a891de6b73ae1541aecac1d7f42e60074c6
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Mon Sep 20 17:58:10 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Mon Sep 20 17:58:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44635a89

dev-db/mysql-workbench: Remove old

Bug: https://bugs.gentoo.org/788199
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas K. Huettel  gentoo.org>

 dev-db/mysql-workbench/Manifest|   2 -
 .../mysql-workbench-8.0.23-r1.ebuild   | 112 -
 2 files changed, 114 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 1dcfffd2120..6862491e60b 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,4 +1,2 @@
-DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
-DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 
4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e
 SHA512 
f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
 DIST mysql-workbench-community-8.0.26-src.tar.gz 19282576 BLAKE2B 
4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c
 SHA512 
33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.23-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.23-r1.ebuild
deleted file mode 100644
index f890a17c511..000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.23-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.7.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm:*
-   dev-cpp/pangomm:1.4
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.8.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-   "${FILESDIR}/${PN}-8.0.23-findlibssh.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt ||

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-09-13 Thread David Seifert 
commit: a91e460a7132a0e173f6d2e703692b0f45a57752
Author: David Seifert  gentoo  org>
AuthorDate: Mon Sep 13 20:30:15 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Sep 13 20:30:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a91e460a

dev-db/mysql-workbench: e2fsprogs-libs → e2fsprogs

Bug: https://bugs.gentoo.org/806875
Signed-off-by: David Seifert  gentoo.org>

 .../{mysql-workbench-8.0.23.ebuild => mysql-workbench-8.0.23-r1.ebuild} | 2 +-
 .../{mysql-workbench-8.0.26.ebuild => mysql-workbench-8.0.26-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.23-r1.ebuild
similarity index 98%
rename from dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
rename to dev-db/mysql-workbench/mysql-workbench-8.0.23-r1.ebuild
index b5fcf9ee257..f890a17c511 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.23-r1.ebuild
@@ -48,7 +48,7 @@ CDEPEND="${PYTHON_DEPS}
dev-libs/libpcre[cxx]
>=sci-libs/gdal-1.11.1-r1
virtual/opengl
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
dev-libs/tinyxml[stl]
>=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
dev-db/vsqlite++

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.26-r1.ebuild
similarity index 98%
rename from dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
rename to dev-db/mysql-workbench/mysql-workbench-8.0.26-r1.ebuild
index cc8eafea3b0..1dd1c744a64 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.26-r1.ebuild
@@ -48,7 +48,7 @@ CDEPEND="${PYTHON_DEPS}
dev-libs/libpcre[cxx]
>=sci-libs/gdal-1.11.1-r1
virtual/opengl
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
dev-libs/tinyxml[stl]
>=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
dev-db/vsqlite++

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2021-09-01 Thread Conrad Kostecki 
commit: d539af30ee13fc8a2fcb3acb30cfef93657973df
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Sep  1 20:26:26 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Sep  1 20:27:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d539af30

dev-db/mysql-workbench: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22178
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/mysql-workbench-8.0.24-gcc11-fix.patch   | 55 --
 1 file changed, 55 deletions(-)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
deleted file mode 100644
index 1ad5b1dafae..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/788199
-
-'volatile gsize' is not accepted by with gcc11 / clang12
-
-"While location has a volatile qualifier, this is a historical
- artifact and the pointer passed to it should not be volatile"
-https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter
-
-For Scintilla GTK, see also:
-https://sourceforge.net/p/scintilla/code/ci/790bfd4c0747eb5e0bc4d627a101298207a8421e/
-
-Also adds missing  includes.
-
-Signed-off-by: Ionen Wolkens 
 a/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
-+++ b/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
-@@ -1011,5 +1011,5 @@
- // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first 
call
- static GType scintilla_object_accessible_get_type(GType parent_type 
G_GNUC_UNUSED) {
--  static volatile gsize type_id_result = 0;
-+  static gsize type_id_result = 0;
- 
-   if (g_once_init_enter(_id_result)) {
-@@ -1102,5 +1102,5 @@
-   *cache = scintilla_object_accessible_new(0, G_OBJECT(widget));
- #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate
--  static volatile gsize registered = 0;
-+  static gsize registered = 0;
- 
-   if (g_once_init_enter()) {
 a/library/forms/gtk/src/mforms_acc.cpp
-+++ b/library/forms/gtk/src/mforms_acc.cpp
-@@ -177,5 +177,5 @@
- // @p parent_type is only required on GTK 3.2 to 3.6, and only on the 
first call
- GType mforms_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
--  static volatile gsize typeIdResult = 0;
-+  static gsize typeIdResult = 0;
- 
-   if (g_once_init_enter()) {
 a/library/ssh/SSHCommon.h
-+++ b/library/ssh/SSHCommon.h
-@@ -42,4 +42,5 @@
- #include 
- #include 
-+#include 
- #include 
- 
 a/library/ssh/SSHTunnelHandler.h
-+++ b/library/ssh/SSHTunnelHandler.h
-@@ -31,4 +31,5 @@
- #include 
- #include 
-+#include 
- #include 
- #include

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-08-27 Thread Hans de Graaff 
commit: 16ea985198c94e9fcd827b213858639a23f8d00d
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Aug 27 07:36:39 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Aug 27 07:36:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ea9851

dev-db/mysql-workbench: cleanup

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   2 -
 .../mysql-workbench/mysql-workbench-8.0.24.ebuild  | 112 -
 .../mysql-workbench/mysql-workbench-8.0.25.ebuild  | 111 
 3 files changed, 225 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 578dc04853e..1dcfffd2120 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,6 +1,4 @@
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 
4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e
 SHA512 
f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
-DIST mysql-workbench-community-8.0.24-src.tar.gz 19105744 BLAKE2B 
bc38f18344ba606d29317e5706b6dcd71a29785a3d94d717c21a591c488182595026bb15e1785e57bd56d74b4eb85c87beb5d386dc050ffe2cb2bd4bb7e665bd
 SHA512 
61dd41cd410cde5da4e43e0fcd9e25fdf4b67b831bb40d8facc9450e9bc9446844f397748875a21a839d2612c64d8f8f05eaae21e9a73e419bfa9e14a8fb19e8
-DIST mysql-workbench-community-8.0.25-src.tar.gz 19107324 BLAKE2B 
aff77a7c216f470d78d3b9f33cc51c70a7b1210c40634c1af75e954ab092efd4d0865afb7869ff52f82434243ed0e2a4ddd48cf55902c9533a32ed2cc183bb33
 SHA512 
b75e82756a91b9f96d8c0eeece1ef8e8f3a7a1dbe8911d2045b9347fb912215ee0a7dd3ef6d827b78fe748aa9e5ecfaa858d2d3dc08233726c706712f3eac3f1
 DIST mysql-workbench-community-8.0.26-src.tar.gz 19282576 BLAKE2B 
4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c
 SHA512 
33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
deleted file mode 100644
index d30a608ba5f..000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm:*
-   dev-cpp/pangomm:1.4
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.8.5[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   >=dev-libs/rapidjson-1.1.0
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1
-   virtual/opengl
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-08-27 Thread Hans de Graaff 
commit: 50c8d39175d5c7140439848918f15db289dcc6d3
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Aug 27 07:36:19 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Aug 27 07:36:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c8d391

dev-db/mysql-workbench: amd64 stable

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
index a565f9ac990..cc8eafea3b0 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-07-20 Thread Hans de Graaff 
commit: 9ab98d4d96b27841f776a8d55923ed03861c46f9
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jul 21 04:57:46 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jul 21 05:40:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab98d4d

dev-db/mysql-workbench: add 8.0.26

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.26.ebuild  | 111 +
 2 files changed, 112 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index d6fe61b5ce6..578dc04853e 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -3,3 +3,4 @@ DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 
4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e
 SHA512 
f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
 DIST mysql-workbench-community-8.0.24-src.tar.gz 19105744 BLAKE2B 
bc38f18344ba606d29317e5706b6dcd71a29785a3d94d717c21a591c488182595026bb15e1785e57bd56d74b4eb85c87beb5d386dc050ffe2cb2bd4bb7e665bd
 SHA512 
61dd41cd410cde5da4e43e0fcd9e25fdf4b67b831bb40d8facc9450e9bc9446844f397748875a21a839d2612c64d8f8f05eaae21e9a73e419bfa9e14a8fb19e8
 DIST mysql-workbench-community-8.0.25-src.tar.gz 19107324 BLAKE2B 
aff77a7c216f470d78d3b9f33cc51c70a7b1210c40634c1af75e954ab092efd4d0865afb7869ff52f82434243ed0e2a4ddd48cf55902c9533a32ed2cc183bb33
 SHA512 
b75e82756a91b9f96d8c0eeece1ef8e8f3a7a1dbe8911d2045b9347fb912215ee0a7dd3ef6d827b78fe748aa9e5ecfaa858d2d3dc08233726c706712f3eac3f1
+DIST mysql-workbench-community-8.0.26-src.tar.gz 19282576 BLAKE2B 
4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c
 SHA512 
33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
new file mode 100644
index 000..a565f9ac990
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//'

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-05-12 Thread Hans de Graaff 
commit: 68a2d68c89ea4e99a8c667fb38c031c5f73d63d8
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed May 12 06:13:45 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed May 12 06:19:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a2d68c

dev-db/mysql-workbench: add 8.0.25

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.25.ebuild  | 111 +
 2 files changed, 112 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index dd70c4caa3f..d6fe61b5ce6 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -2,3 +2,4 @@ DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cb
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 
4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e
 SHA512 
f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
 DIST mysql-workbench-community-8.0.24-src.tar.gz 19105744 BLAKE2B 
bc38f18344ba606d29317e5706b6dcd71a29785a3d94d717c21a591c488182595026bb15e1785e57bd56d74b4eb85c87beb5d386dc050ffe2cb2bd4bb7e665bd
 SHA512 
61dd41cd410cde5da4e43e0fcd9e25fdf4b67b831bb40d8facc9450e9bc9446844f397748875a21a839d2612c64d8f8f05eaae21e9a73e419bfa9e14a8fb19e8
+DIST mysql-workbench-community-8.0.25-src.tar.gz 19107324 BLAKE2B 
aff77a7c216f470d78d3b9f33cc51c70a7b1210c40634c1af75e954ab092efd4d0865afb7869ff52f82434243ed0e2a4ddd48cf55902c9533a32ed2cc183bb33
 SHA512 
b75e82756a91b9f96d8c0eeece1ef8e8f3a7a1dbe8911d2045b9347fb912215ee0a7dd3ef6d827b78fe748aa9e5ecfaa858d2d3dc08233726c706712f3eac3f1

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.25.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.25.ebuild
new file mode 100644
index 000..a565f9ac990
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.25.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt ||

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/, dev-db/mysql-workbench/files/

2021-05-08 Thread Hans de Graaff 
commit: 7783e37a1ece3c5c930fb7ee99c2a15e2a79c2ae
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat May  8 05:54:07 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat May  8 06:11:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7783e37a

dev-db/mysql-workbench: fix compilation with gcc 11

Thanks to Ionen Wolkens for providing a patch.

Closes: https://bugs.gentoo.org/788199
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 .../files/mysql-workbench-8.0.24-gcc11-fix.patch   | 55 ++
 .../mysql-workbench/mysql-workbench-8.0.24.ebuild  |  1 +
 2 files changed, 56 insertions(+)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
new file mode 100644
index 000..1ad5b1dafae
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/788199
+
+'volatile gsize' is not accepted by with gcc11 / clang12
+
+"While location has a volatile qualifier, this is a historical
+ artifact and the pointer passed to it should not be volatile"
+https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter
+
+For Scintilla GTK, see also:
+https://sourceforge.net/p/scintilla/code/ci/790bfd4c0747eb5e0bc4d627a101298207a8421e/
+
+Also adds missing  includes.
+
+Signed-off-by: Ionen Wolkens 
+--- a/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
 b/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
+@@ -1011,5 +1011,5 @@
+ // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first 
call
+ static GType scintilla_object_accessible_get_type(GType parent_type 
G_GNUC_UNUSED) {
+-  static volatile gsize type_id_result = 0;
++  static gsize type_id_result = 0;
+ 
+   if (g_once_init_enter(_id_result)) {
+@@ -1102,5 +1102,5 @@
+   *cache = scintilla_object_accessible_new(0, G_OBJECT(widget));
+ #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate
+-  static volatile gsize registered = 0;
++  static gsize registered = 0;
+ 
+   if (g_once_init_enter()) {
+--- a/library/forms/gtk/src/mforms_acc.cpp
 b/library/forms/gtk/src/mforms_acc.cpp
+@@ -177,5 +177,5 @@
+ // @p parent_type is only required on GTK 3.2 to 3.6, and only on the 
first call
+ GType mforms_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
+-  static volatile gsize typeIdResult = 0;
++  static gsize typeIdResult = 0;
+ 
+   if (g_once_init_enter()) {
+--- a/library/ssh/SSHCommon.h
 b/library/ssh/SSHCommon.h
+@@ -42,4 +42,5 @@
+ #include 
+ #include 
++#include 
+ #include 
+ 
+--- a/library/ssh/SSHTunnelHandler.h
 b/library/ssh/SSHTunnelHandler.h
+@@ -31,4 +31,5 @@
+ #include 
+ #include 
++#include 
+ #include 
+ #include 

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
index a565f9ac990..d30a608ba5f 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
@@ -71,6 +71,7 @@ S="${WORKDIR}"/"${MY_P}"
 PATCHES=(
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+   "${FILESDIR}/${PN}-8.0.24-gcc11-fix.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-04-23 Thread Hans de Graaff 
commit: 77496b0ff742cdc19bb38c3b4b865e71af5fe35e
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 24 05:38:06 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 24 05:38:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77496b0f

dev-db/mysql-workbench: add 8.0.24

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   2 +
 .../mysql-workbench/mysql-workbench-8.0.24.ebuild  | 111 +
 2 files changed, 113 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index d96880fdbf1..dd70c4caa3f 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,2 +1,4 @@
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
+DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 
6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e
 SHA512 
a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 
4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e
 SHA512 
f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
+DIST mysql-workbench-community-8.0.24-src.tar.gz 19105744 BLAKE2B 
bc38f18344ba606d29317e5706b6dcd71a29785a3d94d717c21a591c488182595026bb15e1785e57bd56d74b4eb85c87beb5d386dc050ffe2cb2bd4bb7e665bd
 SHA512 
61dd41cd410cde5da4e43e0fcd9e25fdf4b67b831bb40d8facc9450e9bc9446844f397748875a21a839d2612c64d8f8f05eaae21e9a73e419bfa9e14a8fb19e8

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
new file mode 100644
index 000..a565f9ac990
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm:*
+   dev-cpp/pangomm:1.4
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+   ## Fix

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-03-24 Thread Hans de Graaff 
commit: c5fe08f7d9630f2b7bb4f126929fe16801795be7
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Mar 24 13:09:26 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Mar 24 13:24:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fe08f7

dev-db/mysql-workbench: amd64 stable

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
index 034e1ed3950..b5fcf9ee257 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2021-03-23 Thread Matt Turner 
commit: 22bc11d99e788a1fc6f31546ec45c3edd5dde991
Author: David Michael  gmail  com>
AuthorDate: Tue Mar 23 14:44:48 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Mar 23 15:05:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22bc11d9

dev-db/mysql-workbench: specify the pangomm slot

Signed-off-by: David Michael  gmail.com>
Signed-off-by: Matt Turner  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
index 864c6587d67..034e1ed3950 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
@@ -30,7 +30,7 @@ CDEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-cpp/antlr-cpp:4
dev-cpp/atkmm:*
-   dev-cpp/pangomm
+   dev-cpp/pangomm:1.4
>=dev-cpp/glibmm-2.14:2
dev-cpp/gtkmm:3.0
dev-libs/atk

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/

2021-02-21 Thread Hans de Graaff 
commit: 1896841452356d6598b3c5ce21131ecd260790db
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Feb 21 10:38:11 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Feb 21 10:38:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18968414

dev-db/mysql-workbench: re-import of 8.0.23

Add mysql-workbench back now that it is compatible with python 3.

Bug: https://bugs.gentoo.org/715172
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   2 +
 .../files/mysql-workbench-6.2.5-wbcopytables.patch |  12 +++
 .../mysql-workbench-8.0.19-mysql-connector-8.patch |  12 +++
 .../files/mysql-workbench-8.0.23-findlibssh.patch  |  11 ++
 dev-db/mysql-workbench/metadata.xml|  10 ++
 .../mysql-workbench/mysql-workbench-8.0.23.ebuild  | 112 +
 6 files changed, 159 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
new file mode 100644
index 000..d96880fdbf1
--- /dev/null
+++ b/dev-db/mysql-workbench/Manifest
@@ -0,0 +1,2 @@
+DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
+DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 
4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e
 SHA512 
f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
new file mode 100644
index 000..2d3d8db243f
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
@@ -0,0 +1,12 @@
+--- a/plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.0 
+0100
 b/plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100
+@@ -10,7 +10,8 @@
+ if (UNIX)
+   configure_file(wbcopytables.in wbcopytables)
+   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/wbcopytables DESTINATION 
${WB_INSTALL_BIN_DIR})
+-  
++
++  SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}")
+   add_executable(wbcopytables-bin
+   copytable/copytable.cpp
+   copytable/python_copy_data_source.cpp

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
new file mode 100644
index 000..c624dea0e56
--- /dev/null
+++ 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
@@ -0,0 +1,12 @@
+diff -Naru a/build/cmake/Modules/FindMySQLCppConn.cmake 
b/build/cmake/Modules/FindMySQLCppConn.cmake
+--- a/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:31:34.520496484 +0100
 b/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:32:32.590496631 +0100
+@@ -27,7 +27,7 @@
+   set(MySQLCppConn_FIND_QUIETLY TRUE)
+ endif ()
+ 
+-find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/local/include)
++find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/include/jdbc /usr/local/include /usr/local/include/jdbc)
+ 
+ SET(MySQLCppConn_NAMES mysqlcppconn)
+ 

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch
new file mode 100644
index 000..3f250d78140
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch
@@ -0,0 +1,11 @@
+--- a/build/cmake/Modules/FindLibSSH.cmake.~1~ 2020-12-17 06:22:25.0 
+0100
 b/build/cmake/Modules/FindLibSSH.cmake 2021-02-21 10:38:52.773491295 
+0100
+@@ -51,7 +51,7 @@
+   find_library(LibSSH_LIBRARY NAMES ${LibSSH_NAMES})
+ endif()
+ 
+-set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh.h)
++set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh_version.h)
+ file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MAJOR REGEX "#define 
LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+ if (LibSSH_VERSION_LINE_MAJOR)
+   file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MINOR REGEX "#define 
LIBSSH_VERSION_MINOR[ ]+[0-9]+")

diff --git a/dev-db/mysql-workbench/metadata.xml 
b/dev-db/mysql-workbench/metadata.xml
new file mode 100644
index 000..64e908505cd
--- /dev/null
+++ b/dev-db/mysql-workbench/metadata.xml
@@ -0,0 +1,10 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+gra...@gentoo.org
+  
+  
+antlr/website-antlr3
+  
+

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/, profiles/

2020-09-21 Thread Michał Górny 
commit: 7db99d87e8cbce1345895fa416e78d2dba29b258
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 21 06:13:31 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 21 06:15:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db99d87

dev-db/mysql-workbench: Remove last-rited pkg

Closes: https://bugs.gentoo.org/715172
Signed-off-by: Michał Górny  gentoo.org>

 dev-db/mysql-workbench/Manifest|   4 -
 .../files/mysql-workbench-6.2.5-wbcopytables.patch |  12 --
 .../mysql-workbench-8.0.19-mysql-connector-8.patch |  12 --
 .../mysql-workbench-8.0.21-boost-1.73.0.patch  | 123 -
 dev-db/mysql-workbench/metadata.xml|  10 --
 .../mysql-workbench-8.0.19-r1.ebuild   | 109 --
 .../mysql-workbench/mysql-workbench-8.0.20.ebuild  | 109 --
 .../mysql-workbench/mysql-workbench-8.0.21.ebuild  | 110 --
 profiles/package.mask  |   1 -
 9 files changed, 490 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
deleted file mode 100644
index c1dd84e4105..000
--- a/dev-db/mysql-workbench/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
-DIST mysql-workbench-community-8.0.19-src.tar.gz 19391463 BLAKE2B 
f9374c234a75851784c940f8288a783ee1c02fe4be2973b174a0d3768a60dd5318ceea7d2dacb083376c83c33bed8fca02768bcf4f3b8ba6284ca78fc7910cfe
 SHA512 
986a34328ec3b9aba1532cfd8792fb970fe3c71eda577988a17a6bca25e783a520878067acd097a74ca3f274f02d271af16d7d6beb6970bca48332721021eebc
-DIST mysql-workbench-community-8.0.20-src.tar.gz 19391920 BLAKE2B 
9baf37dec18002ebf7956979fa1e3e45b69a7061bd85d6b2ef25f058ce7595a6847ea314b7443dadf7524ff985ff4e87869e91ea7a012e6cf07a6d139a6c733b
 SHA512 
b31314fac018959a008b283c795df5a676d6c667827e87a98379ce1de172b98cfdf8dd5cac009e2fb78241358afcb318abfed0178d73840bf6b4432b85b6a4e7
-DIST mysql-workbench-community-8.0.21-src.tar.gz 19211633 BLAKE2B 
452ac946d478acb1d0e358d2bc44125f0b7d1f1bc2943d2b03ce6767e659df71b7525b7a51ed1cd5560f02a7a1047e2cd35477a71ddd91f71992e5becc3d1c0d
 SHA512 
40c1144f801424c3b46eb033c9d1174c9bd903cd17672924eacd3ff58daa91b0d09f6045af4746ce7490f5ab2b0973b6d7f44ee8ae022607057cb0f09fc59a3f

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
deleted file mode 100644
index 2d3d8db243f..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.0 
+0100
-+++ b/plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100
-@@ -10,7 +10,8 @@
- if (UNIX)
-   configure_file(wbcopytables.in wbcopytables)
-   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/wbcopytables DESTINATION 
${WB_INSTALL_BIN_DIR})
--  
-+
-+  SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}")
-   add_executable(wbcopytables-bin
-   copytable/copytable.cpp
-   copytable/python_copy_data_source.cpp

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
deleted file mode 100644
index c624dea0e56..000
--- 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/build/cmake/Modules/FindMySQLCppConn.cmake 
b/build/cmake/Modules/FindMySQLCppConn.cmake
 a/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:31:34.520496484 +0100
-+++ b/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:32:32.590496631 +0100
-@@ -27,7 +27,7 @@
-   set(MySQLCppConn_FIND_QUIETLY TRUE)
- endif ()
- 
--find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/local/include)
-+find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/include/jdbc /usr/local/include /usr/local/include/jdbc)
- 
- SET(MySQLCppConn_NAMES mysqlcppconn)
- 

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch
deleted file mode 100644
index 85825f14c04..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Patch from Alt Linux as provided in https://bugs.gentoo.org/723432
-
-diff --git a/library/forms/swig/mforms.i b/library/forms/swig/mforms.i
-index cb74ba41..05535e56 100644
 a/library/forms/swig/mforms.i
-+++ b/library/forms/swig/mforms.i
-@@

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/, dev-db/mysql-workbench/files/

2020-07-20 Thread Hans de Graaff 
commit: 093eafd9ebe55045ddac9aef5ddc2048616e6d29
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Jul 20 07:58:13 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jul 20 07:59:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093eafd9

dev-db/mysql-workbench: fix compat with boost 1.73

Add patch from Alt Linux to fix compatibility with boost 1.73.

Closes: https://bugs.gentoo.org/723432
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Hans de Graaff  gentoo.org>

 .../mysql-workbench-8.0.21-boost-1.73.0.patch  | 123 +
 .../mysql-workbench/mysql-workbench-8.0.21.ebuild  |   1 +
 2 files changed, 124 insertions(+)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch
new file mode 100644
index 000..85825f14c04
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch
@@ -0,0 +1,123 @@
+Patch from Alt Linux as provided in https://bugs.gentoo.org/723432
+
+diff --git a/library/forms/swig/mforms.i b/library/forms/swig/mforms.i
+index cb74ba41..05535e56 100644
+--- a/library/forms/swig/mforms.i
 b/library/forms/swig/mforms.i
+@@ -3,6 +3,7 @@
+ #pragma SWIG nowarn=401,402,509
+ 
+ %{
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp 
b/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp
+index 24db3d63..d997c410 100644
+--- a/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp
 b//modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp
+@@ -31,6 +31,7 @@
+ #include "base/string_utilities.h"
+ #include 
+ #include 
++#include 
+ 
+ using namespace grt;
+ using namespace base;
+diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp 
b/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp
+index 3da58757..a9b082ac 100644
+--- a/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp
 b/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include "mysql_sql_inserts_loader.h"
+ #include "mysql_sql_parser_utils.h"
++#include 
+ #include 
+ 
+ using namespace grt;
+diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp 
b/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp
+index 0c0f72bc..baf3d897 100644
+--- a/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp
 b/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp 
b/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp
+index ef51d77c..68f397ae 100644
+--- a/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp
 b/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp
+@@ -39,6 +39,7 @@
+ #include "base/string_utilities.h"
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ using namespace grt;
+diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h 
b/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h
+index 9e790dfb..2addd87e 100644
+--- a/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h
 b/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h
+@@ -30,6 +30,8 @@
+ 
+ #include "base/string_utilities.h"
+ 
++#include 
++
+ using namespace grt;
+ 
+ template 
+diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp 
b/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp
+index 617487b5..9614ad9c 100644
+--- a/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp
 b/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include 
++#include 
+ #include 
+ 
+ #include "mysql_sql_schema_rename.h"
+diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp 
b/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp
+index 733a..51c3215d 100644
+--- a/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp
 b/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp
+@@ -28,6 +28,7 @@
+ #include "mysql_sql_parser_fe.h"
+ #include "grtdb/charset_utils.h"
+ #include "base/string_utilities.h"
++#include 
+ #include 
+ #include 
+ 
+diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp 
b/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp
+index b87535a0..3900b7a8 100644
+--- a/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp
 b/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp
+@@ -29,6 +29,7 @@
+ #include "mysql_sql_parser_fe.h"
+ #include "base/string_utilities.h"
+ #include 
++#include 
+ #include 
+ 
+ using namespace grt;
+diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp 
b/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp
+index 0f9f80ad..1cb5f78a 100644
+---

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2020-07-19 Thread Hans de Graaff 
commit: 13e80fda7e9740630bef5be9c58bac83989ac98d
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Jul 19 06:14:21 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Jul 19 06:14:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e80fda

dev-db/mysql-workbench: add 8.0.21

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.21.ebuild  | 109 +
 2 files changed, 110 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 1d6065c2b01..c1dd84e4105 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,4 @@
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-8.0.19-src.tar.gz 19391463 BLAKE2B 
f9374c234a75851784c940f8288a783ee1c02fe4be2973b174a0d3768a60dd5318ceea7d2dacb083376c83c33bed8fca02768bcf4f3b8ba6284ca78fc7910cfe
 SHA512 
986a34328ec3b9aba1532cfd8792fb970fe3c71eda577988a17a6bca25e783a520878067acd097a74ca3f274f02d271af16d7d6beb6970bca48332721021eebc
 DIST mysql-workbench-community-8.0.20-src.tar.gz 19391920 BLAKE2B 
9baf37dec18002ebf7956979fa1e3e45b69a7061bd85d6b2ef25f058ce7595a6847ea314b7443dadf7524ff985ff4e87869e91ea7a012e6cf07a6d139a6c733b
 SHA512 
b31314fac018959a008b283c795df5a676d6c667827e87a98379ce1de172b98cfdf8dd5cac009e2fb78241358afcb318abfed0178d73840bf6b4432b85b6a4e7
+DIST mysql-workbench-community-8.0.21-src.tar.gz 19211633 BLAKE2B 
452ac946d478acb1d0e358d2bc44125f0b7d1f1bc2943d2b03ce6767e659df71b7525b7a51ed1cd5560f02a7a1047e2cd35477a71ddd91f71992e5becc3d1c0d
 SHA512 
40c1144f801424c3b46eb033c9d1174c9bd903cd17672924eacd3ff58daa91b0d09f6045af4746ce7490f5ab2b0973b6d7f44ee8ae022607057cb0f09fc59a3f

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild
new file mode 100644
index 000..2590c53d77b
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.7.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+   https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm
+   dev-cpp/pangomm
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8 
=dev-db/mysql-connector-c++-1*
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2020-06-13 Thread Mike Gilbert 
commit: 0e284078f85da68d22f75be7a1df666382bd75c8
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Jun 13 08:08:38 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jun 13 16:27:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e284078

dev-db/mysql-workbench: remove unused patch

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16211

 .../files/mysql-workbench-6.3.10-i386-json.patch   | 182 -
 1 file changed, 182 deletions(-)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
deleted file mode 100644
index 31e789992d1..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Last-Update: 2018-03-05
-Forwarded: not-needed
-Origin: upstream, 
https://github.com/mysql/mysql-workbench/commit/fff08d9ec68de8215fc8f12fe0ee42e598e1cf75.patch
-Bug-Upstream: https://github.com/mysql/mysql-workbench/pull/14
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84886
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84951
-From: Christian Hesse 
-Description: fixes FTBFS on 32bit architectures.
-
-
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:346:79: 
error: format '%lu' expects argument of type 'long unsigned int', but argument 
2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' 
[-Werror=format=]
-   throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", 
pos));
-   
^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In 
member function 'const JsonParser::JsonValue& 
JsonParser::JsonArray::at(JsonParser::JsonArray::SizeType) const':
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:361:79: 
error: format '%lu' expects argument of type 'long unsigned int', but argument 
2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' 
[-Werror=format=]
-   throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", 
pos));
-   
^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In 
member function 'void JsonParser::JsonWriter::write(const 
JsonParser::JsonValue&)':
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1672:44: 
error: conversion from 'const JsonParser::JsonValue' to 'int64_t {aka long long 
int}' is ambiguous
- _output += std::to_string((int64_t)value);
-^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1001:3: 
note: candidate: JsonParser::JsonValue::operator bool() const
-   JsonValue::operator bool() const {
-   ^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:981:3: 
note: candidate: JsonParser::JsonValue::operator double() const
-   JsonValue::operator double() const {
-   ^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:950:3: 
note: candidate: JsonParser::JsonValue::operator size_t() const
-   JsonValue::operator size_t() const {
-   ^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:939:3: 
note: candidate: JsonParser::JsonValue::operator ssize_t() const
-   JsonValue::operator ssize_t() const {
-   ^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1675:45: 
error: conversion from 'const JsonParser::JsonValue' to 'uint64_t {aka long 
long unsigned int}' is ambiguous
- _output += std::to_string((uint64_t)value);
-
-
 a/library/base/jsonparser.cpp
-+++ b/library/base/jsonparser.cpp
-@@ -342,9 +342,9 @@
-* If no such data is present std::out_of_range is thrown.
-*/
-   JsonValue ::at(SizeType pos) {
- if (pos > _data.size())
--  throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", 
pos));
-+  throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", 
pos));
- return _data.at(pos);
-   }
- 
-   
//--
-@@ -357,9 +357,9 @@
-* If no such data is present std::out_of_range is thrown.
-*/
-   const JsonValue ::at(SizeType pos) const {
- if (pos > _data.size())
--  throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", 
pos));
-+  throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", 
pos));
- return _data.at(pos);
-   }
- 
-   
//--
-@@ -1667,14 +1667,16 @@
- break;
-   case VDouble:
- _output += std::to_string((double)value);
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2020-03-31 Thread Agostino Sarubbo 
commit: c2f85398933069b4d691d87321c9f19832c25b79
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Mar 31 07:22:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Mar 31 07:22:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f85398

dev-db/mysql-workbench: x86 stable wrt bug #715138

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
index 3f6a7e95b38..2db141fb63c 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2020-03-29 Thread Mikle Kolyada 
commit: 4590ff10435df8cefe4f29ae64d2ebdad0a6d649
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar 29 07:23:58 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar 29 07:23:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4590ff10

dev-db/mysql-workbench: amd64 stable wrt bug #715138

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
index 2b07cff38b1..3f6a7e95b38 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/, dev-db/mysql-workbench/files/

2020-01-31 Thread Hans de Graaff 
commit: e997d6b79ac1d6f0839b6d38428d03a6ff2bcba4
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Jan 31 10:33:10 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Jan 31 10:33:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e997d6b7

dev-db/mysql-workbench: fix building against mysql-connector-c++-8

Thanks to fedeliallalinea for providing a patch and Marco Genasci for
linking it to the bug.

Closes: https://bugs.gentoo.org/702666
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Hans de Graaff  gentoo.org>

 .../files/mysql-workbench-8.0.19-mysql-connector-8.patch | 12 
 dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild |  1 +
 2 files changed, 13 insertions(+)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
new file mode 100644
index 000..c624dea0e56
--- /dev/null
+++ 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
@@ -0,0 +1,12 @@
+diff -Naru a/build/cmake/Modules/FindMySQLCppConn.cmake 
b/build/cmake/Modules/FindMySQLCppConn.cmake
+--- a/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:31:34.520496484 +0100
 b/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:32:32.590496631 +0100
+@@ -27,7 +27,7 @@
+   set(MySQLCppConn_FIND_QUIETLY TRUE)
+ endif ()
+ 
+-find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/local/include)
++find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/include/jdbc /usr/local/include /usr/local/include/jdbc)
+ 
+ SET(MySQLCppConn_NAMES mysqlcppconn)
+ 

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild
index faddecba8cf..4303dbc9863 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild
@@ -70,6 +70,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 PATCHES=(
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${P}-mysql-connector-8.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2019-12-06 Thread Aaron Bauman 
commit: 39b245cae69379476bbb2564b99e8701fe0d0cfe
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Dec  5 13:55:06 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Dec  6 15:38:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b245ca

dev-db/mysql-workbench: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13881
Signed-off-by: Aaron Bauman  gentoo.org>

 .../files/mysql-workbench-6.3.9-mariadb-json.patch | 55 --
 1 file changed, 55 deletions(-)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
deleted file mode 100644
index e785d6fb097..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
+++ /dev/null
@@ -1,55 +0,0 @@
 a/plugins/migration/copytable/copytable.cpp
-+++ b/plugins/migration/copytable/copytable.cpp
-@@ -109,8 +109,10 @@
-   return "MYSQL_TYPE_STRING";
- case MYSQL_TYPE_GEOMETRY:
-   return "MYSQL_TYPE_GEOMETRY";
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
- case MYSQL_TYPE_JSON:
-   return "MYSQL_TYPE_JSON";
-+#endif
- default:
-   return "UNKNOWN";
-   }
-@@ -295,7 +297,9 @@
-   case MYSQL_TYPE_STRING:
-   case MYSQL_TYPE_VAR_STRING:
-   case MYSQL_TYPE_BIT:
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-   case MYSQL_TYPE_JSON:
-+#endif
- if (!col->is_long_data)
-   bind.buffer_length = (unsigned)col->source_length + 1;
- 
-@@ -1392,7 +1396,11 @@
-   rowbuffer[index].buffer_type == MYSQL_TYPE_MEDIUM_BLOB ||
-   rowbuffer[index].buffer_type == MYSQL_TYPE_LONG_BLOB || 
rowbuffer[index].buffer_type == MYSQL_TYPE_BLOB ||
-   rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
--  rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY || 
rowbuffer[index].buffer_type == MYSQL_TYPE_JSON) {
-+  rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-+  || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
-+#endif
-+  ) {
- if (rowbuffer[index].buffer_length)
-   free(rowbuffer[index].buffer);
- 
-@@ -2162,7 +2170,9 @@
-   case MYSQL_TYPE_STRING:
-   case MYSQL_TYPE_ENUM:
-   case MYSQL_TYPE_SET:
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-   case MYSQL_TYPE_JSON:
-+#endif
- _bulk_insert_record.append("'", 1);
- ret_val = _bulk_insert_record.append_escaped((char 
*)(*_row_buffer)[col_index].buffer,
-  
*(*_row_buffer)[col_index].length);
-@@ -2621,7 +2621,7 @@
-   // This is needed because the escaping depends on the character set in use 
by the server
-   unsigned long ret_length = 0;
- 
--#if MYSQL_CHECK_VERSION(5, 7, 6)
-+#if MYSQL_CHECK_VERSION(5, 7, 6) && ! defined MARIADB_BASE_VERSION
-   if (_target->is_mysql_version_at_least(5, 7, 6))
- ret_length += mysql_real_escape_string_quote(_mysql, buffer + length, 
data, (unsigned long)dlength, '"');
-   else

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-10-15 Thread Hans de Graaff 
commit: 8236d6409c48cb00d128810fa1608cbb70906fb3
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Oct 15 06:03:55 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Oct 15 06:03:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8236d640

dev-db/mysql-workbench: add 8.0.18

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.18.ebuild  | 107 +
 2 files changed, 108 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 42c7197df33..58269456a71 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,4 @@
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B 
c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9
 SHA512 
e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
 DIST mysql-workbench-community-8.0.17-src.tar.gz 15777302 BLAKE2B 
ba1aebfc5f9b55e88529bdbc5ebe42da594fce1da0ea64bd0153294293fe4c2533bbc00aac9c1ba0942577eff90c1b522ef1af803e56edf0c361876ac5dea764
 SHA512 
c7b5f68e4a2fe30d33fde5f18a03342e034a8c10edc2506278dc09751f264884f1dba3d68c430594ac09d26b692465409d2189c2b2a440d80aca7ad00188a39f
+DIST mysql-workbench-community-8.0.18-src.tar.gz 15513209 BLAKE2B 
decacee6ff3e30435fd0d198dc6efd95bf1342318adda977de64afda68d0c982de27dc8a811422f8ecf66a4436b406b63a2ab6c1c5541febdcacd79961a34574
 SHA512 
dbc633a74bc5ce5b46de410b52cb1bd7a81ebc21d57ae75ccd5b50476b557e412f6e21820fb9cc0f499dbcfb28a6975d2fe86531eeccfb90b674ffc6512319db

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild
new file mode 100644
index 000..75561cb1b2c
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.7.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm
+   dev-cpp/pangomm
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   >=dev-libs/rapidjson-1.1.0
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
+
+   ## package is very fragile...
+   strip-flags
+
+   cmake-utils_src_prepare
+}
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-08-02 Thread Hans de Graaff 
commit: 6f63f3cc045d889ac00fc65ff997266c989aa493
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Aug  3 05:40:05 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Aug  3 05:40:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f63f3cc

dev-db/mysql-workbench: cleanup

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench/mysql-workbench-8.0.14.ebuild  | 109 -
 2 files changed, 110 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 769fac0237c..42c7197df33 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,4 +1,3 @@
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
-DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B 
f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4
 SHA512 
fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71
 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B 
c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9
 SHA512 
e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
 DIST mysql-workbench-community-8.0.17-src.tar.gz 15777302 BLAKE2B 
ba1aebfc5f9b55e88529bdbc5ebe42da594fce1da0ea64bd0153294293fe4c2533bbc00aac9c1ba0942577eff90c1b522ef1af803e56edf0c361876ac5dea764
 SHA512 
c7b5f68e4a2fe30d33fde5f18a03342e034a8c10edc2506278dc09751f264884f1dba3d68c430594ac09d26b692465409d2189c2b2a440d80aca7ad00188a39f

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
deleted file mode 100644
index 937637fa44f..000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
http://www.antlr.org/download/antlr-4.7.1-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm
-   dev-cpp/pangomm
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.7.3[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1[-mdb]
-   virtual/opengl
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   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}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-   "${FILESDIR}/${PN}-6.3.10-i386-json.patch"
-)
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt 
sqlparser/' \
-   modules/db.mysql.sqlparser/CMakeLists.txt
-
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//'

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-08-02 Thread Hans de Graaff 
commit: da2e4a92ecef9c0feca6764faad7aade66bf05ef
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Aug  3 05:46:56 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Aug  3 05:46:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2e4a92

dev-db/mysql-workbench: drop unused gnome-keyring USE flag

mysql-workbench now depends unconditionally on libsecret.

Fixes: https://bugs.gentoo.org/691318
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
index 885387e35cc..10955e2f43b 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://www.antlr
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
+IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # glibc: deprecated mutex functions, removed in 2.36.0
@@ -51,7 +51,6 @@ CDEPEND="${PYTHON_DEPS}
>=dev-db/mysql-connector-c++-1.1.8
dev-db/vsqlite++
|| ( dev-db/libiodbc dev-db/unixODBC )
-   gnome-keyring? ( gnome-base/libgnome-keyring )
dev-python/pexpect
>=dev-python/paramiko-1.7.4
 "

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-07-24 Thread Agostino Sarubbo 
commit: 4d39c451408a69c1ac899cba9dd99aa2445112c3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 24 08:18:34 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 24 08:18:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d39c451

dev-db/mysql-workbench: x86 stable wrt bug #690488

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
index 53963f8fb86..fefdda53c4c 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://www.antlr
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-07-23 Thread Agostino Sarubbo 
commit: 06d0174ebe498e4b93f4573a84e34ccb3af530cb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul 23 10:15:27 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul 23 10:15:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d0174e

dev-db/mysql-workbench: amd64 stable wrt bug #690488

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
index d08ef942bec..53963f8fb86 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://www.antlr
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-07-23 Thread Hans de Graaff 
commit: 1f54017f5cfbe36e77472496159297eabc85991b
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Jul 23 08:41:46 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Jul 23 08:42:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f54017f

dev-db/mysql-workbench: allow USE=mdb with gdal again

The issue in gdal that prevented this appears to have been fixed.

Bug: https://bugs.gentoo.org/528868
Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
index 957145c4757..885387e35cc 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
@@ -44,7 +44,7 @@ CDEPEND="${PYTHON_DEPS}
>=dev-libs/libxml2-2.6.2:2
dev-libs/libzip
dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1[-mdb]
+   >=sci-libs/gdal-1.11.1-r1
virtual/opengl
|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
dev-libs/tinyxml[stl]

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-07-23 Thread Hans de Graaff 
commit: eab95916c6d8652b0adc59ec7d539cc793310264
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Jul 23 06:53:23 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Jul 23 06:56:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab95916

dev-db/mysql-workbench: cleanup

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench/mysql-workbench-8.0.15.ebuild  | 109 -
 2 files changed, 110 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 69cf5ff8e98..769fac0237c 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,5 +1,4 @@
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B 
f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4
 SHA512 
fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71
-DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 
4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43
 SHA512 
f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055
 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B 
c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9
 SHA512 
e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
 DIST mysql-workbench-community-8.0.17-src.tar.gz 15777302 BLAKE2B 
ba1aebfc5f9b55e88529bdbc5ebe42da594fce1da0ea64bd0153294293fe4c2533bbc00aac9c1ba0942577eff90c1b522ef1af803e56edf0c361876ac5dea764
 SHA512 
c7b5f68e4a2fe30d33fde5f18a03342e034a8c10edc2506278dc09751f264884f1dba3d68c430594ac09d26b692465409d2189c2b2a440d80aca7ad00188a39f

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild
deleted file mode 100644
index c5dfe62875e..000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
http://www.antlr.org/download/antlr-4.7.1-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm
-   dev-cpp/pangomm
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.7.3[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1[-mdb]
-   virtual/opengl
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   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}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-07-23 Thread Hans de Graaff 
commit: 994a66c53a7a63614397caf21c9630e33a52ad84
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Jul 23 06:52:26 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Jul 23 06:56:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994a66c5

dev-db/mysql-workbench: add 8.0.17

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.17.ebuild  | 108 +
 2 files changed, 109 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 6098b250473..69cf5ff8e98 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -2,3 +2,4 @@ DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cb
 DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B 
f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4
 SHA512 
fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71
 DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 
4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43
 SHA512 
f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055
 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B 
c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9
 SHA512 
e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
+DIST mysql-workbench-community-8.0.17-src.tar.gz 15777302 BLAKE2B 
ba1aebfc5f9b55e88529bdbc5ebe42da594fce1da0ea64bd0153294293fe4c2533bbc00aac9c1ba0942577eff90c1b522ef1af803e56edf0c361876ac5dea764
 SHA512 
c7b5f68e4a2fe30d33fde5f18a03342e034a8c10edc2506278dc09751f264884f1dba3d68c430594ac09d26b692465409d2189c2b2a440d80aca7ad00188a39f

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
new file mode 100644
index 000..957145c4757
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.7.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm
+   dev-cpp/pangomm
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.8.5[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1[-mdb]
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   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}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-6.3.10-i386-json.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-06-05 Thread Hans de Graaff 
commit: 6c15963409434a6e20301eba2a9ce28c9ee9d212
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jun  5 17:54:29 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jun  5 17:56:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c159634

dev-db/mysql-workbench: cleanup

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   2 -
 .../mysql-workbench/mysql-workbench-6.3.10.ebuild  | 111 -
 2 files changed, 113 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index a10abf4cc3e..6098b250473 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,6 +1,4 @@
-DIST antlr-3.4-complete.jar 2388361 BLAKE2B 
561c1dffe464bbc387075df6d95bbdcab27315ba5679cfa10f85d6449baad3d05f4daa45af93d9b127d9fedb8c7e44c45537f1a84b4c4d877c40b9812620f669
 SHA512 
04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
-DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 
57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325
 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
 DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B 
f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4
 SHA512 
fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71
 DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 
4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43
 SHA512 
f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055
 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B 
c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9
 SHA512 
e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
deleted file mode 100644
index 772ccb85d54..000
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true
 -> antlr-3.4-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# 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:3.0
-   dev-libs/atk
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1[-mdb]
-   virtual/opengl
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   gnome-keyring? ( gnome-base/libgnome-keyring )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-   "
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-06-05 Thread Agostino Sarubbo 
commit: 74cd64f711ba39a8564e8250ef49dfa349175291
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun  5 07:45:13 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun  5 07:45:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74cd64f7

dev-db/mysql-workbench: x86 stable wrt bug #683942

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
index 6b14e1edca1..937637fa44f 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz http://www.antlr.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-05-26 Thread Mikle Kolyada 
commit: 369c1e8d4201fbbddd3c7e72f8e41becff47c968
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May 26 11:50:17 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May 26 11:50:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=369c1e8d

dev-db/mysql-workbench: amd64 stable wrt bug #683942

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
index c5dfe62875e..6b14e1edca1 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz http://www.antlr.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-05-20 Thread Hans de Graaff 
commit: 678162b06dc581cf1de69e521d7a2eede8f5b6de
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon May 20 18:00:40 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon May 20 18:04:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678162b0

dev-db/mysql-workbench: fix compilation on x86

Re-add a patch applied to mysql-workbench 6.x earlier that got lost
somehow when introducing 8.x.

Fixes: https://bugs.gentoo.org/686308
Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild | 1 +
 dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild | 1 +
 dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
index 7e90842c681..c5dfe62875e 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
@@ -67,6 +67,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 PATCHES=(
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-6.3.10-i386-json.patch"
 )
 
 src_unpack() {

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild
index 7e90842c681..c5dfe62875e 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild
@@ -67,6 +67,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 PATCHES=(
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-6.3.10-i386-json.patch"
 )
 
 src_unpack() {

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
index e2cec9a8b21..d08ef942bec 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
@@ -69,6 +69,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 PATCHES=(
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-6.3.10-i386-json.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-04-26 Thread Hans de Graaff 
commit: 363cdbff4e8d05c9af81519a846132a84721d9d9
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Apr 26 07:50:20 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Apr 26 07:51:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363cdbff

dev-db/mysql-workbench: add 8.0.16

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.16.ebuild  | 107 +
 2 files changed, 108 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 68abbf97f1d..a10abf4cc3e 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -3,3 +3,4 @@ DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cb
 DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 
57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325
 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
 DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B 
f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4
 SHA512 
fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71
 DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 
4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43
 SHA512 
f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055
+DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B 
c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9
 SHA512 
e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
new file mode 100644
index 000..e2cec9a8b21
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.7.1
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm
+   dev-cpp/pangomm
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.7.3[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1[-mdb]
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   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}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   ## remove hardcoded CXXFLAGS
+   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-04-21 Thread Hans de Graaff 
commit: 45357df11343c15e56dd2c09e5f29ff14bba3030
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Apr 21 08:32:52 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Apr 21 08:40:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45357df1

dev-db/mysql-workbench: add 8.0.15

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.15.ebuild  | 108 +
 2 files changed, 109 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 75af94eba14..1c77e56ac15 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -3,3 +3,4 @@ DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cb
 DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 
57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325
 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
 DIST mysql-workbench-community-8.0.13-src.tar.gz 16047080 BLAKE2B 
c31560a978620ae04210b452bcf90b75e7eb2ec20335470054b2640220ed29c3476f5ee1bacd86575f9b42481de5452e94b8d7a5e8f56eb17ea0770be19dc296
 SHA512 
d6f7aeb85e1bb59474d432f8088fd5603e5b539f3fce9c78db2aeaa8de3bc9356de09a6486138e07a29dd62b971e7601cce12a2e4a9f7309364081ee5db4b55d
 DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B 
f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4
 SHA512 
fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71
+DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 
4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43
 SHA512 
f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild
new file mode 100644
index 000..7e90842c681
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.15.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
http://www.antlr.org/download/antlr-4.7.1-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm
+   dev-cpp/pangomm
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.7.3[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1[-mdb]
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   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}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt 
sqlparser/' \
+   modules/db.mysql.sqlparser/CMakeLists.txt
+
+   ## remove hardcoded

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-04-21 Thread Hans de Graaff 
commit: d0f24d7cb87da3aa4b5c5f50c665d5393d05efbc
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Apr 21 08:35:16 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Apr 21 08:40:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0f24d7c

dev-db/mysql-workbench: cleanup

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench/mysql-workbench-8.0.13.ebuild  | 108 -
 2 files changed, 109 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 1c77e56ac15..68abbf97f1d 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,6 +1,5 @@
 DIST antlr-3.4-complete.jar 2388361 BLAKE2B 
561c1dffe464bbc387075df6d95bbdcab27315ba5679cfa10f85d6449baad3d05f4daa45af93d9b127d9fedb8c7e44c45537f1a84b4c4d877c40b9812620f669
 SHA512 
04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 
57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325
 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
-DIST mysql-workbench-community-8.0.13-src.tar.gz 16047080 BLAKE2B 
c31560a978620ae04210b452bcf90b75e7eb2ec20335470054b2640220ed29c3476f5ee1bacd86575f9b42481de5452e94b8d7a5e8f56eb17ea0770be19dc296
 SHA512 
d6f7aeb85e1bb59474d432f8088fd5603e5b539f3fce9c78db2aeaa8de3bc9356de09a6486138e07a29dd62b971e7601cce12a2e4a9f7309364081ee5db4b55d
 DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B 
f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4
 SHA512 
fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71
 DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 
4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43
 SHA512 
f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
deleted file mode 100644
index ab3a1f466f1..000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/;
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
http://www.antlr.org/download/antlr-4.7.1-complete.jar;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-cpp/antlr-cpp:4
-   dev-cpp/atkmm
-   dev-cpp/pangomm
-   >=dev-cpp/glibmm-2.14:2
-   dev-cpp/gtkmm:3.0
-   dev-libs/atk
-   >=net-libs/libssh-0.7.3[server]
-   x11-libs/pango
-   x11-libs/gtk+:3
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1[-mdb]
-   virtual/opengl
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   >=dev-db/mysql-connector-c++-1.1.8
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   gnome-keyring? ( gnome-base/libgnome-keyring )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2019-02-26 Thread Aaron Bauman 
commit: 9ac346b7c9110d5ecc7d6601064e2aaafa1c7e61
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Jan 19 09:22:16 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Feb 27 05:35:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac346b7

dev-db/mysql-workbench: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10868
Signed-off-by: Aaron Bauman  gentoo.org>

 .../files/mysql-workbench-6.2.3-CMakeLists.patch   | 43 --
 .../mysql-workbench-6.3.3-mysql_options4.patch | 40 
 .../files/mysql-workbench-6.3.4-cxx11.patch| 39 
 .../files/mysql-workbench-6.3.4-gtk.patch  | 38 ---
 4 files changed, 160 deletions(-)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch
deleted file mode 100644
index 6e9a4d5e141..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch
+++ /dev/null
@@ -1,43 +0,0 @@
 mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-08-30 
18:05:12.0 +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.20 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 ()
-@@ -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/files/mysql-workbench-6.3.3-mysql_options4.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch
deleted file mode 100644
index 7fb9c8d57fc..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
 plugins/migration/copytable/copytable.cpp.~1~  2015-04-15 
15:54:19.0 +0200
-+++ plugins/migration/copytable/copytable.cpp  2015-04-26 08:53:08.871167725 
+0200
-@@ -1920,12 +1920,17 @@
- _incoming_data_charset = "latin1";
- 
-   mysql_init(&_mysql);
-+/* This is optional has compiled in for MySQL >= 5.6.6
-+ * Looks like MariaDB does not support this as supposed,
-+ * so disable completly. */
-+#ifndef MARIADB_BASE_VERSION
- #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && 
defined(MYSQL_VERSION_PATCH)
- #if MYSQL_CHECK_VERSION(5,6,6)
-   if (is_mysql_version_at_least(5,6,6))
- mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", 
app_name.c_str());
- #endif
- #endif
-+#endif
- 
-   // _bulk_insert_record is used to prepare a single record string, the 
connection
-   // is needed to escape binary data properly
 plugins/migration/copytable/copytable.cpp.~1~  2015-04-26 
08:57:30.444285953 +0200
-+++ plugins/migration/copytable/copytable.cpp  2015-04-26 10:16:39.234711324 
+0200
-@@ -2875,6 +2875,9 @@
- 
-   // This function is used to create a legal SQL string that you can use in 
an SQL statement
-   // This is needed because the escaping depends on the character set in use 
by the server
-+  #ifdef MARIADB_BASE_VERSION
-+length += mysql_real_escape_string(_mysql, buffer + length, data, 
(unsigned long)dlength);
-+  #else  
-   #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && 
defined(MYSQL_VERSION_PATCH)
-   #if MYSQL_CHECK_VERSION(5,7,6)
- if (is_mysql_version_at_least(5,7,6))
-@@ -2885,6 +2888,7 @@
- length += mysql_real_escape_string(_mysql, buffer + length, data, 
(unsigned long)dlength);
-   #endif
-   #endif
-+  #endif
- 
-   return true;
- }

diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-01-21 Thread Hans de Graaff 
commit: 4b0b3694c2dbfad802d5f3c4a44ae714fc1e5c75
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Jan 21 17:43:29 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jan 21 17:43:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0b3694

dev-db/mysql-workbench: add 8.0.14

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-8.0.14.ebuild  | 108 +
 2 files changed, 109 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 38a715bf98a..75af94eba14 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -2,3 +2,4 @@ DIST antlr-3.4-complete.jar 2388361 BLAKE2B 
561c1dffe464bbc387075df6d95bbdcab273
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 
57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325
 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
 DIST mysql-workbench-community-8.0.13-src.tar.gz 16047080 BLAKE2B 
c31560a978620ae04210b452bcf90b75e7eb2ec20335470054b2640220ed29c3476f5ee1bacd86575f9b42481de5452e94b8d7a5e8f56eb17ea0770be19dc296
 SHA512 
d6f7aeb85e1bb59474d432f8088fd5603e5b539f3fce9c78db2aeaa8de3bc9356de09a6486138e07a29dd62b971e7601cce12a2e4a9f7309364081ee5db4b55d
+DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B 
f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4
 SHA512 
fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
new file mode 100644
index 000..7e90842c681
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
http://www.antlr.org/download/antlr-4.7.1-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm
+   dev-cpp/pangomm
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.7.3[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1[-mdb]
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   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}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+)
+
+src_unpack() {
+   unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+   sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt 
sqlparser/' \
+   modules/db.mysql.sqlparser/CMakeLists.txt
+
+   ## remove hardcoded CXXFLAGS
+   sed -i -e

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2019-01-09 Thread Hans de Graaff 
commit: e4fdca3083a41aceff927d589fbbf04f62145177
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jan  9 09:20:40 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jan  9 09:20:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4fdca30

dev-db/mysql-workbench: cleanup

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench-6.3.4-r1.ebuild| 106 -
 2 files changed, 107 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 9c131354e6e..38a715bf98a 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,5 +1,4 @@
 DIST antlr-3.4-complete.jar 2388361 BLAKE2B 
561c1dffe464bbc387075df6d95bbdcab27315ba5679cfa10f85d6449baad3d05f4daa45af93d9b127d9fedb8c7e44c45537f1a84b4c4d877c40b9812620f669
 SHA512 
04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 
57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325
 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
-DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 BLAKE2B 
54941a760cc44b745039a59d0ad88e109605c47285b34098d7ebc9e7a32758027c07219f7b8dc96fad198fbc68086582ccfa5ba7e7a35fa1fff8ff57b467f91f
 SHA512 
8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
 DIST mysql-workbench-community-8.0.13-src.tar.gz 16047080 BLAKE2B 
c31560a978620ae04210b452bcf90b75e7eb2ec20335470054b2640220ed29c3476f5ee1bacd86575f9b42481de5452e94b8d7a5e8f56eb17ea0770be19dc296
 SHA512 
d6f7aeb85e1bb59474d432f8088fd5603e5b539f3fce9c78db2aeaa8de3bc9356de09a6486138e07a29dd62b971e7601cce12a2e4a9f7309364081ee5db4b55d

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
deleted file mode 100644
index 71ca6115b09..000
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-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 
https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true
 -> antlr-3.4-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# 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.20:2
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1[-mdb]
-   virtual/opengl
-   >=dev-lang/lua-5.1:0[deprecated]
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   dev-db/mysql-connector-c++
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   gnome-keyring? ( gnome-base/libgnome-keyring )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-   "
-
-# lua perhaps no longer needed? Was used via libgrt only
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-src_unpack() {
-   unpack

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-12-13 Thread Hans de Graaff 
commit: da62310d64a566683ba13f62ec23851acc4da5c2
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Dec 14 07:25:00 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Dec 14 07:43:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da62310d

dev-db/mysql-workbench: drop obsolete gnome-keyring cmake option

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
index 4ba8f98a2a2..ab3a1f466f1 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
@@ -97,7 +97,6 @@ src_configure() {
ANTLR_JAR_PATH="${DISTDIR}/antlr-4.7.1-complete.jar"
local mycmakeargs=(
-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
-   -DUSE_GNOME_KEYRING="$(usex gnome-keyring)"
-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
${IODBC}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-12-13 Thread Hans de Graaff 
commit: 8ed71f4173e9789df7e7d6dec97f10e7851031aa
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Dec 14 07:23:29 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Dec 14 07:43:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed71f41

dev-db/mysql-workbench: amd64 stable, bug 658132

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
index 9f27951a7a6..772ccb85d54 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-12-13 Thread Thomas Deutschmann 
commit: a9c4e1ad8bf6e94def44881bc0dd80c34bc373b1
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec 14 02:10:34 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec 14 02:10:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c4e1ad

dev-db/mysql-workbench: x86 stable (bug #658132)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
index 1cd099dac5d..9f27951a7a6 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-12-13 Thread Hans de Graaff 
commit: 057645ffcdb86bd24e7c965f6e1aa03db33abb4c
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Dec 13 11:36:16 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Dec 13 11:36:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057645ff

dev-db/mysql-workbench: fix build with libiodbc

Fixes: https://bugs.gentoo.org/638188
Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild | 6 ++
 dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild | 6 ++
 2 files changed, 12 insertions(+)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
index 4e80549449d..1cd099dac5d 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -88,10 +88,16 @@ src_prepare() {
 }
 
 src_configure() {
+   if has_version dev-db/libiodbc ; then
+   IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+   fi
+
append-cxxflags -std=c++11
local mycmakeargs=(
-DUSE_GNOME_KEYRING="$(usex gnome-keyring)"
-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+   -DIODBC_INCLUDE_PATH="/usr/include/iodbc"
+   ${IODBC}
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
index 81dcd36bcd4..4ba8f98a2a2 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
@@ -89,12 +89,18 @@ src_prepare() {
 }
 
 src_configure() {
+   if has_version dev-db/libiodbc ; then
+   IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+   fi
+
append-cxxflags -std=c++11
ANTLR_JAR_PATH="${DISTDIR}/antlr-4.7.1-complete.jar"
local mycmakeargs=(
-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
-DUSE_GNOME_KEYRING="$(usex gnome-keyring)"
-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+   -DIODBC_INCLUDE_PATH="/usr/include/iodbc"
+   ${IODBC}
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-12-11 Thread Hans de Graaff 
commit: 57c9420bf89905d63b1cd0f6295d9231ba2e9608
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Dec 11 10:00:18 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Dec 11 10:01:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c9420b

dev-db/mysql-workbench: drop commented-out code

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
index df7e12b9028..81dcd36bcd4 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
@@ -101,7 +101,3 @@ src_configure() {
)
cmake-utils_src_configure
 }
-
-#src_compile() {
-#  cmake-utils_src_compile -j1
-#}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-12-11 Thread Hans de Graaff 
commit: 56f2aae74056ef06246f2e45bce384f2c04b986d
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Dec 11 09:50:13 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Dec 11 09:50:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f2aae7

dev-db/mysql-workbench: cleanup

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench-6.3.4-r2.ebuild| 106 -
 .../mysql-workbench/mysql-workbench-6.3.9.ebuild   | 103 
 3 files changed, 210 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 7b8515867ba..9c131354e6e 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -2,5 +2,4 @@ DIST antlr-3.4-complete.jar 2388361 BLAKE2B 
561c1dffe464bbc387075df6d95bbdcab273
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 
57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325
 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 BLAKE2B 
54941a760cc44b745039a59d0ad88e109605c47285b34098d7ebc9e7a32758027c07219f7b8dc96fad198fbc68086582ccfa5ba7e7a35fa1fff8ff57b467f91f
 SHA512 
8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
-DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 BLAKE2B 
0991036cedc3198e789369a40641cc318fdc4230c2b6242b923e836c50248e3e1f5b891c1ce7465d132c30e482ef5458a19ed8b9e4a9865719be8eda61eeb1dc
 SHA512 
a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901
 DIST mysql-workbench-community-8.0.13-src.tar.gz 16047080 BLAKE2B 
c31560a978620ae04210b452bcf90b75e7eb2ec20335470054b2640220ed29c3476f5ee1bacd86575f9b42481de5452e94b8d7a5e8f56eb17ea0770be19dc296
 SHA512 
d6f7aeb85e1bb59474d432f8088fd5603e5b539f3fce9c78db2aeaa8de3bc9356de09a6486138e07a29dd62b971e7601cce12a2e4a9f7309364081ee5db4b55d

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
deleted file mode 100644
index 84f314bf012..000
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# 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.20:2
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   dev-libs/libsigc++:2
-   >=dev-libs/boost-1.55.0[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   >=virtual/mysql-5.1
-   dev-libs/libpcre[cxx]
-   >=sci-libs/gdal-1.11.1-r1[-mdb]
-   virtual/opengl
-   >=dev-lang/lua-5.1:0[deprecated]
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   dev-db/mysql-connector-c++
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   gnome-keyring? ( gnome-base/libgnome-keyring )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-   "
-
-# lua perhaps no longer needed? Was used via libgrt only
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/pkgconfig"
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/

2018-10-27 Thread Hans de Graaff 
commit: e94534c89a38f3109c46fd5f9bba2cc484113e27
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Oct 27 07:27:47 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Oct 27 07:28:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94534c8

dev-db/mysql-workbench: fix compilation on x86

Fix compilation on x86 with debian patch. Thanks to asturm for finding
the patch.

Closes: https://bugs.gentoo.org/659176
Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../files/mysql-workbench-6.3.10-i386-json.patch   | 182 +
 .../mysql-workbench/mysql-workbench-6.3.10.ebuild  |   1 +
 2 files changed, 183 insertions(+)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
new file mode 100644
index 000..31e789992d1
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
@@ -0,0 +1,182 @@
+Last-Update: 2018-03-05
+Forwarded: not-needed
+Origin: upstream, 
https://github.com/mysql/mysql-workbench/commit/fff08d9ec68de8215fc8f12fe0ee42e598e1cf75.patch
+Bug-Upstream: https://github.com/mysql/mysql-workbench/pull/14
+Bug-Upstream: https://bugs.mysql.com/bug.php?id=84886
+Bug-Upstream: https://bugs.mysql.com/bug.php?id=84951
+From: Christian Hesse 
+Description: fixes FTBFS on 32bit architectures.
+
+
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:346:79: 
error: format '%lu' expects argument of type 'long unsigned int', but argument 
2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' 
[-Werror=format=]
+   throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", 
pos));
+   
^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In 
member function 'const JsonParser::JsonValue& 
JsonParser::JsonArray::at(JsonParser::JsonArray::SizeType) const':
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:361:79: 
error: format '%lu' expects argument of type 'long unsigned int', but argument 
2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' 
[-Werror=format=]
+   throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", 
pos));
+   
^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In 
member function 'void JsonParser::JsonWriter::write(const 
JsonParser::JsonValue&)':
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1672:44: 
error: conversion from 'const JsonParser::JsonValue' to 'int64_t {aka long long 
int}' is ambiguous
+ _output += std::to_string((int64_t)value);
+^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1001:3: 
note: candidate: JsonParser::JsonValue::operator bool() const
+   JsonValue::operator bool() const {
+   ^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:981:3: 
note: candidate: JsonParser::JsonValue::operator double() const
+   JsonValue::operator double() const {
+   ^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:950:3: 
note: candidate: JsonParser::JsonValue::operator size_t() const
+   JsonValue::operator size_t() const {
+   ^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:939:3: 
note: candidate: JsonParser::JsonValue::operator ssize_t() const
+   JsonValue::operator ssize_t() const {
+   ^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1675:45: 
error: conversion from 'const JsonParser::JsonValue' to 'uint64_t {aka long 
long unsigned int}' is ambiguous
+ _output += std::to_string((uint64_t)value);
+
+
+--- a/library/base/jsonparser.cpp
 b/library/base/jsonparser.cpp
+@@ -342,9 +342,9 @@
+* If no such data is present std::out_of_range is thrown.
+*/
+   JsonValue ::at(SizeType pos) {
+ if (pos > _data.size())
+-  throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", 
pos));
++  throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", 
pos));
+ return _data.at(pos);
+   }
+ 
+   
//--
+@@ -357,9 +357,9 @@
+* If no such data is present std::out_of_range is thrown.
+*/
+   const JsonValue ::at(SizeType pos) const {
+ if (pos > _data.size())
+-  throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", 
pos));
++  throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", 
pos));
+ return _data.at(pos);
+   }
+ 
+   
//--
+@@ -1667,14 +1667,16 @@
+ break;
+   case VDouble:
+ _output +=

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-10-26 Thread Hans de Graaff 
commit: ada1a814fd8e0557a75133ac2a42832429a670f3
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Oct 26 17:42:33 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Oct 26 17:42:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada1a814

dev-db/mysql-workbench: add missing dependency on libsecret

Closes: https://bugs.gentoo.org/669534
Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
index d26dbccfc30..df7e12b9028 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
@@ -23,6 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # glibc: deprecated mutex functions, removed in 2.36.0
 CDEPEND="${PYTHON_DEPS}
+   app-crypt/libsecret
dev-libs/glib:2
dev-cpp/antlr-cpp:4
dev-cpp/atkmm

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-10-24 Thread Hans de Graaff 
commit: 445be25e86cd6d90e505af8c69f4f270ad6e6ba1
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Oct 23 06:31:07 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Oct 24 06:13:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445be25e

dev-db/mysql-workbench: add 8.0.13

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest|   2 +
 .../mysql-workbench/mysql-workbench-8.0.13.ebuild  | 107 +
 2 files changed, 109 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index dd0faaca1ae..7b8515867ba 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,4 +1,6 @@
 DIST antlr-3.4-complete.jar 2388361 BLAKE2B 
561c1dffe464bbc387075df6d95bbdcab27315ba5679cfa10f85d6449baad3d05f4daa45af93d9b127d9fedb8c7e44c45537f1a84b4c4d877c40b9812620f669
 SHA512 
04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
+DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 
57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325
 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 BLAKE2B 
54941a760cc44b745039a59d0ad88e109605c47285b34098d7ebc9e7a32758027c07219f7b8dc96fad198fbc68086582ccfa5ba7e7a35fa1fff8ff57b467f91f
 SHA512 
8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
 DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 BLAKE2B 
0991036cedc3198e789369a40641cc318fdc4230c2b6242b923e836c50248e3e1f5b891c1ce7465d132c30e482ef5458a19ed8b9e4a9865719be8eda61eeb1dc
 SHA512 
a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901
+DIST mysql-workbench-community-8.0.13-src.tar.gz 16047080 BLAKE2B 
c31560a978620ae04210b452bcf90b75e7eb2ec20335470054b2640220ed29c3476f5ee1bacd86575f9b42481de5452e94b8d7a5e8f56eb17ea0770be19dc296
 SHA512 
d6f7aeb85e1bb59474d432f8088fd5603e5b539f3fce9c78db2aeaa8de3bc9356de09a6486138e07a29dd62b971e7601cce12a2e4a9f7309364081ee5db4b55d

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
new file mode 100644
index 000..f03222f30ec
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
http://www.antlr.org/download/antlr-4.7.1-complete.jar;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   dev-libs/glib:2
+   dev-cpp/antlr-cpp:4
+   dev-cpp/atkmm
+   dev-cpp/pangomm
+   >=dev-cpp/glibmm-2.14:2
+   dev-cpp/gtkmm:3.0
+   dev-libs/atk
+   >=net-libs/libssh-0.7.3[server]
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   >=virtual/mysql-5.6
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1[-mdb]
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   gnome-keyring? ( gnome-base/libgnome-keyring )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-10-24 Thread Hans de Graaff 
commit: 5fd21a2bc569f2a6a65f6f8b85e755c447ab7994
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Oct 24 06:13:24 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Oct 24 06:13:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd21a2b

dev-db/mysql-workbench: drop virtual/mysql dependency

mysql-workbench uses mysql-connector-c++ to establish a connection with
the server. mysql_config is mentioned in a test unit file but tests are
not currently run.

Closes: https://bugs.gentoo.org/665860
Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild   | 3 +--
 dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild | 3 +--
 dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild   | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
index 178a44ec3f9..e89f1328742 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,7 +38,6 @@ CDEPEND="${PYTHON_DEPS}
>=dev-cpp/ctemplate-0.95
>=dev-libs/libxml2-2.6.2:2
dev-libs/libzip
-   >=virtual/mysql-5.6
dev-libs/libpcre[cxx]
>=sci-libs/gdal-1.11.1-r1[-mdb]
virtual/opengl

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
index 1d3b557c13c..71ca6115b09 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -38,7 +38,6 @@ CDEPEND="${PYTHON_DEPS}
>=dev-cpp/ctemplate-0.95
>=dev-libs/libxml2-2.6.2:2
dev-libs/libzip
-   >=virtual/mysql-5.1
dev-libs/libpcre[cxx]
>=sci-libs/gdal-1.11.1-r1[-mdb]
virtual/opengl

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
index f03222f30ec..d26dbccfc30 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.13.ebuild
@@ -40,7 +40,6 @@ CDEPEND="${PYTHON_DEPS}
>=dev-cpp/ctemplate-0.95
>=dev-libs/libxml2-2.6.2:2
dev-libs/libzip
-   >=virtual/mysql-5.6
dev-libs/libpcre[cxx]
>=sci-libs/gdal-1.11.1-r1[-mdb]
virtual/opengl

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2018-03-17 Thread Matt Turner 
commit: 147acf0e82d65f8df572a7c1a255e080d4d9774a
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Mar 17 06:23:38 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Mar 17 06:45:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147acf0e

dev-db/mysql-workbench: Drop ppc keywords

 dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
index 4d946466015..84f314bf012 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2017-12-23 Thread Hans de Graaff 
commit: 57948ebc9c19f582a5591672c55d888226337df2
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Dec 23 09:39:34 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Dec 23 09:40:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57948ebc

dev-db/mysql-workbench: remove -Werror from CFLAGS

Closes: https://bugs.gentoo.org/641838
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
index efa53cd769f..178a44ec3f9 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -78,6 +78,8 @@ src_prepare() {
 
## remove hardcoded CXXFLAGS
sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+   ## And avoid -Werror
+   sed -i -e 's/-Werror//' CMakeLists.txt || die
 
## package is very fragile...
strip-flags

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2017-11-19 Thread Hans de Graaff 
commit: 890c04c2590888b6a7d122fa6a0c46f249d6194c
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Nov 19 10:34:35 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov 19 10:34:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=890c04c2

dev-db/mysql-workbench: add 6.3.10

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-db/mysql-workbench/Manifest|   1 +
 .../mysql-workbench/mysql-workbench-6.3.10.ebuild  | 103 +
 2 files changed, 104 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 9b917725e76..a5fed084adf 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,4 @@
 DIST antlr-3.4-complete.jar 2388361 SHA256 
9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 
04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
 WHIRLPOOL 
488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
+DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 SHA256 
b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
 WHIRLPOOL 
e5d589a15a41a63861ad479a56b8d843487cf739fe9c3422796ddfac1577e7535e6c8c3531ee01595fb7780c524dd186371740ae36ed2d508b36fc7d9e764874
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 
be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 
8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
 WHIRLPOOL 
9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5
 DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 SHA256 
607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951 SHA512 
a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901
 WHIRLPOOL 
654eaa76d6f132e50ca904aae54c07a7d2aabe746e519f5c6c8cd5d40529ebe022616d5ef28be8dd322aba19e589dc8d9dd2bb4c5f2356fa7b5698a84190208e

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
new file mode 100644
index 000..efa53cd769f
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/;
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true
 -> antlr-3.4-complete.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# 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:3.0
+   dev-libs/atk
+   x11-libs/pango
+   x11-libs/gtk+:3
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   >=virtual/mysql-5.6
+   dev-libs/libpcre[cxx]
+   >=sci-libs/gdal-1.11.1-r1[-mdb]
+   virtual/opengl
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   >=dev-db/mysql-connector-c++-1.1.8
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   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}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+   "${FILESDIR}/${PN}-6.3.9-mariadb-json.patch"
+)
+
+src_unpack() {
+   unpack

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2017-07-20 Thread Hans de Graaff 
commit: 08210233f9eeaf3891f3697734823d6afe815385
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jul 20 10:52:39 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jul 20 11:51:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08210233

dev-db/mysql-workbench: update HOMEPAGE

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
index d2904bbaa87..efa53cd769f 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
@@ -12,7 +12,7 @@ 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/;
+HOMEPAGE="https://www.mysql.com/products/workbench/;
 SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true
 -> antlr-3.4-complete.jar"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2017-06-11 Thread Hans de Graaff 
commit: 84027b5db0d48b5e47f5930a1f54509ec0b496e0
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Jun 11 06:28:02 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Jun 11 06:28:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84027b5d

dev-db/mysql-workbench: fix compilation with mysql 5.6, bug 62

Thanks to PhobosK for updating the patch and testing with mysql 5.6.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../files/mysql-workbench-6.3.9-mariadb-json.patch   | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
index 74c84e374dc..e785d6fb097 100644
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
@@ -1,13 +1,13 @@
 a/plugins/migration/copytable/copytable.cpp.~1~2017-02-03 
19:40:18.0 +0100
-+++ b/plugins/migration/copytable/copytable.cpp2017-05-21 
17:23:14.135875375 +0200
+--- a/plugins/migration/copytable/copytable.cpp
 b/plugins/migration/copytable/copytable.cpp
 @@ -109,8 +109,10 @@
return "MYSQL_TYPE_STRING";
  case MYSQL_TYPE_GEOMETRY:
return "MYSQL_TYPE_GEOMETRY";
-+#ifndef MARIADB_BASE_VERSION
++#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
  case MYSQL_TYPE_JSON:
return "MYSQL_TYPE_JSON";
-+#endif 
++#endif
  default:
return "UNKNOWN";
}
@@ -15,9 +15,9 @@
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_BIT:
-+#ifndef MARIADB_BASE_VERSION
++#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
case MYSQL_TYPE_JSON:
-+#endif
++#endif
  if (!col->is_long_data)
bind.buffer_length = (unsigned)col->source_length + 1;
  
@@ -27,9 +27,9 @@
rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
 -  rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY || 
rowbuffer[index].buffer_type == MYSQL_TYPE_JSON) {
 +  rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY
-+#ifndef MARIADB_BASE_VERSION  
++#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
 +  || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
-+#endif  
++#endif
 +  ) {
  if (rowbuffer[index].buffer_length)
free(rowbuffer[index].buffer);
@@ -38,9 +38,9 @@
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_ENUM:
case MYSQL_TYPE_SET:
-+#ifndef MARIADB_BASE_VERSION
++#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
case MYSQL_TYPE_JSON:
-+#endif
++#endif
  _bulk_insert_record.append("'", 1);
  ret_val = _bulk_insert_record.append_escaped((char 
*)(*_row_buffer)[col_index].buffer,
   
*(*_row_buffer)[col_index].length);

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2017-05-28 Thread Hans de Graaff 
commit: 8a4458a2e1bdcdfc32943616647fa5264575ea18
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon May 29 04:35:47 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon May 29 04:35:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4458a2

dev-db/mysql-workbench: backport gtk patch also to stable version

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
index 94025dc46bc..1d3b557c13c 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
@@ -39,7 +39,7 @@ CDEPEND="${PYTHON_DEPS}
>=dev-libs/libxml2-2.6.2:2
dev-libs/libzip
>=virtual/mysql-5.1
-   dev-libs/libpcre
+   dev-libs/libpcre[cxx]
>=sci-libs/gdal-1.11.1-r1[-mdb]
virtual/opengl
>=dev-lang/lua-5.1:0[deprecated]
@@ -75,7 +75,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
"${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \
-   "${FILESDIR}/${PN}-6.3.4-cxx11.patch"
+   "${FILESDIR}/${PN}-6.3.4-cxx11.patch" \
+   "${FILESDIR}/${PN}-6.3.4-gtk.patch"
 
sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt 
sqlparser/' \
modules/db.mysql.sqlparser/CMakeLists.txt

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2017-05-25 Thread Hans de Graaff 
commit: d82d188cb67a2fd509e372bd0a1adbf4394f7252
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu May 25 07:34:50 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu May 25 07:34:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d82d188c

Revert "dev-db/mysql-workbench: add missing X USE flag for pango, fixing bug 
542602"

This reverts commit b37d4b9d3395a444c15469214d8a2d3f7e9bb6f6.

pango[X] provides pango_xft related methods which mysql-workbench does
not use. Reverting this until more is clear about the original bug.

 dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild | 2 +-
 dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
index 400dd22246a..4d946466015 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@@ -29,7 +29,7 @@ CDEPEND="${PYTHON_DEPS}
>=dev-cpp/glibmm-2.14:2
>=dev-cpp/gtkmm-2.14:2.4
dev-libs/atk
-   x11-libs/pango[X]
+   x11-libs/pango
>=x11-libs/gtk+-2.20:2
gnome-base/libglade:2.0
>=x11-libs/cairo-1.5.12[glib,svg]

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
index eba8b9417c0..d2904bbaa87 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
@@ -29,7 +29,7 @@ CDEPEND="${PYTHON_DEPS}
>=dev-cpp/glibmm-2.14:2
dev-cpp/gtkmm:3.0
dev-libs/atk
-   x11-libs/pango[X]
+   x11-libs/pango
x11-libs/gtk+:3
gnome-base/libglade:2.0
>=x11-libs/cairo-1.5.12[glib,svg]

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2017-05-25 Thread Hans de Graaff 
commit: b37d4b9d3395a444c15469214d8a2d3f7e9bb6f6
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu May 25 06:49:51 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu May 25 06:49:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37d4b9d

dev-db/mysql-workbench: add missing X USE flag for pango, fixing bug 542602

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild | 2 +-
 dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
index 4d946466015..400dd22246a 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@@ -29,7 +29,7 @@ CDEPEND="${PYTHON_DEPS}
>=dev-cpp/glibmm-2.14:2
>=dev-cpp/gtkmm-2.14:2.4
dev-libs/atk
-   x11-libs/pango
+   x11-libs/pango[X]
>=x11-libs/gtk+-2.20:2
gnome-base/libglade:2.0
>=x11-libs/cairo-1.5.12[glib,svg]

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
index d2904bbaa87..eba8b9417c0 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
@@ -29,7 +29,7 @@ CDEPEND="${PYTHON_DEPS}
>=dev-cpp/glibmm-2.14:2
dev-cpp/gtkmm:3.0
dev-libs/atk
-   x11-libs/pango
+   x11-libs/pango[X]
x11-libs/gtk+:3
gnome-base/libglade:2.0
>=x11-libs/cairo-1.5.12[glib,svg]

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/

2017-05-25 Thread Hans de Graaff 
commit: 5270e1de52c3b27edf3dd777b07e1f859008a421
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu May 25 06:44:23 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu May 25 06:44:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5270e1de

dev-db/mysql-workbench: add 6.3.9, fixing bug 567226

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-db/mysql-workbench/Manifest|   1 +
 .../files/mysql-workbench-6.2.5-wbcopytables.patch |   4 +-
 .../files/mysql-workbench-6.3.9-mariadb-json.patch |  55 +++
 .../mysql-workbench/mysql-workbench-6.3.9.ebuild   | 103 +
 4 files changed, 161 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 6854db6f8bc..9b917725e76 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,2 +1,3 @@
 DIST antlr-3.4-complete.jar 2388361 SHA256 
9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 
04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
 WHIRLPOOL 
488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 
be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 
8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
 WHIRLPOOL 
9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5
+DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 SHA256 
607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951 SHA512 
a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901
 WHIRLPOOL 
654eaa76d6f132e50ca904aae54c07a7d2aabe746e519f5c6c8cd5d40529ebe022616d5ef28be8dd322aba19e589dc8d9dd2bb4c5f2356fa7b5698a84190208e

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
index 0fcc837fef0..2d3d8db243f 100644
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
@@ -1,5 +1,5 @@
 plugins/migration/CMakeLists.txt.~1~   2015-02-25 09:08:47.0 
+0100
-+++ plugins/migration/CMakeLists.txt   2015-03-07 07:28:56.745378152 +0100
+--- a/plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.0 
+0100
 b/plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100
 @@ -10,7 +10,8 @@
  if (UNIX)
configure_file(wbcopytables.in wbcopytables)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
new file mode 100644
index 000..74c84e374dc
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
@@ -0,0 +1,55 @@
+--- a/plugins/migration/copytable/copytable.cpp.~1~2017-02-03 
19:40:18.0 +0100
 b/plugins/migration/copytable/copytable.cpp2017-05-21 
17:23:14.135875375 +0200
+@@ -109,8 +109,10 @@
+   return "MYSQL_TYPE_STRING";
+ case MYSQL_TYPE_GEOMETRY:
+   return "MYSQL_TYPE_GEOMETRY";
++#ifndef MARIADB_BASE_VERSION
+ case MYSQL_TYPE_JSON:
+   return "MYSQL_TYPE_JSON";
++#endif 
+ default:
+   return "UNKNOWN";
+   }
+@@ -295,7 +297,9 @@
+   case MYSQL_TYPE_STRING:
+   case MYSQL_TYPE_VAR_STRING:
+   case MYSQL_TYPE_BIT:
++#ifndef MARIADB_BASE_VERSION
+   case MYSQL_TYPE_JSON:
++#endif
+ if (!col->is_long_data)
+   bind.buffer_length = (unsigned)col->source_length + 1;
+ 
+@@ -1392,7 +1396,11 @@
+   rowbuffer[index].buffer_type == MYSQL_TYPE_MEDIUM_BLOB ||
+   rowbuffer[index].buffer_type == MYSQL_TYPE_LONG_BLOB || 
rowbuffer[index].buffer_type == MYSQL_TYPE_BLOB ||
+   rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
+-  rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY || 
rowbuffer[index].buffer_type == MYSQL_TYPE_JSON) {
++  rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY
++#ifndef MARIADB_BASE_VERSION  
++  || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
++#endif  
++  ) {
+ if (rowbuffer[index].buffer_length)
+   free(rowbuffer[index].buffer);
+ 
+@@ -2162,7 +2170,9 @@
+   case MYSQL_TYPE_STRING:
+   case MYSQL_TYPE_ENUM:
+   case MYSQL_TYPE_SET:
++#ifndef MARIADB_BASE_VERSION
+   case MYSQL_TYPE_JSON:
++#endif
+ _bulk_insert_record.append("'", 1);
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/, dev-db/mysql-workbench/files/

2017-05-21 Thread Hans de Graaff 
commit: 9e95f740110153a2a1d2d0440484fa717bf0f0c8
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun May 21 08:17:54 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun May 21 08:18:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e95f740

dev-db/mysql-workbench: fix compilation with recent glibmm, fixing bug 600376

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../files/mysql-workbench-6.3.4-gtk.patch  | 38 ++
 .../mysql-workbench-6.3.4-r2.ebuild|  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch
new file mode 100644
index 000..e975906e19a
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch
@@ -0,0 +1,38 @@
+Last-Update: 2016-11-13
+Forwarded: not-needed
+Author: Dmitry Smirnov 
+Bug-Debian: https://bugs.debian.org/839356
+Description: fix FTBFS
+
+--- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popover.cpp
 mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popover.cpp
+@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const i
+   if (_style == mforms::PopoverStyleTooltip)
+   {
+ Glib::RefPtr wnd = this->get_window();
+-if (wnd != 0)
++if (wnd)
+ {
+   int xx;
+   int yy;
+@@ -396,7 +396,7 @@ void PopoverWidget::show_popover(const i
+   {
+ Gdk::ModifierType mask;
+ Glib::RefPtr dsp = Gdk::Display::get_default();
+-if (dsp != 0)
++if (dsp)
+   dsp->get_pointer(x, y, mask);
+   }
+ 
+--- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popup.cpp
 mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popup.cpp
+@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const
+ {
+   d("\n");
+   Glib::RefPtr colormap = screen->get_rgba_colormap();
+-  _have_rgba = colormap;
++  if (colormap)
++_have_rgba = true;
+ 
+   if (!_have_rgba)
+ colormap = screen->get_rgb_colormap();

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
index eff874ba537..4d946466015 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@@ -74,7 +74,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
"${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \
-   "${FILESDIR}/${PN}-6.3.4-cxx11.patch"
+   "${FILESDIR}/${PN}-6.3.4-cxx11.patch" \
+   "${FILESDIR}/${PN}-6.3.4-gtk.patch"
 
sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt 
sqlparser/' \
modules/db.mysql.sqlparser/CMakeLists.txt

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2017-05-21 Thread Hans de Graaff 
commit: 9875e41be66aaf9ee0c5bb2d874855cff6a64544
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun May 21 05:58:04 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun May 21 05:58:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9875e41b

dev-db/mysql-workbench: cleanup

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-db/mysql-workbench/Manifest|   1 -
 .../mysql-workbench/mysql-workbench-6.3.3.ebuild   | 101 
 .../mysql-workbench/mysql-workbench-6.3.4.ebuild   | 104 -
 3 files changed, 206 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 28b7d1c7b14..6854db6f8bc 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,3 +1,2 @@
 DIST antlr-3.4-complete.jar 2388361 SHA256 
9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 
04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
 WHIRLPOOL 
488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
-DIST mysql-workbench-community-6.3.3-src.tar.gz 14892631 SHA256 
4511d63145b2a979310d84c9f0ca61b7460af2c87b81787b2f2404fd5095f419 SHA512 
9736ed4f896b2819d5cde76a000a56b6ce36606262a83b5a0ba8dfc8760476eb43bcda08f258d856297924f3ddca2d89aadf0139fb156beb345f2a6fe5b0bc45
 WHIRLPOOL 
9e1054b8c18e854918133da62f67cc109f212812cd2509edfc775d4ebbc91b402a7b88b530e540eb67dadba6f6fd3d901b3f7a30b7a03a5a33537c677bbd0024
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 
be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 
8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
 WHIRLPOOL 
9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
deleted file mode 100644
index d657dd0565f..000
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-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 
https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true
 -> antlr-3.4-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# 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.20:2
-   gnome-base/libglade:2.0
-   >=x11-libs/cairo-1.5.12[glib,svg]
-   dev-libs/libsigc++:2
-   dev-libs/boost[nls]
-   >=dev-cpp/ctemplate-0.95
-   >=dev-libs/libxml2-2.6.2:2
-   dev-libs/libzip
-   >=virtual/mysql-5.1
-   dev-libs/libpcre
-   >=sci-libs/gdal-1.11.1-r1[-mdb]
-   virtual/opengl
-   >=dev-lang/lua-5.1:0[deprecated]
-   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-   dev-libs/tinyxml[stl]
-   dev-db/mysql-connector-c++
-   dev-db/vsqlite++
-   || ( dev-db/libiodbc dev-db/unixODBC )
-   gnome-keyring? ( gnome-base/libgnome-keyring )
-   dev-python/pexpect
-   >=dev-python/paramiko-1.7.4
-   "
-
-# lua perhaps no longer needed? Was used via libgrt only
-
-RDEPEND="${CDEPEND}
-   app-admin/sudo
-   >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   virtual/jre
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-src_unpack() {
-   unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-   ## Patch CMakeLists.txt
-   epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
-   "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
-   "${FILESDIR}/${PN}-6.3.3-mysql_options4.patch"
-
-   ## remove hardcoded CXXFLAGS
-   sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/libzdb/files/, dev-db/ctdb/files/, ...

2016-07-30 Thread Patrice Clement 
commit: 3e85c8c4859384b2e7860512dee265c8d18ec370
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Jul 19 17:29:57 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Jul 30 06:46:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e85c8c4

dev-db/*: remove unused patches.

Squash all commit messages into a single one.

Closes: https://github.com/gentoo/gentoo/pull/1936
Signed-off-by: Patrice Clement  gentoo.org>

 dev-db/ctdb/files/autoconf-2.62-fix.patch  |  15 --
 dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch  |  77 ---
 dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch   |  13 --
 dev-db/ctdb/files/ctdb-50.samba_gentoo.patch   |  14 --
 dev-db/ctdb/files/ctdb-functions.patch |  76 ---
 dev-db/ctdb/files/ctdb.initd   |  81 ---
 .../files/firebird-2.5.1.26351.0-deps-flags.patch  |  59 -
 dev-db/henplus/files/henplus-0.9.7-build.xml.patch |  34 ---
 dev-db/henplus/files/henplus.patch |  42 
 dev-db/libzdb/files/sqlite_configure.patch |  18 --
 dev-db/mongodb/files/mms-agent.confd   |   9 -
 dev-db/mongodb/files/mms-agent.initd   |  41 
 dev-db/mongodb/files/mms-agent.initd-r1|  31 ---
 dev-db/mongodb/files/mms-agent.initd-r2|  25 ---
 dev-db/mongodb/files/mongodb-2.0-fix-scons.patch   |  36 ---
 .../mongodb/files/mongodb-2.0-r1-boost-1.50.patch  | 245 -
 dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch |  28 ---
 dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch |  35 ---
 dev-db/mongodb/files/mongos.confd  |  16 --
 dev-db/mongodb/files/mongos.initd-r1   |  50 -
 .../mysql-connector-c++-1.1.0-disable-tests.patch  |  14 --
 .../mysql-connector-c++-1.1.0-fix-cmake.patch  |  85 ---
 .../mysql-connector-c++-1.1.5-fix-cmake.patch  | 106 -
 .../mysql-workbench-6.1.7-mysql_options4.patch |  29 ---
 .../files/mysql-workbench-6.1.7-wbcopytables.patch |  10 -
 .../files/mysql-workbench-6.2.3-ctemplate.patch|  35 ---
 .../files/mysql-workbench-6.2.3-glib.patch |  42 
 .../files/mysql-workbench-6.2.3-paramiko.patch |  51 -
 dev-db/postgis/files/postgis-2.0-ldflags.patch |  26 ---
 .../postgis/files/postgis-2.0-pkgconfig-json.patch |  99 -
 ...tgresql-9.4-alpha-fix-read-memory-barrier.patch |  13 --
 dev-db/redis/files/redis-2.4.17-shared.patch   |  22 --
 dev-db/redis/files/redis-2.4.3-shared.patch|  22 --
 dev-db/redis/files/redis-2.4.4-tcmalloc.patch  |  21 --
 dev-db/redis/files/redis-2.6.7-config.patch|  69 --
 dev-db/redis/files/redis-2.6.7-shared.patch|  36 ---
 dev-db/redis/files/redis-2.6.9-tclsh86.patch   |  57 -
 dev-db/redis/files/redis-2.8.3-config.patch|  59 -
 dev-db/redis/files/redis.initd-2   |  23 --
 dev-db/redis/files/redis.initd-3   |  32 ---
 dev-db/slony1/files/slony1-2.1.1-ldflags.patch |  29 ---
 .../files/sqlitebrowser-3.5.1-unbundle.patch   |  70 --
 ...itebrowser-3.6.0-unbundle-keep-qscintilla.patch |  62 --
 dev-db/tokyocabinet/files/1.4.45.patch |  12 -
 dev-db/tokyocabinet/files/1.4.46.patch |  12 -
 dev-db/tokyocabinet/files/remove_docinst.patch |  13 --
 .../files/unixODBC-2.3.0-sqldriverconnect.patch|  27 ---
 dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in |  14 --
 48 files changed, 2035 deletions(-)

diff --git a/dev-db/ctdb/files/autoconf-2.62-fix.patch 
b/dev-db/ctdb/files/autoconf-2.62-fix.patch
deleted file mode 100644
index 2f5bc2b..000
--- a/dev-db/ctdb/files/autoconf-2.62-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 lib/replace/autoconf-2.60.m4.orig  2008-04-19 00:26:33.0 -0400
-+++ lib/replace/autoconf-2.60.m4   2008-04-19 00:22:25.0 -0400
-@@ -179,6 +179,7 @@
- # 
- # Enable extensions on systems that normally disable them,
- # typically due to standards-conformance issues.
-+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
- AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
- [
-   AC_BEFORE([$0], [AC_COMPILE_IFELSE])
-@@ -208,3 +209,4 @@
- AC_DEFINE([__EXTENSIONS__])
-   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
- ])
-+])

diff --git a/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch 
b/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch
deleted file mode 100644
index c70350c..000
--- a/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naur ctdb-1.0.114.orig/config/functions ctdb-1.0.114/config/functions
 ctdb-1.0.114.orig/config/functions 2010-04-04 18:01:18.278707515 +0200
-+++ ctdb-1.0.114/config/functions  2010-04-04 18:08:05.792447032 +0200
-@@ -22,6 +22,8 @@
-   . /etc/default/$1
- elif [ -f $CTDB_BASE/sysconfig/$1 ]; then
-   . $CTDB_BASE/sysconfig/$1
-+  elif [ -f /etc/config.d/$1 ]; then
-+  .

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2016-01-25 Thread Hans de Graaff 
commit: e02d7b31a8ebbd07b2669b6a6967a8e84c496655
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Jan 25 20:26:23 2016 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jan 25 20:27:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e02d7b31

dev-db/mysql-workbench: fix bug 572896

Make sure to depend on libpcre[cxx] since mysql-workbench
requires the C++ bindings to libpcre.

Thanks to Philipp Ammann in bug 572896 for diagnosing the
problem and providing a patch.

Package-Manager: portage-2.2.26

 dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
index c3d9983..60f80e7 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@@ -41,7 +41,7 @@ CDEPEND="${PYTHON_DEPS}
>=dev-libs/libxml2-2.6.2:2
dev-libs/libzip
>=virtual/mysql-5.1
-   dev-libs/libpcre
+   dev-libs/libpcre[cxx]
>=sci-libs/gdal-1.11.1-r1[-mdb]
virtual/opengl
>=dev-lang/lua-5.1:0[deprecated]

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2016-01-12 Thread James Le Cuirot 
commit: a9c925667d3ec1a78824115a7dcfe3df8a3bc668
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan 12 10:33:30 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 12 10:35:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c92566

dev-db/mysql-workbench: Remove unneeded virtual/jre dependency

graaff forgot to remove this in the last commit. See bug #570600.

Package-Manager: portage-2.2.26

 dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
index 4e4b22d..c3d9983 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,7 +63,6 @@ RDEPEND="${CDEPEND}
 
 DEPEND="${CDEPEND}
dev-lang/swig
-   virtual/jre
virtual/pkgconfig"
 
 S="${WORKDIR}"/"${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2016-01-11 Thread Hans de Graaff 
commit: 22aaf07c54aed507a6cb463504764b090a174e1b
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Jan 11 20:57:30 2016 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jan 11 20:57:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22aaf07c

dev-db/mysql-workbench: remove antlr dependency, bug 570600

It turns out that this dependency is not actually needed and
we also don't need to download the antlr files as we did in
previous revisions. See bug 570600 for an analysis by Chewi.

Package-Manager: portage-2.2.26

 dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
index fa6ed5e..4e4b22d 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@@ -62,7 +62,6 @@ RDEPEND="${CDEPEND}
>=sys-apps/net-tools-1.60_p20120127084908"
 
 DEPEND="${CDEPEND}
-   dev-java/antlr:3.5
dev-lang/swig
virtual/jre
virtual/pkgconfig"
@@ -100,7 +99,7 @@ src_configure() {
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
)
-   ANTLR_JAR_PATH="/usr/share/antlr-3.5/antlr-runtime.jar" 
cmake-utils_src_configure
+   cmake-utils_src_configure
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

2016-01-06 Thread Agostino Sarubbo 
commit: 075f33e48824fdcefee7bb1384f1b59da213b54f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan  6 13:33:27 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan  6 13:33:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075f33e4

dev-db/mysql-workbench: x86 stable wrt bug #570090

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
index 521e9b2..2fa905a 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 
 # glibc: deprecated mutex functions, removed in 2.36.0

  1   2   >