diff --git a/app-backup/amanda/amanda-3.5.4-r1.ebuild b/app-backup/amanda/amanda-3.5.4-r2.ebuild
similarity index 94%
rename from app-backup/amanda/amanda-3.5.4-r1.ebuild
rename to app-backup/amanda/amanda-3.5.4-r2.ebuild
index 556188bf01042c..606129cb223d72 100644
--- a/app-backup/amanda/amanda-3.5.4-r1.ebuild
+++ b/app-backup/amanda/amanda-3.5.4-r2.ebuild
@@ -65,6 +65,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.5.4-remove-amanda-message-severity-use.patch
 	"${FILESDIR}"/${PN}-3.5.4-fix-tapelist-null-usage.patch
 	"${FILESDIR}"/${PN}-3.5.4-fix-finished_cb-invocation.patch
+	"${FILESDIR}"/${PN}-3.5.4-use-host-ar.patch
+	"${FILESDIR}"/${PN}-3.5.4-fix-curl-usage-for-newer-versions.patch
 )
 
 MYFILESDIR="${T}/files"
@@ -200,11 +202,11 @@ src_prepare() {
 	done
 
 	if use minimal; then
-		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-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
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
 	fi
 
 	eapply_user
@@ -404,15 +406,19 @@ src_install() {
 		newins "${MYFILESDIR}"/amanda-cron amanda
 	fi
 
+	# Install amandahosts file into /etc/amanda so it gets config protection
 	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
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	fowners -h ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${AMANDA_USER_HOMEDIR}/.amandahosts"
+
 	insinto "${AMANDA_USER_HOMEDIR}"
 	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
 	newins "${MYFILESDIR}"/amanda-profile .profile
+	fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${AMANDA_USER_HOMEDIR}/.profile"
 
 	insinto /etc/amanda
 	doins example/amanda-client.conf
@@ -424,10 +430,14 @@ src_install() {
 	fi
 
 	keepdir "${AMANDA_TAR_LISTDIR}"
+	fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${AMANDA_TAR_LISTDIR}"
 	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${AMANDA_USER_HOMEDIR}/amanda"
 	# Just make sure it exists for XFS to work...
 	use xfs && keepdir /var/xfsdump/inventory
 
+	fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${AMANDA_USER_HOMEDIR}"
+
 	newtmpfiles - amanda.conf <<- _EOF_
 		d	${AMANDA_TMPDIR}	0700	${AMANDA_USER_NAME}	${AMANDA_GROUP_NAME}
 	_EOF_
@@ -479,6 +489,14 @@ src_install() {
 	find "${ED}" -name '*.la' -delete || die
 }
 
+pkg_preinst() {
+	[[ -h ${EROOT}/etc/amanda/amandahosts ]] && rm ${EROOT}/etc/amanda/amandahosts
+	if [[ -f "${EROOT}/${AMANDA_USER_HOMEDIR}/.amandahosts" && ! -f ${EROOT}/etc/amanda/amandahosts ]]; then
+		einfo "Migrating amandahosts from ${AMANDA_USER_HOMEDIR} to /etc"
+		mv "${EROOT}/${AMANDA_USER_HOMEDIR}/.amandahosts" ${EROOT}/etc/amanda/amandahosts
+	fi
+}
+
 pkg_postinst() {
 	[[ ! -f ${TMPENVFILE} && ${MERGE_TYPE} == "binary" ]] && TMPENVFILE="${EROOT}${ENVDIR}/${ENVDFILE}"
 	[[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!"
diff --git a/app-backup/amanda/amanda-3.5.4.ebuild b/app-backup/amanda/amanda-3.5.4.ebuild
deleted file mode 100644
index d22a6a2365e8d6..00000000000000
--- a/app-backup/amanda/amanda-3.5.4.ebuild
+++ /dev/null
@@ -1,523 +0,0 @@
-# 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-fix-curl-usage-for-newer-versions.patch b/app-backup/amanda/files/amanda-3.5.4-fix-curl-usage-for-newer-versions.patch
new file mode 100644
index 00000000000000..2ec44cc4a8da8e
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.4-fix-curl-usage-for-newer-versions.patch
@@ -0,0 +1,54 @@
+diff '--color=auto' -ur amanda-tag-community-3.5.4.orig/device-src/s3.c amanda-tag-community-3.5.4/device-src/s3.c
+--- amanda-tag-community-3.5.4.orig/device-src/s3.c	2024-12-23 15:25:31.444515603 -0500
++++ amanda-tag-community-3.5.4/device-src/s3.c	2024-12-23 15:36:40.430093293 -0500
+@@ -2654,18 +2654,27 @@
+ 	}
+ #endif
+ 
+-        if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_HTTPGET, curlopt_httpget)))
+-            goto curl_error;
+-        if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_UPLOAD, curlopt_upload)))
+-            goto curl_error;
+-        if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_POST, curlopt_post)))
+-            goto curl_error;
+-        if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_NOBODY, curlopt_nobody)))
+-            goto curl_error;
+-        if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_CUSTOMREQUEST,
+-                                          curlopt_customrequest)))
+-            goto curl_error;
+-
++        // set only required http method, these toggle on only, not off
++        if (curlopt_httpget) {
++            if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_HTTPGET, curlopt_httpget)))
++                goto curl_error;
++        }
++        if (curlopt_upload) {
++            if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_UPLOAD, curlopt_upload)))
++                goto curl_error;
++        }
++        if (curlopt_post) {
++            if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_POST, curlopt_post)))
++                goto curl_error;
++        }
++        if (curlopt_nobody) {
++            if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_NOBODY, curlopt_nobody)))
++                goto curl_error;
++        }
++	if (curlopt_customrequest) {
++            if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_CUSTOMREQUEST, curlopt_customrequest)))
++                goto curl_error;
++        }
+ 
+         if (curlopt_upload || curlopt_post) {
+             if ((curl_code = curl_easy_setopt(hdl->curl, CURLOPT_READFUNCTION, read_func)))
+@@ -3437,6 +3446,10 @@
+         /* We don't call curl_easy_reset here, because doing that in curl
+          * < 7.16 blanks the default CA certificate path, and there's no way
+          * to get it back. */
++#if LIBCURL_VERSION_NUM >= 0x071000
++        curl_easy_reset(hdl->curl);
++#endif
++
+         if (hdl->last_message) {
+             g_free(hdl->last_message);
+             hdl->last_message = NULL;
diff --git a/app-backup/amanda/files/amanda-3.5.4-use-host-ar.patch b/app-backup/amanda/files/amanda-3.5.4-use-host-ar.patch
new file mode 100644
index 00000000000000..e04826b1a71927
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.5.4-use-host-ar.patch
@@ -0,0 +1,12 @@
+diff '--color=auto' -ur amanda-tag-community-3.5.4.orig/config/amanda/progs.m4 amanda-tag-community-3.5.4/config/amanda/progs.m4
+--- amanda-tag-community-3.5.4.orig/config/amanda/progs.m4	2024-12-23 13:31:07.911347884 -0500
++++ amanda-tag-community-3.5.4/config/amanda/progs.m4	2024-12-23 13:31:27.275666103 -0500
+@@ -358,7 +358,7 @@
+ AC_DEFUN([AMANDA_PROG_AR],
+ [
+     AC_REQUIRE([AMANDA_INIT_PROGS])
+-    AC_PATH_PROG(AR,ar,,$LOCSYSPATH)
++    AC_PATH_TOOL(AR,ar,,$LOCSYSPATH)
+ ])
+ 
+ AC_DEFUN([AMANDA_PROG_BASH],