1 |
commit: 56f2aae74056ef06246f2e45bce384f2c04b986d |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 11 09:50:13 2018 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 11 09:50:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f2aae7 |
7 |
|
8 |
dev-db/mysql-workbench: cleanup |
9 |
|
10 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
dev-db/mysql-workbench/Manifest | 1 - |
14 |
.../mysql-workbench-6.3.4-r2.ebuild | 106 --------------------- |
15 |
.../mysql-workbench/mysql-workbench-6.3.9.ebuild | 103 -------------------- |
16 |
3 files changed, 210 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest |
19 |
index 7b8515867ba..9c131354e6e 100644 |
20 |
--- a/dev-db/mysql-workbench/Manifest |
21 |
+++ b/dev-db/mysql-workbench/Manifest |
22 |
@@ -2,5 +2,4 @@ DIST antlr-3.4-complete.jar 2388361 BLAKE2B 561c1dffe464bbc387075df6d95bbdcab273 |
23 |
DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1 |
24 |
DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325 SHA512 f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d |
25 |
DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 BLAKE2B 54941a760cc44b745039a59d0ad88e109605c47285b34098d7ebc9e7a32758027c07219f7b8dc96fad198fbc68086582ccfa5ba7e7a35fa1fff8ff57b467f91f SHA512 8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f |
26 |
-DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 BLAKE2B 0991036cedc3198e789369a40641cc318fdc4230c2b6242b923e836c50248e3e1f5b891c1ce7465d132c30e482ef5458a19ed8b9e4a9865719be8eda61eeb1dc SHA512 a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901 |
27 |
DIST mysql-workbench-community-8.0.13-src.tar.gz 16047080 BLAKE2B c31560a978620ae04210b452bcf90b75e7eb2ec20335470054b2640220ed29c3476f5ee1bacd86575f9b42481de5452e94b8d7a5e8f56eb17ea0770be19dc296 SHA512 d6f7aeb85e1bb59474d432f8088fd5603e5b539f3fce9c78db2aeaa8de3bc9356de09a6486138e07a29dd62b971e7601cce12a2e4a9f7309364081ee5db4b55d |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index 84f314bf012..00000000000 |
32 |
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,106 +0,0 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=5 |
39 |
-GCONF_DEBUG="no" |
40 |
- |
41 |
-PYTHON_COMPAT=( python2_7 ) |
42 |
-PYTHON_REQ_USE="sqlite" |
43 |
- |
44 |
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils |
45 |
- |
46 |
-MY_P="${PN}-community-${PV}-src" |
47 |
- |
48 |
-DESCRIPTION="MySQL Workbench" |
49 |
-HOMEPAGE="http://dev.mysql.com/workbench/" |
50 |
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
55 |
-IUSE="debug doc gnome-keyring" |
56 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
57 |
- |
58 |
-# glibc: deprecated mutex functions, removed in 2.36.0 |
59 |
-CDEPEND="${PYTHON_DEPS} |
60 |
- dev-libs/glib:2 |
61 |
- dev-cpp/atkmm |
62 |
- dev-cpp/pangomm |
63 |
- >=dev-cpp/glibmm-2.14:2 |
64 |
- >=dev-cpp/gtkmm-2.14:2.4 |
65 |
- dev-libs/atk |
66 |
- x11-libs/pango |
67 |
- >=x11-libs/gtk+-2.20:2 |
68 |
- gnome-base/libglade:2.0 |
69 |
- >=x11-libs/cairo-1.5.12[glib,svg] |
70 |
- dev-libs/libsigc++:2 |
71 |
- >=dev-libs/boost-1.55.0[nls] |
72 |
- >=dev-cpp/ctemplate-0.95 |
73 |
- >=dev-libs/libxml2-2.6.2:2 |
74 |
- dev-libs/libzip |
75 |
- >=virtual/mysql-5.1 |
76 |
- dev-libs/libpcre[cxx] |
77 |
- >=sci-libs/gdal-1.11.1-r1[-mdb] |
78 |
- virtual/opengl |
79 |
- >=dev-lang/lua-5.1:0[deprecated] |
80 |
- || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) |
81 |
- dev-libs/tinyxml[stl] |
82 |
- dev-db/mysql-connector-c++ |
83 |
- dev-db/vsqlite++ |
84 |
- || ( dev-db/libiodbc dev-db/unixODBC ) |
85 |
- gnome-keyring? ( gnome-base/libgnome-keyring ) |
86 |
- dev-python/pexpect |
87 |
- >=dev-python/paramiko-1.7.4 |
88 |
- " |
89 |
- |
90 |
-# lua perhaps no longer needed? Was used via libgrt only |
91 |
- |
92 |
-RDEPEND="${CDEPEND} |
93 |
- app-admin/sudo |
94 |
- >=sys-apps/net-tools-1.60_p20120127084908" |
95 |
- |
96 |
-DEPEND="${CDEPEND} |
97 |
- dev-lang/swig |
98 |
- virtual/pkgconfig" |
99 |
- |
100 |
-S="${WORKDIR}"/"${MY_P}" |
101 |
- |
102 |
-src_unpack() { |
103 |
- unpack ${PN}-community-${PV}-src.tar.gz |
104 |
-} |
105 |
- |
106 |
-src_prepare() { |
107 |
- ## Patch CMakeLists.txt |
108 |
- epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \ |
109 |
- "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \ |
110 |
- "${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \ |
111 |
- "${FILESDIR}/${PN}-6.3.4-cxx11.patch" \ |
112 |
- "${FILESDIR}/${PN}-6.3.4-gtk.patch" |
113 |
- |
114 |
- sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \ |
115 |
- modules/db.mysql.sqlparser/CMakeLists.txt |
116 |
- |
117 |
- ## remove hardcoded CXXFLAGS |
118 |
- sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die |
119 |
- |
120 |
- ## package is very fragile... |
121 |
- strip-flags |
122 |
- |
123 |
- cmake-utils_src_prepare |
124 |
-} |
125 |
- |
126 |
-src_configure() { |
127 |
- append-cxxflags -std=c++11 |
128 |
- local mycmakeargs=( |
129 |
- $(cmake-utils_use_use gnome-keyring GNOME_KEYRING) |
130 |
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)" |
131 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
132 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
133 |
- ) |
134 |
- cmake-utils_src_configure |
135 |
-} |
136 |
- |
137 |
-src_compile() { |
138 |
- # Work around parallel build issues, bug 507838 |
139 |
- cmake-utils_src_compile -j1 |
140 |
-} |
141 |
|
142 |
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild |
143 |
deleted file mode 100644 |
144 |
index efa53cd769f..00000000000 |
145 |
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild |
146 |
+++ /dev/null |
147 |
@@ -1,103 +0,0 @@ |
148 |
-# Copyright 1999-2017 Gentoo Foundation |
149 |
-# Distributed under the terms of the GNU General Public License v2 |
150 |
- |
151 |
-EAPI=6 |
152 |
-GCONF_DEBUG="no" |
153 |
- |
154 |
-PYTHON_COMPAT=( python2_7 ) |
155 |
-PYTHON_REQ_USE="sqlite" |
156 |
- |
157 |
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils |
158 |
- |
159 |
-MY_P="${PN}-community-${PV}-src" |
160 |
- |
161 |
-DESCRIPTION="MySQL Workbench" |
162 |
-HOMEPAGE="https://www.mysql.com/products/workbench/" |
163 |
-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" |
164 |
- |
165 |
-LICENSE="GPL-2" |
166 |
-SLOT="0" |
167 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
168 |
-IUSE="debug doc gnome-keyring" |
169 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
170 |
- |
171 |
-# glibc: deprecated mutex functions, removed in 2.36.0 |
172 |
-CDEPEND="${PYTHON_DEPS} |
173 |
- dev-libs/glib:2 |
174 |
- dev-cpp/atkmm |
175 |
- dev-cpp/pangomm |
176 |
- >=dev-cpp/glibmm-2.14:2 |
177 |
- dev-cpp/gtkmm:3.0 |
178 |
- dev-libs/atk |
179 |
- x11-libs/pango |
180 |
- x11-libs/gtk+:3 |
181 |
- gnome-base/libglade:2.0 |
182 |
- >=x11-libs/cairo-1.5.12[glib,svg] |
183 |
- dev-libs/libsigc++:2 |
184 |
- >=dev-libs/boost-1.55.0[nls] |
185 |
- >=dev-cpp/ctemplate-0.95 |
186 |
- >=dev-libs/libxml2-2.6.2:2 |
187 |
- dev-libs/libzip |
188 |
- >=virtual/mysql-5.6 |
189 |
- dev-libs/libpcre[cxx] |
190 |
- >=sci-libs/gdal-1.11.1-r1[-mdb] |
191 |
- virtual/opengl |
192 |
- || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) |
193 |
- dev-libs/tinyxml[stl] |
194 |
- >=dev-db/mysql-connector-c++-1.1.8 |
195 |
- dev-db/vsqlite++ |
196 |
- || ( dev-db/libiodbc dev-db/unixODBC ) |
197 |
- gnome-keyring? ( gnome-base/libgnome-keyring ) |
198 |
- dev-python/pexpect |
199 |
- >=dev-python/paramiko-1.7.4 |
200 |
- " |
201 |
- |
202 |
-RDEPEND="${CDEPEND} |
203 |
- app-admin/sudo |
204 |
- >=sys-apps/net-tools-1.60_p20120127084908" |
205 |
- |
206 |
-DEPEND="${CDEPEND} |
207 |
- dev-lang/swig |
208 |
- virtual/jre |
209 |
- virtual/pkgconfig" |
210 |
- |
211 |
-S="${WORKDIR}"/"${MY_P}" |
212 |
- |
213 |
-PATCHES=( |
214 |
- "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" |
215 |
- "${FILESDIR}/${PN}-6.3.9-mariadb-json.patch" |
216 |
-) |
217 |
- |
218 |
-src_unpack() { |
219 |
- unpack ${PN}-community-${PV}-src.tar.gz |
220 |
-} |
221 |
- |
222 |
-src_prepare() { |
223 |
- sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \ |
224 |
- modules/db.mysql.sqlparser/CMakeLists.txt |
225 |
- |
226 |
- ## remove hardcoded CXXFLAGS |
227 |
- sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die |
228 |
- |
229 |
- ## package is very fragile... |
230 |
- strip-flags |
231 |
- |
232 |
- cmake-utils_src_prepare |
233 |
-} |
234 |
- |
235 |
-src_configure() { |
236 |
- append-cxxflags -std=c++11 |
237 |
- local mycmakeargs=( |
238 |
- -DUSE_GNOME_KEYRING="$(usex gnome-keyring)" |
239 |
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)" |
240 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
241 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
242 |
- -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" |
243 |
- ) |
244 |
- ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure |
245 |
-} |
246 |
- |
247 |
-src_compile() { |
248 |
- # Work around parallel build issues, bug 507838 |
249 |
- cmake-utils_src_compile -j1 |
250 |
-} |