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: Fri, 02 Dec 2022 08:30:20
Message-Id: 1669969808.45c3f6245bfed29baa59febb10acb658c0886f99.graaff@gentoo
1 commit: 45c3f6245bfed29baa59febb10acb658c0886f99
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 2 08:10:54 2022 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 2 08:30:08 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c3f624
7
8 dev-db/mysql-workbench: drop 8.0.28-r1, 8.0.30-r1
9
10 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
11
12 dev-db/mysql-workbench/Manifest | 2 -
13 .../mysql-workbench-8.0.28-r1.ebuild | 111 ---------------------
14 .../mysql-workbench-8.0.30-r1.ebuild | 111 ---------------------
15 3 files changed, 224 deletions(-)
16
17 diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
18 index 077605c3b94c..56ea1faaeb9c 100644
19 --- a/dev-db/mysql-workbench/Manifest
20 +++ b/dev-db/mysql-workbench/Manifest
21 @@ -1,5 +1,3 @@
22 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e SHA512 a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
23 -DIST mysql-workbench-community-8.0.28-src.tar.gz 19275374 BLAKE2B 31930e181888dba0b5dd54509ffa58a9328d12ac2ad080a27715bbcd7fbf347d892175323632e5e7edc2926836427499be5a040ad9c731d9ad5b165a36065d4e SHA512 373f829c6f4ab5e97d277476166144f70f76e32b7443cd5d403dffc10f4fa80ad4dc27bb88b2c564f7c39e5f32045be94eb2b1b9ee2bf560f22d9c4d7fce53e1
24 DIST mysql-workbench-community-8.0.29-src.tar.gz 19353576 BLAKE2B 7562da75534261e128e990e64dbdbe7486bbf7a5d3c777f505178be9f33c6266e2e5c3efcad2cb14fdb53878fc485bbc13dce7f37bc0aaaf114d41e9c86335a7 SHA512 f2ce224154c35ee7076d044ec0db3d23bec466f22361ed5d0cd1f49a34a4aeb963405db6d9bd1923bd176163652a54f0501b53ad34c5c0a999f6a39f137bce3e
25 -DIST mysql-workbench-community-8.0.30-src.tar.gz 19349201 BLAKE2B aea468a2952b45edec4405094a1fbea6c1dd67831222a9255f1b9ce3ce35095dc45946fb6908d1ec60876d592d4f64cc0ebc952bfe81477c4258628ead8b5dab SHA512 195f7dceeb9a0c596c49a3ea6c3a9647763671676bae52e4d21a4dd85eb7d5ca05f78158bfe31bca9217e3cf868d8f335cad0ae3f68357937e951525c5fbf4f0
26 DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548 SHA512 7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a
27
28 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
29 deleted file mode 100644
30 index efc97d50ee5f..000000000000
31 --- a/dev-db/mysql-workbench/mysql-workbench-8.0.28-r1.ebuild
32 +++ /dev/null
33 @@ -1,111 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -GCONF_DEBUG="no"
39 -
40 -PYTHON_COMPAT=( python3_{8,9,10} )
41 -PYTHON_REQ_USE="sqlite"
42 -
43 -ANTLR_VERSION=4.9.1
44 -
45 -inherit gnome2 flag-o-matic python-single-r1 cmake
46 -
47 -MY_P="${PN}-community-${PV}-src"
48 -
49 -DESCRIPTION="MySQL Workbench"
50 -HOMEPAGE="https://www.mysql.com/products/workbench/"
51 -SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
52 - https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
53 -
54 -LICENSE="GPL-2"
55 -SLOT="0"
56 -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
57 -IUSE="debug doc"
58 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
59 -
60 -# glibc: deprecated mutex functions, removed in 2.36.0
61 -CDEPEND="${PYTHON_DEPS}
62 - app-crypt/libsecret
63 - dev-libs/glib:2
64 - dev-cpp/antlr-cpp:4
65 - dev-cpp/atkmm:*
66 - dev-cpp/pangomm:1.4
67 - >=dev-cpp/glibmm-2.14:2
68 - dev-cpp/gtkmm:3.0
69 - dev-libs/atk
70 - >=net-libs/libssh-0.8.5[server]
71 - x11-libs/pango
72 - x11-libs/gtk+:3
73 - gnome-base/libglade:2.0
74 - >=x11-libs/cairo-1.5.12[glib,svg(+)]
75 - >=dev-libs/rapidjson-1.1.0
76 - dev-libs/libsigc++:2
77 - dev-libs/boost[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-fs/e2fsprogs dev-libs/ossp-uuid )
85 - dev-libs/tinyxml[stl]
86 - >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
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}-8.0.19-mysql-connector-8.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 - ## Fix doc install directory
119 - sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
120 -
121 - ## package is very fragile...
122 - strip-flags
123 -
124 - cmake_src_prepare
125 -}
126 -
127 -src_configure() {
128 - if has_version dev-db/libiodbc ; then
129 - IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
130 - fi
131 -
132 - append-cxxflags -std=c++11
133 - ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
134 - local mycmakeargs=(
135 - -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
136 - -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
137 - -DIODBC_INCLUDE_PATH="/usr/include/iodbc"
138 - ${IODBC}
139 - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
140 - -DPYTHON_LIBRARY="$(python_get_library_path)"
141 - -DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
142 - )
143 - cmake_src_configure
144 -}
145
146 diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.30-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.30-r1.ebuild
147 deleted file mode 100644
148 index de5f67463f1a..000000000000
149 --- a/dev-db/mysql-workbench/mysql-workbench-8.0.30-r1.ebuild
150 +++ /dev/null
151 @@ -1,111 +0,0 @@
152 -# Copyright 1999-2022 Gentoo Authors
153 -# Distributed under the terms of the GNU General Public License v2
154 -
155 -EAPI=7
156 -GCONF_DEBUG="no"
157 -
158 -PYTHON_COMPAT=( python3_{8,9,10} )
159 -PYTHON_REQ_USE="sqlite"
160 -
161 -ANTLR_VERSION=4.9.1
162 -
163 -inherit gnome2 flag-o-matic python-single-r1 cmake
164 -
165 -MY_P="${PN}-community-${PV}-src"
166 -
167 -DESCRIPTION="MySQL Workbench"
168 -HOMEPAGE="https://www.mysql.com/products/workbench/"
169 -SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
170 - https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
171 -
172 -LICENSE="GPL-2"
173 -SLOT="0"
174 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
175 -IUSE="debug doc"
176 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
177 -
178 -# glibc: deprecated mutex functions, removed in 2.36.0
179 -CDEPEND="${PYTHON_DEPS}
180 - app-crypt/libsecret
181 - dev-libs/glib:2
182 - dev-cpp/antlr-cpp:4
183 - dev-cpp/atkmm:*
184 - dev-cpp/pangomm:1.4
185 - >=dev-cpp/glibmm-2.14:2
186 - dev-cpp/gtkmm:3.0
187 - dev-libs/atk
188 - >=net-libs/libssh-0.8.5[server]
189 - x11-libs/pango
190 - x11-libs/gtk+:3
191 - gnome-base/libglade:2.0
192 - >=x11-libs/cairo-1.5.12[glib,svg(+)]
193 - >=dev-libs/rapidjson-1.1.0
194 - dev-libs/libsigc++:2
195 - dev-libs/boost[nls]
196 - >=dev-cpp/ctemplate-0.95
197 - >=dev-libs/libxml2-2.6.2:2
198 - dev-libs/libzip
199 - dev-libs/libpcre[cxx]
200 - >=sci-libs/gdal-1.11.1-r1
201 - virtual/opengl
202 - || ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
203 - dev-libs/tinyxml[stl]
204 - >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
205 - dev-db/vsqlite++
206 - || ( dev-db/libiodbc dev-db/unixODBC )
207 - dev-python/pexpect
208 - >=dev-python/paramiko-1.7.4
209 -"
210 -
211 -RDEPEND="${CDEPEND}
212 - app-admin/sudo
213 - >=sys-apps/net-tools-1.60_p20120127084908"
214 -
215 -DEPEND="${CDEPEND}
216 - dev-lang/swig
217 - virtual/jre
218 - virtual/pkgconfig"
219 -
220 -S="${WORKDIR}"/"${MY_P}"
221 -
222 -PATCHES=(
223 - "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
224 - "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
225 -)
226 -
227 -src_unpack() {
228 - unpack ${PN}-community-${PV}-src.tar.gz
229 -}
230 -
231 -src_prepare() {
232 - ## remove hardcoded CXXFLAGS
233 - sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
234 - ## And avoid -Werror
235 - sed -i -e 's/-Werror//' CMakeLists.txt || die
236 - ## Fix doc install directory
237 - sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
238 -
239 - ## package is very fragile...
240 - strip-flags
241 -
242 - cmake_src_prepare
243 -}
244 -
245 -src_configure() {
246 - if has_version dev-db/libiodbc ; then
247 - IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
248 - fi
249 -
250 - append-cxxflags -std=c++11
251 - ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
252 - local mycmakeargs=(
253 - -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
254 - -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
255 - -DIODBC_INCLUDE_PATH="/usr/include/iodbc"
256 - ${IODBC}
257 - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
258 - -DPYTHON_LIBRARY="$(python_get_library_path)"
259 - -DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
260 - )
261 - cmake_src_configure
262 -}