summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/Manifest.gzbin15223 -> 15223 bytes
-rw-r--r--dev-db/mysql-workbench/Manifest5
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild (renamed from dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild)15
-rw-r--r--dev-db/pg_activity/Manifest4
-rw-r--r--dev-db/pg_activity/pg_activity-3.3.0.ebuild (renamed from dev-db/pg_activity/pg_activity-3.1.1.ebuild)4
5 files changed, 19 insertions, 9 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b54f38f9d299..804f289b8aff 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
Binary files differ
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 346904e831d4..32a77ac03a2d 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,8 +1,9 @@
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
+DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b SHA512 a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e SHA512 a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
-DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548 SHA512 7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a
DIST mysql-workbench-community-8.0.32-src.tar.gz 19353724 BLAKE2B 0ae8b7cfa0c73b4637ea62bdb46ff4102a374a6dc0b84eed8df414c07277763c61312996a011da82af668c6600bb76f723be60995509b7108ec184fde514f7b0 SHA512 368f9874a996efa782b6e0e6cf8b8919aacd2d7d4ad273f8ab5ed1ac6c9490e2c37bc1413867c5ed85169f04773bafcea7d513c8fc12323ba225cdb411b9ff05
-EBUILD mysql-workbench-8.0.31-r1.ebuild 2718 BLAKE2B b9299bbc229f4c3bb1fae0a5bd4cd8f1a964d63723808b3863a1e48aac05c56052833694fcb54c7c00f6f1c331e4bf135825b1d10fd3d6ccd66f8cfaf99db1f7 SHA512 d0dbc55589b4634fd603387cad9bff00c003279ad5e98804f6378896d2c74243f3c0b29e72dde14c2500321d3a7d3ca030794802f07b40ca76b4d0ef6b5a1744
+DIST mysql-workbench-community-8.0.33-src.tar.gz 27900614 BLAKE2B fd1fd53eec882c1cdc42ac1f56bfec034e1e3266768f12d41306464e87e81008008b5a467bbad251f49d2c3c9e7737440c4c9d9a00020a7fa603c6f5c5fbe107 SHA512 cd251d7eb6aa0e1d8a1ee5c5cd7c7422979172b333420fbd30c626b1acc9563e34cf537374888365e3001277b4dcd7adffbb2f14f0dccc219ba1ef5f2d44b292
EBUILD mysql-workbench-8.0.32.ebuild 2718 BLAKE2B b9299bbc229f4c3bb1fae0a5bd4cd8f1a964d63723808b3863a1e48aac05c56052833694fcb54c7c00f6f1c331e4bf135825b1d10fd3d6ccd66f8cfaf99db1f7 SHA512 d0dbc55589b4634fd603387cad9bff00c003279ad5e98804f6378896d2c74243f3c0b29e72dde14c2500321d3a7d3ca030794802f07b40ca76b4d0ef6b5a1744
+EBUILD mysql-workbench-8.0.33.ebuild 2968 BLAKE2B bae5648bf9dd9ec733ff1ae4fdfbbc09e55481853b20d1503bd87bc65f03553bf47015cff42bd51c5d6fca945026d8cc65978db21ee11f67c9780770db80ce4f SHA512 292dc2511d409c190ddd389236140f7719fc02be78f132a4c6d0afb476c9af207574ebfe4eae40eeb93c44912b9555f8b35a72118dbcaea341cdfc75106707cf
MISC metadata.xml 312 BLAKE2B 8c491f0d45e24b9e367ef63f8822daf6925a17f8d44ff822b8faf7485f729524de02309b91e18411421b4533aa086853914c4a0b2a93d3fd5573a289fa1e3715 SHA512 01f2f645d167290bdb313e6c1c386b0426b41edd0ee9b50acf538a7353855c84321111ffd11c213c71424c7df73aa48b8fb9f3f2af914b595fb2961cc6b3186c
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
index 865ff1995aa0..f22506106d34 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.31-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
@@ -4,10 +4,10 @@
EAPI=7
GCONF_DEBUG="no"
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
PYTHON_REQ_USE="sqlite"
-ANTLR_VERSION=4.9.1
+ANTLR_VERSION=4.11.1
inherit gnome2 flag-o-matic python-single-r1 cmake
@@ -20,7 +20,7 @@ SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug doc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -28,7 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
CDEPEND="${PYTHON_DEPS}
app-crypt/libsecret
dev-libs/glib:2
- <dev-cpp/antlr-cpp-4.8:4
+ >=dev-cpp/antlr-cpp-4.11.1:4
dev-cpp/atkmm:*
dev-cpp/pangomm:1.4
>=dev-cpp/glibmm-2.14:2
@@ -83,6 +83,8 @@ src_prepare() {
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
+ ## Look for an existing header file
+ sed -i -e 's/unixodbc.h/unixodbc_conf.h/' build/cmake/Modules/FindUNIXODBC.cmake || die
## package is very fragile...
strip-flags
@@ -95,6 +97,10 @@ src_configure() {
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=(
@@ -102,6 +108,7 @@ src_configure() {
-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"
diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index c22300783e76..de4a2f58d183 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1,3 +1,3 @@
-DIST pg_activity-3.1.1.tar.gz 427382 BLAKE2B a46090bca01f5b2bc73770df82acddeff17acab36b416f21b2a761cd1dc1631211bbac35a78ce94572824a6c269ad542c513f6a260f569adc21ae64150c767d3 SHA512 c8cd7812109d8237e4183e410723d978f219e5adf6e3fa6e3cc0dddf4bf6065df64b72a036004a1c59b96ff8eadfe96b06833b699177b29defccd47ddb55c8ff
-EBUILD pg_activity-3.1.1.ebuild 1003 BLAKE2B 1af6810808743b9d0398457d1983de82b464f00ec774c11ce766528c673749d04d8ad68b96a59776fe626626af405e1c6596c335f99232eaf402e677fc482901 SHA512 340bf65249c8a7371ec18c111314cf0b2838b8bd35e28b6a549c49dc3a1733a8c793ad5d2d6a01c1e9f334c8c78a7c8958bb1db4fe8b13344e6358c892f8d004
+DIST pg_activity-3.3.0.tar.gz 429012 BLAKE2B cc7a985c49713822ca0a250d6843820033e0ddac95429b5fbbb72e8beb6a6994020e6f2bdc0890341e72ad615d7da795e7411a817f5c25d275413852175f32b0 SHA512 94ffb48c5989fd47420c65c564a12fa0c2df7527e56c2832d00b04ed7fa75de77f3fce2c45e17435a4eecfd942665fa837147962fe695308455efb28c75cb5fc
+EBUILD pg_activity-3.3.0.ebuild 1034 BLAKE2B 8341c90494aac09064a3266cca444db46ef16fb012fbdcb5cfe4a86f17009bc021d36d4e0c5e64ec642d93e9fa7dfdb1323b04783ee214cc1eb77d2a4ce76c29 SHA512 253c2321357aff682d2f64a86bb0406a57ca064d702758670d4d19833a021c732fb83287839759ca415bb525451ed3034a2ec084819a74cc81b4d19e2f59eab7
MISC metadata.xml 340 BLAKE2B 694c72866277373c6387ae8622ab5458f8846cf5ac04c23b2730e490196f8bca1c7d8e94f88b6041a2ecc917a30e78035801f5318fb7fe4c95b9f83f07b81b76 SHA512 3d8717a513c5dbc736585578fce771798540816efc9a683ca38746d03945f1f847aaca9123c07c18e2e7269a4b216a030640d2ec90f7c1951849d8037b656048
diff --git a/dev-db/pg_activity/pg_activity-3.1.1.ebuild b/dev-db/pg_activity/pg_activity-3.3.0.ebuild
index 987d27b7f245..bb4c7b32493d 100644
--- a/dev-db/pg_activity/pg_activity-3.1.1.ebuild
+++ b/dev-db/pg_activity/pg_activity-3.3.0.ebuild
@@ -1,7 +1,9 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="8"
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1