diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest index b272fe57947c3..7d284a4a832cc 100644 --- a/dev-db/mycli/Manifest +++ b/dev-db/mycli/Manifest @@ -1,4 +1,4 @@ -DIST mycli-1.64.0.tar.gz 356929 BLAKE2B 2cc581f8f79c75aafb2eae6523ac3b2842e958ef45b4031cafea78a17dd6c5df01e778b51c9e4002c82ce31b297636ad1f26141d20e98b483a54280c27ea06e8 SHA512 b4af6b15990975e40a4ff15e605e2692d71b3a54bd83b84dc97b8a5b638eadf6e95d3a311abbb8f07e55c10b119bcf738bdf663366cf04ed2432039cbedc8efe -DIST mycli-1.64.0.tar.gz.provenance 9605 BLAKE2B 320f5f1ef0b356948a2e87b8acb0b99ad840ede59fe8b5bf102b472ed25ef4b6d8c03ec41b95e1edc4346068364bae4f6bdbe956d3efded926756936bf08da1b SHA512 aa1e1f5e31addc744c8cf378e400aa034da7eb89e93d9458eccdecfd52bfa261ff990ce21267f7961f1ffedffc3b8499eb0899fcec06d87e078d3de994cf38f0 DIST mycli-1.65.0.tar.gz 358883 BLAKE2B f155547301dc01fd3e2546dc662998f7f9c2bb301a0b8081b7eac1078782a879d0f96854ca50be298a144ca292b9a119032890091115c76726811621faa8bab6 SHA512 fcd58c72cc0d98c58467e90e566f79d1ce4693ce79b0be49203a547f3a92f0818ba04ebfc8c0822a5807e37701ec1345d785bd01e1d5fad1258f28d188b375f8 DIST mycli-1.65.0.tar.gz.provenance 9484 BLAKE2B f9af01db05dac0a069e3a5da5ccb9c3741079f21c6f3d0dcc07eb475d672aa6ecd83eb992f3f8c8fa42ca5b4d1d6707d961012a4677f9f9244a5fcf2fda71fbb SHA512 0d1418fd257a7efab78f1266eb166b37669c9fa308b93c1f84ffe967e74d83da33cf7265930329296fed5ae5161107edb207780922961251b81df0220035422d +DIST mycli-1.70.0.tar.gz 461619 BLAKE2B 88202706c1a0869da08dda0dc09ac2bb2597c84258d8e8d68a0a227d829a3bb88e9bb66065457e15dac1f3993c952aca14ec6b7234ddf9e3f5b820a38438e6cf SHA512 94546ceb40ce91476381c4c242e344c8bb8bb9728122f3a2dd8136ce5dfe6b7ed7e7bd059a7398e2907dad53d319ab2abafe175cd708fa1e5d743d1c009f0cd6 +DIST mycli-1.70.0.tar.gz.provenance 9373 BLAKE2B b45211cc1f9ea6f0e10c24b40f05bfc8c2a40097689c58f5b898614a60ba9c9508b6624d026d4228379da9d4b961f27288928a9a490f4e14ac1c6fd7ae618eb2 SHA512 3fdd28bd6738ed130b5b7eda5553b5f954e357da6ab89d63c39c6efa4d861b08966ebcabfeb3b57213d9e89c279ffa1268c3db9a2b6cf7ea42093c541ef0529c diff --git a/dev-db/mycli/mycli-1.64.0.ebuild b/dev-db/mycli/mycli-1.70.0.ebuild similarity index 93% rename from dev-db/mycli/mycli-1.64.0.ebuild rename to dev-db/mycli/mycli-1.70.0.ebuild index a6ec734f4e13c..d87bd93bf51fe 100644 --- a/dev-db/mycli/mycli-1.64.0.ebuild +++ b/dev-db/mycli/mycli-1.70.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="BSD MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~amd64" # optional llm unpackaged IUSE="ssh" @@ -28,8 +28,9 @@ IUSE="ssh" # https://github.com/dbcli/mycli/issues/1464 RDEPEND=" $(python_gen_cond_dep ' - >=dev-python/cli-helpers-2.11.0[${PYTHON_USEDEP}] + >=dev-python/cli-helpers-2.12.0[${PYTHON_USEDEP}] >=dev-python/click-8.3.1[${PYTHON_USEDEP}] + >=dev-python/clickdc-0.1.1[${PYTHON_USEDEP}] >=dev-python/configobj-5.0.9[${PYTHON_USEDEP}] >=dev-python/cryptography-46.0.5[${PYTHON_USEDEP}] >=dev-python/keyring-25.7.0[${PYTHON_USEDEP}] @@ -41,7 +42,7 @@ RDEPEND=" >=dev-python/pymysql-1.1.2[${PYTHON_USEDEP}] >=dev-python/pyperclip-1.11.0[${PYTHON_USEDEP}] >=dev-python/rapidfuzz-3.14.3[${PYTHON_USEDEP}] - >=dev-python/sqlglot-29.0.1[${PYTHON_USEDEP}] + >=dev-python/sqlglot-30.4.3[${PYTHON_USEDEP}] =dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}] >=dev-python/wcwidth-0.6.0[${PYTHON_USEDEP}] @@ -92,6 +93,9 @@ python_prepare_all() { sed -e '/edit sql in file with external editor/i @gentoo_skip' \ -i test/features/iocommands.feature || die + # avoid unpackaged pytest-random-order + sed -e "/^addopts =/ s/, '--random-order'//" -i pyproject.toml || die + distutils-r1_python_prepare_all } @@ -136,11 +140,7 @@ src_test() { 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 + test/pytests/test_special_llm.py ) local failures=() diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest index c66826944e49a..4ac971f843865 100644 --- a/dev-db/mysql-connector-c++/Manifest +++ b/dev-db/mysql-connector-c++/Manifest @@ -1,2 +1,3 @@ DIST mysql-connector-c++-9.4.0-src.tar.gz 4788987 BLAKE2B 41a6cfbcfcca91b9a244fa30c6f1857ea4574e084bc9d2283bd0f34777acabb5dc30084c401ca7c12213f7d9a6e14d019182df48da86a59f48e32e2444626ea3 SHA512 80fc167c2ac0f6f1a368cb4778c67c3d95d713f8d350169d4a9e733a81bc60b4ed9847d1d6a29d1ca0e01002b0266c1391ef4b59604f5060ff81d62030c233c5 DIST mysql-connector-c++-9.6.0-src.tar.gz 4789835 BLAKE2B d4991161d524e887b7dff1eacf719f9114657dd4a34df9c2b20882f8eb125ec0d86527464b7f1444fbe4e9f346dd92b49a5a6a48675ed3e426b599628be3c5d3 SHA512 227854759a19d5738ca4a33b128242b166699b0e664652e8f621c084898c84ac0c99daeeb4ee9c68bef2c2bd539f268bfb0f38d8ead590ea0b27919865655442 +DIST mysql-connector-c++-9.7.0-src.tar.gz 4790031 BLAKE2B f826020d96779f92118acd266de1e397f55cbeff49a8091ebad79ae7d868e1e8dad4d3dd17cfc0acce76d06472c85d667fbc8e51f07ed1b62f0c8f78135759fa SHA512 9c29c0baab89f37d0eeec0c78fce9707d8ad8605cbb1ed660a9845d046ba67a4abada88ef585d69a7f7c0077a2bc65f1058696fee1c53724dd52cf976e8cacb6 diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-9.7.0.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-9.7.0.ebuild new file mode 100644 index 0000000000000..e6e5dfba2a5b3 --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-9.7.0.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +URI_DIR="Connector-C++" +DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" +HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" +SRC_URI=" + https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz +" +S="${WORKDIR}/${P}-src" + +LICENSE="Artistic GPL-2" +# See ABI_VERSION(s) is version.cmake +SLOT="0/2.10" # ABI_VERSION_MAJOR/JDBC_ABI_VERSION_MAJOR +# -ppc, -sparc for bug #711940 +KEYWORDS="~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86" +IUSE="+legacy test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/lz4:= + app-arch/zstd:= + dev-libs/openssl:= + virtual/zlib:= + legacy? ( + >=dev-db/mysql-connector-c-8.0.27:= + ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-cpp/gtest + ) +" +BDEPEND=" + test? ( + >=dev-db/mysql-8[server] + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.27-mysqlclient_r.patch + "${FILESDIR}"/${PN}-8.0.33-jdbc.patch + "${FILESDIR}"/${PN}-9.2.0-gcc-15-cstdint.patch + "${FILESDIR}"/${PN}-9.2.0-test-iomanip.patch + "${FILESDIR}"/${PN}-9.4.0-hookup-tests.patch + "${FILESDIR}"/${PN}-9.4.0-cmake4.patch +) + +src_prepare() { + cmake_src_prepare + + # ignores MAKEOPTS and runs recursive make -j$(nproc). Clobbers jobs badly + # enough that your system immediately freezes. + # + # https://bugs.gentoo.org/921309 + # https://bugs.mysql.com/bug.php?id=115734 + sed -i 's/prc_cnt AND NOT/FALSE AND NOT/' cdk/cmake/dependency.cmake || die +} + +src_configure() { + # sanity check subslot to kick would be drive by bumpers + local detected_abi + detected_abi="$(awk '$1 ~ "set.*ABI_VERSION_MAJOR" {printf("%s.",$2)}' version.cmake)" + detected_abi="${detected_abi%.}" + if [[ "${SLOT#0/}" != "${detected_abi}" ]]; then + die "Sub slot ${SLOT#0/} doesn't match upstream specified ABI ${detected_abi}." + fi + + local mycmakeargs=( + -DBUNDLE_DEPENDENCIES=OFF + # Cannot handle protobuf >23, bug #912797 + #-DWITH_PROTOBUF=system + -DWITH_LZ4=system + -DWITH_SSL=system + -DWITH_ZLIB=system + -DWITH_ZSTD=system + -DWITH_JDBC=$(usex legacy) + -DWITH_TESTS=$(usex test) + ) + + if use legacy ; then + mycmakeargs+=( + -DMYSQLCLIENT_STATIC_BINDING=0 + -DMYSQLCLIENT_STATIC_LINKING=0 + ) + fi + + cmake_src_configure +} + +# NOTE: Test failures in jdbc may be a sign of issues in mysql-connector-c. +src_test() { + local CMAKE_SKIP_TESTS=( + # Test that configures, builds and install a test project again. It gets caught on the install phase. + Link_test + # Only ipv4 will work as only the ipv4 local address is specified. A future task for someone... + # https://dev.mysql.com/doc/refman/8.4/en/x-plugin-options-system-variables.html#sysvar_mysqlx_bind_address + Sess.ipv6 + # FIXME: + # not ok 15 - preparedstatement::queryAttributes # assertEquals(int) failed in + # /var/tmp/portage/dev-db/mysql-connector-c++-9.2.0/work/mysql-connector-c++-9.2.0-src/jdbc/test/unit/classes/preparedstatement.cpp, + # line #1582 expecting '200' got '0' + jdbc_test_preparedstatement + ) + + local -x MYSQL_HOST="127.0.0.1" + local -x MYSQL_PORT="5555" + local -x MYSQL_USER="$(whoami)" + local -x MYSQL_PASSWORD="insecure" + local -x XPLUGIN_PORT="5556" + + einfo "Creating mysql test instance" + mkdir -p "${T}"/mysql || die + mysqld \ + --no-defaults \ + --initialize-insecure \ + --user root \ + --basedir="${EPREFIX}/usr" \ + --datadir="${T}"/mysql 1>"${T}"/mysqld_install.log || die + + einfo "Starting mysql test instance ..." + mysqld \ + --no-defaults \ + --character-set-server=utf8 \ + --bind-address=${MYSQL_HOST} \ + --port=${MYSQL_PORT} \ + --socket="${T}"/mysqld.sock \ + --mysqlx-bind-address=${MYSQL_HOST} \ + --mysqlx-port=${XPLUGIN_PORT} \ + --mysqlx-socket="${T}"/mysqlx.sock \ + --pid-file="${T}"/mysqld.pid \ + --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 "Configure mysql test instance ..." + # https://github.com/mysql/mysql-connector-cpp/blob/trunk/jdbc/test/CJUnitTestsPort/README + mysql -u root \ + -e "CREATE USER ${MYSQL_USER} IDENTIFIED BY '${MYSQL_PASSWORD}'; GRANT ALL PRIVILEGES ON *.* TO ${MYSQL_USER} WITH GRANT OPTION;" \ + -S "${T}/mysqld.sock" \ + -h ${MYSQL_HOST} \ + -P ${MYSQL_PORT} || die + mysql -u root \ + -S "${T}/mysqld.sock" \ + -h ${MYSQL_HOST} \ + -P ${MYSQL_PORT} < "${S}"/jdbc/test/CJUnitTestsPort/cts.sql || die + + # Do tests with one job for proper clean up in database tests. + nonfatal cmake_src_test -j1 + local ret=${?} + + 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 + + [[ ${ret} -ne 0 ]] && die +} + +src_install() { + cmake_src_install + einstalldocs + + # cmake package config file appears to be broken in multiple ways + rm "${ED}/usr/mysql-concpp-config.cmake" || die + rm "${ED}/usr/mysql-concpp-config-version.cmake" || die +} diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 96a2131260c2d..96911a79e0267 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,9 +1,9 @@ DIST mysql-8.0.43-patches-01.tar.xz 8396 BLAKE2B 83c1992ae6f3b58f5c0e07926abb36fd1581f6db5a4e440b62e16f87d99133797c74e889f1a0e99d407ab7882f825b516885599cdb41e4429b405c968c995dbf SHA512 8e1480817f924c6a3db1ac412fe551337cfa134bf2729344fdb811d44ced96c78300ffca0eabc4ddd5e24827ebc1ddeea6c5973fd00ecd4c7fe67fe96d4c0081 DIST mysql-8.4.7-patches-01.tar.xz 8268 BLAKE2B 5a580c4295c246ffaad0d2819ab2860d0f762b633611b5c4a9c1cfb4f0a959d20595148108ea04fc9f0a699f46c39939e3c093fa0845d717133807ce8f1c74a6 SHA512 d451c6766b41cc95356e7c7cd45238d18236d9d71225e00b129d30c59463bc5c05f077a9c9d77b605fecb07189dd8502e8a6568cc5b75264e2255ffcd61715e9 -DIST mysql-8.4.7.tar.gz 478948308 BLAKE2B e2ca33c1149e5c48fdee4c46444ebce8585c95ec32c2a73970cfc194728f159ad599807eb93c0b95f6bb34498cf7a8599d5fe2f802e6116d0e93b175e5d7cf46 SHA512 d9596395b176490d5e58be307c2f82f55c9acd3206c1ba29bdb8c96c67438bbe5594621f601161ccb77f56c8262d00255ab6fd8aa62db61c80a1721e3d4e45a2 -DIST mysql-8.4.7.tar.gz.asc 833 BLAKE2B 8b8e430b72e0b928a9cdfae965f4e08b7bb2add5e2e9ac2254bc648e4230610d59cefd7f46f83b917ab0752c6434fe0a745944c45174ae3a75ec6429dac3e650 SHA512 51c22eef6e3611da0ce524784844339063ffabb378f0069e7abccee95a16cd8b9cc248b9eff1622adce6cb625322837b93f44fbd5668d18c79b0fd6875032798 DIST mysql-8.4.8.tar.gz 479002191 BLAKE2B 98ebaee3eab210c00743699149314351607c805a040d965ecb406789c8272a1f9985e72c2d6c7263d632da39abe36978c4a220588cd0e2821cf91de0f145a546 SHA512 4e95db1a1c2bf99240d846e690784616b15fb3137b4512072ad71a40911c5bb72c0b0354cc588aab7cd5d396e1d1c709a63d9cd09ae664d8fe6ed0f7683e4cf6 DIST mysql-8.4.8.tar.gz.asc 833 BLAKE2B 0991cedf1bc5048ffe278b83411bcffbe7003011bee403341b62671117cba4369729b395287f35ac972a478a6ab0e41e8733bc660d3b04d28c612914a6c2bc7a SHA512 62fcf0be950f5f9bcec0670bba921d556218a33776f524395ab0d0710c54060192e40e52e1307ed10516cb0553f994ba00dc10342cc9620f5ff20e5705eaf28b -DIST mysql-boost-8.0.43.tar.gz 492715363 BLAKE2B cce0d525a218cc15293611b96402832398152575fa94ad24373f31252e491bc69ed99603e2822bfbe32e0be155d12963ed40857672a8d2ac3a65fbd3acffbe17 SHA512 433666f03448833a24e3811afb0fb98cdaeac573f1dc3b682afa10f534f3d3750c515ea93ef2b07557ea5d7151051e181a845e0885d2ac63f01558938c4485ba +DIST mysql-8.4.9.tar.gz 479076177 BLAKE2B bbb9a65d3ba52b734ed4a7654dcda24584d9da87ba817bd025ec63c76f6728a67d26cb9a3effe362ab94eb2651192c7b698c0f6ca2826c15d1faeabd9e37714b SHA512 bae8aba6ba921f96799063f6c10f9f02030276f802e74a8b80f2df34e56b0d4501a1c9a9f818529cb70ec700a8f11aedf7fa645fa5db8550f51291759e6a25ad +DIST mysql-8.4.9.tar.gz.asc 833 BLAKE2B 11d9693dc95b7897492022a64a0205c72cd8978b1e62c28019a9f7223d1070442c869028b2075ed5c37a90a87e07cf77b66c7a41b6c37c8b5c6ebb956c60bde9 SHA512 71944c031d4e7b73ec8c1eace4bd51220b42e1528291c3cdf0ceab25fc0b56f198c756af60f340596ef7d9ebb86e7de341eaef49b1124bb520a54221f028943f DIST mysql-boost-8.0.44.tar.gz 492448984 BLAKE2B e018119cb65d6835693cbc4401fc83e54d71e887578da9ea7b5d1ba8053bd7e4de2912553db6da7c8b3569d03b82391dd1858125bc7756d519e73652948f5e9d SHA512 f6881d6f88a4060796e1eac47c1ffe3ea005c27f1b0509fd97774ba5b1e7bf86d0f8c4e13126750f0cc3dd86af92c26459ae8fecf9e8f0f058dab43e93bb3b42 DIST mysql-boost-8.0.45.tar.gz 492472802 BLAKE2B cb253e2c69534c54ea6e79095619ebd4ed0b2187bd5e3b5746c5e6f92a08289df17cbb05305a9c23f3f11f2c78042a7e3edf98f33c9e5f35cc85102bfc97d328 SHA512 9ab52da87e9c1570328080b802f8c9ca1bcbb08e489e1d6cc3282b994cfd07099a0cf5eee420faa684e8372aee66495b34b633224dca98cd5caa8f4a93e500a4 +DIST mysql-boost-8.0.46.tar.gz 492495969 BLAKE2B d2f1132b3069e3ac42e884a3c02dfbcf7a23083c9559950b117ca83b6ada7159ff92c83a84c4cf09dfc10df7aa56cbe7ae85751aadcf35e9e694a485edb4c2b2 SHA512 b90ee9ad03ddc4732d2942ae4918010a7c398b2080f0e11750df0e61ec07a17bf26ce6aea8806729250b015607e398a8608363ed0830f4f613fafd09dbab7412 diff --git a/dev-db/mysql/mysql-8.0.43.ebuild b/dev-db/mysql/mysql-8.0.46.ebuild similarity index 97% rename from dev-db/mysql/mysql-8.0.43.ebuild rename to dev-db/mysql/mysql-8.0.46.ebuild index e711bbaf59d0f..b63a4e1e3f5bd 100644 --- a/dev-db/mysql/mysql-8.0.43.ebuild +++ b/dev-db/mysql/mysql-8.0.46.ebuild @@ -25,7 +25,7 @@ S="${WORKDIR}/mysql" LICENSE="GPL-2" SLOT="8.0" # -ppc for bug #761715 -KEYWORDS="amd64 arm arm64 ~hppa ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris" IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test test-install" RESTRICT="!test? ( test )" @@ -47,12 +47,12 @@ COMMON_DEPEND=" >=app-arch/lz4-1.9.4:= >=app-arch/zstd-1.2.0:= >=dev-libs/openssl-1.0.0:= + net-libs/libtirpc:= sys-libs/ncurses:= >=virtual/zlib-1.2.13:= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads(+)] - net-libs/libtirpc:= cjk? ( app-text/mecab ) jemalloc? ( dev-libs/jemalloc:= ) kernel_linux? ( @@ -119,8 +119,6 @@ PATCHES=( "${FILESDIR}"/mysql-8.0.37-fix-bundled-boost.patch # Needed due to bundled abseil-cpp-20230802, this fix is included in abseil-cpp-20240722 "${FILESDIR}"/mysql-8.0.37-fix-bundled-abseil.patch - # for 8.0.43 only - "${FILESDIR}"/mysql-8.0.43-fix-clang-20-allocator.patch ) mysql_init_vars() { @@ -502,15 +500,6 @@ src_test() { "main.keyring_migration_password;0;Known test failure -- no upstream bug yet" "innodb.upgrade_orphan;0;Known test failure -- no upstream bug yet" - - # Updated in newer versions - # https://github.com/mysql/mysql-server/commit/269f4ef1e091c7a4404450f97c5ae1845443eb25 - "auth_sec.admin_channel_tls;0;Certificate expired" - "auth_sec.admin_channel_tls_startup;0;Certificate expired" - "auth_sec.cert_verify;0;Certificate expired" - "auth_sec.cert_verify_openssl;0;Certificate expired" - "x.mysqlxtest_mode_ssl;0;Certificate expired" - "x.mysqlxtest_mode_ssl_unixsocket;0;Certificate expired" ) if ! hash zip 1>/dev/null 2>&1 ; then @@ -595,6 +584,14 @@ src_test() { einfo "Will run test suite with open file limit set to 16500 (best test coverage)." fi + local test_failures=() + + # bug #823656 + nonfatal cmake_src_test --test-command "--gtest_death_test_style=threadsafe" + if [[ $? -ne 0 ]]; then + test_failures+=( cmake_src_test ) + fi + # run mysql-test tests # Enable force restart to ensure success when tests don't cleanup sufficiently. # Anything touching gtid_executed is negatively affected if you have unlucky ordering @@ -606,7 +603,13 @@ src_test() { --retry=3 --retry-failure=2 \ --report-unstable-tests \ --report-features - retstatus_tests=$? + if [[ $? -ne 0 ]]; then + test_failures+=( mysql-test-run.pl ) + + eerror "Tests failed. When you file a bug, please attach the following items:" + eerror "The file that is created with this command:" + eerror "\t'find ${T}/var-tests -name '*.log' | tar -caf mysql-test-logs.tar.xz --files-from -'" + fi if [[ "${VARDIR}" != "${T}/var-tests" ]]; then # Move vardir to tempdir. @@ -615,23 +618,17 @@ src_test() { rm -rf "${VARDIR}" 2>/dev/null fi - if [[ "${retstatus_tests}" -ne 0 ]]; then - eerror "Tests failed. When you file a bug, please attach the following items:" - eerror "The file that is created with this command:" - eerror "\t'find ${T}/var-tests -name '*.log' | tar -caf mysql-test-logs.tar.xz --files-from -'" - fi - popd &>/dev/null || die # Cleanup is important for these testcases. pkill -9 -f "${S}/ndb" 2>/dev/null pkill -9 -f "${S}/sql" 2>/dev/null - # bug #823656 - cmake_src_test --test-command "--gtest_death_test_style=threadsafe" - - [[ "${retstatus_tests}" -ne 0 ]] && die "Test failures: mysql-test-run.pl" - einfo "Tests successfully completed" + if [[ ${#test_failures} -eq 0 ]]; then + einfo "Tests successfully completed" + else + die "Test failures: ${test_failures[@]}" + fi } src_install() { diff --git a/dev-db/mysql/mysql-8.4.7.ebuild b/dev-db/mysql/mysql-8.4.9.ebuild similarity index 99% rename from dev-db/mysql/mysql-8.4.7.ebuild rename to dev-db/mysql/mysql-8.4.9.ebuild index 892d43038fa37..b4dede13e7396 100644 --- a/dev-db/mysql/mysql-8.4.7.ebuild +++ b/dev-db/mysql/mysql-8.4.9.ebuild @@ -65,11 +65,11 @@ COMMON_DEPEND=" >=app-arch/lz4-1.9.4:= >=app-arch/zstd-1.2.0:= >=dev-libs/openssl-1.0.0:= + net-libs/libtirpc:= sys-libs/ncurses:= >=virtual/zlib-1.2.13:= server? ( dev-libs/icu:= - net-libs/libtirpc:= cjk? ( app-text/mecab ) jemalloc? ( dev-libs/jemalloc:= ) kernel_linux? ( @@ -126,7 +126,7 @@ BDEPEND=" dev-perl/JSON sys-libs/timezone-data ) - verify-sig? ( >=sec-keys/openpgp-keys-mysql-20231023 ) + verify-sig? ( >=sec-keys/openpgp-keys-mysql-20250120 ) " PATCHES=( diff --git a/dev-python/clickdc/Manifest b/dev-python/clickdc/Manifest new file mode 100644 index 0000000000000..349ec2b1eb948 --- /dev/null +++ b/dev-python/clickdc/Manifest @@ -0,0 +1 @@ +DIST clickdc-0.1.1.tar.gz 10128 BLAKE2B 98d9cf5f223be841c07698ec3a42f8cf49b8808d8090a7a5aaa2809c44d613f87e81fa2cee99e1cb611f8b0b691faaa9fd9de9fa71fb85e17e4845409bd44621 SHA512 9b369d86240da16cc38edae7b7ca705610c8afce3240fafeb287053b860c40cd30bd3af48a73fb5d4444cb62ecb1266c505f817f231671b95d0413fb416e7a6c diff --git a/dev-python/clickdc/clickdc-0.1.1.ebuild b/dev-python/clickdc/clickdc-0.1.1.ebuild new file mode 100644 index 0000000000000..9894ae3e95364 --- /dev/null +++ b/dev-python/clickdc/clickdc-0.1.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{12..14} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Define click command line options from a python dataclass" +HOMEPAGE=" + https://github.com/Kamilcuk/clickdc + https://pypi.org/project/clickdc/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pydantic[${PYTHON_USEDEP}] + ) +" + +EPYTEST_DESELECT=( + # Irrevelant downstream, unpackaged pyright + "tests/test_typing.py" +) +EPYTEST_PLUGINS=() +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/clickdc-0.1.1-click-8.2.patch +) + +python_prepare_all() { + # workaround setuptools-git-versioning + sed -e "/^\[project\]/aversion = \"${PV}\"" \ + -e '/^dynamic =/ s/"version", //' \ + -i pyproject.toml || die + + distutils-r1_python_prepare_all +} diff --git a/dev-python/clickdc/files/clickdc-0.1.1-click-8.2.patch b/dev-python/clickdc/files/clickdc-0.1.1-click-8.2.patch new file mode 100644 index 0000000000000..13cdbad77d5eb --- /dev/null +++ b/dev-python/clickdc/files/clickdc-0.1.1-click-8.2.patch @@ -0,0 +1,15 @@ +More complicated patch +https://github.com/Kamilcuk/clickdc/pull/3 + +--- a/tests/test.py ++++ b/tests/test.py +@@ -11,7 +11,7 @@ import clickdc + + + def invoke(*args, **kwargs): +- return CliRunner(mix_stderr=True).invoke(*args, **kwargs) ++ return CliRunner().invoke(*args, **kwargs) + + + def run(arg_class, input: str, output: Any = None, fail: int = 0, toargs: bool = False): + diff --git a/dev-python/clickdc/metadata.xml b/dev-python/clickdc/metadata.xml new file mode 100644 index 0000000000000..076d44c24befd --- /dev/null +++ b/dev-python/clickdc/metadata.xml @@ -0,0 +1,12 @@ + + + + + python@gentoo.org + + + + Kamilcuk/clickdc + clickdc + + diff --git a/dev-python/pypax/pypax-0.9.5-r2.ebuild b/dev-python/pypax/pypax-0.9.5-r2.ebuild index 71d1782aaaebd..91ac7335b3a16 100644 --- a/dev-python/pypax/pypax-0.9.5-r2.ebuild +++ b/dev-python/pypax/pypax-0.9.5-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_COMPAT=( python3_{11..14} ) inherit distutils-r1 diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild index ad89926ea24cf..214c19bce065a 100644 --- a/dev-python/pypax/pypax-9999.ebuild +++ b/dev-python/pypax/pypax-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..14} ) inherit distutils-r1 diff --git a/dev-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest index 831bdf46d443f..3e2a20ee6e5fa 100644 --- a/dev-util/android-udev-rules/Manifest +++ b/dev-util/android-udev-rules/Manifest @@ -1,2 +1,2 @@ -DIST android-udev-rules-20250314.tar.gz 25109 BLAKE2B 8e0738d69a244a5df42b696d32f4d7ca629f660598fb470eb4dcfab93c937aea3bc2a9d9ed5a9ebbd65714551b81cd95cab5cf51e1cb5cc07128c2f741c60afd SHA512 792851a7579cc183f15900d74c476ed3a96e8cfe5a510a0c9f0ee5ee16642f497c237a32d68d725efcbeeade613cc0fb6135e5ed5797a84d776e367e1b5b5974 DIST android-udev-rules-20250525.tar.gz 23794 BLAKE2B 2a086c3451d7f5309108960eff25afc77e7902e3bbf68018b1a4b89115123e7a45c293dbecece217a5565f71e5688e3996426f0e6a1167bf35deb14da4bddb70 SHA512 c4370ba89ee240d540b6a18e6fd37bace27315b9637577eb08c48cfec8c77dcb8ebfebdf2b7853b9f3c7db35fe50458af52d070946bb0ab0db67539470bbf0ad +DIST android-udev-rules-20260423.tar.gz 23917 BLAKE2B 0149de234ac44e72b05cfb5467d636ee71b29e04bf80036524912823f9fe6c831c3493c7f6b44c6969e369432df25379f97c48df3992593a776016b2971c623a SHA512 97966f1c02a9f85825a217384c94cfa8b9f721173e543c324b866ee7823b09ca67ec7ba1b012ce10de9d56ae7e4157d4cec8364c8e325001664cf6383778a5fe diff --git a/dev-util/android-udev-rules/android-udev-rules-20250314.ebuild b/dev-util/android-udev-rules/android-udev-rules-20260423.ebuild similarity index 90% rename from dev-util/android-udev-rules/android-udev-rules-20250314.ebuild rename to dev-util/android-udev-rules/android-udev-rules-20260423.ebuild index 7fe4e9222260f..0dc57aebae4a5 100644 --- a/dev-util/android-udev-rules/android-udev-rules-20250314.ebuild +++ b/dev-util/android-udev-rules/android-udev-rules-20260423.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2025 Gentoo Authors +# Copyright 2022-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.ta LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm arm64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" # No tests RESTRICT="test" diff --git a/dev-util/gtest-parallel/gtest-parallel-20250716.ebuild b/dev-util/gtest-parallel/gtest-parallel-20250716.ebuild index 670054a5c704d..b615f7b3a263e 100644 --- a/dev-util/gtest-parallel/gtest-parallel-20250716.ebuild +++ b/dev-util/gtest-parallel/gtest-parallel-20250716.ebuild @@ -1,4 +1,4 @@ -# Copyright 2025 Gentoo Authors +# Copyright 2025-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64" +KEYWORDS="amd64 arm64" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest index 536a718d2be5c..b83cc90591e21 100644 --- a/media-gfx/qiv/Manifest +++ b/media-gfx/qiv/Manifest @@ -1 +1,2 @@ DIST qiv-3.0.2.tar.gz 143688 BLAKE2B 5f5fa04383ef7a7f0891279a1644cc6ecdc59c43dd8d0fcbbb9b03aa8e7633e9afb2e039a47e745f1bb2f2ea8d5b38cd62a3c0d3e1a9708cf0630d27821f4626 SHA512 51c27eff7e4f65dd21c022d7f60c59e78f41adb2e6feadbc85842865c7d0a1c5d1fd752ad0bd96af77f33acfaed4d6fdb27acd824b92733a198064cb9122a1dd +DIST qiv-3.0.4.tar.gz 146841 BLAKE2B bc38dea92610a7251d76fd421b48d86898282365b66cfee2f63bc2431253b5ef2ce4ddd062dbbdb09d1dee53b687919261d142966d8eea9e717581b259f6f2ec SHA512 494630090ae8f86f71019db2fd3027715d8c7549edee1dcc15d0ea0569d5fc98c7b9f3518f688c9ab345b67a8f6bc59734b506af17fec3607ad52b301704cf6a diff --git a/media-gfx/qiv/qiv-3.0.4.ebuild b/media-gfx/qiv/qiv-3.0.4.ebuild new file mode 100644 index 0000000000000..3ed2f9c8d9c3b --- /dev/null +++ b/media-gfx/qiv/qiv-3.0.4.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature toolchain-funcs xdg + +DESCRIPTION="Quick Image Viewer" +HOMEPAGE="https://spiegl.de/qiv/ https://codeberg.org/ciberandy/qiv" +SRC_URI="https://codeberg.org/ciberandy/qiv/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~mips ~x86" +IUSE="exif lcms" +# just a launch-test +RESTRICT="test" + +RDEPEND=" + dev-libs/glib:2 + sys-apps/file + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11 + x11-libs/libXext + x11-libs/pango + exif? ( media-libs/libexif ) + lcms? ( + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/tiff:= + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + if ! use exif ; then + sed -i 's/^EXIF =/#\0/' Makefile || die + fi + + if ! use lcms ; then + sed -i 's/^LCMS =/#\0/' Makefile || die + fi +} + +src_compile() { + tc-export CC PKG_CONFIG + default +} + +src_install() { + local myemakeargs=( + PREFIX="${ED}/usr" + # do not compress the manpage + COMPRESS_PROG=true + # do not strip + STRIP_FLAG= + ) + emake "${myemakeargs[@]}" install + + dodoc Changelog contrib/qiv-command.example README README.TODO +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "GIF support" gui-libs/gdk-pixbuf[gif] + optfeature "JPEG support" gui-libs/gdk-pixbuf[jpeg] + optfeature "TIFF support" gui-libs/gdk-pixbuf[tiff] + optfeature "WebP support" gui-libs/gdk-pixbuf-loader-webp +} diff --git a/media-libs/svt-av1/svt-av1-3.1.2.ebuild b/media-libs/svt-av1/svt-av1-3.1.2.ebuild index a8b050908237b..d907fdaabbc8d 100644 --- a/media-libs/svt-av1/svt-av1-3.1.2.ebuild +++ b/media-libs/svt-av1/svt-av1-3.1.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git" else SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.bz2" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86" S="${WORKDIR}/SVT-AV1-v${PV}" fi diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest index 99497680f17fe..dca4b0573e761 100644 --- a/net-im/gajim/Manifest +++ b/net-im/gajim/Manifest @@ -1,3 +1,3 @@ DIST gajim-2.2.0.tar.gz 4798143 BLAKE2B 3799bacfd6a94d8313bf02c6f48d0e348aeb89147c730c8c5ef04d9cf1d8ff289cabd576cea55be755410080416706776c1af224fe1cd2a1fa63f4bbd887026c SHA512 b61682a8dde3beaf03d5be16091e54b2aada681493d4f4ad4a83bade37d3762d12663a0b918abbc07136c32925ba168780caaf9dfe9080872779026755286b45 -DIST gajim-2.4.4.tar.gz 5050978 BLAKE2B e8dd3f09d5f8bac0ec14813134d6182dcb9b7bf36062b894649116cba2fcad9aa3e4f0494570bc24f883041cc99a28a9d0d9c1d0d1eed735e427b01f677accc1 SHA512 442a4a8d8dfe1d22fb2cd10ebe30c38e6d7ce0f7bb6d1a7e3022c89e9c24b699bd0cf9c64ea19a8f3872d8d2ea052ebf241ab256310a1763550251739e89dd0e DIST gajim-2.4.5.tar.gz 5091348 BLAKE2B a162857a81c3a689a2a6cf692b95d3499eba7f1d1858bd9212f905333172c533f731f960a62ff2436933d5425ee1fbb9e09177ad426829ae828883896c9c5647 SHA512 37e7665e5b7d4b45af096fa002efdade412bb844f3403297a2fda21ae802272a687b47e1ab18bc0376403622ec80cd45fbda6804d3870356391901d1011b8168 +DIST gajim-2.4.6.tar.gz 5105111 BLAKE2B e105867689b615ac771a39600e279d8e11932ef948e32914bb314147987cf99ba612226d69cd546ff92c131046122ac09c14160f05aa4f67771b0be538720190 SHA512 36967064f90bbddd1e84e93129d13eef6f5ca47a1e8417ca19feb5a411b860949c8acb8e8c9db558ee662a379a97eb1026a3d74ec1e5f5c8d4114a5fa9409ae3 diff --git a/net-im/gajim/files/gajim-2.2.0-py3.14.patch b/net-im/gajim/files/gajim-2.2.0-py3.14.patch new file mode 100644 index 0000000000000..d93e555e015e5 --- /dev/null +++ b/net-im/gajim/files/gajim-2.2.0-py3.14.patch @@ -0,0 +1,34 @@ +https://dev.gajim.org/gajim/gajim/-/commit/89272f260c318389be10855c42ad0b82de385c77 + +From 89272f260c318389be10855c42ad0b82de385c77 Mon Sep 17 00:00:00 2001 +From: Philipp Hörist +Date: Sat, 29 Nov 2025 14:45:13 +0100 +Subject: [PATCH] fix: Commands: Don’t fail to create commands with python 3.14 + +--- a/gajim/common/commands.py ++++ b/gajim/common/commands.py +@@ -9,6 +9,7 @@ + import io + import operator + import shlex ++import sys + from collections.abc import Callable + + from nbxmpp.protocol import JID +@@ -77,7 +78,12 @@ def __init__(self) -> None: + Observable.__init__(self) + + def init(self) -> None: +- self._parser = ArgumentParser(prog='ChatCommands') ++ if sys.version_info >= (3, 14): ++ # Disable colors because we depend on a stable format for the ++ # usage string ++ self._parser = ArgumentParser(prog='ChatCommands', color=False) ++ else: ++ self._parser = ArgumentParser(prog='ChatCommands') + self._sub_parser = self._parser.add_subparsers(title='Commands') + self._commands: dict[str, tuple[list[str], str]] = {} + +-- +GitLab + diff --git a/net-im/gajim/gajim-2.2.0-r1.ebuild b/net-im/gajim/gajim-2.2.0-r1.ebuild new file mode 100644 index 0000000000000..44e6e51ab94ad --- /dev/null +++ b/net-im/gajim/gajim-2.2.0-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..14} ) +PYTHON_REQ_USE="sqlite,xml(+)" +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 optfeature xdg + +DESCRIPTION="GTK XMPP Client" +HOMEPAGE="https://gajim.org/" +SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" + +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="voice" + +# Same order as in upstream pyproject.toml please for the python dependencies + +# For introspection dependencies consult upstream documentation and any gi.require_version in the code + +# USE="voice" handles all video and audio. +# https://dev.gajim.org/gajim/gajim#for-video-and-audio-calls +# https://dev.gajim.org/gajim/gajim#for-voice-messages + +# xdg-desktop-portal: apparent runtime requirement +# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2963fc1a23747bbb60a3785bf06dd566e6d8be9 + +RDEPEND="${COMMON_DEPEND} + >=dev-python/cryptography-3.4.8[${PYTHON_USEDEP}] + dev-python/css-parser[${PYTHON_USEDEP}] + >=dev-python/emoji-2.6.0[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + =dev-python/nbxmpp-6.2.0[${PYTHON_USEDEP}] + =dev-python/omemo-dr-1.0.0[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + >=dev-python/pillow-9.1.0[${PYTHON_USEDEP}] + >=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}] + >=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}] + >=dev-python/pygobject-3.42.0:3[cairo,${PYTHON_USEDEP}] + >=dev-python/qrcode-7.3.1[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-2.0.0[${PYTHON_USEDEP}] + + dev-libs/glib[introspection(+)] + >=gui-libs/gtk-4.14.0:4[introspection] + gui-libs/gtksourceview:5[introspection] + media-libs/graphene[introspection] + net-libs/libsoup:3.0[introspection] + x11-libs/gdk-pixbuf:2[introspection] + >=x11-libs/pango-1.50.0[introspection] + + voice? ( + media-libs/gstreamer:1.0[introspection] + media-libs/gst-plugins-base + media-libs/gst-plugins-ugly + media-plugins/gst-plugins-gtk + media-plugins/gst-plugins-libav + net-libs/farstream:0.2[introspection] + ) + + sys-apps/xdg-desktop-portal +" +BDEPEND=" + >=sys-devel/gettext-0.17-r1 +" + +EPYTEST_PLUGINS=() +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/gajim-2.2.0-py3.14.patch +) + +python_compile_all() { + # Generates manpages, app icons, translation and metadata + ./make.py build --dist unix || die +} + +python_install_all() { + # Installs manpages, app icons, translation and metadata + ./make.py install --dist unix --prefix="${ED}/usr" || die + + # Undo compression in ./make.py install + gzip -d "${ED}"/usr/share/man/man1/*.gz || die + + distutils-r1_python_install_all +} + +pkg_postinst() { + ewarn "The chat database format changes when upgrading from 1.8.x to 1.9.x." + ewarn "The first time the user starts Gajim, an automatic migration is performed." + + # https://dev.gajim.org/gajim/gajim/-/tree/master?ref_type=heads#optional-runtime-requirements + #optfeature "Sentry error reporting to dev.gajim.org" dev-python/sentry-sdk + optfeature "keyring support" app-crypt/libsecret[introspection] + optfeature "spellchecking support" "app-text/hunspell app-text/libspelling:1" + # https://dev.gajim.org/gajim/gajim/-/issues/11578 + #optfeature "better NAT traversing" net-libs/gupnp:1.6[introspection] + optfeature "network lose detection" net-misc/networkmanager[introspection] + optfeature "sharing your location" app-misc/geoclue:2.0[introspection] + optfeature "notifcation sound support" media-libs/gsound[introspection] + + xdg_pkg_postinst +} diff --git a/net-im/gajim/gajim-2.4.4.ebuild b/net-im/gajim/gajim-2.4.6.ebuild similarity index 95% rename from net-im/gajim/gajim-2.4.4.ebuild rename to net-im/gajim/gajim-2.4.6.ebuild index f25c4fa0f9ffe..2e62916548b6f 100644 --- a/net-im/gajim/gajim-2.4.4.ebuild +++ b/net-im/gajim/gajim-2.4.6.ebuild @@ -32,14 +32,14 @@ IUSE="voice" # httpx[http2,socks]: h2, socksio # gst-plugins-rs (uses gtk4paintablesink): media-plugins/gst-plugin-gtk4 RDEPEND=" - >=dev-python/cryptography-3.4.8[${PYTHON_USEDEP}] + >=dev-python/cryptography-43.0.0[${PYTHON_USEDEP}] dev-python/css-parser[${PYTHON_USEDEP}] >=dev-python/emoji-2.6.0[${PYTHON_USEDEP}] dev-python/h2[${PYTHON_USEDEP}] dev-python/httpx[${PYTHON_USEDEP}] dev-python/keyring[${PYTHON_USEDEP}] =dev-python/nbxmpp-7.1.0[${PYTHON_USEDEP}] + >=dev-python/nbxmpp-7.2.0[${PYTHON_USEDEP}] =dev-python/omemo-dr-1.2.0[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] @@ -109,7 +109,7 @@ pkg_postinst() { #optfeature "better NAT traversing" net-libs/gupnp:1.6[introspection] optfeature "network lose detection" net-misc/networkmanager[introspection] optfeature "sharing your location" app-misc/geoclue:2.0[introspection] - optfeature "notifcation sound support" media-libs/gsound[introspection] + optfeature "accurate version info about the used operating system" dev-python/distro xdg_pkg_postinst } diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index 92ad651fd4d68..c93040b25386f 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,2 +1,3 @@ DIST qmapshack-1.19.0.tar.gz 58382506 BLAKE2B 5280480d09ce70bd96fc9e96e36b2a2da412f3938230cb21921270d88cb5885b53517251afbe29c597a709d84c2db5e5c34d6fbaf43f3f3e8ac7a3592996ed07 SHA512 a3da5396d9f1c7773a06f1edfdfce627249ab892e0386d804cd974cd88f9ea657e0ea330ab1855171b4b7777c77084f63308a23f2343437e544b20e1162364e5 DIST qmapshack-1.20.1.tar.gz 57842834 BLAKE2B 88c4b2f0c293a8c1e067411f6ad9db64a32d549f189bfdc5fb9e0cb54a8c653b8da1b2e28e77431edb0f082fad2c9da5da312cb5e95c2b87051e0fca464dfea2 SHA512 f236431b6944757d12cfa8c4b5af7b43a4b989ce4ede763a5d616f45035dda89a21adb263f82e6e811f0d4f11158be63ed3caac087711fc618afdb770612c41a +DIST qmapshack-1.20.2.tar.gz 57864693 BLAKE2B b827982b27f1e34891abe5d64348295add98995e10a9d42b5ffe09b2d6ccf0104bba44b45e8d073d55081888c27bd1403bdea054afbba300dc59343d678e4fde SHA512 73c4bd9f2063e520d717f5414926fdd19b961b59b4701911de957f1003287a4e0819e64e8ce37cbd4aa10c4389decc6304127e02af74b64a258a86b20eff2d4b diff --git a/sci-geosciences/qmapshack/qmapshack-1.20.2.ebuild b/sci-geosciences/qmapshack/qmapshack-1.20.2.ebuild new file mode 100644 index 0000000000000..ac840a230862b --- /dev/null +++ b/sci-geosciences/qmapshack/qmapshack-1.20.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="GPS mapping utility" +HOMEPAGE="https://github.com/Maproom/qmapshack/wiki" +SRC_URI="https://github.com/Maproom/${PN}/archive/tags/V_${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-tags-V_${PV} + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="dbus" + +RDEPEND=" + dev-db/sqlite + >=dev-libs/quazip-1.3-r2:=[qt6(+)] + dev-qt/qt5compat:6 + dev-qt/qtbase:6[dbus?,gui,network,sql,widgets,xml] + dev-qt/qtdeclarative:6 + dev-qt/qttools:6[assistant,widgets] + dev-qt/qtwebengine:6[widgets] + sci-geosciences/routino + sci-libs/alglib + sci-libs/gdal:= + sci-libs/proj:= +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" + +src_configure() { + local mycmakeargs=( + -DUSE_QT6DBus=$(usex dbus) + -DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}/qch" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + docompress -x "/usr/share/doc/${PF}/qch" +} diff --git a/sys-apps/elfix/elfix-0.9.5-r2.ebuild b/sys-apps/elfix/elfix-0.9.5-r2.ebuild new file mode 100644 index 0000000000000..0f9edecc76586 --- /dev/null +++ b/sys-apps/elfix/elfix-0.9.5-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..14} ) +inherit python-single-r1 + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git" + inherit autotools git-r3 +else + SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="Suite of tools to work with ELF objects on Hardened Gentoo" +HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml + https://dev.gentoo.org/~blueness/elfix/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="+ptpax test +xtpax" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( ptpax xtpax ) +" +# These only work with a properly configured PaX kernel +RESTRICT="!test? ( test ) test" + +DEPEND="$(python_gen_cond_dep "~dev-python/pypax-${PV}[ptpax=,xtpax=,\${PYTHON_USEDEP}]") + ptpax? ( dev-libs/elfutils ) + xtpax? ( sys-apps/attr )" + +RDEPEND="${DEPEND} + ${PYTHON_DEPS}" + +src_prepare() { + default + if [[ ${PV} == *9999* ]]; then + eautoreconf + cd doc && ./make.sh || die + fi +} + +src_configure() { + rm -f "${S}/scripts/setup.py" || die + econf \ + $(use_enable test tests) \ + $(use_enable ptpax) \ + $(use_enable xtpax) +} + +src_install() { + default + python_fix_shebang "${ED}" +} diff --git a/sys-apps/elfix/elfix-9999.ebuild b/sys-apps/elfix/elfix-9999.ebuild index d7ed625acc47c..0f9edecc76586 100644 --- a/sys-apps/elfix/elfix-9999.ebuild +++ b/sys-apps/elfix/elfix-9999.ebuild @@ -1,8 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +PYTHON_COMPAT=( python3_{11..14} ) +inherit python-single-r1 + if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git" inherit autotools git-r3 @@ -18,15 +21,18 @@ HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml LICENSE="GPL-3+" SLOT="0" IUSE="+ptpax test +xtpax" -REQUIRED_USE="|| ( ptpax xtpax )" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( ptpax xtpax ) +" # These only work with a properly configured PaX kernel RESTRICT="!test? ( test ) test" -DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=] +DEPEND="$(python_gen_cond_dep "~dev-python/pypax-${PV}[ptpax=,xtpax=,\${PYTHON_USEDEP}]") ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + ${PYTHON_DEPS}" src_prepare() { default @@ -43,3 +49,8 @@ src_configure() { $(use_enable ptpax) \ $(use_enable xtpax) } + +src_install() { + default + python_fix_shebang "${ED}" +}