diff --git a/app-admin/xkcdpass/files/xkcdpass-1.30.0-fix-failing-test.patch b/app-admin/xkcdpass/files/xkcdpass-1.30.0-fix-failing-test.patch new file mode 100644 index 0000000000000..918b6e0281737 --- /dev/null +++ b/app-admin/xkcdpass/files/xkcdpass-1.30.0-fix-failing-test.patch @@ -0,0 +1,16 @@ +From b981361292ae7328313e116178acacc90680df5e Mon Sep 17 00:00:00 2001 +From: Steven Tobin +Date: Sat, 24 Jan 2026 11:35:40 +0000 +Subject: [PATCH] fix failing test + +--- a/tests/test_xkcdpass.py ++++ b/tests/test_xkcdpass.py +@@ -29,7 +29,7 @@ def setUp(self): + valid_chars='[a-z]') + + def test_loadwordfile(self): +- self.assertEqual(len(self.wordlist_full), 5670) ++ self.assertEqual(len(self.wordlist_full), 29611) + + def test_regex(self): + self.assertNotIn("__$$$__", self.wordlist_small) diff --git a/app-admin/xkcdpass/xkcdpass-1.30.0.ebuild b/app-admin/xkcdpass/xkcdpass-1.30.0.ebuild index a84af7e68ae93..ddece6fe0e2af 100644 --- a/app-admin/xkcdpass/xkcdpass-1.30.0.ebuild +++ b/app-admin/xkcdpass/xkcdpass-1.30.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_COMPAT=( python3_{9..14} ) inherit distutils-r1 pypi DESCRIPTION="Password generator inspired by XKCD 936" @@ -21,6 +21,10 @@ IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt" distutils_enable_tests pytest REQUIRED_USE="test? ( l10n_en )" +PATCHES=( + "${FILESDIR}"/${P}-fix-failing-test.patch +) + src_prepare() { default diff --git a/dev-ml/opam-common/files/fix-dotinstall-escape.patch b/dev-ml/opam-common/files/fix-dotinstall-escape.patch new file mode 100644 index 0000000000000..1481bddf18a05 --- /dev/null +++ b/dev-ml/opam-common/files/fix-dotinstall-escape.patch @@ -0,0 +1,22 @@ +diff --git a/src/format/opamFile.ml b/src/format/opamFile.ml +index c1c0a3f1dff..dd85ff45bc0 100644 +--- a/src/format/opamFile.ml ++++ b/src/format/opamFile.ml +@@ -3728,8 +3728,15 @@ module Dot_installSyntax = struct + Pp.V.map_list ~depth:1 @@ Pp.V.map_option + (Pp.V.string -| pp_optional) + (Pp.opt @@ +- Pp.singleton -| Pp.V.string -| +- Pp.of_module "rel-filename" (module OpamFilename.Base)) ++ Pp.singleton -| Pp.V.string -| Pp.pp ~name:"rel-filename" ++ (fun ~pos s -> ++ if OpamFilename.might_escape ~sep:`Unspecified s then ++ Pp.bad_format ~pos "%s references its parent directory." s ++ else if Filename.is_relative s then ++ OpamFilename.Base.of_string s ++ else ++ Pp.bad_format ~pos "%s is an absolute filename." s) ++ OpamFilename.Base.to_string) + in + let pp_misc = + Pp.V.map_list ~depth:1 @@ Pp.V.map_option diff --git a/dev-ml/opam-common/opam-common-2.3.0.ebuild b/dev-ml/opam-common/opam-common-2.3.0-r1.ebuild similarity index 94% rename from dev-ml/opam-common/opam-common-2.3.0.ebuild rename to dev-ml/opam-common/opam-common-2.3.0-r1.ebuild index 0759f84400134..c13e6af145498 100644 --- a/dev-ml/opam-common/opam-common-2.3.0.ebuild +++ b/dev-ml/opam-common/opam-common-2.3.0-r1.ebuild @@ -31,6 +31,8 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="dev-ml/findlib" +PATCHES=( "${FILESDIR}"/fix-dotinstall-escape.patch ) + src_configure() { : } diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index c736f280f002d..66a99eeb0ea6c 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -2,3 +2,5 @@ DIST qbittorrent-5.0.5.tar.xz 4561340 BLAKE2B 445f47b689c0166b2a16bbf35bcfaada4d DIST qbittorrent-5.0.5.tar.xz.asc 849 BLAKE2B 56f913de4bc8a6138621b4a38132e791be70aa8449371977aa08aad2b401c5729870f76977382f83b9d5a6c82b02facffc7ab261ad23d3486c8c320564b9828f SHA512 d74abaa1914bbc2aee358c801d6f9ce04c2a79a3ac1c9eb9715681c728060c9786e33315583f38cee219f3398dff399e12a2b62aba63437bbe4659590839de88 DIST qbittorrent-5.1.2.tar.xz 4631900 BLAKE2B 5cf21619c29878f1cecc08d66df27289c8f8541fe03bc4593384394921ad13891fc89f5846a9828b927ea08b51c0123d17d02952fee0b5ddac6dd259a9b0030b SHA512 8817c0136892373257b4c89983121af1d2c33ab93b248678949775c3b0e5e6b299cefd1ad3c7ab9b88c56a618ee3837a984872f781bb4ace9769c92a42908cab DIST qbittorrent-5.1.2.tar.xz.asc 849 BLAKE2B 2d023dd2dc922da973f26094349c2262e8f29227b615debc4a8f04c511bb513bfa56c0ac78e8e351e5b6c5f1a003c29d3a1860cd31e7d3dcbb006367b41e7d3e SHA512 69be899ed521da551ebcf0961c494ae828d2143fea9bc253f17ed81df61c4989124a8b231226c83c433314059e292ee3bf58422d861166eaa4272597bb8643c6 +DIST qbittorrent-5.1.4.tar.xz 4652880 BLAKE2B 2c3278fc29213f6b53927873e228ddc179a3222e77f2d8c6e48e263e4bef52728c84b85c3e9e7611d84fd0e46310e29313f9c6500b7cb0893236efaccf569d6d SHA512 57c82b46cd6963bb740a4bf823374e952c6488d7e925907bca4d94eb2e363e5015b469fc8f3543c817df82a46e6db998c79c35d3339c8e403a696c42f574234d +DIST qbittorrent-5.1.4.tar.xz.asc 849 BLAKE2B 80fddc88fc53aa480201ad4dab7483051a7f60ef4e247cafeb6d6cca53d9e751923f52f3af177d84d64271834da7bbbef563ed717f94f76eebc225b262bb442e SHA512 c1d918ef9972dc5ffd66bd35a87f6f4598dbd11a005c6d0bdef92cee0c06e81e393c4cf2a66724ad0f2e8323d4f03f091d21fc17b1972000be49c17a8fb864c5 diff --git a/net-p2p/qbittorrent/qbittorrent-5.1.4.ebuild b/net-p2p/qbittorrent/qbittorrent-5.1.4.ebuild new file mode 100644 index 0000000000000..b6e4895557b45 --- /dev/null +++ b/net-p2p/qbittorrent/qbittorrent-5.1.4.ebuild @@ -0,0 +1,128 @@ +# Copyright 2023-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake edo multibuild optfeature systemd verify-sig xdg + +DESCRIPTION="BitTorrent client in C++ and Qt" +HOMEPAGE="https://www.qbittorrent.org" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git" + inherit git-r3 +else + SRC_URI=" + https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz + verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc ) + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc +fi + +LICENSE="GPL-2+-with-openssl-exception GPL-3+-with-openssl-exception" +SLOT="0" +IUSE="+dbus +gui test webui" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( gui webui ) + dbus? ( gui ) +" + +# boost is not linked, but we must rebuild when libtorrent-rasterbar does. +# See bug #969055 +RDEPEND=" + >=dev-libs/boost-1.76:= + >=dev-libs/openssl-3.0.2:= + >=dev-qt/qtbase-6.5:6[network,ssl,sql,sqlite,xml] + >=net-libs/libtorrent-rasterbar-2.0.10:= + >=virtual/zlib-1.2.11:= + gui? ( + >=dev-qt/qtbase-6.5:6[dbus?,gui,widgets] + >=dev-qt/qtsvg-6.5:6 + ) + webui? ( + acct-group/qbittorrent + acct-user/qbittorrent + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND+=" + >=dev-qt/qttools-6.5:6[linguist] + virtual/pkgconfig +" + +DOCS=( AUTHORS Changelog {CONTRIBUTING,README}.md ) + +src_configure() { + MULTIBUILD_VARIANTS=( + $(usev gui) + $(usev webui nogui) + ) + + my_src_configure() { + local mycmakeargs=( + -DVERBOSE_CONFIGURE=ON # for bug reports + -DSTACKTRACE=$(usex !elibc_musl) # musl lacks execinfo.h + -DTESTING=$(usex test) + -DWEBUI=$(usex webui) + ) + + # upstream supports building just gui or nogui + # so we build the project twice (see #839531 for details) + # Fedora does the same: https://src.fedoraproject.org/rpms/qbittorrent + if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then + mycmakeargs+=( + -DGUI=ON + -DDBUS=$(usex dbus) + -DSYSTEMD=OFF + ) + else + mycmakeargs+=( + -DGUI=OFF + -DDBUS=OFF + # The systemd service calls qbittorrent-nox, built only when GUI=OFF. + -DSYSTEMD=ON + -DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)" + ) + fi + + cmake_src_configure + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_test() { + my_src_test() { + # cmake does not detect tests by default, if you use enable_testing + # in a subdirectory instead of the root CMakeLists.txt + cd "${BUILD_DIR}"/test || die + edo ctest . + } + + multibuild_foreach_variant my_src_test +} + +src_install() { + multibuild_foreach_variant cmake_src_install + + if use webui; then + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "I2P anonymyzing network support" net-vpn/i2pd net-vpn/i2p +} diff --git a/sys-process/iotop/iotop-0.6_p20230124.ebuild b/sys-process/iotop/iotop-0.6_p20230124.ebuild index bc13cb329f40b..5e3042ad41f6a 100644 --- a/sys-process/iotop/iotop-0.6_p20230124.ebuild +++ b/sys-process/iotop/iotop-0.6_p20230124.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..13} ) +PYTHON_COMPAT=( python3_{11..14} ) PYTHON_REQ_USE="ncurses(+)" MY_COMMIT="a14256a3ff74eeee59493ac088561f1bafab85a7"