10 files changed, 585 insertions, 77 deletions
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index cea6ef43a196..fa1de3f19d9b 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1 +1,2 @@
+DIST bacula-15.0.3-qt6-gentoo.tgz 7097 BLAKE2B a342c882cecdabebbdd8e33258da434f6f12cb34ca23bc038df7cbec9fb379c960ae2c770b91ecac40b2a291471d954c7e7085902cebe6bf8d7fe7d145438eb0 SHA512 b6659b8f246836d305994c0f9b079bf7547e29693c4e9be1eaf779e674b58b7e033a0d0a094a96ae7acef8a5a155d1e46f13be7e13ed74de12d5ec0019ace4ab
 DIST bacula-15.0.3.tar.gz 6539212 BLAKE2B 16af09af709406fce5e05b101c3ab1337e24816b353cc1a00c0efe05ba798fdf21f3a36ca1c3f867ff4bd768822494ba5f45d6555d0978754d30e08cfaa638dc SHA512 1700ac00b41d9e3426f6b7ead5bf44722e2f36e54ddb26a9ea169f6fbf4a61a7863e2e7b81890911d567d653468675d53eb7fc74e77c93358d6f9a52a73c0af8
diff --git a/app-backup/bacula/bacula-15.0.3-r2.ebuild b/app-backup/bacula/bacula-15.0.3-r2.ebuild
new file mode 100644
index 000000000000..0e0f138ec937
--- /dev/null
+++ b/app-backup/bacula/bacula-15.0.3-r2.ebuild
@@ -0,0 +1,457 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~tomjbe/distfiles/${PN}-15.0.3-qt6-gentoo.tgz"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt6 readline selinux +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads(+)] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		virtual/zlib:=[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			dev-libs/openssl:0=[static-libs]
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		virtual/zlib:=
+		acl? ( virtual/acl )
+		ssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-util/patchelf
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	selinux? ( sec-policy/selinux-bacula )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+# suppress warning wrt 'implicit function declaration' in config logs
+# bug 900663
+QA_CONFIG_IMPL_DECL_SKIP=(
+	makedev		# designed to check availability in
+				# used header file
+)
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt6; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt6' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# tray-monitor needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-15.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
+	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
+
+	# correct library search path for slibtool usage (bug #914389)
+	eapply -p0 "${FILESDIR}/${PN}-15.0.2-fix_slibtool.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+	sed -i -e "s/+= qt$/+= qt nostrip/" \
+			src/qt-console/tray-monitor/tray-monitor.pro.in || die
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt6 (#952935)
+	eapply -p2 ../${PN}-15.0.3-qt6-gentoo.patch	# patch to work with Qt6
+
+	export QMAKE="$(qt6_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# same for tray-monitor (bug #915605)
+	sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \
+		src/qt-console/tray-monitor/tray-monitor.pro.in || die
+	mkdir src/qt-console/tray-monitor/.libs || die
+	touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
+	chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
+
+	eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die
+
+	# drop reliance on installed 'which' program (bug #940692)
+	eapply "${FILESDIR}"/${PN}-drop-which.patch
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# bug #940695
+	#
+	# common datastructures with partial different components for
+	# different tools of the backup suite
+	filter-lto
+
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt6 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--htmldir=/usr/share/doc/${PF} \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+	keepdir /var/lib/bacula/tmp
+
+	# remove not needed .la files #840957
+	find "${ED}" -name '*.la' -delete || die
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt6 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt6; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+		rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	fi
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt6'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+
+	einfo
+	einfo "If you adapt the port numbers for baculas components in the config files"
+	einfo "make sure to adapt the file names for the pidfile accordingly"
+	einfo "(see init.d scripts)."
+}
diff --git a/app-backup/bacula/files/newscripts/bacula-dir.initd b/app-backup/bacula/files/newscripts/bacula-dir.initd
index df76a70ca3ee..74c93ef0365a 100644
--- a/app-backup/bacula/files/newscripts/bacula-dir.initd
+++ b/app-backup/bacula/files/newscripts/bacula-dir.initd
@@ -10,7 +10,7 @@ pidfile=/var/run/bacula-dir.9101.pid
 depend() {
 	need net
 	if [ "${LOCAL_DB}" -eq 1 ]; then
-		:
+		need %database%
 	fi
 	use dns bacula-fd bacula-sd
 }
diff --git a/app-backup/ccollect/ccollect-2.10.ebuild b/app-backup/ccollect/ccollect-2.10.ebuild
index 8c8c3c097c32..d93c5c5fdc52 100644
--- a/app-backup/ccollect/ccollect-2.10.ebuild
+++ b/app-backup/ccollect/ccollect-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nico.schottelius.org/software/${PN}/download/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ~sparc x86"
 IUSE="doc examples"
 # tests need ssh-access
 RESTRICT="test"
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index b16a13133806..e1694ec81e0e 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1 +1,2 @@
 DIST dar-2.8.1.tar.gz 2378700 BLAKE2B f8b4b85bc49c4eaedc58eeb8171bfb65a8f77f3b5ac35e407edbdff25b8feb3698d99b9585ee3a9219b87cee53e970cb0c14ba88b083d4b998b18f0d6c7e2ec9 SHA512 7a0d59bfe41442f4d5c5704c76c28845357458f912f0b97c8556bccfad7c20fa6248783889b7cc08ae800a334ce06854488a460137bfa022eb3a7274a0ebe74e
+DIST dar-2.8.2.tar.gz 2379524 BLAKE2B 6b6a2321ee15e3d63692544135fea45368ff52016cc832f414d2bb6cdf9fc4d4c9b14bf5f3459a3a864172c640931ec216f863cbdd8d68991328f4cfff43d2bc SHA512 f2c645ad3eff25054667a06b7095ab3616df1a1d4e7db26127301bb2e3b2d17e1eaba4ed9048fddf8436cc82a61cc5d5c3c0535c890a325724e199b4bd9f776a
diff --git a/app-backup/dar/dar-2.8.2.ebuild b/app-backup/dar/dar-2.8.2.ebuild
new file mode 100644
index 000000000000..0c60ab0a1cce
--- /dev/null
+++ b/app-backup/dar/dar-2.8.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="https://downloads.sourceforge.net/project/dar/dar/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync sftp whirlpool xattr"
+
+REQUIRED_USE="
+	?? ( dar32 dar64 )
+	gpg? ( gcrypt )
+"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	>=dev-libs/libthreadar-1.5.0
+	sys-libs/libcap
+	>=virtual/zlib-1.2.3:=
+	argon2? ( app-crypt/argon2:= )
+	curl? ( net-misc/curl )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gpg? (
+		app-crypt/gpgme:=
+		dev-libs/libassuan:=
+	)
+	lz4? ( app-arch/lz4:= )
+	lzo? ( dev-libs/lzo:2 )
+	nls? ( virtual/libintl )
+	rsync? ( net-libs/librsync:= )
+	sftp? ( net-libs/libssh:=[sftp] )
+	whirlpool? ( app-crypt/rhash:= )
+	xattr? ( sys-apps/attr )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-text/doxygen )
+	nls? ( sys-devel/gettext )
+"
+# Bug #862025 - upstream has a different numbering scheme for libdar
+QA_PKGCONFIG_VERSION=""
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE logic.
+	# For example "--enable-dar-static" causes configure to DISABLE static
+	# builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the logic has
+	# been fixed by upstream.
+	local myconf=(
+		--disable-dar-static
+		--disable-python-binding
+		--disable-upx
+		$(usev !argon2 --disable-libargon2-linking)
+		$(usev !curl --disable-libcurl-linking)
+		$(usev dar32 --enable-mode=32)
+		$(usev dar64 --enable-mode=64)
+		$(usev !doc --disable-build-html)
+		$(usev !gcrypt --disable-libgcrypt-linking)
+		$(usev !gpg --disable-gpgme-linking)
+		$(usev !lz4 --disable-liblz4-linking)
+		$(usev !lzo --disable-liblzo2-linking)
+		$(usev !nls --disable-nls)
+		$(usev !rsync --disable-librsync-linking)
+		$(usev !sftp --disable-libssh-linking)
+		$(usev !whirlpool --disable-librhash-linking)
+		$(usev !xattr --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+
+	# Bug 729150
+	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
+}
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index a54f9a1f5547..c0887db9f039 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,3 +1,2 @@
 DIST duplicity-rel.3.0.5.tar.bz2 952327 BLAKE2B a5befdcfbca07655b690c681a7858e181029f6432583006872d9a1fe446a157717d6bfdc8462b087d719548ad8e761efb35b37ee23441bd7ed7830cbf5ed1612 SHA512 c57cd0192989ea98ef297aa5eb1e80f32f885af8c035521fffed115e2bd77af187b726a500e8d2e3f4100b00490cc62079dcba4568ca0d17239763477d3e7cb5
-DIST duplicity-rel.3.0.6.2.tar.bz2 959175 BLAKE2B b1f04665daadaebc924203982b2ffe8f25275e2909b0bf8076d50823f8be56e6d5af55e6d9ae064256d345b8bec517179ef262b45be135f3ecad5f1b88716e39 SHA512 90fe1af5ad14f64c2e60f97b03a36465740e457893ea49a54331c40742f784a009dd049e6ad9d3bb0ed9687047b8ff7779ebd4f3549adf98f25fb9ce6a54bc17
 DIST duplicity-rel.3.0.6.3.tar.bz2 989593 BLAKE2B f2f465527e6c876593709d7ace2163f6f60c340995b2037872039ed33cc740b3527c2197b7741fef495b84da3610bcf6762353f2cdf64c7ce773653f0e7fd2ee SHA512 cf2c9804a609541a67a5bdf5da8cd8a0595a146f5a036b7223c0d3f72361bd944f2d3c532e5e64458a0410a80a6d8090f035bc06af0253ccc031e2db90e112bc
diff --git a/app-backup/duplicity/duplicity-3.0.6.2.ebuild b/app-backup/duplicity/duplicity-3.0.6.3-r1.ebuild
index a6b4516ffb38..04d5fc69a92f 100644
--- a/app-backup/duplicity/duplicity-3.0.6.2.ebuild
+++ b/app-backup/duplicity/duplicity-3.0.6.3-r1.ebuild
@@ -30,6 +30,7 @@ COMMON_DEPEND="
 	app-alternatives/gpg
 	net-libs/librsync:=
 	dev-python/fasteners[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -37,7 +38,6 @@ DEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		|| ( app-arch/par2cmdline app-arch/par2cmdline-turbo )
-		dev-python/pexpect[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
@@ -66,6 +66,17 @@ PATCHES=(
 
 distutils_enable_tests pytest
 
+python_test() {
+	# The default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR DOCKER_GNUPGHOME
+	TMPDIR="$(mktemp -d --tmpdir=/tmp ${PF}-XXX || die)"
+	# testing/__init__.py doesn't respect GNUPGHOME
+	DOCKER_GNUPGHOME="${TMPDIR}/gnupg"
+	cp -ar "${S}"/testing/gnupg "${DOCKER_GNUPGHOME}"/ || die
+
+	epytest
+}
+
 pkg_postinst() {
 	elog "Duplicity has many optional dependencies to support various backends."
 	elog "Currently it's up to you to install them as necessary."
diff --git a/app-backup/duplicity/duplicity-3.0.6.3.ebuild b/app-backup/duplicity/duplicity-3.0.6.3.ebuild
deleted file mode 100644
index a6b4516ffb38..000000000000
--- a/app-backup/duplicity/duplicity-3.0.6.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_EXT=1
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://duplicity.gitlab.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/duplicity/duplicity.git/"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/${PN}-rel.${PV}.tar.bz2"
-	S="${WORKDIR}"/${PN}-rel.${PV}
-
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="s3 test"
-
-COMMON_DEPEND="
-	app-alternatives/gpg
-	net-libs/librsync:=
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		|| ( app-arch/par2cmdline app-arch/par2cmdline-turbo )
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto3[${PYTHON_USEDEP}] )
-"
-
-EPYTEST_DESELECT=(
-	# Linting tests (black, pylint, etc); not relevant for us
-	testing/test_code.py::CodeTest::test_black
-	testing/test_code.py::CodeTest::test_pep8
-	testing/test_code.py::CodeTest::test_pylint
-	# boto3
-	testing/unit/test_cli_main.py::CommandlineTest::test_intermixed_args
-)
-
-EPYTEST_IGNORE=(
-	testing/test_code.py
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.4.0-fix-docs-cmd.patch
-	"${FILESDIR}"/${PN}-3.0.5-dont-repeat-standard-paths.patch
-)
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-9999.ebuild b/app-backup/duplicity/duplicity-9999.ebuild
index a6b4516ffb38..04d5fc69a92f 100644
--- a/app-backup/duplicity/duplicity-9999.ebuild
+++ b/app-backup/duplicity/duplicity-9999.ebuild
@@ -30,6 +30,7 @@ COMMON_DEPEND="
 	app-alternatives/gpg
 	net-libs/librsync:=
 	dev-python/fasteners[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -37,7 +38,6 @@ DEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		|| ( app-arch/par2cmdline app-arch/par2cmdline-turbo )
-		dev-python/pexpect[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
@@ -66,6 +66,17 @@ PATCHES=(
 
 distutils_enable_tests pytest
 
+python_test() {
+	# The default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR DOCKER_GNUPGHOME
+	TMPDIR="$(mktemp -d --tmpdir=/tmp ${PF}-XXX || die)"
+	# testing/__init__.py doesn't respect GNUPGHOME
+	DOCKER_GNUPGHOME="${TMPDIR}/gnupg"
+	cp -ar "${S}"/testing/gnupg "${DOCKER_GNUPGHOME}"/ || die
+
+	epytest
+}
+
 pkg_postinst() {
 	elog "Duplicity has many optional dependencies to support various backends."
 	elog "Currently it's up to you to install them as necessary."