[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/

[Hans de Graaff]

commit:     16ea985198c94e9fcd827b213858639a23f8d00d
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 07:36:39 2021 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 07:36:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ea9851

dev-db/mysql-workbench: cleanup

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

 dev-db/mysql-workbench/Manifest                    |   2 -
 .../mysql-workbench/mysql-workbench-8.0.24.ebuild  | 112 ---------------------
 .../mysql-workbench/mysql-workbench-8.0.25.ebuild  | 111 --------------------
 3 files changed, 225 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 578dc04853e..1dcfffd2120 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,6 +1,4 @@
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e SHA512 a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e SHA512 f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
-DIST mysql-workbench-community-8.0.24-src.tar.gz 19105744 BLAKE2B bc38f18344ba606d29317e5706b6dcd71a29785a3d94d717c21a591c488182595026bb15e1785e57bd56d74b4eb85c87beb5d386dc050ffe2cb2bd4bb7e665bd SHA512 61dd41cd410cde5da4e43e0fcd9e25fdf4b67b831bb40d8facc9450e9bc9446844f397748875a21a839d2612c64d8f8f05eaae21e9a73e419bfa9e14a8fb19e8
-DIST mysql-workbench-community-8.0.25-src.tar.gz 19107324 BLAKE2B aff77a7c216f470d78d3b9f33cc51c70a7b1210c40634c1af75e954ab092efd4d0865afb7869ff52f82434243ed0e2a4ddd48cf55902c9533a32ed2cc183bb33 SHA512 b75e82756a91b9f96d8c0eeece1ef8e8f3a7a1dbe8911d2045b9347fb912215ee0a7dd3ef6d827b78fe748aa9e5ecfaa858d2d3dc08233726c706712f3eac3f1
 DIST mysql-workbench-community-8.0.26-src.tar.gz 19282576 BLAKE2B 4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c SHA512 33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
deleted file mode 100644
index d30a608ba5f..00000000000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-	https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-		app-crypt/libsecret
-		dev-libs/glib:2
-		dev-cpp/antlr-cpp:4
-		dev-cpp/atkmm:*
-		dev-cpp/pangomm:1.4
-		>=dev-cpp/glibmm-2.14:2
-		dev-cpp/gtkmm:3.0
-		dev-libs/atk
-		>=net-libs/libssh-0.8.5[server]
-		x11-libs/pango
-		x11-libs/gtk+:3
-		gnome-base/libglade:2.0
-		>=x11-libs/cairo-1.5.12[glib,svg]
-		>=dev-libs/rapidjson-1.1.0
-		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
-		dev-libs/libpcre[cxx]
-		>=sci-libs/gdal-1.11.1-r1
-		virtual/opengl
-		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-		dev-libs/tinyxml[stl]
-		>=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
-		dev-db/vsqlite++
-		|| ( dev-db/libiodbc dev-db/unixODBC )
-		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}-8.0.19-mysql-connector-8.patch"
-	"${FILESDIR}/${PN}-8.0.24-gcc11-fix.patch"
-)
-
-src_unpack() {
-	unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-	## remove hardcoded CXXFLAGS
-	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-	## And avoid -Werror
-	sed -i -e 's/-Werror//' CMakeLists.txt || die
-	## Fix doc install directory
-	sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-
-	## package is very fragile...
-	strip-flags
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	if has_version dev-db/libiodbc ; then
-		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
-	fi
-
-	append-cxxflags -std=c++11
-	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
-	local mycmakeargs=(
-		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
-		${IODBC}
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
-	)
-	cmake_src_configure
-}

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.25.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.25.ebuild
deleted file mode 100644
index a565f9ac990..00000000000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.25.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.9.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-	https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-		app-crypt/libsecret
-		dev-libs/glib:2
-		dev-cpp/antlr-cpp:4
-		dev-cpp/atkmm:*
-		dev-cpp/pangomm:1.4
-		>=dev-cpp/glibmm-2.14:2
-		dev-cpp/gtkmm:3.0
-		dev-libs/atk
-		>=net-libs/libssh-0.8.5[server]
-		x11-libs/pango
-		x11-libs/gtk+:3
-		gnome-base/libglade:2.0
-		>=x11-libs/cairo-1.5.12[glib,svg]
-		>=dev-libs/rapidjson-1.1.0
-		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
-		dev-libs/libpcre[cxx]
-		>=sci-libs/gdal-1.11.1-r1
-		virtual/opengl
-		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-		dev-libs/tinyxml[stl]
-		>=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
-		dev-db/vsqlite++
-		|| ( dev-db/libiodbc dev-db/unixODBC )
-		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}-8.0.19-mysql-connector-8.patch"
-)
-
-src_unpack() {
-	unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-	## remove hardcoded CXXFLAGS
-	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-	## And avoid -Werror
-	sed -i -e 's/-Werror//' CMakeLists.txt || die
-	## Fix doc install directory
-	sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-
-	## package is very fragile...
-	strip-flags
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	if has_version dev-db/libiodbc ; then
-		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
-	fi
-
-	append-cxxflags -std=c++11
-	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
-	local mycmakeargs=(
-		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
-		${IODBC}
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
-	)
-	cmake_src_configure
-}