gentoo auto-resync : 03:07:2024 - 08:05:42

5 files changed, 118 insertions, 2 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 2991315fbbe3..883b6c8fa53c 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/futuresql/Manifest b/dev-db/futuresql/Manifest
index 25c80e9b052f..ba540be8655e 100644
--- a/dev-db/futuresql/Manifest
+++ b/dev-db/futuresql/Manifest
@@ -1,3 +1,3 @@
 DIST futuresql-0.1.1.tar.xz 27844 BLAKE2B d2f335c7a64b44b32785e2bf8522ca3670450ff2ec5190aa2ff296198e2ac62985e51dacb890566b24a52c54f6300688f17cbb208055d7b4a3ee007d19415d81 SHA512 ce9cd927c6da3ca7351640cc2c36854c1a728ec5c24517e61772e3571d56bcaa2221cfe05127f78554bd9d2b2d72bd46e911834c9fb1e9b89bd96b84b39bda16
-EBUILD futuresql-0.1.1.ebuild 750 BLAKE2B 0f18a11856c8e91168911f2d621da4fb38c8245ad029ec9036202cd90a4addafcdc4fa8f0e808f2339bc7b4c819b81099d8d020c47b0435ffeb72dc78d9f092a SHA512 1d28fcb14b7ad9adc962df546177903a604b869b7dba67db79253c7f42d067b688832d4f97ffe1f2326f07b61e505e066e079195ac544a5ba11b7edcb652f5f5
+EBUILD futuresql-0.1.1.ebuild 757 BLAKE2B 7e9185a171003217f08b93e8a05cf435caea06cec79dd8372b5911c5c55c7a359fe1c70147d96ec39a669e3e37adced0f37bd8685abfea53863b3306b0c9365a SHA512 ba4a833435f897bbce0fc91e2877cabe28c9475c8fc7d704bab4ffe432c2744ab41628627cf1b9dcdaaf63a03b8d25f408b265e302099737f4036171f619e2b4
 MISC metadata.xml 381 BLAKE2B 8baa7ecfc8760e4a4ae2a3507ede44cda62346dab1feee357ff737c26714d4888665af8fb02b3d4c6ed096bafe6e2f7247bfebbd73d66ca8a8d19dcc2f1aa1b4 SHA512 cab8f42d78acc59bd863272275e35af36b6f93c22d8a0269038b591f7fefe161579d9c08c936bb66fd1a7dfc871d63213108753b6cd4cbd3f8cfada675a3a206
diff --git a/dev-db/futuresql/futuresql-0.1.1.ebuild b/dev-db/futuresql/futuresql-0.1.1.ebuild
index acad2895fac0..8c0ea6be8458 100644
--- a/dev-db/futuresql/futuresql-0.1.1.ebuild
+++ b/dev-db/futuresql/futuresql-0.1.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/futuresql/html/index.html https://invent.kde.org/l
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="MIT"
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index df7944b74529..bb622f379599 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -4,5 +4,7 @@ AUX mysql-workbench-8.0.33-gcc13.patch 1516 BLAKE2B 831bde621ae092aeb75bf3e9cab6
 AUX mysql-workbench-8.0.36-libxml2-2.12-support.patch 1167 BLAKE2B f0f7275dd923191accaeea90bdfff2e511c20eb1d5a7e369852b1d572b8b2e5945c2f04ec95a9eb92b7c96c3622d817a1d60da18ea31f4037d4a8406957971a7 SHA512 89196eb3c61636111914eed8fbf501cfeb1bd5c605c7b0bd2bac8e56fad957c7d02d34b423b456365c5c11b367ac10e9bf04ba07e8486d53170eb11003e5990d
 DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b SHA512 a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
 DIST mysql-workbench-community-8.0.36-src.tar.gz 27419906 BLAKE2B 47ab5c64b5beee712c9227cdb5c46a6863d830ef75983e0e56702e0b08370b9118b301d0c34ba95180bef2fe0b01ae24791337c9e1922cd412a37f057906027a SHA512 953f072414abb8c236ffccb8a4439dcd4c5eb76ff07f5ca276c35e8cf6102ef73292412fc70113a167f34bd998603ef22b59038ae06cf84d2f0440769c1d9689
+DIST mysql-workbench-community-8.0.38-src.tar.gz 59069184 BLAKE2B ace0afbab46c106200da5234595065766798d97f57008261c166f97bed842f185e1bba90e0c60b9acf4843b54261b5aa49c8a3a6b096e72597443fcb1a011217 SHA512 9fa18d3a66111461dd47dec05ea8dfa214dac85017d51358e694d56cb05439d96a91f675e105cfbecc70c456127964a81ddb2a5a2951457196b20b10dcb6f502
 EBUILD mysql-workbench-8.0.36.ebuild 2946 BLAKE2B 2584f5d3dfa01aaa0732092d90e3cacdde3a713249d4c4a9890d66787fbe701707b9fb4dd34476b860b6e28cf21e4158db5c178654cf95d16d2aab2711785c0e SHA512 936604d7af3e06fa8dd425a23e25bec16c389e1c7fea34d2bcff6f59c458257be030bdb90ed8d03fefce0f6c9b48d5d99cca505f8161ea19c2b0877141ffff19
+EBUILD mysql-workbench-8.0.38.ebuild 2894 BLAKE2B 78c752b1bc4d36fc52b44ebd2ac794a8d4e33f248b426cb42f6b1553f4017a1b6a03e42a818263975953673917b92cd7488331df6454ac97afe18b30b89cf6e3 SHA512 5f97cd2ad42238ca2738fc8af36539aeae77edc53b3fb3f1f4083d069d501aad6d4032d96e364454ac5bf0d01542bf7d1951dedea3d6494cbc3abc0d6f4290c6
 MISC metadata.xml 312 BLAKE2B 8c491f0d45e24b9e367ef63f8822daf6925a17f8d44ff822b8faf7485f729524de02309b91e18411421b4533aa086853914c4a0b2a93d3fd5573a289fa1e3715 SHA512 01f2f645d167290bdb313e6c1c386b0426b41edd0ee9b50acf538a7353855c84321111ffd11c213c71424c7df73aa48b8fb9f3f2af914b595fb2961cc6b3186c
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.38.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.38.ebuild
new file mode 100644
index 000000000000..584f3a01ce3c
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.38.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.11.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"
+S="${WORKDIR}"/"${MY_P}"
+
+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.11.1:4
+		dev-cpp/atkmm:*
+		dev-cpp/pangomm:1.4
+		>=dev-cpp/glibmm-2.14:2
+		dev-cpp/gtkmm:3.0
+		>=net-libs/libssh-0.9.5[server]
+		x11-libs/pango
+		x11-libs/gtk+:3
+		>=x11-libs/cairo-1.5.12[glib,svg(+)]
+		>=dev-libs/rapidjson-1.1.0
+		dev-libs/libsigc++:2
+		dev-libs/boost[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++-8.0.27-r1[legacy(-)]
+		dev-db/vsqlite++
+		|| ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
+		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-11
+		virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+	"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+	"${FILESDIR}/${PN}-8.0.33-gcc13.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
+
+	if has_version dev-db/unixODBC ; then
+		UNIXODBC="-DUNIXODBC_CONFIG_PATH=/usr/bin/odbc_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}
+		${UNIXODBC}
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
+	)
+	cmake_src_configure
+}