1 |
commit: 59bc3db78c609a01db5e773f55bad299e639e7ea |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 19 18:56:45 2020 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 19 18:58:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59bc3db7 |
7 |
|
8 |
dev-db/mysql-workbench: cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
12 |
|
13 |
dev-db/mysql-workbench/Manifest | 2 - |
14 |
.../mysql-workbench/mysql-workbench-8.0.17.ebuild | 108 --------------------- |
15 |
.../mysql-workbench/mysql-workbench-8.0.18.ebuild | 108 --------------------- |
16 |
3 files changed, 218 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest |
19 |
index 3731ef7626a..bca6c1ddbee 100644 |
20 |
--- a/dev-db/mysql-workbench/Manifest |
21 |
+++ b/dev-db/mysql-workbench/Manifest |
22 |
@@ -1,5 +1,3 @@ |
23 |
DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1 |
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 |
-DIST mysql-workbench-community-8.0.18-src.tar.gz 15513209 BLAKE2B decacee6ff3e30435fd0d198dc6efd95bf1342318adda977de64afda68d0c982de27dc8a811422f8ecf66a4436b406b63a2ab6c1c5541febdcacd79961a34574 SHA512 dbc633a74bc5ce5b46de410b52cb1bd7a81ebc21d57ae75ccd5b50476b557e412f6e21820fb9cc0f499dbcfb28a6975d2fe86531eeccfb90b674ffc6512319db |
27 |
DIST mysql-workbench-community-8.0.19-src.tar.gz 19391463 BLAKE2B f9374c234a75851784c940f8288a783ee1c02fe4be2973b174a0d3768a60dd5318ceea7d2dacb083376c83c33bed8fca02768bcf4f3b8ba6284ca78fc7910cfe SHA512 986a34328ec3b9aba1532cfd8792fb970fe3c71eda577988a17a6bca25e783a520878067acd097a74ca3f274f02d271af16d7d6beb6970bca48332721021eebc |
28 |
|
29 |
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild |
30 |
deleted file mode 100644 |
31 |
index a6b3052b682..00000000000 |
32 |
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.17.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,108 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
-GCONF_DEBUG="no" |
40 |
- |
41 |
-PYTHON_COMPAT=( python2_7 ) |
42 |
-PYTHON_REQ_USE="sqlite" |
43 |
- |
44 |
-ANTLR_VERSION=4.7.1 |
45 |
- |
46 |
-inherit gnome2 flag-o-matic python-single-r1 cmake-utils |
47 |
- |
48 |
-MY_P="${PN}-community-${PV}-src" |
49 |
- |
50 |
-DESCRIPTION="MySQL Workbench" |
51 |
-HOMEPAGE="https://www.mysql.com/products/workbench/" |
52 |
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz |
53 |
- https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar" |
54 |
- |
55 |
-LICENSE="GPL-2" |
56 |
-SLOT="0" |
57 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
58 |
-IUSE="debug doc" |
59 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
60 |
- |
61 |
-# glibc: deprecated mutex functions, removed in 2.36.0 |
62 |
-CDEPEND="${PYTHON_DEPS} |
63 |
- app-crypt/libsecret |
64 |
- dev-libs/glib:2 |
65 |
- dev-cpp/antlr-cpp:4 |
66 |
- dev-cpp/atkmm |
67 |
- dev-cpp/pangomm |
68 |
- >=dev-cpp/glibmm-2.14:2 |
69 |
- dev-cpp/gtkmm:3.0 |
70 |
- dev-libs/atk |
71 |
- >=net-libs/libssh-0.8.5[server] |
72 |
- x11-libs/pango |
73 |
- x11-libs/gtk+:3 |
74 |
- gnome-base/libglade:2.0 |
75 |
- >=x11-libs/cairo-1.5.12[glib,svg] |
76 |
- dev-libs/libsigc++:2 |
77 |
- >=dev-libs/boost-1.55.0[nls] |
78 |
- >=dev-cpp/ctemplate-0.95 |
79 |
- >=dev-libs/libxml2-2.6.2:2 |
80 |
- dev-libs/libzip |
81 |
- dev-libs/libpcre[cxx] |
82 |
- >=sci-libs/gdal-1.11.1-r1 |
83 |
- virtual/opengl |
84 |
- || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) |
85 |
- dev-libs/tinyxml[stl] |
86 |
- >=dev-db/mysql-connector-c++-1.1.8 |
87 |
- dev-db/vsqlite++ |
88 |
- || ( dev-db/libiodbc dev-db/unixODBC ) |
89 |
- dev-python/pexpect |
90 |
- >=dev-python/paramiko-1.7.4 |
91 |
-" |
92 |
- |
93 |
-RDEPEND="${CDEPEND} |
94 |
- app-admin/sudo |
95 |
- >=sys-apps/net-tools-1.60_p20120127084908" |
96 |
- |
97 |
-DEPEND="${CDEPEND} |
98 |
- dev-lang/swig |
99 |
- virtual/jre |
100 |
- virtual/pkgconfig" |
101 |
- |
102 |
-S="${WORKDIR}"/"${MY_P}" |
103 |
- |
104 |
-PATCHES=( |
105 |
- "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" |
106 |
- "${FILESDIR}/${PN}-6.3.10-i386-json.patch" |
107 |
-) |
108 |
- |
109 |
-src_unpack() { |
110 |
- unpack ${PN}-community-${PV}-src.tar.gz |
111 |
-} |
112 |
- |
113 |
-src_prepare() { |
114 |
- ## remove hardcoded CXXFLAGS |
115 |
- sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die |
116 |
- ## And avoid -Werror |
117 |
- sed -i -e 's/-Werror//' CMakeLists.txt || die |
118 |
- |
119 |
- ## package is very fragile... |
120 |
- strip-flags |
121 |
- |
122 |
- cmake-utils_src_prepare |
123 |
-} |
124 |
- |
125 |
-src_configure() { |
126 |
- if has_version dev-db/libiodbc ; then |
127 |
- IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config" |
128 |
- fi |
129 |
- |
130 |
- append-cxxflags -std=c++11 |
131 |
- ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar" |
132 |
- local mycmakeargs=( |
133 |
- -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH} |
134 |
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)" |
135 |
- -DIODBC_INCLUDE_PATH="/usr/include/iodbc" |
136 |
- ${IODBC} |
137 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
138 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
139 |
- -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" |
140 |
- ) |
141 |
- cmake-utils_src_configure |
142 |
-} |
143 |
|
144 |
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild |
145 |
deleted file mode 100644 |
146 |
index faddecba8cf..00000000000 |
147 |
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild |
148 |
+++ /dev/null |
149 |
@@ -1,108 +0,0 @@ |
150 |
-# Copyright 1999-2020 Gentoo Authors |
151 |
-# Distributed under the terms of the GNU General Public License v2 |
152 |
- |
153 |
-EAPI=6 |
154 |
-GCONF_DEBUG="no" |
155 |
- |
156 |
-PYTHON_COMPAT=( python2_7 ) |
157 |
-PYTHON_REQ_USE="sqlite" |
158 |
- |
159 |
-ANTLR_VERSION=4.7.1 |
160 |
- |
161 |
-inherit gnome2 flag-o-matic python-single-r1 cmake-utils |
162 |
- |
163 |
-MY_P="${PN}-community-${PV}-src" |
164 |
- |
165 |
-DESCRIPTION="MySQL Workbench" |
166 |
-HOMEPAGE="https://www.mysql.com/products/workbench/" |
167 |
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz |
168 |
- https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar" |
169 |
- |
170 |
-LICENSE="GPL-2" |
171 |
-SLOT="0" |
172 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
173 |
-IUSE="debug doc" |
174 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
175 |
- |
176 |
-# glibc: deprecated mutex functions, removed in 2.36.0 |
177 |
-CDEPEND="${PYTHON_DEPS} |
178 |
- app-crypt/libsecret |
179 |
- dev-libs/glib:2 |
180 |
- dev-cpp/antlr-cpp:4 |
181 |
- dev-cpp/atkmm |
182 |
- dev-cpp/pangomm |
183 |
- >=dev-cpp/glibmm-2.14:2 |
184 |
- dev-cpp/gtkmm:3.0 |
185 |
- dev-libs/atk |
186 |
- >=net-libs/libssh-0.8.5[server] |
187 |
- x11-libs/pango |
188 |
- x11-libs/gtk+:3 |
189 |
- gnome-base/libglade:2.0 |
190 |
- >=x11-libs/cairo-1.5.12[glib,svg] |
191 |
- >=dev-libs/rapidjson-1.1.0 |
192 |
- dev-libs/libsigc++:2 |
193 |
- >=dev-libs/boost-1.55.0[nls] |
194 |
- >=dev-cpp/ctemplate-0.95 |
195 |
- >=dev-libs/libxml2-2.6.2:2 |
196 |
- dev-libs/libzip |
197 |
- dev-libs/libpcre[cxx] |
198 |
- >=sci-libs/gdal-1.11.1-r1 |
199 |
- virtual/opengl |
200 |
- || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) |
201 |
- dev-libs/tinyxml[stl] |
202 |
- >=dev-db/mysql-connector-c++-1.1.8 |
203 |
- dev-db/vsqlite++ |
204 |
- || ( dev-db/libiodbc dev-db/unixODBC ) |
205 |
- dev-python/pexpect |
206 |
- >=dev-python/paramiko-1.7.4 |
207 |
-" |
208 |
- |
209 |
-RDEPEND="${CDEPEND} |
210 |
- app-admin/sudo |
211 |
- >=sys-apps/net-tools-1.60_p20120127084908" |
212 |
- |
213 |
-DEPEND="${CDEPEND} |
214 |
- dev-lang/swig |
215 |
- virtual/jre |
216 |
- virtual/pkgconfig" |
217 |
- |
218 |
-S="${WORKDIR}"/"${MY_P}" |
219 |
- |
220 |
-PATCHES=( |
221 |
- "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" |
222 |
-) |
223 |
- |
224 |
-src_unpack() { |
225 |
- unpack ${PN}-community-${PV}-src.tar.gz |
226 |
-} |
227 |
- |
228 |
-src_prepare() { |
229 |
- ## remove hardcoded CXXFLAGS |
230 |
- sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die |
231 |
- ## And avoid -Werror |
232 |
- sed -i -e 's/-Werror//' CMakeLists.txt || die |
233 |
- |
234 |
- ## package is very fragile... |
235 |
- strip-flags |
236 |
- |
237 |
- cmake-utils_src_prepare |
238 |
-} |
239 |
- |
240 |
-src_configure() { |
241 |
- if has_version dev-db/libiodbc ; then |
242 |
- IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config" |
243 |
- fi |
244 |
- |
245 |
- append-cxxflags -std=c++11 |
246 |
- ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar" |
247 |
- local mycmakeargs=( |
248 |
- -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH} |
249 |
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)" |
250 |
- -DIODBC_INCLUDE_PATH="/usr/include/iodbc" |
251 |
- ${IODBC} |
252 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
253 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
254 |
- -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" |
255 |
- ) |
256 |
- cmake-utils_src_configure |
257 |
-} |