1 |
commit: 6c15963409434a6e20301eba2a9ce28c9ee9d212 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 5 17:54:29 2019 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 5 17:56:14 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c159634 |
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.66, Repoman-2.3.11 |
12 |
|
13 |
dev-db/mysql-workbench/Manifest | 2 - |
14 |
.../mysql-workbench/mysql-workbench-6.3.10.ebuild | 111 --------------------- |
15 |
2 files changed, 113 deletions(-) |
16 |
|
17 |
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest |
18 |
index a10abf4cc3e..6098b250473 100644 |
19 |
--- a/dev-db/mysql-workbench/Manifest |
20 |
+++ b/dev-db/mysql-workbench/Manifest |
21 |
@@ -1,6 +1,4 @@ |
22 |
-DIST antlr-3.4-complete.jar 2388361 BLAKE2B 561c1dffe464bbc387075df6d95bbdcab27315ba5679cfa10f85d6449baad3d05f4daa45af93d9b127d9fedb8c7e44c45537f1a84b4c4d877c40b9812620f669 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 |
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-8.0.14-src.tar.gz 15631739 BLAKE2B f37dbe83ecc642d08dc4996e343944b4f1c1c00a84d581ce79944d7f431910cd89b0c53fda14e8ff4c912ed8a1eaab517710d24e0bef89f2ed566d0d5f0730e4 SHA512 fc09bb73692956b40b003e23c9b6b6b710082c98393ad4de988dc4f4d5c78d7476a7f56f7fa5d201bf5a267643b13a30db385016fe800b57893355b9225aaf71 |
26 |
DIST mysql-workbench-community-8.0.15-src.tar.gz 15631418 BLAKE2B 4bfea1e4dbdda2bef856bd1601d85a1196052d7abc253eb1e291a5d2b5a6b807875e0367a6e542975a12529d142695c1b45f9f1b9b8e094cdf6183f1b1b11b43 SHA512 f6b1dedd0fd97aae0da04fb5a7ebaac980753386f10588dcec2c77fdf5832caf4ee10f277d338f74a1551d8071b17ae4724386e7e62e2bf8421377b304c31055 |
27 |
DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9 SHA512 e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9 |
28 |
|
29 |
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild |
30 |
deleted file mode 100644 |
31 |
index 772ccb85d54..00000000000 |
32 |
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,111 +0,0 @@ |
35 |
-# Copyright 1999-2018 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 |
-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="https://www.mysql.com/products/workbench/" |
50 |
-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" |
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:3.0 |
65 |
- dev-libs/atk |
66 |
- x11-libs/pango |
67 |
- x11-libs/gtk+:3 |
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 |
- dev-libs/libpcre[cxx] |
76 |
- >=sci-libs/gdal-1.11.1-r1[-mdb] |
77 |
- virtual/opengl |
78 |
- || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) |
79 |
- dev-libs/tinyxml[stl] |
80 |
- >=dev-db/mysql-connector-c++-1.1.8 |
81 |
- dev-db/vsqlite++ |
82 |
- || ( dev-db/libiodbc dev-db/unixODBC ) |
83 |
- gnome-keyring? ( gnome-base/libgnome-keyring ) |
84 |
- dev-python/pexpect |
85 |
- >=dev-python/paramiko-1.7.4 |
86 |
- " |
87 |
- |
88 |
-RDEPEND="${CDEPEND} |
89 |
- app-admin/sudo |
90 |
- >=sys-apps/net-tools-1.60_p20120127084908" |
91 |
- |
92 |
-DEPEND="${CDEPEND} |
93 |
- dev-lang/swig |
94 |
- virtual/jre |
95 |
- virtual/pkgconfig" |
96 |
- |
97 |
-S="${WORKDIR}"/"${MY_P}" |
98 |
- |
99 |
-PATCHES=( |
100 |
- "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" |
101 |
- "${FILESDIR}/${PN}-6.3.9-mariadb-json.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 |
- local mycmakeargs=( |
131 |
- -DUSE_GNOME_KEYRING="$(usex gnome-keyring)" |
132 |
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)" |
133 |
- -DIODBC_INCLUDE_PATH="/usr/include/iodbc" |
134 |
- ${IODBC} |
135 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
136 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
137 |
- -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" |
138 |
- ) |
139 |
- ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure |
140 |
-} |
141 |
- |
142 |
-src_compile() { |
143 |
- # Work around parallel build issues, bug 507838 |
144 |
- cmake-utils_src_compile -j1 |
145 |
-} |