gentoo resync : 22.05.2021

3 files changed, 2 insertions, 56 deletions

diff --git a/app-admin/gentoo-rsync-mirror/Manifest b/app-admin/gentoo-rsync-mirror/Manifest
index 822db6ce5cf4..6e1a335a00ec 100644
--- a/app-admin/gentoo-rsync-mirror/Manifest
+++ b/app-admin/gentoo-rsync-mirror/Manifest
@@ -3,6 +3,5 @@ AUX rsync-gentoo-portage.sh 332 BLAKE2B 1f060ffdb7b7a1116875804053e80896d36dad31
 AUX rsyncd.conf 611 BLAKE2B 2842f2fe86d3d84e6385d979337a523db12fa8f39316652d2cc0151431e033d7832d5299ec49e0fedd4d55e9faf67014ca32cf020f13adda5143b340f5f8988b SHA512 11af716d1741d482f11ec9a9a2d5edbf4c3c0bacd7ed357588f2a8398d313d47de880ae5c38f40ce940259cb741cd7695eab42249ca10e05c3f2654581ffc791
 AUX rsyncd.motd 44 BLAKE2B 764e92b05ece7c7c114106e3cb634cce9383b96b7e076b2cc95217aba5eff6a849e32da1acd2d1cb34316b81701ecf4c7b09bc304e43eff992014128048170bf SHA512 812c0e738274222e65e5bc57379ebc6150c232cd8bf98e72b500763828bfcfa45fb8e89c7cccd5e34685f4e5d4787d9cd2ab03ace64bc76f5c5416deb03c17f3
 AUX rsynclogparse-extended.pl 3476 BLAKE2B 230fc0a15cb5341f3bbf1455b86e5bd0a92bd12eaf5d8ece373bfcac0d1b45b310b0a3194d2200676b351e5b5931be51319801b1e5df87cb7d41c799447dca8a SHA512 60656deb0e501c51c4a37d2f9cce2829faea830ae42d1f33db52f37b337b71a125b7d350e893fb6098b405e1439cbde160d9e7ecda3ebd8a8f8c34b84acf80b3
-EBUILD gentoo-rsync-mirror-1.0-r5.ebuild 1979 BLAKE2B a74cf0aeea5514a6f336f830352d1af6819472568103821228b976e06c0f142aac90f591c168df9e54253ba8db7c22c2510b19ba8d7fef761599222eadddef78 SHA512 aaa53eed5de43ec23719725839b235c5ec46ebce2645328b62ea475a055b71489d95a0415f9da47b08531ca95e0569a27b017cdb9b173a206396c9e85c5a90df
-EBUILD gentoo-rsync-mirror-1.0-r6.ebuild 1960 BLAKE2B a8b7ba5eca1cc7ba4d77f99604961679817b180bc8f3edbf64bd58819cf6eed820c9f945b437226d32353984e0f7c53dcf72c39a3532147feb2103ba925bd926 SHA512 d48410057c70f4ab892396863fda248a980ea7360d1c0b739994ca4521ab58bfe0733d09beb473d645997e68b92005c8767dfe7fb0f8a3536ab84202c3c081c8
+EBUILD gentoo-rsync-mirror-1.0-r6.ebuild 1955 BLAKE2B d4b7cce1ed3ea86d2390e1728516642afbf5f53e3ca1beaa02e118bdfb458e2c53871c5b0e927b7d2e5950cb5bc6a1f3b1a5ea551e0c283dac6a228df2b1743a SHA512 017a88bb5f50e8d3f53919bb170b6ebd8ea0fc5ae72227a4979542f8d6abe1c0a484fadbb97c5d816c0522df0ed8fd49636fd0e6f59d3b6c3e31567670464f81
 MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
deleted file mode 100644
index b2eaae686135..000000000000
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /opt/gentoo-rsync
-	doexe "${FILESDIR}"/rsync-gentoo-portage.sh
-	doexe "${FILESDIR}"/rsynclogparse-extended.pl
-	insinto etc/rsync
-	doins "${FILESDIR}"/rsyncd.conf
-	doins "${FILESDIR}"/rsyncd.motd
-	doins "${FILESDIR}"/gentoo-mirror.conf
-	dodir /opt/gentoo-rsync/portage
-}
-
-pkg_postinst() {
-	elog "The rsync-mirror is now installed into /opt/gentoo-rsync"
-	elog "The local portage copy resides in      /opt/gentoo-rsync/portage"
-	elog "Please change /opt/gentoo-rsync/rsync-gentoo-portage.sh for"
-	elog "configuration of your main rsync server and use it to sync."
-	elog "Change /etc/rsync/rsyncd.motd to display your correct alias."
-	elog
-	elog "RSYNC_OPTS="--config=/etc/rsync/rsyncd.conf" needs"
-	elog "to be set in /etc/conf.d/rsyncd to make allow syncing."
-	elog
-	elog "The service can be started using /etc/init.d/rsyncd start"
-	elog "If you are setting up an official mirror, don't forget to add"
-	elog "00,30 * * * *      root    /opt/gentoo-rsync/rsync-gentoo-portage.sh"
-	elog "to your /etc/crontab to sync your tree every 30 minutes."
-	elog
-	elog "If you are setting up a private (unofficial) mirror, you can add"
-	elog "0 3 * * *	root	/opt/gentoo-rsync/rsync-gentoo-portage.sh"
-	elog "to your /etc/crontab to sync your tree once per day."
-	elog
-	elog "****IMPORTANT****"
-	elog "If you are setting up a private mirror, DO NOT sync against the"
-	elog "gentoo.org official rotations more than once a day.  Doing so puts"
-	elog "you at risk of having your IP address banned from the rotations."
-	elog
-	elog "For more information visit: https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
-}
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r6.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r6.ebuild
index 99328b9e78df..b2b2a0289c6c 100644
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r6.ebuild
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r6.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 
 S="${WORKDIR}"