Version bumped. Introduces a config file. Closes #53210.

8 files changed, 36 insertions, 63 deletions

diff --git a/app-admin/gentoo-rsync-mirror/ChangeLog b/app-admin/gentoo-rsync-mirror/ChangeLog
index 6f0d7fc605a8..81c53fb5e190 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/ChangeLog,v 1.18 2004/07/18 13:50:27 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/ChangeLog,v 1.19 2004/08/30 23:38:09 tantive Exp $
+
+*gentoo-rsync-mirror-1.0-r4 (31 Aug 2004)
+
+  31 Aug 2004; Michael Imhof <tantive@gentoo.org>
+  files/rsync-gentoo-portage.sh, -gentoo-rsync-mirror-1.0-r2.ebuild,
+  -gentoo-rsync-mirror-1.0-r3.ebuild, +gentoo-rsync-mirror-1.0-r4.ebuild:
+  Version bumped. Introduces a config file. Closes #53210.
 
   13 Jun 2004; Martin Holzer <mholzer@gentoo.org>
   files/rsync-gentoo-portage.sh:
diff --git a/app-admin/gentoo-rsync-mirror/Manifest b/app-admin/gentoo-rsync-mirror/Manifest
index 03e7714adb25..0d138d5f6ba6 100644
--- a/app-admin/gentoo-rsync-mirror/Manifest
+++ b/app-admin/gentoo-rsync-mirror/Manifest
@@ -1,11 +1,14 @@
-MD5 fe7d670f084243492df814ce54ea9afc gentoo-rsync-mirror-1.0-r2.ebuild 1530
 MD5 13e59c18e75753498213dc19830ea594 gentoo-rsync-mirror-1.0-r3.ebuild 2038
-MD5 45c404abc0b920aa61a173eac647fa8a ChangeLog 2085
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
-MD5 ea6051bed36e051cb977663d82f9f544 files/rsync-gentoo-portage.sh 621
-MD5 866f4631fad8ab795f8420dfb8144ffb files/rsynclogparse-extended.pl 3476
-MD5 4047d0e8a4cc37326c8f37d873b7ec09 files/rsyncd.conf 735
+MD5 fe7d670f084243492df814ce54ea9afc gentoo-rsync-mirror-1.0-r2.ebuild 1530
+MD5 45c404abc0b920aa61a173eac647fa8a ChangeLog 2085
+MD5 7b04fa5dc8a784ff5d1d734457e06e2a gentoo-rsync-mirror-1.0-r4.ebuild 1990
 MD5 b378b8aab36575664a04d6e5adaa9e1e files/rsyncd.init 647
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoo-rsync-mirror-1.0-r3 0
+MD5 106fe6e320ef412edeed16ce96f5128f files/rsync-gentoo-portage.sh 235
+MD5 220875d857476610ea757a365925fa5b files/gentoo-mirror.conf 463
+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-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoo-rsync-mirror-1.0-r3 0
+MD5 866f4631fad8ab795f8420dfb8144ffb files/rsynclogparse-extended.pl 3476
diff --git a/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r3 b/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r3
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r3
+++ /dev/null
diff --git a/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r2 b/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r2
+++ b/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r4
diff --git a/app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf b/app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf
new file mode 100644
index 000000000000..86bd14590e47
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf
@@ -0,0 +1,9 @@
+# Gentoo rsync mirror config
+
+RSYNC="/usr/bin/rsync"
+OPTS="--quiet --recursive --links --perms --times --devices --delete --timeout=300"
+#Uncomment the following line only if you have been granted access to rsync1.us.gentoo.org
+#SRC="rsync://rsync1.us.gentoo.org/gentoo-portage"
+#If you are waiting for access to our master mirror, select one of our mirrors to mirror from:
+SRC="rsync://rsync.de.gentoo.org/gentoo-portage"
+DST="/opt/gentoo-rsync-mirror/portage/"
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 b6816db8df9f..c37b8279b730 100644
--- a/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh
+++ b/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh
@@ -1,12 +1,6 @@
 #!/bin/bash
 
-RSYNC="/usr/bin/rsync"
-OPTS="--quiet --recursive --links --perms --times --devices --delete --timeout=300"
-#Uncomment the following line only if you have been granted access to rsync1.us.gentoo.org
-#SRC="rsync://rsync1.us.gentoo.org/gentoo-portage"
-#If you are waiting for access to our master mirror, select one of our mirrors to mirror from:
-SRC="rsync://rsync.gentoo.org/gentoo-portage"
-DST="/opt/gentoo-rsync/portage/"
+source /etc/rsync/gentoo-mirror.conf
 
 echo "Started update at" `date` >> $0.log 2>&1
 logger -t rsync "re-rsyncing the gentoo-portage tree"
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r2.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r2.ebuild
deleted file mode 100644
index 853f278f985e..000000000000
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 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-r2.ebuild,v 1.8 2004/06/25 16:10:15 vapier Exp $
-
-DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror"
-HOMEPAGE="http://www.gentoo.org/doc/en/rsync.xml"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="net-misc/rsync
-	dev-lang/perl"
-
-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
-	dodir /opt/gentoo-rsync/portage
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rsyncd.init rsyncd
-}
-
-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 "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 "For more information visit: http://www.gentoo.org/doc/en/rsync.xml"
-}
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r3.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild
index cdfc77fa443b..0aa14a4906d7 100644
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r3.ebuild
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 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-r3.ebuild,v 1.5 2004/06/25 16:10:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild,v 1.1 2004/08/30 23:38:09 tantive Exp $
 
+IUSE=""
+S=${WORKDIR}/gentoo-rsync-mirror-${PV}
 DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror"
 HOMEPAGE="http://www.gentoo.org/doc/en/rsync.xml"
 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
+DEPEND="virtual/glibc"
 RDEPEND="net-misc/rsync
 	dev-lang/perl"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 src_install() {
 	dodir /opt/gentoo-rsync
@@ -21,6 +21,7 @@ src_install() {
 	insinto etc/rsync
 	doins ${FILESDIR}/rsyncd.conf
 	doins ${FILESDIR}/rsyncd.motd
+	doins ${FILESDIR}/gentoo-mirror.conf
 	dodir /opt/gentoo-rsync/portage
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/rsyncd.init rsyncd
@@ -49,3 +50,4 @@ pkg_postinst() {
 	einfo
 	einfo "For more information visit: http://www.gentoo.org/doc/en/rsync.xml"
 }
+