diff --git a/Manifest.files.gz b/Manifest.files.gz
index 441287783051..0db6a831364d 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 d2f939d8d535..d334ff85d0d4 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/cmd5checkpw/Manifest b/acct-group/cmd5checkpw/Manifest
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild b/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild
deleted file mode 100644
index 6873ca559f38..000000000000
--- a/acct-group/cmd5checkpw/cmd5checkpw-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=212
diff --git a/acct-group/cmd5checkpw/metadata.xml b/acct-group/cmd5checkpw/metadata.xml
deleted file mode 100644
index 630f5673b82e..000000000000
--- a/acct-group/cmd5checkpw/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- eike@sf-mail.de
- Rolf Eike Beer
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 2133c9b4eca3..f69c988dc1e5 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/cmd5checkpw/Manifest b/acct-user/cmd5checkpw/Manifest
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild b/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild
deleted file mode 100644
index c4772b70850d..000000000000
--- a/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for cmd5checkpw"
-ACCT_USER_ID=212
-ACCT_USER_GROUPS=( nofiles )
-
-acct-user_add_deps
diff --git a/acct-user/cmd5checkpw/metadata.xml b/acct-user/cmd5checkpw/metadata.xml
deleted file mode 100644
index 630f5673b82e..000000000000
--- a/acct-user/cmd5checkpw/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- eike@sf-mail.de
- Rolf Eike Beer
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 40fcc46d493d..97a737b7f9ba 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/caribou/caribou-0.4.21-r4.ebuild b/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
deleted file mode 100644
index 24394a7692dd..000000000000
--- a/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit autotools gnome.org gnome2-utils python-single-r1 vala
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-accessibility/at-spi2-core
- $(python_gen_cond_dep '
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
- ')
- >=dev-libs/gobject-introspection-0.10.7:=
- dev-libs/libgee:0.8
- dev-libs/libxml2
- >=media-libs/clutter-1.5.11:1.0[introspection]
- >=x11-libs/gtk+-3:3[introspection]
- x11-libs/libX11
- x11-libs/libxklavier
- x11-libs/libXtst
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="
- ${COMMON_DEPEND}
- dev-libs/glib[dbus]
- $(python_gen_cond_dep '
- >=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
- ')
- >=gnome-base/gsettings-desktop-schemas-3
- gnome-base/librsvg:2
- sys-apps/dbus
- !=dev-util/intltool-0.35.5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-fix-compilation-error.patch"
- "${FILESDIR}/${PN}-fix-subkey-popmenu.patch"
- "${FILESDIR}/${PN}-fix-xadapter-xkb-calls.patch"
- "${FILESDIR}/${PN}-fix-antler-style-css.patch"
- "${FILESDIR}/${PN}-fix-python-env.patch"
- "${FILESDIR}/${PN}-change_autostart_cinnamon.patch"
- "${FILESDIR}/${PN}-drop_gir_patch.patch"
-)
-
-src_prepare() {
- default
- vala_src_prepare
- gnome2_disable_deprecation_warning
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-maintainer-mode \
- --disable-schemas-compile \
- --disable-docs \
- --disable-static \
- --disable-gtk2-module \
- --enable-gtk3-module
-}
-
-src_install() {
- DOCS="AUTHORS NEWS README"
- default
- find "${D}" -name '*.la' -delete || die
- python_optimize
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/app-accessibility/freetts/freetts-1.2.2-r2.ebuild b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
index 4322b03c1b15..38b75456e0e4 100644
--- a/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.2-r2.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
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc examples source"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A speech synthesis system written entirely in Java"
-HOMEPAGE="https://freetts.sourceforge.net/"
+HOMEPAGE="https://freetts.sourceforge.io/"
SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
diff --git a/app-accessibility/sound-icons/sound-icons-0.1.ebuild b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
index 2582afeca261..294d6b7afb58 100644
--- a/app-accessibility/sound-icons/sound-icons-0.1.ebuild
+++ b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
@@ -3,9 +3,9 @@
EAPI=7
-DESCRIPTION="a collection of Sound Icons for speech-dispatcher"
-HOMEPAGE="http://www.freebsoft.org"
-SRC_URI="http://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
+DESCRIPTION="Collection of Sound Icons for speech-dispatcher"
+HOMEPAGE="https://www.freebsoft.org"
+SRC_URI="https://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 531b5d4f6a1d..6ddff1958c95 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,2 +1 @@
-DIST speech-dispatcher-0.11.3.tar.gz 7150632 BLAKE2B 92bad589e453a243362a9e0142d2897b9651fa648012f2bd7ef00bc1ded389fd2c01b6f38f19002289357f7aa6361a6e7fa3ee35ec2ad7c044f34d87e7f2c409 SHA512 e9f5b862066c0292230fda32f16782f9a2d66e8d0c0e3aa0ccdb4628c1182661d2f40894f480ae5206af7fbbc49338189312afe02092f5d472095b053afd75c7
DIST speech-dispatcher-0.11.4.tar.gz 7127323 BLAKE2B 651a20ec403c6158756ab6ff7fbedb38ce1cec413be49367128274c8d20ccc7080a2dccd68cb7ebbec6bab05599f06a4aafc561e4e5e53cf52d19fa1b94fa286 SHA512 d0ebe832e2586abdb1284be36f8427cfbbd94f1a2dead1b74526b151e9529f9e61679339274b73afab5f829d184337372ba0aad93d880c42d2a6a1bcb2b7afef
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch
deleted file mode 100644
index 3575e2c54c99..000000000000
--- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This fixes pthread_mutex_t being undefined on musl libc.
-
-https://github.com/brailcom/speechd/commit/17e4038948f01e389cbd7fedbe3f0eb54ad3292d
-https://bugs.gentoo.org/833347
---- a/src/modules/module_main.h
-+++ b/src/modules/module_main.h
-@@ -31,6 +31,7 @@
-
- #include
- #include
-+#include
-
- #ifdef __cplusplus
- extern "C" {
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch
deleted file mode 100644
index f520fdc6adfb..000000000000
--- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://github.com/brailcom/speechd/commit/db21e5fe4b3155734f60a67c8ab5da6b53174e1b
-https://github.com/brailcom/speechd/pull/783
-https://bugs.gentoo.org/877339
-
-From db21e5fe4b3155734f60a67c8ab5da6b53174e1b Mon Sep 17 00:00:00 2001
-From: Bernard Cafarelli
-Date: Mon, 17 Oct 2022 15:28:37 +0200
-Subject: [PATCH] Fix audio plugin loading with dlopen
-
-dlopen needs the full name including .so extension
-Set SPD_AUDIO_PLUGIN_ENTRY to correct name (ltdl adds a prefix)
---- a/src/audio/alsa.c
-+++ b/src/audio/alsa.c
-@@ -37,7 +37,11 @@
- #include
- #include
-
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_alsa_LTX_spd_audio_plugin_get
-+#endif
- #include
-
- typedef struct {
---- a/src/audio/libao.c
-+++ b/src/audio/libao.c
-@@ -32,7 +32,11 @@
- #include
- #include
-
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_libao_LTX_spd_audio_plugin_get
-+#endif
- #include
-
- /* send a packet of XXX bytes to the sound device */
---- a/src/audio/nas.c
-+++ b/src/audio/nas.c
-@@ -32,7 +32,11 @@
-
- #include
-
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_nas_LTX_spd_audio_plugin_get
-+#endif
- #include
-
- typedef struct {
---- a/src/audio/oss.c
-+++ b/src/audio/oss.c
-@@ -39,7 +39,11 @@
-
- #include
-
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_oss_LTX_spd_audio_plugin_get
-+#endif
- #include
-
- typedef struct {
---- a/src/audio/pulse.c
-+++ b/src/audio/pulse.c
-@@ -51,7 +51,11 @@
- #include
- #include
-
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_pulse_LTX_spd_audio_plugin_get
-+#endif
- #include
-
- typedef struct {
---- a/src/common/spd_audio.c
-+++ b/src/common/spd_audio.c
-@@ -120,7 +120,7 @@ AudioID *spd_audio_open(const char *name, void **pars, char **error)
- plugin_dir = PLUGIN_DIR;
-
- #ifdef USE_DLOPEN
-- libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s", plugin_dir, name);
-+ libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s.so", plugin_dir, name);
- dlhandle = dlopen(libname, RTLD_NOW | RTLD_GLOBAL);
-
- g_free(libname);
-
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild
deleted file mode 100644
index 889db1da776b..000000000000
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit python-r1 systemd
-
-DESCRIPTION="Speech synthesis interface"
-HOMEPAGE="https://freebsoft.org/speechd"
-SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="python? ( ${PYTHON_DEPS} )
- >=dev-libs/dotconf-1.3
- >=dev-libs/glib-2.36:2
- >=media-libs/libsndfile-1.0.2
- alsa? ( media-libs/alsa-lib )
- ao? ( media-libs/libao )
- espeak? ( app-accessibility/espeak )
- espeak-ng? ( app-accessibility/espeak-ng )
- flite? ( app-accessibility/flite )
- nas? ( media-libs/nas )
- pulseaudio? ( media-sound/pulseaudio )"
-RDEPEND="${DEPEND}
- python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
-BDEPEND="
- sys-apps/help2man
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.11.1-include-pthread_h.patch
- "${FILESDIR}"/${P}-fix-dlopen.patch
-)
-
-src_configure() {
- # bug 573732
- export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
- local myeconfargs=(
- --disable-ltdl
- --disable-python
- --disable-static
- --with-baratinoo=no
- --with-ibmtts=no
- --with-kali=no
- --with-pico=no
- --with-voxin=no
- $(use_with alsa)
- $(use_with ao libao)
- $(use_with espeak)
- $(use_with espeak-ng)
- $(use_with flite)
- $(use_with nas)
- $(use_with pulseaudio pulse)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- use python && python_copy_sources
-
- emake
-
- if use python; then
- building() {
- cd src/api/python || die
- emake \
- pyexecdir="$(python_get_sitedir)" \
- pythondir="$(python_get_sitedir)"
- }
- python_foreach_impl run_in_build_dir building
- fi
-}
-
-src_install() {
- default
-
- if use python; then
- installation() {
- cd src/api/python || die
- emake \
- DESTDIR="${D}" \
- pyexecdir="$(python_get_sitedir)" \
- pythondir="$(python_get_sitedir)" \
- install
- }
- python_foreach_impl run_in_build_dir installation
- python_replicate_script "${ED}"/usr/bin/spd-conf
- python_foreach_impl python_optimize
- fi
-
- find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
- local editconfig="n"
- if ! use espeak-ng; then
- ewarn "You have disabled espeak-ng, which is speech-dispatcher's"
- ewarn "default speech synthesizer."
- ewarn
- editconfig="y"
- fi
- if ! use pulseaudio; then
- ewarn "You have disabled pulseaudio support."
- ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
- ewarn
- editconfig="y"
- fi
- if [[ "${editconfig}" == "y" ]]; then
- ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf"
- ewarn "and make sure the settings there match your system."
- ewarn
- fi
-}
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
index 5e3d29432faa..c2d113a7a6c6 100644
--- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
@@ -9,7 +9,7 @@ MY_P=${P/speech-/speech_}
PATCHSET="r3"
DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
+HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/"
SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz
https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"
S="${WORKDIR}/speech_tools"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c9e849dd7fef..17828d0788ec 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-cmdb/Manifest b/app-admin/ansible-cmdb/Manifest
deleted file mode 100644
index e33a869b8ada..000000000000
--- a/app-admin/ansible-cmdb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ansible-cmdb-1.30.tar.gz 179165 BLAKE2B 377b182ffd0f7cf6630011f7df82fe1155c0f00a482e91e0d8206eee5aab167eb96dc936b2fbd02c6c80e725b9767f25a02422d538ee7ecf95ad1e9be51fe81a SHA512 e4561976588d6268c6849a4b1656c57d9a0f2db9256b2d2821f9c1a8c23fdb92b843b06bb94b44db565966c209b62da4bb11dfa41319a3b01ea4c7a53dde930f
diff --git a/app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild b/app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild
deleted file mode 100644
index a87e1129b407..000000000000
--- a/app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Ansible Configuration Management Database"
-HOMEPAGE="https://github.com/fboender/ansible-cmdb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-python/mako[${PYTHON_USEDEP}]
- dev-python/jsonxs[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/app-admin/ansible-cmdb/metadata.xml b/app-admin/ansible-cmdb/metadata.xml
deleted file mode 100644
index bc1cb5f88825..000000000000
--- a/app-admin/ansible-cmdb/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- monsieurp@gentoo.org
- Patrice Clement
-
-
- fboender/ansible-cmdb
- ansible-cmdb
-
-
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index ca7f10d5d3a6..ebc4128a5e84 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,3 +2,7 @@ DIST aws-cli-1.27.20.gh.tar.gz 2315771 BLAKE2B 6729a6709e2ae3d493700b49dbcb70203
DIST aws-cli-1.27.29.gh.tar.gz 2325759 BLAKE2B 693131da782ce248a00560617d3d1cd57e1dcac20ba8a6a560b5a1c06c7f6b18576efd4e0a2151d538e28b3f59593ded609e8fea3d29bce9f91bc270f888e23a SHA512 828a3fdda0b3156c1b09ed53b5c2c6486857bdd1e4e3d5cfd77e817bc6c1e53e1ff3f7ddf83c55e8ca93b2944f37333244adffa0f3b9416b1c4197db9b364dde
DIST aws-cli-1.27.31.gh.tar.gz 2327529 BLAKE2B 5c274358df6ed3081e945f21aac184fb774cc4b5d621954f4c4b88996252c3edb0b9c76d6aaab1f5273f0c2db1d19a7d5a46f3c1915190e7d5c141e9cfcf908d SHA512 37b295265d32e8ca73f3b16c4225027df8b735c39a930ad64db9590737da0e9407560fb82514417a0f7b42692fec27c8b949f91c973e719199c9767ff613559d
DIST aws-cli-1.27.32.gh.tar.gz 2328348 BLAKE2B 0958525a47f6dac8422dd37c9e099c2bf48d4bb5a8897673d18bb5b747dc6a0806d71cdf92899daf768ffa7cf9b7d39fe559cadad46eabc7913130d98c578d75 SHA512 db034e58761368a72e5a233e49e6c904281635fb47384f984b2ead1bd285bdb0af1a7e7b76d77ddaa6d19496ee1add756e1dbc43044aab1ba2b1f09232a112c9
+DIST aws-cli-1.27.33.gh.tar.gz 2330168 BLAKE2B f5edc8494ba8b66c9819dd2b9182ab3bbc1f91c1114222e53ed890706c7d6c63adf31f754d85526c01459d3910b7cde5cb38f7e29c1821f086d3b94b9003eaec SHA512 d5e0e18804c7cbc549ba8d8cf4fa6a180f78f0681d09955e96874e0a67a3c3de2a1397995a62a9df14b08425feef6d625ae61522dbe38a62ddf9cb7e72d786d4
+DIST aws-cli-1.27.34.gh.tar.gz 2330530 BLAKE2B ee58a6cf4b2fa66c308a479222d13bdb1140e61c591c9d0bc452ae823a2d6a6ed14adb72cb6316d21ca26e33476fecf45f1484346924c9db2a4e7120d586babf SHA512 db9deda8021cb30f597f5bf96e0312bf3a0046da82a894663bb79549857b745e3676340997c0eb381e170d89e177d938cc1e93c0371b364bd23533dbdf39a344
+DIST aws-cli-1.27.36.gh.tar.gz 2332507 BLAKE2B 215356ff11388b5ecc3c71cf6a33b7a9e23449fd88bc4342aeae4660a17b2348f736d646b34eb343a4fc0f4d990d7b39d43de3b21d3b8b4bc1bdfa0f37db2fb6 SHA512 a84bf8c636d39ced6e1e5153e8eedc1db8629cd325236b5c9ab5cd39b59105f9f906822955318bec99062f438ddb118e26e5aa4e50d2e1c2397249b64014288e
+DIST aws-cli-1.27.37.gh.tar.gz 2332965 BLAKE2B 9c855f02bc63f64e3d9bb706139305a6b3dad523bd2563c9d6ca4b39b340ea242bf8e85ee369ca92d327073d9eb0a4f0e3da59b4016eaa2ce4f48aa083cc9c51 SHA512 3f53d4c15244019d1773486e192bda4ca69a9afe8e32f2fcfd9f56affc3bcc84e15a1aa4b27563f404bc5471b868eabc74c8fb3884deb0372d61a038e101202a
diff --git a/app-admin/awscli/awscli-1.27.33.ebuild b/app-admin/awscli/awscli-1.27.33.ebuild
new file mode 100644
index 000000000000..caea725bbca7
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.33.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.27.34.ebuild b/app-admin/awscli/awscli-1.27.34.ebuild
new file mode 100644
index 000000000000..caea725bbca7
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.34.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.27.36.ebuild b/app-admin/awscli/awscli-1.27.36.ebuild
new file mode 100644
index 000000000000..caea725bbca7
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.36.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.27.37.ebuild b/app-admin/awscli/awscli-1.27.37.ebuild
new file mode 100644
index 000000000000..caea725bbca7
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.37.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/bastille/bastille-3.0.9-r3.ebuild b/app-admin/bastille/bastille-3.0.9-r3.ebuild
index 365b97b97bad..4a1ca299446d 100644
--- a/app-admin/bastille/bastille-3.0.9-r3.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r3.ebuild
@@ -9,7 +9,7 @@ PATCHVER=0.2
MY_PN=${PN/b/B}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.sourceforge.net/"
+HOMEPAGE="https://bastille-linux.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
S="${WORKDIR}"/${MY_PN}
diff --git a/app-admin/coreboot-utils/Manifest b/app-admin/coreboot-utils/Manifest
new file mode 100644
index 000000000000..3a7daa58eb9a
--- /dev/null
+++ b/app-admin/coreboot-utils/Manifest
@@ -0,0 +1 @@
+DIST coreboot-4.18.tar.xz 57868424 BLAKE2B 981d8c1cf007be15a85d5860dcfcfa6fa637f66438ff4ef6619491aaf0192e622bfbe9608deb13a975d899c94430bc3d1f0eb3a5a3dc6598f49a726b8ff641e1 SHA512 b363850d31074950bc710bd0a47a896a6c6ef23c53d720ae90ec2257697a3eeeb211e163199064b5e532e5b1e86cdecf997276d742435deeaaacfb19b83f4e6d
diff --git a/app-admin/coreboot-utils/coreboot-utils-4.18.ebuild b/app-admin/coreboot-utils/coreboot-utils-4.18.ebuild
new file mode 100644
index 000000000000..a9115a5fe9d9
--- /dev/null
+++ b/app-admin/coreboot-utils/coreboot-utils-4.18.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A selection from coreboot/utils useful in general"
+HOMEPAGE="https://www.coreboot.org/"
+SRC_URI="https://coreboot.org/releases/coreboot-${PV}.tar.xz"
+
+LICENSE="GPL-2+ GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="sys-apps/pciutils
+ sys-libs/zlib"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/coreboot-${PV}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.18-musl.patch
+ "${FILESDIR}"/${PN}-4.18-flags.patch
+)
+
+coreboot_utils=(
+ #cbfstool has textrels and is not really necessary outside coreboot
+ cbmem
+ ifdtool
+ intelmetool
+ inteltool
+ me_cleaner
+ nvramtool
+ pmh7tool
+ superiotool
+)
+
+src_prepare() {
+ default
+ # drop some CFLAGS that hurt compilation on modern toolchains or
+ # force optimisation
+ # can't do this in one sed, because it all happens back-to-back
+ for e in '-O[01234567s]' '-g' '-Werror' '-ansi' '-pendantic' ; do
+ sed -i -e 's/ '"${e}"'\( \|$\)/ /g' util/*/Makefile{.inc,} || die
+ done
+}
+
+src_compile() {
+ # selection from README.md that seem useful outside coreboot
+
+ tc-export CC
+ export HOSTCFLAGS="${CFLAGS}"
+ for tool in ${coreboot_utils[*]} ; do
+ [[ -f util/${tool}/Makefile ]] || continue
+ emake -C util/${tool} V=1
+ done
+}
+
+src_install() {
+ exeinto /usr/sbin
+ for tool in ${coreboot_utils[*]} ; do
+ [[ -e util/${tool}/${tool} ]] && doexe util/${tool}/${tool}
+ [[ -e util/${tool}/${tool}.py ]] && doexe util/${tool}/${tool}.py
+ done
+}
diff --git a/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch b/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch
new file mode 100644
index 000000000000..e42e6b2921da
--- /dev/null
+++ b/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch
@@ -0,0 +1,35 @@
+- ifdtool: respect LDFLAGS
+- nvramtool: respect CFLAGS
+- pmh7tool: respect CC, CFLAGS
+
+--- a/util/ifdtool/Makefile.inc 2022-10-16 20:14:31.000000000 +0000
++++ b/util/ifdtool/Makefile.inc 2022-12-25 11:38:47.572534621 +0000
+@@ -16,4 +16,4 @@
+
+ $(objutil)/ifdtool/ifdtool: $(addprefix $(objutil)/ifdtool/,$(ifdtoolobj))
+ printf " IFDTOOL\n"
+- $(HOSTCC) $(addprefix $(objutil)/ifdtool/,$(ifdtoolobj)) -o $@
++ $(HOSTCC) $(LDFLAGS) $(addprefix $(objutil)/ifdtool/,$(ifdtoolobj)) -o $@
+--- a/util/nvramtool/Makefile 2022-10-16 20:14:31.000000000 +0000
++++ b/util/nvramtool/Makefile 2022-12-25 11:39:15.924345609 +0000
+@@ -11,7 +11,7 @@
+ CC ?= gcc
+ INSTALL = /usr/bin/env install
+ PREFIX = /usr/local
+-CFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes -I. -DCMOS_HAL=1
++CFLAGS += -O2 -g -Wall -Wextra -Wmissing-prototypes -I. -DCMOS_HAL=1
+ #CFLAGS = -Os -Wall
+
+ CLI_OBJS = cli/nvramtool.o cli/opts.o
+--- a/util/pmh7tool/Makefile 2022-10-16 20:14:31.000000000 +0000
++++ b/util/pmh7tool/Makefile 2022-12-25 11:39:38.491195945 +0000
+@@ -1,7 +1,7 @@
+ ## SPDX-License-Identifier: GPL-2.0-only
+
+-CC = gcc
+-CFLAGS = -O2 -Wall -Wextra -Werror
++CC ?= gcc
++CFLAGS ?= -O2 -Wall -Wextra -Werror
+ PROGRAM = pmh7tool
+ INSTALL = /usr/bin/env install
+ PREFIX = /usr/local
diff --git a/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch
new file mode 100644
index 000000000000..435977ac9c0b
--- /dev/null
+++ b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch
@@ -0,0 +1,75 @@
+Author: Fabian Groffen
+Date: Wed Dec 14 17:28:13 2022 +0100
+
+ musl: clumpsy buildfixes
+
+diff --git a/src/arch/x86/include/arch/mmio.h b/src/arch/x86/include/arch/mmio.h
+index c2aa0fb910..b2a37a03dd 100644
+--- a/src/arch/x86/include/arch/mmio.h
++++ b/src/arch/x86/include/arch/mmio.h
+@@ -5,6 +5,10 @@
+
+ #include
+
++#ifndef __always_inline
++#define __always_inline inline
++#endif
++
+ static __always_inline uint8_t read8(const volatile void *addr)
+ {
+ return *((volatile uint8_t *)(addr));
+diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
+index 5b40721262..2d0da33d72 100644
+--- a/util/inteltool/inteltool.h
++++ b/util/inteltool/inteltool.h
+@@ -12,6 +12,7 @@
+ #if defined(__GLIBC__)
+ #include
+ #endif
++#include
+ #if (defined(__MACH__) && defined(__APPLE__))
+ /* DirectHW is available here: https://www.coreboot.org/DirectHW */
+ #define __DARWIN__
+diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
+index ed18c13e62..fa2c6ce35d 100644
+--- a/util/superiotool/superiotool.c
++++ b/util/superiotool/superiotool.c
+@@ -320,6 +320,7 @@ int main(int argc, char *argv[])
+ }
+ }
+
++#if 0
+ #if defined(__FreeBSD__)
+ if ((io_fd = open("/dev/io", O_RDWR)) < 0) {
+ perror("/dev/io");
+@@ -330,6 +331,7 @@ int main(int argc, char *argv[])
+ printf("Superiotool must be run as root.\n");
+ exit(1);
+ }
++#endif
+
+ print_version();
+
+diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
+index a621ae5274..d5f44fece4 100644
+--- a/util/superiotool/superiotool.h
++++ b/util/superiotool/superiotool.h
+@@ -24,6 +24,10 @@
+ # endif
+ #endif
+
++#include
++#include
++#include
++
+ #if defined(__FreeBSD__)
+ #include
+ #include
+@@ -89,6 +93,7 @@ static __inline__ uint32_t inl(uint16_t port)
+ __asm__ __volatile__ ("inl %1,%0":"=a" (value):"Nd" (port));
+ return value;
+ }
++
+ #endif
+
+ #define USAGE "Usage: superiotool [-d] [-e] [-a] [-l] [-V] [-v] [-h]\n\n\
diff --git a/app-admin/coreboot-utils/metadata.xml b/app-admin/coreboot-utils/metadata.xml
new file mode 100644
index 000000000000..e33cf762c720
--- /dev/null
+++ b/app-admin/coreboot-utils/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ grobian@gentoo.org
+
+
diff --git a/app-admin/drush/drush-6.7.0-r3.ebuild b/app-admin/drush/drush-6.7.0-r3.ebuild
deleted file mode 100644
index 1ecfe2c05382..000000000000
--- a/app-admin/drush/drush-6.7.0-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-DESCRIPTION="Command line shell and scripting interface for Drupal"
-HOMEPAGE="https://github.com/drush-ops/drush"
-SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
- dev-php/PEAR-Console_Table"
-
-PATCHES=(
- "${FILESDIR}/update-bash-completion-script-for-2.1.patch"
- "${FILESDIR}/array-syntax.patch"
-)
-
-src_prepare() {
- default
-
- # dodoc compresses all of the documentation, so we fix the filenames
- # in a few places.
- #
- # First, the README location in bootstrap.inc.
- sed -i -e \
- "s!/share/doc/drush!/share/doc/${PF}!" \
- -e "s!README\.md!\0.bz2!g" \
- includes/bootstrap.inc || die
-
- # Next, the list of documentation in docs.drush.inc. Note that
- # html files don't get compressed.
- sed -i \
- -e "s!\.bashrc'!.bashrc.bz2'!" \
- -e "s!\.inc'!.inc.bz2'!" \
- -e "s!\.ini'!.ini.bz2'!" \
- -e "s!\.md'!.md.bz2'!" \
- -e "s!\.php'!.php.bz2'!" \
- -e "s!\.script'!.script.bz2'!" \
- -e "s!\.txt'!.txt.bz2'!" \
- commands/core/docs.drush.inc || die
-}
-
-src_install() {
- # Always install the examples; they're referenced within the source
- # code and too difficult to exorcise.
- dodoc -r README.md docs examples
-
- insinto /usr/share/drush
- doins -r classes commands includes lib misc
- doins drush_logo-black.png drush.info drush.php
-
- exeinto /usr/share/drush
- doexe drush
- dosym ../share/drush/drush /usr/bin/drush
-
- keepdir /etc/drush
- newbashcomp drush.complete.sh drush
-}
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index e4eb818785f5..db4f01b0349a 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,3 +1 @@
-DIST entr-5.0.tar.gz 25480 BLAKE2B 5de00d6b1042667e209b2c33d7d019bad4833a0711a18d47eddb129ef60f5518c42fc2af3169510f57eb39f861d416ab67d7cd83e4a631cfcaa4cc7ac266f82d SHA512 f485efb7d05f1d099c85d8af2f313e3ed2f36720483afc3004479b5b8754c60c52a108b827efd017c674f01d6ced2878a317addef3960c8cdf9e6b142f2ad5fd
-DIST entr-5.1.tar.gz 25674 BLAKE2B e456c415198f4d5be49fd52785cd8cce41756d2ebe14c493891c3fa05f3a763c9e3be65538d3150b484e48e0d23615556dd6c45fdbefc7b2052fc36f265ca685 SHA512 b8ee7dae5bda503af814eb109a0180c9864fa1b1cf5a2fe53c9915b6536e9471f8293c63d138d881da7bf70dfee24a6c271b82ecb6ccb2cb6ea664cabedba202
DIST entr-5.2.tar.gz 25834 BLAKE2B c14eddaaf26994679991c43b38dcea0f1cbf53ce517af462cfed9dea2c914d9c1719053cb3b9f28f04d0cbf8719fe5612963c1428832e02bd55545ba33c72556 SHA512 b12310b6695f0b3d3d830b651dd182ddf2321aad38f569066cc2e5b17570070e48eb4900725c88c1d31a8ff71099aba78fb7508ad60706265cbdf8f29257eaaa
diff --git a/app-admin/entr/entr-5.0.ebuild b/app-admin/entr/entr-5.0.ebuild
deleted file mode 100644
index 760aed913403..000000000000
--- a/app-admin/entr/entr-5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="https://eradman.com/entrproject/"
-SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-
-src_configure() {
- sh configure || die
- sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
- export CC="$(tc-getCC)"
- default
-}
-
-src_test() {
- export CC="$(tc-getCC)"
- default
-}
diff --git a/app-admin/entr/entr-5.1.ebuild b/app-admin/entr/entr-5.1.ebuild
deleted file mode 100644
index 53c88c3095c2..000000000000
--- a/app-admin/entr/entr-5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="https://eradman.com/entrproject/"
-SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-
-src_configure() {
- sh configure || die
- sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
- export CC="$(tc-getCC)"
- default
-}
-
-src_test() {
- export CC="$(tc-getCC)"
- default
-}
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
index 0cfdc861f166..413516588e6e 100644
--- a/app-admin/hardinfo/Manifest
+++ b/app-admin/hardinfo/Manifest
@@ -1,2 +1 @@
-DIST hardinfo-0.6_alpha_pre20201116.tar.gz 1294614 BLAKE2B d585be00603a5da2873d0e15829039f3f5212e2ab294b71d7f53299d7eecdfbb2d46ee8d56913039bf03807cebe3f100f41ce6560a1a33fcd712eab59c2a92a9 SHA512 34ce849f2d1a9ea129502abfb186b43a0d8ddecc853d2edc3128389944a34efa3580c6d8a35b8fc40b55d64cc8f3c0d33b97f198a449ed0cacdbff2520853c1c
DIST hardinfo-0.6_alpha_pre20221113-a798cbaed6f1b083cc3c26dbede74cf40947d0ef.tar.gz 1411038 BLAKE2B 8a6ca1a8e2bd53804cd6f55f0b9ce89d24d61aff9e267636301331d329229cd11778ea087e1906e7313cb1bd077ca69766e6fdf86c21985deba51f942cedf904 SHA512 faa7db1c8a7ac4f432a27cf10d21b453091136dd2d171b63f0b91eeea65c3cec25e7b4c2a845dfb64ff572ee6acaddfec56bd51f7292ed8b3674b44755a7a631
diff --git a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
deleted file mode 100644
index 3185f5988b51..000000000000
--- a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-GIT_COMMIT="54b2e307af763ce87bc8c88e80785d8114bf38dd"
-
-DESCRIPTION="System information and benchmark tool for Linux systems"
-HOMEPAGE="https://github.com/lpereira/hardinfo"
-SRC_URI="https://github.com/lpereira/hardinfo/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/json-glib
- net-libs/libsoup:2.4
- sys-libs/zlib
- x11-libs/cairo
- >=x11-libs/gtk+-3.0:3"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-
-src_configure() {
- local mycmakeargs=(
- -DHARDINFO_GTK3=1
- -DHARDINFO_DEBUG=$(usex debug 1 0)
- )
- cmake_src_configure
-}
diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml
index 115e9d64a669..4571b973d5b5 100644
--- a/app-admin/hardinfo/metadata.xml
+++ b/app-admin/hardinfo/metadata.xml
@@ -2,4 +2,7 @@
+
+ lpereira/hardinfo
+
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
deleted file mode 100644
index 7ab548ea474f..000000000000
--- a/app-admin/prelude-manager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch b/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch
deleted file mode 100644
index 4012c6c4b794..000000000000
--- a/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-When : everytime
-Why : Fix the run dir to comply with the Gentoo FS layout.
---- a/configure.ac
-+++ b/configure.ac
-@@ -337,7 +337,7 @@
-
- manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover
- manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler
--manager_run_dir=$LOCALSTATEDIR/run/prelude-manager
-+manager_run_dir=/run/prelude-manager
-
- AC_DEFINE_UNQUOTED(REPORT_PLUGIN_DIR, "$report_plugin_dir", Prelude-Manager report plugin directory)
- AC_DEFINE_UNQUOTED(DECODE_PLUGIN_DIR, "$decode_plugin_dir", Prelude-Manager decode plugin directory)
diff --git a/app-admin/prelude-manager/files/prelude-manager.initd b/app-admin/prelude-manager/files/prelude-manager.initd
deleted file mode 100644
index 14a39ba415e8..000000000000
--- a/app-admin/prelude-manager/files/prelude-manager.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BIN_MANAGER=/usr/bin/prelude-manager
-PID_MANAGER=/run/prelude-manager/prelude-manager.pid
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting prelude-manager"
- checkpath -d -m 0755 -o root:root /run/prelude-manager
- start-stop-daemon --start --exec $BIN_MANAGER \
- --pidfile $PID_MANAGER -- -d -P $PID_MANAGER
- eend $?
-}
-
-stop() {
- ebegin "Stopping prelude-manager"
- start-stop-daemon --stop --exec $BIN_MANAGER \
- --pidfile $PID_MANAGER
- eend $?
-}
diff --git a/app-admin/prelude-manager/files/prelude-manager.run b/app-admin/prelude-manager/files/prelude-manager.run
deleted file mode 100644
index 739808485129..000000000000
--- a/app-admin/prelude-manager/files/prelude-manager.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration to create /run/prelude-manager directory
-# Used as part of systemd's tmpfiles
-
-d /run/prelude-manager 0755 root root
diff --git a/app-admin/prelude-manager/files/prelude-manager.service b/app-admin/prelude-manager/files/prelude-manager.service
deleted file mode 100644
index 15eee91b8aa7..000000000000
--- a/app-admin/prelude-manager/files/prelude-manager.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Prelude-Manager service
-DefaultDependencies=no
-After=remote_fs.target
-Before=prelude-lml.service prelude-correlator.service
-
-[Service]
-ExecStart=/usr/bin/prelude-manager -d -P /run/prelude-manager/prelude-manager.pid
-Type=forking
-PIDFile=/run/prelude-manager/prelude-manager.pid
-Restart=always
-
-[Install]
-WantedBy=prelude-lml.service prelude-correlator.service multi-user.target
diff --git a/app-admin/prelude-manager/metadata.xml b/app-admin/prelude-manager/metadata.xml
deleted file mode 100644
index 921cf39372d1..000000000000
--- a/app-admin/prelude-manager/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- Prelude-Manager is a high availability server that
- accepts secured connections from distributed sensors
- and saves received events to a media specified by the user
- (database, log file, mail etc.). The server schedules and
- establishes the priorities of treatment according to the
- critical character and the source of the alerts.
-
-
-
diff --git a/app-admin/prelude-manager/prelude-manager-5.2.0-r1.ebuild b/app-admin/prelude-manager/prelude-manager-5.2.0-r1.ebuild
deleted file mode 100644
index 9ac8724e854b..000000000000
--- a/app-admin/prelude-manager/prelude-manager-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Bus communication for all Prelude modules"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbx geoip snmp tcpd xml"
-
-RDEPEND="net-libs/gnutls:=
- >=dev-libs/libprelude-5.2.0
- =dev-libs/libpreludedb-5.2.0
- =dev-ruby/facter-3.0.0
+ dev-ruby/concurrent-ruby
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl
+ dev-ruby/hocon"
+
+ruby_add_bdepend "
+ doc? ( dev-ruby/yard )
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0
+ acct-user/puppet
+ acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # fix systemd path
+ eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init puppet
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"
+ dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ tmpfiles_process puppet.conf
+
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+ elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+ elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+ elog "not already done so."
+ elog
+}
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
index 7d07c97eef1d..ca8f483d7a92 100644
--- a/app-admin/radmind/Manifest
+++ b/app-admin/radmind/Manifest
@@ -1,2 +1 @@
-DIST radmind-1.15.3.tar.gz 843033 BLAKE2B 3d4446e5ce9e668039277f63a16c014dbbecca870886e68603af4100cdbf4a0adf074d26c90985968ec1a680fb483395676b85020134ec56686318b3d0664d99 SHA512 121fa2ea4dc9532bdbb1440c3ee485db1d6a1e770bd01dc0e832d51ee26112441ff47bea8e7f063feffc4d5bf3cfc5ce53d316bb469ff4ff0a65ca5463c99d11
DIST radmind-1.15.4.tar.gz 413132 BLAKE2B 1327b429e12b09d49866e393b344ec7e2c471313a9437e5cb979f25674c7871948a0a4374c05d4939a697702675df70279ac476b3ed6a437b99afe5c98918e25 SHA512 538165123dfebc5c3890ae0864bc32988170e5235093d291a18ea7cf86eb50e9cf90c8a0530ae4b72611e95b5faa9474561f411ad646374173ee7b14235b5a5b
diff --git a/app-admin/radmind/radmind-1.15.3-r1.ebuild b/app-admin/radmind/radmind-1.15.3-r1.ebuild
deleted file mode 100644
index 972433fc9009..000000000000
--- a/app-admin/radmind/radmind-1.15.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tools and server to remotely administer multiple Unix filesystems"
-HOMEPAGE="https://github.com/Radmind https://sourceforge.net/projects/radmind/"
-SRC_URI="https://github.com/voretaq7/radmind/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/openssl:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.0-gentoo.patch
- "${FILESDIR}"/${PN}-1.14.1-glibc225.patch
-)
-
-src_install() {
- default
- keepdir /var/radmind/{cert,client,postapply,preapply}
-}
diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild
deleted file mode 100644
index 8b715d598fab..000000000000
--- a/app-admin/sud/sud-1.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A daemon to execute processes with special privileges in a nosuid environment"
-HOMEPAGE="http://s0ftpj.org/projects/sud/index.htm"
-SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3-fix-build-system.patch
- "${FILESDIR}"/${PN}-1.3-use-system-queue.patch
-)
-
-src_prepare() {
- default
-
- # bug #713470
- rm sud/queue.h || die
-
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_GNU_SOURCE
- default
-}
-
-src_install() {
- default
-
- doman ilogin.1 sud.1 suz.1
- insinto /etc
- doins miscs/sud.conf*
- newinitd "${FILESDIR}"/sud.rc6 sud
-}
diff --git a/app-admin/sud/sud-1.3-r2.ebuild b/app-admin/sud/sud-1.3-r2.ebuild
new file mode 100644
index 000000000000..f70d17d498c8
--- /dev/null
+++ b/app-admin/sud/sud-1.3-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A daemon to execute processes with special privileges in a nosuid environment"
+HOMEPAGE="http://www.s0ftpj.org/projects/sud/index.htm"
+SRC_URI="http://www.s0ftpj.org/projects/sud/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3-fix-build-system.patch
+ "${FILESDIR}"/${PN}-1.3-use-system-queue.patch
+)
+
+src_prepare() {
+ default
+
+ # bug #713470
+ rm sud/queue.h || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -D_GNU_SOURCE
+ default
+}
+
+src_install() {
+ default
+
+ doman ilogin.1 sud.1 suz.1
+ insinto /etc
+ doins miscs/sud.conf*
+ newinitd "${FILESDIR}"/sud.rc6 sud
+}
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index f20cd79a3b38..635d9abb518d 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -1,2 +1,3 @@
DIST supervisor-4.2.2.tar.gz 463657 BLAKE2B 766feffcbd70b575b6b7dfd6ed98e3510e0fd9362c423b677d44a2b5dd23ded14a349a279d3d28d4fd9e04a2175c8f00e24c07df310b61d34c7f69f60d26a4ac SHA512 f787206e6c6a5d3dfc4284974a4a87cbcaeac0c705afb2b8eae53f066413bd9e68095c5309e29625e01469a4748613370e1ac0d7be84b9d72c3623244bdd2eb3
DIST supervisor-4.2.4.tar.gz 465151 BLAKE2B 91b99a64950dc874bdc008ba53ca8b1962cc34981fee27c2fd82956d73ace9eaaf91439ef6be40530c4860fe1eee193e19b51ab81050f7368aa7d31f8444c785 SHA512 38c55aeadb8664337b667aad891a3a2134ae4af88e90d636054e6be9aebc8a3ef87d79d15fcafd2b9966af562deeedc96ac3730bde9439dde30208f0a874f2d7
+DIST supervisor-4.2.5.tar.gz 466073 BLAKE2B 54b45c824a1ad2960b04ca4ca9e54337f8c4da1a13008b559103f9efb9043588e72b3ee97c41218eb9252606d717575ad2615d12136047734f83d843d0a63bfa SHA512 ea80c8c91356646deccf20735e065fd9b341f3be6d56838d333989297a912b0a59142338925b2eb08690e038f0617814e03447673701a19093aa483432ce6d41
diff --git a/app-admin/supervisor/supervisor-4.2.5.ebuild b/app-admin/supervisor/supervisor-4.2.5.ebuild
new file mode 100644
index 000000000000..de4148c5f9bd
--- /dev/null
+++ b/app-admin/supervisor/supervisor-4.2.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="acct-group/supervisor"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_install_all() {
+ distutils-r1_python_install_all
+ newinitd "${FILESDIR}/init.d-r2" supervisord
+ newconfd "${FILESDIR}/conf.d-r1" supervisord
+ dodoc supervisor/skel/sample.conf
+ keepdir /etc/supervisord.d
+ insinto /etc
+ doins "${FILESDIR}/supervisord.conf"
+ keepdir /var/log/supervisor
+ systemd_dounit "${FILESDIR}/supervisord.service"
+}
+
+pkg_preinst() {
+ fowners :supervisor /var/log/supervisor
+ fperms 750 /var/log/supervisor
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
+ elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
+ elog ""
+ elog "By default, only members of the supervisor group can run supervisorctl."
+ fi
+}
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 05b3b354d9ef..d2c098172f03 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,2 +1 @@
-DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
DIST ulogd-2.0.8.tar.bz2 435434 BLAKE2B 8922a722d635b24dd8bed9bff9e96cbbdf1ac790defd3b205b6867f32d7abcd6dff1c37097305ed3ed627d66da1bdb1f7aa2a9fe7e29a2b2104959a986207478 SHA512 9f99f6f35bad5da4559d788dc3ba3dae17d4ae972737cae3313ecf68f08eaf5f55514fce6f30503437e4158fd30a06438b9249d5d20f6343964cbf690f87309d
diff --git a/app-admin/ulogd/files/patches/ulogd.patch b/app-admin/ulogd/files/patches/ulogd.patch
deleted file mode 100644
index c82e5022ed35..000000000000
--- a/app-admin/ulogd/files/patches/ulogd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ulogd.c
-+++ b/src/ulogd.c
-@@ -65,6 +65,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #ifdef DEBUG
diff --git a/app-admin/ulogd/ulogd-2.0.7-r3.ebuild b/app-admin/ulogd/ulogd-2.0.7-r3.ebuild
deleted file mode 100644
index 43b27f76543b..000000000000
--- a/app-admin/ulogd/ulogd-2.0.7-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info readme.gentoo-r1 systemd
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
-SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
-
-DEPEND="
- || ( net-firewall/iptables net-firewall/nftables )
- >=net-libs/libnfnetlink-1.0.1
- dbi? ( dev-db/libdbi )
- json? ( dev-libs/jansson:= )
- nfacct? (
- >=net-libs/libmnl-1.0.4
- >=net-libs/libnetfilter_acct-1.0.3
- )
- nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
- nflog? ( >=net-libs/libnetfilter_log-1.0.1 )
- mysql? ( dev-db/mysql-connector-c:= )
- pcap? ( net-libs/libpcap )
- postgres? ( dev-db/postgresql:= )
- sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="
- ${DEPEND}
- acct-user/ulogd
- acct-group/ulogd
- selinux? ( sec-policy/selinux-ulogd )
-"
-BDEPEND="
- doc? (
- app-text/linuxdoc-tools
- app-text/texlive-core
- dev-texlive/texlive-fontsrecommended
- virtual/latex-base
- )
-"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
- You must have at least one logging stack enabled to make ulogd work.
- Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
-"
-
-PATCHES=( "${FILESDIR}"/patches/ulogd.patch )
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if use nfacct && kernel_is lt 3 3 0; then
- ewarn "NFACCT input plugin requires a kernel >= 3.3."
- fi
-
- if use ulog && kernel_is ge 3 17 0; then
- ewarn "ULOG target has been removed in the 3.17 kernel release."
- ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
- fi
-}
-
-src_prepare() {
- default
-
- # Change default settings to:
- # - keep log files in /var/log/ulogd instead of /var/log;
- # - create sockets in /run instead of /tmp.
- sed -i \
- -e "s|var/log|var/log/${PN}|g" \
- -e 's|tmp|run|g' \
- ulogd.conf.in || die
-}
-
-src_configure() {
- append-lfs-flags
- local myeconfargs=(
- $(use_with dbi)
- $(use_with json jansson)
- $(use_enable nfacct)
- $(use_enable nfct)
- $(use_enable nflog)
- $(use_with mysql)
- $(use_with pcap)
- $(use_with postgres pgsql)
- $(use_with sqlite)
- $(use_enable ulog)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default_src_compile
-
- if use doc; then
- # Prevent access violations from bitmap font files generation.
- export VARTEXFONTS="${T}/fonts"
- emake -C doc
- fi
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/${PN}.html )
-
- default_src_install
- find "${ED}" -name '*.la' -delete || die
-
- readme.gentoo_create_doc
- doman ${PN}.8
-
- use doc && dodoc doc/${PN}.{dvi,ps,txt}
- use mysql && dodoc doc/mysql-*.sql
- use postgres && dodoc doc/pgsql-*.sql
- use sqlite && dodoc doc/sqlite3.table
-
- insinto /etc
- doins ${PN}.conf
- fowners root:ulogd /etc/${PN}.conf
- fperms 640 /etc/${PN}.conf
-
- newinitd "${FILESDIR}/${PN}.init" ${PN}
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- diropts -o ulogd -g ulogd
- keepdir /var/log/ulogd
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index de4aba8d61de..2f92a34ddb06 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,2 +1 @@
-DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd
DIST xstow-1.1.0.tar.bz2 187761 BLAKE2B ed3822e638aedf8900a3baba62a5af9de9d7b98dcdf27ca81a6898353b9f5c7f767ec7d8e68ead4d5ef318af5a6eda2b1cc68a5c80a6a8ad2b9c8adf03ae3377 SHA512 30f2e0be0c2aba668b4cc781fe69ac74c2460cc681c6b47a55ee66af5c0f2ac14dee9fe2e95a288ce06059378407a2b99d2156430a5a6dcbf06def793f579015
diff --git a/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch b/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
deleted file mode 100644
index 982d6bc5cb12..000000000000
--- a/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://svnweb.freebsd.org/ports/head/sysutils/xstow/files/patch-src__string_utils.h?revision=319588&view=co&pathrev=319588
-https://svnweb.freebsd.org/ports/head/sysutils/xstow/files/patch-src__leoini.h?revision=319588&view=co&pathrev=319588
-https://bugs.gentoo.org/840359
-https://bugs.gentoo.org/729114
-
---- a/src/leoini.h
-+++ b/src/leoini.h
-@@ -260,11 +260,9 @@
-
- if( start == std::string::npos ||
- end == std::string::npos )
-- s = "";
-- else
-- s = s.substr( start+1, start-end -1 );
-+ return s2x("");
-
-- return s2x(s);
-+ return s2x(s.substr( start+1, start-end -1 ));
- }
- } // namespace Leo
-
---- a/src/string_utils.h
-+++ b/src/string_utils.h
-@@ -28,6 +28,9 @@
- # define STRSTREAM
- #endif
-
-+typedef std::vector vec_string;
-+std::ostream& operator<<( std::ostream& out, const vec_string &v );
-+
- std::string toupper( std::string s );
- std::string strip( const std::string& str, const std::string& what = " \t\n\0" );
- bool is_int( const std::string &s );
diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
deleted file mode 100644
index b7d29f287e7f..000000000000
--- a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,11 +91,12 @@
- AC_MSG_RESULT(disabled)
- support_curses=0
- else
-+ AC_MSG_RESULT(enabled)
- support_curses=1
- fi
- ],
-- [
-- AC_MSG_RESULT(enabled)
-+ [])
-+if test $support_curses -eq 1; then
- AC_CHECK_HEADER([curses.h],
- [
- # test which libraray to use
-@@ -146,7 +147,7 @@
- fi
-
- if test $support_curses -eq 1; then
-- AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib")
-+ AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib")
- AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used])
- fi
-
-@@ -154,8 +155,7 @@
- [
- support_curses=0
- ])
-- ])
--
-+fi
-
- NO_STL_SSTREAM=0
- NO_STL_STRSTREAM=0
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -46,7 +46,7 @@
- backtrace.h \
- backtrace.cpp
-
--xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
-+xstow_LDADD= $(LDFLAGS_DYNAMIC)
-
- if ENABLE_MERGE
-
-@@ -63,7 +63,7 @@
- backtrace.h \
- backtrace.cpp
-
--merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
-+merge_info_LDADD= $(LDFLAGS_DYNAMIC)
-
- endif
-
diff --git a/app-admin/xstow/xstow-1.0.2-r1.ebuild b/app-admin/xstow/xstow-1.0.2-r1.ebuild
deleted file mode 100644
index 85b4c928574f..000000000000
--- a/app-admin/xstow/xstow-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Replacement for GNU stow with extensions"
-HOMEPAGE="http://xstow.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.0.1-ncurses.patch
- "${FILESDIR}"/${PN}-1.0.1-gcc12-clang.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with ncurses curses)
-}
-
-src_install() {
- emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
- dodoc AUTHORS ChangeLog NEWS README TODO
-
- # Create new STOWDIR
- keepdir /var/lib/xstow
-
- # Install env.d file to add STOWDIR to PATH and LDPATH
- doenvd "${FILESDIR}"/99xstow
-}
-
-pkg_postinst() {
- elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
- elog "instead of /usr/local in order to avoid conflicts with the"
- elog "symlink from /usr/lib64 -> /usr/lib. See Bug 246264"
- elog "(regarding app-admin/stow, equally applicable to XStow) for"
- elog "more details on this change."
- elog "For your convenience, PATH has been updated to include"
- elog "/var/lib/bin."
-}
diff --git a/app-admin/xstow/xstow-1.0.2.ebuild b/app-admin/xstow/xstow-1.0.2.ebuild
deleted file mode 100644
index 879bda8dfbaa..000000000000
--- a/app-admin/xstow/xstow-1.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Replacement for GNU stow with extensions"
-HOMEPAGE="http://xstow.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.0.1-ncurses.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with ncurses curses)
-}
-
-src_install() {
- emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
- dodoc AUTHORS ChangeLog NEWS README TODO
-
- # create new STOWDIR
- dodir /var/lib/xstow
-
- # install env.d file to add STOWDIR to PATH and LDPATH
- doenvd "${FILESDIR}/99xstow"
-}
-
-pkg_postinst() {
- elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
- elog "instead of /usr/local in order to avoid conflicts with the"
- elog "symlink from /usr/lib64 -> /usr/lib. See Bug 246264"
- elog "(regarding app-admin/stow, equally applicable to XStow) for"
- elog "more details on this change."
- elog "For your convenience, PATH has been updated to include"
- elog "/var/lib/bin."
-}
diff --git a/app-admin/yadm/yadm-3.2.1.ebuild b/app-admin/yadm/yadm-3.2.1.ebuild
index 4da1c8793b18..1a38c6538290 100644
--- a/app-admin/yadm/yadm-3.2.1.ebuild
+++ b/app-admin/yadm/yadm-3.2.1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 python-any-r1 python-utils-r1
+inherit bash-completion-r1 python-any-r1
DESCRIPTION="Git based tool for managing dotfiles"
HOMEPAGE="https://github.com/TheLocehiliosan/yadm"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 5a192d70afa4..2efea228b04d 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
deleted file mode 100644
index 535030c9466f..000000000000
--- a/app-arch/arc/arc-5.21p.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Create & extract files from DOS .ARC files"
-HOMEPAGE="https://arc.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.21m-darwin.patch
- "${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch
- "${FILESDIR}"/${PN}-5.21o-interix.patch
- "${FILESDIR}"/${PN}-5.21p-fno-common.patch
-)
-
-src_prepare() {
- default
-
- sed -i Makefile \
- -e 's/CFLAGS = $(OPT) $(SYSTEM)/CFLAGS += $(SYSTEM)/' \
- || die "sed Makefile"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" OPT="${LDFLAGS}"
-}
-
-src_install() {
- dobin arc marc
- doman arc.1
- dodoc Arc521.doc Arcinfo Changelog Readme
-}
diff --git a/app-arch/bloscpack/Manifest b/app-arch/bloscpack/Manifest
deleted file mode 100644
index 4ea87053d80f..000000000000
--- a/app-arch/bloscpack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bloscpack-0.16.0.tar.gz 99059 BLAKE2B 415894771d6b987170b6938fd20ad065d30075410ddf021bd6e65e3e02d12bff6f5bb22960cdd186d9e52666a1d934047e0383e5d74016c3ad2ba1eef06cafb6 SHA512 0608c795570961c2dc6ba5a6ea3c8c79b215609c2d141db797429abbceb8ee43843196a2d14fc94797d7df62d562abf5efdae10f093154d5d7a20b3b9bcd85ed
diff --git a/app-arch/bloscpack/bloscpack-0.16.0.ebuild b/app-arch/bloscpack/bloscpack-0.16.0.ebuild
deleted file mode 100644
index eb9555caa3d5..000000000000
--- a/app-arch/bloscpack/bloscpack-0.16.0.ebuild
+++ /dev/null
@@ -1,31 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Blosc compression"
-HOMEPAGE="https://github.com/Blosc/bloscpack"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# needs porting to newer numpy, bug #732790
-RESTRICT="test"
-
-RDEPEND="
- dev-python/blosc[${PYTHON_USEDEP}]
- dev-python/deprecated[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests nose
-
-python_test() {
- PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
-}
diff --git a/app-arch/bloscpack/metadata.xml b/app-arch/bloscpack/metadata.xml
deleted file mode 100644
index 427fc0e662c7..000000000000
--- a/app-arch/bloscpack/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- sci@gentoo.org
- Gentoo Science Project
-
-
-
- Command line interface to and serialization format for Blosc, a high
- performance, multi-threaded, blocking and shuffling compressor. Uses
- python-blosc bindings to interface with blosc.
-
-
- bloscpack
- Blosc/bloscpack
-
-
diff --git a/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch b/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
index 0f902f060f86..abd1b663496d 100644
--- a/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
+++ b/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
@@ -1,10 +1,12 @@
--- a/am/ax_compile_check_rettype.m4
+++ b/am/ax_compile_check_rettype.m4
-@@ -70,6 +70,7 @@ AC_CACHE_VAL(AC_CV_NAME,
+@@ -70,6 +70,9 @@ AC_CACHE_VAL(AC_CV_NAME,
[for ac_type in char short int long "long long" $4
do
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef HAVE_SYS_SYSMACROS_H
+#include
++#endif
#include
$3
]], [[switch (0) case 0: case (sizeof ($1($2)) == sizeof ($ac_type)):;]])], [AC_CV_NAME=$ac_type])
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 538f4e0bbcae..f0088d97f1eb 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,2 +1 @@
-DIST engrampa-1.24.2.tar.xz 1687432 BLAKE2B b2ef407aef77f9ecd3f8b06d2e991615a39fa2d4487678292d035a7cab882551bc8c757c6a15037b828cb51aaba14c2ec25e85e891770f6f8c9b453753d87b42 SHA512 1e0acecfe42e3945fe43729283522dfd56dc4cee92a4d5998c995a496f42f41b284ec10f01eb142139c1cec65e3b5a037299b168b73a2e6e828ae3ab4b9c777d
DIST engrampa-1.26.0.tar.xz 1761596 BLAKE2B c72def523f6589ab97351568e0562898d996e640ffefa66f32096e5a0ad97ad0b05b21ebdcc16ba1f75d9b75a444f8ed4ed492a412cc16c018e65135a88f3398 SHA512 8058627af19744d26f0997fca37a9a1d9902c63e4008e1af44b2a3b15ebc03e27f2018c60351ee503a28aa072836d201625074abb838e0a95071ce65c64a52bc
diff --git a/app-arch/engrampa/engrampa-1.24.2-r1.ebuild b/app-arch/engrampa/engrampa-1.24.2-r1.ebuild
deleted file mode 100644
index 8073767c9909..000000000000
--- a/app-arch/engrampa/engrampa-1.24.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mate optfeature
-
-DESCRIPTION="Engrampa archive manager for MATE"
-
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-IUSE="caja magic packagekit"
-
-DEPEND="
- >=dev-libs/glib-2.50:2
- >=dev-libs/json-glib-0.14
- virtual/libintl
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3[X]
- x11-libs/libSM
- x11-libs/pango
- caja? ( >=mate-base/caja-1.17.1 )
- magic? ( sys-apps/file )
- packagekit? ( app-admin/packagekit-base )
-"
-RDEPEND="
- ${DEPEND}
- virtual/libintl
-"
-BDEPEND="
- app-text/yelp-tools
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_configure() {
- mate_src_configure \
- --disable-run-in-place \
- $(use_enable caja caja-actions) \
- $(use_enable magic) \
- $(use_enable packagekit)
-}
-
-pkg_postinst() {
- mate_pkg_postinst
-
- optfeature "Support for 7-zip" app-arch/p7zip
- optfeature "Support for ace" app-arch/unace
- optfeature "Support for arj" app-arch/arj
- optfeature "Support for cpio" app-arch/cpio
- optfeature "Support for deb" app-arch/dpkg
- optfeature "Support for iso" app-cdr/cdrtools
- optfeature "Support for jar,zip" app-arch/zip app-arch/unzip
- optfeature "Support for lha" app-arch/lha
- optfeature "Support for lzma" app-arch/xz-utils
- optfeature "Support for lzop" app-arch/lzop
- optfeature "Support for rar" app-arch/unrar
- optfeature "Support for rpm" app-arch/rpm
- optfeature "Support for unstuff" app-arch/stuffit
- optfeature "Support for zoo" app-arch/zoo
-}
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index daa35af2526f..7f54976734ca 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -9,8 +9,6 @@
Enable engrampa to integrate with
mate-base/caja by providing entries in its context
menu
- Enable support for installing via Packagekit
- based on archive type
mate-desktop/engrampa
diff --git a/app-arch/pxz/files/pxz-5.0_pre20220509-fix-xz-path.patch b/app-arch/pxz/files/pxz-5.0_pre20220509-fix-xz-path.patch
new file mode 100644
index 000000000000..76e1f1506157
--- /dev/null
+++ b/app-arch/pxz/files/pxz-5.0_pre20220509-fix-xz-path.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/887255
+https://github.com/jnovy/pxz/issues/34
+https://github.com/jnovy/pxz/pull/40
+
+From 20014a968d2330ac90f48fc2091e15a44cb1e759 Mon Sep 17 00:00:00 2001
+From: Tobias Faller
+Date: Tue, 20 Dec 2022 22:41:59 +0100
+Subject: [PATCH] Updated default path for xz binary
+
+--- a/pxz.c
++++ b/pxz.c
+@@ -43,7 +43,7 @@
+ #endif
+
+ #ifndef XZ_BINARY
+-#define XZ_BINARY "xz"
++#define XZ_BINARY "/usr/bin/xz"
+ #endif
+
+ #define BUFFSIZE 0x10000
+
diff --git a/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild b/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild
new file mode 100644
index 000000000000..0968ba7b2f96
--- /dev/null
+++ b/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs prefix vcs-snapshot
+
+PXZ_COMMIT="136e5c25daf545753329d7cee1b06ae482fb9c44"
+DESCRIPTION="Parallel implementation of the XZ compression utility"
+HOMEPAGE="https://jnovy.fedorapeople.org/pxz/"
+SRC_URI="https://github.com/jnovy/pxz/archive/${PXZ_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux"
+
+# Needs the library from xz-utils
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.0_pre20220509-fix-xz-path.patch
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+ default
+
+ # bug #887255
+ eprefixify pxz.c
+
+ if use elibc_musl ; then
+ sed -i -e '//c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c || die
+ fi
+}
+
+src_configure() {
+ tc-export CC
+ export BINDIR="${EPREFIX}"/usr/bin
+ export MANDIR="${EPREFIX}"/usr/share/man
+}
diff --git a/app-arch/pxz/pxz-5.0_pre20220509.ebuild b/app-arch/pxz/pxz-5.0_pre20220509.ebuild
index 0c834cf15ee1..44c00d324932 100644
--- a/app-arch/pxz/pxz-5.0_pre20220509.ebuild
+++ b/app-arch/pxz/pxz-5.0_pre20220509.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs vcs-snapshot
PXZ_COMMIT="136e5c25daf545753329d7cee1b06ae482fb9c44"
DESCRIPTION="Parallel implementation of the XZ compression utility"
-HOMEPAGE="http://jnovy.fedorapeople.org/pxz/"
+HOMEPAGE="https://jnovy.fedorapeople.org/pxz/"
SRC_URI="https://github.com/jnovy/pxz/archive/${PXZ_COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch b/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch
deleted file mode 100644
index f11c86bb248a..000000000000
--- a/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/excludes.c b/excludes.c
-index b7c928d..fa43cef 100644
---- a/excludes.c
-+++ b/excludes.c
-@@ -106,7 +106,7 @@ build_exclude(fnm_exclude **ex_ptr, const char *pattern)
- }
-
-
--inline int
-+int
- match_excludes(const char *dir, const char *file, fnm_exclude **excludes)
- {
- char *p;
-diff --git a/main.c b/main.c
-index 84feed4..2c2da3e 100644
---- a/main.c
-+++ b/main.c
-@@ -42,8 +42,8 @@ int remove_node(const char *path, struct stat *st);
- int ensure_files_layout(const tar_entry **ttar, const unsigned int ttar_count, tar_entry ***missing,
- unsigned int *missing_count, tar_entry ***existing, unsigned int *existing_count,
- fnm_exclude **excludes);
--inline int check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st);
--inline int enforce_owner(const char *path, const tar_entry *t, struct stat *st);
-+int check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st);
-+int enforce_owner(const char *path, const tar_entry *t, struct stat *st);
- int copy_whole_file(cfile *tar_cfh, const tar_entry *ttent);
-
- static int check_mtime = 1;
-@@ -669,7 +669,7 @@ recursively_delete_dir(const char *path)
- return ret;
- }
-
--inline int
-+int
- check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st)
- {
- int type;
-@@ -685,7 +685,7 @@ check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st
- return 0;
- }
-
--inline int
-+int
- enforce_owner(const char *path, const tar_entry *t, struct stat *st)
- {
- struct stat st2;
-diff --git a/tar.c b/tar.c
-index 792ccd4..42dc8e7 100644
---- a/tar.c
-+++ b/tar.c
-@@ -40,7 +40,7 @@ int check_str_chksum(const char *block)
-
- /* possibly this could be done different, what of endptr of strtol?
- Frankly I worry about strtol trying to go too far and causing a segfault, due to tar fields not always having trailing \0 */
--inline unsigned long octal_str2long(const char *string, unsigned int length)
-+unsigned long octal_str2long(const char *string, unsigned int length)
- {
- if(string[length]) {
- char *ptr = strndup(string, length);
diff --git a/app-arch/tarsync/files/tarsync-0.2.1-make.patch b/app-arch/tarsync/files/tarsync-0.2.1-make.patch
deleted file mode 100644
index 4f3d062f3619..000000000000
--- a/app-arch/tarsync/files/tarsync-0.2.1-make.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Respect CC, CPPFLAGS and LDFLAGS.
-
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- CC=gcc
- endif
- tarsync: main.o names.o tar.o string-misc.o fs.o options.o excludes.o
-- gcc $(CFLAGS) $^ -o tarsync -lcfile
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o tarsync -lcfile
- all: tarsync
-
- clean:
diff --git a/app-arch/tarsync/files/tarsync-0.2.1-symlink.patch b/app-arch/tarsync/files/tarsync-0.2.1-symlink.patch
deleted file mode 100644
index cb0efd01b1ba..000000000000
--- a/app-arch/tarsync/files/tarsync-0.2.1-symlink.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 6654d41a14da2fc521e889f01669f0dbb89aef15 Mon Sep 17 00:00:00 2001
-From: Zac Medico
-Date: Tue, 5 Oct 2021 23:21:53 -0700
-Subject: [PATCH] Symlink support
-
-Bug: https://bugs.gentoo.org/815823
-Signed-off-by: Zac Medico
----
- main.c | 37 +++++++++++++++++++++++++++++++++++--
- tar.c | 16 ++++++++++++++--
- tar.h | 2 ++
- 3 files changed, 51 insertions(+), 4 deletions(-)
-
-diff --git a/main.c b/main.c
-index 2c2da3e..448a9d0 100644
---- a/main.c
-+++ b/main.c
-@@ -257,7 +257,14 @@ main(int argc, char **argv)
- // no need to seek. cfile handles resetting streams as needed
-
- for(x=0; x < missing_count; x++) {
-- if(copy_whole_file(&tar_cfh, missing[x]) != 0) {
-+ if (missing[x]->type == SYMTYPE) {
-+ if(copy_symlink(&tar_cfh, missing[x]) != 0) {
-+ v0printf("failed transfering symlink %s\n", missing[x]->fullname);
-+ exit(9);
-+ }
-+ continue;
-+ }
-+ else if(copy_whole_file(&tar_cfh, missing[x]) != 0) {
- v0printf("failed transfering file %s\n", missing[x]->fullname);
- exit(9);
- }
-@@ -673,6 +680,8 @@ int
- check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st)
- {
- int type;
-+ unsigned char linkname[TAR_LINKNAME_LEN];
-+ ssize_t linkname_len;
- type = convert_lstat_type_tar_type(de->d_name, st);
- if(type < 0)
- return -1;
-@@ -682,6 +691,15 @@ check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st
- return 2;
- if(REGTYPE == type && (st->st_size != t->size || (check_mtime && t->mtime != st->st_mtime)))
- return 3;
-+ if (SYMTYPE == type) {
-+ if ((linkname_len = readlink(de->d_name, linkname, TAR_LINKNAME_LEN)) == -1) {
-+ return -1;
-+ }
-+ if(strncmp((const char *)linkname, (const char *)t->linkname, linkname_len) != 0) {
-+ remove_node(de->d_name, st);
-+ return 3;
-+ }
-+ }
- return 0;
- }
-
-@@ -703,7 +721,22 @@ enforce_owner(const char *path, const tar_entry *t, struct stat *st)
- }
- return 0;
- }
--
-+
-+int
-+copy_symlink(cfile *tar_cfh, const tar_entry *ttent)
-+{
-+ v1printf("creating %s\n", ttent->fullname);
-+
-+ if (symlink(ttent->linkname, ttent->fullname) != 0) {
-+ v0printf("failed creating symlink %s -> %s\n", ttent->fullname, ttent->linkname);
-+ return -1;
-+ }
-+ if(lchown(ttent->fullname, ttent->uid, ttent->gid) != 0) {
-+ v0printf("failed chown'ing %s\n", ttent->fullname);
-+ return -1;
-+ }
-+ return 0;
-+}
-
- int
- copy_whole_file(cfile *tar_cfh, const tar_entry *ttent)
-diff --git a/tar.c b/tar.c
-index 42dc8e7..514e5fb 100644
---- a/tar.c
-+++ b/tar.c
-@@ -214,8 +214,7 @@ read_entry(cfile *src_cfh, off_u64 start, tar_entry *entry)
- case AREGTYPE:
- entry->type = REGTYPE; break;
- case SYMTYPE:
-- v0printf("symlinks not supported\n");
-- entry->type = TTAR_UNSUPPORTED_TYPE; break;
-+ entry->type = SYMTYPE; break;
- case LNKTYPE:
- v0printf("hardlinks not supported!\n");
- entry->type = TTAR_UNSUPPORTED_TYPE; break;
-@@ -242,6 +241,17 @@ read_entry(cfile *src_cfh, off_u64 start, tar_entry *entry)
- if(get_uid(block + TAR_UNAME_LOC, &entry->uid))
- entry->uid = octal_str2long(block + TAR_UID_LOC, TAR_UID_LOC);
-
-+ if (entry->type == SYMTYPE) {
-+ name_len = strnlen((char *)block + TAR_LINKNAME_LOC, TAR_LINKNAME_LEN);
-+ if((entry->linkname = (char *)malloc(name_len + 1)) == NULL){
-+ v0printf("unable to allocate needed memory, bailing\n");
-+ return MEM_ERROR;
-+ }
-+ memcpy(entry->linkname, block + TAR_LINKNAME_LOC, name_len);
-+ entry->linkname[name_len] = '\0';
-+ entry->linkname_len = name_len;
-+ }
-+
- // if(entry->end % 512)
- // entry->end += 512 - (entry->end % 512);
- return 0;
-@@ -256,6 +266,8 @@ convert_lstat_type_tar_type(const char *path, struct stat *st)
- if(S_ISREG(st->st_mode)) {
- if(st->st_nlink == 1)
- return REGTYPE;
-+ } else if(S_ISLNK(st->st_mode)) {
-+ return SYMTYPE;
- } else if(S_ISDIR(st->st_mode))
- return DIRTYPE;
-
-diff --git a/tar.h b/tar.h
-index e9d9ee9..95f957c 100644
---- a/tar.h
-+++ b/tar.h
-@@ -78,6 +78,8 @@ typedef struct {
- off_u64 size;
- unsigned int fullname_len;
- char *fullname;
-+ unsigned int linkname_len;
-+ char *linkname;
- time_t mtime;
- uid_t uid;
- gid_t gid;
---
-2.32.0
-
diff --git a/app-arch/upx-bin/upx-bin-4.0.1.ebuild b/app-arch/upx-bin/upx-bin-4.0.1.ebuild
index a6902194c16d..0a5aabf6cf03 100644
--- a/app-arch/upx-bin/upx-bin-4.0.1.ebuild
+++ b/app-arch/upx-bin/upx-bin-4.0.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="x86? ( https://github.com/upx/upx/releases/download/v${PV}/${MY_P}-i386
LICENSE="GPL-2+ UPX-exception"
SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
RESTRICT="strip"
RDEPEND="!app-arch/upx"
diff --git a/app-arch/upx/upx-4.0.1.ebuild b/app-arch/upx/upx-4.0.1.ebuild
index 04a011030c35..1a9d20a8f767 100644
--- a/app-arch/upx/upx-4.0.1.ebuild
+++ b/app-arch/upx/upx-4.0.1.ebuild
@@ -17,6 +17,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="!app-arch/upx-bin"
BDEPEND="app-arch/xz-utils[extra-filters]"
+src_configure() {
+ local mycmakeargs=(
+ -DUPX_CONFIG_DISABLE_WERROR=ON
+ )
+ cmake_src_configure
+}
+
src_test() {
# Don't run tests in parallel, #878977
cmake_src_test -j1
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 38fecccd2ee0..293ce283447b 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/borgweb/Manifest b/app-backup/borgweb/Manifest
deleted file mode 100644
index 386fef65e528..000000000000
--- a/app-backup/borgweb/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST borgweb-0.2.0.tar.gz 503852 BLAKE2B 6d37eeca4893f825486d46e03d8212fc3597a8704cee976429a7c55f7ab98b405038948ce7e407fa7c78a2a9f6c2b0ca4307144ffae3bf68ad6e582921989bfb SHA512 7898caf803b82e910eaa1672b892657038da6606777ecefd97c27698c14524094f0c1741621ad4ff9a230d66454de419558644ba185488b0fdb5e1aa604010a0
-DIST borgweb-0.3.0.tar.gz 512052 BLAKE2B a783a4d0528b0d501918b958facbfbee131e95a8219bf9608572e402f6e6e3010f6716c64e76ef72858e949b505ef8c4eefd5f6512dd1b0ef767a32d2c493fc5 SHA512 90867338f3678732ade97f9b595579cc5aabf6ee824b0bd4dec986ae04db94304dee1d8ae1275331d93a2b3a89916ed11e834ace8a92cf196f4050178bf96625
diff --git a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
deleted file mode 100644
index 6ed8f90906be..000000000000
--- a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browser-based user interface for BorgBackup"
-HOMEPAGE="https://pypi.org/project/borgweb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-backup/borgbackup[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/app-backup/borgweb/borgweb-0.3.0.ebuild b/app-backup/borgweb/borgweb-0.3.0.ebuild
deleted file mode 100644
index 6ed8f90906be..000000000000
--- a/app-backup/borgweb/borgweb-0.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browser-based user interface for BorgBackup"
-HOMEPAGE="https://pypi.org/project/borgweb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-backup/borgbackup[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/app-backup/borgweb/metadata.xml b/app-backup/borgweb/metadata.xml
deleted file mode 100644
index 2daaa17a826b..000000000000
--- a/app-backup/borgweb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- blueness@gentoo.org
- Anthony G. Basile
-
-
- borgweb
-
-
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index f9f24666294c..5a59f512d0dc 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,2 +1,3 @@
DIST burp-2.4.0.tar.gz 624032 BLAKE2B 4a1ff48236dc631dd6d545480a33af3cdf8020c3088f1ca09ab66ac5cec8128d262b9b991bf9e3229c80f75a4746d338073a0a43fdb67a2fe21a0fd4f243469d SHA512 ea81a12e54c6d88b702dd09dc4fa5a724d1e322bdfba2643c9312a9077c9edc63f6ca0f6cb3a6ebecb6ad9feb1cc26c114277b2308d9903f4abb0442a9be7c19
DIST burp-3.1.2.tar.gz 549260 BLAKE2B a8767d9ac2188e7a44fa2e8e4ba08dd3a5edeac268afcf196db5cae06e8bcc1faae1a48ba1873ef43fdbb9764946384233a755779e09984217b4334781529024 SHA512 a832502f617b66b87feeff032002bc25827809a165e3fb6ef85a9f3d847e308e9fa69f138b7e80662366fa3de09b39f7ef209b529d82c3d487dca11fe3ebcddf
+DIST burp-3.1.4.tar.gz 549879 BLAKE2B bf70051a658700fab60182b97b7ce8540fbd85ad1264ee09c9fa5b5a99046f391b91cd8673097ef869c6b762aea6d8fecdedb38425dca9e6bcbb1f2c2afa96fb SHA512 3aa9fb1512f985fa99e7cb9a45502bbdbf513935e0c62fa4327f0e6cb68d3840f59bfe1b38a7c2419b3e69bc04aef36c223313897c2e45e94f3be3f9d41714db
diff --git a/app-backup/burp/burp-3.1.2.ebuild b/app-backup/burp/burp-3.1.2.ebuild
index 2d84d0488b11..5391dc17f81c 100644
--- a/app-backup/burp/burp-3.1.2.ebuild
+++ b/app-backup/burp/burp-3.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="acl ipv6 test xattr"
RESTRICT="!test? ( test )"
diff --git a/app-backup/burp/burp-3.1.4.ebuild b/app-backup/burp/burp-3.1.4.ebuild
new file mode 100644
index 000000000000..1efa9828e50c
--- /dev/null
+++ b/app-backup/burp/burp-3.1.4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="https://burp.grke.org/"
+SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl test xattr"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="acct-group/burp
+ acct-user/burp
+ dev-libs/uthash
+ dev-libs/openssl:0=
+ net-libs/librsync:=
+ sys-libs/ncurses:0=
+ sys-libs/libcap
+ sys-libs/zlib
+ virtual/libcrypt:=
+ acl? ( sys-apps/acl )
+ xattr? ( sys-apps/attr )"
+DEPEND="${COMMON_DEPEND}
+ elibc_musl? ( sys-libs/queue-standalone )
+ test? ( dev-libs/check )"
+BDEPEND=">=sys-devel/autoconf-2.71
+ virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+ virtual/logger"
+
+PATCHES=(
+ "${FILESDIR}"/"${PN}"-2.1.20-no_mkdir_run.patch
+ "${FILESDIR}"/"${PN}"-2.0.54-server_user.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --localstatedir=/var
+ --sysconfdir=/etc/burp
+ --enable-largefile
+ --runstatedir=/run
+ "$(use_enable acl)"
+ "$(use_enable xattr)"
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # See https://github.com/grke/burp/issues/869
+ local -x CK_DEFAULT_TIMEOUT=10
+ default
+}
+
+src_install() {
+ default
+ keepdir /var/spool/burp
+ fowners -R root:"${PN}" /var/spool/burp
+ fperms 0770 /var/spool/burp
+
+ emake DESTDIR="${D}" install-configs
+ fowners -R root:"${PN}" /etc/burp
+ fperms 0750 /etc/burp
+ fperms 0640 /etc/burp/burp-server.conf
+ fperms 0750 /etc/burp/clientconfdir
+
+ newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
+ systemd_dounit "${FILESDIR}"/"${PN}".service
+}
+
+pkg_postinst() {
+ elog "Burp ebuilds now support the autoupgrade mechanism in both"
+ elog "client and server mode. In both cases it is disabled by"
+ elog "default. You almost certainly do NOT want to enable it in"
+ elog "client mode because upgrades obtained this way will not be"
+ elog "managed by Portage."
+
+ if [[ ! -e "${EROOT}"/etc/burp/CA/index.txt ]]; then
+ elog ""
+ elog "At first run burp server will generate DH parameters and SSL"
+ elog "certificates. You should adjust configuration before."
+ elog "Server configuration is located at"
+ elog ""
+ elog " ${EROOT}/etc/burp/burp-server.conf"
+ elog ""
+ fi
+
+ # According to PMS this can be a space-separated list of version
+ # numbers, even though in practice it is typically just one.
+ local oldver
+ for oldver in ${REPLACING_VERSIONS}; do
+ if [[ $(ver_cut 1 "${oldver}") -lt 2 ]]; then
+ ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+ ewarn "the server config file by default. If you use bedup, please"
+ ewarn "update your scripts to invoke it as"
+ ewarn ""
+ ewarn " bedup -c ${EROOT}/etc/burp/burp-server.conf"
+ ewarn ""
+ ewarn "Otherwise deduplication will not work!"
+ break
+ fi
+ done
+}
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch
new file mode 100644
index 000000000000..207bf6cfe106
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch
@@ -0,0 +1,35 @@
+diff -Naur rdiff-backup-2.2.0.orig/setup.py rdiff-backup-2.2.0/setup.py
+--- rdiff-backup-2.2.0.orig/setup.py 2022-12-18 09:19:30.000000000 +0100
++++ rdiff-backup-2.2.0/setup.py 2022-12-19 22:00:43.289239007 +0100
+@@ -283,10 +283,7 @@
+ ),
+ ],
+ data_files=[
+- ("share/man/man1", ["build/rdiff-backup.1",
+- "build/rdiff-backup-old.1",
+- "build/rdiff-backup-delete.1",
+- "build/rdiff-backup-statistics.1"]),
++ ("share/man/man1", ["build/rdiff-backup-old.1"]),
+ (
+ "share/doc/rdiff-backup", [
+ "CHANGELOG.adoc",
+@@ -311,19 +308,6 @@
+ ("tools/rdiff-backup.spec.template-fedora", "build/rdiff-backup.fedora.spec"),
+ ("docs/rdiff-backup-old.1", "build/rdiff-backup-old.1"),
+ ]},
+- "build_exec": {"commands": [
+- ("asciidoctor -b manpage -a revdate=\"{date}\" "
+- "-a revnumber=\"{ver}\" -o {outfile} {infile}",
+- ("docs", "rdiff-backup.1.adoc"), ("build", "rdiff-backup.1")),
+- ("asciidoctor -b manpage -a revdate=\"{date}\" "
+- "-a revnumber=\"{ver}\" -o {outfile} {infile}",
+- ("docs", "rdiff-backup-statistics.1.adoc"),
+- ("build", "rdiff-backup-statistics.1")),
+- ("asciidoctor -b manpage -a revdate=\"{date}\" "
+- "-a revnumber=\"{ver}\" -o {outfile} {infile}",
+- ("docs", "rdiff-backup-delete.1.adoc"),
+- ("build", "rdiff-backup-delete.1")),
+- ]},
+ },
+ cmdclass={
+ 'build_exec': build_exec,
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
index 398e35fac70f..b65b8b6ec227 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
@@ -26,10 +26,16 @@ RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
dev-python/pyxattr[${PYTHON_USEDEP}]
>=net-libs/librsync-1.0:0="
-src_prepare() {
- mkdir build || die
- cp "${S}"-manpages/*.1 build || die
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.0-no-manpages.patch"
+)
+src_prepare() {
sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die
default
}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ doman "${S}"-manpages/*.1
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 372a65bd1562..aa339f436a62 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index cfdbed478a57..9c30e3d684a0 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -2,5 +2,4 @@ DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b33203
DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
-DIST Geekbench-5.4.5-Linux.tar.gz 93182782 BLAKE2B c0da6e787700775f709966538d3c714eb20165838c565d1ee1d69ddec7f5ab25975462c1edeeedde94e70fdf5a19aad0bc23986f87e1d2299fd86464e9582fca SHA512 890a3749a6fe6eb395b0cd84b7ae869c30e89fc93c7634a52cca2b01e4fcdf071ddc3dc58a581dec8e6582d4336a5cea55d34b1a9ca03a847a412b8ec81a85a6
DIST Geekbench-5.4.6-Linux.tar.gz 93188716 BLAKE2B 6a38449b8b494fe878d2c583838c2cc95eef736a174231d8ab25b616c39b8deb4edbadd5f9545176a01a9fff55935f20c572fb9cb3902dddc2fad2836cba5166 SHA512 6c1bc9db284ee4dea282f329b08bc75172c92951d1d43131226eaa42e05e1e39e11d34fe0c3d29f45e6b421bea16a102170a631a4b11a7a3d026024171ba5ccb
diff --git a/app-benchmarks/geekbench/geekbench-5.4.5.ebuild b/app-benchmarks/geekbench/geekbench-5.4.5.ebuild
deleted file mode 100644
index 64adc3adf0b5..000000000000
--- a/app-benchmarks/geekbench/geekbench-5.4.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
-HOMEPAGE="https://www.geekbench.com/"
-SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
-KEYWORDS="-* amd64"
-LICENSE="geekbench"
-SLOT="5"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
- opt/geekbench5/geekbench5
- opt/geekbench5/geekbench_x86_64
-"
-
-pkg_nofetch() {
- elog "Please download ${A} from ${HOMEPAGE}/download/linux"
- elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
- exeinto /opt/geekbench5
- doexe geekbench5 geekbench_x86_64
-
- insinto /opt/geekbench5
- doins geekbench.plar
-
- dodir /opt/bin
- dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
-}
-
-pkg_postinst() {
- elog "If you have purchased a commercial license, you can enter"
- elog "your email address and your license key with the following command:"
- elog "geekbench5 -r "
-}
diff --git a/app-benchmarks/geekbench/geekbench-5.4.6.ebuild b/app-benchmarks/geekbench/geekbench-5.4.6.ebuild
index ba46b34c5a0a..64adc3adf0b5 100644
--- a/app-benchmarks/geekbench/geekbench-5.4.6.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.4.6.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.geekbench.com/"
SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
S="${WORKDIR}/Geekbench-${PV}-Linux"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
LICENSE="geekbench"
SLOT="5"
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index c84a2923cb03..3d24b1495ca3 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/extract-xiso/Manifest b/app-cdr/extract-xiso/Manifest
index f92cfad8bd6a..b738e9b8ef90 100644
--- a/app-cdr/extract-xiso/Manifest
+++ b/app-cdr/extract-xiso/Manifest
@@ -1,2 +1 @@
-DIST extract-xiso-2.7.1.tar.gz 207518 BLAKE2B bf99e2555e85344db318bdedf0e6dfb80b5f8cd079dc2083ba94e06c62032235d88296909a1aa887180ce94ce9d80a6b39aab25ed99b04741951aed79c2e8cdb SHA512 a7153d96fa7cfb01dfa385a0984d94dc0fa5ac14ce9f7e2d50287b7e1edbb6a4ba84b6b874aa2628b1a82f23b30687958e411699487896cc48787f48e0e012c6
DIST extract-xiso-2.7.1_p202204252159.tar.gz 26979 BLAKE2B e313f78a6c835cbb87467a4509c576e589e05103c5723ecf224b85e5ca6f55cbdcf290c98bc03a745e2a24b2eca3368aea7dffe894300312e2b6287873258f9b SHA512 459a69a95f9680fb4659e30a777694b1ea37087742885e2d06338eab985d9d5734b4571fe7222d1e11489457d584b9da999c2bfb455f3d5eadcf36c8e4c8d844
diff --git a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
deleted file mode 100644
index f4e6324db818..000000000000
--- a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV=${PV/_beta/b}
-
-DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images"
-HOMEPAGE="https://sourceforge.net/projects/extract-xiso"
-SRC_URI="mirror://sourceforge/extract-xiso/${P}.tar.gz"
-S="${WORKDIR}"/${PN}
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.7.1-headers.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e 's:__LINUX__:__linux__:' \
- *.[ch] */*.[ch] || die
-}
-
-doit() { echo "$@"; "$@"; }
-
-src_compile() {
- # Need _GNU_SOURCE here for asprintf prototype.
- doit $(tc-getCC) ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} \
- extract-xiso.c libftp-*/*.c -o extract-xiso || die
-}
-
-src_install() {
- dobin extract-xiso
- dodoc README.TXT
-}
diff --git a/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch b/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch
deleted file mode 100644
index 3de797050b43..000000000000
--- a/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix missing prototype warnings
-
---- a/libftp-5.0.1.modified.by.in/FtpLibrary.h
-+++ b/libftp-5.0.1.modified.by.in/FtpLibrary.h
-@@ -20,6 +20,7 @@
- extern "C" {
- #endif
-
-+#include
- #include
- #include
- #include
-@@ -33,6 +34,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
diff --git a/app-cdr/kcdemu/kcdemu-0.8.0.ebuild b/app-cdr/kcdemu/kcdemu-0.8.0.ebuild
index 2ebcd8fc228b..6e367c588676 100644
--- a/app-cdr/kcdemu/kcdemu-0.8.0.ebuild
+++ b/app-cdr/kcdemu/kcdemu-0.8.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
MY_PN="kde_cdemu"
KFMIN=5.60.0
@@ -11,6 +11,7 @@ inherit ecm
DESCRIPTION="Frontend to cdemu daemon based on KDE Frameworks"
HOMEPAGE="https://www.linux-apps.com/p/998461/"
SRC_URI="mirror://sourceforge/project/kde-cdemu-manager/kde_cdemu-${PV}.tar.bz2"
+S="${WORKDIR}/${MY_PN}"
LICENSE="GPL-2"
SLOT="5"
@@ -32,5 +33,3 @@ DEPEND="
RDEPEND="${DEPEND}
>=app-cdr/cdemu-2.0.0[cdemu-daemon]
"
-
-S="${WORKDIR}/${MY_PN}"
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index c068f278134f..9a5bed2fa3e8 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index eea76685605a..aa3c36378b3f 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1,2 +1 @@
-DIST cri-o-1.25.0.tar.gz 27673668 BLAKE2B 5231f1b00781233ddf82827a580100055fefb97e768d871a845506ee28ebc122f20f6c8dff64b9dd8d991ed6ed761a72e96d607354f7e8d4182daff36ef3c253 SHA512 783c2f019ef65079dbb838e58acde5a24bda282ba8298d7b95491356e46fc208a14bcc4c65e3183001f0fb275d8ec5d7b5c795300e6424096f84fb9130721cba
-DIST cri-o-1.25.1.tar.gz 27675134 BLAKE2B 76220f63f5d9c146d6afc15b8afba2ef590faf8916ea3e7f38daeaa58dd6e039ae1a3e607c3e3a194e27f45e67a95a50ca8404f1e457aee89442fbe3505d3c67 SHA512 73b3267583b049e6aa51c1f208512d8e77bc296c34b3ad37977ee57e085b208496e11957c5cc4b55a6b4e2cc728599ce65624233d4d5a4bdc837f0dddb569323
+DIST cri-o-1.26.0.tar.gz 28306997 BLAKE2B aa4eb7b9964456ff95572e3e8f4f791141956863b13bb9b0eb3507321b76ef7e815f6a27f003f9265ffdfbeaf59a8f3e291187314ec2137dde741143cbcead2f SHA512 489cd0b3989764f48d8803e65e152515d77326f3f794cec02f694825fc6e5b0541d3608253d5e8a399c9119e85fa947fc62558b4656bf6a189c52e0bef4d669e
diff --git a/app-containers/cri-o/cri-o-1.25.0.ebuild b/app-containers/cri-o/cri-o-1.25.0.ebuild
deleted file mode 100644
index 60e59d76e3fe..000000000000
--- a/app-containers/cri-o/cri-o-1.25.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT=315a0cb5b0abd15619384d7da7f3941714afcb8e
-
-inherit go-module
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs +device-mapper selinux systemd"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- app-containers/conmon
- app-containers/runc
- dev-libs/glib:=
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- net-firewall/conntrack-tools
- net-firewall/iptables
- app-containers/cni-plugins
- net-misc/socat
- sys-apps/iproute2
- sys-libs/libseccomp:=
- btrfs? ( sys-fs/btrfs-progs )
- device-mapper? ( sys-fs/lvm2:= )
- selinux? ( sys-libs/libselinux:= )
- systemd? ( sys-apps/systemd:= )"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- !> Makefile || die
-
- sed -e 's:/usr/local/bin:/usr/bin:' \
- -i contrib/systemd/* || die
-}
-
-src_compile() {
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die; }
-
- [[ -f hack/libdm_installed.sh ]] || die
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
- hack/libdm_installed.sh || die; }
-
- [[ -f hack/selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- hack/selinux_tag.sh || die; }
-
- mkdir -p bin || die
- emake all \
- GOBIN="${S}/bin" \
- GO_BUILD="go build ${GOFLAGS}" \
- GO_MD2MAN="$(which go-md2man)"
-}
-
-src_install() {
- emake install install.config install.systemd \
- DESTDIR="${D}" \
- GO_MD2MAN="$(which go-md2man)" \
- PREFIX="${D}${EPREFIX}/usr"
- keepdir /etc/crio
- mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
- newinitd "${FILESDIR}/crio.initd" crio
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
- # Suppress crio log error messages triggered if these don't exist.
- keepdir /etc/containers/oci/hooks.d
- keepdir /usr/share/containers/oci/hooks.d
-
- # Suppress crio "Missing CNI default network" log message.
- keepdir /etc/cni/net.d
- insinto /etc/cni/net.d
- doins contrib/cni/99-loopback.conf
-}
diff --git a/app-containers/cri-o/cri-o-1.25.1.ebuild b/app-containers/cri-o/cri-o-1.25.1.ebuild
deleted file mode 100644
index 65ab0adb604d..000000000000
--- a/app-containers/cri-o/cri-o-1.25.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT=afa0c576fcafc095e2827261e412fadabb016874
-
-inherit go-module
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs +device-mapper selinux systemd"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- app-containers/conmon
- app-containers/runc
- dev-libs/glib:=
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- net-firewall/conntrack-tools
- net-firewall/iptables
- app-containers/cni-plugins
- net-misc/socat
- sys-apps/iproute2
- sys-libs/libseccomp:=
- btrfs? ( sys-fs/btrfs-progs )
- device-mapper? ( sys-fs/lvm2:= )
- selinux? ( sys-libs/libselinux:= )
- systemd? ( sys-apps/systemd:= )"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- !> Makefile || die
-
- sed -e 's:/usr/local/bin:/usr/bin:' \
- -i contrib/systemd/* || die
-}
-
-src_compile() {
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die; }
-
- [[ -f hack/libdm_installed.sh ]] || die
- use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
- hack/libdm_installed.sh || die; }
-
- [[ -f hack/selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- hack/selinux_tag.sh || die; }
-
- mkdir -p bin || die
- emake all \
- GOBIN="${S}/bin" \
- GO_BUILD="go build ${GOFLAGS}" \
- GO_MD2MAN="$(which go-md2man)"
-}
-
-src_install() {
- emake install install.config install.systemd \
- DESTDIR="${D}" \
- GO_MD2MAN="$(which go-md2man)" \
- PREFIX="${D}${EPREFIX}/usr"
- keepdir /etc/crio
- mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
- newinitd "${FILESDIR}/crio.initd" crio
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
- # Suppress crio log error messages triggered if these don't exist.
- keepdir /etc/containers/oci/hooks.d
- keepdir /usr/share/containers/oci/hooks.d
-
- # Suppress crio "Missing CNI default network" log message.
- keepdir /etc/cni/net.d
- insinto /etc/cni/net.d
- doins contrib/cni/99-loopback.conf
-}
diff --git a/app-containers/cri-o/cri-o-1.26.0.ebuild b/app-containers/cri-o/cri-o-1.26.0.ebuild
new file mode 100644
index 000000000000..d2510ed1b0e5
--- /dev/null
+++ b/app-containers/cri-o/cri-o-1.26.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT=214b77367c48acd75a08610ac8d0941540347691
+
+inherit go-module
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="https://cri-o.io/"
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+ app-crypt/gpgme:=
+ app-containers/conmon
+ app-containers/runc
+ dev-libs/glib:=
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ net-firewall/conntrack-tools
+ net-firewall/iptables
+ app-containers/cni-plugins
+ net-misc/socat
+ sys-apps/iproute2
+ sys-libs/libseccomp:=
+ btrfs? ( sys-fs/btrfs-progs )
+ device-mapper? ( sys-fs/lvm2:= )
+ selinux? ( sys-libs/libselinux:= )
+ systemd? ( sys-apps/systemd:= )"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+ !> Makefile || die
+
+ sed -e 's:/usr/local/bin:/usr/bin:' \
+ -i contrib/systemd/* || die
+}
+
+src_compile() {
+ [[ -f hack/btrfs_installed_tag.sh ]] || die
+ use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+ hack/btrfs_installed_tag.sh || die; }
+
+ [[ -f hack/libdm_installed.sh ]] || die
+ use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+ hack/libdm_installed.sh || die; }
+
+ [[ -f hack/selinux_tag.sh ]] || die
+ use selinux || { echo -e "#!/bin/sh\ntrue" > \
+ hack/selinux_tag.sh || die; }
+
+ mkdir -p bin || die
+ emake all \
+ GOBIN="${S}/bin" \
+ GO_BUILD="go build ${GOFLAGS}" \
+ GO_MD2MAN="$(which go-md2man)"
+}
+
+src_install() {
+ emake install install.config install.systemd \
+ DESTDIR="${D}" \
+ GO_MD2MAN="$(which go-md2man)" \
+ PREFIX="${D}${EPREFIX}/usr"
+ keepdir /etc/crio
+ mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+ newinitd "${FILESDIR}/crio.initd" crio
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+ # Suppress crio log error messages triggered if these don't exist.
+ keepdir /etc/containers/oci/hooks.d
+ keepdir /usr/share/containers/oci/hooks.d
+
+ # Suppress crio "Missing CNI default network" log message.
+ keepdir /etc/cni/net.d
+ insinto /etc/cni/net.d
+ doins contrib/cni/99-loopback.conflist
+}
diff --git a/app-containers/distrobox/Manifest b/app-containers/distrobox/Manifest
index becca553ed65..6569a5f4bcf0 100644
--- a/app-containers/distrobox/Manifest
+++ b/app-containers/distrobox/Manifest
@@ -1 +1,2 @@
DIST distrobox-1.4.1.tar.gz 231405 BLAKE2B 920fc2ccf20ad2b6af2a3ea3dfe5c209cd779d6490e6fb95110af5e74ce56354aa264f413c070a6814253a5c51e82be110b8fc86e536a4ae0881fa22afc16630 SHA512 6cee6b734bf22e678529b93f15cdf98f09506642ef5e204ae73590c29a85e205a16715588c9e49b1c39b71023ea906565078e9c2c1f6368df885d20bf37136e2
+DIST distrobox-1.4.2.1.tar.gz 235019 BLAKE2B dd512b183763a2e4c7e2b495bb50cc3fc3d764c48ce902b83e0b543587b60b458c6b9ae937057bfc91860dc415f9ad68fb648cf06faeeb56d0a4c27180e4c2e0 SHA512 d3bc1de91bf33b7ac500c0ae471feb28c9b1efdef6878bf1aed50ef394f69d2d36f99296f0a8182b139d9339558720b891f7dc1249a7f91c883c00bac5597283
diff --git a/app-containers/distrobox/distrobox-1.4.2.1.ebuild b/app-containers/distrobox/distrobox-1.4.2.1.ebuild
new file mode 100644
index 000000000000..f3fc5a365796
--- /dev/null
+++ b/app-containers/distrobox/distrobox-1.4.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Use any Linux distribution inside your terminal (powered by docker/podman)"
+HOMEPAGE="https://distrobox.privatedns.org/
+ https://github.com/89luca89/distrobox/"
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/89luca89/${PN}.git"
+else
+ SRC_URI="https://github.com/89luca89/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3" # GPL-3.0-only !
+SLOT="0"
+
+RDEPEND="
+ || (
+ app-containers/docker
+ app-containers/podman
+ )
+"
+
+src_install() {
+ sh ./install --prefix "${ED}"/usr || die "${PN} install script failed"
+ dodoc *.md
+}
diff --git a/app-containers/skopeo/metadata.xml b/app-containers/skopeo/metadata.xml
index 18cbb63e9295..21cb782a75cf 100644
--- a/app-containers/skopeo/metadata.xml
+++ b/app-containers/skopeo/metadata.xml
@@ -8,4 +8,7 @@
+
+ containers/skopeo
+
diff --git a/app-containers/syft/metadata.xml b/app-containers/syft/metadata.xml
index 3b2a9c591010..08a781acd85a 100644
--- a/app-containers/syft/metadata.xml
+++ b/app-containers/syft/metadata.xml
@@ -5,4 +5,7 @@
williamh@gentoo.org
William Hubbs
+
+anchore/syft
+
diff --git a/app-containers/umoci/metadata.xml b/app-containers/umoci/metadata.xml
index db463f3eeb66..7cc282ba772a 100644
--- a/app-containers/umoci/metadata.xml
+++ b/app-containers/umoci/metadata.xml
@@ -5,4 +5,7 @@
williamh@gentoo.org
William Hubbs
+
+ opencontainers/umoci
+
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0d7aa7f2da32..be3f8acc8093 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/acme-2.0.0.ebuild b/app-crypt/acme/acme-2.0.0.ebuild
index 8105093d2780..07f2c8f48ea5 100644
--- a/app-crypt/acme/acme-2.0.0.ebuild
+++ b/app-crypt/acme/acme-2.0.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
S=${WORKDIR}/certbot-${PV}/acme
fi
diff --git a/app-crypt/adcli/metadata.xml b/app-crypt/adcli/metadata.xml
index 9d60dd89cfd7..99303bacc412 100644
--- a/app-crypt/adcli/metadata.xml
+++ b/app-crypt/adcli/metadata.xml
@@ -9,4 +9,7 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
+ realmd/adcli
+
diff --git a/app-crypt/certbot-apache/certbot-apache-2.0.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.0.0.ebuild
index f8549e7c0712..9c216af8fefe 100644
--- a/app-crypt/certbot-apache/certbot-apache-2.0.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-2.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
fi
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.0.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.0.0.ebuild
index b1aa9acb7e1a..d0adb3551929 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-2.0.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
fi
diff --git a/app-crypt/certbot/certbot-2.0.0.ebuild b/app-crypt/certbot/certbot-2.0.0.ebuild
index 91bad26d75d6..5dda54b27949 100644
--- a/app-crypt/certbot/certbot-2.0.0.ebuild
+++ b/app-crypt/certbot/certbot-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
fi
S=${WORKDIR}/${P}/${PN}
diff --git a/app-crypt/efitools/efitools-1.9.2-r1.ebuild b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
index ae06bba83d82..c10f01e423d3 100644
--- a/app-crypt/efitools/efitools-1.9.2-r1.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="static"
LIB_DEPEND="dev-libs/openssl:=[static-libs(+)]"
diff --git a/app-crypt/gcr/gcr-3.41.1-r1.ebuild b/app-crypt/gcr/gcr-3.41.1-r1.ebuild
index 188888a2a397..25096c2209ab 100644
--- a/app-crypt/gcr/gcr-3.41.1-r1.ebuild
+++ b/app-crypt/gcr/gcr-3.41.1-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
DEPEND="
>=dev-libs/glib-2.44.0:2
diff --git a/app-crypt/gcr/gcr-4.0.0.ebuild b/app-crypt/gcr/gcr-4.0.0.ebuild
index 4967e4a86b4d..301cc3b75646 100644
--- a/app-crypt/gcr/gcr-4.0.0.ebuild
+++ b/app-crypt/gcr/gcr-4.0.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
DEPEND="
>=dev-libs/glib-2.68.0:2
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 08e0bcdd792b..1179e4e4a355 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,5 +2,9 @@ DIST gnupg-2.2.39.tar.bz2 7290098 BLAKE2B a9e31830f3ef9ec6d8d461a85fcbe4b91bcac9
DIST gnupg-2.2.39.tar.bz2.sig 119 BLAKE2B 584d7d36671670ac507948257e9c6be556ed2a2d3c0100bb2746edfe96df5ee1d4c6172fe0cae39d85fc290097bc5f6e1b351debc8ec2f5cc78047354fbed016 SHA512 6f7d7c2d1fae706b03c735cf453976c3aebef3f23659426f39a88c63d979f4d873ae09280d75dee9000805468d2a7f49d348609061939000f7cedf34ec5c6019
DIST gnupg-2.2.40.tar.bz2 7301631 BLAKE2B c9a077e28b22888573bdd12029205eb5f79a463a297e400a623bc86a39eeb6454cd884d05bd96734998613c695f2c9dcc68963c7275b89938ac38ddc7ba1e229 SHA512 4c2f5fbf37ba6fbad0045aad23129186963010c673ea0b81801adc4f98efe14d6c7228e22815b6b26307c1fe5bb51cd088aa6a0f06a9325d3c021849ef81c594
DIST gnupg-2.2.40.tar.bz2.sig 119 BLAKE2B baaffad8203169fca54be031b3c77f818ecf973c73b9389cb3cbcd8217ae8a6018f0d3d4d2d5b6f0611f7643b78467f91902add3107e9538273607c6ba3a49bf SHA512 fccc06c709450d58e64716c505cd79556edac440462613c47c6ec78714355425c045418946b4b4b2a5c79e33e0e75b20f0699ae6de9921add4877fd6c8cc2d64
+DIST gnupg-2.2.41.tar.bz2 7313746 BLAKE2B 0be2965a646a8636a127f89329030860908b0bbc447381782527459aed85f5276c29e7a2c89f87cb715407d9f1aabbf3ae1765073764d05e422035e8d5962569 SHA512 f472e5058ea9881355f0c754a47acd0b5360c36e8976b8563dbc763a7cef792bf88227cc15fe5172d3e9bb9fc34d8448dd5c183949031e91a1997cc7f0f83b55
+DIST gnupg-2.2.41.tar.bz2.sig 119 BLAKE2B d9a9ab4d71ca759d634c606144a2602fce8bf4e3a7407908442ef6f251c5e01ef829b3d35d28f03b13a3a7099081484ee6c83a26a9fe2154aa0a00e8678c654c SHA512 467c94a876c57854d283447ca7e94bd72d95d9cbe45247f39d9a73d0b3c500388927c980f84afb1b9c02c3811f349582cb7ee36d967c4f0d8aae95ce07bed955
DIST gnupg-2.3.8.tar.bz2 7644926 BLAKE2B afb960adb877398363d92585d54bccc82c816f87b4489835950c19fc330edbf5302f7f958fdc6333b80d2e34730c9518e6abffea721891fd76c1b2ff2aa704be SHA512 6df8b1c53f0112c358f9f9eac732dd4ca13bcec24fc55a7d4a606587da988c5b7bb4c61be52b8b7769f1536dd2043087e6eb5cf224991cb0b2ed38ad00717ee2
DIST gnupg-2.3.8.tar.bz2.sig 119 BLAKE2B 29a133605d72dc4c102ec9a82d654cb980a72463fdc6e255d595e0559bb08860dcb1b014681e1d177eb29c0d32f4ce4ef6caefa6558f1cb97c87c42fb426ea63 SHA512 d97a92c245df997dbff800b25872e9f0769b20e9336b12682b4539fd4fe0e9c2dada7af397b8afeeeba316100b8f4dd86ba96e1dc62cee70158927229b0a015d
+DIST gnupg-2.4.0.tar.bz2 7666935 BLAKE2B cc4bcd439a3283df5932c0c41873a3b85de07103d9164ec6dc44552fa0d8c5e5973d74dcd3ffd3d4cf0564c9dab66c6e2adbcd7b34bbc4b5faf0f1bf0f3836aa SHA512 094d631130d4dfe4421cc5e715eaec1888d0b4b764f1be9287be86cbc34430313211739d5481b34e9b59021d05cdbae8a87a1007031cc4dc6213045984a8559a
+DIST gnupg-2.4.0.tar.bz2.sig 119 BLAKE2B 238e07f48d7cf13d1030801d16dfd0af0411b5a9ebf0594124dc5edc02953187dd5fe7c9b7cca3edd63bd4ffb3604a098ee71031bf8fcef731e55268efb1f509 SHA512 3ed098ad036907fde2c80fdd09a5f3fd1a151ecfa47b5a34a949e129fcd1a748ab0ed7219433e5104d98a670bd91d353157ef2e8cc4e0c5817da2d7da58c4b20
diff --git a/app-crypt/gnupg/gnupg-2.2.41.ebuild b/app-crypt/gnupg/gnupg-2.2.41.ebuild
new file mode 100644
index 000000000000..37e68bc395e3
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.41.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
+inherit flag-o-matic out-of-source multiprocessing systemd toolchain-funcs verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND="
+ >=dev-libs/libassuan-2.5.0
+ >=dev-libs/libgcrypt-1.8.0:=
+ >=dev-libs/libgpg-error-1.29
+ >=dev-libs/libksba-1.3.5
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ ldap? ( net-nds/openldap:= )
+ readline? ( sys-libs/readline:= )
+ smartcard? ( usb? ( virtual/libusb:1 ) )
+ ssl? ( >=net-libs/gnutls-3.0:= )
+ tofu? ( >=dev-db/sqlite-3.7 )
+"
+RDEPEND="
+ ${DEPEND}
+ app-crypt/pinentry
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+)
+
+src_prepare() {
+ default
+
+ # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+ # idea borrowed from libdbus, see
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+ #
+ # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+ # which in turn requires discovery in Autoconf, something that upstream deeply resents.
+ sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+ -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+my_src_configure() {
+ local myconf=(
+ $(use_enable bzip2)
+ $(use_enable nls)
+ $(use_enable smartcard scdaemon)
+ $(use_enable ssl gnutls)
+ $(use_enable test all-tests)
+ $(use_enable test tests)
+ $(use_enable tofu)
+ $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+ $(use_enable wks-server wks-tools)
+ $(use_with ldap)
+ $(use_with readline)
+
+ # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+ # As of GnuPG 2.3, the mailprog substitution is used for the binary called
+ # by wks-client & wks-server; and if it's autodetected but not not exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+ --with-mailprog=/usr/libexec/sendmail
+
+ --disable-ntbtls
+ --enable-gpg
+ --enable-gpgsm
+ --enable-large-secmem
+
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+ KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+ LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+ LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+ NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
+ fi
+
+ # bug #663142
+ if use user-socket; then
+ myconf+=( --enable-run-gnupg-user-socket )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+ econf "${myconf[@]}"
+}
+
+my_src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+my_src_test() {
+ export TESTFLAGS="--parallel=$(makeopts_jobs)"
+
+ default
+}
+
+my_src_install() {
+ emake DESTDIR="${D}" install
+
+ use tools && dobin \
+ tools/{gpg-zip,gpgconf,gpgsplit,gpg-check-pattern} \
+ tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/*
+}
+
+my_src_install_all() {
+ einstalldocs
+
+ use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+
+ use doc && dodoc doc/*.png
+
+ systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.4.0.ebuild b/app-crypt/gnupg/gnupg-2.4.0.ebuild
new file mode 100644
index 000000000000..8c58fb2730da
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.4.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
+inherit flag-o-matic out-of-source multiprocessing systemd toolchain-funcs verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND="
+ >=dev-libs/libassuan-2.5.0
+ >=dev-libs/libgcrypt-1.9.1:=
+ >=dev-libs/libgpg-error-1.46
+ >=dev-libs/libksba-1.6.3
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ ldap? ( net-nds/openldap:= )
+ readline? ( sys-libs/readline:0= )
+ smartcard? ( usb? ( virtual/libusb:1 ) )
+ tofu? ( >=dev-db/sqlite-3.27 )
+ tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
+ ssl? ( >=net-libs/gnutls-3.0:0= )
+"
+RDEPEND="
+ ${DEPEND}
+ app-crypt/pinentry
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+)
+
+src_prepare() {
+ default
+
+ # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+ # idea borrowed from libdbus, see
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+ #
+ # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+ # which in turn requires discovery in Autoconf, something that upstream deeply resents.
+ sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+ -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+my_src_configure() {
+ local myconf=(
+ $(use_enable bzip2)
+ $(use_enable nls)
+ $(use_enable smartcard scdaemon)
+ $(use_enable ssl gnutls)
+ $(use_enable test all-tests)
+ $(use_enable test tests)
+ $(use_enable tofu)
+ $(use_enable tofu keyboxd)
+ $(use_enable tofu sqlite)
+ $(usex tpm '--with-tss=intel' '--disable-tpm2d')
+ $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+ $(use_enable wks-server wks-tools)
+ $(use_with ldap)
+ $(use_with readline)
+
+ # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+ # As of GnuPG 2.3, the mailprog substitution is used for the binary called
+ # by wks-client & wks-server; and if it's autodetected but not not exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+ --with-mailprog=/usr/libexec/sendmail
+
+ --disable-ntbtls
+ --enable-gpgsm
+ --enable-large-secmem
+
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+ KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+ LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+ LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+ NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
+ fi
+
+ # bug #663142
+ if use user-socket; then
+ myconf+=( --enable-run-gnupg-user-socket )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+ econf "${myconf[@]}"
+}
+
+my_src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+my_src_test() {
+ export TESTFLAGS="--parallel=$(makeopts_jobs)"
+
+ default
+}
+
+my_src_install() {
+ emake DESTDIR="${D}" install
+
+ use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/*
+}
+
+my_src_install_all() {
+ einstalldocs
+
+ use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+
+ use doc && dodoc doc/*.png
+
+ systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/hashcat-utils/metadata.xml b/app-crypt/hashcat-utils/metadata.xml
index a0fddf470150..160cda032966 100644
--- a/app-crypt/hashcat-utils/metadata.xml
+++ b/app-crypt/hashcat-utils/metadata.xml
@@ -5,4 +5,7 @@
Rick Farina
zerochaos@gentoo.org
+
+ hashcat/hashcat-utils
+
diff --git a/app-crypt/heimdal/files/heimdal_hcrypto.patch b/app-crypt/heimdal/files/heimdal_hcrypto.patch
deleted file mode 100644
index ff3228d4973a..000000000000
--- a/app-crypt/heimdal/files/heimdal_hcrypto.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 329918bd671c89de6e1c2874baba48d658a89a10 Mon Sep 17 00:00:00 2001
-From: Damir Franusic
-Date: Sun, 9 Dec 2018 19:53:58 +0100
-Subject: [PATCH] hcrypto: fix include path
-
----
- lib/hcrypto/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am
-index 469176b6c6..195117d174 100644
---- a/lib/hcrypto/Makefile.am
-+++ b/lib/hcrypto/Makefile.am
-@@ -9,7 +9,8 @@ AM_CPPFLAGS += $(INCLUDE_openssl_crypto)
- endif
-
- AM_CPPFLAGS += -I$(top_srcdir)/lib/hx509 \
-- -I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1
-+ -I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1 \
-+ -I$(srcdir)/..
-
- lib_LTLIBRARIES = libhcrypto.la
- check_LTLIBRARIES = libhctest.la
-From 572a6fd7ac41e9210ef3eb765fe7da4ec8a94bb2 Mon Sep 17 00:00:00 2001
-From: Luke Howard
-Date: Mon, 24 Dec 2018 02:21:32 +0000
-Subject: [PATCH] hx509: fix dependency, hxtool requires ASN.1 headers
-
----
- lib/hx509/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
-index b58deb3e37..09643c43a0 100644
---- a/lib/hx509/Makefile.am
-+++ b/lib/hx509/Makefile.am
-@@ -164,7 +164,7 @@ hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC)
- dist_hxtool_SOURCES = hxtool.c
- nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h
-
--$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h
-+$(hxtool_OBJECTS): hxtool-commands.h $(nodist_include_HEADERS)
-
- hxtool_LDADD = \
- libhx509.la \
diff --git a/app-crypt/jitterentropy-rngd/Manifest b/app-crypt/jitterentropy-rngd/Manifest
index 432b1f574f94..74c99ee7cd19 100644
--- a/app-crypt/jitterentropy-rngd/Manifest
+++ b/app-crypt/jitterentropy-rngd/Manifest
@@ -1 +1,2 @@
DIST jitterentropy-rngd-1.2.7.tar.gz 46546 BLAKE2B 82f0610ab5e2dd4ac42b5c2a72a59cc9c78dd65f82327302d4699b129280d45bf61a7197d44d3d141b6ccd3b512b984b0f95f1594c97a8c54f10c0d58906089c SHA512 4d89110cb7456b360f4c268121b61c2141b9d592877728eb94de0c8679928689b3b039a99579af4ee1299a1eb538c9a2d4527d9a4e98f85022c590a0d01f4811
+DIST jitterentropy-rngd-1.2.8.tar.gz 46950 BLAKE2B 67e6a590bf5d535a6f8cf465b8c6f59ccc101e699979573e117432545800e42393e2232f5a3404f03f7806eb79c4a3148a14eb35f660233926ac874ad5207779 SHA512 9cc2c66388f592e2e4df89e0e9950dc83af168658dd456c9b1af9883cce7ce5f6ece37089d7dbfb0bb61433a52bf596d129819b3328551f2ec29a5d74f94ea47
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild
new file mode 100644
index 000000000000..1d082547ec2f
--- /dev/null
+++ b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info systemd
+
+DESCRIPTION="Jitter RNG daemon"
+HOMEPAGE="https://www.chronox.de/jent.html"
+SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.0-do-not-strip-and-compress.patch
+)
+
+src_configure() {
+ filter-flags '*'
+ append-cflags '-O0'
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
+ UNITDIR="$(systemd_get_systemunitdir)" install
+ newinitd "${FILESDIR}"/jitterentropy-rngd-initd jitterentropy-rngd
+}
diff --git a/app-crypt/minisign/minisign-0.10.ebuild b/app-crypt/minisign/minisign-0.10.ebuild
index 52e8ac6a0846..295e3a7ed18b 100644
--- a/app-crypt/minisign/minisign-0.10.ebuild
+++ b/app-crypt/minisign/minisign-0.10.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
else
SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
fi
LICENSE="ISC"
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.4-r1.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.4-r1.ebuild
index 5a78ca4edd5a..0ce5dbbe30a0 100644
--- a/app-crypt/sbsigntools/sbsigntools-0.9.4-r1.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot
LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
IUSE=""
RDEPEND="
diff --git a/app-crypt/sequoia-sq/metadata.xml b/app-crypt/sequoia-sq/metadata.xml
index a7fa285c7476..3c72ac7546b9 100644
--- a/app-crypt/sequoia-sq/metadata.xml
+++ b/app-crypt/sequoia-sq/metadata.xml
@@ -5,4 +5,7 @@
Florian Schmaus
flow@gentoo.org
+
+ sequoia-pgp/sequoia
+
diff --git a/app-crypt/sequoia-sqv/metadata.xml b/app-crypt/sequoia-sqv/metadata.xml
index a7fa285c7476..3c72ac7546b9 100644
--- a/app-crypt/sequoia-sqv/metadata.xml
+++ b/app-crypt/sequoia-sqv/metadata.xml
@@ -5,4 +5,7 @@
Florian Schmaus
flow@gentoo.org
+
+ sequoia-pgp/sequoia
+
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
index 1ad716fc5197..3187cf4dce7f 100644
--- a/app-crypt/swtpm/metadata.xml
+++ b/app-crypt/swtpm/metadata.xml
@@ -16,4 +16,7 @@
+
+ stefanberger/swtpm
+
diff --git a/app-crypt/tpm-emulator/metadata.xml b/app-crypt/tpm-emulator/metadata.xml
index 51fbbfdd110b..fdd2723e0b5e 100644
--- a/app-crypt/tpm-emulator/metadata.xml
+++ b/app-crypt/tpm-emulator/metadata.xml
@@ -2,10 +2,11 @@
-
- tpm-emulator
-
+
+ tpm-emulator
+ PeterHuewe/tpm-emulator
+
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index ab9d8884a85b..6d4d9df9473c 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1 +1,2 @@
DIST tpm2-abrmd-2.4.1.tar.gz 577259 BLAKE2B 7d97e1069a171f3693fb11b8e2ce0243993f4352aae9fd691bfbf1b8fcef8615b79957f8f662ac00fe59bf7e3830d8abb79c67790f7be1cd3140fd1c7b1ed560 SHA512 0335285678cfceca4f185981ded90d213ff796cadddc9b5d6dbf2db533f81023a0f1089bbd8a8017bccb95190889be23b24d38a176d3368d221479aff4ff7d6c
+DIST tpm2-abrmd-3.0.0.tar.gz 576822 BLAKE2B cdcb677a2dec59cdc454b98793bb0784ba3403c276b618cd37c5748ab1d883ee8f3f69c0ae95c7bf262e2e993dcc0b12ae39010de12c6c211fe3de8c21515160 SHA512 65a39cd0518dfbcbd5835ac6c6628444d412e36471702f2cd1f1077d788330a477778e6403899ea2fa0497b643e5db9ca3e746845492eff78c4c78d8dd8f9e7d
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..56f9d03e0cbe
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="TPM2 Access Broker & Resource Manager"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/tss
+ acct-user/tss
+ sys-apps/dbus
+ dev-libs/glib:=
+ app-crypt/tpm2-tss:="
+DEPEND="${RDEPEND}
+ test? (
+ app-crypt/swtpm
+ >=app-crypt/tpm2-tss-3.0.0:=
+ dev-util/cmocka
+ )"
+BDEPEND="virtual/pkgconfig
+ dev-util/gdbus-codegen"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # tests fail with LTO enabbled. See bug 865275
+ filter-lto
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable test unit) \
+ $(use_enable test integration) \
+ --disable-defaultflags \
+ --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
+ --with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
+ --with-systemdpresetdisable \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+ default
+
+ find "${D}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+ einfo "As of tpm2-abrmd 3.0.0, users must be in the tss group"
+ einfo "to access the TPM"
+}
diff --git a/app-crypt/tpm2-pkcs11/metadata.xml b/app-crypt/tpm2-pkcs11/metadata.xml
index 12ab3f529d15..4b7a498cda7f 100644
--- a/app-crypt/tpm2-pkcs11/metadata.xml
+++ b/app-crypt/tpm2-pkcs11/metadata.xml
@@ -12,4 +12,7 @@
+
+ tpm2-software/tpm2-pkcs11
+
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index a0813d8bd6cc..e89942029277 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1,3 @@
DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
DIST tpm2-tools-5.3.tar.gz 1118934 BLAKE2B 7efb43180c23cee30ea860fb697049d5c4444594bff66404d0fe805ef1783b70859c04563ed946fe38bac329fe0c849ba30fe0dff9fc10f0d6942210862d96d6 SHA512 224a5ea3448a877362abb35ac06b115c559c09b44b30d74c8326211be66d24e0e130c285b1e285be1842e7203ab488629b0f4e451cbd782c83ed72023d146675
+DIST tpm2-tools-5.4.tar.gz 1241132 BLAKE2B 21406ec61de19db49f1dd1ff9648e1b0a9ae2647df2ce290acca40c2fc54464e3c8a744afdbc9314ca731869ac974a7863e2bea3c70df844a972501a5b7973f2 SHA512 8d7802b85bd26b6efa0ed6be73b917b907bb7b424ff7d07e46e5574dfdd9d46ea2d7727904ebaba4651c8d1249cd52a7dc6dff8e9635666c8d97ca7c337a0396
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
new file mode 100644
index 000000000000..6b996f725753
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 flag-o-matic python-any-r1
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
+SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+fapi test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+ dev-libs/openssl:=
+ net-misc/curl
+ sys-libs/efivar:="
+DEPEND="${RDEPEND}
+ test? (
+ app-crypt/swtpm
+ app-crypt/tpm2-abrmd
+ dev-util/cmocka
+ )"
+BDEPEND="virtual/pkgconfig
+ sys-devel/autoconf-archive
+ test? (
+ app-editors/vim-core
+ dev-tcltk/expect
+ $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+ )
+ ${PYTHON_DEPS}"
+
+src_configure() {
+ # tests fail with LTO enabbled. See bug 865275 and 865277
+ filter-lto
+ econf \
+ $(use_enable fapi) \
+ $(use_enable test unit) \
+ --with-bashcompdir=$(get_bashcompdir) \
+ --enable-hardening
+}
+
+src_install() {
+ default
+ mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
+ local utils=( "${ED}"/usr/bin/tpm2_* )
+ bashcomp_alias tpm2 "${utils[@]##*/}"
+}
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index fbe1511216da..3a945d93a771 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1 +1,2 @@
DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
+DIST tpm2-tss-3.2.1.tar.gz 1638566 BLAKE2B bdf5eeca1e7269a639cefd8b4a38e16c5b7c08518411a22718dcd14bc9fe3b621eee77cdd98f9ece0f6d9a52319bce5e0a502ff9a6e4ba6716341bd01f5967a9 SHA512 dbe5e29349d78621fcd608d9c75fa58f5e6462264b9654ca85af9f9faafebe1107d9f735a1b6ad4956a089b0dd96cbda3f46364cabd846f9fb29a419b074c78f
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index b66b6e79c143..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 183289f7..c791896c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -689,24 +689,6 @@ endif #FAPI
- EXTRA_DIST += dist/tpm-udev.rules
-
- install-dirs:
--if HOSTOS_LINUX
--if SYSD_SYSUSERS
-- @echo "systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf"
-- @systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf || echo "WARNING Failed to create the tss user and group"
--else
-- @echo "call make_tss_user_and_group"
-- @$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
--endif
--if SYSD_TMPFILES
-- @echo "systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf"
-- @systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to create the FAPI directories with the correct permissions"
--else
-- @echo "(call make_fapi_dirs) && (call set_fapi_permissions)"
-- @-$(call make_fapi_dirs) && $(call set_fapi_permissions) || echo "WARNING Failed to create the FAPI directories with the correct permissions"
--endif
-- @echo "call check_fapi_dirs"
-- @$(call check_fapi_dirs)
--endif
-
- install-data-hook: install-dirs
- -if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 000000000000..7e55f965bd2f
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,61 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6242b19c..b30ec6e0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -492,7 +492,6 @@ fapi-config.json: dist/fapi-config.json.in
+ -e 's|[@]userstatedir@|$(userstatedir)|g' \
+ < "$<" > "$@"
+
+-sysusers_DATA = dist/sysusers.d/tpm2-tss.conf
+ tmpfiles_DATA = tpm2-tss-fapi.conf
+
+ CLEANFILES += tpm2-tss-fapi.conf
+@@ -516,7 +515,6 @@ EXTRA_DIST += \
+ dist/fapi-config.json.in \
+ dist/fapi-profiles/P_RSA2048SHA256.json \
+ dist/fapi-profiles/P_ECCP256SHA256.json \
+- dist/sysusers.d/tpm2-tss.conf \
+ dist/tmpfiles.d/tpm2-tss-fapi.conf.in \
+ doc/fapi-config.md \
+ doc/fapi-profile.md \
+@@ -726,13 +724,6 @@ EXTRA_DIST += dist/tpm-udev.rules
+
+ install-dirs:
+ if HOSTOS_LINUX
+-if SYSD_SYSUSERS
+- @echo "systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf"
+- @systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf || echo "WARNING Failed to create the tss user and group"
+-else
+- @echo "call make_tss_user_and_group"
+- @$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
+-endif
+ if SYSD_TMPFILES
+ @echo "systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf"
+ @systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to create the FAPI directories with the correct permissions"
+diff --git a/configure.ac b/configure.ac
+index 83554edd..c9599b93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -483,22 +483,9 @@ AS_IF([test "x$enable_integration" = "xyes" && test "x$enable_self_generated_cer
+ [AC_MSG_WARN([Running integration tests without EK certificate verification, use --enable-self-generated-certificate for full test coverage])])
+
+ # Check for systemd helper tools used by make install
+-AC_CHECK_PROG(systemd_sysusers, systemd-sysusers, yes)
+-AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes")
+ AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes)
+ AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes")
+
+-# Check all tools used by make install
+-AS_IF([test "$HOSTOS" = "Linux"],
+- [ AC_CHECK_PROG(useradd, useradd, yes)
+- AC_CHECK_PROG(groupadd, groupadd, yes)
+- AC_CHECK_PROG(adduser, adduser, yes)
+- AC_CHECK_PROG(addgroup, addgroup, yes)
+- AS_IF([test "x$addgroup" != "xyes" && test "x$groupadd" != "xyes" ],
+- [AC_MSG_ERROR([addgroup or groupadd are needed.])])
+- AS_IF([test "x$adduser" != "xyes" && test "x$useradd" != "xyes" ],
+- [AC_MSG_ERROR([adduser or useradd are needed.])])])
+-
+ AC_SUBST([PATH])
+
+ dnl --------- Doxy Gen -----------------------
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
deleted file mode 100644
index 6b9f088e71d1..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
- fapi? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
- acct-user/tss
- fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
- >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
- mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
- openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- test? ( app-crypt/swtpm
- dev-libs/uthash
- dev-util/cmocka
- fapi? ( >=net-misc/curl-7.80.0 ) )"
-BDEPEND="sys-apps/acl
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch"
-)
-
-pkg_setup() {
- local CONFIG_CHECK=" \
- ~TCG_TPM
- "
- linux-info_pkg_setup
- kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
- default
-
- # See bug #833887 (and similar); eautoreconf means .pc file gets wrong version.
- sed -i \
- "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
- "configure.ac" || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865279
- filter-lto
-
- ECONF_SOURCE=${S} econf \
- --localstatedir=/var \
- $(multilib_native_use_enable doc doxygen-doc) \
- $(use_enable fapi) \
- $(use_enable static-libs static) \
- $(multilib_native_use_enable test unit) \
- $(multilib_native_use_enable test integration) \
- $(multilib_native_use_enable test self-generated-certificate) \
- --disable-tcti-libtpms \
- --disable-defaultflags \
- --disable-weakcrypto \
- --with-crypto="$(usex mbedtls mbed ossl)" \
- --with-runstatedir=/run \
- --with-udevrulesdir="$(get_udevdir)/rules.d" \
- --with-udevrulesprefix=60- \
- --with-sysusersdir="/usr/lib/sysusers.d" \
- --with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-multilib_src_install() {
- default
-
- if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then
- # Safeguard for bug #833887
- die "pkg-config file version doesn't match ${PV}! Please report a bug!"
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process tpm2-tss-fapi.conf
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.1.ebuild
new file mode 100644
index 000000000000..0a1f2270a6ce
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc +fapi +openssl mbedtls static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( mbedtls openssl )
+ fapi? ( openssl !mbedtls )"
+
+RDEPEND="acct-group/tss
+ acct-user/tss
+ fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
+ >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
+ mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+ openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ test? ( app-crypt/swtpm
+ dev-libs/uthash
+ dev-util/cmocka
+ fapi? ( >=net-misc/curl-7.80.0 ) )"
+BDEPEND="sys-apps/acl
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch"
+)
+
+pkg_setup() {
+ local CONFIG_CHECK=" \
+ ~TCG_TPM
+ "
+ linux-info_pkg_setup
+ kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_prepare() {
+ eautoreconf
+ default
+}
+
+multilib_src_configure() {
+ # tests fail with LTO enabbled. See bug 865275 and 865279
+ filter-lto
+
+ ECONF_SOURCE=${S} econf \
+ --localstatedir=/var \
+ $(multilib_native_use_enable doc doxygen-doc) \
+ $(use_enable fapi) \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_enable test unit) \
+ $(multilib_native_use_enable test integration) \
+ $(multilib_native_use_enable test self-generated-certificate) \
+ --disable-tcti-libtpms \
+ --disable-defaultflags \
+ --disable-weakcrypto \
+ --with-crypto="$(usex mbedtls mbed ossl)" \
+ --with-runstatedir=/run \
+ --with-udevrulesdir="$(get_udevdir)/rules.d" \
+ --with-udevrulesprefix=60- \
+ --with-sysusersdir="/usr/lib/sysusers.d" \
+ --with-tmpfilesdir="/usr/lib/tmpfiles.d"
+}
+
+multilib_src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ tmpfiles_process tpm2-tss-fapi.conf
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 1460afde6f92..c40f38570cea 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/eblook/eblook-1.6.1.ebuild b/app-dicts/eblook/eblook-1.6.1.ebuild
deleted file mode 100644
index 0ac5d0edc7d7..000000000000
--- a/app-dicts/eblook/eblook-1.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Interactive search utility for electronic dictionaries"
-HOMEPAGE="http://openlab.ring.gr.jp/edict/eblook/"
-SRC_URI="http://openlab.ring.gr.jp/edict/eblook/dist/${P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~riscv x86"
-
-DEPEND=">=dev-libs/eb-3.3.4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P%_*}"
-
-PATCHES=( "${FILESDIR}"/${P}-LDFLAGS.patch )
-
-src_configure() {
- econf --with-eb-conf="${EPREFIX}"/etc/eb.conf
-}
diff --git a/app-dicts/eblook/files/eblook-1.6.1-LDFLAGS.patch b/app-dicts/eblook/files/eblook-1.6.1-LDFLAGS.patch
deleted file mode 100644
index 79bb33dd0292..000000000000
--- a/app-dicts/eblook/files/eblook-1.6.1-LDFLAGS.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -21918,7 +21918,7 @@
- save_LIBS=$LIBS
- CPPFLAGS="$CPPFLAGS $EBCONF_PTHREAD_CPPFLAGS $EBCONF_EBINCS $EBCONF_ZLIBINCS $EBCONF_INTLINCS"
- CFLAGS="$CFLAGS $EBCONF_PTHREAD_CFLAGS"
--LDFLAGS="$LDFAGS $EBCONF_PTHREAD_LDFLAGS"
-+LDFLAGS="$LDFLAGS $EBCONF_PTHREAD_LDFLAGS"
- LIBS="$LIBS $EBCONF_EBLIBS $EBCONF_ZLIBLIBS $EBCONF_INTLLIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -21981,7 +21981,7 @@
- sysconfdir=$sysconfdir
- CPPFLAGS="$CPPFLAGS $EBCONF_PTHREAD_CPPFLAGS $EBCONF_EBINCS $EBCONF_ZLIBINCS $EBCONF_INTLINCS"
- CFLAGS="$CFLAGS $EBCONF_PTHREAD_CFLAGS"
--LDFLAGS="$LDFAGS $EBCONF_PTHREAD_LDFLAGS"
-+LDFLAGS="$LDFLAGS $EBCONF_PTHREAD_LDFLAGS"
- LIBS="$LIBS $EBCONF_EBLIBS $EBCONF_ZLIBLIBS $EBCONF_INTLLIBS"
-
-
diff --git a/app-dicts/libydpdict/metadata.xml b/app-dicts/libydpdict/metadata.xml
index 85e4ed814fa2..cc6d8743c599 100644
--- a/app-dicts/libydpdict/metadata.xml
+++ b/app-dicts/libydpdict/metadata.xml
@@ -1,5 +1,8 @@
-
+
+
+ wojtekka/libydpdict
+
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 57c918369cf5..1c004071ddab 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 4eeb34d8ba29..85f40f3e3073 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,2 +1 @@
-DIST doxygen-1.9.4.src.tar.gz 5196383 BLAKE2B 8fe27a8821e3309aa0314586b569a7e295425ba50f4c3e56eb1e2e726f15197c7e1b4c68803b4017345b5a67fddbadcc5a5b30039287a38c3a804bfce844c513 SHA512 613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a
DIST doxygen-1.9.5.src.tar.gz 5251459 BLAKE2B 46ce6c767ec60ba4b4e2d4e343f78b401b142f242e7037ce8877a5316ad5685a7c080045de793aa8fc1334cd593f9ef5f55d1b6259cb8966ce0b804c8860efbc SHA512 4ad4c1ecd4a12220442f354b90aa56f80e78fcaf288d5e36da421437d59811ed3d429ee13717692886a55b9628ae565d40ce13c51792ccc8bba15b1e018cb651
diff --git a/app-doc/doxygen/doxygen-1.9.4-r2.ebuild b/app-doc/doxygen/doxygen-1.9.4-r2.ebuild
deleted file mode 100644
index ff97c461722b..000000000000
--- a/app-doc/doxygen/doxygen-1.9.4-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit cmake flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-else
- SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite"
-# We need TeX for tests, bug #765472
-RESTRICT="!doc? ( test )"
-
-BDEPEND="sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
-"
-RDEPEND="app-text/ghostscript-gpl
- dev-lang/perl
- media-libs/libpng:0=
- virtual/libiconv
- clang? ( >=sys-devel/clang-10:= )
- dot? (
- media-gfx/graphviz
- media-libs/freetype
- )
- doc? (
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-plaingeneric
- )
- doxysearch? ( dev-libs/xapian:= )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
- "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
- "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
- "${FILESDIR}/${P}-gcc12-include.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
- sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
- # fix pdf doc
- sed -i.orig -e "s:g_kowal:g kowal:" \
- doc/maintainers.txt || die
-
- if is-flagq "-O3" ; then
- ewarn
- ewarn "Compiling with -O3 is known to produce incorrectly"
- ewarn "optimized code which breaks doxygen."
- ewarn
- elog
- elog "Continuing with -O2 instead ..."
- elog
- replace-flags "-O3" "-O2"
- fi
-}
-
-src_configure() {
- # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287
- filter-lto
-
- local mycmakeargs=(
- -Duse_libclang=$(usex clang)
- -Dbuild_doc=$(usex doc)
- -Dbuild_search=$(usex doxysearch)
- -Dbuild_wizard=$(usex qt5)
- -Duse_sqlite3=$(usex sqlite)
- -DGIT_EXECUTABLE="false"
- )
-
- use doc && mycmakeargs+=(
- -DDOC_INSTALL_DIR="share/doc/${P}"
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- export VARTEXFONTS="${T}/fonts" # bug #564944
-
- if ! use dot; then
- sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
- {Doxyfile,doc/Doxyfile} \
- || die "disabling dot failed"
- fi
-
- # -j1 for bug #770070
- cmake_src_compile docs -j1
- fi
-}
-
-src_install() {
- cmake_src_install
-
- doman doc/*.1
-}
diff --git a/app-doc/jargon/jargon-4.4.7-r2.ebuild b/app-doc/jargon/jargon-4.4.7-r2.ebuild
new file mode 100644
index 000000000000..5a209b20012a
--- /dev/null
+++ b/app-doc/jargon/jargon-4.4.7-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A compendium of hacker slang illuminating many aspects of hackish tradition"
+HOMEPAGE="http://www.catb.org/jargon/"
+SRC_URI="http://www.catb.org/jargon/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+src_prepare() {
+ default
+ find . -name .xvpics | xargs rm -rf
+ assert
+ cd html || die
+ sed -i -e 's#\.\./\.\.#..#' */* \
+ || die "sed failed"
+}
+
+src_install() {
+ docinto html
+ dodoc -r html/.
+}
diff --git a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
index 8098c758596a..a0675deb99a2 100644
--- a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
+++ b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit python-any-r1 python-utils-r1 vcs-clean
+inherit python-any-r1 vcs-clean
COMMIT="9d711f40638202b02f2154d7f05ea35088ff9388"
diff --git a/app-doc/single-unix-specification/Manifest b/app-doc/single-unix-specification/Manifest
index 4cd61dd785dd..ab0ab4247268 100644
--- a/app-doc/single-unix-specification/Manifest
+++ b/app-doc/single-unix-specification/Manifest
@@ -1 +1,2 @@
+DIST susv4-2018.tar.bz2 3352852 BLAKE2B 0f05f2dd6444d35b2d962651643eb8bd0520169c8670072fdb1ce2c671b3bdeed8e4d99dfacceba69f846c107c73c4a60f3f51e48c64499f40a9fa594ac877ba SHA512 2484d24d19b9731808c61219b61d63cdf4d8dff6498fb4655478b76808a583064a5cfbcfcf18f1d27c56e03a6b47cc6833f94483784ec29059bef063724c2567
DIST susv4tc2.tar.bz2 3649434 BLAKE2B c09eb835badec0bf191da4caaa7b35ccedfb1512218d3ebb66d0301bbe6404a30df2e3c51838dcd9f91912f41ce3e39478d2c061ac2f075ef678ae20fcaf0ad6 SHA512 cc86b2b4860b1069cb8712ef7b5a9702510f48d6585b5414ff561f85677974c156d8cc95cf29dfdab360c13ecb884e19e2112fe5c6bc49666417c9a744a816ad
diff --git a/app-doc/single-unix-specification/single-unix-specification-4_p2.ebuild b/app-doc/single-unix-specification/single-unix-specification-4_p2.ebuild
index 1aebea7be9ed..eab527bfdb98 100644
--- a/app-doc/single-unix-specification/single-unix-specification-4_p2.ebuild
+++ b/app-doc/single-unix-specification/single-unix-specification-4_p2.ebuild
@@ -1,23 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="The Single UNIX Specification, Version 4, 2016 Edition"
HOMEPAGE="https://www2.opengroup.org/ogsys/catalog/T101"
-SRC_URI="http://pubs.opengroup.org/onlinepubs/9699919799/download/susv4tc2.tar.bz2"
+SRC_URI="https://pubs.opengroup.org/onlinepubs/9699919799/download/susv4tc2.tar.bz2"
+S="${WORKDIR}/susv4tc2"
LICENSE="sus4-copyright"
SLOT="4"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE=""
RESTRICT="mirror"
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/susv4tc2"
-
src_install() {
dodoc -r *
}
diff --git a/app-doc/single-unix-specification/single-unix-specification-4_p2018.ebuild b/app-doc/single-unix-specification/single-unix-specification-4_p2018.ebuild
new file mode 100644
index 000000000000..5de651d34c07
--- /dev/null
+++ b/app-doc/single-unix-specification/single-unix-specification-4_p2018.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The Single UNIX Specification, Version 4, $(ver_cut 3) Edition"
+HOMEPAGE="https://www2.opengroup.org/ogsys/catalog/T101"
+SRC_URI="https://pubs.opengroup.org/onlinepubs/9699919799/download/susv4-$(ver_cut 3).tar.bz2"
+S="${WORKDIR}/susv4-$(ver_cut 3)"
+
+LICENSE="sus4-copyright"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+RESTRICT="mirror"
+
+src_install() {
+ dodoc -r *
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index c2822d956e9c..276ea067d4df 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/bvi/bvi-1.4.1-r2.ebuild b/app-editors/bvi/bvi-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..65616724b31d
--- /dev/null
+++ b/app-editors/bvi/bvi-1.4.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Display-oriented editor for binary files, based on the vi texteditor"
+HOMEPAGE="http://bvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-prototypes.patch" )
+
+src_configure() {
+ append-cflags -DANSI -std=gnu89
+ default
+}
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index 5fc02a094799..b99e11773705 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,3 +1,2 @@
-DIST featherpad-1.1.0.tar.gz 1061070 BLAKE2B 78c7ddf0b7961a300fe2e425876bfaf32a1186eb88c2619202cb2f07a780aed3c2f8d1ced0e963b1868c94e890d1d809baae534fe1f3d06b3f3036aeeccf7414 SHA512 c734619ea8eda2709ccfa4d1b3c2ac541f32d52f31f0896ddf3c1c5733f175da9d955458a62a34221400a73003970cf796f59cf574b499831267b6f4d1a28d21
-DIST featherpad-1.2.0.tar.gz 1091776 BLAKE2B f63ddcc8bf02b3f9ad5f6ad2b56b8f99cc8566f70351a293fbe339930b41542e9ba27888afabfcf98a04ec6a1087dd77aa35006ea33526e1a7d6c45f5fe3b7d9 SHA512 cf21ed9394444920fcf3a8ce3a8338814d69322389c4652e79f0754fe67ee61260f81604c91adf0a864fb1441307706c60ee1bd29efd2e617ab8e1f5fc254cdd
DIST featherpad-1.3.1.tar.gz 1096886 BLAKE2B 360940f0fe781676baa89a99f3d0a7c8ff8219da05fc5757b2e96654ab6c937534e2ef1cd216a3df73fd417353a3285716d09198b27626183c58d031abed363e SHA512 d17eb4691c759a7e97f24bf149152d104141162bef9f819cb09ecdd440916d1f5aa1a56252e64b859220237ea078a072c75308ec7b2e131078df938a171f506f
+DIST featherpad-1.3.4.tar.gz 1101191 BLAKE2B 6313e107373e10f7784f9c2f082896fdc7e56587d7c7abde088f8fe133fc1a80f52809d6f369adbbdfe590298b119167b6aa95271c138d964fc76d9583ef8c06 SHA512 81be35bd1f90be4657225f3d8a040882073ad0a600a78c00207bdf0d7e7666e0542c67e07107d4c610753d8deb48829f7b092ab93216c77487d1310ced066e0e
diff --git a/app-editors/featherpad/featherpad-1.1.0.ebuild b/app-editors/featherpad/featherpad-1.1.0.ebuild
deleted file mode 100644
index dd562f11fb34..000000000000
--- a/app-editors/featherpad/featherpad-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
-HOMEPAGE="https://github.com/tsujan/FeatherPad"
-SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FeatherPad-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+X"
-
-RDEPEND="app-text/hunspell:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_configure() {
- local mycmakeargs=(
- -DWITHOUT_X11=$(usex !X)
- )
- cmake_src_configure
-}
diff --git a/app-editors/featherpad/featherpad-1.2.0.ebuild b/app-editors/featherpad/featherpad-1.2.0.ebuild
deleted file mode 100644
index e82070d4a429..000000000000
--- a/app-editors/featherpad/featherpad-1.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg cmake
-
-DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
-HOMEPAGE="https://github.com/tsujan/FeatherPad"
-SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FeatherPad-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+X"
-
-RDEPEND="app-text/hunspell:=
- >=dev-qt/qtcore-5.15.0
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_configure() {
- local mycmakeargs=(
- -DWITHOUT_X11=$(usex !X)
- )
- cmake_src_configure
-}
diff --git a/app-editors/featherpad/featherpad-1.3.4.ebuild b/app-editors/featherpad/featherpad-1.3.4.ebuild
new file mode 100644
index 000000000000..c456752a0f7c
--- /dev/null
+++ b/app-editors/featherpad/featherpad-1.3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake
+
+DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
+HOMEPAGE="https://github.com/tsujan/FeatherPad"
+SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FeatherPad-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+X"
+
+RDEPEND="app-text/hunspell:=
+ >=dev-qt/qtcore-5.15.0:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITHOUT_X11=$(usex !X)
+ )
+ cmake_src_configure
+}
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index eb90445d2fa3..5a3e22c48c59 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,2 +1 @@
-DIST pluma-1.24.2.tar.xz 3745160 BLAKE2B ed855b19f1ab80cb6ef9bc175eea3c2af386b1e45123bc0e3ad93d1964efb4822fe1b3d7490308357fcff96557bb6189f081a467f41a6907e76a1961de8f23d3 SHA512 588640744f8a0bec08d0c51c0309380a57cb6319c98124885e30d05e7dd8488ba7bd5acec1bf21fb0d6832626ae8925b24cd241202265af1a631a91313cdad2b
DIST pluma-1.26.0.tar.xz 3765056 BLAKE2B 4a3107df7c4ba906d405b5ef3ea6dd9ca0e372a7b00224213fc8a60d1dc26663d1363aa7f0569b0242407f5b5d850386308fae9192c4a33f577295bb55ef5a16 SHA512 a6c0cee7110f4863e44af51b19bb528f0f3570eab8db98038152bf142eedde97ac13b896deff7051b941a0f43c6fe14e316a97eba40fe5d4854d76038450245f
diff --git a/app-editors/pluma/pluma-1.24.2.ebuild b/app-editors/pluma/pluma-1.24.2.ebuild
deleted file mode 100644
index 22ecdfa87638..000000000000
--- a/app-editors/pluma/pluma-1.24.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} )
-
-inherit mate python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="+introspection spell test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk
- >=dev-libs/glib-2.50:2
- >=dev-libs/libpeas-1.2.0[gtk]
- >=dev-libs/libxml2-2.5:2
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3[introspection?]
- >=x11-libs/gtksourceview-3.0.0:3.0
- x11-libs/libICE
- x11-libs/libX11
- >=x11-libs/libSM-1.0
- x11-libs/pango
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- spell? (
- >=app-text/enchant-1.6:=
- >=app-text/iso-codes-0.35
- )
- !!app-editors/mate-text-editor
-"
-
-RDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}
- >=mate-base/mate-desktop-1.9[introspection?]
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- ~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- dev-util/glib-utils
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_configure() {
- mate_src_configure \
- $(use_enable introspection) \
- $(use_enable spell) \
- $(use_enable test tests)
-}
-
-src_test() {
- # FIXME: This should be handled at eclass level.
- "${EPREFIX%/}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- unset DBUS_SESSION_BUS_ADDRESS
-
- GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 0dd0c5740fff..ac2810f6bc2b 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -4,3 +4,6 @@ DIST vscode-1.74.0-arm64.tar.gz 127510791 BLAKE2B 829539d4d4be86f59f0e8577b55fc6
DIST vscode-1.74.1-amd64.tar.gz 138266991 BLAKE2B 283fedd15cf2eb75f339c741785cff35a0fca62b267cf71b26e2f0dce308f2f189c32bdfa0e4137109551b3bfb45c0e71fbb4d0940961d166955b053ae80e43d SHA512 73aabce1ce68c3b321490fe36083847d9d012c1a5fd6e095bf6a0160abad5e0935d4f1d8e0ad8e7e84bdc844bf8f2331baeb6ff58df2ffba080c97f46c096038
DIST vscode-1.74.1-arm.tar.gz 117868697 BLAKE2B 331d1fa61d6a0ee4c588dc416fee3a62e33066c4d02a2a4a07002c89f5ec7a125269d05866817277f79649a3834221d209377d78622c4c8709cc6bffd9a9da71 SHA512 cb959dccdadbbcf4a592a92a543efa5bca193fcd9293dc61f42f4328676cfc1429099e4e10b8fef456b41e428f3eefecea462adde82a915ec3ab9c543184001b
DIST vscode-1.74.1-arm64.tar.gz 127513900 BLAKE2B 1d34816d28f2a415d33ee8196a2c6843ba49f736abf8d862232a4905ddf73679ac2bf5145cb2673355c16bc62143b1428ed0d503153d7a84a30d17cc9602a881 SHA512 6a41cc164e1fc2ea2ce5d3f0f2c346aa78df7aec93457e6b4359fb588c40120917c810f96d6434c532c199444f233690de46ec9cd94494ee1b6e2baaf2eb542b
+DIST vscode-1.74.2-amd64.tar.gz 138265366 BLAKE2B 49dbd775a1488bdf4bf3f5771493e6b9395cea4ec9b288e6ff36684af0c5ff9b8ec1db4525c59ff8a2b292598f57bc6d2a99e286cc2b14430f35f7a725082f1c SHA512 8c9dba2b00583b446dcdf0b1cf489dcabbfb34eee6d3945dc1eb8f369c0c708137ae2b1773806191848649e5f7246340c850c2a96d2e395b7fd745a8e3a8765b
+DIST vscode-1.74.2-arm.tar.gz 117860078 BLAKE2B 70fd60fca021416edec9b5631156989b72c6d4096bf2277381aca4d29f841ecc1d09ba782df4814cedbd7c611fc7e5a818166cbe4528b673045d7c6768fe86dc SHA512 dbce967d6c02ec762d43bfbf1b3daa36261eb9eb965376d560e731d3db94bff29f98ceb7ce1e809a940bc0882760baf9f20cead1715d97afe32ef2e2eff7b284
+DIST vscode-1.74.2-arm64.tar.gz 127507954 BLAKE2B f3e2b278fe487033920ddf97ae2e02672a7e9430f1d2011e7fbe64464fbbcd3b48895732bd9f3b805d618181f341c0f4e87a27c2f9467bc5b0d9c139c5be2d4e SHA512 255e316a5193a7dd3728b50e885d55ab77be047638dfcf35c823064d15a4f0d26fc53d217403a85210f1151ea4cf22c1d839141f9822a899d7be1760701995fe
diff --git a/app-editors/vscode/vscode-1.74.2.ebuild b/app-editors/vscode/vscode-1.74.2.ebuild
new file mode 100644
index 000000000000..6f579f293498
--- /dev/null
+++ b/app-editors/vscode/vscode-1.74.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+ amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+ arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+ arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+ Apache-2.0
+ BSD
+ BSD-1
+ BSD-2
+ BSD-4
+ CC-BY-4.0
+ ISC
+ LGPL-2.1+
+ Microsoft-vscode
+ MIT
+ MPL-2.0
+ openssl
+ PYTHON
+ TextMate-bundle
+ Unlicense
+ UoI-NCSA
+ W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
+ app-crypt/libsecret[crypt]
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/mesa
+ net-print/cups
+ sys-apps/util-linux
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libxshmfence
+ x11-libs/pango
+"
+
+QA_PREBUILT="
+ /opt/vscode/bin/code-tunnel
+ /opt/vscode/chrome_crashpad_handler
+ /opt/vscode/chrome-sandbox
+ /opt/vscode/code
+ /opt/vscode/libEGL.so
+ /opt/vscode/libffmpeg.so
+ /opt/vscode/libGLESv2.so
+ /opt/vscode/libvk_swiftshader.so
+ /opt/vscode/libvulkan.so*
+ /opt/vscode/resources/app/extensions/*
+ /opt/vscode/resources/app/node_modules.asar.unpacked/*
+ /opt/vscode/swiftshader/libEGL.so
+ /opt/vscode/swiftshader/libGLESv2.so
+"
+
+src_install() {
+ if use amd64; then
+ cd "${WORKDIR}/VSCode-linux-x64" || die
+ elif use arm; then
+ cd "${WORKDIR}/VSCode-linux-armhf" || die
+ elif use arm64; then
+ cd "${WORKDIR}/VSCode-linux-arm64" || die
+ else
+ die "Visual Studio Code only supports amd64, arm and arm64"
+ fi
+
+ # Cleanup
+ rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
+
+ # Disable update server
+ sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+ # Install
+ pax-mark m code
+ insinto "/opt/${PN}"
+ doins -r *
+ fperms +x /opt/${PN}/{,bin/}code
+ fperms +x /opt/${PN}/chrome_crashpad_handler
+ fperms 4711 /opt/${PN}/chrome-sandbox
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
+ fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+ fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
+ dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
+ dosym "../../opt/${PN}/bin/code" "usr/bin/code"
+ domenu "${FILESDIR}/vscode.desktop"
+ domenu "${FILESDIR}/vscode-url-handler.desktop"
+ domenu "${FILESDIR}/vscode-wayland.desktop"
+ domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+ newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "You may want to install some additional utils, check in:"
+ elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+ optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index eb96fdde87e9..6071675b4bd1 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -4,3 +4,6 @@ DIST vscodium-1.74.0.22342-arm64.tar.gz 114462026 BLAKE2B 56f965056b826868e3c89c
DIST vscodium-1.74.1.22349-amd64.tar.gz 121393633 BLAKE2B e30b7edd966e56f79742bd045e75d02b76d886ea3cc450121e2ad625fc9a2296d78fb652e8a796fe04def3d5a7a56020e658d6f8401a9546366838af2ea26cb5 SHA512 0f05d3e17603cbdd072210f6d725fc3f9b5a03bcd01b0962f5ada48486e5d1caeb222b5c25ba9a5353f2455a282f61ed4af1660b23f7aec5f994c80187682145
DIST vscodium-1.74.1.22349-arm.tar.gz 103433677 BLAKE2B 820b1363f5814549c13f2c15edbd14ac55be7a78f0357ffc3655f3e1b641977da344419865b116e72da1d26be0754e48ef1b8145d9e9c28ffc83f2ce7fef5326 SHA512 69ccef8a618aa9f56ba24720217e7b33fcf42aa8c6ce879c938b1e0a5b7887c9472083ff92b77eb95fad6c29ed5722d9113c55fde120a92d35c7d3fb51bdd11d
DIST vscodium-1.74.1.22349-arm64.tar.gz 114469077 BLAKE2B 3751a2a25d32917fd71e782a168638ecd387ccd41ab62e79d3b5dfb49b5e169e1030df72ee2551c75fc8add434791497d13020b8bf96addb403f18ff0829b5ff SHA512 16f6c09762773ab4ac695c97f9458464ecdcb30f06023122e94278758424fd127d0921779e6f04e496cd004994b1996b276812eb11423d08fb4060fee60df4ed
+DIST vscodium-1.74.2.22355-amd64.tar.gz 121392747 BLAKE2B c94de3bb8f0bce582aa0dc983f6215be2a0c21676e57a0a9eed63f667708f2ed3694f84041c9e6a4aeaf6aa6c86d3ca8d9801358af93a127ec7b12ccf2b07870 SHA512 b1e6bac2a3d08a903a2906f0b514e64e44a50d6be1318214431a3d851010c724dcb7e1e28a1e01ab7e09fdf486cbf667040e4b80084a0be62125c814160326e7
+DIST vscodium-1.74.2.22355-arm.tar.gz 103437753 BLAKE2B 215a7bc9e5f5137742885b3bb06e3e45fbc6b9c267b1653db04ee746e69794ba2be789c59322e80a486a63c38744cd471c0a9b3b0ce1a52222e4d86e2f38a16b SHA512 c556b7e0413c0e4af098c8f5443cbe3c58a4a7ede8b5fe5dadb8f1faa97413c006a430702ad93002950584ca94d10cdd22465e7f37de6b1bb8af1f430644a505
+DIST vscodium-1.74.2.22355-arm64.tar.gz 114464524 BLAKE2B 3c2e166ef1bee641c3082267fe62ae80858c044f5aae62c656c95288282174e81a3961465b45222fe3dd97abfdb2a4e81c2969e0e0d95981c783dbebf23266b0 SHA512 6b956d286a6a335bd87b321b353f5e857844c6ab8b45bfeb141cd49ab0d42d62f3d857270001ebd77eef81dbdd53671c8de84861e61b87186533580f7e00e5b1
diff --git a/app-editors/vscodium/vscodium-1.74.2.22355.ebuild b/app-editors/vscodium/vscodium-1.74.2.22355.ebuild
new file mode 100644
index 000000000000..64ee4a6f829e
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.74.2.22355.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+ amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
+ arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
+ arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
+"
+
+RESTRICT="strip bindist"
+
+LICENSE="
+ Apache-2.0
+ BSD
+ BSD-1
+ BSD-2
+ BSD-4
+ CC-BY-4.0
+ ISC
+ LGPL-2.1+
+ MIT
+ MPL-2.0
+ openssl
+ PYTHON
+ TextMate-bundle
+ Unlicense
+ UoI-NCSA
+ W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND="
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
+ app-crypt/libsecret[crypt]
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/mesa
+ net-print/cups
+ sys-apps/util-linux
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libxshmfence
+ x11-libs/pango
+"
+
+QA_PREBUILT="
+ /opt/vscode/bin/code-tunnel
+ /opt/vscodium/chrome_crashpad_handler
+ /opt/vscodium/chrome-sandbox
+ /opt/vscodium/codium
+ /opt/vscodium/libEGL.so
+ /opt/vscodium/libffmpeg.so
+ /opt/vscodium/libGLESv2.so
+ /opt/vscodium/libvk_swiftshader.so
+ /opt/vscodium/libvulkan.so*
+ /opt/vscodium/resources/app/extensions/*
+ /opt/vscodium/resources/app/node_modules.asar.unpacked/*
+ /opt/vscodium/swiftshader/libEGL.so
+ /opt/vscodium/swiftshader/libGLESv2.so
+"
+
+S="${WORKDIR}"
+
+src_install() {
+ # Cleanup
+ rm "${S}/resources/app/LICENSE.txt" || die
+
+ # Disable update server
+ sed -i "/updateUrl/d" "${S}"/resources/app/product.json || die
+
+ # Install
+ pax-mark m codium
+ insinto "/opt/${PN}"
+ doins -r *
+ fperms +x /opt/${PN}/{,bin/}codium
+ fperms +x /opt/${PN}/chrome_crashpad_handler
+ fperms 4711 /opt/${PN}/chrome-sandbox
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
+ fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+ fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
+ dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
+ dosym "../../opt/${PN}/bin/codium" "usr/bin/codium"
+ domenu "${FILESDIR}/vscodium.desktop"
+ domenu "${FILESDIR}/vscodium-url-handler.desktop"
+ domenu "${FILESDIR}/vscodium-wayland.desktop"
+ domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
+ newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "When compared to the regular VSCode, VSCodium has a few quirks"
+ elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+ optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
+}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r13.ebuild b/app-editors/xemacs/xemacs-21.5.34-r13.ebuild
new file mode 100644
index 000000000000..d257f4c26662
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r13.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=8
+
+inherit flag-o-matic xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="https://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-$(ver_cut 1-2)/${P}.tar.gz
+ neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+ berkdb? ( >=sys-libs/db-4:= !!=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
+ >=sys-libs/zlib-1.1.4
+ >=dev-libs/openssl-0.9.6:0=
+ >=media-libs/audiofile-0.2.3
+ gpm? ( >=sys-libs/gpm-1.19.6 )
+ postgres? ( dev-db/postgresql:= )
+ ldap? ( net-nds/openldap:= )
+ alsa? ( media-libs/alsa-lib )
+ nas? ( media-libs/nas )
+ X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+ dnd? ( x11-libs/dnd )
+ motif? ( >=x11-libs/motif-2.3:0[xft=] )
+ athena? ( x11-libs/libXaw )
+ Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
+ xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+ neXt? ( x11-libs/neXtaw )
+ xface? ( media-libs/compface )
+ tiff? ( media-libs/tiff:= )
+ png? ( >=media-libs/libpng-1.2:0 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ freewnn? ( app-i18n/freewnn )
+ >=sys-libs/ncurses-5.2:=
+ >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+ mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+ default_src_unpack
+}
+
+src_prepare() {
+ use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+ find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+ eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
+ eapply "${FILESDIR}/${P}-gcc5.patch"
+ eapply "${FILESDIR}/${P}-glibc-macro.patch"
+ eapply "${FILESDIR}/${P}-as-needed.patch"
+ eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+ eapply "${FILESDIR}/${P}-ar.patch"
+ eapply "${FILESDIR}/${P}-strsignal.patch"
+ eapply "${FILESDIR}/${P}-process-test-qa.patch"
+ eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
+ eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch"
+ eapply "${FILESDIR}/${P}-module-autoloads.patch"
+
+ eapply_user
+
+ # Some binaries and man pages are installed under suffixed names
+ # to avoid collions with their GNU Emacs counterparts (see below).
+ # Fix internal filename references.
+ sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+ sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+ sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+}
+
+src_configure() {
+ local myconf=""
+
+ # bug #639642
+ test-flags -no-pie >/dev/null && append-flags -no-pie
+ filter-flags -pie
+
+ if use X; then
+
+ myconf="${myconf} --with-widgets=athena"
+ myconf="${myconf} --with-dialogs=athena"
+ myconf="${myconf} --with-menubars=lucid"
+ myconf="${myconf} --with-scrollbars=lucid"
+ if use motif ; then
+ myconf="--with-widgets=motif"
+ myconf="${myconf} --with-dialogs=motif"
+ myconf="${myconf} --with-scrollbars=motif"
+ myconf="${myconf} --with-menubars=lucid"
+ fi
+ if use athena or use Xaw3d ; then
+ myconf="--with-scrollbars=athena"
+ fi
+
+ if use Xaw3d; then
+ myconf="${myconf} --with-athena=3d"
+ elif use neXt; then
+ myconf="${myconf} --with-athena=next"
+ else
+ myconf="${myconf} --with-athena=xaw"
+ fi
+
+ use dnd && myconf="${myconf} --with-dragndrop"
+
+ myconf="${myconf} $(use_with tiff )"
+ myconf="${myconf} $(use_with png )"
+ myconf="${myconf} $(use_with jpeg )"
+ myconf="${myconf} $(use_with xface )"
+
+ use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
+ myconf="${myconf} --with-xft=no"
+
+ else
+ myconf="${myconf}
+ --without-x
+ --without-xpm
+ --without-dragndrop
+ --with-xft=no
+ --with-gif=no"
+ fi
+
+ if use mule ; then
+ myconf="${myconf} --with-mule"
+
+ if use xim ; then
+ if use motif ; then
+ myconf="${myconf} --with-xim=motif"
+ else
+ myconf="${myconf} --with-xim=xlib"
+ fi
+ else
+ myconf="${myconf} --with-xim=no"
+ fi
+
+ myconf="${myconf} $(use_with freewnn wnn )"
+ fi
+
+ # This determines the type of sounds we are playing
+ local soundconf="native"
+
+ # This determines how these sounds should be played
+ use nas && soundconf="${soundconf},nas"
+ use alsa && soundconf="${soundconf},alsa"
+
+ myconf="${myconf} --with-sound=${soundconf}"
+
+ if use gdbm || use berkdb ; then
+ use gdbm && mydb="gdbm"
+ use berkdb && mydb="${mydb},berkdb"
+
+ myconf="${myconf} --with-database=${mydb}"
+ else
+ myconf="${myconf} --without-database"
+ fi
+
+ use debug && myconf="${myconf} --with-debug" ||
+ myconf="${myconf} --with-optimization --with-cflags-debugging="
+
+ econf ${myconf} \
+ $(use_with gif ) \
+ $(use_with gpm ) \
+ $(use_with postgres postgresql ) \
+ $(use_with ldap ) \
+ $(use_with pop ) \
+ --prefix=/usr \
+ --without-canna \
+ --with-ncurses \
+ --with-msw=no \
+ --with-mail-locking=flock \
+ --with-site-lisp=yes \
+ --with-site-modules=yes \
+ --with-system-malloc \
+ --enable-option-checking=no \
+ --with-last-packages=/usr/lib/xemacs
+}
+
+src_compile() {
+ emake EMACSLOADPATH="${S}"/lisp
+}
+
+src_install() {
+ emake prefix="${ED}"/usr \
+ mandir="${ED}"/usr/share/man/man1 \
+ infodir="${ED}"/usr/share/info \
+ libdir="${ED}"/usr/$(get_libdir) \
+ datadir="${ED}"/usr/share \
+ install
+
+ # Rename some applications installed in bin so that it is clear
+ # which application installed them and so that conflicting
+ # packages (emacs) can't clobber the actual applications.
+ # Addresses bug #62991.
+ for i in b2m ctags etags gnuclient gnudoit gnuattach; do
+ mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+ done
+
+ # rename man pages
+ for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+ mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+ done
+
+ # install base packages directories
+ dodir /usr/lib/xemacs/xemacs-packages/
+ dodir /usr/lib/xemacs/site-packages/
+ dodir /usr/lib/xemacs/site-modules/
+ dodir /usr/lib/xemacs/site-lisp/
+
+ if use mule;
+ then
+ dodir /usr/lib/xemacs/mule-packages
+ fi
+
+ # remove extraneous info files
+ cd "${ED}"/usr/share/info
+ rm -f dir info.info texinfo* termcap* standards*
+
+ cd "${S}"
+ dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+ newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+ domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+ eselect emacs update ifunset
+ eselect gnuclient update ifunset
+ xdg_desktop_database_update
+
+ einfo "If you are upgrading from XEmacs 21.4 you should note the following"
+ einfo "incompatibilities:"
+ einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+ einfo "- The X resource class has changed from Emacs to XEmacs,"
+ einfo " settings in your .Xdefaults file should be updated accordingly."
+
+ if use xft;
+ then
+ einfo "You have enabled Xft font support. Xft requires font names to be provided"
+ einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+ fi
+}
+
+pkg_postrm() {
+ eselect emacs update ifunset
+ eselect gnuclient update ifunset
+ xdg_desktop_database_update
+}
diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index 2cfa5ff7eba1..c164858b40dd 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild
@@ -4,7 +4,7 @@
# Note: xemacs currently does not work with position independent code
# so the build forces the use of the -no-pie option
-EAPI=7
+EAPI=8
inherit flag-o-matic xdg-utils desktop
@@ -62,14 +62,6 @@ src_unpack() {
src_prepare() {
use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
- # eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
- # eapply "${FILESDIR}/${P}-gcc5.patch"
- # eapply "${FILESDIR}/${P}-glibc-macro.patch"
- # eapply "${FILESDIR}/${P}-as-needed.patch"
- # eapply "${FILESDIR}/${P}-configure-libc-version.patch"
- # eapply "${FILESDIR}/${P}-ar.patch"
- # eapply "${FILESDIR}/${P}-strsignal.patch"
- # eapply "${FILESDIR}/${P}-process-test-qa.patch"
eapply_user
@@ -166,7 +158,7 @@ src_configure() {
fi
use debug && myconf="${myconf} --with-debug" ||
- myconf="${myconf} --with-optimization"
+ myconf="${myconf} --with-optimization --with-cflags-debugging="
econf ${myconf} \
$(use_with gif ) \
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d0f73098282c..8fde2f5d9a2b 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/bind-chord/bind-chord-2.4.4.ebuild b/app-emacs/bind-chord/bind-chord-2.4.4.ebuild
index db00c8122d1b..e37bf47db113 100644
--- a/app-emacs/bind-chord/bind-chord-2.4.4.ebuild
+++ b/app-emacs/bind-chord/bind-chord-2.4.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/use-package-${PV}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
app-emacs/bind-key
diff --git a/app-emacs/bind-key/bind-key-2.4.4.ebuild b/app-emacs/bind-key/bind-key-2.4.4.ebuild
index 5375860de36c..5b5cc8256a7b 100644
--- a/app-emacs/bind-key/bind-key-2.4.4.ebuild
+++ b/app-emacs/bind-key/bind-key-2.4.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/use-package-${PV}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/citeproc-el/Manifest b/app-emacs/citeproc-el/Manifest
index 385d6a355b8d..e627231eca69 100644
--- a/app-emacs/citeproc-el/Manifest
+++ b/app-emacs/citeproc-el/Manifest
@@ -1 +1,2 @@
DIST citeproc-el-0.9.1.tar.gz 108702 BLAKE2B 409548f50baa37c03906d3435569b8f75d8f0238b2d463e22ab0428a0536c6b12e2bf723a8fc4684fae17b31a9d46121d0ebcfd3cd03ada5b0838c8f0e042106 SHA512 6eab58576b4f851f44b45e444ee43a9022651dd322efa77b6162db0906a8cace70458b0a1431ed3d995d480d38944bafc13e76e04e5a310e8c14ffc28888953f
+DIST citeproc-el-0.9.2.tar.gz 109024 BLAKE2B 0687145f2f5dbef5926add7e97794d2ec4895db01df5710c621221de392eeebaa724bf0c69394e82e223b9cc44bca3078fe510a58365c67d4f84450ad3c5c238 SHA512 d3bffcebd9409c879bb3406b7d2cb95f93417872ef9fdb084adff8d06b7f3e7c52e6de2a78a78a7cea4b9410a13bdc70c7f8f3808186299fa01ca8ce992cdf4e
diff --git a/app-emacs/citeproc-el/citeproc-el-0.9.2.ebuild b/app-emacs/citeproc-el/citeproc-el-0.9.2.ebuild
new file mode 100644
index 000000000000..b59dcf28c0e8
--- /dev/null
+++ b/app-emacs/citeproc-el/citeproc-el-0.9.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26
+
+inherit elisp
+
+DESCRIPTION="CSL 1.0.2 Citation Processor for Emacs"
+HOMEPAGE="https://github.com/andras-simonyi/citeproc-el"
+SRC_URI="https://github.com/andras-simonyi/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-editors/emacs-26:*[libxml2]
+ app-emacs/dash
+ app-emacs/f
+ app-emacs/parsebib
+ app-emacs/queue
+ app-emacs/s
+ app-emacs/string-inflection
+"
+BDEPEND="
+ ${RDEPEND}
+ test? (
+ app-emacs/ht
+ app-emacs/yaml
+ )
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} -L . -L test \
+ -l citeproc-test-human.el \
+ -l test/citeproc-test-int-biblatex.el \
+ -l test/citeproc-test-int-formatters.el \
+ -f ert-run-tests-batch-and-exit || die
+}
diff --git a/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild b/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
index c98be895bfb4..d3eaa3b2efde 100644
--- a/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
+++ b/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${H}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
PATCHES=( "${FILESDIR}"/${PN}-company-icons-root.patch )
diff --git a/app-emacs/counsel/counsel-0.13.4.ebuild b/app-emacs/counsel/counsel-0.13.4.ebuild
index fe5b3a0a93e8..e44256ff9581 100644
--- a/app-emacs/counsel/counsel-0.13.4.ebuild
+++ b/app-emacs/counsel/counsel-0.13.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/swiper-${PV}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RESTRICT="test" # Ivy, Swiper and Counsel tests are performed in app-emacs/ivy
RDEPEND="
diff --git a/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild b/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild
index e23d63b3e2c5..af7cee0f4b64 100644
--- a/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild
+++ b/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/emacs-${PN}-${H}
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RESTRICT="test" # tests not in the repository, require "Eask"
DOCS=( CHANGELOG.md README.org etc )
diff --git a/app-emacs/demap/demap-1.4.0.ebuild b/app-emacs/demap/demap-1.4.0.ebuild
index 8e23040b1ed6..d5ef5014c63b 100644
--- a/app-emacs/demap/demap-1.4.0.ebuild
+++ b/app-emacs/demap/demap-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/sawyerjgardner/${PN}.el/-/archive/v${PV}/${PN}.el-v$
S="${WORKDIR}"/${PN}.el-v${PV}
LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"
# "make test" is just a practical check if "demap-open" works, maintainers of
diff --git a/app-emacs/diminish/diminish-0.46_pre20220128.ebuild b/app-emacs/diminish/diminish-0.46_pre20220128.ebuild
index ca948d12b66a..ffd1f83da350 100644
--- a/app-emacs/diminish/diminish-0.46_pre20220128.ebuild
+++ b/app-emacs/diminish/diminish-0.46_pre20220128.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}.el-${H}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DOCS=( README.md )
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.61.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.61.ebuild
index d98741ee668c..55f7d250b64e 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.61.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.61.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit elisp readme.gentoo-r1
+inherit elisp optfeature
DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
@@ -18,5 +18,11 @@ BDEPEND="sys-apps/texinfo"
DOCS="ChangeLog keyword-generation.sh"
ELISP_TEXINFO="${PN}.texi"
SITEFILE="50${PN}-gentoo-1.54.el"
-DOC_CONTENTS="Some optional features may require installation of additional
- packages, like dev-python/docutils-glep for glep."
+
+pkg_postinst() {
+ elisp_pkg_postinst
+ optfeature "ebuild commands support" sys-apps/portage
+ optfeature "additional development tools" dev-util/pkgdev
+ optfeature "ebuild QA utilities" dev-util/pkgcheck
+ optfeature "generating HTML from GLEPs" dev-python/docutils-glep
+}
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
index fac0e127d13f..c38145e974d3 100644
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@@ -1,3 +1,3 @@
-DIST eldev-1.2.1.tar.gz 238318 BLAKE2B 18c75aab3b06254ab1c8fe87c11104977066bc5fddfcd5e11c413e9d2df7458cef55da9349bf1bc68cb126c02addbc7ee2f071c698f8bc1ba1195dbe694a99ba SHA512 88a3750eccd10eccedb2cff1b807d65d8026c07cc1255ba9d562c1ddc662c2c14641cd4053d82574b2007ca1ce1470bd1f2ebc5bcd99207ef7e0749eb6b6f505
DIST eldev-1.2.2.tar.gz 238729 BLAKE2B d1d896033a98ed12c64a90fba828f28794c4196e62007004e14648db3f5bf19a253d50977ba335457793c7e2176857160e684f395429ce4f71ac0a794e10b776 SHA512 b0cdad8b09d019adb9f6c6347e3a3194dc7486e14046ee8d100addbb0e46db23b996237d4008e823a6713c0f55dc7bcb3d6044e3723b95e754e0e121d42beef2
+DIST eldev-1.3.1.tar.gz 259101 BLAKE2B 838c000865c04079c0ca6d03fff0bf3b9a45d1494a9b1d471303769ff21f2bdd99914e188c9fbf450ded8434bab6a5cb40b7c3b8e445f379f32519dda05d94aa SHA512 255f9a8bc68fb625e5ba5cc8f26720f5736ee70f2e08bec1e088e37705576d8d07607f1c365eb4891aa9b8fa422ea034c88e580b7024e3d4548e0fd250c28fa7
DIST eldev-1.3.tar.gz 258781 BLAKE2B cb5b48622d77a3f79dfad7b9acb08705edaf6b9bc9c5086bd8afad515d0cf0f25a504f2c39a0bfa7a7f55d2855d11d993c02a46fbdf57d4f47e7c0530412f057 SHA512 ed7edbc6c2601cd1db669545d9103c632c46d498eb3839fc87003c1bdc2bbf6eac76f996bb3290e5115b8f474afc0d028db740f2c6bcd1b67e0f6174d321fbcd
diff --git a/app-emacs/eldev/eldev-1.2.1.ebuild b/app-emacs/eldev/eldev-1.3.1.ebuild
similarity index 100%
rename from app-emacs/eldev/eldev-1.2.1.ebuild
rename to app-emacs/eldev/eldev-1.3.1.ebuild
diff --git a/app-emacs/elpher/elpher-3.4.2.ebuild b/app-emacs/elpher/elpher-3.4.2.ebuild
index 5697a17cb252..85a0c6189c32 100644
--- a/app-emacs/elpher/elpher-3.4.2.ebuild
+++ b/app-emacs/elpher/elpher-3.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${H}
S="${WORKDIR}"/${PN}-${H}
LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"
DOCS=( ISSUES.org README )
diff --git a/app-emacs/emacs-ansilove/Manifest b/app-emacs/emacs-ansilove/Manifest
new file mode 100644
index 000000000000..af57ae6a6c4c
--- /dev/null
+++ b/app-emacs/emacs-ansilove/Manifest
@@ -0,0 +1 @@
+DIST emacs-ansilove-1.0.1.tar.bz2 17727 BLAKE2B 708497e4163bad664a7208ce027ea9222a75b8ddecbed5f4d24619efe5c0f65d6f40c6ca592bbc7676207b9d5f6fa83883154b0624b8919d42458d09b595c58f SHA512 a1f472f3b2ea5bb3c6221afd0d84c18f174d24992865fe689166ae6d8c6099bdbbfa38bee639d0a22c16cded8047ae808143e855a9624943eb59a3f35676a9a9
diff --git a/app-emacs/emacs-ansilove/emacs-ansilove-1.0.1.ebuild b/app-emacs/emacs-ansilove/emacs-ansilove-1.0.1.ebuild
new file mode 100644
index 000000000000..290a0c7ba03f
--- /dev/null
+++ b/app-emacs/emacs-ansilove/emacs-ansilove-1.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Display buffers as PNG images using ansilove in GNU Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-ansilove/"
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+ >=app-editors/emacs-${NEED_EMACS}[imagemagick]
+ media-gfx/ansilove
+ media-gfx/imagemagick[png]
+"
+
+src_compile() {
+ emake EMACS="${EMACS}" compile
+}
+
+src_install() {
+ dodoc "${S}"/extras/ansi/logo.ans README.md logo.png
+ elisp-install ${PN} src/*.el{,c}
+ elisp-site-file-install "${S}"/extras/gentoo/50ansilove-gentoo.el
+}
diff --git a/app-emacs/emacs-ansilove/emacs-ansilove-9999.ebuild b/app-emacs/emacs-ansilove/emacs-ansilove-9999.ebuild
new file mode 100644
index 000000000000..290a0c7ba03f
--- /dev/null
+++ b/app-emacs/emacs-ansilove/emacs-ansilove-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Display buffers as PNG images using ansilove in GNU Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-ansilove/"
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+ >=app-editors/emacs-${NEED_EMACS}[imagemagick]
+ media-gfx/ansilove
+ media-gfx/imagemagick[png]
+"
+
+src_compile() {
+ emake EMACS="${EMACS}" compile
+}
+
+src_install() {
+ dodoc "${S}"/extras/ansi/logo.ans README.md logo.png
+ elisp-install ${PN} src/*.el{,c}
+ elisp-site-file-install "${S}"/extras/gentoo/50ansilove-gentoo.el
+}
diff --git a/app-emacs/emacs-ansilove/metadata.xml b/app-emacs/emacs-ansilove/metadata.xml
new file mode 100644
index 000000000000..c0785c1f9d2e
--- /dev/null
+++ b/app-emacs/emacs-ansilove/metadata.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ This package provides some integration with the ansilove tool, which is a
+ ANSI and ASCII art to PNG converter.
+
+
+
+ xgqt@riseup.net
+ Maciej BarÄ
+
+ https://gitlab.com/xgqt/emacs-ansilove/-/issues/
+ xgqt/emacs-ansilove
+
+
diff --git a/app-emacs/emacs-el-fetch/Manifest b/app-emacs/emacs-el-fetch/Manifest
new file mode 100644
index 000000000000..cf940a518fac
--- /dev/null
+++ b/app-emacs/emacs-el-fetch/Manifest
@@ -0,0 +1 @@
+DIST emacs-el-fetch-3.2.1.tar.bz2 18093 BLAKE2B b09d9bb77834f77597e92115f5055b0f17fa466ec695b5e8855cbc445ae2fda00f9a951a8b45b43e12eaf0846b7e2e3533091e9b2a879b2220edaeb40050029d SHA512 c46713d1d51c55715d7ffc165d89b5ae56a7f93aea894111da24547d02ed0c8cf3bc9c2deaa5a9a762ac5d699a6558b6215c55c207413d25bbfe52624ba86148
diff --git a/app-emacs/emacs-el-fetch/emacs-el-fetch-3.2.1.ebuild b/app-emacs/emacs-el-fetch/emacs-el-fetch-3.2.1.ebuild
new file mode 100644
index 000000000000..cbe834002bf1
--- /dev/null
+++ b/app-emacs/emacs-el-fetch/emacs-el-fetch-3.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Show system information in Neofetch-like style inside Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-el-fetch/"
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/buttercup )"
+
+src_compile() {
+ emake compile
+}
+
+src_install() {
+ einstalldocs
+ elisp-install ${PN} "${S}"/src/el-fetch/*.el{,c}
+ elisp-site-file-install "${S}"/extras/gentoo/50el-fetch-gentoo.el
+}
diff --git a/app-emacs/emacs-el-fetch/emacs-el-fetch-9999.ebuild b/app-emacs/emacs-el-fetch/emacs-el-fetch-9999.ebuild
new file mode 100644
index 000000000000..cbe834002bf1
--- /dev/null
+++ b/app-emacs/emacs-el-fetch/emacs-el-fetch-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Show system information in Neofetch-like style inside Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-el-fetch/"
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/buttercup )"
+
+src_compile() {
+ emake compile
+}
+
+src_install() {
+ einstalldocs
+ elisp-install ${PN} "${S}"/src/el-fetch/*.el{,c}
+ elisp-site-file-install "${S}"/extras/gentoo/50el-fetch-gentoo.el
+}
diff --git a/app-emacs/emacs-el-fetch/metadata.xml b/app-emacs/emacs-el-fetch/metadata.xml
new file mode 100644
index 000000000000..6bdc4f73ca31
--- /dev/null
+++ b/app-emacs/emacs-el-fetch/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+
+
+ xgqt@riseup.net
+ Maciej BarÄ
+
+ https://gitlab.com/xgqt/emacs-el-fetch/-/issues/
+ xgqt/emacs-el-fetch
+
+
diff --git a/app-emacs/emacs-websearch/Manifest b/app-emacs/emacs-websearch/Manifest
new file mode 100644
index 000000000000..2c55ae214d8c
--- /dev/null
+++ b/app-emacs/emacs-websearch/Manifest
@@ -0,0 +1 @@
+DIST emacs-websearch-2.0.1.tar.bz2 93918 BLAKE2B ec7a1c03b8b04d6fd48f56a774e69d962536fb7add843533b554099349638e4223ceb2cf37f89d68589292efe6388b4bce9b31b9100b73ced0dbc540cf8fcc21 SHA512 c6815be855b887943315f96e880a566b38c91da3c88b6077c3845d96aa35c0ea33af32ae9224f9efeb8d8b49c0cbb5bc08dfaade1659d1fc85ed44aecaa371ff
diff --git a/app-emacs/emacs-websearch/emacs-websearch-2.0.1.ebuild b/app-emacs/emacs-websearch/emacs-websearch-2.0.1.ebuild
new file mode 100644
index 000000000000..8a88f1199ed5
--- /dev/null
+++ b/app-emacs/emacs-websearch/emacs-websearch-2.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Query search engines from Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-websearch/"
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DOCS=( README.md logo.png )
+
+src_install() {
+ elisp_src_install
+ elisp-site-file-install "${S}"/extras/gentoo/50websearch-gentoo.el
+}
diff --git a/app-emacs/emacs-websearch/emacs-websearch-9999.ebuild b/app-emacs/emacs-websearch/emacs-websearch-9999.ebuild
new file mode 100644
index 000000000000..8a88f1199ed5
--- /dev/null
+++ b/app-emacs/emacs-websearch/emacs-websearch-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Query search engines from Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-websearch/"
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DOCS=( README.md logo.png )
+
+src_install() {
+ elisp_src_install
+ elisp-site-file-install "${S}"/extras/gentoo/50websearch-gentoo.el
+}
diff --git a/app-emacs/emacs-websearch/metadata.xml b/app-emacs/emacs-websearch/metadata.xml
new file mode 100644
index 000000000000..3dc420dbd6ef
--- /dev/null
+++ b/app-emacs/emacs-websearch/metadata.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ The websearch package allows You to query predefined search engines
+ (websearch-custom-engines) with interactive selection. The query terms can
+ either be extracted form selection, kill-ring or typed on demand.
+
+
+
+
+ xgqt@riseup.net
+ Maciej BarÄ
+
+ https://gitlab.com/xgqt/emacs-websearch/-/issues/
+ xgqt/emacs-websearch
+
+
diff --git a/app-emacs/engrave-faces/Manifest b/app-emacs/engrave-faces/Manifest
new file mode 100644
index 000000000000..df925ebb1de9
--- /dev/null
+++ b/app-emacs/engrave-faces/Manifest
@@ -0,0 +1 @@
+DIST engrave-faces-0.3.1.tar.gz 23748 BLAKE2B e58e8a0c03c80682c6d1a69f00148d61fa23ae5df1bf87604e2e259e436f2fe3dafe26dd49aaf520fb8779e4171a609f54442cfcdfd2b608f2d896527a3b230b SHA512 97303d9324013028feda5d357004315536733f2f605995b5cdb69b22a955e030654b8e1595bc80b9070a22e280c3be3f44cbe1e74c12bd5e6d7066e884fc59ce
diff --git a/app-emacs/engrave-faces/engrave-faces-0.3.1.ebuild b/app-emacs/engrave-faces/engrave-faces-0.3.1.ebuild
new file mode 100644
index 000000000000..52f2efb4ab39
--- /dev/null
+++ b/app-emacs/engrave-faces/engrave-faces-0.3.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Convert font-lock faces to other formats"
+HOMEPAGE="https://github.com/tecosaur/engrave-faces/"
+SRC_URI="https://github.com/tecosaur/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/engrave-faces/files/50engrave-faces-gentoo.el b/app-emacs/engrave-faces/files/50engrave-faces-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/engrave-faces/files/50engrave-faces-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/engrave-faces/metadata.xml b/app-emacs/engrave-faces/metadata.xml
new file mode 100644
index 000000000000..91d9312e75dc
--- /dev/null
+++ b/app-emacs/engrave-faces/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ This package aims to produce a versatile generic core which can process a
+ fontified buffer and elegantly pass the data to any number of backends
+ which can deal with specific output formats.
+
+
+
+ https://github.com/tecosaur/engrave-faces/issues/
+ tecosaur/engrave-faces
+
+
diff --git a/app-emacs/epl/epl-0.9-r2.ebuild b/app-emacs/epl/epl-0.9-r2.ebuild
index ab77384670c6..a1fc793839b1 100644
--- a/app-emacs/epl/epl-0.9-r2.ebuild
+++ b/app-emacs/epl/epl-0.9-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cask/epl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-emacs/flycheck/flycheck-32_p20210825.ebuild b/app-emacs/flycheck/flycheck-32_p20210825.ebuild
index 2f6ead369883..652f7f4670fe 100644
--- a/app-emacs/flycheck/flycheck-32_p20210825.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20210825.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 arm64"
RESTRICT="test" # test requires cask and ert-runner which are not packaged yet
RDEPEND=">=app-emacs/dash-2.12.1
diff --git a/app-emacs/helm/helm-3.9.0.ebuild b/app-emacs/helm/helm-3.9.0.ebuild
index 59c678741fd3..e48c31ab585e 100644
--- a/app-emacs/helm/helm-3.9.0.ebuild
+++ b/app-emacs/helm/helm-3.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
app-emacs/async
diff --git a/app-emacs/ivy/ivy-0.13.4.ebuild b/app-emacs/ivy/ivy-0.13.4.ebuild
index 910a40158220..03ac85ecd099 100644
--- a/app-emacs/ivy/ivy-0.13.4.ebuild
+++ b/app-emacs/ivy/ivy-0.13.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/swiper-${PV}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="sys-apps/texinfo"
diff --git a/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild b/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild
index 9df5d5964aff..23538d1182f4 100644
--- a/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild
+++ b/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${H}
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DOCS=( README.md )
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/marginalia/Manifest b/app-emacs/marginalia/Manifest
index c6beab2e5544..8c1abea46b53 100644
--- a/app-emacs/marginalia/Manifest
+++ b/app-emacs/marginalia/Manifest
@@ -1,3 +1,3 @@
-DIST marginalia-0.13.tar.gz 28803 BLAKE2B 396656d93ee85d0b4ad216c2b27de5f2415ae0b54198eacf327eb035f4753a74389734353dd19913f6778d4cf9bfd82b1ee359105d7527d95fe9675afa368655 SHA512 08c6fd3ff744c3112e76a44786d5422b04d0fdf3e08342b1903578b80922df28b2fadd8f0af612f32dfd9c607786c12b6508b6996acbc671ba4d542c9a67d52b
DIST marginalia-0.14.tar.gz 28890 BLAKE2B 801f9c6a83f564f74a03466b1de0a9d7403d7c0d3fcbb597a3f6f824f3156f44d4267623bc21ab7c2e8f6ef6363add730c8dfe5dbbe5b050240a32ae8f14753c SHA512 efc98387572df01b9a45133587023ce33654a4f8c87d33ccd55ad42a26c6bb2418d388995167b2bdb3276c6f961100f12774743670933467dfdc8060beeeafe8
DIST marginalia-0.15.tar.gz 28952 BLAKE2B 80d89d0dad5d3c4494dfbe888763f3e1712ae575ee5e5d392ca4b0691ea3fcfa8b1da9ada6afe75f7e936e1d9d46b32e13b541ac7521fbd009f5ef5322e9b3cc SHA512 bdd06de527a3d5849c776a55c704a8c41c086a5bc4d69f980194484f6f7aa3202b0dec8ffccaa0de5e7c54d1d93476d6d5fdb66c62a507cbe368696e4a0ee84c
+DIST marginalia-1.0.tar.gz 29142 BLAKE2B 99048ebca2156981aa77eb10bbd914648932bfc328f41abdda8196361542e7550895f5263b04a239fca3ef79a2cc87ff7e9a9d315ab46ef6d87846117a325cd5 SHA512 82b7220bce1d8804be9a4783518f4492d66e039a50c0fb064bbfe18acf119600a9f3c9cc2dede038b390c4522c1163ea1982e9f3f8a3f170c0f4f86ef1ec87d5
diff --git a/app-emacs/marginalia/marginalia-0.13.ebuild b/app-emacs/marginalia/marginalia-1.0.ebuild
similarity index 100%
rename from app-emacs/marginalia/marginalia-0.13.ebuild
rename to app-emacs/marginalia/marginalia-1.0.ebuild
diff --git a/app-emacs/orderless/Manifest b/app-emacs/orderless/Manifest
index 9a9acf3577bf..3b21cb3a0bd7 100644
--- a/app-emacs/orderless/Manifest
+++ b/app-emacs/orderless/Manifest
@@ -1 +1,2 @@
DIST orderless-0.7.tar.gz 160435 BLAKE2B bf4c3380b368458fb14c9e851532f3dc591ab3576da1ee26b7232e38eaa2e8e7dc7a18cb46bd005de4e30a47d0395e83fd1e36f38017b0758bca549d3ef853af SHA512 7f3a5781ed5e8787a9b47cae8c9397538434ab508c9638e80e19ef0f074cfd94b2522c3f2bb64f4e8a008f59dc44ea8ddd21b6690c4df1e997c89a921297ed10
+DIST orderless-0.8.tar.gz 161385 BLAKE2B 32c929f9bf26313392f7df62eac45431ee15ecbd23cfad23e0ea4f92930c126df5c940828ad39d4fee2aa1540c3099f0ad12d87f21d800f968f0c21fd2b775d1 SHA512 3c72b35da1d56c4090ac19c672a24d8a9858c0827eb25bf50ca53de9885dc5bfea53afccd5d2e4428e87c7dbdf59dc3cb5236046210f60486aeae12c61821fd9
diff --git a/app-emacs/orderless/orderless-0.8.ebuild b/app-emacs/orderless/orderless-0.8.ebuild
new file mode 100644
index 000000000000..4e2b3347a81c
--- /dev/null
+++ b/app-emacs/orderless/orderless-0.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=26
+
+inherit readme.gentoo-r1 elisp
+
+DESCRIPTION="Completion style that matches multiple regexps in any order"
+HOMEPAGE="https://github.com/oantolin/orderless"
+SRC_URI="https://github.com/oantolin/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Enable orderless completion by placing
+ \"(setq completion-styles '(orderless))\" in your .emacs file."
+ELISP_TEXTINFO="${PN}.texi"
+
+src_compile() {
+ elisp_src_compile
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/org-contrib/Manifest b/app-emacs/org-contrib/Manifest
index d9cb159b7e0b..a273f05ef8ad 100644
--- a/app-emacs/org-contrib/Manifest
+++ b/app-emacs/org-contrib/Manifest
@@ -1,3 +1,3 @@
-DIST org-contrib-0.2.tar.gz 231795 BLAKE2B e8ec122bc87a50ae9b718ab984418a73c6e6734920a208815cac11ecbc2a3897409f3f4d3c0bbbc04f2f4a1a5e657ef35b71e0342156e1b82e2057a6deffdcb8 SHA512 26ce845a9f845ceee2326bd006ff18ef35ba5b1af438d9d02e7f249bf45df293128b24f9f9ff15d7c87271618d1e4ee95d689a96e2104b6dee09ef7b78a6d581
DIST org-contrib-0.3.tar.gz 231094 BLAKE2B e27a6fecdafea3fbe1f50bf525845c48ce88b2bd6cac100c56a2a3113dab1063417c8a507e228a7eb11c7c0a083db0198fff7c713c0ddb6eac74ef9ab9fa485d SHA512 bdab6eea64157480914acb53904b0089c31b354adbc2c5f051deb5bbab9a28fe39026be0b51bb5233da066bf155b98966944b1209d05976729301e96a8e91fa4
+DIST org-contrib-0.4.1.tar.gz 177509 BLAKE2B 4aea73aa21f36d8e655feb78e34545ba962fe82e9516010c2f55c91009fc67ca9ce12c0309174704a2ace7f98401921571b927549bf8c134cdb020e1079898c7 SHA512 e582963ab65fd88cd01013733f497c19a724b9584ae7dec178604377f347f3f8d3aa1e7871ee1ab3903a0fc94baa4ff3ce0c0591c0d5c918aeda1a9a747f9d6b
DIST org-contrib-0.4.tar.gz 177349 BLAKE2B e26e0ae1d82d3ffffc2746d83fa359e7036eb208084f6e7b9deb1a851de347441bedf7cd47e1eaf3b0ec07acf17016b7ec656ea61ac4a2e88ba7dc221cfb1146 SHA512 cc89a53ba342addb3d508a290cf7c734a6efef2f119c05c85db14177c0b5976ccfe263aac23003328992f71f9223851a5ab186a5c40d677bf9a9a798997f4abb
diff --git a/app-emacs/org-contrib/org-contrib-0.2.ebuild b/app-emacs/org-contrib/org-contrib-0.2.ebuild
deleted file mode 100644
index b3eb691a59b1..000000000000
--- a/app-emacs/org-contrib/org-contrib-0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="Contributed packages to Org"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="https://git.sr.ht/~bzg/${PN}/archive/release_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-release_${PV}/lisp"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=app-emacs/org-mode-9.5"
-
-DOCS="../README.org"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-contrib/org-contrib-0.4.1.ebuild b/app-emacs/org-contrib/org-contrib-0.4.1.ebuild
new file mode 100644
index 000000000000..e0570dbb3965
--- /dev/null
+++ b/app-emacs/org-contrib/org-contrib-0.4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Contributed packages to Org"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="https://git.sr.ht/~bzg/${PN}/archive/release_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release_${PV}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=app-emacs/org-mode-9.5"
+
+DOCS="../README.org"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/pkg-info/pkg-info-0.6.ebuild b/app-emacs/pkg-info/pkg-info-0.6.ebuild
index b715d3255ceb..6d5a97eaf6ad 100644
--- a/app-emacs/pkg-info/pkg-info-0.6.ebuild
+++ b/app-emacs/pkg-info/pkg-info-0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/emacsorphanage/pkg-info/archive/refs/tags/${PV}.tar.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~x64-macos"
RESTRICT="test" # Tests fail
RDEPEND=">=app-emacs/epl-0.8"
diff --git a/app-emacs/posframe/Manifest b/app-emacs/posframe/Manifest
index fb14f7a3de29..5d1934a3bbf0 100644
--- a/app-emacs/posframe/Manifest
+++ b/app-emacs/posframe/Manifest
@@ -1,3 +1,3 @@
-DIST posframe-1.2.0.tar.gz 79432 BLAKE2B 1de3a52de7c251ba13493c346f3b76f105b38014ae81ceedfe019d854cccc3ddfec876f5aa3684ecfa28588b9c81f8f1457fc161012d3252c0448d12ac4548b9 SHA512 e3f5996ea423bf34105502e4902c1d1f50ca31955007f7a623b9a26efc4d00e5264357ea70b8895a0e9151af14648e57123c0492a531a9e678e1ccf047399f08
DIST posframe-1.3.0.tar.gz 78746 BLAKE2B aea0b4e96d52e2da681c03b971150ba5fc2c1a6a9306ff6fbd5e5d46dd964f0997a598b97bf0a0aa13ebd67da3e05a19fc5ae63b1ec6a0a03d9c082bee2aa34b SHA512 78088f11b7f719b5a3b2163f64a957318c1b9e41929d705629ab48e602642c6e8d63860f7552d8a78a6c294a4fa850f24fade410aabbcf58e8c8711165d19fa8
DIST posframe-1.3.1.tar.gz 78823 BLAKE2B ec5db1a303a1da4ad126985ab962bfc5e19fb870e65a36c7ec0768afd26b05b12fe5ed67da3b0ab19d6bf450f48173edb2324091768f5e1fd7ae33a5ecf379fe SHA512 2310a3f4c694ce6b421cc5bf9cb8f9f3f95e8e4de8f5b5f891084a595672587cb4eca7651eee57c434210a4e936ba469178de0803df2fd8148a86143431c78ed
+DIST posframe-1.3.2.tar.gz 78915 BLAKE2B a9499f6eb6ddfd888a834c020e95e0a990eaff207e8be681e8945d9852c52c8b4e2c37ad3f78bb0714d411594ea8887743c90ccef65049a0c0b5caf1a90457c6 SHA512 6cc8e57455e4427aba8cc0323c2d9e2e191d71aa7d8d1190a86edf9475b01bafd14ab18ec3445f9cc86a0299824955042198c84ba95e63673db310ff1aa7704e
diff --git a/app-emacs/posframe/posframe-1.2.0.ebuild b/app-emacs/posframe/posframe-1.3.2.ebuild
similarity index 100%
rename from app-emacs/posframe/posframe-1.2.0.ebuild
rename to app-emacs/posframe/posframe-1.3.2.ebuild
diff --git a/app-emacs/racket-mode/Manifest b/app-emacs/racket-mode/Manifest
index cb2215442296..d335e4c21a0c 100644
--- a/app-emacs/racket-mode/Manifest
+++ b/app-emacs/racket-mode/Manifest
@@ -2,3 +2,4 @@ DIST racket-mode-0_p20220505.tar.gz 305491 BLAKE2B ca6a6ee6ae9f95f397959d9f0fa97
DIST racket-mode-0_p20220804.tar.gz 308183 BLAKE2B 23ef01773f7bf0a8e44c74217d29d4e6093ce963a8d71a6f6d5227f5a23ab62023dbfa4a3ada97f4d886abdb0b48454344509bdd7cc17a2210bd23a7ca72051a SHA512 9ed5ecb0a38a5421f7103471167339e2a92e78e912ec3416975c91fb0e2526f79cfd38cdf63b60371d7ef5c4ad7087320ef6270eab15eefed80a87aad6a3f626
DIST racket-mode-0_p20220830.tar.gz 308654 BLAKE2B 85f82181fe994c48369c27ae762d1a0c336b155bc28ee8a4a5a52853e57d23f58c47e34e76b4fb103f9f5115bd856d635dac63f0b1955f7baa24e850e7ea7404 SHA512 6b94b839d9f25d4d07fd73e0a291862014d70501e9db2f154d37ef88f449140543344d4ee0072be0f7bf1c8994d82cf2794d512fd30216336ece2be31db4dc5c
DIST racket-mode-1_p20221122.tar.gz 322401 BLAKE2B 8ae447616485d7e9deafe50044d0b0cf73ab93a628b2a536ba67604f7ee9ac7b13beb844c2b25de86c2da4d0f13ad1c92f8fb1be96236cbee7e8efe7607da94a SHA512 e4870cb00e1137cbacedda986ccc61f01a8e86c65d1a87b895a268460583f8671c256f07b2fbd1ede36dcf0d0c2770da00f39692a43b5ccba02f21aafe9a1602
+DIST racket-mode-1_p20221216.tar.gz 322994 BLAKE2B 6a221162f27621dfece9679ab6dfcf4930f55bba366421fbda029a7c808ed919051a4a2728892c75cacd87179c80043b6427ac83b4adfd9371342a4c70a037e0 SHA512 dcb06ea327fac75831ad037768f74b446fa0286f5c90ffcf5d7e279780a64b8e1beaf34c4e220ed8c2ef4ea174998c9502e7188ae365a07762c6bee3566c1e64
diff --git a/app-emacs/racket-mode/racket-mode-1_p20221216.ebuild b/app-emacs/racket-mode/racket-mode-1_p20221216.ebuild
new file mode 100644
index 000000000000..f077fe90ed27
--- /dev/null
+++ b/app-emacs/racket-mode/racket-mode-1_p20221216.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=b2fdf248682364d2a9b8f7e97dd98ed02454d7bb
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
+HOMEPAGE="https://github.com/greghendershott/racket-mode/"
+SRC_URI="https://github.com/greghendershott/${PN}/archive/${H}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-scheme/racket:=[-minimal]"
+BDEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-rkt-source-dir.patch )
+
+DOCS=( CONTRIBUTING.org README.org THANKS.org )
+
+ELISP_TEXINFO="doc/racket-mode.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed "s|@SITEETC@|${SITEETC}/${PN}|" -i racket-util.el || die
+}
+
+src_compile() {
+ elisp_src_compile
+
+ # Equivalent to compiling from Emacs with "racket-mode-start-faster",
+ # because this is installed globally we have to compile it now.
+ ebegin "Compiling Racket source files"
+ find "${S}"/racket -type f -name "*.rkt" -exec raco make -v {} +
+ eend $? "failed to compile Racket source files" || die
+}
+
+src_test() {
+ # Set "PLTUSERHOME" to a safe temp directory to prevent writing to ~.
+ PLTUSERHOME="${T}"/racket-mode/test-racket emake test-racket
+}
+
+src_install() {
+ elisp_src_install
+
+ # Install Racket files
+ insinto "${SITEETC}/${PN}"
+ doins -r racket
+}
diff --git a/app-emacs/swiper/swiper-0.13.4.ebuild b/app-emacs/swiper/swiper-0.13.4.ebuild
index 2f7a22c9eec8..e11bd19a36be 100644
--- a/app-emacs/swiper/swiper-0.13.4.ebuild
+++ b/app-emacs/swiper/swiper-0.13.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/abo-abo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RESTRICT="test" # Ivy, Swiper and Counsel tests are performed in app-emacs/ivy
RDEPEND=">=app-emacs/ivy-${PV}"
diff --git a/app-emacs/system-packages/system-packages-1.1.0.ebuild b/app-emacs/system-packages/system-packages-1.1.0.ebuild
index 0c462895c9ad..a30418ec3208 100644
--- a/app-emacs/system-packages/system-packages-1.1.0.ebuild
+++ b/app-emacs/system-packages/system-packages-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/jabranham/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DOCS=( README.org )
ELISP_REMOVE=".dir-locals.el"
diff --git a/app-emacs/use-package/use-package-2.4.4.ebuild b/app-emacs/use-package/use-package-2.4.4.ebuild
index 754ce7658dfb..d7e20ba99707 100644
--- a/app-emacs/use-package/use-package-2.4.4.ebuild
+++ b/app-emacs/use-package/use-package-2.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jwiegley/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
app-emacs/bind-chord
diff --git a/app-emacs/vertico/Manifest b/app-emacs/vertico/Manifest
index 902ec0774b10..82306ff65606 100644
--- a/app-emacs/vertico/Manifest
+++ b/app-emacs/vertico/Manifest
@@ -1,3 +1,3 @@
-DIST vertico-0.27.tar.gz 43417 BLAKE2B be9fcd53c836e16f6ee3380ed8f727fbc62153a87a759dee7091b959f3ad0a940a6c1fe176a2073db153ae855b42a64ee92f57e7f3be4538c2f8a13606443d06 SHA512 cce90065473cf8440567b591544bf74af71752e476b667d7bc7d77bb83c8d43e38f2170f5e66f4723dfe29e6228d4933be2cb0d899cb8b56843a6a1ecb07f6a3
DIST vertico-0.28.tar.gz 43472 BLAKE2B 4c2771104960ee95ac7dffebecdf30ddfcc42bb91377dbbf27f245e9f93eb392dfa16a9fdd45f34ef739b4f9364cdb3d5c9dca9dd2a111a0008b726bc31df117 SHA512 3844f16184056210cadc755e52d5886c9c6ed0b00278d5c1b0d30e2d13dd8b63215026305e62d69873aaea720aadaeb772b29161d98d2e080b302565bd1f1d4a
DIST vertico-0.29.tar.gz 43682 BLAKE2B fef1ae786c823d7180f1c2d312a5961309d934145029933cc05e09839120bb2f4fcd1dbfad2194bb8613badb49966d1f69eb658397e4e2346ccc46fb228136ff SHA512 6af726ee916090247d003f552470dea6a2348c3ca382e030fe4c3de777c3414ed00a50aa5cdec17de7e59ebd44f5d88d842a284b38be7f9edca9220a1b240da0
+DIST vertico-1.0.tar.gz 43930 BLAKE2B 7418566d03c86c95aeb1969db19359628f04930413b17aaa2113836ee90368bb6df26c6af16a530a2977f3834b56565bbcd304ce362b6387baf9cc812c8b2982 SHA512 ad4e92b1edc5897f37b5ecc0c2f3291cf775afca14a33f1db17878f0560a4a1230513b833b1222f97b92f8711d2178bc30c6ccb55c8d22593f29b01717fd8968
diff --git a/app-emacs/vertico/vertico-0.27.ebuild b/app-emacs/vertico/vertico-1.0.ebuild
similarity index 100%
rename from app-emacs/vertico/vertico-0.27.ebuild
rename to app-emacs/vertico/vertico-1.0.ebuild
diff --git a/app-emacs/which-key/which-key-3.6.0.ebuild b/app-emacs/which-key/which-key-3.6.0.ebuild
index e5243f24d20c..6dbe2520a925 100644
--- a/app-emacs/which-key/which-key-3.6.0.ebuild
+++ b/app-emacs/which-key/which-key-3.6.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/emacs-${P}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DOCS=( README.org img )
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 23f3c4c548fd..9c81af85c590 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
deleted file mode 100644
index 966ea6c08330..000000000000
--- a/app-emulation/aqemu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aqemu-0.9.2.tar.gz 1373465 BLAKE2B 8b2b3ed311f8dd723a0d06ab74659514c6ccda67643c747af832f1677ab86ffcecde3607ead0b3410a310c38a2fe360a5ff187ef86b5953e4f5a5054a862c26c SHA512 9d4808172ee1be82509956560e4d3f9ee349fedd920342146083cc9bc79ef51fc95937c64f20ffb13e2849c577f95f59b5b65271d6e29e2d2e1ec2d1562006ba
diff --git a/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild b/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
deleted file mode 100644
index 6a2be65aaa60..000000000000
--- a/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt5"
-HOMEPAGE="https://sourceforge.net/projects/aqemu"
-SRC_URI="https://github.com/tobimensch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vnc"
-
-RDEPEND="
- app-emulation/qemu
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
- vnc? ( net-libs/libvncserver )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS CHANGELOG README TODO )
-PATCHES=(
- "${FILESDIR}/${PN}-0.9.2-qtbindir.patch"
- "${FILESDIR}/${PN}-0.9.2-include.patch"
- "${FILESDIR}/${PN}-0.9.2-docs.patch"
- "${FILESDIR}/${PN}-0.9.2-crash-fix.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DMAN_PAGE_COMPRESSOR=OFF
- -DWITHOUT_EMBEDDED_DISPLAY=$(usex vnc OFF ON)
- )
-
- cmake_src_configure
-}
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch b/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch
deleted file mode 100644
index ef4c1a146461..000000000000
--- a/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-https://github.com/tobimensch/aqemu/pull/116
-https://bugs.gentoo.org/738020
-
-From dc19121a923c71eed248cd6310b9b06ec0af6abe Mon Sep 17 00:00:00 2001
-From: Moskaliou Nikita <44800696+nikitamos@users.noreply.github.com>
-Date: Sun, 5 Dec 2021 19:36:44 +0300
-Subject: [PATCH] Change widgets names
-
-Several widgets in the src/Main_Window.ui file had the same name ("widget"), for several users AQEMU crashed with SEGFAULT. So, the names were changed and now everything works fine
---- a/src/Main_Window.ui
-+++ b/src/Main_Window.ui
-@@ -226,7 +226,7 @@
-
-
- -
--
-+
-
-
- 24
-@@ -275,9 +275,6 @@
-
- 64
-
--
-- QComboBox::AdjustToMinimumContentsLength
--
-
-
- -
-@@ -294,9 +291,6 @@
-
- 16
-
--
-- QComboBox::AdjustToMinimumContentsLength
--
-
-
-
- 1
-@@ -395,9 +389,6 @@
- 0
-
-
--
-- QComboBox::AdjustToMinimumContentsLength
--
-
-
- -
-@@ -526,9 +517,6 @@
-
- 8
-
--
-- QComboBox::AdjustToMinimumContentsLength
--
-
-
-
- Floppy
-@@ -586,9 +574,6 @@
-
- 8
-
--
-- QComboBox::AdjustToMinimumContentsLength
--
-
-
- -
-@@ -618,9 +603,6 @@
-
- 128
-
--
-- QComboBox::AdjustToMinimumContentsLength
--
-
-
-
- en-us (default)
-@@ -1333,7 +1315,7 @@
-
-
-
-- widget
-+ general_Machine_Sets
- GB_Options
- GB_Audio
- GB_Memory
-@@ -2457,7 +2439,7 @@
-
-
- -
--
-+
-
-
- 6
-@@ -2515,7 +2497,7 @@
-
-
- -
--
-+
-
-
- 6
-@@ -3018,7 +3000,7 @@
- 0
- 0
- 982
-- 32
-+ 22
-
-
-