gentoo resync : 13.10.2019

4 files changed, 6 insertions, 113 deletions

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 82eadf47fe08..d916152b6856 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -3,9 +3,7 @@ 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.1.32.tar.gz 591737 BLAKE2B fd525bff32348f1dbc37b1c065d262ff8af1d999d19f63711ebcff3fb55e90a7440cc6cfc0b7eefe6f8e250672c799d86e65ed599f0b8d7dd80bebcb99888987 SHA512 2477b7a9a2123b227a27519f7f3d9facca7173a9e63d66f6a8fb2ae5408d8af4ad5bfdd0a14efd6cf80e7bc8e91907f7c293a3d621b86bafdbf163bfa08d0c81
 DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d
-EBUILD burp-2.1.32-r1.ebuild 2841 BLAKE2B aa96c385aee446cb39191f067eb7896bed961a0711372a8db1aee2209a692286d64ad63cd6cf9551497f00cba8e570b9f46f54d1fb39b08b3982464c8df47457 SHA512 b5405cae46b2991827adf6fb152a12cfb8ef382f07575882f81f73e88a13ab0af93f122fc551293e8e5fa0d6063832eef0cb30dd8f3b9b8cfcfb8082e24780d9
-EBUILD burp-2.2.18-r1.ebuild 2806 BLAKE2B 1cea6fda2ab3bae884f149ed1a2e26cfb8715eb010390d8b264bbd318e44eb873df1bb6c96440b0f01191eff3613117f2be486948dd11ca3699b3fa31195cb01 SHA512 5c331c155b0a807e18ebc26a8c0bf2847a39b0d65b1dc2a08bf4e338500e026f7699ef7dd3f735d43ce70186b14105ab33148522f0becec500f57e0e34f98b2a
-EBUILD burp-2.2.18.ebuild 2846 BLAKE2B ec0ad61b2b7502cf0462315e7e515ff285a0d231ee9d4fe98adc0fe38f1397bace971c12f48e27a4205c42465da3993fa8bdac3836b98105c378713ac8f5d411 SHA512 f8b0235a5e77ec0f4911b699dff22c77f022acfc2d2931f9723aff2974aef6fbe4cfeed4e915770306ff819d77a2ffc40c7d624589fa2901d639895de4f294ed
+EBUILD burp-2.2.18-r1.ebuild 2834 BLAKE2B 43c82ad416be2cfa689f037d0c61dec3fd88e752f2697653e348f57a2875af09292ad46f4bac9c7d0f7d45e7c4d6c37b47c38a70635df881b7be8b540357e976 SHA512 012a20f640b6999d91e47aec6d85da3cf9146b826a91f4f06a450a229eb7b1ba6c02a52983b919b531386faf34750c2c75fe44c39797d5362a440ff2072d26d2
+EBUILD burp-2.2.18.ebuild 2874 BLAKE2B f6c253a5adfc5e945a9f9b8e919556c124fd0205b269409680f3ba3b7aed79ff420859ab574fb69e2364071232fd87eeacdf73263c9401bfc617284b40be9d29 SHA512 7b4b21657a6cc4abb6bee9bd2e86160e7620cc4df4ab9e42c502b26df265eed89c7da2fa7f10a26c80b7913f7261e754e9802f1842589f59f1491ed9f9a33477
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
diff --git a/app-backup/burp/burp-2.1.32-r1.ebuild b/app-backup/burp/burp-2.1.32-r1.ebuild
deleted file mode 100644
index 18bb33408e5d..000000000000
--- a/app-backup/burp/burp-2.1.32-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd user versionator
-
-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"
-
-CDEPEND="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
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-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
-	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 /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 [[ $(get_major_version ${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.2.18-r1.ebuild b/app-backup/burp/burp-2.2.18-r1.ebuild
index fdfa715eed61..14448982e6d5 100644
--- a/app-backup/burp/burp-2.2.18-r1.ebuild
+++ b/app-backup/burp/burp-2.2.18-r1.ebuild
@@ -14,6 +14,8 @@ 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
diff --git a/app-backup/burp/burp-2.2.18.ebuild b/app-backup/burp/burp-2.2.18.ebuild
index cf4ac612bd2b..0d5a5cd5cd47 100644
--- a/app-backup/burp/burp-2.2.18.ebuild
+++ b/app-backup/burp/burp-2.2.18.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="acl ipv6 libressl test xattr"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="dev-libs/uthash
 	net-libs/librsync
 	sys-libs/ncurses:0=