gentoo resync : 20.03.2022

4 files changed, 26 insertions, 140 deletions

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index b5ca28d9bf37..2ac52cafce7c 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -3,10 +3,8 @@ AUX burp-2.1.20-no_mkdir_run.patch 238 BLAKE2B 44ba927f8ca97386d70d52411f2fe5ca2
 AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610dd918b583455fda6d13eef6292a7eeaac0d14266bf21f97caf6dba65f0a46b1534695e7b72b91c6958d86f70ac63e356b5e05691 SHA512 249a426a76a81a2582f824d2d767695bfd848a04190ee9a2f1d4296bed03f93d4eaa86c13b4b755700b1b552bb584f9b0031ec60a705f2b27b20d62eb58aef8c
 AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef3fc3d42249e23a97555f9ce67d13a94565d0f3f61a7f4fd5c71300e7988b9d666f220122e0f1 SHA512 dc06be1e5433973f6bbabd86671ea20f12bf57d91871b4664bd7fbae32a561967f139b99674ac93a3a9ec56380e090500c118b45917f884b69395e3f03f9a311
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
-DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d
-DIST burp-2.3.36.tar.gz 619564 BLAKE2B 8f30fb8808c8a3167467ef0bcdc84cd7c2e885ee6a8aa285d96f9187aeb33eacb90fefe382ddb74bbabcfefde6faa9ac6125e3bf4a6eb9778b650e74e812991d SHA512 48b852aca8ccf0abd696b9434cb83c0447845192096d0f3f0c032c328dcc20314faf68db94fa14da72692327432b78eb3680e83b1e892dd30c9aa2f340838ee3
 DIST burp-2.4.0.tar.gz 624032 BLAKE2B 4a1ff48236dc631dd6d545480a33af3cdf8020c3088f1ca09ab66ac5cec8128d262b9b991bf9e3229c80f75a4746d338073a0a43fdb67a2fe21a0fd4f243469d SHA512 ea81a12e54c6d88b702dd09dc4fa5a724d1e322bdfba2643c9312a9077c9edc63f6ca0f6cb3a6ebecb6ad9feb1cc26c114277b2308d9903f4abb0442a9be7c19
-EBUILD burp-2.2.18-r2.ebuild 2802 BLAKE2B 5836cb858ddefee698aa1781b30c0e2102cdff4acb1d8f1d53cec0afb4183085c4435ce0b0a4fe74cbeb348d9c8430580207b479da6a7bd3bb67ef4a91ac5499 SHA512 b7015a72e38382af5308eb5b3e666b52c5c34a9965178dc728e7163a1e77bdbcc7a00dd0801c14b2a48087b72fff3f770149801b8ae8ae9fadbe8eb3ce17ca71
-EBUILD burp-2.3.36-r1.ebuild 3173 BLAKE2B 769e558604b2d4de172b2d640222577e813a17ce5a805fd5fa16ea455527e66ec14655dae72b64f24ca1e4abfbb1f2ba39d26ee6353571c318fb4bb7055f2773 SHA512 42aa51c9e035e88f2eec4d9cfe9fef4ae70c4afb17f3502a42c0160dc7143e677dbc1eb537b310154a9a20b3dc5daa93a086d30c4186651ad110f7929933cb9a
-EBUILD burp-2.4.0.ebuild 2926 BLAKE2B eb2406bd0b45cdc0d4d9fc4a697f1aed432e45a66ba44712d917e0690105e9695deeb9b1d543724b7397372e06cb7f36cfe480c937e0afa56659fa07f5a6c6aa SHA512 66963b2dfb784dc664097d7f5581860fa1da1ddbe8c2a26162b8123926ae3e977e4ff794feb939885ef7aef18073deff0e69b226988dce9e3dd7e3a5e6093705
+DIST burp-2.5.4.tar.gz 625018 BLAKE2B 83cb8e48c616f527b2271c6ea5855a303f2925d3d0b83182afc64fe139676a4b1b98349d0ba0636613d3409f100417c4a36b7b1f24bc64bba329940d4587cd2b SHA512 b283e34e76a6887517d72c99deac5e0299efa07dd922d1275666683cc3ba4b040b97e5ce4840cb06025926ea616778811bf4c9c6f9c7564da5122900cdd7bad0
+EBUILD burp-2.4.0.ebuild 2967 BLAKE2B 1750cbef2e51155f745308f1ae3913e46a9ed34e7bebdedc02994adc66679ae053a8ba6bbf3aee584c4ebb22ebb05dbcbdba23a6655d35d93eac069c947c4647 SHA512 0c484c2dbbdbe8b681facb1da7735167535265c483d5323b64b5932e4eb322b255b08d336b66290b4763267f3a6c27c358034e789496bae02462a2b3a38122dc
+EBUILD burp-2.5.4.ebuild 2969 BLAKE2B 4271114fa6845a377d910bc0a34bd4bb9e27aec4048822928b32b00ede5c64cc20f59216f530ed72d8231be46906ffe3bd66dbbfffbaccd9703393704be309f0 SHA512 96b0dfdcf82f220fd57771abf9b5f6b4787b5a506c698c2cf9a9c9afb36945d0acc1e0c1269d084d93df23139331b2f31392400eadfcd042f95ff2a44342ed83
 MISC metadata.xml 824 BLAKE2B 144475d686773901cee9f3926e843a2d9b3cab8a9db0c2b6d590b389dde0dda059bb06abb74e015d19a1f1ed60c4a2c7a11c06bf35e93bf1be8cb2a702447558 SHA512 1cc41b5f4c4d31355824a595f778702b79bec6a45b398e503834d55408bdbbf708bafc7c364f5fc038e31eef26baf4adcd8cd922ac18f6a41b5be446eb9ebf0c
diff --git a/app-backup/burp/burp-2.3.36-r1.ebuild b/app-backup/burp/burp-2.3.36-r1.ebuild
deleted file mode 100644
index 64656ff83755..000000000000
--- a/app-backup/burp/burp-2.3.36-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	dev-libs/openssl:0=
-	net-libs/librsync:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.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/burp-2.4.0.ebuild b/app-backup/burp/burp-2.4.0.ebuild
index 7b41744c57b6..b694099ed5d7 100644
--- a/app-backup/burp/burp-2.4.0.ebuild
+++ b/app-backup/burp/burp-2.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="acl ipv6 test xattr"
 
 RESTRICT="!test? ( test )"
@@ -28,6 +28,7 @@ COMMON_DEPEND="acct-group/burp
 	acl? ( sys-apps/acl )
 	xattr? ( sys-apps/attr )"
 DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
 	test? ( dev-libs/check )"
 BDEPEND=">=sys-devel/autoconf-2.71
 	virtual/pkgconfig"
diff --git a/app-backup/burp/burp-2.2.18-r2.ebuild b/app-backup/burp/burp-2.5.4.ebuild
index b9b40e1d1d59..f43a92ad64bd 100644
--- a/app-backup/burp/burp-2.2.18-r2.ebuild
+++ b/app-backup/burp/burp-2.5.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools systemd
 
@@ -11,25 +11,28 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl ipv6 test xattr"
 
 RESTRICT="!test? ( test )"
 
-CDEPEND="acct-group/burp
+COMMON_DEPEND="acct-group/burp
 	acct-user/burp
 	dev-libs/uthash
 	dev-libs/openssl:0=
 	net-libs/librsync:=
 	sys-libs/ncurses:0=
+	sys-libs/libcap
 	sys-libs/zlib
 	virtual/libcrypt:=
 	acl? ( sys-apps/acl )
 	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
 	test? ( dev-libs/check )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${CDEPEND}
+BDEPEND=">=sys-devel/autoconf-2.71
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
 	virtual/logger"
 
 PATCHES=(
@@ -49,13 +52,18 @@ src_configure() {
 		--localstatedir=/var
 		--sysconfdir=/etc/burp
 		--enable-largefile
+		--runstatedir=/run
 		$(use_enable acl)
 		$(use_enable ipv6)
 		$(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
+	default
 }
 
 src_install() {
@@ -81,13 +89,13 @@ pkg_postinst() {
 	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
 
@@ -100,7 +108,7 @@ pkg_postinst() {
 			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 "  bedup -c ${EROOT}/etc/burp/burp-server.conf"
 			ewarn ""
 			ewarn "Otherwise deduplication will not work!"
 			break