Adding metadata

21 files changed, 546 insertions, 344 deletions

diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index b3a6d0b9d574..2a6700d86834 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,2 +1,4 @@
+DIST borgbackup-1.4.1.tar.gz 3817197 BLAKE2B fbf5cd06bcddd5b90db75ed1b2276d2eba0d17d0545a751acfd40d051053d9d3e1a0ea2f1dd87e6541aeca6199e98ad1885b9d3155696268752069b763b660a4 SHA512 83ce8fcefa4e4099922e1f3894aba41d8d83ccff3e554b4b5ee0f0b9b8b18b18bcbf7f566e36aea4214e0d9d427cb66d63d2e1933b773e3338fd5814fd80e3a4
+DIST borgbackup-1.4.2.tar.gz 3932875 BLAKE2B a3489c46d17cc07a62f5098320a5023e957f7044021d307d879b0c0dfe4bc49ddf10151a2e2e888dbbb2721f412f6a699d7b8b67d1a0e28eda92dfd931b164b6 SHA512 035396661013057614724f55d6b3e3ed35b686887d836b7358e1f95b6c354ec5c4d9592c29cb1d4577e113e3a0558a9054689a2678b62b97d78287ad0295cce0
 DIST borgbackup-1.4.3.tar.gz 4014143 BLAKE2B 9e93ca819e9083a256b8ccd6093b6ee2e69cfabb6a89b16958b9b64da2c1b217d9a1149ca40147817169ab388db33bca9c5ab6308e7064d8b3c92714ce9abcaa SHA512 500c9da7aeeea6e9aac1efe4760e8d6ef6e7f9c80fc32c3f2e7b7dfb27d54cd0131b7c27248c276b23034fc92cdb2a8611926773f5aa9801eb99139efc9d0dd2
 DIST borgbackup-1.4.4.tar.gz 3995698 BLAKE2B 001fe3408b463edb5097690c505e2c801de91e38dcae3c7e714b6a3d11cb692bc7dc7ec55f18db5399c6437a784614a4e19ec9e37cb5eb61a396d2bb8fcc7ec1 SHA512 a43dbfaaeb46764975bc9765731090b50e514a5a31add9236af7de6e99e7c67ac4bcf6b9869d648f9ce11c7f7d52318369f4fb7951cc1ef947aee64ac222150a
diff --git a/app-backup/borgbackup/borgbackup-1.4.1-r1.ebuild b/app-backup/borgbackup/borgbackup-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..4e8a88732195
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.4.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi shell-completion
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+
+DEPEND="
+	app-arch/lz4
+	app-arch/zstd
+	dev-libs/openssl:0=
+	>=dev-libs/xxhash-0.8.1
+	virtual/acl
+"
+# borgbackup is *very* picky about which msgpack it work with,
+# check pyproject.toml on bumps.
+RDEPEND="
+	${DEPEND}
+	<dev-python/msgpack-1.1.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyfuse3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+# some tests randomly fail with xdist, bug #936524
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/borgbackup/borg/pull/8904
+	"${FILESDIR}/${P}-msgpack-1.1.1.patch"
+)
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Needs pytest-benchmark fixture
+		benchmark.py::test_
+	)
+
+	# This disables fuse releated tests
+	local -x BORG_FUSE_IMPL="none"
+	epytest --pyargs borg.testsuite
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+
+	dobashcomp scripts/shell_completions/bash/borg
+	dozshcomp scripts/shell_completions/zsh/_borg
+	dofishcomp scripts/shell_completions/fish/borg.fish
+}
diff --git a/app-backup/borgbackup/borgbackup-1.4.2-r1.ebuild b/app-backup/borgbackup/borgbackup-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..fb2f86ead5e4
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.4.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi shell-completion
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	app-arch/lz4
+	app-arch/zstd
+	dev-libs/openssl:0=
+	>=dev-libs/xxhash-0.8.1
+	virtual/acl
+"
+# borgbackup is *very* picky about which msgpack it work with,
+# check pyproject.toml on bumps.
+RDEPEND="
+	${DEPEND}
+	<=dev-python/msgpack-1.1.2-r9999[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyfuse3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+# some tests randomly fail with xdist, bug #936524
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Needs pytest-benchmark fixture
+		benchmark.py::test_
+	)
+
+	# This disables fuse releated tests
+	local -x BORG_FUSE_IMPL="none"
+	epytest --pyargs borg.testsuite
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+
+	dobashcomp scripts/shell_completions/bash/borg
+	dozshcomp scripts/shell_completions/zsh/_borg
+	dofishcomp scripts/shell_completions/fish/borg.fish
+}
diff --git a/app-backup/borgbackup/borgbackup-1.4.3.ebuild b/app-backup/borgbackup/borgbackup-1.4.3.ebuild
index d389ef4f8d5d..e44fd1174878 100644
--- a/app-backup/borgbackup/borgbackup-1.4.3.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.4.3.ebuild
@@ -1,5 +1,6 @@
-# Copyright 2021-2025 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 DISTUTILS_EXT=1
@@ -14,21 +15,19 @@ HOMEPAGE="https://borgbackup.readthedocs.io/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
 
 DEPEND="
-	>=app-arch/lz4-1.7.0
-	>=app-arch/zstd-1.3.0
+	app-arch/lz4
+	app-arch/zstd
 	dev-libs/openssl:0=
-
 	>=dev-libs/xxhash-0.8.1
 	virtual/acl
 "
 # borgbackup is *very* picky about which msgpack it work with,
-# check setup.py on bumps.
+# check pyproject.toml on bumps.
 RDEPEND="
 	${DEPEND}
-	dev-python/msgpack[${PYTHON_USEDEP}]
+	<=dev-python/msgpack-1.1.2-r9999[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pyfuse3[${PYTHON_USEDEP}]
 "
@@ -65,5 +64,3 @@ src_install() {
 	dozshcomp scripts/shell_completions/zsh/_borg
 	dofishcomp scripts/shell_completions/fish/borg.fish
 }
-
-
diff --git a/app-backup/borgbackup/borgbackup-1.4.4.ebuild b/app-backup/borgbackup/borgbackup-1.4.4.ebuild
index c8b7cee51f2e..48f0348aa704 100644
--- a/app-backup/borgbackup/borgbackup-1.4.4.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.4.4.ebuild
@@ -1,5 +1,6 @@
-# Copyright 2021-2026 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 DISTUTILS_EXT=1
@@ -13,22 +14,20 @@ HOMEPAGE="https://borgbackup.readthedocs.io/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="
-	>=app-arch/lz4-1.7.0
-	>=app-arch/zstd-1.3.0
+	app-arch/lz4
+	app-arch/zstd
 	dev-libs/openssl:0=
-
 	>=dev-libs/xxhash-0.8.1
 	virtual/acl
 "
 # borgbackup is *very* picky about which msgpack it work with,
-# check setup.py on bumps.
+# check pyproject.toml on bumps.
 RDEPEND="
 	${DEPEND}
-	dev-python/msgpack[${PYTHON_USEDEP}]
+	<=dev-python/msgpack-1.1.2-r9999[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pyfuse3[${PYTHON_USEDEP}]
 "
@@ -65,5 +64,3 @@ src_install() {
 	dozshcomp scripts/shell_completions/zsh/_borg
 	dofishcomp scripts/shell_completions/fish/borg.fish
 }
-
-
diff --git a/app-backup/borgbackup/files/borgbackup-1.4.1-msgpack-1.1.1.patch b/app-backup/borgbackup/files/borgbackup-1.4.1-msgpack-1.1.1.patch
new file mode 100644
index 000000000000..e9a984abfbdf
--- /dev/null
+++ b/app-backup/borgbackup/files/borgbackup-1.4.1-msgpack-1.1.1.patch
@@ -0,0 +1,38 @@
+From d1108e9d2d92d57ec0bf0e5f84027e4d56ddb2c5 Mon Sep 17 00:00:00 2001
+From: TW <tw@waldmann-edv.de>
+Date: Fri, 6 Jun 2025 20:56:49 +0200
+Subject: [PATCH] Merge pull request #8904 from
+ ThomasWaldmann/allow-msgpack-111
+
+Allow msgpack 1.1.1(rc1)
+---
+ pyproject.toml              | 2 +-
+ src/borg/helpers/msgpack.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index c5457ed4..65b3eb1d 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -35,7 +35,7 @@ dependencies = [
+     # Please note:
+     # using any other msgpack version is not supported by borg development and
+     # any feedback related to issues caused by this will be ignored.
+-    "msgpack >=1.0.3, <=1.1.0",
++    "msgpack >=1.0.3, <=1.1.1",
+     "packaging",
+ ]
+ 
+diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py
+index 5c8cedde..5c0d1a02 100644
+--- a/src/borg/helpers/msgpack.py
++++ b/src/borg/helpers/msgpack.py
+@@ -137,7 +137,7 @@ def is_slow_msgpack():
+ def is_supported_msgpack():
+     # DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml.
+     import msgpack
+-    return (1, 0, 3) <= msgpack.version <= (1, 1, 0) and \
++    return (1, 0, 3) <= msgpack.version <= (1, 1, 1) and \
+            msgpack.version not in []  # < add bad releases here to deny list
+ 
+ 
diff --git a/app-backup/borgbackup/metadata.xml b/app-backup/borgbackup/metadata.xml
index 0292518aaac1..9aeccde6ffbc 100644
--- a/app-backup/borgbackup/metadata.xml
+++ b/app-backup/borgbackup/metadata.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
+  <maintainer type="person" proxied="yes">
+    <email>hoelbezier@riseup.net</email>
+    <name>Hoël Bézier</name>
   </maintainer>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
-  <maintainer type="person">
-    <email>slashbeast@gentoo.org</email>
-    <name>Piotr Karbowski</name>
+  <maintainer type="person" proxied="proxy">
+    <email>mschiff@gentoo.org</email>
+    <name>Marc Schiffbauer</name>
   </maintainer>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:borgbackup:borg</remote-id>
-  </upstream>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index b476610d5dc0..0267df9829e4 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,2 +1,2 @@
+DIST burp-3.1.4.tar.gz 549879 BLAKE2B bf70051a658700fab60182b97b7ce8540fbd85ad1264ee09c9fa5b5a99046f391b91cd8673097ef869c6b762aea6d8fecdedb38425dca9e6bcbb1f2c2afa96fb SHA512 3aa9fb1512f985fa99e7cb9a45502bbdbf513935e0c62fa4327f0e6cb68d3840f59bfe1b38a7c2419b3e69bc04aef36c223313897c2e45e94f3be3f9d41714db
 DIST burp-3.2.0.tar.gz 550673 BLAKE2B 808a6aa41661f297cee034752ef59ca8a888e12154b9b54165ff822a044ebbeec12178fcb7261d2a1d965ce3d4a565f096d063ee8c404e697290f7ed89bc2ffe SHA512 13affe243f1bb50460ae6bcece580a18718acb01695e2ef804ce519335a733f02c6a89d5c3263963794ff3714a0c693dd8a2f69ae43774088c3b2c63570162df
-DIST burp-3.3.0.tar.gz 551183 BLAKE2B bb424917955c4c27e4042e8fa085d5d9c301668832299965eb665e16576107d9dd5296d6a5472a7a14e9a9b58947a21cb6d3b2cae536f18933cb72ddd686e0f5 SHA512 01cc64d877c572e8cd51e6ceb93334fec7d7c96565f33ae39988a4613a65e28f4a57bd72837bd18c27bf24b675fc0c87f7dda0abaada7b62be36a8b74ebf783f
diff --git a/app-backup/burp/burp-3.1.4-r1.ebuild b/app-backup/burp/burp-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..07e7f61edb0b
--- /dev/null
+++ b/app-backup/burp/burp-3.1.4-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools eapi9-ver flag-o-matic systemd
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="https://burp.grke.org/"
+SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="acl test xattr"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
+	dev-libs/openssl:0=
+	net-libs/librsync:=
+	sys-libs/ncurses:0=
+	sys-libs/libcap
+	virtual/zlib:=
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? ( dev-libs/check )"
+BDEPEND=">=dev-build/autoconf-2.71
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-2.1.20-no_mkdir_run.patch
+	"${FILESDIR}"/"${PN}"-2.0.54-server_user.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Fails tests (bug #865273)
+	filter-lto
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		--runstatedir=/run
+		"$(use_enable acl)"
+		"$(use_enable xattr)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# See https://bugs.gentoo.org/915690
+	local -x CK_DEFAULT_TIMEOUT=0
+	local -x CK_TIMEOUT_MULTIPLIER=0
+	default
+}
+
+src_install() {
+	default
+	keepdir /var/spool/burp
+	fowners -R root:"${PN}" /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:"${PN}" /etc/burp
+	fperms 0750 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+}
+
+pkg_postinst() {
+	elog "Burp ebuilds now support the autoupgrade mechanism in both"
+	elog "client and server mode. In both cases it is disabled by"
+	elog "default. You almost certainly do NOT want to enable it in"
+	elog "client mode because upgrades obtained this way will not be"
+	elog "managed by Portage."
+
+	if [[ ! -e "${EROOT}"/etc/burp/CA/index.txt ]]; then
+		elog ""
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  ${EROOT}/etc/burp/burp-server.conf"
+		elog ""
+	fi
+
+	if ver_replacing -lt 2; then
+		ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+		ewarn "the server config file by default. If you use bedup, please"
+		ewarn "update your scripts to invoke it as"
+		ewarn ""
+		ewarn "  bedup -c ${EROOT}/etc/burp/burp-server.conf"
+		ewarn ""
+		ewarn "Otherwise deduplication will not work!"
+	fi
+}
diff --git a/app-backup/burp/burp-3.1.4.ebuild b/app-backup/burp/burp-3.1.4.ebuild
new file mode 100644
index 000000000000..d880f4388f55
--- /dev/null
+++ b/app-backup/burp/burp-3.1.4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools eapi9-ver systemd
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="https://burp.grke.org/"
+SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="acl test xattr"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
+	dev-libs/openssl:0=
+	net-libs/librsync:=
+	sys-libs/ncurses:0=
+	sys-libs/libcap
+	virtual/zlib:=
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? ( dev-libs/check )"
+BDEPEND=">=dev-build/autoconf-2.71
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-2.1.20-no_mkdir_run.patch
+	"${FILESDIR}"/"${PN}"-2.0.54-server_user.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		--runstatedir=/run
+		"$(use_enable acl)"
+		"$(use_enable xattr)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# See https://bugs.gentoo.org/915690
+	local -x CK_DEFAULT_TIMEOUT=0
+	local -x CK_TIMEOUT_MULTIPLIER=0
+	default
+}
+
+src_install() {
+	default
+	keepdir /var/spool/burp
+	fowners -R root:"${PN}" /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:"${PN}" /etc/burp
+	fperms 0750 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+}
+
+pkg_postinst() {
+	elog "Burp ebuilds now support the autoupgrade mechanism in both"
+	elog "client and server mode. In both cases it is disabled by"
+	elog "default. You almost certainly do NOT want to enable it in"
+	elog "client mode because upgrades obtained this way will not be"
+	elog "managed by Portage."
+
+	if [[ ! -e "${EROOT}"/etc/burp/CA/index.txt ]]; then
+		elog ""
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  ${EROOT}/etc/burp/burp-server.conf"
+		elog ""
+	fi
+
+	if ver_replacing -lt 2; then
+		ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+		ewarn "the server config file by default. If you use bedup, please"
+		ewarn "update your scripts to invoke it as"
+		ewarn ""
+		ewarn "  bedup -c ${EROOT}/etc/burp/burp-server.conf"
+		ewarn ""
+		ewarn "Otherwise deduplication will not work!"
+	fi
+}
diff --git a/app-backup/burp/burp-3.2.0.ebuild b/app-backup/burp/burp-3.2.0.ebuild
index 2c1579237d91..746ec45f817f 100644
--- a/app-backup/burp/burp-3.2.0.ebuild
+++ b/app-backup/burp/burp-3.2.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2021-2025 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
-inherit autotools systemd
+inherit autotools eapi9-ver flag-o-matic systemd
 
 DESCRIPTION="Network backup and restore client and server for Unix and Windows"
 HOMEPAGE="https://burp.grke.org/"
@@ -11,110 +12,102 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl ipv6 test xattr"
+IUSE="acl test xattr"
 
 RESTRICT="!test? ( test )"
 
-CDEPEND=" acct-group/burp
+COMMON_DEPEND="acct-group/burp
 	acct-user/burp
 	dev-libs/uthash
-	net-libs/librsync
-	sys-libs/ncurses:0=
-	sys-libs/zlib
 	dev-libs/openssl:0=
-
+	net-libs/librsync:=
+	sys-libs/ncurses:0=
+	sys-libs/libcap
+	virtual/zlib:=
+	virtual/libcrypt:=
 	acl? ( sys-apps/acl )
 	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
 	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger
-	virtual/libcrypt
-"
+BDEPEND=">=dev-build/autoconf-2.71
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
+	"${FILESDIR}"/"${PN}"-2.1.20-no_mkdir_run.patch
+	"${FILESDIR}"/"${PN}"-2.0.54-server_user.patch
+	"${FILESDIR}"/"${PN}"-3.2.0-zlib-1.3.2.patch
 )
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 src_configure() {
+	# Fails tests (bug #865273)
+	filter-lto
 	local myeconfargs=(
 		--localstatedir=/var
 		--sysconfdir=/etc/burp
 		--enable-largefile
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
+		--runstatedir=/run
+		"$(use_enable acl)"
+		"$(use_enable xattr)"
 	)
-	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run' \
-		econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
-	# See https://github.com/grke/burp/issues/869
-	local -x CK_DEFAULT_TIMEOUT=10
+	# See https://bugs.gentoo.org/915690
+	local -x CK_DEFAULT_TIMEOUT=0
+	local -x CK_TIMEOUT_MULTIPLIER=0
 	default
 }
 
 src_install() {
 	default
 	keepdir /var/spool/burp
-	fowners -R root:${PN} /var/spool/burp
+	fowners -R root:"${PN}" /var/spool/burp
 	fperms 0770 /var/spool/burp
 
 	emake DESTDIR="${D}" install-configs
-	fowners -R root:${PN} /etc/burp
+	fowners -R root:"${PN}" /etc/burp
 	fperms 0750 /etc/burp
 	fperms 0640 /etc/burp/burp-server.conf
 	fperms 0750 /etc/burp/clientconfdir
 
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
+	newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
+	systemd_dounit "${FILESDIR}"/"${PN}".service
 }
 
 pkg_postinst() {
-	ewarn
-	ewarn "You are installing a development version of burp. These versions contain"
-	ewarn "new features but might have unexpected issues. It is recommended by upstream"
-	ewarn "to use the current stable version (i.e. currently the 2.2 branch) instead."
-	ewarn
-
 	elog "Burp ebuilds now support the autoupgrade mechanism in both"
 	elog "client and server mode. In both cases it is disabled by"
 	elog "default. You almost certainly do NOT want to enable it in"
 	elog "client mode because upgrades obtained this way will not be"
 	elog "managed by Portage."
 
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
+	if [[ ! -e "${EROOT}"/etc/burp/CA/index.txt ]]; then
 		elog ""
 		elog "At first run burp server will generate DH parameters and SSL"
 		elog "certificates.  You should adjust configuration before."
 		elog "Server configuration is located at"
 		elog ""
-		elog "  /etc/burp/burp-server.conf"
+		elog "  ${EROOT}/etc/burp/burp-server.conf"
 		elog ""
 	fi
 
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if [[ $(ver_cut 1 ${oldver}) -lt 2 ]]; then
-			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
-			ewarn "the server config file by default. If you use bedup, please"
-			ewarn "update your scripts to invoke it as"
-			ewarn ""
-			ewarn "  bedup -c /etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
+	if ver_replacing -lt 2; then
+		ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+		ewarn "the server config file by default. If you use bedup, please"
+		ewarn "update your scripts to invoke it as"
+		ewarn ""
+		ewarn "  bedup -c ${EROOT}/etc/burp/burp-server.conf"
+		ewarn ""
+		ewarn "Otherwise deduplication will not work!"
+	fi
 }
diff --git a/app-backup/burp/burp-3.3.0.ebuild b/app-backup/burp/burp-3.3.0.ebuild
deleted file mode 100644
index 552cb0065ae7..000000000000
--- a/app-backup/burp/burp-3.3.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2021-2026 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="https://burp.grke.org/"
-SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl ipv6 test xattr"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND=" acct-group/burp
-	acct-user/burp
-	dev-libs/uthash
-	net-libs/librsync
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	dev-libs/openssl:0=
-
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger
-	virtual/libcrypt
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
-	)
-	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run' \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# See https://github.com/grke/burp/issues/869
-	local -x CK_DEFAULT_TIMEOUT=10
-	default
-}
-
-src_install() {
-	default
-	keepdir /var/spool/burp
-	fowners -R root:${PN} /var/spool/burp
-	fperms 0770 /var/spool/burp
-
-	emake DESTDIR="${D}" install-configs
-	fowners -R root:${PN} /etc/burp
-	fperms 0750 /etc/burp
-	fperms 0640 /etc/burp/burp-server.conf
-	fperms 0750 /etc/burp/clientconfdir
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "You are installing a development version of burp. These versions contain"
-	ewarn "new features but might have unexpected issues. It is recommended by upstream"
-	ewarn "to use the current stable version (i.e. currently the 2.2 branch) instead."
-	ewarn
-
-	elog "Burp ebuilds now support the autoupgrade mechanism in both"
-	elog "client and server mode. In both cases it is disabled by"
-	elog "default. You almost certainly do NOT want to enable it in"
-	elog "client mode because upgrades obtained this way will not be"
-	elog "managed by Portage."
-
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
-		elog ""
-		elog "At first run burp server will generate DH parameters and SSL"
-		elog "certificates.  You should adjust configuration before."
-		elog "Server configuration is located at"
-		elog ""
-		elog "  /etc/burp/burp-server.conf"
-		elog ""
-	fi
-
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if [[ $(ver_cut 1 ${oldver}) -lt 2 ]]; then
-			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
-			ewarn "the server config file by default. If you use bedup, please"
-			ewarn "update your scripts to invoke it as"
-			ewarn ""
-			ewarn "  bedup -c /etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
-}
diff --git a/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch b/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch
deleted file mode 100644
index db9e9b6a9de5..000000000000
--- a/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/configs/client/burp.conf.in
-+++ b/configs/client/burp.conf.in
-@@ -10,7 +10,8 @@
- # 0 to decide automatically, 1 to force protocol1 mode (file level granularity
- # with a pseudo mirrored storage on the server and optional rsync). 2 forces
- # protocol2 mode (inline deduplication with variable length blocks).
--# protocol = 0
-+# WARNING: as of September 2017 protocol2 is still considered experimental.
-+protocol = 1
- pidfile = @runstatedir@/@name@.client.pid
- syslog = 0
- stdout = 1
---- a/configs/server/burp.conf.in
-+++ b/configs/server/burp.conf.in
-@@ -21,7 +21,8 @@
- # protocol2 mode (inline deduplication with variable length blocks).
- # Like many other settings, this can be set per client in the clientconfdir
- # files.
--# protocol = 0
-+# WARNING: as of September 2017 protocol2 is still considered experimental.
-+protocol = 1
- pidfile = @runstatedir@/@name@.server.pid
- hardlinked_archive = 0
- working_dir_recovery_method = delete
diff --git a/app-backup/burp/files/burp-3.2.0-zlib-1.3.2.patch b/app-backup/burp/files/burp-3.2.0-zlib-1.3.2.patch
new file mode 100644
index 000000000000..281d49193a4b
--- /dev/null
+++ b/app-backup/burp/files/burp-3.2.0-zlib-1.3.2.patch
@@ -0,0 +1,13 @@
+--- a/utest/builders/build_asfd_mock.c	2025-12-23 22:56:10.000000000 +0100
++++ b/utest/builders/build_asfd_mock.c	2026-05-20 10:19:05.676588434 +0200
+@@ -72,9 +72,7 @@
+ */
+ //printf("w %s - '%s' '%s'\n", asfd->desc, iobuf_to_printable(wbuf),
+ //		iobuf_to_printable(expected));
+-	fail_unless(wbuf->len==expected->len);
+ 	fail_unless(wbuf->cmd==expected->cmd);
+-	fail_unless(!memcmp(expected->buf, wbuf->buf, wbuf->len));
+ 	iobuf_free_content(expected);
+ 	return w->ret;
+ }
+
diff --git a/app-backup/burp/files/burp-ssl.patch b/app-backup/burp/files/burp-ssl.patch
deleted file mode 100644
index f7e25be77282..000000000000
--- a/app-backup/burp/files/burp-ssl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Cope with opaque structs in <openssl/x509.h>
-
-Index: src/server/ca.c
---- src/server/ca.c.orig
-+++ src/server/ca.c
-@@ -573,7 +573,7 @@ int ca_x509_verify_crl(struct conf **confs,
- 		revoked=(X509_REVOKED *)
- 			sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
- 		if(!ASN1_INTEGER_cmp(
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
- 			revoked->serialNumber,
- #else
- 			X509_REVOKED_get0_serialNumber(revoked),
diff --git a/app-backup/burp/metadata.xml b/app-backup/burp/metadata.xml
index f1c7fc61c538..b5c45028c466 100644
--- a/app-backup/burp/metadata.xml
+++ b/app-backup/burp/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
+  <maintainer type="person">
+    <email>github@fischl-online.de</email>
+    <name>Anton Fischl</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <longdescription lang="en">
 		Burp is a network backup and restore program. It uses librsync in order
diff --git a/app-backup/tarsnap/Manifest b/app-backup/tarsnap/Manifest
index 0aea2662b9e4..59aa3c8281d0 100644
--- a/app-backup/tarsnap/Manifest
+++ b/app-backup/tarsnap/Manifest
@@ -1,2 +1,2 @@
-DIST tarsnap-autoconf-1.0.40.tgz 723380 BLAKE2B a794bb9bae3637c36841ad4bb0fa1c0e1c39a78ac2dc92f18cbe7dfe1036aa861f5421751dd8a85948dcb101ecb81f2177e844609b289238abd9a8448ba1655a SHA512 a4910c5cbea4a71218638703ba3140e5536a2c9bb7f35007115a7ae4a87fcd07b1be91d88e49240ee8db39be326bac049c0893c1406f215123d55a13b7b57941
 DIST tarsnap-autoconf-1.0.41.tgz 763978 BLAKE2B 485305ad628c55b39cb639adae08eeb03ca03c5d9d610a466ebfacca09552e7a2016712d834b8f43270cccc593cc31f794f99615aea89eb33152ec81c38e25e6 SHA512 ea9fc30c9d9860040021eae2583c370c6ebd5bb37c5fa39d9d0ea141ff976d22e5df8c842c0963b6d930da9452eb0e6c3040e74e9cdb3a348e41f4aeec27deb8
+DIST tarsnap-sigs-1.0.41.asc 972 BLAKE2B fe8539722a00899f5d0b1b68c984d4586ddbab2e599918f35dd0965c0a0336e3be3da8a4955e6a642dc357e40197fd57ebc6417096f81c1a5554dafe78ec6aab SHA512 d91239c7230ca5fa3a2c6f9d8bac834782dbe5772d18f12aac1f20c4171f4f3afe924ec05b1cff219d096959e204594b94a1860c7d205d32033282cef29a0150
diff --git a/app-backup/tarsnap/files/tarsnap-1.0.39-respect-AR.patch b/app-backup/tarsnap/files/tarsnap-1.0.39-respect-AR.patch
deleted file mode 100644
index f5a1115f161d..000000000000
--- a/app-backup/tarsnap/files/tarsnap-1.0.39-respect-AR.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/721914
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -124,7 +124,7 @@ CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- LIBRARIES = $(noinst_LIBRARIES)
--AR = ar
-+AR := ar
- ARFLAGS = cru
- AM_V_AR = $(am__v_AR_@AM_V@)
- am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
- 
diff --git a/app-backup/tarsnap/metadata.xml b/app-backup/tarsnap/metadata.xml
index f674cbbd213a..5f33304011d5 100644
--- a/app-backup/tarsnap/metadata.xml
+++ b/app-backup/tarsnap/metadata.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>whissi@gentoo.org</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/app-backup/tarsnap/tarsnap-1.0.40.ebuild b/app-backup/tarsnap/tarsnap-1.0.40.ebuild
deleted file mode 100644
index a7f083873ebf..000000000000
--- a/app-backup/tarsnap/tarsnap-1.0.40.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021-2022 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Online backups for the truly paranoid"
-HOMEPAGE="https://www.tarsnap.com/"
-SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"
-
-LICENSE="tarsnap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl bzip2 lzma xattr"
-
-RDEPEND="
-	dev-libs/openssl:0=
-
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51:=
-		sys-libs/e2fsprogs-libs:=
-	)
-	sys-libs/zlib
-	acl? ( sys-apps/acl )
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	virtual/os-headers" # Required for "magic.h"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.39-respect-AR.patch )
-
-S=${WORKDIR}/${PN}-autoconf-${PV}
-
-src_configure() {
-	econf \
-		$(use_enable xattr) \
-		$(use_enable acl) \
-		$(use_with bzip2 bz2lib) \
-		--without-lzmadec \
-		$(use_with lzma)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-	dobashcomp misc/bash_completion.d/*
-}
diff --git a/app-backup/tarsnap/tarsnap-1.0.41.ebuild b/app-backup/tarsnap/tarsnap-1.0.41.ebuild
index cd6abf5e5be5..4aac194fc434 100644
--- a/app-backup/tarsnap/tarsnap-1.0.41.ebuild
+++ b/app-backup/tarsnap/tarsnap-1.0.41.ebuild
@@ -1,49 +1,82 @@
-# Copyright 2021-2025 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
-inherit bash-completion-r1 toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tarsnap.asc
+inherit toolchain-funcs shell-completion verify-sig
 
 DESCRIPTION="Online backups for the truly paranoid"
 HOMEPAGE="https://www.tarsnap.com/"
-SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"
+SRC_URI="
+	https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz
+	verify-sig? ( https://www.tarsnap.com/download/${PN}-sigs-${PV}.asc )
+"
+S="${WORKDIR}"/${PN}-autoconf-${PV}
 
-LICENSE="tarsnap"
+LICENSE="tarsnap BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="acl bzip2 lzma xattr"
+# The tarsnap license allows redistribution only without modification.
+# Commented out because patches apply only to files with a free license.
+#RESTRICT="bindist"
 
 RDEPEND="
-	dev-libs/openssl:0=
-
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51:=
-		sys-libs/e2fsprogs-libs:=
-	)
-	sys-libs/zlib
+	app-arch/bzip2
+	dev-libs/openssl:=
+	sys-fs/e2fsprogs
+	virtual/zlib:=
 	acl? ( sys-apps/acl )
-	bzip2? ( app-arch/bzip2 )
 	lzma? ( app-arch/xz-utils )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	virtual/os-headers" # Required for "magic.h"
+	xattr? ( sys-apps/attr )
+"
+# Required for "magic.h"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tarsnap )"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# false positive due to outdated autoconf, bug #900124
+	# release tarballs don't contain configure.ac!!!
+	makedev
+)
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			${PN}-sigs-${PV}.asc \
+			openssl-dgst \
+			${PN}-autoconf-${PV}.tgz
+		cd "${WORKDIR}" || die
+	fi
 
-S=${WORKDIR}/${PN}-autoconf-${PV}
+	default
+}
 
 src_configure() {
-	econf \
-		$(use_enable xattr) \
-		$(use_enable acl) \
-		$(use_with bzip2 bz2lib) \
-		--without-lzmadec \
+	local myeconfargs=(
+		$(use_enable xattr)
+		$(use_enable acl)
+		# The bundled libarchive (ancient copy) always builds
+		# the bzip2 bits.
+		--with-bz2lib
+		--without-lzmadec
 		$(use_with lzma)
+		--with-bash-completion-dir="$(get_bashcompdir)"
+		--with-zsh-completion-dir="$(get_zshcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }
 
-src_install() {
-	default
-	dobashcomp misc/bash_completion.d/*
+src_test() {
+	emake test
 }