Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/
Date: Sat, 03 Aug 2019 05:47:10
Message-Id: 1564810805.6f63f3cc045d889ac00fc65ff997266c989aa493.graaff@gentoo
1 commit: 6f63f3cc045d889ac00fc65ff997266c989aa493
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 3 05:40:05 2019 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 3 05:40:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f63f3cc
7
8 dev-db/mysql-workbench: cleanup
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.16
11 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
12
13 dev-db/mysql-workbench/Manifest | 1 -
14 .../mysql-workbench/mysql-workbench-8.0.14.ebuild | 109 ---------------------
15 2 files changed, 110 deletions(-)
16
17 diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
18 index 769fac0237c..42c7197df33 100644
19 --- a/dev-db/mysql-workbench/Manifest
20 +++ b/dev-db/mysql-workbench/Manifest
21 @@ -1,4 +1,3 @@
22 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
23 -DIST mysql-workbench-community-8.0.14-src.tar.gz 15631739 BLAKE2B f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4 SHA512 fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71
24 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9 SHA512 e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
25 DIST mysql-workbench-community-8.0.17-src.tar.gz 15777302 BLAKE2B ba1aebfc5f9b55e88529bdbc5ebe42da594fce1da0ea64bd0153294293fe4c2533bbc00aac9c1ba0942577eff90c1b522ef1af803e56edf0c361876ac5dea764 SHA512 c7b5f68e4a2fe30d33fde5f18a03342e034a8c10edc2506278dc09751f264884f1dba3d68c430594ac09d26b692465409d2189c2b2a440d80aca7ad00188a39f
26
27 diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
28 deleted file mode 100644
29 index 937637fa44f..00000000000
30 --- a/dev-db/mysql-workbench/mysql-workbench-8.0.14.ebuild
31 +++ /dev/null
32 @@ -1,109 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -GCONF_DEBUG="no"
38 -
39 -PYTHON_COMPAT=( python2_7 )
40 -PYTHON_REQ_USE="sqlite"
41 -
42 -inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
43 -
44 -MY_P="${PN}-community-${PV}-src"
45 -
46 -DESCRIPTION="MySQL Workbench"
47 -HOMEPAGE="https://www.mysql.com/products/workbench/"
48 -SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz http://www.antlr.org/download/antlr-4.7.1-complete.jar"
49 -
50 -LICENSE="GPL-2"
51 -SLOT="0"
52 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
53 -IUSE="debug doc gnome-keyring"
54 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
55 -
56 -# glibc: deprecated mutex functions, removed in 2.36.0
57 -CDEPEND="${PYTHON_DEPS}
58 - app-crypt/libsecret
59 - dev-libs/glib:2
60 - dev-cpp/antlr-cpp:4
61 - dev-cpp/atkmm
62 - dev-cpp/pangomm
63 - >=dev-cpp/glibmm-2.14:2
64 - dev-cpp/gtkmm:3.0
65 - dev-libs/atk
66 - >=net-libs/libssh-0.7.3[server]
67 - x11-libs/pango
68 - x11-libs/gtk+:3
69 - gnome-base/libglade:2.0
70 - >=x11-libs/cairo-1.5.12[glib,svg]
71 - dev-libs/libsigc++:2
72 - >=dev-libs/boost-1.55.0[nls]
73 - >=dev-cpp/ctemplate-0.95
74 - >=dev-libs/libxml2-2.6.2:2
75 - dev-libs/libzip
76 - dev-libs/libpcre[cxx]
77 - >=sci-libs/gdal-1.11.1-r1[-mdb]
78 - virtual/opengl
79 - || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
80 - dev-libs/tinyxml[stl]
81 - >=dev-db/mysql-connector-c++-1.1.8
82 - dev-db/vsqlite++
83 - || ( dev-db/libiodbc dev-db/unixODBC )
84 - gnome-keyring? ( gnome-base/libgnome-keyring )
85 - dev-python/pexpect
86 - >=dev-python/paramiko-1.7.4
87 -"
88 -
89 -RDEPEND="${CDEPEND}
90 - app-admin/sudo
91 - >=sys-apps/net-tools-1.60_p20120127084908"
92 -
93 -DEPEND="${CDEPEND}
94 - dev-lang/swig
95 - virtual/jre
96 - virtual/pkgconfig"
97 -
98 -S="${WORKDIR}"/"${MY_P}"
99 -
100 -PATCHES=(
101 - "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
102 - "${FILESDIR}/${PN}-6.3.10-i386-json.patch"
103 -)
104 -
105 -src_unpack() {
106 - unpack ${PN}-community-${PV}-src.tar.gz
107 -}
108 -
109 -src_prepare() {
110 - sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \
111 - modules/db.mysql.sqlparser/CMakeLists.txt
112 -
113 - ## remove hardcoded CXXFLAGS
114 - sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
115 - ## And avoid -Werror
116 - sed -i -e 's/-Werror//' CMakeLists.txt || die
117 -
118 - ## package is very fragile...
119 - strip-flags
120 -
121 - cmake-utils_src_prepare
122 -}
123 -
124 -src_configure() {
125 - if has_version dev-db/libiodbc ; then
126 - IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
127 - fi
128 -
129 - append-cxxflags -std=c++11
130 - ANTLR_JAR_PATH="${DISTDIR}/antlr-4.7.1-complete.jar"
131 - local mycmakeargs=(
132 - -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
133 - -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
134 - -DIODBC_INCLUDE_PATH="/usr/include/iodbc"
135 - ${IODBC}
136 - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
137 - -DPYTHON_LIBRARY="$(python_get_library_path)"
138 - -DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
139 - )
140 - cmake-utils_src_configure
141 -}