Patched gentoo-rsync-mirror script. Changed metadata. Closes #88054.

(Portage version: 2.0.51.22-r2)

6 files changed, 79 insertions, 17 deletions

diff --git a/app-admin/gentoo-rsync-mirror/ChangeLog b/app-admin/gentoo-rsync-mirror/ChangeLog
index 3806f83ef955..84c4434eb6b8 100644
--- a/app-admin/gentoo-rsync-mirror/ChangeLog
+++ b/app-admin/gentoo-rsync-mirror/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/gentoo-rsync-mirror
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/ChangeLog,v 1.25 2005/06/02 18:33:51 omkhar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/ChangeLog,v 1.26 2005/07/28 22:31:42 tantive Exp $
+
+*gentoo-rsync-mirror-1.0-r5 (28 Jul 2005)
+
+  28 Jul 2005; Michael Imhof <tantive@gentoo.org>
+  files/rsync-gentoo-portage.sh, metadata.xml,
+  +gentoo-rsync-mirror-1.0-r5.ebuild:
+  Patched gentoo-rsync-mirror script. Changed metadata. Closes #88054.
 
   02 Jun 2005; Omkhar Arasaratnam <omkhar@gentoo.org>
   gentoo-rsync-mirror-1.0-r4.ebuild:
diff --git a/app-admin/gentoo-rsync-mirror/Manifest b/app-admin/gentoo-rsync-mirror/Manifest
index cfc4370f2a33..a9da0079a46c 100644
--- a/app-admin/gentoo-rsync-mirror/Manifest
+++ b/app-admin/gentoo-rsync-mirror/Manifest
@@ -1,9 +1,11 @@
-MD5 eb50fd50d69fe7ae304b716aa70740fd gentoo-rsync-mirror-1.0-r4.ebuild 2080
+MD5 eb50fd50d69fe7ae304b716aa70740fd gentoo-rsync-mirror-1.0-r5.ebuild 2080
+MD5 d2daa22c953834b3854c99417e6f0a19 metadata.xml 291
 MD5 9a0e8e30467093483251c9fe7900fe07 ChangeLog 3030
-MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
-MD5 106fe6e320ef412edeed16ce96f5128f files/rsync-gentoo-portage.sh 235
+MD5 eb50fd50d69fe7ae304b716aa70740fd gentoo-rsync-mirror-1.0-r4.ebuild 2080
+MD5 ee8368fc4f76d62d2dcde7689f1b432c files/rsync-gentoo-portage.sh 342
 MD5 2772b1fe18c7c54ea201fa2a7dd2f19b files/gentoo-mirror.conf 456
-MD5 866f4631fad8ab795f8420dfb8144ffb files/rsynclogparse-extended.pl 3476
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoo-rsync-mirror-1.0-r4 0
 MD5 4047d0e8a4cc37326c8f37d873b7ec09 files/rsyncd.conf 735
 MD5 508f4e735f2fbacd4a123c002c72e545 files/rsyncd.motd 44
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoo-rsync-mirror-1.0-r4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoo-rsync-mirror-1.0-r5 0
+MD5 866f4631fad8ab795f8420dfb8144ffb files/rsynclogparse-extended.pl 3476
diff --git a/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r5 b/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r5
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r5
diff --git a/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh b/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh
index c37b8279b730..8224f0c2aa54 100644
--- a/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh
+++ b/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh
@@ -1,10 +1,11 @@
-#!/bin/bash
-
-source /etc/rsync/gentoo-mirror.conf
-
-echo "Started update at" `date` >> $0.log 2>&1
-logger -t rsync "re-rsyncing the gentoo-portage tree"
-${RSYNC} ${OPTS} ${SRC} ${DST} >> $0.log 2>&1
-
-echo "End: "`date` >> $0.log 2>&1 
-
+#!/bin/bash

+

+source /etc/rsync/gentoo-mirror.conf

+

+echo "Started update at" `date` >> $0.log 2>&1

+logger -t rsync "re-rsyncing the gentoo-portage tree"

+${RSYNC} ${OPTS} ${SRC} ${DST} >> $0.log 2>&1

+logger -t rsync "deleting spurious Changelog files"

+find ${DST} -iname ".ChangeLog*" | xargs rm -rf

+

+echo "End: "`date` >> $0.log 2>&1
\ No newline at end of file
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
new file mode 100644
index 000000000000..fcabe61845be
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild,v 1.1 2005/07/28 22:31:42 tantive Exp $
+
+DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror"
+HOMEPAGE="http://www.gentoo.org/doc/en/rsync.xml"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~alpha ~ppc ~sparc ~x86 ~hppa ~ppc64"
+IUSE=""
+
+DEPEND="virtual/libc"
+RDEPEND="net-misc/rsync
+	dev-lang/perl"
+
+S=${WORKDIR}/gentoo-rsync-mirror-${PV}
+
+src_install() {
+	dodir /opt/gentoo-rsync
+	cp ${FILESDIR}/rsync-gentoo-portage.sh ${D}/opt/gentoo-rsync
+	cp ${FILESDIR}/rsynclogparse-extended.pl ${D}/opt/gentoo-rsync
+	insinto etc/rsync
+	doins ${FILESDIR}/rsyncd.conf
+	doins ${FILESDIR}/rsyncd.motd
+	doins ${FILESDIR}/gentoo-mirror.conf
+	dodir /opt/gentoo-rsync/portage
+}
+
+pkg_postinst() {
+	einfo "The rsync-mirror is now installed into /opt/gentoo-rsync"
+	einfo "The local portage copy resides in      /opt/gentoo-rsync/portage"
+	einfo "Please change /opt/gentoo-rsync/rsync-gentoo-portage.sh for"
+	einfo "configuration of your main rsync server and use it so sync."
+	einfo "Change /etc/rsync/rsyncd.motd to display your correct alias."
+	einfo
+	einfo "The service can be started using /etc/init.d/rsyncd start"
+	einfo "If you are setting up an official mirror, don't forget to add"
+	einfo "00,30 * * * *      root    /opt/gentoo-rsync/rsync-gentoo-portage.sh"
+	einfo "to your /etc/crontab to sync your tree every 30 minutes."
+	einfo
+	einfo "If you are setting up a private (unofficial) mirror, you can add"
+	einfo "0 3 * * *	root	/opt/gentoo-rsync/rsync-gentoo-portage.sh"
+	einfo "to your /etc/crontab to sync your tree once per day."
+	einfo
+	einfo "****IMPORTANT****"
+	einfo "If you are setting up a private mirror, DO NOT sync against the"
+	einfo "gentoo.org official rotations more than once a day.  Doing so puts"
+	einfo "you at risk of having your IP address banned from the rotations."
+	einfo
+	einfo "For more information visit: http://www.gentoo.org/doc/en/rsync.xml"
+}
diff --git a/app-admin/gentoo-rsync-mirror/metadata.xml b/app-admin/gentoo-rsync-mirror/metadata.xml
index db933d7a6217..60773be7dbec 100644
--- a/app-admin/gentoo-rsync-mirror/metadata.xml
+++ b/app-admin/gentoo-rsync-mirror/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
 <maintainer>
   <email>tantive@gentoo.org</email>
   <name>Michael Imhof</name>