Sync with portage [Mon Dec 26 07:10:10 MSK 2022].

1 year ago · 394a1982e2
parent 2d85c704c9
commit 394a1982e2
7110 changed files with 64526 additions and 95309 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/cmd5checkpw/Manifest
+++ b/acct-group/cmd5checkpw/Manifest
--- a/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild
+++ b/acct-group/cmd5checkpw/cmd5checkpw-0-r1.ebuild
@ -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
--- a/acct-group/cmd5checkpw/metadata.xml
+++ b/acct-group/cmd5checkpw/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>eike@sf-mail.de</email>
-		<name>Rolf Eike Beer</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/cmd5checkpw/Manifest
+++ b/acct-user/cmd5checkpw/Manifest
--- a/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild
+++ b/acct-user/cmd5checkpw/cmd5checkpw-0-r1.ebuild
@ -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
--- a/acct-user/cmd5checkpw/metadata.xml
+++ b/acct-user/cmd5checkpw/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>eike@sf-mail.de</email>
-		<name>Rolf Eike Beer</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
@ -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
-	!<x11-base/xorg-server-1.20.10
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-"
-BDEPEND="
-	$(vala_depend)
-	>=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
-}
--- 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"
--- 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"
--- 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
--- 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
@ -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 <speechd_types.h>
- #include <spd_audio.h>
-+#include <pthread.h>
- 
- #ifdef __cplusplus
- extern "C" {
--- 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
@ -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 <bernard.cafarelli@gmail.com>
-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 <alsa/asoundlib.h>
- #include <alsa/pcm.h>
- 
-+#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 <spd_audio_plugin.h>
- 
- typedef struct {
--- a/src/audio/libao.c
-+++ b/src/audio/libao.c
-@@ -32,7 +32,11 @@
- #include <glib.h>
- #include <ao/ao.h>
- 
-+#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 <spd_audio_plugin.h>
- 
- /* 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 <pthread.h>
- 
-+#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 <spd_audio_plugin.h>
- 
- typedef struct {
--- a/src/audio/oss.c
-+++ b/src/audio/oss.c
-@@ -39,7 +39,11 @@
- 
- #include <sys/soundcard.h>
- 
-+#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 <spd_audio_plugin.h>
- 
- typedef struct {
--- a/src/audio/pulse.c
-+++ b/src/audio/pulse.c
-@@ -51,7 +51,11 @@
- #include <pulse/simple.h>
- #include <pulse/error.h>
- 
-+#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 <spd_audio_plugin.h>
- 
- 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);
-
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild
@ -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
-}
--- 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"
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-cmdb/Manifest
+++ b/app-admin/ansible-cmdb/Manifest
@ -1 +0,0 @@
-DIST ansible-cmdb-1.30.tar.gz 179165 BLAKE2B 377b182ffd0f7cf6630011f7df82fe1155c0f00a482e91e0d8206eee5aab167eb96dc936b2fbd02c6c80e725b9767f25a02422d538ee7ecf95ad1e9be51fe81a SHA512 e4561976588d6268c6849a4b1656c57d9a0f2db9256b2d2821f9c1a8c23fdb92b843b06bb94b44db565966c209b62da4bb11dfa41319a3b01ea4c7a53dde930f
--- a/app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild
+++ b/app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild
@ -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}]"
--- a/app-admin/ansible-cmdb/metadata.xml
+++ b/app-admin/ansible-cmdb/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">fboender/ansible-cmdb</remote-id>
-		<remote-id type="pypi">ansible-cmdb</remote-id>
-	</upstream>
-</pkgmetadata>
--- 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
--- a/app-admin/awscli/awscli-1.27.33.ebuild
+++ 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
+}
--- a/app-admin/awscli/awscli-1.27.34.ebuild
+++ 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
+}
--- a/app-admin/awscli/awscli-1.27.36.ebuild
+++ 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
+}
--- a/app-admin/awscli/awscli-1.27.37.ebuild
+++ 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
+}
--- 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}
--- a/app-admin/coreboot-utils/Manifest
+++ b/app-admin/coreboot-utils/Manifest
@ -0,0 +1 @@
+DIST coreboot-4.18.tar.xz 57868424 BLAKE2B 981d8c1cf007be15a85d5860dcfcfa6fa637f66438ff4ef6619491aaf0192e622bfbe9608deb13a975d899c94430bc3d1f0eb3a5a3dc6598f49a726b8ff641e1 SHA512 b363850d31074950bc710bd0a47a896a6c6ef23c53d720ae90ec2257697a3eeeb211e163199064b5e532e5b1e86cdecf997276d742435deeaaacfb19b83f4e6d
--- a/app-admin/coreboot-utils/coreboot-utils-4.18.ebuild
+++ 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
+}
--- a/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch
+++ 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
--- a/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch
+++ b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch
@ -0,0 +1,75 @@
+Author: Fabian Groffen <grobian@gentoo.org>
+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 <stdint.h>
+ 
+#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 <sys/io.h>
+ #endif
+#include <sys/io.h>
+ #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 <sys/types.h>
+#include <stdint.h>
+#include <sys/io.h>
+
+ #if defined(__FreeBSD__)
+ #include <sys/types.h>
+ #include <machine/cpufunc.h>
+@@ -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\
--- a/app-admin/coreboot-utils/metadata.xml
+++ b/app-admin/coreboot-utils/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grobian@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
--- a/app-admin/drush/drush-6.7.0-r3.ebuild
+++ b/app-admin/drush/drush-6.7.0-r3.ebuild
@ -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
-}
--- 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
--- a/app-admin/entr/entr-5.0.ebuild
+++ b/app-admin/entr/entr-5.0.ebuild
@ -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
-}
--- a/app-admin/entr/entr-5.1.ebuild
+++ b/app-admin/entr/entr-5.1.ebuild
@ -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
-}
--- 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
--- a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
+++ b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
@ -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
-}
--- a/app-admin/hardinfo/metadata.xml
+++ b/app-admin/hardinfo/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">lpereira/hardinfo</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@ -1 +0,0 @@
-DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6
--- 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
@ -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)
--- a/app-admin/prelude-manager/files/prelude-manager.initd
+++ b/app-admin/prelude-manager/files/prelude-manager.initd
@ -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 $?
-}
--- a/app-admin/prelude-manager/files/prelude-manager.run
+++ b/app-admin/prelude-manager/files/prelude-manager.run
@ -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
--- a/app-admin/prelude-manager/files/prelude-manager.service
+++ b/app-admin/prelude-manager/files/prelude-manager.service
@ -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
--- a/app-admin/prelude-manager/metadata.xml
+++ b/app-admin/prelude-manager/metadata.xml
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		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.
-	</longdescription>
-	<use>
-		<flag name="dbx">Enables Prelude Manager storing Prelude alerts into database through <pkg>dev-libs/libpreludedb</pkg></flag>
-	</use>
-</pkgmetadata>
--- a/app-admin/prelude-manager/prelude-manager-5.2.0-r1.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-5.2.0-r1.ebuild
@ -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/libprelude-6
-	dbx? (
-		>=dev-libs/libpreludedb-5.2.0
-		<dev-libs/libpreludedb-6
-	)
-	geoip? ( dev-libs/libmaxminddb )
-	snmp? ( net-analyzer/net-snmp )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-run.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		$(use_with dbx libpreludedb-prefix)
-		$(use_enable geoip libmaxminddb)
-		$(use_enable snmp snmp)
-		$(use_with tcpd libwrap)
-		$(usex xml '' '--without-xml-prefix')
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rv "${ED}/run" || die "rm failed"
-	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
-	keepdir /var/spool/prelude/prelude-manager{,/failover,/scheduler}
-
-	find "${D}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
--- a/app-admin/puppet/files/puppet.init
+++ b/app-admin/puppet/files/puppet.init
@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
+
+depend() {
+	need localmount
+	use dns logger puppetmaster netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}
--- a/app-admin/puppet/files/tmpfiles.d-2
+++ b/app-admin/puppet/files/tmpfiles.d-2
@ -0,0 +1 @@
+D /run/puppet 0755 puppet puppet -
--- a/app-admin/puppet/puppet-7.21.0-r1.ebuild
+++ b/app-admin/puppet/puppet-7.21.0-r1.ebuild
@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=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
+}
--- 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
--- a/app-admin/radmind/radmind-1.15.3-r1.ebuild
+++ b/app-admin/radmind/radmind-1.15.3-r1.ebuild
@ -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}
-}
--- a/app-admin/sud/sud-1.3-r1.ebuild
+++ b/app-admin/sud/sud-1.3-r1.ebuild
@ -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
-}
--- a/app-admin/sud/sud-1.3-r2.ebuild
+++ 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
+}
--- 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
--- a/app-admin/supervisor/supervisor-4.2.5.ebuild
+++ 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
+}
--- 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
--- a/app-admin/ulogd/files/patches/ulogd.patch
+++ b/app-admin/ulogd/files/patches/ulogd.patch
@ -1,10 +0,0 @@
--- a/src/ulogd.c
-+++ b/src/ulogd.c
-@@ -65,6 +65,7 @@
- #include <sys/time.h>
- #include <sys/stat.h>
- #include <sched.h>
-+#include <limits.h>
- #include <ulogd/conffile.h>
- #include <ulogd/ulogd.h>
- #ifdef DEBUG
--- a/app-admin/ulogd/ulogd-2.0.7-r3.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.7-r3.ebuild
@ -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
-}
--- 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
--- a/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
+++ b/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
@ -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<A>("");
- 
-    return s2x<A>(s);
-+    return s2x<A>(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<std::string> 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 );
--- a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
+++ b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
@ -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
- 
--- a/app-admin/xstow/xstow-1.0.2-r1.ebuild
+++ b/app-admin/xstow/xstow-1.0.2-r1.ebuild
@ -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."
-}
--- a/app-admin/xstow/xstow-1.0.2.ebuild
+++ b/app-admin/xstow/xstow-1.0.2.ebuild
@ -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."
-}
--- 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"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@ -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
-}
--- a/app-arch/bloscpack/Manifest
+++ b/app-arch/bloscpack/Manifest
@ -1 +0,0 @@
-DIST bloscpack-0.16.0.tar.gz 99059 BLAKE2B 415894771d6b987170b6938fd20ad065d30075410ddf021bd6e65e3e02d12bff6f5bb22960cdd186d9e52666a1d934047e0383e5d74016c3ad2ba1eef06cafb6 SHA512 0608c795570961c2dc6ba5a6ea3c8c79b215609c2d141db797429abbceb8ee43843196a2d14fc94797d7df62d562abf5efdae10f093154d5d7a20b3b9bcd85ed
--- a/app-arch/bloscpack/bloscpack-0.16.0.ebuild
+++ b/app-arch/bloscpack/bloscpack-0.16.0.ebuild
@ -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
-}
--- a/app-arch/bloscpack/metadata.xml
+++ b/app-arch/bloscpack/metadata.xml
@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <longdescription lang="en">
-    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.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">bloscpack</remote-id>
-    <remote-id type="github">Blosc/bloscpack</remote-id>
-  </upstream>
-</pkgmetadata>
--- 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 <sys/sysmacros.h>
+#endif
 #include <sys/types.h>
 $3
 ]], [[switch (0) case 0: case (sizeof ($1($2)) == sizeof ($ac_type)):;]])], [AC_CV_NAME=$ac_type])
--- 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
--- a/app-arch/engrampa/engrampa-1.24.2-r1.ebuild
+++ b/app-arch/engrampa/engrampa-1.24.2-r1.ebuild
@ -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
-}
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@ -9,8 +9,6 @@
 		<flag name="caja">Enable engrampa to integrate with
 			<pkg>mate-base/caja</pkg> by providing entries in its context 
 			menu</flag>
-		<flag name="packagekit">Enable support for installing via Packagekit
-			based on archive type</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/engrampa</remote-id>
--- 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
@ -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 <fallert@tf.uni-freiburg.de>
+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
+
--- a/app-arch/pxz/pxz-5.0_pre20220509-r1.ebuild
+++ 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 '/<error.h>/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
+}
--- 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"
--- a/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch
+++ b/app-arch/tarsync/files/tarsync-0.2.1-gcc5.patch
@ -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);
--- a/app-arch/tarsync/files/tarsync-0.2.1-make.patch
+++ b/app-arch/tarsync/files/tarsync-0.2.1-make.patch
@ -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:	
--- a/app-arch/tarsync/files/tarsync-0.2.1-symlink.patch
+++ b/app-arch/tarsync/files/tarsync-0.2.1-symlink.patch
@ -1,139 +0,0 @@
-From 6654d41a14da2fc521e889f01669f0dbb89aef15 Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Tue, 5 Oct 2021 23:21:53 -0700
-Subject: [PATCH] Symlink support
-
-Bug: https://bugs.gentoo.org/815823
-Signed-off-by: Zac Medico <zmedico@gentoo.org>
---
- 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
-
--- 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"
--- 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
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgweb/Manifest
+++ b/app-backup/borgweb/Manifest
@ -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
--- a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
+++ b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
@ -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}]"
--- a/app-backup/borgweb/borgweb-0.3.0.ebuild
+++ b/app-backup/borgweb/borgweb-0.3.0.ebuild
@ -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}]"
--- a/app-backup/borgweb/metadata.xml
+++ b/app-backup/borgweb/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">borgweb</remote-id>
-  </upstream>
-</pkgmetadata>
--- 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
--- 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 )"
--- a/app-backup/burp/burp-3.1.4.ebuild
+++ 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
+}
--- 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
@ -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,
--- 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
+}
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- 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
--- a/app-benchmarks/geekbench/geekbench-5.4.5.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.4.5.ebuild
@ -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 <email address> <license key>"
-}
--- 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"

--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- 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
--- a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
+++ b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
@ -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
-}
--- 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
@ -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 <ctype.h>
- #include <errno.h>
- #include <stdio.h>
- #include <stdarg.h>
-@@ -33,6 +34,7 @@
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <arpa/ftp.h>
-+#include <arpa/inet.h>
- #include <arpa/telnet.h>
- #include <netinet/in.h>
- #include <netdb.h>
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST ansible-cmdb-1.30.tar.gz 179165 BLAKE2B 377b182ffd0f7cf6630011f7df82fe1155c0f00a482e91e0d8206eee5aab167eb96dc936b2fbd02c6c80e725b9767f25a02422d538ee7ecf95ad1e9be51fe81a SHA512 e4561976588d6268c6849a4b1656c57d9a0f2db9256b2d2821f9c1a8c23fdb92b843b06bb94b44db565966c209b62da4bb11dfa41319a3b01ea4c7a53dde930f`
				`@ -0,0 +1 @@`
				`DIST coreboot-4.18.tar.xz 57868424 BLAKE2B 981d8c1cf007be15a85d5860dcfcfa6fa637f66438ff4ef6619491aaf0192e622bfbe9608deb13a975d899c94430bc3d1f0eb3a5a3dc6598f49a726b8ff641e1 SHA512 b363850d31074950bc710bd0a47a896a6c6ef23c53d720ae90ec2257697a3eeeb211e163199064b5e532e5b1e86cdecf997276d742435deeaaacfb19b83f4e6d`
				`@ -1 +0,0 @@`
				`DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6`
				`@ -1 +0,0 @@`
				`DIST bloscpack-0.16.0.tar.gz 99059 BLAKE2B 415894771d6b987170b6938fd20ad065d30075410ddf021bd6e65e3e02d12bff6f5bb22960cdd186d9e52666a1d934047e0383e5d74016c3ad2ba1eef06cafb6 SHA512 0608c795570961c2dc6ba5a6ea3c8c79b215609c2d141db797429abbceb8ee43843196a2d14fc94797d7df62d562abf5efdae10f093154d5d7a20b3b9bcd85ed`