summaryrefslogtreecommitdiff
path: root/dev-db/mysql-workbench
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
commitfc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree326613a08f25851c388715e205576a2e7d25dc4f /dev-db/mysql-workbench
parentb24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
gentoo resync : 18.08.2019
Diffstat (limited to 'dev-db/mysql-workbench')
-rw-r--r--dev-db/mysql-workbench/Manifest4
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild109
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild3
3 files changed, 2 insertions, 114 deletions
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 7dc7abf73093..a757ddc211bb 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -2,10 +2,8 @@ AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c72
AUX mysql-workbench-6.3.10-i386-json.patch 7167 BLAKE2B 44a6e2446b24cd2f7f096d51b6cfdacfb485634a94733c4ef67a128ec903fec3736cb62ed45d6abbe7c7793b7d3ab668198f663a44b1bcc313f4d02ced4cd578 SHA512 992595df7719c4c958c98b5561f3fea04607213287c72daea6bb331392c417123d6fe5d1126c6dec128a857aa299908221f3a2c0ac08744241bf395e80a9574d
AUX mysql-workbench-6.3.9-mariadb-json.patch 2320 BLAKE2B 9dcf7ca5091109ab71a201a68aa16259402dae85d4ea1135fbce476dbc0d4f49ad154005a6fe6195ce86ffba49ebf3d03de8ac94b6adcda2a297600b1ac6d0d3 SHA512 23e4135ee5c8b7cc7b70cc6b5170209c9a6350cfc7e8450d29a1098c31472b68494147ec4f1286365f7802af72570f4822b0078ae269affbbaf98e3ad9e99eb4
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
-EBUILD mysql-workbench-8.0.14.ebuild 2718 BLAKE2B 4abd1c59b13bf3ce319c9959c8caabd4121a34ca4718aa08e7f508ff5f28326f7a2023d38ed5380666382f25255f831f869e8aca12b9fe70a5110ef86365ada8 SHA512 bd43c28ec80e357841aa9775dfc83367cc9f972f877b30097aa930ca8a03cbfd50376d30a13739cdbcc4ba2960215b209a979249d8365dca867891c70efe755c
EBUILD mysql-workbench-8.0.16.ebuild 2637 BLAKE2B 3b51c37e36967fcb2b88693953c18729ef3932ef2c8af677fb36ec9a9fce324d2897364b07cae56753fd4c793b832e55096935959019e8c23446a4a3ed886763 SHA512 a4ca773c4f10e60d3413244f0f7599dce9ce740e3e39bffd4bd150b8a5bcbe30f038f85cd4dee05d9495bf9fb69658867a926f5c15415f2647fa18f7c8bf510c
-EBUILD mysql-workbench-8.0.17.ebuild 2626 BLAKE2B f35131ede307c0084de78b4b2c0f131ec9c5e2d01c0a1fb61aa41536333a9605c7f5185c7a9800bfcdf37480632d5240e94b77f986e42f5b546bbbce8e2dd26a SHA512 3a17d3f41be4e6244db474139d76d8a993053df0c57fc0001eb1ed7a43a85c750931a905b5955e99cf2ac64db83b61e5151504a95c9bd115f2f96099afdc9ef2
+EBUILD mysql-workbench-8.0.17.ebuild 2563 BLAKE2B 6a0adebe6937f644d709c55f34017d6ca661517e4424d924fdda4f972c702d7bac081da9a0f869d06873169df9c5066f196e857cb423f63d80286650888a1710 SHA512 2bbab3de08f6cb73c0b606d2a0a19035f3829d28b74a46c257360e21c4c5b0c823f7511193a20d49f4f60acc055c38c117cf9f0aa962e8e09799848ed55f7017
MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
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 937637fa44f7..000000000000
--- 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//' 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
-}
-
-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}
- -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-utils_src_configure
-}
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 885387e35cc7..10955e2f43b5 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
"