From 177b9ffb05b0ad38a0cf6579c1ffa9cce6abd660 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 9 Jul 2026 01:04:15 +0100 Subject: [PATCH 1/8] net-dns/dnsmasq: add 2.93 Signed-off-by: Sam James --- net-dns/dnsmasq/Manifest | 2 + net-dns/dnsmasq/dnsmasq-2.93.ebuild | 237 ++++++++++++++++++++++++++++ 2 files changed, 239 insertions(+) create mode 100644 net-dns/dnsmasq/dnsmasq-2.93.ebuild diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 96f6c96162d39..6017e9a017699 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -1,2 +1,4 @@ DIST dnsmasq-2.92rel2.tar.xz 638020 BLAKE2B 4dd6b286c1f361673fea32ed3e0c3144fa3f873bfc0ec699c05c47da52371ee0f57abf15a851933c8967015bda3cd1f62e07c8ece875891c3660d02bb55677a5 SHA512 607abf33d6eac24eafdff9cd291d84b065354303d5e1d9514d79085b247fb3861ac57851ca1dfc4a5cddd314f8b970d17e93b987b1576e9f6ba1d6bffd42fff1 DIST dnsmasq-2.92rel2.tar.xz.asc 833 BLAKE2B 0544e86f5c7eb3141a8d19a7b3234fb0e52f308462a0ccc3843d37af644d079e928fa53eb38672b78fd7fc067982c87b74adc848b3fc0055d91e314b5c31a88e SHA512 140161d89287ab46fe15f7b68264a166e1a1f1a019cc781b0013a6345790e3f75186a023b32e526e7b5c05584734dfaff7e3b76b3c01878c0d22d9f6a039fcde +DIST dnsmasq-2.93.tar.xz 642764 BLAKE2B 19b4d434e2d98b9946a59dc8ffb9b67ff97731d8375d093652da59c830b84469c221ba587e479293bdc537175b9688474bda37091b2f075df5d7eea8e091cd9d SHA512 ee442c634c54f103e034ee5259f1802895f9e9d172891f14c644e260519da73f5dd6f28b75cb84c0b1cc5f9ec464ba8f40c87095fa96719cb0df831eae0887ee +DIST dnsmasq-2.93.tar.xz.asc 833 BLAKE2B 880f4004dd41e5f80fa5f3c4b700e7f330d70973ec3b53210153ac64bd2362470d377d3d06ede7498381f7a6a841eee356a56ce1f3da32ebca62ea7172c0a8cb SHA512 13b34102d8593fab8c859ca839ec240478e2382c35251afb3d69b73124a4826031d8945fe33c92f9b5302e49b1789f3db5c0d7ae98118aeba4ee317767c46dd9 diff --git a/net-dns/dnsmasq/dnsmasq-2.93.ebuild b/net-dns/dnsmasq/dnsmasq-2.93.ebuild new file mode 100644 index 0000000000000..3fbfdeff32857 --- /dev/null +++ b/net-dns/dnsmasq/dnsmasq-2.93.ebuild @@ -0,0 +1,237 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/simonkelley.asc +inherit toolchain-funcs lua-single systemd verify-sig + +MY_P="${P/_p/rel}" +DESCRIPTION="Small forwarding DNS server" +HOMEPAGE="https://thekelleys.org.uk/dnsmasq/doc.html" +SRC_URI=" + https://thekelleys.org.uk/dnsmasq/${MY_P}.tar.xz + verify-sig? ( https://thekelleys.org.uk/dnsmasq/${MY_P}.tar.xz.asc ) +" +S="${WORKDIR}"/${MY_P} + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" +IUSE+=" +loop +inotify ipv6 lua nettlehash nls script selinux static tftp" + +DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) + +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-simonkelley ) +" + +COMMON_DEPEND=" + acct-group/dnsmasq + acct-user/dnsmasq + dbus? ( sys-apps/dbus:= ) + idn? ( + !libidn2? ( net-dns/libidn:0= ) + libidn2? ( >=net-dns/libidn2-2.0:= ) + ) + lua? ( ${LUA_DEPS} ) + conntrack? ( net-libs/libnetfilter_conntrack:= ) + nls? ( sys-devel/gettext ) +" + +DEPEND="${COMMON_DEPEND} + dnssec? ( + dev-libs/nettle:=[gmp] + static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) + ) + nettlehash? ( + static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) + ) +" + +RDEPEND="${COMMON_DEPEND} + dnssec? ( + !static? ( >=dev-libs/nettle-3.4:=[gmp] ) + ) + nettlehash? ( + !static? ( dev-libs/nettle:=[gmp] ) + ) + selinux? ( sec-policy/selinux-dnsmasq ) +" + +REQUIRED_USE=" + dhcp-tools? ( dhcp ) + dnssec? ( !nettlehash ) + lua? ( + script + ${LUA_REQUIRED_USE} + ) + libidn2? ( idn ) +" + +use_have() { + local no_only + if [[ ${1} == '-n' ]]; then + no_only=1 + shift + fi + local useflag="${1}" + shift + + local uword="${1:-${useflag}}" + shift + + while [[ ${uword} ]]; do + uword="${uword^^}" + + if ! use "${useflag}"; then + printf -- " -DNO_%s" "${uword}" + elif [[ -z "${no_only}" ]]; then + printf -- " -DHAVE_%s" "${uword}" + fi + uword="${1}" + shift + done +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +pkg_pretend() { + if use static; then + einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." + use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \ + "in this case the static USE flag does nothing." + fi +} + +src_prepare() { + default + + sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \ + dnsmasq.conf.example || die +} + +src_configure() { + COPTS=( + $(use_have -n auth-dns auth) + $(use_have conntrack) + $(use_have dbus) + $(use libidn2 || use_have idn) + $(use_have libidn2) + $(use_have -n inotify) + $(use_have -n dhcp dhcp dhcp6) + $(use_have -n ipv6 ipv6 dhcp6) + $(use_have -n id id) + $(use_have -n loop) + $(use_have lua luascript) + $(use_have -n script) + $(use_have -n tftp) + $(use_have dnssec) + $(use_have nettlehash) + $(use_have static dnssec_static) + $(use_have -n dumpfile) + ) +} + +src_compile() { + emake \ + PREFIX=/usr \ + MANDIR=/usr/share/man \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + COPTS="${COPTS[*]}" \ + CONFFILE="/etc/${PN}.conf" \ + all$(use nls && printf -- "-i18n\n") + + use dhcp-tools && emake -C contrib/lease-tools \ + PREFIX=/usr \ + MANDIR=/usr/share/man \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + all +} + +src_install() { + local lingua puid + emake \ + PREFIX=/usr \ + MANDIR=/usr/share/man \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + COPTS="${COPTS[*]}" \ + CONFFILE="/etc/${PN}.conf" \ + DESTDIR="${ED}" \ + install$(use nls && printf -- "-i18n\n") + + for lingua in "${DM_LINGUAS[@]}"; do + has ${lingua} ${LINGUAS-${lingua}} \ + || rm -rf "${ED}"/usr/share/locale/${lingua} + done + [[ -d "${D}"/usr/share/locale/ ]] && \ + rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/ + + dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example + dodoc -r logo + + docinto html/ + dodoc *.html + + newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN} + newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} + + insinto /etc/logrotate.d + newins "${FILESDIR}"/dnsmasq.logrotate ${PN} + + insinto /etc + newins dnsmasq.conf.example dnsmasq.conf + + insinto /usr/share/dnsmasq + doins trust-anchors.conf + + if use dhcp; then + keepdir /var/lib/misc + newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN} + fi + if use dbus; then + insinto /etc/dbus-1/system.d + doins dbus/dnsmasq.conf + + docinto + dodoc dbus/DBus-interface + fi + + if use dhcp-tools; then + dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} + doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 + if use ipv6; then + dosbin contrib/lease-tools/dhcp_release6 + doman contrib/lease-tools/dhcp_release6.1 + fi + fi + + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service +} + +pkg_preinst() { + [[ -f /var/lib/misc/dnsmasq.leases ]] && \ + cp /var/lib/misc/dnsmasq.leases "${T}" +} + +pkg_postinst() { + [[ -f "${T}"/dnsmasq.leases ]] && \ + cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases +} From 115004dddbb20e283ce32bee747938cfb7ffc945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= Date: Thu, 9 Jul 2026 11:09:57 +0200 Subject: [PATCH 2/8] app-metrics/alertmanager: BDEPEND on >=go-1.25.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/978973 Signed-off-by: Holger Hoffstätte Part-of: https://codeberg.org/gentoo/gentoo/pulls/1362 Merges: https://codeberg.org/gentoo/gentoo/pulls/1362 Signed-off-by: Sam James --- app-metrics/alertmanager/alertmanager-0.33.1.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-metrics/alertmanager/alertmanager-0.33.1.ebuild b/app-metrics/alertmanager/alertmanager-0.33.1.ebuild index 73e55f5e511b1..fd80ccfecdb56 100644 --- a/app-metrics/alertmanager/alertmanager-0.33.1.ebuild +++ b/app-metrics/alertmanager/alertmanager-0.33.1.ebuild @@ -19,8 +19,10 @@ KEYWORDS="~amd64 ~arm64" # tests don't work due to "missing files" RESTRICT+=" test" -BDEPEND="dev-util/promu" - +BDEPEND=" + >=dev-lang/go-1.25.0 + dev-util/promu +" DEPEND=" acct-group/alertmanager acct-user/alertmanager From 4a3adc678c7cedb4dfbdaa3c82816c5e48ee11df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= Date: Thu, 9 Jul 2026 10:54:29 +0200 Subject: [PATCH 3/8] dev-python/btrfs: add py3.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also silence a setuptools warning. Signed-off-by: Holger Hoffstätte Part-of: https://codeberg.org/gentoo/gentoo/pulls/1361 Merges: https://codeberg.org/gentoo/gentoo/pulls/1361 Signed-off-by: Sam James --- dev-python/btrfs/btrfs-15.ebuild | 4 +++- dev-python/btrfs/files/15-setup.patch | 32 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 dev-python/btrfs/files/15-setup.patch diff --git a/dev-python/btrfs/btrfs-15.ebuild b/dev-python/btrfs/btrfs-15.ebuild index a25738fe47bc5..cb3f8b94717b8 100644 --- a/dev-python/btrfs/btrfs-15.ebuild +++ b/dev-python/btrfs/btrfs-15.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..14} ) +PYTHON_COMPAT=( python3_{12..15} ) inherit distutils-r1 @@ -25,6 +25,8 @@ SLOT="0" KEYWORDS="amd64" IUSE="examples" +PATCHES=( "${FILESDIR}"/15-setup.patch ) + python_install_all() { if use examples; then # skip symlink meant for development diff --git a/dev-python/btrfs/files/15-setup.patch b/dev-python/btrfs/files/15-setup.patch new file mode 100644 index 0000000000000..418ecbf8720ff --- /dev/null +++ b/dev-python/btrfs/files/15-setup.patch @@ -0,0 +1,32 @@ +https://github.com/knorrie/python-btrfs/issues/55 +https://github.com/knorrie/python-btrfs/commit/7d27aa6665bd38ad05b6eb990dd3bfd5394ee37f + +From: Hans van Kranenburg +Date: Sun, 10 May 2026 10:59:27 +0200 +Subject: [PATCH] setup.py: convert license classifier to SPDX + +setuptools >75.6.0 wants to see the license type specified differently. +Use SPDX identifier instead of the now unused field in classifiers. + +Thanks Holger Hoffstätte, for reporting. +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 744bf26..25ca48a 100644 +--- a/setup.py ++++ b/setup.py +@@ -56,11 +56,11 @@ def get_version(): + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'Intended Audience :: System Administrators', +- 'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)', + 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: Implementation :: CPython', + 'Operating System :: POSIX :: Linux', + 'Topic :: System :: Filesystems', + 'Topic :: System :: Systems Administration', + ], ++ license='LGPL-3.0-or-later', + ) From 016a00ca6dd0a7fad78cdb7b14fd518c803f364d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= Date: Thu, 9 Jul 2026 11:12:23 +0200 Subject: [PATCH 4/8] dev-lang/blackbox_exporter: BDEPEND on >=go-1.25.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Holger Hoffstätte Part-of: https://codeberg.org/gentoo/gentoo/pulls/1363 Merges: https://codeberg.org/gentoo/gentoo/pulls/1363 Signed-off-by: Sam James --- .../blackbox_exporter/blackbox_exporter-0.28.0.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.28.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.28.0.ebuild index 66b1888e06347..adc7c80963669 100644 --- a/app-metrics/blackbox_exporter/blackbox_exporter-0.28.0.ebuild +++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.28.0.ebuild @@ -19,7 +19,10 @@ COMMON_DEPEND="acct-group/blackbox_exporter acct-user/blackbox_exporter" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" -BDEPEND="dev-util/promu" +BDEPEND=" + >=dev-lang/go-1.25.0 + dev-util/promu +" FILECAPS=( cap_net_raw usr/bin/blackbox_exporter From 92ddcc7883fc4b9f1fc06183e6be94d6e018fbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= Date: Thu, 9 Jul 2026 11:38:53 +0200 Subject: [PATCH 5/8] sys-process/rust-parallel: silence CFLAGS QA warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/978974 Signed-off-by: Holger Hoffstätte Part-of: https://codeberg.org/gentoo/gentoo/pulls/1364 Merges: https://codeberg.org/gentoo/gentoo/pulls/1364 Signed-off-by: Sam James --- sys-process/rust-parallel/rust-parallel-1.23.0.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-process/rust-parallel/rust-parallel-1.23.0.ebuild b/sys-process/rust-parallel/rust-parallel-1.23.0.ebuild index 591efed397b0a..e9fd65bf16087 100644 --- a/sys-process/rust-parallel/rust-parallel-1.23.0.ebuild +++ b/sys-process/rust-parallel/rust-parallel-1.23.0.ebuild @@ -29,6 +29,8 @@ IUSE="symlink" RDEPEND="symlink? ( !sys-process/parallel )" +QA_FLAGS_IGNORED="usr/bin/${PN}" + src_install() { dobin $(cargo_target_dir)/rust-parallel From ebfce619211ba215e2a1f87b471882b48b16b113 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 9 Jul 2026 14:58:07 +0100 Subject: [PATCH 6/8] app-text/mupdf: Stabilize 1.27.2 amd64, #970463 Signed-off-by: Sam James --- app-text/mupdf/mupdf-1.27.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.27.2.ebuild b/app-text/mupdf/mupdf-1.27.2.ebuild index 1da0877e51930..a453f75997169 100644 --- a/app-text/mupdf/mupdf-1.27.2.ebuild +++ b/app-text/mupdf/mupdf-1.27.2.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="archive barcode brotli +javascript +jpeg2k opengl ssl X" REQUIRED_USE="opengl? ( javascript )" From fde7f2e3f7b4b8e890f02c8e5b71baa5aad367d9 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 9 Jul 2026 14:58:09 +0100 Subject: [PATCH 7/8] dev-python/django: Stabilize 5.2.16 ALLARCHES, #978935 Signed-off-by: Sam James --- dev-python/django/django-5.2.16.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/django/django-5.2.16.ebuild b/dev-python/django/django-5.2.16.ebuild index 02e2932f450ae..7c32adf378a84 100644 --- a/dev-python/django/django-5.2.16.ebuild +++ b/dev-python/django/django-5.2.16.ebuild @@ -26,7 +26,7 @@ LICENSE+=" Apache-2.0" # admin icons, jquery, xregexp.js LICENSE+=" MIT" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos" IUSE="doc sqlite test" RESTRICT="!test? ( test )" From 6066266a9688dd2bb9f51c1b04bf66b279a24093 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 9 Jul 2026 14:58:12 +0100 Subject: [PATCH 8/8] dev-libs/libinput: Stabilize 1.31.3 x86, #978962 Signed-off-by: Sam James --- dev-libs/libinput/libinput-1.31.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libinput/libinput-1.31.3.ebuild b/dev-libs/libinput/libinput-1.31.3.ebuild index ff18a0dcf7978..f025aa127c7ab 100644 --- a/dev-libs/libinput/libinput-1.31.3.ebuild +++ b/dev-libs/libinput/libinput-1.31.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2 LICENSE="MIT" SLOT="0/10" if [[ $(ver_cut 3) -lt 900 ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" fi IUSE="doc input_devices_wacom lua test" RESTRICT="!test? ( test )"