7 files changed, 31 insertions, 524 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d1523cee1089..28c64f92e3e2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index af1cdafa7b9e..95a6608f80af 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,10 +3,8 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
 DIST NetworkManager-1.42.6.tar.xz 6749088 BLAKE2B 9d583c163908ee4fe145cdbdaa657cbc682d9f6270efc7d7525acd86912a0da50f2ccf14810fdfe2998c6ce701dcabc2b5b39fa58ff9d3fe4f5630205b15f4c8 SHA512 606a996043d8fbc7972329b94bc9854557950f665790381611eddfc632850b31584a4ba2d773fa9d12127db4c37ea2076c657521b78cedb012144df6f41d3748
-DIST NetworkManager-1.42.8.tar.xz 6754344 BLAKE2B 74002dd273924c863350ba704f6f13b2a30a4d3f48449a59c34529cba675931bb009ed313eb7410b211beaf73866c48d07115268b3aa195606840a5c9ee5cb08 SHA512 9465f59a1d20e44e2d8d0eefbffbc4dfe4bcebbd1e36c6e09be1e4700cc748f0c8a32c8492590f6171365697c2f25fa166dd00da58be19a3ed89e9fb7981c40f
 DIST NetworkManager-1.44.0.tar.xz 6868528 BLAKE2B f916620e74c0d5b8581b8c1eeb8f58c1cbac2d6c18bc72a25679cf5d36975df6c37b130f97e8d2078d9ab7aeeb4371ed6f9e830c5e6dce19feb41f26277be734 SHA512 7ebece465dfd108d66adb1c941ab22bdca8bb0ce7869baa421e4aef65e89a23bf63f3713e809e1e7b6c5226813ad9d56d8af339c711507a33aa6728afd334405
 DIST networkmanager-ppp-2.5.0.patch 45845 BLAKE2B afcf1410f89db950a7e7c2c0af3aaed174a43fae127c8a139431093a3ae9802542c40cf69faabd1d057563438b48f0a0b0d4c7fc188c13e9320d127e0034f181 SHA512 34fe7780ac1780efa156429166344548058a9079ad61238a33d89a57e52ab79765ebfaf39bd9c246d0b74549ca7156e9df1a472920485cbe23ed81de4f8cf243
 EBUILD networkmanager-1.42.6-r1.ebuild 12035 BLAKE2B 44665e81663ea8bf2d3092c33a6b118b4f8667d3e350da2097143db482d207d056e73746e5fd6e5ef3ecae39f12d9e622ff9aa8069c3118e3de1ffda4de8c20b SHA512 5607829b21a4a3e94c7c57c6f7fc61da0ac15bab5108ea83c762b5c67d77c5f1aa95f3f8f6d42162edfa5420d95b371931475816f0d4d89a27a2bc8e0b58375e
-EBUILD networkmanager-1.42.8.ebuild 11766 BLAKE2B 262dd48206e00d8ee455c8ab5c67e02cc727fa9340c1dd46061253c27166a8f56e4dfc2bed4070dfc77f69aa66be19bd900ee196d28f39320aa1fd278ccab41b SHA512 cfef8a7ab8fa28417ecc6bc79f842fb743e62c40ee9abdd237568b2b75e404394f7b62352c044262492fc5329d55e9dcef638ba9a98cc950a1d2cecb44905d66
 EBUILD networkmanager-1.44.0.ebuild 11808 BLAKE2B b95fdddd10c9f22e1bd1ff6a5d5c71c6bae9a578b79d01c8c25945305b19a77b99f9143b0236bf01ee40d4c3ed13a32aefab653a17999d12e6ba835a0e89e128 SHA512 27ef12328cbae862253b10b249f2a51ffe2091bf0286d4032efa44226f552d9e3611456e66ca11a855b9cdd067fbe0114f23c2938ba1ecc49f1f778a60da8812
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.42.8.ebuild b/net-misc/networkmanager/networkmanager-1.42.8.ebuild
deleted file mode 100644
index 904108223555..000000000000
--- a/net-misc/networkmanager/networkmanager-1.42.8.ebuild
+++ /dev/null
@@ -1,395 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit flag-o-matic gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? (
-		sec-policy/selinux-networkmanager
-		sys-libs/libselinux
-	)
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7:=
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? (
-		dev-libs/nspr[${MULTILIB_USEDEP}]
-		>=dev-libs/nss-3.11[${MULTILIB_USEDEP}]
-	)
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5:= )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( virtual/resolvconf )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		>=dev-libs/newt-0.52.15
-		libedit? ( dev-libs/libedit )
-		!libedit? ( sys-libs/readline:= )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-
-	# bug 809695
-	if tc-is-clang && use lto; then
-		eerror "Clang does not support -flto-partition"
-		die "Please use gcc or turn off USE=lto flag when building with clang"
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_setup
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-meson_nm_program() {
-	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
-	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
-	filter-lto
-
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-
-		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
-		-Dnetconfig=no
-		-Dconfig_dns_rc_manager_default=auto
-
-		$(meson_nm_program dhclient "" /sbin/dhclient)
-		-Ddhcpcanon=no
-		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-
-		$(meson_use lto b_lto)
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	if use tools ; then
-		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
-	else
-		emesonargs+=( -Dreadline=none )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	udev_reload
-
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index ee9c9348e09c..41f18301c822 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -1,7 +1,7 @@
+AUX wget2-2.0.1-stdint.patch 573 BLAKE2B bd2f85fc234a6d019c10212bee2c636c9b428476b1b0fa7379e575f157dd18aa6cc8d6221be4f3a9fecac395e920b4d6efae04f933fbae0e0e0a79f10a0a14e4 SHA512 7098cf95f2b9c3af3eca65d365e66c06292037fa9093844b02561bd6e52f9d7c676167cb0175c9d56de145e1fb93906eb8509e89291c6f4250efab666b581fd5
 AUX wget2-fix-build-issues-with-clang-16.patch 841 BLAKE2B 055c0e61566fa78360481f618dbcdc5fd65f853c94ac4b5d1e75e43a5be9b6295e9281c632635405eec840a79b6d106b30bf068d7577f21d8d087f6b102f39f1 SHA512 59c95329ee7f779be169c2a9032a36dd49e8c596967ba3a6d0dc12ba3cbd67dab8acccabff7d73126232ee60b699b84ee95253c17b39b47e049134b86700608a
 DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e
-EBUILD wget2-2.0.1-r2.ebuild 2055 BLAKE2B 0576f5e248d77f224d1dd917c9b28e8eb6476e04ae564b79e953f293acaf7502bde8b1d5b99ab268f716695ba0fbb66617cbaa2b81a78632415b079391cc61a5 SHA512 9053e8ebb0e5c445fd638c4a149864946f126e6f9e91f67615420d5f6bdc71246bdb8a3b229319d801f66d9d8743036f813b9c5722ca83feeebf2bbce5919d88
 EBUILD wget2-2.0.1-r3.ebuild 2126 BLAKE2B af9a29e617300020c65e92601c5b33a4fb3b955c0a9f7bdebfef1e7e8d7511a8312a5297973e63f47f9b5efb213a66f76de8d3172cad7db505ddbdaf4a4ab155 SHA512 10f834711efca9ed76b4efdeed537524aaacefb4c25300a0bc437b3e107d754cac9976dae00e0f08a4afea981cbd5beb73c9d938a24f3be96a1e65b4fa4b5ddf
-EBUILD wget2-2.0.1.ebuild 2654 BLAKE2B 3feefaf562ace459b805ae2ffac5de2149cba905deae795b69412704b50bcba37c58e03aecc42f1c0f5d0d07d9fa75e24db4e1b517597e56e6fc6d15cfaad03c SHA512 de9c5db375389484d8129a758c0b0b2c089fcb8b02e9170a1042af4408f0cc9cff4472608065dc586c45e780bcf0b9cd3a7657b8cf6e130945f087a8b7e522a9
+EBUILD wget2-2.0.1-r4.ebuild 2159 BLAKE2B 263d8d0f357ffa3b9925036fdc8386c6cc0ffe4b5cee9d179d96fff75e99121cb3cf5a26e64da93f26f2aa780a92fbe6ee8577aed0dc751e7e9287833ce6fce5 SHA512 b64ec5071f2863991008b542f1b8a8ae73dd672050eb89a300253650d87dbb0e8f591e0a66db57fc6f98f048704158d14d92e0abca792d7640935a1943965bc5
 EBUILD wget2-9999.ebuild 2458 BLAKE2B 4e75262df94e6db8be002957a829714cfac0f03420ed6e453c5da65929ae00364938d066d0f5a707ed9631612d0638d10c527fcc37620c7fc6764534f79a3dee SHA512 20c2d157007f78069d9e04823717ff0efe10cdc4c9dc9a56ab91c696a73c2045b5f787531d68adfc3f8a96c126885a6c1039f71200381883dfd4c32542a88d7c
 MISC metadata.xml 827 BLAKE2B 707f4ea6684a3ae7180790983d3a622721106990e69e8855fde5c6442fade3ff8ff6ff006c7c310bb055a68a7e4ceb376d855393fa491ae6f41ad2e272072fd5 SHA512 7022b91c3c5eb59d3c5a0bc7a5f3f36b25ae766f866b253cdab284ce4c723f2860a82bc8042a9b761911bc80e4726a84893107e27e3cefe84fa2ad4fcbfd69b4
diff --git a/net-misc/wget2/files/wget2-2.0.1-stdint.patch b/net-misc/wget2/files/wget2-2.0.1-stdint.patch
new file mode 100644
index 000000000000..984cf52c1fc0
--- /dev/null
+++ b/net-misc/wget2/files/wget2-2.0.1-stdint.patch
@@ -0,0 +1,24 @@
+From 96fda91da2df356a7e0897187822e27125a3e40b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Mon, 22 May 2023 19:56:35 +0200
+Subject: * libwget/decompressor.c: Explicitly include stdint.h before lzlib.h
+
+---
+ libwget/decompressor.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libwget/decompressor.c b/libwget/decompressor.c
+index 53ed884..69ce5dd 100644
+--- a/libwget/decompressor.c
++++ b/libwget/decompressor.c
+@@ -60,6 +60,7 @@
+ #endif
+ 
+ #ifdef WITH_LZIP
++#include <stdint.h>
+ #include <lzlib.h>
+ #endif
+ 
+-- 
+cgit v1.1
+
diff --git a/net-misc/wget2/wget2-2.0.1-r2.ebuild b/net-misc/wget2/wget2-2.0.1-r4.ebuild
index c9f6bad3566c..981ce1c60b0c 100644
--- a/net-misc/wget2/wget2-2.0.1-r2.ebuild
+++ b/net-misc/wget2/wget2-2.0.1-r4.ebuild
@@ -46,6 +46,11 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-build-issues-with-clang-16.patch
+	"${FILESDIR}"/${P}-stdint.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		--disable-static
diff --git a/net-misc/wget2/wget2-2.0.1.ebuild b/net-misc/wget2/wget2-2.0.1.ebuild
deleted file mode 100644
index 974ef7241035..000000000000
--- a/net-misc/wget2/wget2-2.0.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
-HOMEPAGE="https://gitlab.com/gnuwget/wget2"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"
-else
-	SRC_URI="mirror://gnu/wget/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-# LGPL for libwget
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/0" # subslot = libwget.so version
-IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib"
-
-RDEPEND="
-	brotli? ( app-arch/brotli )
-	bzip2? ( app-arch/bzip2 )
-	!gnutls? ( dev-libs/libgcrypt:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	gpgme? (
-		app-crypt/gpgme:=
-		dev-libs/libassuan
-		dev-libs/libgpg-error
-	)
-	http2? ( net-libs/nghttp2 )
-	idn? ( net-dns/libidn2:= )
-	lzip? ( app-arch/lzlib )
-	lzma? ( app-arch/xz-utils )
-	pcre? ( dev-libs/libpcre2 )
-	psl? ( net-libs/libpsl )
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	if [[ "${PV}" == *9999 ]] ; then
-		git-r3_src_unpack
-
-		# We need to mess with gnulib :-/
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
-		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ "${PV}" == *9999 ]] ; then
-		local bootstrap_opts=(
-			--gnulib-srcdir=../gnulib
-			--no-bootstrap-sync
-			--copy
-			--no-git
-			--skip-po
-		)
-		AUTORECONF="/bin/true" \
-		LIBTOOLIZE="/bin/true" \
-		sh ./bootstrap "${bootstrap_opts[@]}" || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--disable-valgrind-tests
-		--with-plugin-support
-		--with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)"
-		--without-libidn
-		--without-libmicrohttpd
-		$(use_enable doc)
-		$(use_enable xattr)
-		$(use_with brotli brotlidec)
-		$(use_with bzip2)
-		$(use_with gpgme)
-		$(use_with http2 libnghttp2)
-		$(use_with idn libidn2)
-		$(use_with lzip)
-		$(use_with lzma)
-		$(use_with pcre libpcre2)
-		$(use_with psl libpsl)
-		$(use_with zlib)
-
-		# Avoid calling ldconfig
-		LDCONFIG=:
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} == *9999 ]] ; then
-		if use doc ; then
-			local mpage
-			for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do
-				doman ${mpage}
-			done
-		fi
-	else
-		doman docs/man/man{1/*.1,3/*.3}
-	fi
-
-	find "${D}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/bin/${PN}_noinstall || die
-}