diff options
Diffstat (limited to 'dev-db')
17 files changed, 217 insertions, 635 deletions
diff --git a/dev-db/duckdb/Manifest b/dev-db/duckdb/Manifest index 0d03879f248f..d34c79713995 100644 --- a/dev-db/duckdb/Manifest +++ b/dev-db/duckdb/Manifest @@ -1,3 +1,2 @@ -DIST duckdb-1.4.0.tar.gz 97540554 BLAKE2B 22e768dc3a0e2cb197c9ebd111a453d8a51aede61404d3c49d4e0e4507b655c675c72e506baa7b0834d49ba4687a76b2b13965051cd0d1a1cd4d442964345881 SHA512 c6514268d136b7c1c768c4d5470b230345b68d5db0c78acd48329d8fa0b6faff146d1840ff5d207dacdc9930a60aed09495f3867bd0e11bc9c63bdbef7781478 -DIST duckdb-1.4.1.tar.gz 97523171 BLAKE2B 1f845cb39965c9d5f5ac5005286aed233ab710d435cbbcd6ebcaaf26db797cd8d5f72e687be2591d9d427f315806fab26d9521d6e8c9335c843bd662282bcb2e SHA512 4965071888bfd791ddc81ed9eb53cedcd0248b159e6db3492bf5d17557b0f7516aed0840408ff46a06e9a0989a42d7b2a7452fdaf619c8ca44de43e5d1c338b8 DIST duckdb-1.4.2.tar.gz 98396769 BLAKE2B cb6ccff7c03d865db66b38fb6a1327b9db4a75b247b2321a58f30394f865e220584007ef5af007433021093d33baf4dd4d03908229c99bd9f3c895891c82c457 SHA512 28eabd8ee84c8b859c475f0fce5c4ee3df53143807fef2b0892caeb39abb006ff27c0c9549f1502ad4afa0aab715a5c751a592af86ce4ad1e3abb1a3b7c63c03 +DIST duckdb-1.4.3.tar.gz 98406292 BLAKE2B 9196bd78980c0a035b81b540d3ba1fe5bd0eb613d8a1dfb19808bd8d09fb71af0d1396da1a0a5acca736fa98ccd35fbe723c732e72675e7ee67deaba4026f3f2 SHA512 058218e4551867dc231cae682e835fb76b2d02b655f889753fde6745b9895b81a7161c7eb3104c9f9e8a7a33fed460fc0028d0b94a1e36834100aa597b97a877 diff --git a/dev-db/duckdb/duckdb-1.4.1.ebuild b/dev-db/duckdb/duckdb-1.4.1.ebuild deleted file mode 100644 index 12e1e1314a29..000000000000 --- a/dev-db/duckdb/duckdb-1.4.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake dot-a - -DESCRIPTION="high-performance analytical database system" -HOMEPAGE="https://duckdb.org https://github.com/duckdb/duckdb" - -SRC_URI="https://github.com/duckdb/duckdb/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" - -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="test" - -src_prepare() { - cd third_party/thrift/thrift/transport/ - eapply "${FILESDIR}/thrift-cstdint.patch" - cd "${S}" - eapply_user - cmake_src_prepare -} - -src_configure() { - lto-guarantee-fat - mycmakeargs=( "-DINSTALL_LIB_DIR=/usr/$(get_libdir)/" - "-DOVERRIDE_GIT_DESCRIBE=v${PV}" - "-DBUILD_EXTENSIONS='autocomplete;icu;tpch;tpcds;json;jemalloc'" - "-DCXX_EXTRA=${CXXFLAGS}" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - strip-lto-bytecode -} diff --git a/dev-db/duckdb/duckdb-1.4.0.ebuild b/dev-db/duckdb/duckdb-1.4.3.ebuild index 12e1e1314a29..12e1e1314a29 100644 --- a/dev-db/duckdb/duckdb-1.4.0.ebuild +++ b/dev-db/duckdb/duckdb-1.4.3.ebuild diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.4.7.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.4.7.ebuild index 87e7273b96a8..b0909dc2fa02 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.4.7.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.4.7.ebuild @@ -11,7 +11,7 @@ else MY_PV=${PV/_b/-b} SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz" S="${WORKDIR%/}/${PN}-${MY_PV}-src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86" fi inherit cmake-multilib flag-o-matic toolchain-funcs diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest index 37821a1f6fbd..0ac556433cac 100644 --- a/dev-db/mycli/Manifest +++ b/dev-db/mycli/Manifest @@ -1,3 +1 @@ -DIST mycli-1.37.0.tar.gz 300531 BLAKE2B f081db26a2f1ab9c804384525abd0e98dee308da0075691433fe323e6638757cec689cd4ab559b5ffafc5d953b961785b8f8a3b380eaeae5bad47c29165fc9c6 SHA512 6e6cb2c4de7a6b5b9d758806abd076fdfbd2ea9bdc89d0096948a6dad68b55d4378d5687eac950409b0eb8e6d67ae6da0851b749129ed63b701496427a33dbb2 -DIST mycli-1.41.1.tar.gz 309858 BLAKE2B 84fe6f17a8230950dbef5329e37565bb71d8b606604d2c305cf5f087af5b30a5d41675f430ca00d11ba8cde0cd575ba8dd8f939be4b4f7ea9c53f1bd26f71a43 SHA512 3078846589c97cced82f8894145df5ee1da91b462e734965a2a44a51cb52afbbb20983f17b7e2ffaded4c90cd1a2f4ac2e38787444fd428cd060064187597e1f DIST mycli-1.41.2.tar.gz 309963 BLAKE2B 002d4acf1d59af017145d42e265546bda13d86ad28f87341aceb860e824310df6ff56e15c21c27f3b4c2e8ed9a9f7c535dd2d0d5f243d60887f91f27cea57bde SHA512 d0c5ee73689209b30bf832c4494bf03123c73f4d818624668456039aff518dd12ef5b29daf0f5b14bb36619e0d2459e5d8971193c8ec17f7d6bcf771f409b153 diff --git a/dev-db/mycli/mycli-1.37.0.ebuild b/dev-db/mycli/mycli-1.37.0.ebuild deleted file mode 100644 index 4dd647721e08..000000000000 --- a/dev-db/mycli/mycli-1.37.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=yes -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting" -HOMEPAGE=" - https://www.mycli.net/ - https://github.com/dbcli/mycli/ - https://pypi.org/project/mycli/ -" - -LICENSE="BSD MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="ssh" - -RDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/cli-helpers-2.7.0[${PYTHON_USEDEP}] - >=dev-python/click-7.0[${PYTHON_USEDEP}] - >=dev-python/configobj-5.0.5[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}] - >=dev-python/prompt-toolkit-3.0.6[${PYTHON_USEDEP}] - <dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}] - >=dev-python/pyaes-1.6.1[${PYTHON_USEDEP}] - >=dev-python/pyfzf-0.3.1[${PYTHON_USEDEP}] - >=dev-python/pygments-1.6[${PYTHON_USEDEP}] - >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}] - >=dev-python/pyperclip-1.8.1[${PYTHON_USEDEP}] - =dev-python/sqlglot-26*[${PYTHON_USEDEP}] - <dev-python/sqlparse-0.6.0[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}] - ssh? ( - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/sshtunnel[${PYTHON_USEDEP}] - ) - ') -" -BDEPEND=" - $(python_gen_cond_dep ' - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - dev-db/mysql[server] - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/sshtunnel[${PYTHON_USEDEP}] - ) - ') -" - -EPYTEST_PLUGINS=() -distutils_enable_tests pytest - -export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - -python_prepare_all() { - # Relax click requirement. Behave tests aren't hooked up here :/ - # https://github.com/dbcli/mycli/commit/bb18b0c2f2ed7375efe31d379e616a11c82b1299 - # https://github.com/dbcli/mycli/pull/1241 - sed -e '/click/ s/,<8.1.8//' -i pyproject.toml || die - - # no coverage please - sed -e 's/import coverage ; coverage.process_startup(); //' \ - -i test/features/environment.py test/features/steps/wrappers.py || die - - distutils-r1_python_prepare_all -} - -src_test() { - # test/utils.py - local -x PYTEST_PASSWORD="notsecure" - local -x PYTEST_HOST="127.0.0.1" - local -x PYTEST_PORT="43307" - local -x PYTEST_CHARSET="utf8" - - einfo "Creating mysql test instance ..." - mysqld \ - --no-defaults \ - --initialize-insecure \ - --basedir="${EPREFIX}/usr" \ - --datadir="${T}/mysql" 1>"${T}"/mysql_install.log || die - - einfo "Starting mysql test instance ..." - mysqld \ - --no-defaults \ - --character-set-server="${PYTEST_CHARSET}" \ - --bind-address="${PYTEST_HOST}" \ - --port="${PYTEST_PORT}" \ - --pid-file="${T}/mysqld.pid" \ - --socket="${T}/mysqld.sock" \ - --datadir="${T}/mysql" 1>"${T}/mysqld.log" 2>&1 & - - # wait for it to start - local i - for (( i = 0; i < 10; i++ )); do - [[ -S ${T}/mysqld.sock ]] && break - sleep 1 - done - [[ ! -S ${T}/mysqld.sock ]] && die "mysqld failed to start" - - einfo "Configuring test mysql instance ..." - mysql \ - -u root \ - --socket="${T}/mysqld.sock" \ - -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '${PYTEST_PASSWORD}'" \ - || die "Failed to change mysql user password" - - local failures=() - nonfatal distutils-r1_src_test - [[ ${?} -ne 0 ]] && failures+=( pytest ) - - # Behave is in a weird situation, last non beta version is 7 years old and doesnt build well with modern setuptools. - # Mycli doesnt pass tests with prereleases of updated behave. - #behave --jobs=$(get_makeopts_jobs) --summary --verbose test/features - #[[ ${?} -ne 0 ]] && failures+=( behave ) - - einfo "Stopping mysql test instance ..." - pkill -F "${T}"/mysqld.pid || die - # wait for it to stop - local i - for (( i = 0; i < 10; i++ )); do - [[ -S ${T}/mysqld.sock ]] || break - sleep 1 - done - - rm -rf "${T}"/mysql || die - - if [[ ${#failures[@]} -gt 0 ]]; then - die "Tests failed: ${failures}" - fi -} diff --git a/dev-db/mycli/mycli-1.41.1.ebuild b/dev-db/mycli/mycli-1.41.1.ebuild deleted file mode 100644 index 1dfe9e0a524f..000000000000 --- a/dev-db/mycli/mycli-1.41.1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=yes -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..14} ) - -inherit distutils-r1 pypi - -DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting" -HOMEPAGE=" - https://www.mycli.net/ - https://github.com/dbcli/mycli/ - https://pypi.org/project/mycli/ -" - -LICENSE="BSD MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -# optional llm unpackaged -IUSE="ssh" - -RDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/cli-helpers-2.7.0[${PYTHON_USEDEP}] - >=dev-python/click-8.3.1[${PYTHON_USEDEP}] - >=dev-python/configobj-5.0.5[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}] - >=dev-python/prompt-toolkit-3.0.6[${PYTHON_USEDEP}] - <dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - >=dev-python/pyfzf-0.3.1[${PYTHON_USEDEP}] - >=dev-python/pygments-1.6[${PYTHON_USEDEP}] - >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}] - >=dev-python/pyperclip-1.8.1[${PYTHON_USEDEP}] - =dev-python/sqlglot-27*[${PYTHON_USEDEP}] - <dev-python/sqlparse-0.6.0[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}] - ssh? ( - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/sshtunnel[${PYTHON_USEDEP}] - ) - ') -" -BDEPEND=" - $(python_gen_cond_dep ' - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - dev-db/mysql[server] - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/sshtunnel[${PYTHON_USEDEP}] - ) - ') -" - -EPYTEST_PLUGINS=() -distutils_enable_tests pytest - -export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - -python_prepare_all() { - # no coverage please - sed -e 's/import coverage ; coverage.process_startup(); //' \ - -i test/features/environment.py test/features/steps/wrappers.py || die - - # convert from pycryptodomex to pycryptodome - sed -e 's/pycryptodomex/pycryptodome/' -i pyproject.toml || die - sed -e 's/from Cryptodome/from Crypto/' -i mycli/config.py || die - - distutils-r1_python_prepare_all -} - -src_test() { - # test/utils.py - local -x PYTEST_PASSWORD="notsecure" - local -x PYTEST_HOST="127.0.0.1" - local -x PYTEST_PORT="43307" - local -x PYTEST_CHARSET="utf8" - - einfo "Creating mysql test instance ..." - mysqld \ - --no-defaults \ - --initialize-insecure \ - --basedir="${EPREFIX}/usr" \ - --datadir="${T}/mysql" 1>"${T}"/mysql_install.log || die - - einfo "Starting mysql test instance ..." - mysqld \ - --no-defaults \ - --character-set-server="${PYTEST_CHARSET}" \ - --bind-address="${PYTEST_HOST}" \ - --port="${PYTEST_PORT}" \ - --pid-file="${T}/mysqld.pid" \ - --socket="${T}/mysqld.sock" \ - --datadir="${T}/mysql" 1>"${T}/mysqld.log" 2>&1 & - - # wait for it to start - local i - for (( i = 0; i < 10; i++ )); do - [[ -S ${T}/mysqld.sock ]] && break - sleep 1 - done - [[ ! -S ${T}/mysqld.sock ]] && die "mysqld failed to start" - - einfo "Configuring test mysql instance ..." - mysql \ - -u root \ - --socket="${T}/mysqld.sock" \ - -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '${PYTEST_PASSWORD}'" \ - || die "Failed to change mysql user password" - - EPYTEST_IGNORE=( - # Requires unpackaged llm - test/test_llm_special.py - # AssertionError: assert 8 in [4, 5, 6, 7] - # Per upstream: "...it is a flaky test at best." - # https://github.com/dbcli/mycli/commit/3d08910a366d4505a40e8a0fb36c210330723f18 - test/test_special_iocommands.py::test_watch_query_full - ) - - local failures=() - nonfatal distutils-r1_src_test - [[ ${?} -ne 0 ]] && failures+=( pytest ) - - # Behave is in a weird situation, last non beta version is 7 years old and doesnt build well with modern setuptools. - # Mycli doesnt pass tests with prereleases of updated behave. - #behave --jobs=$(get_makeopts_jobs) --summary --verbose test/features - #[[ ${?} -ne 0 ]] && failures+=( behave ) - - einfo "Stopping mysql test instance ..." - pkill -F "${T}"/mysqld.pid || die - # wait for it to stop - local i - for (( i = 0; i < 10; i++ )); do - [[ -S ${T}/mysqld.sock ]] || break - sleep 1 - done - - rm -rf "${T}"/mysql || die - - if [[ ${#failures[@]} -gt 0 ]]; then - die "Tests failed: ${failures}" - fi -} diff --git a/dev-db/mysql/files/my.cnf.distro-client b/dev-db/mysql/files/my.cnf.distro-client deleted file mode 100644 index a5a0dcb0c16a..000000000000 --- a/dev-db/mysql/files/my.cnf.distro-client +++ /dev/null @@ -1,21 +0,0 @@ -# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/50-distro-client.cnf: The global mysql configuration file. - -# The following options will be passed to all MySQL clients -[client] -socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock -character-sets-dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets -loose-default-character-set=utf8 - -[mysql] -# uncomment the next directive if you are not familiar with SQL -#safe-updates - -[mysqldump] -quick -max_allowed_packet = 16M - -[myisamchk] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets - -[myisampack] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets diff --git a/dev-db/mysql/files/my.cnf.distro-server b/dev-db/mysql/files/my.cnf.distro-server deleted file mode 100644 index d4ed30c1f089..000000000000 --- a/dev-db/mysql/files/my.cnf.distro-server +++ /dev/null @@ -1,28 +0,0 @@ -# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/50-distro-server.cnf: The global mysql configuration file. - -# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations -[mysqld] -character-set-server = utf8 -user = mysql -port = 3306 -socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock -pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysql.pid -log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err -basedir = @GENTOO_PORTAGE_EPREFIX@/usr -datadir = @DATADIR@ -skip-external-locking -lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql -#Set this to your desired error message language -lc_messages = en_US - -# security: -# using "localhost" in connects uses sockets by default -# skip-networking -bind-address = 127.0.0.1 - -log-bin -server-id = 1 - -# point the following paths to different dedicated disks -tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ -#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname diff --git a/dev-db/postgresql/files/postgresql-13.3-riscv-spinlocks.patch b/dev-db/postgresql/files/postgresql-13.3-riscv-spinlocks.patch deleted file mode 100644 index 86d1fae20d87..000000000000 --- a/dev-db/postgresql/files/postgresql-13.3-riscv-spinlocks.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/include/storage/s_lock.h -+++ b/src/include/storage/s_lock.h -@@ -315,12 +315,12 @@ - #endif /* __ia64__ || __ia64 */ - - /* -- * On ARM and ARM64, we use __sync_lock_test_and_set(int *, int) if available. -+ * On ARM, ARM64 and RISC-V, we use __sync_lock_test_and_set(int *, int) if available. - * - * We use the int-width variant of the builtin because it works on more chips - * than other widths. - */ --#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) -+#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv) - #ifdef HAVE_GCC__SYNC_INT32_TAS - #define HAS_TEST_AND_SET - -@@ -337,7 +337,7 @@ - #define S_UNLOCK(lock) __sync_lock_release(lock) - - #endif /* HAVE_GCC__SYNC_INT32_TAS */ --#endif /* __arm__ || __arm || __aarch64__ || __aarch64 */ -+#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ - - - /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ diff --git a/dev-db/postgresql/files/postgresql-13.8-no-server.patch b/dev-db/postgresql/files/postgresql-13.8-no-server.patch deleted file mode 100644 index 295df7087c14..000000000000 --- a/dev-db/postgresql/files/postgresql-13.8-no-server.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -5,56 +5,9 @@ - include $(top_builddir)/src/Makefile.global - - SUBDIRS = \ -- adminpack \ -- amcheck \ -- auth_delay \ -- auto_explain \ -- bloom \ -- btree_gin \ -- btree_gist \ -- citext \ -- cube \ -- dblink \ -- dict_int \ -- dict_xsyn \ -- earthdistance \ -- file_fdw \ -- fuzzystrmatch \ -- hstore \ -- intagg \ -- intarray \ -- isn \ -- lo \ -- ltree \ - oid2name \ -- pageinspect \ -- passwordcheck \ -- pg_buffercache \ -- pg_freespacemap \ -- pg_prewarm \ -- pg_standby \ -- pg_stat_statements \ -- pg_trgm \ -- pgcrypto \ -- pgrowlocks \ -- pgstattuple \ -- pg_visibility \ -- postgres_fdw \ -- seg \ -- spi \ -- tablefunc \ -- tcn \ -- test_decoding \ -- tsm_system_rows \ -- tsm_system_time \ -- unaccent \ - vacuumlo - --ifeq ($(with_openssl),yes) --SUBDIRS += sslinfo --else --ALWAYS_SUBDIRS += sslinfo --endif - - ifneq ($(with_uuid),no) - SUBDIRS += uuid-ossp ---- a/src/backend/Makefile -+++ b/src/backend/Makefile -@@ -56,7 +56,7 @@ - - ########################################################################## - --all: submake-libpgport submake-catalog-headers submake-utils-headers postgres $(POSTGRES_IMP) -+all: generated-headers - - ifneq ($(PORTNAME), cygwin) - ifneq ($(PORTNAME), win32) -@@ -195,23 +195,7 @@ - - ########################################################################## - --install: all installdirs install-bin --ifeq ($(PORTNAME), cygwin) --ifeq ($(MAKE_DLL), true) -- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' --endif --endif --ifeq ($(PORTNAME), win32) --ifeq ($(MAKE_DLL), true) -- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' --endif --endif -- $(MAKE) -C catalog install-data -- $(MAKE) -C tsearch install-data -- $(MAKE) -C utils install-data -- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample' -- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample' -- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' -+install: - - ifeq ($(with_llvm), yes) - install-bin: install-postgres-bitcode ---- a/src/bin/Makefile -+++ b/src/bin/Makefile -@@ -14,21 +14,8 @@ - include $(top_builddir)/src/Makefile.global - - SUBDIRS = \ -- initdb \ -- pg_archivecleanup \ -- pg_basebackup \ -- pg_checksums \ - pg_config \ -- pg_controldata \ -- pg_ctl \ - pg_dump \ -- pg_resetwal \ -- pg_rewind \ -- pg_test_fsync \ -- pg_test_timing \ -- pg_upgrade \ -- pg_verifybackup \ -- pg_waldump \ - pgbench \ - psql \ - scripts ---- a/src/Makefile -+++ b/src/Makefile -@@ -15,21 +15,12 @@ - SUBDIRS = \ - common \ - port \ -- timezone \ - backend \ -- backend/utils/mb/conversion_procs \ -- backend/snowball \ - include \ - interfaces \ -- backend/replication/libpqwalreceiver \ -- backend/replication/pgoutput \ - fe_utils \ - bin \ -- pl \ -- makefiles \ -- test/regress \ -- test/isolation \ -- test/perl -+ makefiles - - ifeq ($(with_llvm), yes) - SUBDIRS += backend/jit/llvm diff --git a/dev-db/postgresql/files/postgresql-17.6-llvm21.patch b/dev-db/postgresql/files/postgresql-17.6-llvm21.patch deleted file mode 100644 index 90e32e872be1..000000000000 --- a/dev-db/postgresql/files/postgresql-17.6-llvm21.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 282d0bdee6192f1a859ee34672ae73abf49794dc Mon Sep 17 00:00:00 2001 -From: Peter Eisentraut <peter@eisentraut.org> -Date: Mon, 15 Sep 2025 08:13:21 +0200 -Subject: [PATCH 1/1] jit: fix build with LLVM-21 -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -LLVM-21 renamed llvm::GlobalValue::getGUID() to -getGUIDAssumingExternalLinkage(), so add a version guard. - -Author: Holger Hoffstätte <holger@applied-asynchrony.com> -Discussion: https://www.postgresql.org/message-id/flat/d25e6e4a-d1b4-84d3-2f8a-6c45b975f53d%40applied-asynchrony.com ---- - src/backend/jit/llvm/llvmjit_inline.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp -index 2764c3bbe2f..51b32cd9f94 100644 ---- a/src/backend/jit/llvm/llvmjit_inline.cpp -+++ b/src/backend/jit/llvm/llvmjit_inline.cpp -@@ -238,7 +238,11 @@ llvm_build_inline_plan(LLVMContextRef lc, llvm::Module *mod) - - llvm_split_symbol_name(symbolName.data(), &cmodname, &cfuncname); - -+#if LLVM_VERSION_MAJOR >= 21 -+ funcGUID = llvm::GlobalValue::getGUIDAssumingExternalLinkage(cfuncname); -+#else - funcGUID = llvm::GlobalValue::getGUID(cfuncname); -+#endif - - /* already processed */ - if (inlineState.processed) --- -2.39.5 - diff --git a/dev-db/repmgr/files/repmgr-5.1.0-fno-common.patch b/dev-db/repmgr/files/repmgr-5.1.0-fno-common.patch deleted file mode 100644 index c5450291dbb4..000000000000 --- a/dev-db/repmgr/files/repmgr-5.1.0-fno-common.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/repmgr-action-cluster.c -+++ b/repmgr-action-cluster.c -@@ -26,6 +26,7 @@ - - #define SHOW_HEADER_COUNT 9 - -+extern t_conninfo_param_list source_conninfo; - typedef enum - { - SHOW_ID = 0, ---- a/repmgr-action-node.c -+++ b/repmgr-action-node.c -@@ -32,6 +32,7 @@ - #include "repmgr-action-node.h" - #include "repmgr-action-standby.h" - -+extern t_conninfo_param_list source_conninfo; - static bool copy_file(const char *src_file, const char *dest_file); - static void format_archive_dir(PQExpBufferData *archive_dir); - static t_server_action parse_server_action(const char *action); ---- a/repmgr-action-service.c -+++ b/repmgr-action-service.c -@@ -26,6 +26,7 @@ - #include "repmgr-client-global.h" - #include "repmgr-action-service.h" - -+extern t_conninfo_param_list source_conninfo; - - /* - * Possibly also show: ---- a/repmgr-action-witness.c -+++ b/repmgr-action-witness.c -@@ -28,6 +28,7 @@ - #include "repmgr-client-global.h" - #include "repmgr-action-witness.h" - -+extern t_conninfo_param_list source_conninfo; - static char repmgr_user[MAXLEN]; - static char repmgr_db[MAXLEN]; - ---- a/repmgr-client-global.h -+++ b/repmgr-client-global.h -@@ -236,7 +236,7 @@ typedef struct ColHeader - extern t_runtime_options runtime_options; - extern t_configuration_options config_file_options; - --t_conninfo_param_list source_conninfo; -+extern t_conninfo_param_list source_conninfo; - - - extern bool config_file_required; diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest index 632f49e64582..ebefc84bb708 100644 --- a/dev-db/sqlitestudio/Manifest +++ b/dev-db/sqlitestudio/Manifest @@ -1 +1,2 @@ DIST sqlitestudio-3.4.17.tar.gz 16696859 BLAKE2B 6b1d4660c7b4ed4880df3c7e2e68d7b52edb46d7e19a751d49825c08a477adc02646729418e3a8b1fd6e5bc8192cc35197a23aa7e9142e4c2ebd184c049ee1eb SHA512 2fab60c9a695022998ad7848b0ece614170070fd9603fb559a942692fb644204aa4437cf33b18f66bbcfe36f82bdfddb7e1d5c934e2946a3e56f537171798f4a +DIST sqlitestudio-4.0.0_pre20251207-bac238cc.tar.gz 17654915 BLAKE2B fb93d688076cc27752b5578f764e4e99ee89bd7ff49ac2c06b4cc7fb3018835df1675aa053bad5eee06b6db40fae20535b63e6a4076213a05e4592d2faafdace SHA512 50fbe053ae9bc93019a71c9d4be4671e7c3b49e77eab7e341f6b7e2254fd9b2541b556e5e7eec0737ce39da2219ddb2b10bfdcb7637c789027370f7d8b59b0a9 diff --git a/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-fix-python.patch b/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-fix-python.patch new file mode 100644 index 000000000000..ddb88534257e --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-fix-python.patch @@ -0,0 +1,13 @@ +diff --git a/Plugins/ScriptingPython/ScriptingPython.pro b/Plugins/ScriptingPython/ScriptingPython.pro +index 75375da..614cfe8 100644 +--- a/Plugins/ScriptingPython/ScriptingPython.pro ++++ b/Plugins/ScriptingPython/ScriptingPython.pro +@@ -22,7 +22,7 @@ isEmpty(PYTHON_VERSION) { + PYTHON_VERSION = 3.9 + } + linux: { +- LIBS += -lpython$$PYTHON_VERSION ++ #LIBS += -lpython$$PYTHON_VERSION + } + + macx: { diff --git a/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-missing-headers.patch b/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-missing-headers.patch new file mode 100644 index 000000000000..4461f0264bcb --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-4.0.0_pre20251207-missing-headers.patch @@ -0,0 +1,26 @@ +From fba5a4e01a4d4e1114bbea21bf3ac9c27f3f8af9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 12 Dec 2025 22:42:31 +0100 +Subject: [PATCH] Add missing QJsonValue and QUuid headers + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + SQLiteStudio3/coreSQLiteStudio/common/utils.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp +index f9b550901..dc6177456 100644 +--- a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp ++++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp +@@ -4,6 +4,8 @@ + #include "dbobjecttype.h" + #include "rsa/RSA.h" + #include <QJsonDocument> ++#include <QJsonValue> ++#include <QUuid> + #include <QLine> + #include <QString> + #include <QStringConverter> +-- +2.52.0 + diff --git a/dev-db/sqlitestudio/sqlitestudio-4.0.0_pre20251207.ebuild b/dev-db/sqlitestudio/sqlitestudio-4.0.0_pre20251207.ebuild new file mode 100644 index 000000000000..10f4543508c8 --- /dev/null +++ b/dev-db/sqlitestudio/sqlitestudio-4.0.0_pre20251207.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +COMMIT=bac238ccb0000419a66f3b2134b08d1f7a2bd076 + +PLOCALES="af_ZA ar_SA be_BY ca_ES cs_CZ da_DK de_DE el_GR en_US es_ES fa_IR fi_FI fr_FR he_IL hu_HU it_IT ja_JP kaa ko_KR nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_SP sv_SE tr_TR uk_UA vi_VN zh_CN zh_TW" + +# ScriptingPython says exactly 3.9 +PYTHON_COMPAT=( python3_{11..13} ) +inherit desktop plocale python-single-r1 qmake-utils xdg + +DESCRIPTION="Powerful cross-platform SQLite database manager" +HOMEPAGE="https://sqlitestudio.pl" +SRC_URI="https://github.com/pawelsalawa/sqlitestudio/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli python tcl test" + +REQUIRED_USE=" + test? ( cli ) + python? ( ${PYTHON_REQUIRED_USE} ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/openssl:= + dev-db/sqlite:3 + dev-qt/qtbase:6[gui,network,widgets,xml] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 + cli? ( + sys-libs/readline:= + sys-libs/ncurses:= + ) + python? ( ${PYTHON_DEPS} ) + tcl? ( dev-lang/tcl:0= ) +" +DEPEND="${RDEPEND} + dev-qt/qttools:6[designer] + dev-qt/qtbase:6[concurrent] +" +BDEPEND=" + dev-qt/qttools:6[linguist] + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-fix-python.patch + "${FILESDIR}"/${P}-missing-headers.patch +) + +core_build_dir="${S}/output/build" +plugins_build_dir="${core_build_dir}/Plugins" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + disable_modules() { + [[ $# -lt 2 ]] && die "not enough arguments" + + local pro="$1"; shift + local modules="${@}" + + sed -r -i \ + -e 's/('${modules// /|}')[[:space:]]*(\\?)/\2/' \ + ${pro} || die + } + + use cli || disable_modules SQLiteStudio3/SQLiteStudio3.pro cli + + local mod_lst=( DbSqlite2 ) + use tcl || mod_lst+=( ScriptingTcl ) + use python || mod_lst+=( ScriptingPython ) + disable_modules Plugins/Plugins.pro ${mod_lst[@]} + + local mylrelease="$(qt6_get_bindir)"/lrelease + local ts_dir_lst=$(find * -type f -name "*.qm" -printf '%h\n' | sort -u) + local ts_pro_lst=$(find * -type f -name "*.pro" -exec grep -l 'TRANSLATIONS' {} \;) + local ts_qrc_lst=$(find * -type f -name "*.qrc" -exec grep -l '\.qm' {} \;) + + # delete all "*.qm" + for ts_dir in ${ts_dir_lst[@]}; do + rm "${ts_dir}"/*.qm || die + done + + lrelease_locale() { + for ts_dir in ${ts_dir_lst[@]}; do + local ts=$(find "${ts_dir}" -type f -name "*${1}.ts" || continue) + "${mylrelease}" "${ts}" || die "preparing ${1} locale failed" + done + } + + rm_locale() { + for ts_pro in ${ts_pro_lst[@]}; do + sed -i -r -e 's/[^[:space:]]*'${1}'\.ts//' \ + ${ts_pro} || die + done + + for ts_qrc in ${ts_qrc_lst[@]}; do + sed -i -e '/'${1}'\.qm/d' \ + ${ts_qrc} || die + done + } + + local ts_dir_main="SQLiteStudio3/sqlitestudio/translations" + plocale_find_changes ${ts_dir_main} "sqlitestudio_" '.ts' + plocale_for_each_locale lrelease_locale + plocale_for_each_disabled_locale rm_locale + + # prevent "multilib-strict check failed" with USE test by + # replacing target paths with dynamic lib dir + # + sed -i -e 's/\(target\.path = .*\/\)lib/\1'$(get_libdir)'/' \ + SQLiteStudio3/Tests/TestUtils/TestUtils.pro || die +} + +src_configure() { + # NOTE: QMAKE_CFLAGS_ISYSTEM option prevents + # build error with tcl use enabled (stdlib.h is missing) + # "QMAKE_CFLAGS_ISYSTEM=\"\"" + # CONFIG+ borrowed from compile.sh of tarball + local myqmakeargs=( + "BINDIR=${EPREFIX}/usr/bin" + "LIBDIR=${EPREFIX}/usr/$(get_libdir)" + "CONFIG+=portable" + $(usex test 'DEFINES+=tests' '') + ) + + # Combination of kvirc ebuild and qtcompress + if use python; then + myqmakeargs+=( + INCLUDEPATH+=" $(python_get_includedir)" + LIBS+=" $(python_get_LIBS)" + ) + fi + + ## Core |