gentoo resync : 25.09.2021

3 files changed, 0 insertions, 127 deletions

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 9e9f2f79bacf..cd2b9df5b794 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,10 +1,6 @@
 AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b
 AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b0127664471877bb9cdcda946c35ed7a159646b94891a791a618c77201cc7696d6f2893e95fd78dbc13325cef752740f76e69974e10c0f88084594fb SHA512 09c2349cb42393f6d32f24804e2c3438a5d846fc9611e0684ccf2139fd30b0abcb0f2aa7b205c60a081259e073fb345cd72837dab1a216e6a8aaaba5ec3decf7
-AUX mysql-workbench-8.0.23-findlibssh.patch 633 BLAKE2B 12deef5c346773931fb0f6d37a24cc67d4d0d6079b05cacbcaefc7a8c453f2811a4ea018a5e71390739500d2801cc12889ac2b61346830eff9d348925fdbb88d SHA512 d1d2d7091fad56fb62f29a323df00ae29a7ce5e921a49eb9199363e1113da207872f8f636cba479bc15697b574e54b4cf312aa354f6c050bd1934a523175b79d
-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.26-src.tar.gz 19282576 BLAKE2B 4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c SHA512 33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c
-EBUILD mysql-workbench-8.0.23-r1.ebuild 2780 BLAKE2B 3807d34824ded986c05ea14b52b36c687197e8151f5953fab95cc3aff8884cc12a26f29c348450cc7a3ac8ebb5a29921fa9acef238cc34d54fea33c95260d41a SHA512 827290ce1f2c9b57d2536a9d141d403b4d194c7585e90f3a07fea118c7a5e9592767aecd5bc04e8308d26bb7e9d33f96d46c359c81c6d3ffaa0c64c532b97c9e
 EBUILD mysql-workbench-8.0.26-r1.ebuild 2773 BLAKE2B 79bf4e4144cb9d7704c93290eca97185b78ecec676fef873644305c307ce22e63245e4460e0849db417114c64b9579c03e316fda9c06b74a8fd33ab981b2d1a2 SHA512 5483b9ce7bf2746957451710e89f19de915d2a82c437982d27c5c7d8d190c7050e906b130171830f49a08d7348ec1bcf5eb8bd77a1dc42a4d5f8fe0e370dca05
 MISC metadata.xml 311 BLAKE2B 78ae228a5e7307e8ed03ddab6b38d288bb7811f0a04d460fa13096fd8350b9b097dffcc1fb8e7f173834d49c108e482b8c8fc6ba65ffbaf6697c4e7075167ccd SHA512 72243543b91ee6b5560444cb1082dac192e2b17b5746e52b92076b483e14ced459ac54fad595307a6e7b53f48d1466d81b1ea4c1829d128f7b977fae87a176cc
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch
deleted file mode 100644
index 3f250d78140f..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/cmake/Modules/FindLibSSH.cmake.~1~	2020-12-17 06:22:25.000000000 +0100
-+++ b/build/cmake/Modules/FindLibSSH.cmake	2021-02-21 10:38:52.773491295 +0100
-@@ -51,7 +51,7 @@
-   find_library(LibSSH_LIBRARY NAMES ${LibSSH_NAMES})
- endif()
- 
--set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh.h)
-+set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh_version.h)
- file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MAJOR REGEX "#define LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
- if (LibSSH_VERSION_LINE_MAJOR)
-   file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MINOR REGEX "#define LIBSSH_VERSION_MINOR[ ]+[0-9]+")
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.23-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.23-r1.ebuild
deleted file mode 100644
index f890a17c511c..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.23-r1.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.7.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-fs/e2fsprogs 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.23-findlibssh.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}/" 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
-}