Merge updates from master

19 files changed, 644 insertions, 71 deletions

diff --git a/acct-group/rspamd/metadata.xml b/acct-group/rspamd/metadata.xml
index 399ef64db037..79c983af8c3e 100644
--- a/acct-group/rspamd/metadata.xml
+++ b/acct-group/rspamd/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>djc@gentoo.org</email>
-		<name>Dirkjan Ochtman</name>
-	</maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>arkamar@atlas.cz</email>
+    <name>Petr Vaněk</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/acct-user/rspamd/metadata.xml b/acct-user/rspamd/metadata.xml
index 399ef64db037..79c983af8c3e 100644
--- a/acct-user/rspamd/metadata.xml
+++ b/acct-user/rspamd/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>djc@gentoo.org</email>
-		<name>Dirkjan Ochtman</name>
-	</maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>arkamar@atlas.cz</email>
+    <name>Petr Vaněk</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-containers/slirp4netns/slirp4netns-1.1.12.ebuild b/app-containers/slirp4netns/slirp4netns-1.1.12-r1.ebuild
index 1a757da88f4f..3895f2b716fe 100644
--- a/app-containers/slirp4netns/slirp4netns-1.1.12.ebuild
+++ b/app-containers/slirp4netns/slirp4netns-1.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,27 +9,29 @@ DESCRIPTION="User-mode networking for unprivileged network namespaces"
 HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
 SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 
 RDEPEND="
 	dev-libs/glib:2=
-	dev-libs/libpcre:=
 	net-libs/libslirp:=
 	sys-libs/libseccomp:=
 	sys-libs/libcap:="
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
 RESTRICT+=" test"
 
 src_prepare() {
+	default
+
 	# Respect AR variable for bug 722162.
 	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
 		-i configure.ac || die
 	eautoreconf
-	default
 }
 
 pkg_postinst() {
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 98669a94c4d6..10e25ce2940e 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -6,3 +6,5 @@ DIST libvirt-8.0.0.tar.xz 8860124 BLAKE2B 4669ae8f4de6379c3f94d3b6875ccc8eb435fb
 DIST libvirt-8.0.0.tar.xz.asc 833 BLAKE2B 2571ee10d433630ddd79761b1a50948aed33f61ef11e793a7e563e37c28e48bc856139aa1cc62bf50852b056de14f36bb75fa97155b31bfa97c8af2ef55ba4dc SHA512 ce1252a034723774542ab00e782c24b7ef243b5ca302033e45993f90273c697cdb82e9a126b729557a6c90b5f407f0f06b78c0affb6eefe60c364fa979831f8b
 DIST libvirt-8.1.0.tar.xz 8881608 BLAKE2B ddbd684f43a75ab04aca8be0a761ec5890c365e3c802af55e85d0f3b906a3b075f737acd14648d46cdacce90cbd2ccdda12d39784eaa17a05657b13447df1fe7 SHA512 5db227b78f48e35f917030eeb45ce9d0f7e868c5ce75da496ca06fad175ad6b026173b2fb78415c0103a61af24aec78d89bcebdf60b817d8ff6e84dc926faa97
 DIST libvirt-8.1.0.tar.xz.asc 833 BLAKE2B 21ea45127d68313264b9e17c315d75b20e409ef56ce3f6a61899c3c9d9ce1ff51a4743d912f7440d2197230df802d955516cbc8d6f98960cef8a0265a7d0f334 SHA512 9a28b0405c01518f7d6837d02df492d6d97d6e73cd711e718b53cc18d8830a1216aa87366b2065ef5ce65b12d72cbb3d80024529264430de20fe89d8bf595d76
+DIST libvirt-8.2.0.tar.xz 8871236 BLAKE2B 85c4fd7323f4ea0564e6fcb37dffe643d0ff54f228a695476c1b24c78022402a86cf967503e40fad003d82528f24a02bef79466e38c133c5ad37cbcd5783f01d SHA512 fbdc2953e86117643aafb3198a3d9327188d94abfd155eae4439ee0e722737a57ee44dbb2929746c0a28e10e275c35f4a8190e99668e4cba4025555358591544
+DIST libvirt-8.2.0.tar.xz.asc 833 BLAKE2B 3dba2fe7dc76052307ab8b1d7f2a61445759ed15e130615ca2a6325e981ae5c1a7143e7d78ee67f2bf9001cdf82126dff89f4f1eb3b39b77620721a5b75f4cfa SHA512 33ecc465da1b7e4b53733611255d01414f8c1081c96fdcb0a9f1a0e194823872b7f9f9032938527f6d1d8bbebc3b61f2dc393875b8d11fdd47bec40e9408475b
diff --git a/app-emulation/libvirt/files/libvirtd.init-r19 b/app-emulation/libvirt/files/libvirtd.init-r19
index 60dad6a791dc..bbfe6766317c 100644
--- a/app-emulation/libvirt/files/libvirtd.init-r19
+++ b/app-emulation/libvirt/files/libvirtd.init-r19
@@ -16,7 +16,7 @@ retry="${LIBVIRTD_TERMTIMEOUT}"
 depend() {
 	need virtlogd
 	use ceph dbus iscsid virtlockd
-	after cgconfig corosync ebtables iptables ip6tables nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled
+	after cgconfig corosync ebtables iptables ip6tables shorewall nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled
 	USE_FLAG_FIREWALLD
 }
 
diff --git a/app-emulation/libvirt/libvirt-8.1.0.ebuild b/app-emulation/libvirt/libvirt-8.1.0.ebuild
index fb02517f617a..8dca1c9e39b8 100644
--- a/app-emulation/libvirt/libvirt-8.1.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.1.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+# Please bump with dev-python/libvirt-python!
+
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
diff --git a/app-emulation/libvirt/libvirt-8.2.0.ebuild b/app-emulation/libvirt/libvirt-8.2.0.ebuild
new file mode 100644
index 000000000000..ba77ccd2daa7
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-8.2.0.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-python/libvirt-python!
+
+PYTHON_COMPAT=( python3_{8..10} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
+	parted pcap policykit +qemu rbd sasl selinux +udev
+	virtualbox +virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	sys-libs/ncurses:=
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.7:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-2.11
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6(+)]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 85ed8bf29244..ba77ccd2daa7 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,32 +1,31 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+# Please bump with dev-python/libvirt-python!
 
+PYTHON_COMPAT=( python3_{8..10} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
 inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
 	EGIT_BRANCH="master"
-	SRC_URI=""
-	SLOT="0"
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
 		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	SLOT="0/${PV}"
 fi
 
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
+SLOT="0/${PV}"
 IUSE="
 	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
 	parted pcap policykit +qemu rbd sasl selinux +udev
 	virtualbox +virt-network wireshark-plugins xen zfs
 "
@@ -59,32 +58,32 @@ BDEPEND="
 RDEPEND="
 	acct-user/qemu
 	app-misc/scrub
-	>=dev-libs/glib-2.48.0
-	dev-libs/libgcrypt:0
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
 	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
+	>=dev-libs/libxml2-2.9.1
 	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
 	net-libs/rpcsvc-proto
 	>=net-misc/curl-7.18.0
 	sys-apps/dbus
 	sys-apps/dmidecode
 	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
+	sys-libs/ncurses:=
+	>=sys-libs/readline-7.0:=
 	virtual/acl
 	apparmor? ( sys-libs/libapparmor )
 	audit? ( sys-process/audit )
 	caps? ( sys-libs/libcap-ng )
 	dtrace? ( dev-util/systemtap )
 	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:0= )
+	fuse? ( sys-fs/fuse:= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
+	libssh? ( >=net-libs/libssh-0.7:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
 	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
 	nfs? ( net-fs/nfs-utils )
@@ -96,17 +95,17 @@ RDEPEND="
 		>=sys-block/parted-1.8[device-mapper]
 		sys-fs/lvm2[-device-mapper-only(-)]
 	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
+	pcap? ( >=net-libs/libpcap-1.8.0 )
 	policykit? (
 		acct-group/libvirt
 		>=sys-auth/polkit-0.9
 	)
 	qemu? (
 		>=app-emulation/qemu-2.11
-		dev-libs/yajl
+		>=dev-libs/yajl-2.0.3:=
 	)
 	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
 	selinux? ( >=sys-libs/libselinux-2.0.85 )
 	virt-network? (
 		net-dns/dnsmasq[dhcp,ipv6(+),script]
@@ -115,25 +114,25 @@ RDEPEND="
 		net-misc/radvd
 		sys-apps/iproute2[-minimal]
 	)
-	wireshark-plugins? ( net-analyzer/wireshark:= )
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
 	xen? (
 		>=app-emulation/xen-4.9.0
 		app-emulation/xen-tools:=
 	)
 	udev? (
-		virtual/libudev
+		virtual/libudev:=
 		>=x11-libs/libpciaccess-0.10.9
 	)
-	zfs? ( sys-fs/zfs )"
-
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
 DEPEND="${BDEPEND}
 	${RDEPEND}
 	${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-8.1.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
 )
 
 pkg_setup() {
@@ -243,6 +242,7 @@ src_configure() {
 		$(meson_feature iscsi-direct storage_iscsi_direct)
 		$(meson_feature libvirtd driver_libvirtd)
 		$(meson_feature libssh)
+		$(meson_feature libssh2)
 		$(meson_feature lvm storage_lvm)
 		$(meson_feature lvm storage_mpath)
 		$(meson_feature lxc driver_lxc)
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index cd76572452f6..ab1603dc9f57 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -64,6 +64,10 @@
 		Use <pkg>net-libs/libssh</pkg> to communicate with remote libvirtd hosts,
 		for example: qemu+libssh://server/system
 	</flag>
+	<flag name="libssh2">
+		Use <pkg>net-libs/libssh2</pkg> to communicate with remote libvirtd hosts,
+		for example: qemu+libssh2://server/system
+	</flag>
 	<flag name="pcap">
 		Support auto learning IP addreses for routing
 	</flag>
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 186a267dce41..f9737eeb7325 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -6,3 +6,5 @@ DIST libvirt-python-8.0.0.tar.gz 218832 BLAKE2B be86e423607f90fb9e93fdb3b1ea768e
 DIST libvirt-python-8.0.0.tar.gz.asc 833 BLAKE2B 12aec1acbf41811d9aa33a99038e1987624a2964579ef8ec236ba63fa8507cbe47d17e654221753a8d53af7d44ec53c2daca54f3b2dce18d8aea3e6d1012beaa SHA512 d6652f5d694a2b12d595fd78eb8ebc4f03ee02d20ed06187edfca5611b4784469af1cfd8c3ba009b799e7adf500775ede9d9c53544b995a072dc599797460d16
 DIST libvirt-python-8.1.0.tar.gz 221567 BLAKE2B aaf296f60c991c2877a2bb4ed47f1f2c4f75dd16b6831f53baab23883030cf20675ea61f636f0483e0c9a2f362638c860dd68eeb23b5ad82f43c66cd5f91b825 SHA512 507742d7b6503fdab45dad0b1e3b320f49a5cb01c1e0077f777bf41d53d2e6be4df0671e379d9a69330623ae362b725c7511d44d2c48489b21a657cf17efbd93
 DIST libvirt-python-8.1.0.tar.gz.asc 833 BLAKE2B a4fb10816ee50c1979926db87fa85e838e6caf74d086b612f07fb37730003030c16ce9f538fa8765a705b9a51d398e0284410a53aed31ac3452af4a4e5aae30e SHA512 2ca4bf7393f60267e0d7d32dcc50219847a86dbde76e1a83a9723c07133ff90d930dde32f454631c474fd36ac3837ccf94629576ddfb93288dfdb2490ce20724
+DIST libvirt-python-8.2.0.tar.gz 223589 BLAKE2B 6c8d39e6af1167aa24a1c0710177188aa0a73e54d9dbd6015d6a3b60726b78c45442fc756e68c61d54352a5fa9466f538ff986712e775bc54d46c885bcbcc8da SHA512 8d3eceb36651dbb903f51ec198dcf6bcd4dc3d3b31ce6a41df10928bbbf43b32a2f80c006c1fb9fc3e1cf2d7ffed95efc1209e0d20018135fb32c50876987d58
+DIST libvirt-python-8.2.0.tar.gz.asc 833 BLAKE2B 262a8072b58b19f871a72ed81d8dcab907130ce6f25f6478c72e6f3e7d8d51226fda1844a37baf82667d2f35ef3e64e84e47de1d33217a356ea1d78fec6aa548 SHA512 11ea846816a3300940b9792a5a778c633bb2d9e0523f442588ae82f8fb46ecc0256267b2efece655331112e3912c9bfcf46247555e48d1861999d1363f6034b1
diff --git a/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild
index 6000240c3d04..13e15986dc34 100644
--- a/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+# Please bump with app-emulation/libvirt!
+
 PYTHON_COMPAT=( python3_{8..10} )
 
 DISTUTILS_USE_SETUPTOOLS=no
diff --git a/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild
new file mode 100644
index 000000000000..d88122f6fa4f
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-emulation/libvirt!
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+MY_P="${P/_rc/-rc}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index 6dbe00052c00..d88122f6fa4f 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+# Please bump with app-emulation/libvirt!
 
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
-
 MY_P="${P/_rc/-rc}"
-
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
 inherit distutils-r1 verify-sig
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
@@ -25,9 +25,9 @@ S="${WORKDIR}/${P%_rc*}"
 
 DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
+
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
@@ -47,5 +47,6 @@ python_install_all() {
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-util/anjuta/anjuta-3.34.0.ebuild b/dev-util/anjuta/anjuta-3.34.0-r1.ebuild
index 865d18e33fbe..43ee21d824b3 100644
--- a/dev-util/anjuta/anjuta-3.34.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.34.0-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{8..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 # libanjuta-language-vala.so links to a specific slot of libvala; we want to
 # avoid automagic behavior.
-VALA_MIN_API_VERSION="0.46" # 3.34.0 upstream release supports up to 0.44, but 0.46 vala LTS support was added without any other adjustments post-release; 0.48 will need patches
+VALA_MIN_API_VERSION="0.56"
 VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
 
-# We inherit autotools explicitly because GNOME2_EAUTORECONF is set only conditionally later, so gnome2.eclass doesn't do it for us
-inherit autotools gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
 
 DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
+HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta https://gitlab.gnome.org/GNOME/anjuta/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 IUSE="debug devhelp glade +introspection subversion terminal test vala"
 RESTRICT="!test? ( test )"
@@ -72,7 +71,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	!!dev-libs/gnome-build
 	test? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/docbook-xml-dtd:4.5 )
@@ -82,6 +80,12 @@ DEPEND="${COMMON_DEPEND}
 "
 # yelp-tools, gi-common and gnome-common are required by eautoreconf
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-Add-new-vala-support.patch
+	"${FILESDIR}"/${PV}-autoconf-2.70.patch
+	"${FILESDIR}"/${PV}-prefer-newer-vala.patch
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
@@ -95,10 +99,6 @@ will need to:
 1. Go to 'Build' -> 'Configure project'
 2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
 'Configure options'."
-
-		# Without removing other vala versions, it ends up picking the oldest vala available, not newest
-		sed -i -e "s/\[0.44\], \[0.42\], \[0.40\], \[0.38\], \[0.36\], \[0.34\], \[0.32\], \[0.30\], \[0.28\], \[0.26\], \[0.24\], \[0.22\], \[0.20\], \[0.18\]/[${VALA_MAX_API_VERSION}]/" configure.ac || die
-		GNOME2_EAUTORECONF="yes"
 	fi
 
 	# COPYING is used in Anjuta's help/about entry
@@ -111,7 +111,7 @@ will need to:
 	sed -e '/SUBDIRS =/ s/benchmark//' \
 		-i plugins/symbol-db/Makefile.{am,in} || die
 
-	use vala && vala_src_prepare
+	use vala && vala_setup
 	gnome2_src_prepare
 }
 
diff --git a/dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch b/dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch
new file mode 100644
index 000000000000..219a0308121b
--- /dev/null
+++ b/dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch
@@ -0,0 +1,132 @@
+This is a combination of 7 upstream commits:
+
+build: Allow building with vala 0.46 and drop support for 0.30 and earlier
+language-support-vala: Support for vala 0.48 API
+build: Allow building with vala 0.48
+build: Allow building with vala 0.50
+build: Allow building with vala 0.50 and 0.52
+build: Allow building with vala 0.54
+build: Allow building with vala 0.56
+---
+ configure.ac                              |  4 +--
+ plugins/language-support-vala/plugin.vala | 37 ++++++++++++++++++-----
+ 2 files changed, 31 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3b4c99504..4fbad5392 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -338,7 +338,7 @@ if test "$user_disabled_vala" = 1; then
+ else
+         AC_MSG_RESULT(no)
+ 	AC_MSG_CHECKING(if libvala is available)
+-	m4_foreach([VERSION], [[0.44], [0.42], [0.40], [0.38], [0.36], [0.34], [0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]],
++	m4_foreach_w([VERSION], [0.56 0.54 0.52 0.50 0.48 0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32],
+ 		[PKG_CHECK_EXISTS([ libvala-VERSION ],
+ 			 [ valaver="-VERSION" ])
+ 			 ])
+@@ -350,7 +350,7 @@ else
+ 	else
+ 		AC_MSG_RESULT(no)
+ 		enable_vala="no"
+-		VALA_REQUIRED=0.18.0
++		VALA_REQUIRED=0.32.0
+ 	fi
+ 	AC_SUBST(LIBVALA)
+ fi
+diff --git a/plugins/language-support-vala/plugin.vala b/plugins/language-support-vala/plugin.vala
+index 13d35fec4..d94634c7f 100644
+--- a/plugins/language-support-vala/plugin.vala
++++ b/plugins/language-support-vala/plugin.vala
+@@ -78,7 +78,11 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
+ 
+ 	void init_context () {
+ 		context = new Vala.CodeContext();
++#if VALA_0_50
++		context.set_target_profile (Vala.Profile.GOBJECT);
++#else
+ 		context.profile = Vala.Profile.GOBJECT;
++#endif
+ 		context.report = report;
+ 		report.clear_error_indicators ();
+ 
+@@ -414,11 +418,19 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
+ 			builder.append_printf ("%s sender", widget.get_full_name ());
+ 
+ 			foreach (var param in sig.get_parameters ()) {
++#if VALA_0_48
++				builder.append_printf (", %s %s", param.variable_type.type_symbol.get_full_name (), param.name);
++#else
+ 				builder.append_printf (", %s %s", param.variable_type.data_type.get_full_name (), param.name);
++#endif
+ 			}
+ 		} else {
+ 			foreach (var param in sig.get_parameters ()) {
++#if VALA_0_48
++				builder.append_printf ("%s %s, ", param.variable_type.type_symbol.get_full_name (), param.name);
++#else
+ 				builder.append_printf ("%s %s, ", param.variable_type.data_type.get_full_name (), param.name);
++#endif
+ 			}
+ 
+ 			builder.append_printf ("%s sender", widget.get_full_name ());
+@@ -563,6 +575,15 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
+ 		}
+ 		return matching_symbols;
+ 	}
++
++	inline List<Vala.Symbol> symbol_lookup_inherited_for_type (Vala.DataType data_type, string name, bool prefix_match, bool invocation = false) {
++#if VALA_0_48
++		return symbol_lookup_inherited (data_type.type_symbol, name, prefix_match, invocation);
++#else
++		return symbol_lookup_inherited (data_type.data_type, name, prefix_match, invocation);
++#endif
++	}
++
+ 	List<Vala.Symbol> symbol_lookup_inherited (Vala.Symbol? sym, string name, bool prefix_match, bool invocation = false) {
+ 		List<Vala.Symbol> result = null;
+ 
+@@ -580,32 +601,32 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
+ 		}
+ 		if (invocation && sym is Vala.Method) {
+ 			var func = (Vala.Method) sym;
+-			result.concat (symbol_lookup_inherited (func.return_type.data_type, name, prefix_match));
++			result.concat (symbol_lookup_inherited_for_type (func.return_type, name, prefix_match));
+ 		} else if (sym is Vala.Class) {
+ 			var cl = (Vala.Class) sym;
+ 			foreach (var base_type in cl.get_base_types ()) {
+-				result.concat (symbol_lookup_inherited (base_type.data_type, name, prefix_match));
++				result.concat (symbol_lookup_inherited_for_type (base_type, name, prefix_match));
+ 			}
+ 		} else if (sym is Vala.Struct) {
+ 			var st = (Vala.Struct) sym;
+-			result.concat (symbol_lookup_inherited (st.base_type.data_type, name, prefix_match));
++			result.concat (symbol_lookup_inherited_for_type (st.base_type, name, prefix_match));
+ 		} else if (sym is Vala.Interface) {
+ 			var iface = (Vala.Interface) sym;
+ 			foreach (var prerequisite in iface.get_prerequisites ()) {
+-				result.concat (symbol_lookup_inherited (prerequisite.data_type, name, prefix_match));
++				result.concat (symbol_lookup_inherited_for_type (prerequisite, name, prefix_match));
+ 			}
+ 		} else if (sym is Vala.LocalVariable) {
+ 			var variable = (Vala.LocalVariable) sym;
+-			result.concat (symbol_lookup_inherited (variable.variable_type.data_type, name, prefix_match));
++			result.concat (symbol_lookup_inherited_for_type (variable.variable_type, name, prefix_match));
+ 		} else if (sym is Vala.Field) {
+ 			var field = (Vala.Field) sym;
+-			result.concat (symbol_lookup_inherited (field.variable_type.data_type, name, prefix_match));
++			result.concat (symbol_lookup_inherited_for_type (field.variable_type, name, prefix_match));
+ 		} else if (sym is Vala.Property) {
+ 			var prop = (Vala.Property) sym;
+-			result.concat (symbol_lookup_inherited (prop.property_type.data_type, name, prefix_match));
++			result.concat (symbol_lookup_inherited_for_type (prop.property_type, name, prefix_match));
+ 		} else if (sym is Vala.Parameter) {
+ 			var fp = (Vala.Parameter) sym;
+-			result.concat (symbol_lookup_inherited (fp.variable_type.data_type, name, prefix_match));
++			result.concat (symbol_lookup_inherited_for_type (fp.variable_type, name, prefix_match));
+ 		}
+ 
+ 		return result;
+-- 
+2.35.1
+
diff --git a/dev-util/anjuta/files/3.34.0-autoconf-2.70.patch b/dev-util/anjuta/files/3.34.0-autoconf-2.70.patch
new file mode 100644
index 000000000000..fdcc9e3158bf
--- /dev/null
+++ b/dev-util/anjuta/files/3.34.0-autoconf-2.70.patch
@@ -0,0 +1,15 @@
+https://gitlab.gnome.org/GNOME/anjuta/-/merge_requests/13
+
+diff --git a/configure.ac b/configure.ac
+index c637f9cf3..4b101c35e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,8 +85,6 @@ case "$YACC" in
+     AC_MSG_ERROR(bison is required)
+     ;;
+ esac
+-AC_LANG([C])
+-AC_LANG([C++])
+ AC_PROG_CXX
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],,
+    AC_MSG_ERROR([C++ Compiler required to compile Anjuta]))
diff --git a/dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch b/dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch
new file mode 100644
index 000000000000..6ae0ead0f3d7
--- /dev/null
+++ b/dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch
@@ -0,0 +1,15 @@
+https://gitlab.gnome.org/GNOME/anjuta/-/merge_requests/14
+
+diff --git a/configure.ac b/configure.ac
+index c637f9cf3..b34e103b2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -338,7 +338,7 @@ if test "$user_disabled_vala" = 1; then
+ else
+         AC_MSG_RESULT(no)
+ 	AC_MSG_CHECKING(if libvala is available)
+-	m4_foreach_w([VERSION], [0.56 0.54 0.52 0.50 0.48 0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32],
++	m4_foreach_w([VERSION], [0.32 0.34 0.36 0.38 0.40 0.42 0.44 0.46 0.48 0.50 0.52 0.54 0.56],
+ 		[PKG_CHECK_EXISTS([ libvala-VERSION ],
+ 			 [ valaver="-VERSION" ])
+ 			 ])
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 1c38e54404e6..29d9dead1d08 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -30,8 +30,8 @@ VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.46}
 
 # @ECLASS_VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
-# Maximum vala API version (e.g. 0.54).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.54}
+# Maximum vala API version (e.g. 0.56).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.56}
 
 # @ECLASS_VARIABLE: VALA_USE_DEPEND
 # @DEFAULT_UNSET
diff --git a/profiles/package.mask b/profiles/package.mask
index 556faa3898f7..1168ec09879f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (2022-03-27)
+# Dead package. Homepage doesn't resolve. Unmaintained in Gentoo for at
+# least 6 years.
+# Removal on 2022-05-02
+app-pda/gtkpod
+
 # Ulrich Müller <ulm@gentoo.org> (2022-04-01)
 # Illegal instruction errors seen by several users.
 # Masked for testing. (bug #835930)
@@ -404,12 +410,6 @@ dev-tex/pdfannotextractor
 =sys-kernel/gentoo-sources-5.14.19
 =sys-kernel/vanilla-sources-5.14.19
 
-# Mart Raudsepp <leio@gentoo.org> (2021-11-11)
-# Needs testing to ensure valac-0.54 works for existing packages
->=dev-libs/vala-common-0.53
-dev-lang/vala:0.54
-dev-lang/vala:0.56
-
 # Ionen Wolkens <ionen@gentoo.org> (2021-10-09)
 # Vulkan beta driver branch aimed at Vulkan developers for testing
 # new features. Beside vulkan, it is typically behind the main branch