commit:     56f2aae74056ef06246f2e45bce384f2c04b986d
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 09:50:13 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 09:50:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f2aae7

dev-db/mysql-workbench: cleanup

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/mysql-workbench/Manifest                    |   1 -
 .../mysql-workbench-6.3.4-r2.ebuild                | 106 ---------------------
 .../mysql-workbench/mysql-workbench-6.3.9.ebuild   | 103 --------------------
 3 files changed, 210 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 7b8515867ba..9c131354e6e 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -2,5 +2,4 @@ DIST antlr-3.4-complete.jar 2388361 BLAKE2B 
561c1dffe464bbc387075df6d95bbdcab273
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 
57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325
 SHA512 
f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 BLAKE2B 
54941a760cc44b745039a59d0ad88e109605c47285b34098d7ebc9e7a32758027c07219f7b8dc96fad198fbc68086582ccfa5ba7e7a35fa1fff8ff57b467f91f
 SHA512 
8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
-DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 BLAKE2B 
0991036cedc3198e789369a40641cc318fdc4230c2b6242b923e836c50248e3e1f5b891c1ce7465d132c30e482ef5458a19ed8b9e4a9865719be8eda61eeb1dc
 SHA512 
a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901
 DIST mysql-workbench-community-8.0.13-src.tar.gz 16047080 BLAKE2B 
c31560a978620ae04210b452bcf90b75e7eb2ec20335470054b2640220ed29c3476f5ee1bacd86575f9b42481de5452e94b8d7a5e8f56eb17ea0770be19dc296
 SHA512 
d6f7aeb85e1bb59474d432f8088fd5603e5b539f3fce9c78db2aeaa8de3bc9356de09a6486138e07a29dd62b971e7601cce12a2e4a9f7309364081ee5db4b55d

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
deleted file mode 100644
index 84f314bf012..00000000000
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="http://dev.mysql.com/workbench/";
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-               dev-libs/glib:2
-               dev-cpp/atkmm
-               dev-cpp/pangomm
-               >=dev-cpp/glibmm-2.14:2
-               >=dev-cpp/gtkmm-2.14:2.4
-               dev-libs/atk
-               x11-libs/pango
-               >=x11-libs/gtk+-2.20:2
-               gnome-base/libglade:2.0
-               >=x11-libs/cairo-1.5.12[glib,svg]
-               dev-libs/libsigc++:2
-               >=dev-libs/boost-1.55.0[nls]
-               >=dev-cpp/ctemplate-0.95
-               >=dev-libs/libxml2-2.6.2:2
-               dev-libs/libzip
-               >=virtual/mysql-5.1
-               dev-libs/libpcre[cxx]
-               >=sci-libs/gdal-1.11.1-r1[-mdb]
-               virtual/opengl
-               >=dev-lang/lua-5.1:0[deprecated]
-               || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-               dev-libs/tinyxml[stl]
-               dev-db/mysql-connector-c++
-               dev-db/vsqlite++
-               || ( dev-db/libiodbc dev-db/unixODBC )
-               gnome-keyring? ( gnome-base/libgnome-keyring )
-                       dev-python/pexpect
-                       >=dev-python/paramiko-1.7.4
-       "
-
-# lua perhaps no longer needed? Was used via libgrt only
-
-RDEPEND="${CDEPEND}
-               app-admin/sudo
-               >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-               dev-lang/swig
-               virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-src_unpack() {
-       unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-       ## Patch CMakeLists.txt
-       epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
-               "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
-               "${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \
-               "${FILESDIR}/${PN}-6.3.4-cxx11.patch" \
-               "${FILESDIR}/${PN}-6.3.4-gtk.patch"
-
-       sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt 
sqlparser/' \
-               modules/db.mysql.sqlparser/CMakeLists.txt
-
-       ## remove hardcoded CXXFLAGS
-       sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-
-       ## package is very fragile...
-       strip-flags
-
-       cmake-utils_src_prepare
-}
-
-src_configure() {
-       append-cxxflags -std=c++11
-       local mycmakeargs=(
-               $(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
-               -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-               -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-               -DPYTHON_LIBRARY="$(python_get_library_path)"
-       )
-       cmake-utils_src_configure
-}
-
-src_compile() {
-       # Work around parallel build issues, bug 507838
-       cmake-utils_src_compile -j1
-}

diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
deleted file mode 100644
index efa53cd769f..00000000000
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.9.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/";
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-               dev-libs/glib:2
-               dev-cpp/atkmm
-               dev-cpp/pangomm
-               >=dev-cpp/glibmm-2.14:2
-               dev-cpp/gtkmm:3.0
-               dev-libs/atk
-               x11-libs/pango
-               x11-libs/gtk+:3
-               gnome-base/libglade:2.0
-               >=x11-libs/cairo-1.5.12[glib,svg]
-               dev-libs/libsigc++:2
-               >=dev-libs/boost-1.55.0[nls]
-               >=dev-cpp/ctemplate-0.95
-               >=dev-libs/libxml2-2.6.2:2
-               dev-libs/libzip
-               >=virtual/mysql-5.6
-               dev-libs/libpcre[cxx]
-               >=sci-libs/gdal-1.11.1-r1[-mdb]
-               virtual/opengl
-               || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-               dev-libs/tinyxml[stl]
-               >=dev-db/mysql-connector-c++-1.1.8
-               dev-db/vsqlite++
-               || ( dev-db/libiodbc dev-db/unixODBC )
-               gnome-keyring? ( gnome-base/libgnome-keyring )
-                       dev-python/pexpect
-                       >=dev-python/paramiko-1.7.4
-       "
-
-RDEPEND="${CDEPEND}
-               app-admin/sudo
-               >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-               dev-lang/swig
-               virtual/jre
-               virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-       "${FILESDIR}/${PN}-6.3.9-mariadb-json.patch"
-)
-
-src_unpack() {
-       unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-       sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt 
sqlparser/' \
-               modules/db.mysql.sqlparser/CMakeLists.txt
-
-       ## remove hardcoded CXXFLAGS
-       sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-
-       ## package is very fragile...
-       strip-flags
-
-       cmake-utils_src_prepare
-}
-
-src_configure() {
-       append-cxxflags -std=c++11
-       local mycmakeargs=(
-               -DUSE_GNOME_KEYRING="$(usex gnome-keyring)"
-               -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-               -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-               -DPYTHON_LIBRARY="$(python_get_library_path)"
-               -DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
-       )
-       ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" 
cmake-utils_src_configure
-}
-
-src_compile() {
-       # Work around parallel build issues, bug 507838
-       cmake-utils_src_compile -j1
-}

Reply via email to