gentoo auto-resync : 08:06:2024 - 00:08:11

8 files changed, 656 insertions, 76 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 6c05de574bbc..f8014971a9f2 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index c56d7d1cb2ff..60887a804ce7 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -1,6 +1,7 @@
 AUX amanda-3.5.1-configure-clang16.patch 657 BLAKE2B f5d3da0eff9f7064b5982b68133bea4425a3ac45dd728a86b26971558cf655828e856800e5baeba0527ece5120906c81e495e1901d83ae98a4322aabbe069e55 SHA512 afe29fad81ab13c75add9f2e4b40233d37bd33f4df98a39ce672cd93fa6bc9f9837a6d1c8a7f287b75215ea6cb76e815ca7819bda3121903fb02ebbcddf67a51
 AUX amanda-3.5.1-fno-common.patch 428 BLAKE2B fcd2a7a2d9a6a121f81676e682606911a30b6077571e7d5aa4acb423e0a2ee50be09847566e4c38ac8a249ea729568b009a51b63ee15d53b4670653359c4f214 SHA512 66ec0c45849dcfd7ed35ace22d72f161995e80c85823eb244928862f199885f796fc7e276f14fadb1e0aace1410761e6c5f2305f8c8712fb880f80db69efa20e
 AUX amanda-3.5.1-tirpc.patch 520 BLAKE2B 9bbc1bc49c04d631920fcb1ab512e9d9343cf28fa811fd85f2911b145de853e69d0ea8c4a87986682297445243a889ab62495a825adecbbf36285a9c15f0e86c SHA512 e2ad07e598ec0de85069d93c66798a13db0a96d7b81701f8827328408b50c7581dc48b04587a0af90b77177723f4029f22b29ac5fc5414da87c264b29ddae739
+AUX amanda-3.5.4-no-ndmp.patch 1368 BLAKE2B d631d2d73a060c323b6abe5ab36581fa6446083674e2bafc6b34f78e64366855baed283c2eedd363159dd2342d1f7e26a35d6b9dace018d60dcfdefc4c221d91 SHA512 ce195e06bbfda1b631da12013cad0283178a5e155e1d5decb14d544acd7b01b024a38dd68a09c8652a1f6ae24acb061f9a49cca178caffdd7f0c043ecaf0da2c
 AUX amanda-amandahosts-client-2.5.1_p3-r1 343 BLAKE2B 9aca710f5a94a4acf625ecc3e78007826797dc74102a8df3f03b0113b15b9dc588a2e82192f0e3a70ffbd51e2be2597a98218c93b316382a978768cf551afa95 SHA512 7c0c4fc6d18b37ee8c11e64f98074b93f52f1bdcb97949648ced82d83ada2ea688f79531efa4c3e596f7390770540f45a7b122bba862cbd5218f1b870594f751
 AUX amanda-amandahosts-server-2.5.1_p3-r1 340 BLAKE2B 67f5de50dcf25204df2ff92b228aa76303ac69b07b31ff373fc644685f278f3e898e4e3a8e43e666ac0b64ebd61a41bb0e73db22d728a9988a93c6ea983ba29f SHA512 b11076634608c16cec4350364d60bcf3d22c12f07c0d8fab53d854e4fb21197eb016fb7f75d8153295ef9f997a3850fcd56b9fe268fa8dde5fd39d9dcbabb08b
 AUX amanda-cron 419 BLAKE2B ecfff0377fd47fb6765fd98310b1c7d16d3caccada79503f8bb6e7ae0685bd08f38f526b32be12dd5c6c7ed71b8ada4e6b6c48ebff8fdc29e08e9fcf77ea0df9 SHA512 93aa1a6bcc66bc5147210bd0dd52ae664064cc708cbe59969a5bc9e783e4972841ad7cb89f3ae111ac7695c42e1b91f727890b8e58c4f8757f08e5eae90fb505
@@ -15,5 +16,7 @@ AUX example_amanda.conf 635 BLAKE2B c02539af8d0692d8ebf80fae47979845a872bd151596
 AUX example_disklist-2.5.1_p3-r1 177 BLAKE2B 3060151252a44a4abf02764c19db8349ea63691495bda0ca2db4112844c5aea60e4f8b13e668d9a9ac3707f4f52407c8639ed8cca353eac72e8ca7d9cf38dcd5 SHA512 43fd73b55d48396e1863b23b20b84781aaa7e38200ee4fdbcb898c9a8c5479e24b8448a68ceac01bd6339202935bbf32f02e70a779ee989eeb368ec88d890ae3
 AUX example_global.conf 1377 BLAKE2B 712a3ce480b2cc5e0e47a168ac178621b1e655e9d9880c278dfd5aad9627db14f1f3f6be410c3abc4ce4bd33b0728db14d7832149c1643929bd1c53f27d2987a SHA512 c432bdfb97ceb1005bc004d12208f90b09d4c41c8562b8bba0f7b43bbe510672038ca1658a764cff7c6f8e56fa1439a7c15c69714773438e602a693a4f8195a5
 DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
+DIST tag-community-3.5.4.tar.gz 3926529 BLAKE2B 9f50786015535007554fcfe974f228e21028860d53a211b89f5da2294dc70314a5dce46a3bdca37e98357402461b59f3952311796818ab8f9556553324bc0c0b SHA512 748491e36776a02a1497ce061588d40dfe6eceb6967b7ea7505c086e084aa1d6f69d8a581b46aa305d17c4e6eba28ba746aa178cb6ab97e1fd96ccdad5910824
 EBUILD amanda-3.5.1-r5.ebuild 15968 BLAKE2B 1135efd4551310690177d7e24619733ef1a187d91664ae62ac14796ef0bf6bf56a3aec94a00c29672971fa8a2c75340f9c77b54f99cee553281da9b93b96ea2a SHA512 f7a1dbb8285aada297e81bb0cbacaf5f426cde5d72a37a11983668ac509ea159be4c7e65916f38694e389f67f453d7c54ebaaf2e92fa01c79de1915e7a049647
-MISC metadata.xml 871 BLAKE2B ebf78f608f917ff892d1034ab68cfce89b89a04a6bdbb3f83e58507358f65071651b7693526cffd7f3c18951d22a43702b8575954f4f0138632186f271943a21 SHA512 36e84c83319616a8c4feeffa5919cec8d983a9b2f4eaae79c06d7030fa8630c112127755cad290a4047ad6f595c6ac3f47d332c45d094c97358f827b7a8410fb
+EBUILD amanda-3.5.4.ebuild 16781 BLAKE2B 75b1ca8b1b52a6cb02d006dbb87e65a19d235afe54dd3372b4d075dc337534e42f32c3419b7f9ef7a5503f724fa60f4f349d2a84c0f512830689093c9d1ecab0 SHA512 d544d589d243f32f5d61901c767da942eda55753225e74b21e947cbddc4d8af646384d45f54dda289c5adb0a2de089a7352e2c2b00abdae12c340fdbcec51ff9
+MISC metadata.xml 924 BLAKE2B 4e9d263db4f0bc312b711db7a93292ab405fa44d631f85bc0438c8e97f171a88574bc4e834ce6ddcb5b8fa455b68193ed4fe096fc6fe914774d7d47c26c601a4 SHA512 4d8fcf205ca63ddfc85b8a2a0428f96b0512ecfc813bcbdd30f8a6350866d6e4ddf4fa6d774bb0605409ad12af652277cf7f171414b2d1fb112663877a09cc14
diff --git a/app-backup/amanda/amanda-3.5.4.ebuild b/app-backup/amanda/amanda-3.5.4.ebuild
new file mode 100644
index 000000000000..d22a6a2365e8
--- /dev/null
+++ b/app-backup/amanda/amanda-3.5.4.ebuild
@@ -0,0 +1,523 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools perl-module systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="https://github.com/zmanda/amanda/archive/refs/tags/tag-community-${PV}.tar.gz"
+
+S="${WORKDIR}/amanda-tag-community-${PV}"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba selinux systemd xfs"
+
+DEPEND="
+	acct-group/amanda
+	acct-user/amanda
+	app-arch/dump
+	app-arch/tar
+	dev-libs/glib:2
+	dev-lang/perl:=
+	dev-perl/Encode-Locale
+	dev-perl/JSON
+	virtual/openssh
+	sys-libs/readline:=
+	app-alternatives/awk
+	kerberos? ( app-crypt/mit-krb5 )
+	ndmp? ( net-libs/libtirpc:= )
+	nls? ( virtual/libintl )
+	samba? ( net-fs/samba:= )
+	s3? ( net-misc/curl )
+	!s3? ( curl? ( net-misc/curl ) )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		app-arch/mt-st:=
+		app-crypt/aespipe
+		app-crypt/gnupg
+		dev-perl/XML-Simple
+		sys-block/mtx
+		virtual/mailx
+		gnuplot? ( sci-visualization/gnuplot )
+	)"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-amanda )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd
+	dev-lang/swig
+	dev-libs/libxslt
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.1-configure-clang16.patch
+	"${FILESDIR}"/${PN}-3.5.4-no-ndmp.patch
+)
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_HOMEDIR
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	AMANDA_GROUP_NAME=amanda
+	AMANDA_USER_NAME=amanda
+	AMANDA_USER_HOMEDIR=/var/spool/amanda
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	: ${AMANDA_SERVER:=${HOSTNAME}}
+	: ${AMANDA_SERVER_TAPE:=${AMANDA_SERVER}}
+	: ${AMANDA_SERVER_TAPE_DEVICE:="${EPREFIX}"/dev/nst0}
+	: ${AMANDA_SERVER_INDEX:=${AMANDA_SERVER}}
+	: ${AMANDA_TAR_LISTDIR:=${AMANDA_USER_HOMEDIR}/tar-lists}
+	: ${AMANDA_CONFIG_NAME:=DailySet1}
+	: ${AMANDA_TMPDIR:="${EPREFIX}"/var/tmp/amanda}
+	: ${AMANDA_DBGDIR:=${AMANDA_TMPDIR}}
+	# These are left empty by default
+	: ${AMANDA_PORTS_UDP:=""}
+	: ${AMANDA_PORTS_TCP:=""}
+	: ${AMANDA_PORTS_BOTH:=""}
+	: ${AMANDA_PORTS:=""}
+
+	# What tar to use
+	: ${AMANDA_TAR:=/bin/tar}
+
+	# Now pull in the old stuff
+	if [[ -f ${EROOT}${ENVDIR}/${ENVDFILE} ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(grep -E "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[[ -n ${currentamanda} ]] && eval $(echo "${currentamanda}")
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [[ ${AMANDA_SERVER} == ${HOSTNAME} ]]; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default
+}
+
+src_prepare() {
+	default
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' gnulib/stdio.in.h || die
+
+	# https://bugs.gentoo.org/701416 sandbox violation
+	sed -i -e 's/case `"$SAMBA_CLIENT.*/case "Connection to nosuchhost.amanda.org failed" in/' \
+		config/amanda/dumpers.m4 || die
+
+	# Generate file-list. Copied from autogen
+	(
+		cd config
+		for m4dir in amanda gettext-macros gnulib macro-archive; do
+			echo "## this file is automatically generated by autogen" > "$m4dir/file-list"
+			for f in $m4dir/*.m4; do echo "EXTRA_DIST += $f" >> "$m4dir/file-list"; done
+		done
+
+		echo "## this file is automatically generated by autogen" > "automake/file-list"
+		for f in automake/*.am; do echo "EXTRA_DIST += $f" >> "automake/file-list"; done
+	)
+
+	# Generate FULL_VERSION. Copied from autogen
+	config/set_full_version
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA}; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-*; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf=()
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf+=( --with-tape-server="${AMANDA_SERVER_TAPE}" )
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf+=( --with-tape-device="${AMANDA_SERVER_TAPE_DEVICE}" )
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf+=( --with-index-server="${AMANDA_SERVER_INDEX}" )
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf+=( --with-user="${AMANDA_USER_NAME}" )
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf+=( --with-group="${AMANDA_GROUP_NAME}" )
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf+=( --with-gnutar="${AMANDA_TAR}" )
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf+=( --with-gnutar-listdir="${AMANDA_TAR_LISTDIR}" )
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf+=( --with-config="${AMANDA_CONFIG_NAME}" )
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf+=( --with-tmpdir="${AMANDA_TMPDIR}" )
+
+	if [[ -n ${AMANDA_PORTS_UDP} && -n ${AMANDA_PORTS_TCP} && -z ${AMANDA_PORTS_BOTH} ]]; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [[ -n ${AMANDA_PORTS_UDP} ]]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf+=( --with-udpportrange="${AMANDA_PORTS_UDP}" )
+	fi
+	if [[ -n ${AMANDA_PORTS_TCP} ]]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf+=( --with-tcpportrange="${AMANDA_PORTS_TCP}" )
+	fi
+	if [[ -n ${AMANDA_PORTS} ]]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf+=( --with-portrange="${AMANDA_PORTS}" )
+	fi
+
+	# Extras
+	# Speed option
+	myconf+=( --with-buffered-dump )
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf+=( --with-debugging )
+	# Where to put our files
+	myconf+=( --localstatedir="${AMANDA_USER_HOMEDIR}" )
+
+	# Samba support
+	myconf+=( $(use_with samba smbclient /usr/bin/smbclient) )
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf+=( --with-bsd-security )
+	myconf+=( --with-ssh-security )
+	myconf+=( --with-bsdudp-security )
+	myconf+=( --with-bsdtcp-security )
+
+	# kerberos-security mechanism version 5
+	myconf+=( $(use_with kerberos krb5-security) )
+
+	# Amazon S3 support
+	myconf+=( $(use_enable s3 s3-device) )
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf+=( $(use_with curl libcurl) )
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal; then
+		myconf+=( --without-server )
+	else
+		# amplot
+		myconf+=( $(use_with gnuplot) )
+	fi
+
+	# IPv6 fun.
+	myconf+=( $(use_with ipv6) )
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf+=( $(use_enable nls) )
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf+=( --with-amperldir="${VENDOR_LIB}" )
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf+=( --disable-syntax-checks )
+
+	# build manpages
+	myconf+=( --enable-manpage-build )
+
+	# Bug #636262
+	myconf+=( $(use_with ndmp ndmp) )
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		--disable-static \
+		$(use_with readline) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[[ -z ${root} ]] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local i le=/usr/libexec/amanda
+	for i in "${le}"/calcsize "${le}"/killpgrp "${le}"/rundump "${le}"/runtar; do
+		[[ -e ${root}/${i} ]] || continue
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
+		chmod u=srwx,g=rx,o= "${root}"/${i} || die
+	done
+
+	# amanda-security.conf is a config file with similar requirements:
+	# writable only by root
+	# world-readable
+	# 3.3.9: introduced in /etc/amanda-security.conf
+	# 3.4.2: moved to /etc/amanda/amanda-security.conf
+	# must be in /etc as all files in /etc/amanda should be owned by amanda user/group
+	f=/etc/amanda-security.conf
+	chown root:root "${root}""${f}" || die
+	chmod u=rw,go=r "${root}""${f}" || die
+}
+
+src_install() {
+	[[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Installing environment config file"
+	newenvd - "${ENVDFILE}" <<- _EOF_
+		# These settings are what was present in the environment when this
+		# Amanda was compiled.  Changing anything below this comment will
+		# have no effect on your application, but it merely exists to
+		# preserve them for your next emerge of Amanda
+		$(cat "${TMPENVFILE}" | sed "s,=\$,='',g")
+	_EOF_
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}"/amanda-cron amanda
+	fi
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym "${AMANDA_USER_HOMEDIR}/.amandahosts" /etc/amanda/amandahosts
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}"/amanda-profile .profile
+
+	insinto /etc/amanda
+	doins example/amanda-client.conf
+	if ! use minimal; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins example/amanda.conf
+		doins example/disklist
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	newtmpfiles - amanda.conf <<- _EOF_
+		d	${AMANDA_TMPDIR}	0700	${AMANDA_USER_NAME}	${AMANDA_GROUP_NAME}
+	_EOF_
+
+	local i
+	for i in /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_USER_HOMEDIR}/amanda" \
+		/etc/amanda
+
+	if ! use minimal; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+			 /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	# move example security file to production location
+	mv "${ED}/etc/amanda/amanda-security.conf" "${ED}/etc/amanda-security.conf"
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${ED}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.6.0_p2-r2 amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${ED}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die
+	mv "${ED}"/usr/share/amanda/example "${ED}"/usr/share/doc/${PF}/ || die
+	docinto example1
+	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
+	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
+	newdoc "${FILESDIR}"/example_global.conf global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	[[ ! -f ${TMPENVFILE} && ${MERGE_TYPE} == "binary" ]] && TMPENVFILE="${EROOT}${ENVDIR}/${ENVDFILE}"
+	[[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [[ -f ${EROOT}/etc/amandates && ! -f ${EROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates ]]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${EROOT}"/etc/amandates "${EROOT}"/etc/amandates.orig || die
+		mkdir -p "${EROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
+		cp -dp "${EROOT}"/etc/amandates "${EROOT}"/${AMANDA_USER_HOMEDIR}/amanda/amandates || die
+	fi
+	if [[ -f ${EROOT}/etc/amandates ]]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${EROOT}"/
+
+	tmpfiles_process amanda.conf
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
diff --git a/app-backup/amanda/files/amanda-3.5.4-no-ndmp.patch b/app-backup/amanda/files/amanda-3.5.4-no-ndmp.patch
new file mode 100644
index 000000000000..71919e8e7877
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.4-no-ndmp.patch
@@ -0,0 +1,32 @@
+diff -ur amanda-tag-community-3.5.4.orig/perl/Makefile.am amanda-tag-community-3.5.4/perl/Makefile.am
+--- amanda-tag-community-3.5.4.orig/perl/Makefile.am	2024-04-13 03:27:58.245243730 -0400
++++ amanda-tag-community-3.5.4/perl/Makefile.am	2024-04-13 02:57:41.721169046 -0400
+@@ -139,8 +139,10 @@
+ libDevice_la_LIBADD = amglue/libamglue.la \
+ 	$(top_builddir)/device-src/libamdevice.la \
+ 	$(top_builddir)/xfer-src/libamxfer.la \
+-	$(top_builddir)/ndmp-src/libndmlib.la \
+ 	$(top_builddir)/common-src/libamanda.la
++if WANT_NDMP
++libDevice_la_LIBADD += $(top_builddir)/ndmp-src/libndmlib.la
++endif
+ Amanda_DATA += Amanda/Device.pm
+ MAINTAINERCLEANFILES += Amanda/Device.c Amanda/Device.pm
+ endif
+diff -ur amanda-tag-community-3.5.4.orig/server-src/Makefile.am amanda-tag-community-3.5.4/server-src/Makefile.am
+--- amanda-tag-community-3.5.4.orig/server-src/Makefile.am	2024-04-13 03:27:58.249243801 -0400
++++ amanda-tag-community-3.5.4/server-src/Makefile.am	2024-04-13 03:28:59.274321715 -0400
+@@ -90,9 +90,12 @@
+ 	libamserver.la               \
+ 	../device-src/libamdevice.la     \
+ 	../xfer-src/libamxfer.la         \
+-	../ndmp-src/libndmlib.la         \
+ 	../common-src/libamanda.la
+ 
++if WANT_NDMP
++LDADD += ../ndmp-src/libndmlib.la
++endif
++
+ libamserver_la_SOURCES=	amindex.c	cmdfile.c \
+ 			diskfile.c	driverio.c	cmdline.c  \
+ 			holding.c	infofile.c	logfile.c	\
diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index 8372298b14c7..1afce8b34304 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -21,5 +21,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">amanda</remote-id>
+		<remote-id type="github">zmanda/amanda</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-backup/rdedup/Manifest b/app-backup/rdedup/Manifest
index da82e2e97552..4a9e413cd823 100644
--- a/app-backup/rdedup/Manifest
+++ b/app-backup/rdedup/Manifest
@@ -1,34 +1,44 @@
 DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
-DIST argparse-0.2.1.crate 18969 BLAKE2B 68e4b5502409b2d2b8d2891164d114bde6b65babca241f8c881b07483dd78b114594c1450c06124f04946022303fa41d8b108122757ff2117ca6be3a0e619ad3 SHA512 f12aea4ddc0d619d40194f8d3db3c4d952521d1dfad6bc21b5b7cf8db91c30f70c5259bd6a0cf40d521e4d0cbaf3e4d59ae0bd40554772c79a4b200ebcfa73fe
+DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
+DIST cc-1.0.99.crate 76961 BLAKE2B d615f647bc5e4f7f580f878fc41baee172e9513f1157d421c491c36af2ca330dde2a6ddd4238c03aae27feed5e8cc042f4b790d7b145952a8676ac553f72e356 SHA512 2f6c9a0869b3b636b011390efade0085ed5fe616ecb33ff586c948779b9c9bea9169cb1c31441b0aeb63dbaa35cdb76b6e67ace38d561e2c150e06853a2b1757
 DIST env_logger-0.3.5.crate 5950 BLAKE2B 89772523b6beaa965be1548a0193d92a0a334e301b23e94bcbd407c1e0d5c31ea999b75fbc48d007529ac7581f92866a654d0fd67cc2df329a1ba1ce53c0fdf6 SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181
-DIST flate2-0.2.17.crate 47795 BLAKE2B d6bcae7d12040f2fdddc33828e7c66ee8de47469c4b808ba10239ad3b31482ddeda0f39678a6660410a3772afc3546c03aa4050ca6f83ac532f051f39b8fe104 SHA512 609f2e3c71e8889ccc3682fa62ecf52a068c1e61040b2e0eebb7b8de7784dd595592bdef34c7a03e0587cb3e4c2e2d8de88eec113122a222676cd4fb7d8cc775
+DIST flate2-0.2.20.crate 61748 BLAKE2B 8538749b3bed9cde97762702cd4882a9582bb3b11c080d888aebbd31aa10da8ec056d5129d8d3af833da06d84b4b061e8ec5332948a4a43cc2cb0b61a40f1d18 SHA512 b8273301dd1ddd4d05d2767dd56b963ee7f5f777fc584d7b4ff887dc53578579945ecbd58cb0aaae2050cdd0c735b3662469098a377e68af08e9e0068c4410fb
 DIST fs2-0.2.5.crate 12661 BLAKE2B c759986069c015e470fb622bccfea63b7d6b9c89e08fbc304765204a23e05552ab0408c9cf508a2ec5aaf1baac8bb992dcc39037e37d21c3adc7cae0c2025a85 SHA512 733598cf49f8725a98b91f65d1243dd0d078f129df62f68e8fb9ecd4cc58179627038586ab505d31a82932e7ee196e99f4967f5f82d08b90e3c7927a19006447
-DIST gcc-0.3.43.crate 26087 BLAKE2B abd5bfd81c628a2f726fb3fca90e87c87de8a78d58982b1db20b26dde2a182a708c4e30ae2b0714aec8d8d85c9e0af508b093e1a53a7ab9b41543d4dd508cc10 SHA512 27dd847b9466140d8cdd9bd4ac466d2ba26a93f858fcdcc1d58a59b08207f34f283004512faa53c4d8cf9632e0e9199c0f42db6df1db9a8d6b96e72e074af5e3
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST gcc-0.3.55.crate 37262 BLAKE2B 3341dc7136c14fa822a67fdeb72f7ea50b1264823e695e189d69604b8b8cce898ee2d40d8a536d0f520f5e190576afde16afa5d9cbe0a2c4b8600cf50bbd1447 SHA512 b045b60cf65c1deae44e4f40d0f511dab05c82be5065390dfbdaf5b51ee2d0653c3a6d8d1e7606e4bb6d234adfd22a8c68bde724406f3edb4bb6366617d46a86
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST libc-0.2.20.crate 121083 BLAKE2B 5ff063ccfb8eb0398cdb7307c9ee096a32fbce6da02418677324d6fe9901f3437c6060435867c781d4d617fe9183126a42a9c07acc9b5698c4af92121e6fbdbc SHA512 fb86e11f8317881c3e804e186ad9e2b7aee0ad4d0965ea67729ba74682e246e70bc2d283b170b6ab451c9907ee63fa6632a7211b2342f03e2ecb800fcaafd696
+DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libsodium-sys-0.0.12.crate 13527 BLAKE2B 991f3ca1009af39a55d259e1b161750e4144ffd8098948934877af47a29cb8296fb0cb0c8a41556eac21713fe8d6374823afd3f351ecae9443fc1055e9b04e50 SHA512 9370a2b69fe6b0b1c69d07ebbbbff0f5677e8575bb4be43356c0d7bd6c64e7553396f3626e06e8a48a2ff03823bb164f18d768bd49732a5f7ab00168126dfdf1
-DIST log-0.3.6.crate 16110 BLAKE2B 6dc589c3c24f3bbecf60310bfbd187179ac18afae1a17e6d28abf38f322e740aa02d73d396926650c347dba24afc50e3bb4cdeccf74ec7511ff9a7277084f5ec SHA512 f2e5526a2613f70301a607cbc79213a946a6039f85473f9de28ceb2f3b464be61a584f34ca6381e077d8bf6ac751c93011087d1723649c0d7722281f1a2b7174
+DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
+DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
-DIST miniz-sys-0.1.9.crate 53242 BLAKE2B 1259dae3c0c1d37c68e947f9f64e8c4044ef7eb6d900cc8f6a8ef07a42454beba4565885c301021cf925096b605fbe482d22df6c6f9b44a228e7a6fe468ad7a8 SHA512 130d872d25ca30937cbe34d93c6c3be359b4613c192b2dd8c542c0f3c2893c15176afc84da8e9077368647bdc0cc584aa995b3cbc8927b5e7de059b6135be709
-DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
-DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
+DIST miniz-sys-0.1.12.crate 78209 BLAKE2B bd6aea3b23382b754a926e8f6f4ba4b1684ea86987100c16556d0567278297e6e5bcfed2ca8a114831f75814692f38ae147f6c1951d218cd5ddfd81231fde86c SHA512 e00ab08d024806ffe68f8d9d0404bf83e62c58d04398bd8b0f8993a6c60a38fcc3a50189cef7a699ad7a93682d9f2353a31f5596d62a72c5f6560d12cf0c0a02
+DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
+DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
+DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rdedup-1.0.2.crate 7161 BLAKE2B 800eb6da28186b310a973ff4c5a678230e9455400d4262a774f64c8285bcf51feaceca3abd87b7b3445e2a4cd29568d7f24893a03eb5a478bad670ba359f00ac SHA512 f3999b6c981b52d237288c77c6bbb7b86a6531c0753d660d26cc6cfe540037c57e06f626315d1294b2fd312f0782494f273242b295a4ab9bc79a6a4de0cb8562
 DIST rdedup-lib-1.0.2.crate 12851 BLAKE2B 9fe6536ab54c5288763e14b304e2bdd31bfd7b5ca3b675ad707c7a83bef2640bf97ff0573efb90033b4eaa666320770e62305c28e190e540ee836cc6443983e9 SHA512 563376d7423facd4831a87a444f57c597d909e3cee7c53cc5420ddf4dcc512d789d6c31da0d3c9edc8ce736bab71519424333ec6a4ab5c86ce4046a80b5d9703
-DIST redox_syscall-0.1.16.crate 11598 BLAKE2B c6fd512e6d61c5d96a4b5aa65f7bc383e61abd7ccd96c332d99f10c8afd1985c18cf0744769cd3e743a4abce55c1ef4824a5397021ebeb2d8b690b4ad8ecbfd2 SHA512 16b2a06549dbfd778e1bcbde2b1aa33951bc925d34cc910898563e400ca107221f32e022a131089831370aa7c056da1717ebb6f0947e2d8722bb443388462f2f
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0
 DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506
 DIST rollsum-0.2.1.crate 4171 BLAKE2B 61f255d1815d724492a3f8295d9584794520a9103d6b65704333e54488da2978829b70212d12e0d7d42428e747317f0cd3b0b78a0bbc20bcb1f828595f2d12ac SHA512 d179f8dd169a98a921affeb896cbef1368eeb393556c11a89386b6532239776fe4f1be9e80e41bd3c8f744bc36c5b0cc6fa2649e4235c6f69e948dad7917a58d
 DIST rpassword-0.2.3.crate 3610 BLAKE2B 1a094674d11637d5c3ca9d067c9b324c05a90a1e4f7be762b4e5ebf124e5dbecc184e619c9238d18cad6daf72f4340a42bbbd63addf7bd79939e138d1813b5ae SHA512 16b8d627e56a581ee663c43c6ed63c8f45160b46c7bb4544614aa98911850edcf379c23e35c0d6682037b05f6990a96c86490f65d23a26d58928af096c556229
 DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90
-DIST rustc-serialize-0.3.22.crate 45545 BLAKE2B b367550233def2244b15cfffa7b089a0771e99047f477dab92a44c3b228b8879b92fba3f76998e9f6babb5b0a0ea8062f619bc8d9256f6e8edbb1680a4c548c3 SHA512 833649dc82e0a568eee051a37856983aadb3a33ca5d20c02e6ef057c7fad802c19d3131cc7108b33b098a964a2492e43d796f36b600fe3df4c93c76c9abb219c
+DIST rustc-serialize-0.3.25.crate 46114 BLAKE2B 54feaa72c7cda8aa4d4de225a99b3e2c78fa3893eef47c7666b6503e183bfd830d9693676a274e0dbf1d2f650489c4ba924ebf8650c47d11d561ec8bf8e85a11 SHA512 d7023ab949a1bcb43b3458a7bf3f6a8903a5a8e43ad87e8c635f5b1a43c72a27052b96bd9f2e9e8da4a532b5a97674850e5a11537ef8a1b17ef44017c7be1be8
 DIST serde-0.7.15.crate 22719 BLAKE2B 4d9fbe17250097540c9b0188b4935a39befb52b8637c7296b848a971dabec89c8243e833d36c9640a81da6f42c5d28be17514a94e6ded500a82629654d9e48f2 SHA512 c7fe504876c3d654797c88b47af81d422129b427bb3bc8d9876106865913ac9863e7b323cb6a5098d654e7af0b18b39310bbb204d03d3b465dde38ad92912a7c
 DIST sodiumoxide-0.0.12.crate 2068250 BLAKE2B 55e916af69c91d494137e19eeeb38db51ad2647cf774fa9fb487bd4c7ce9ba23a7717a445a00e661dc4e78b5b2758a8dadc27dc168093f5334948ec67827c8b5 SHA512 b47e9a1463185360886f23a8dc0b5f26784f639b204dec9ff6e830d845f42b201addc7cba87a4f75d19939fb1b21ee0fb7e3dc55dccbbe7e8d0f6c3ae7bac2a8
 DIST termios-0.2.2.crate 8966 BLAKE2B df99537abec76fe65a51bb5172d69cf0626045447b5aebc9e388b9b36b685f99919f032075ff6a3da82612b6fee5a0fa57d347136b66a761dc24b84ca4128749 SHA512 ded990bf8c1fa2bc31087ce077903eb8955687cd8ada25b82c4ab030ce3a73cede0ed4c599963c2d0c05c51e2a0c26f0d29d328b364342d21a73eaf4fc153f2c
 DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
 DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
-DIST time-0.1.36.crate 28333 BLAKE2B b87de9c713346b55eea1b738236608e7d9e14d619fb16e0d4772cc383c04b63a1ae5428d2248ad161d16fe37d282e3676dc04bc0b83ef86ecc6e5aeeaf998689 SHA512 1aa57438bb471344c1559610a0bb644dc488b0a69e354ad362c3cc95cd44c1c9269d9bd266c556c53796161d6ed381b35cba6fdcb62dfbef161ab4502300550a
+DIST time-0.1.45.crate 28911 BLAKE2B d43e2431752881f6885d572017f461b304d07ee5ef0d8b4898e62b47c8154268839c3bf69b141159090cfc0d90bd0113d6084fe99ea1f2b1e20668528ce21112 SHA512 e643fb8649f3efdaa1b0b6abc6a140d55ac550a55cad99d0cce9415dc51e155fb1ea240953eeaba5dc47ec73c49ab7f2962af79c693436289de0eb3ff60985ee
 DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-EBUILD rdedup-1.0.2.ebuild 1121 BLAKE2B 3e55b4475573d41d886615b5331fcfebb60c5fbf0979ee6bb570efff82adee7b9148f78400292e4434abe83efdd669ad208ad8558a911f8a2bfe92dbcb107fa3 SHA512 62dacfa13f79f21f7cf68944bf30fc27b77397555cd4820701ee4de5e759452a45da5b97a7564f768fffdd1bb585e6e830d3becb4781211be2cb9a2fe63cc61b
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+EBUILD rdedup-1.0.2-r1.ebuild 1397 BLAKE2B b9ef531c8b1c17407308ef2a23407e00f7000c285267c27772e00abe8f5f3726c14e53dbbdc48d419e406221f5510ca8899666e71a78458a45f36cd197782216 SHA512 503891db8cbd5fd8a1eaa3f9093e2a9fbfe4c7d6ff637ebd9f680da0144802a9f5789b763949b96459c14eef842228fbadd4b327ca94ebe3ccd54bdcf5d13df8
 MISC metadata.xml 326 BLAKE2B 09ef13f7449c123287a51c7f5583659e7a38fb8ff98e37f9a5d3b43256d0662d1ba250dd9a8e78edce9cc6931e8eb6f467d01b34504f5ec4fbe9ff578c903191 SHA512 96e53ba4d70912c1798275a71bfad53c79869560bcb1d830e2980169175a47c830b58d8c4b02ed9e28008264995dfc30be3aed5f23176e8596055d3aaeb27f48
diff --git a/app-backup/rdedup/rdedup-1.0.2-r1.ebuild b/app-backup/rdedup/rdedup-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..b5cc8252eaf7
--- /dev/null
+++ b/app-backup/rdedup/rdedup-1.0.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@0.5.3
+	argparse@0.2.2
+	cc@1.0.99
+	env_logger@0.3.5
+	flate2@0.2.20
+	fs2@0.2.5
+	fuchsia-cprng@0.1.1
+	gcc@0.3.55
+	kernel32-sys@0.2.2
+	libc@0.2.155
+	libsodium-sys@0.0.12
+	log@0.3.9
+	log@0.4.21
+	memchr@0.1.11
+	miniz-sys@0.1.12
+	pkg-config@0.3.30
+	rand@0.3.23
+	rand@0.4.6
+	rand_core@0.3.1
+	rand_core@0.4.2
+	rdrand@0.4.0
+	regex@0.1.80
+	regex-syntax@0.3.9
+	rollsum@0.2.1
+	rpassword@0.2.3
+	rust-crypto@0.2.36
+	rustc-serialize@0.3.25
+	serde@0.7.15
+	sodiumoxide@0.0.12
+	termios@0.2.2
+	thread-id@2.0.0
+	thread_local@0.2.7
+	time@0.1.45
+	utf8-ranges@0.1.3
+	wasi@0.10.0+wasi-snapshot-preview1
+	winapi@0.2.8
+	winapi@0.3.9
+	winapi-build@0.1.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	rdedup@${PV}
+	rdedup-lib@${PV}
+"
+
+inherit cargo
+
+DESCRIPTION="Data deduplication with compression and public key encryption"
+HOMEPAGE="https://github.com/dpc/rdedup"
+SRC_URI="${CARGO_CRATE_URIS}"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/libsodium-1.0.11:="
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+	ln -sf "${WORKDIR}/cargo_home/gentoo/rdedup-lib-${PV}" lib || die
+}
+
+src_install() {
+	cargo_src_install
+	dodoc {CHANGELOG,README}.md
+}
diff --git a/app-backup/rdedup/rdedup-1.0.2.ebuild b/app-backup/rdedup/rdedup-1.0.2.ebuild
deleted file mode 100644
index db1c7985f566..000000000000
--- a/app-backup/rdedup/rdedup-1.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.5.3
-argparse-0.2.1
-env_logger-0.3.5
-flate2-0.2.17
-fs2-0.2.5
-gcc-0.3.43
-kernel32-sys-0.2.2
-libc-0.2.20
-libsodium-sys-0.0.12
-log-0.3.6
-memchr-0.1.11
-miniz-sys-0.1.9
-pkg-config-0.3.9
-rand-0.3.15
-rdedup-lib-1.0.2
-regex-0.1.80
-regex-syntax-0.3.9
-rollsum-0.2.1
-rpassword-0.2.3
-rust-crypto-0.2.36
-rustc-serialize-0.3.22
-serde-0.7.15
-sodiumoxide-0.0.12
-termios-0.2.2
-thread-id-2.0.0
-thread_local-0.2.7
-time-0.1.36
-utf8-ranges-0.1.3
-winapi-0.2.8
-winapi-build-0.1.1
-rdedup-1.0.2
-rdedup-lib-1.0.2
-redox_syscall-0.1.16
-"
-
-inherit cargo
-
-DESCRIPTION="data deduplication with compression and public key encryption"
-HOMEPAGE="https://github.com/dpc/rdedup"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/libsodium-1.0.11:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	ln -sf "${WORKDIR}/cargo_home/gentoo/rdedup-lib-${PV}" lib || die
-}
-
-src_install() {
-	cargo_src_install
-	dodoc {CHANGELOG,README}.md
-}