gentoo resync : 08.01.2021

3 files changed, 3 insertions, 51 deletions

diff --git a/net-misc/ucarp/Manifest b/net-misc/ucarp/Manifest
index 605c12bca68e..1e00f5f3dfd5 100644
--- a/net-misc/ucarp/Manifest
+++ b/net-misc/ucarp/Manifest
@@ -8,6 +8,5 @@ AUX vip-down-default.sh-r1 118 BLAKE2B b9e814d9247ee11978f2a5cf5c285aa4ab0ec8a1e
 AUX vip-up-default.sh 132 BLAKE2B 01d0976bc4029250a481ad22db0432b62604030ed2d6d3f93e6bf9fceed1d077bee1eb9068d748faaae1bae91d3f7e347d411fa8e7cb4e40da98017980af9701 SHA512 4db8a047c39671578d0fa0e0dfadf3ce6e4f5881a85811c5c8e986f26c97b5de64cc58578cd77ba9ee93e2c6659b178c69575d3006934da56736441c30c703ce
 AUX vip-up-default.sh-r1 131 BLAKE2B b0067bf6a9c442fe536564fc50f589be00caf7dbacfe1bb2370d467a5f5e706a548bfb5db8d2f5d21bf946ab543e0a2f84c74d07d737772c70713c583ec551a1 SHA512 d00a2acaa44567f936e029af96a841bf815b75e18f5d2563800e996acdea68ef3265e7ea7b67e7cba3fe671e7809ec905e9cc39ad5fe2c807170cfa1fa6595ff
 DIST ucarp-1.5.2.tar.gz 429089 BLAKE2B 2e30b5c2f1f4e51662e9dab0e3b32eae636fbaeb533df2c8753dd1df8199101aa75b146bda1035fd77b0d209617eb9eb1d3a8b2fc4bd5089e6c1478c4a821ef8 SHA512 568ff2061e59d314c72a160ccb42eb099bf7cdf04bc30f405b5b62322dff3ceb4fa037c2b430fdb4cee25f0dcacf9309a15bd814b4b70b640840400bda20b253
-EBUILD ucarp-1.5.2-r3.ebuild 1247 BLAKE2B 067f4cab17d51e15ffc2abd8407450ded183e6e6ac7d82af3994b0b1ebea0f0da3e3ef25ed2b954cb07379a2249ee050b62913493821bfd3c97c7785740589d1 SHA512 66ab66b2db551c97bee096a2f1d81767c10e6beb96c2268504db219c2b01b4edae118c82ca04c3fa2d153d486673ab108caba5ff43d5168530f9a5a0eea75bc4
-EBUILD ucarp-1.5.2-r7.ebuild 1450 BLAKE2B 3571bb3a3fa11476607ec3815616669e21559e7293f4e40686a578a8fcbf5e82d5ae7a27667362fbad0f7571995ba19a349f0d9e08c6dc38f0e5caeca2cc3dd5 SHA512 2b581d01af3b1d423837a1f1c9b1432d98a2068d6a5c9a997c47e80c33430fbdc388778fb22f8c5ffe5ac75cca97c4221922584b35aae190fb7ac82b39197ab7
+EBUILD ucarp-1.5.2-r7.ebuild 1449 BLAKE2B 2b683279698197cfecda7f838cbeaa8a8aecd4d62303fe65776e565c3c695f9da451ddb1839142875df91099f195d5d723b968b607eab9363cbdb852f5b965ab SHA512 51221af2c881fe34adf6c1eb1ccbe6f96a128ca83458984c1b62a0aa41003ac05c803d91c99f595defde5f16a34b3a2e5ce0778411224d69be1260f2a1cf4ecb
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/net-misc/ucarp/ucarp-1.5.2-r3.ebuild b/net-misc/ucarp/ucarp-1.5.2-r3.ebuild
deleted file mode 100644
index 7a09ba18faf4..000000000000
--- a/net-misc/ucarp/ucarp-1.5.2-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
-HOMEPAGE="http://www.ucarp.org"
-SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	doman "${FILESDIR}"/ucarp.8
-
-	exeinto /usr/libexec/ucarp
-	doexe "${FILESDIR}"/vip-up-default.sh
-	doexe "${FILESDIR}"/vip-down-default.sh
-
-	keepdir /etc/ucarp
-
-	newinitd "${FILESDIR}"/ucarp.initd-r1 ucarp
-	newconfd "${FILESDIR}"/ucarp.confd ucarp
-}
-
-pkg_postinst() {
-	elog "The provided init script needs to be configured first."
-	elog "Edit /etc/conf.d/ucarp to suite your environment."
-	elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass"
-	elog "or whatever file you have set \$UCARP_PASSFILE to."
-
-	elog "If you need more than one instance of ucarp running, simply symlink"
-	elog "the init script and create a copy of the init script configuration"
-	elog "which corresponds to the name of the init script."
-}
diff --git a/net-misc/ucarp/ucarp-1.5.2-r7.ebuild b/net-misc/ucarp/ucarp-1.5.2-r7.ebuild
index a843fc050bfa..71bed0a3f337 100644
--- a/net-misc/ucarp/ucarp-1.5.2-r7.ebuild
+++ b/net-misc/ucarp/ucarp-1.5.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug nls"
 
 RDEPEND="net-libs/libpcap"