diff --git a/Manifest.files.gz b/Manifest.files.gz
index 26258d701aea..3f65b8397c00 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 17adea275d50..65712f9b2066 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/quagga/Manifest b/acct-group/quagga/Manifest
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/acct-group/quagga/metadata.xml b/acct-group/quagga/metadata.xml
deleted file mode 100644
index b3726e9bf59e..000000000000
--- a/acct-group/quagga/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- Sergey Popov
- pinkbyte@gentoo.org
-
-
diff --git a/acct-group/quagga/quagga-0-r1.ebuild b/acct-group/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index 104f8007e235..000000000000
--- a/acct-group/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=424
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index f49c5b8ffd5a..fc7b171ffee2 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/quagga/Manifest b/acct-user/quagga/Manifest
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/acct-user/quagga/quagga-0-r1.ebuild b/acct-user/quagga/quagga-0-r1.ebuild
deleted file mode 100644
index d40e6dace3fe..000000000000
--- a/acct-user/quagga/quagga-0-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=424
-ACCT_USER_GROUPS=( quagga )
-
-acct-user_add_deps
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 69659de096a3..e4dca41babf7 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
index 2ed9a2f37a66..37666f544f15 100644
--- a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
VALA_USE_DEPEND=vapigen
inherit gnome2 meson-multilib python-any-r1 vala virtualx
@@ -25,16 +25,21 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
DEPEND="
>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
"
RDEPEND="${DEPEND}
virtual/secret-service"
BDEPEND="
+ app-text/docbook-xml-dtd:4.2
dev-libs/libxslt
dev-util/gdbus-codegen
dev-util/glib-utils
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
+ gtk-doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ dev-util/gtk-doc
+ )
test? (
$(python_gen_any_dep '
dev-python/mock[${PYTHON_USEDEP}]
diff --git a/app-crypt/libsecret/libsecret-0.20.4.ebuild b/app-crypt/libsecret/libsecret-0.20.4.ebuild
deleted file mode 100644
index 5db7cd230147..000000000000
--- a/app-crypt/libsecret/libsecret-0.20.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 meson-multilib python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-
-IUSE="+crypt gtk-doc +introspection test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- vala? ( introspection )
- gtk-doc? ( crypt )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-
-DEPEND="
- >=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
- crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-"
-RDEPEND="${DEPEND}"
-# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
-PDEPEND=">=gnome-base/gnome-keyring-3" # to avoid circular dep (bug #547456)
-BDEPEND="
- dev-libs/libxslt
- dev-util/gdbus-codegen
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? (
- $(python_gen_any_dep '
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
- introspection? ( >=dev-libs/gjs-1.32 )
- )
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
-)
-
-python_check_deps() {
- if use introspection; then
- has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- has_version -b "dev-python/mock[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- default
-
- # Remove @filename@ from the header template that would otherwise cause
- # differences dependent on the ABI
- sed -e '/enumerations from "@filename@"/d' \
- -i libsecret/secret-enum-types.h.template || die
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use crypt gcrypt)
-
- # Don't build docs multiple times
- $(meson_native_true manpage)
- $(meson_native_use_bool gtk-doc gtk_doc)
-
- $(meson_native_use_bool introspection)
- $(meson_native_use_bool vala vapi)
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- virtx meson_src_test
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.2.ebuild
index 1ee2e7de82cb..70ef8d64a922 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.19.2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
MY_P="${P/mit-}"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index ceb6bc73aa0c..6d29a07916b9 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index 7bfd8becebc9..36daa6c7006b 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,2 +1,2 @@
-DIST fs-uae-launcher-3.1.63.tar.xz 7718940 BLAKE2B e1e6102ce6f3e0a5b3f7429ac5894a50b42f2ee26d3b8bf4fec5b39fa199a28d12ebd056ac0c372ce38f78c820dc0c3dec4c4af0918f3a7e5f4b05f944791afb SHA512 d363512c4930f0a245d5333bb5324264244ffc0eb3a39e4ec419cb4861ca9bf5e1f2084405b7f8757f86f0ed9754dbbbbe0aab3391b04898a7d3dc2621346849
DIST fs-uae-launcher-3.1.64.tar.xz 7719268 BLAKE2B 7753006e40e11d557f9cca90296b189638b832b8c2caebceb3fd5aa0393d3b1236ef2d47b176a900d26ab37012198afeb1549da92ba0570eb9b61df42c896550 SHA512 2f7c485f7707595a847130ebbaad3cf1fe9dc11149744bad2683b1b912a53830b687c0aa5ce97dc95a883182ef51020cc02fa434eac903752530f3780342090a
+DIST fs-uae-launcher-3.1.66.tar.xz 7730328 BLAKE2B 68e141658d267c0bc574b216be5c99d10dff23d153e13cccc6a19c5abe618657ce3faf5c685e604ef55927a0dc713c0606f9e1f41e3bcd0015aeb232b9266713 SHA512 6232f43a0a41e67d912b277294079608808a7243512e7970900fab2be483ba82da99eaae547c41be059828c1f5d316e9b58ab8018651c9643b2b72cf7eb6f67e
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.63.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.66.ebuild
similarity index 100%
rename from app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.63.ebuild
rename to app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.66.ebuild
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index 103d7da407ab..c0f76411351a 100644
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@@ -1,2 +1,2 @@
-DIST fs-uae-3.1.35.tar.gz 4817547 BLAKE2B 5f75a1e262ba8d642401a03ac5b2494be37b8bab8f014a48208cc6e0b2e33373a7ce6146065f41404d8fcbd60fe71582319abe51521336c2d7c04668c3adacd9 SHA512 96bec936f867fc42eb9f61058887c027da0bab1c8df196ab62a714b1f28c92aafe6c4a61d441e5c7b5d8aee28c90d68812d0f6049c610e2ef9eebdd7e3edf013
DIST fs-uae-3.1.62.tar.xz 3632040 BLAKE2B 7d38a7bedca979c88d1c7566ae3a3c3df8009b2c02aec28753b6dc72d27049de37c5c0d3436fe5e8309511e9710ae3238f6f2d7eea36285acf4807294621bce5 SHA512 bafa9b012042c2b973ea0e5aaac88404f00bdfac85a2239513088d5432bda631242244f66f72b5879794815167409b127ee0a9dd320dd90ba8dac16019adbb28
+DIST fs-uae-3.1.66.tar.xz 3627688 BLAKE2B 9c7742b78055b4c2409c4527ab3b5daac829fa8d09363c5640ce433770ec0f7f6417cfa5dc7689bfdf747083bad654a8d433216b2c94e93ef3189f7e6f7213d9 SHA512 3d93c6481d4aebb21607fa6cd0716bb809a902a5e6e20cda97751f7878157a0737b80df1290c2e1cf4e13f1e9a824b750c52479cd05e56bff291be7471d167a1
diff --git a/app-emulation/fs-uae/fs-uae-3.1.35.ebuild b/app-emulation/fs-uae/fs-uae-3.1.66.ebuild
similarity index 96%
rename from app-emulation/fs-uae/fs-uae-3.1.35.ebuild
rename to app-emulation/fs-uae/fs-uae-3.1.66.ebuild
index 6bba9b857875..5cb3b91f1ede 100644
--- a/app-emulation/fs-uae/fs-uae-3.1.35.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.1.66.ebuild
@@ -7,7 +7,7 @@ inherit autotools xdg
DESCRIPTION="Integrates the most accurate Amiga emulation code available from WinUAE"
HOMEPAGE="https://fs-uae.net/"
-SRC_URI="https://fs-uae.net/stable/${PV}/${P}.tar.gz"
+SRC_URI="https://fs-uae.net/files/FS-UAE/Stable/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc64"
@@ -40,7 +40,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
"${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch
- "${FILESDIR}"/${PN}-3.1.35-ar.patch
"${FILESDIR}"/${PN}-3.1.35-deepbind.patch
)
diff --git a/app-emulation/qemu/qemu-6.2.0.ebuild b/app-emulation/qemu/qemu-6.2.0.ebuild
index 0eb1fd734c4b..bfc38240e3a6 100644
--- a/app-emulation/qemu/qemu-6.2.0.ebuild
+++ b/app-emulation/qemu/qemu-6.2.0.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://download.qemu.org/${P}.tar.xz"
- KEYWORDS="~amd64 arm64 ~ppc ppc64 x86"
+ KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/spice/spice-0.14.3-r1.ebuild b/app-emulation/spice/spice-0.14.3-r1.ebuild
index 8310f48f147f..1eed375b81ad 100644
--- a/app-emulation/spice/spice-0.14.3-r1.ebuild
+++ b/app-emulation/spice/spice-0.14.3-r1.ebuild
@@ -20,14 +20,14 @@ RESTRICT="!test? ( test )"
# the libspice-server only uses the headers of libcacard
RDEPEND="
dev-lang/orc[static-libs(+)?]
- >=dev-libs/glib-2.22:2[static-libs(+)?]
+ >=dev-libs/glib-2.38:2[static-libs(+)?]
media-libs/opus[static-libs(+)?]
sys-libs/zlib[static-libs(+)?]
virtual/jpeg:0=[static-libs(+)?]
>=x11-libs/pixman-0.17.7[static-libs(+)?]
dev-libs/openssl:0=[static-libs(+)?]
lz4? ( app-arch/lz4:0=[static-libs(+)?] )
- smartcard? ( >=app-emulation/libcacard-0.1.2 )
+ smartcard? ( >=app-emulation/libcacard-2.5.1 )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
gstreamer? (
media-libs/gstreamer:1.0
diff --git a/app-emulation/spice/spice-0.15.0.ebuild b/app-emulation/spice/spice-0.15.0.ebuild
index 30f4642538da..c727ca7067e6 100644
--- a/app-emulation/spice/spice-0.15.0.ebuild
+++ b/app-emulation/spice/spice-0.15.0.ebuild
@@ -21,21 +21,21 @@ RESTRICT="!test? ( test )"
# the libspice-server only uses the headers of libcacard
RDEPEND="
dev-lang/orc[static-libs(+)?]
- >=dev-libs/glib-2.22:2[static-libs(+)?]
+ >=dev-libs/glib-2.38:2[static-libs(+)?]
media-libs/opus[static-libs(+)?]
sys-libs/zlib[static-libs(+)?]
virtual/jpeg:0=[static-libs(+)?]
>=x11-libs/pixman-0.17.7[static-libs(+)?]
dev-libs/openssl:0=[static-libs(+)?]
lz4? ( app-arch/lz4:0=[static-libs(+)?] )
- smartcard? ( >=app-emulation/libcacard-0.1.2 )
+ smartcard? ( >=app-emulation/libcacard-2.5.1 )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)"
DEPEND="${RDEPEND}
- >=app-emulation/spice-protocol-0.14.0
+ >=app-emulation/spice-protocol-0.14.3
smartcard? ( app-emulation/qemu[smartcard] )
test? ( net-libs/glib-networking )"
BDEPEND="${PYTHON_DEPS}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 3c6b58e2d3d9..0429a1a8c4c0 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/afl/afl-2.57b-r2.ebuild b/app-forensics/afl/afl-2.57b-r2.ebuild
new file mode 100644
index 000000000000..95bfacc4b55c
--- /dev/null
+++ b/app-forensics/afl/afl-2.57b-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs flag-o-matic
+
+# See https://github.com/google/AFL/pull/117
+PATCHES=( "${FILESDIR}/${P}-install-readmemd.diff" )
+
+DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
+HOMEPAGE="https://lcamtuf.coredump.cx/afl/"
+SRC_URI="https://github.com/google/AFL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="sys-devel/gcc:*
+ !app-forensics/aflplusplus"
+RDEPEND="${DEPEND}"
+QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
+
+S="${WORKDIR}/AFL-${PV}"
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ PREFIX="${EPREFIX}/usr" \
+ HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+ DOC_PATH="${EPREFIX}/usr/share/doc/${PF}"
+# Not compatible with latest clang, see
+# https://github.com/google/AFL/issues/151
+#
+# CC="clang" CXX="clang++" strip-unsupported-flags
+# cd llvm_mode || die
+# emake \
+# PREFIX="${EPREFIX}/usr" \
+# HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+# DOC_PATH="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+ DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+ install
+}
diff --git a/app-forensics/afl/files/afl-2.57b-install-readmemd.diff b/app-forensics/afl/files/afl-2.57b-install-readmemd.diff
new file mode 100644
index 000000000000..50b777413c19
--- /dev/null
+++ b/app-forensics/afl/files/afl-2.57b-install-readmemd.diff
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 5e800db26..381931289 100644
+--- a/Makefile
++++ b/Makefile
+@@ -133,7 +133,7 @@ endif
+ set -e; for i in afl-g++ afl-clang afl-clang++; do ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/$$i; done
+ install -m 755 afl-as $${DESTDIR}$(HELPER_PATH)
+ ln -sf afl-as $${DESTDIR}$(HELPER_PATH)/as
+- install -m 644 docs/README docs/ChangeLog docs/*.txt $${DESTDIR}$(DOC_PATH)
++ install -m 644 README.md docs/ChangeLog docs/*.txt $${DESTDIR}$(DOC_PATH)
+ cp -r testcases/ $${DESTDIR}$(MISC_PATH)
+ cp -r dictionaries/ $${DESTDIR}$(MISC_PATH)
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 556de9743a60..7b1bb9eccb80 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 99bf07749a7d..ce4ba0771fda 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,4 +1,4 @@
DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
DIST portage-utils-0.92.tar.xz 1819676 BLAKE2B 01798e3984745140bca1bcc1eda5c2aea7c517bee2656acfe1bd810fc8088ddcb474f2c64fee6832c5e1699e2ec8ad5a9c6d5afba8a2e2b6f1861d49fbf7fcb7 SHA512 7d36263c9c242c8e82786fa12e171a3f396f65520acb8caa91516862615bd71241699ab6c2232122f7009875aa0a10b06b614a842d45afc86e599b39711e12b3
-DIST portage-utils-0.93.2.tar.xz 1796492 BLAKE2B 32aedb673d868389b1053bea932fdcd8624017d725bb91e1a994124606625b0205a81a1668a62ad61c366682e734a497d7f0a46f094ba27159cfbf881379a09e SHA512 45e42b72e79ffc080c408d92cf431f07be8444f0fa5d185cf98c58847a5af13e14cf002ecd77446c39d2114ff38de47e2772344750a4fcbc0ecc8df27bec998e
+DIST portage-utils-0.93.3.tar.xz 1796828 BLAKE2B cfad7ab27ff2d92f631f4e31012e8903c5fa6113485f727338812059379cdd4a9552d80dc3aef6bb91264c361c0554fe9054a12347e274c4c5c3db66fd36008b SHA512 c1245aa78d236263cd266fc8565312c2ac30cb992037a7b0f26da04ecf2dfeebc85bff653784e186cf2c7d7468e4772fb0bd93bcdb3a37d46e493d000933e5a1
diff --git a/app-portage/portage-utils/portage-utils-0.93.2.ebuild b/app-portage/portage-utils/portage-utils-0.93.3.ebuild
similarity index 100%
rename from app-portage/portage-utils/portage-utils-0.93.2.ebuild
rename to app-portage/portage-utils/portage-utils-0.93.3.ebuild
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 497f5ee8a04e..8a1fa8b24fbc 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild
index 3cfdd740bc9a..4ea8bdc99c17 100644
--- a/app-shells/ksh/ksh-1.0.0_beta2.ebuild
+++ b/app-shells/ksh/ksh-1.0.0_beta2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3f60b34950e7..f590c59a4095 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-shells/fzy/Manifest b/app-text/fzy/Manifest
similarity index 100%
rename from app-shells/fzy/Manifest
rename to app-text/fzy/Manifest
diff --git a/app-shells/fzy/files/1.0-cflags.patch b/app-text/fzy/files/1.0-cflags.patch
similarity index 100%
rename from app-shells/fzy/files/1.0-cflags.patch
rename to app-text/fzy/files/1.0-cflags.patch
diff --git a/app-shells/fzy/fzy-1.0-r1.ebuild b/app-text/fzy/fzy-1.0-r1.ebuild
similarity index 99%
rename from app-shells/fzy/fzy-1.0-r1.ebuild
rename to app-text/fzy/fzy-1.0-r1.ebuild
index 2e74b46c1a85..a7450fedb766 100644
--- a/app-shells/fzy/fzy-1.0-r1.ebuild
+++ b/app-text/fzy/fzy-1.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit optfeature savedconfig toolchain-funcs
diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-text/fzy/fzy-9999.ebuild
similarity index 100%
rename from app-shells/fzy/fzy-9999.ebuild
rename to app-text/fzy/fzy-9999.ebuild
diff --git a/app-shells/fzy/metadata.xml b/app-text/fzy/metadata.xml
similarity index 100%
rename from app-shells/fzy/metadata.xml
rename to app-text/fzy/metadata.xml
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 170e1a1035e4..1facfc1a1d2b 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,2 +1,3 @@
DIST qpdfview-0.4.18.tar.gz 786577 BLAKE2B 07ef444ba39435578481e549fcbbd2d97362c6bda3092a17f1daa8b8437febf50cd2f145cd5e80cc1be565c5a658e85a428314a1bcd2a5a38efce0830f1cffba SHA512 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66
DIST qpdfview-0.4.18_p1.tar.bz2 448818 BLAKE2B 690f93c7f0af376e2b60d69a9802cdb159a97eb66b572a913badcd7ce3b9303d69bf8fbb359b5aa09ad1c63b1b6865e3602c8dc9cdad2506a43273d410a64d89 SHA512 41152596e39e6084e4e46c1aca28dfa4c619bf31068ee3272c6119793da5d99c58868ecf682ed0dc81e740f20193372e2780cf7d7fb917545662c93e6a2a1b4a
+DIST qpdfview-0.4.18_p20211227.tar.bz2 485165 BLAKE2B 1efdebf84ffbcedf464615e6ef2ef4092ef3210177e5faf17bb01c39243fdd5b11434459dad897a04acff0cf037129d2a524d37c670ae57556219421c363d1c5 SHA512 ea2206d9f2cbd5bf53ab75c8e78a5b3e30136febcf82630c375d664645d6b5e72c6128fb7b63cb65ec511c2c23014ceddd93495c520e9cddd1c52f01377bea17
diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml
index 8cbacb076ed2..9e9a7f9e3fdc 100644
--- a/app-text/qpdfview/metadata.xml
+++ b/app-text/qpdfview/metadata.xml
@@ -1,6 +1,10 @@
+
+ grozin@gentoo.org
+ Andrey Grozin
+
qt@gentoo.org
Gentoo Qt Project
diff --git a/app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild b/app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild
new file mode 100644
index 000000000000..e555d9864d04
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ast az be ber bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hi hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zgh zh_CN zh_TW"
+inherit plocale qmake-utils xdg
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+# bzr revision 2137
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+RDEPEND="
+ cups? ( net-print/cups )
+ djvu? ( app-text/djvu )
+ fitz? ( >=app-text/mupdf-1.7:= )
+ postscript? ( app-text/libspectre )
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5[cups?]
+ dev-qt/qtwidgets:5
+ dbus? ( dev-qt/qtdbus:5 )
+ pdf? ( >=app-text/poppler-0.35[qt5]
+ dev-qt/qtxml:5 )
+ sqlite? ( dev-qt/qtsql:5[sqlite] )
+ svg? ( dev-qt/qtsvg:5 )
+ !svg? ( virtual/freedesktop-icon-theme )
+ synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+ default
+
+ local mylrelease="$(qt5_get_bindir)"/lrelease
+ prepare_locale() {
+ "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+ }
+
+ rm_help() {
+ rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+ }
+
+ plocale_find_changes translations ${PN}_ .ts
+ plocale_for_each_locale prepare_locale
+ plocale_for_each_disabled_locale rm_help
+
+ # adapt for prefix
+ sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+}
+
+src_configure() {
+ local myconfig=() i=
+ for i in cups dbus djvu pdf svg synctex; do
+ use ${i} || myconfig+=(without_${i})
+ done
+ use fitz && myconfig+=(with_fitz)
+ use postscript || myconfig+=(without_ps)
+ use sqlite || myconfig+=(without_sql)
+
+ local myqmakeargs=(
+ qpdfview.pro
+ CONFIG+="${myconfig[*]}"
+ PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+ )
+ eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index ebea832745f6..6c2d886e89f1 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/VSS/Manifest b/dev-ada/VSS/Manifest
new file mode 100644
index 000000000000..714cc852f4fb
--- /dev/null
+++ b/dev-ada/VSS/Manifest
@@ -0,0 +1 @@
+DIST VSS-22.0.0.tar.gz 310314 BLAKE2B 710645472b0e767f744ca12564a595fabc6bd931a271bc6fd575fdee70ade1676f3a0dbe00d7700ba5bbeb341fa6cc767b8efb18162f1fc308edcb653c9919f4 SHA512 b38582efc2b334a5b550eb9eacadd721b354f51d4cc26fcb4da1c8e7d241a848d5d3ee2651a72b552e2d5357b9fde46ba48e694f17f49cc2bcdad63d2f9d685e
diff --git a/dev-ada/VSS/VSS-22.0.0.ebuild b/dev-ada/VSS/VSS-22.0.0.ebuild
new file mode 100644
index 000000000000..170d744c2a58
--- /dev/null
+++ b/dev-ada/VSS/VSS-22.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0,1} )
+inherit ada multiprocessing
+
+DESCRIPTION="A high level string and text processing library"
+HOMEPAGE="https://github.com/AdaCore/VSS"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+ emake GPRBUILD_FLAGS="-p -j$(makeopts_jobs) -v"
+}
diff --git a/acct-user/quagga/metadata.xml b/dev-ada/VSS/metadata.xml
similarity index 62%
rename from acct-user/quagga/metadata.xml
rename to dev-ada/VSS/metadata.xml
index b3726e9bf59e..91e8ad9f5e33 100644
--- a/acct-user/quagga/metadata.xml
+++ b/dev-ada/VSS/metadata.xml
@@ -1,8 +1,7 @@
-
- Sergey Popov
- pinkbyte@gentoo.org
+
+ ada@gentoo.org
diff --git a/dev-ada/gtkada/files/gtkada-2021-uninstall.patch b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
new file mode 100644
index 000000000000..c782aac633b7
--- /dev/null
+++ b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in 2021-12-27 09:42:14.575136019 +0100
++++ b/Makefile.in 2021-12-27 09:42:31.159870381 +0100
+@@ -113,10 +113,6 @@
+ endif
+
+ install-clean:
+-ifneq (,$(wildcard $(prefix)/lib/gnat/manifests/gtkada))
+- -$(GPRINSTALL) --uninstall -f --prefix=$(prefix) \
+- --project-subdir=lib/gnat gtkada
+-endif
+
+ install: install-clean
+ ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
diff --git a/dev-ada/gtkada/gtkada-2021.ebuild b/dev-ada/gtkada/gtkada-2021.ebuild
index da08ed425283..1005a7ba1034 100644
--- a/dev-ada/gtkada/gtkada-2021.ebuild
+++ b/dev-ada/gtkada/gtkada-2021.ebuild
@@ -39,6 +39,7 @@ S="${WORKDIR}"/${MYP}
PATCHES=(
"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
"${FILESDIR}"/${PN}-2019-gentoo.patch
+ "${FILESDIR}"/${P}-uninstall.patch
)
src_prepare() {
diff --git a/dev-ada/gtkada/gtkada-22.0.0.ebuild b/dev-ada/gtkada/gtkada-22.0.0.ebuild
index 8a1efe2e0af3..6cb33f81492e 100644
--- a/dev-ada/gtkada/gtkada-22.0.0.ebuild
+++ b/dev-ada/gtkada/gtkada-22.0.0.ebuild
@@ -33,6 +33,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
"${FILESDIR}"/${PN}-2019-gentoo.patch
+ "${FILESDIR}"/${PN}-2021-uninstall.patch
)
src_prepare() {
diff --git a/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild b/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
index 9f4a7cad4a24..d0fb5513cc81 100644
--- a/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
+++ b/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-ADA_COMPAT=( gnat_202{0,1} )
+ADA_COMPAT=( gnat_2021 )
inherit ada multiprocessing
DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
diff --git a/dev-ada/spawn/spawn-22.0.0.ebuild b/dev-ada/spawn/spawn-22.0.0.ebuild
index 9ac4af26e845..2d8433b46e3a 100644
--- a/dev-ada/spawn/spawn-22.0.0.ebuild
+++ b/dev-ada/spawn/spawn-22.0.0.ebuild
@@ -18,7 +18,8 @@ IUSE="glib +shared static-libs static-pic"
REQUIRED_USE="|| ( shared static-libs static-pic )
${ADA_REQUIRED_USE}"
-RDEPEND="glib? (
+RDEPEND="${ADA_DEPS}
+ glib? (
dev-ada/gtkada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
dev-libs/glib
)"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index fd4cea391a38..a9c028a8cebe 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/jffi/jffi-1.2.9-r1.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild
index 6c6b7d259e42..ef103551c7d9 100644
--- a/dev-java/jffi/jffi-1.2.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
CDEPEND="dev-libs/libffi:0="
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
index 20c56e8735fd..2c4a9a83197d 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="2"
-KEYWORDS="ppc64"
+KEYWORDS="~arm ppc64"
# Fixing https://bugs.gentoo.org/736830 would cost too much time.
RESTRICT="test"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 524157983e9b..d6353de13645 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/idris2/metadata.xml b/dev-lang/idris2/metadata.xml
index b8e693b1cb86..aab9447eef4a 100644
--- a/dev-lang/idris2/metadata.xml
+++ b/dev-lang/idris2/metadata.xml
@@ -6,7 +6,7 @@
scheme@gentoo.org
Gentoo Scheme Project
-
+
Idris is a programming language designed to encourage Type-Driven
Development.
In type-driven development, types are tools for constructing programs.
@@ -16,7 +16,10 @@
the more confidence we can have that the resulting program will be correct.
- https://github.com/idris-lang/Idris2/issues
+ https://github.com/idris-lang/Idris2/issues/
+
+ https://github.com/idris-lang/Idris2/blob/main/CHANGELOG.md
+
idris-lang/Idris2