gentoo resync : 16.09.2020

3 files changed, 8 insertions, 119 deletions

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 3dfecc8554db..7721916e43bf 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -4,9 +4,7 @@ AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610d
 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.30.tar.gz 617064 BLAKE2B 62aa65da16155d2a321d4ef700a83000e9754eeee53ad7605b97c589a09e1168cd4cece3076d2c4660c098967f5b19056875b5aa4f226f135a17965fc099bb44 SHA512 c315c30c064073f864058d1ec9341b6e800964f308fa5ea298759e35a58ff27a198a3b6886cc04692bc259f1cfe5a5e077542fd45d3e89813541af2e4ca03533
-DIST burp-2.3.32.tar.gz 617641 BLAKE2B f193b3ed42bb8456fbad72ca5625d4a32b498749d04fc187a87f68e03c1a4131dd8e7276bcd6ded40e551f17c6bda7c12ba538e0dc74a8d750bff91e4e2ae84b SHA512 a7393d5097b03a3684104693620ecc9646caf3f4556201977ea88462700274361b01f1134f9c18368ffec6a31d11b4a9bd9091af7a54ac98dfd724779dab41c6
+DIST burp-2.3.34.tar.gz 618913 BLAKE2B 081bfb48548a18a1029d3ea610be13f033e37c9b698cbf2b4af9dd4ced6505b3062edcd27ddb9f4cfd64289ae6a3bae2aff0444f88a2e054c9ca5c1eb74c7238 SHA512 749146a2581e6c47c2343201b050f44e098a5a93e39b5426934ed74ee0eca73431e148c548b6d657e33357cd5973a12fb4c7a4737f46ce5482a2ce7684762fcf
 EBUILD burp-2.2.18-r1.ebuild 2832 BLAKE2B 91c0da9f9e456cde5b62dbe114efecc42aa9af1ac38c6e5bb0eac0c8b8aa8f6c454cd8d318b4cf27c039c3848d40c386d544b79e0a863b4b24f9dde41275eba2 SHA512 bb31a0f602f8bbaa50968a3085d84625711dc0d7f53ccd7f4216d8e1009b59da824d266729d0e2ac54ad0b02468146f770dcc45162a5dac950c35e503967ff5f
-EBUILD burp-2.3.30.ebuild 3101 BLAKE2B 888c2c4e938d3d8fa385aa1c60cbee41807e3e09893b33561b0f8bd2b412642af3b9dcaedec605cf3a792341d8ccd7807cd24f1629a6419e90cae08eb26066be SHA512 94a2b64aea3d2dd2c792eb7fff090ab9b2910f2b80f8841868e2a7508525790e3c7cc67dbe4c7f90c950be5102793d4d99a277122da3b6c36d3caccf3e447fdc
-EBUILD burp-2.3.32.ebuild 3101 BLAKE2B 888c2c4e938d3d8fa385aa1c60cbee41807e3e09893b33561b0f8bd2b412642af3b9dcaedec605cf3a792341d8ccd7807cd24f1629a6419e90cae08eb26066be SHA512 94a2b64aea3d2dd2c792eb7fff090ab9b2910f2b80f8841868e2a7508525790e3c7cc67dbe4c7f90c950be5102793d4d99a277122da3b6c36d3caccf3e447fdc
+EBUILD burp-2.3.34.ebuild 3205 BLAKE2B 5dbac3c78cd16a6da6e65b2f57849c0e4e4792c1d208a7be1fac30264cac9985510611877bf62108489b649927f7e07223c33a9073129214f5b2fda0f069b2e4 SHA512 e214fa7397b8aae84211c510a61fe54804eba7490a5e5c04de95036e590df080cb77c1a6edfc8fbf5944f655f6d3174ae0b543e0115a58669754ec3ffb12e9f9
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
diff --git a/app-backup/burp/burp-2.3.32.ebuild b/app-backup/burp/burp-2.3.32.ebuild
deleted file mode 100644
index 34645f772590..000000000000
--- a/app-backup/burp/burp-2.3.32.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 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 libressl 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
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-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_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.3.30.ebuild b/app-backup/burp/burp-2.3.34.ebuild
index 34645f772590..a72b5a23100f 100644
--- a/app-backup/burp/burp-2.3.30.ebuild
+++ b/app-backup/burp/burp-2.3.34.ebuild
@@ -58,6 +58,12 @@ src_configure() {
 		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