gentoo auto-resync : 03:12:2022 - 14:59:58

3 files changed, 2 insertions, 120 deletions

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 761a8a1f63d5..7d6514a67cac 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -6,7 +6,6 @@ AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
 DIST burp-2.4.0.tar.gz 624032 BLAKE2B 4a1ff48236dc631dd6d545480a33af3cdf8020c3088f1ca09ab66ac5cec8128d262b9b991bf9e3229c80f75a4746d338073a0a43fdb67a2fe21a0fd4f243469d SHA512 ea81a12e54c6d88b702dd09dc4fa5a724d1e322bdfba2643c9312a9077c9edc63f6ca0f6cb3a6ebecb6ad9feb1cc26c114277b2308d9903f4abb0442a9be7c19
 DIST burp-3.1.2.tar.gz 549260 BLAKE2B a8767d9ac2188e7a44fa2e8e4ba08dd3a5edeac268afcf196db5cae06e8bcc1faae1a48ba1873ef43fdbb9764946384233a755779e09984217b4334781529024 SHA512 a832502f617b66b87feeff032002bc25827809a165e3fb6ef85a9f3d847e308e9fa69f138b7e80662366fa3de09b39f7ef209b529d82c3d487dca11fe3ebcddf
-EBUILD burp-2.4.0-r1.ebuild 3018 BLAKE2B af972d0d9659683f0d229a0ea51aedb7abfd120fd9285e8e5e1d72c13330ecd70234fe6aba0ef2e9f9bff733d7fef097d613cd3818e675117a924171ee3d77b6 SHA512 1989cf48300401556e78538b666d1e8114e29ede419430af14664f0ed7af1da406c9a84bdca9043b619cdf85446192cac39f668d1a5249a232a89ad5331e8109
-EBUILD burp-2.4.0.ebuild 2967 BLAKE2B 1750cbef2e51155f745308f1ae3913e46a9ed34e7bebdedc02994adc66679ae053a8ba6bbf3aee584c4ebb22ebb05dbcbdba23a6655d35d93eac069c947c4647 SHA512 0c484c2dbbdbe8b681facb1da7735167535265c483d5323b64b5932e4eb322b255b08d336b66290b4763267f3a6c27c358034e789496bae02462a2b3a38122dc
+EBUILD burp-2.4.0-r2.ebuild 3024 BLAKE2B 3e055fd9b6baeff748ae0947153ddecab47630cee644d1a2bbb6177f250932c691d53e9612c0ff78b29f9aab7cbb0a1be69ee54e1dc2d577f7fbbc3b9cd7c024 SHA512 7231796aa70493cbd18561e11f851b443f4eb8de3a85bc43a0d5bf3fb0384171b2743a1f94bd4c65606a867600717e777a9c3657884c5a08dcc64707cc11f10e
 EBUILD burp-3.1.2.ebuild 2914 BLAKE2B 6208675f02c598ccbb07234b5487a1dd40a9a3c4e08c5cd8bf54e7148f8f957f75bfc3fe46ecfe740dad0a4684f05dbe5487474cf129ca9caa38cbdafa178d1c SHA512 4eb1bad4ce04987a8dd5f166ed54b764160013470092daae4cfaa7d014c320cd6d744eaece6960e81d3e2d88dae7264944890927e743baebfe41697b9f2c2d16
 MISC metadata.xml 824 BLAKE2B 144475d686773901cee9f3926e843a2d9b3cab8a9db0c2b6d590b389dde0dda059bb06abb74e015d19a1f1ed60c4a2c7a11c06bf35e93bf1be8cb2a702447558 SHA512 1cc41b5f4c4d31355824a595f778702b79bec6a45b398e503834d55408bdbbf708bafc7c364f5fc038e31eef26baf4adcd8cd922ac18f6a41b5be446eb9ebf0c
diff --git a/app-backup/burp/burp-2.4.0-r1.ebuild b/app-backup/burp/burp-2.4.0-r2.ebuild
index 1828f91d0e5b..30d969280e58 100644
--- a/app-backup/burp/burp-2.4.0-r1.ebuild
+++ b/app-backup/burp/burp-2.4.0-r2.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="acct-group/burp
 	acct-user/burp
 	dev-libs/uthash
-	dev-libs/openssl:0=
+	<dev-libs/openssl-3.0.0:=
 	net-libs/librsync:=
 	sys-libs/ncurses:0=
 	sys-libs/libcap
diff --git a/app-backup/burp/burp-2.4.0.ebuild b/app-backup/burp/burp-2.4.0.ebuild
deleted file mode 100644
index b694099ed5d7..000000000000
--- a/app-backup/burp/burp-2.4.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo 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 )"
-
-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="${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? ( dev-libs/check )"
-BDEPEND=">=sys-devel/autoconf-2.71
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	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
-		--runstatedir=/run
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
-	)
-	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() {
-	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
-
-	# 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 ${EROOT}/etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
-}