6 files changed, 32 insertions, 116 deletions
diff --git a/app-portage/emerge-delta-webrsync/ChangeLog b/app-portage/emerge-delta-webrsync/ChangeLog
index b13788630a9f..369b1278421a 100644
--- a/app-portage/emerge-delta-webrsync/ChangeLog
+++ b/app-portage/emerge-delta-webrsync/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-portage/emerge-delta-webrsync
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/ChangeLog,v 1.27 2007/01/30 04:39:27 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/ChangeLog,v 1.28 2010/01/03 21:47:20 zmedico Exp $
+
+*emerge-delta-webrsync-3.5.1-r3 (03 Jan 2010)
+
+  03 Jan 2010; Zac Medico <zmedico@gentoo.org>
+  +emerge-delta-webrsync-3.5.1-r3.ebuild:
+  Bug #299443 - Fix for 2010. Stable revbump since this is the only change
+  and older versions are broken now.
+
+  03 Jan 2010; Zac Medico <zmedico@gentoo.org>
+  -emerge-delta-webrsync-3.3.ebuild, -emerge-delta-webrsync-3.5.1.ebuild,
+  -emerge-delta-webrsync-3.5.1-r1.ebuild,
+  -emerge-delta-webrsync-3.5.1-r2.ebuild:
+  Remove older versions which do not work after 2010.
 
   30 Jan 2007; Steve Dibb <beandog@gentoo.org>
   emerge-delta-webrsync-3.5.1-r2.ebuild:
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 93c9a773348e..09cce0acf1aa 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,11 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.5.1-md5sum.patch 1191 RMD160 987459f6315c9bcab56893cc890293eec23fe871 SHA1 cbbdd6bf3816ec034b0dd827219fb9ebe45851cd SHA256 b7316dc972d890e396168844e372f97e05d6fb0e769d1b2c510d1a7d70c17d35
 AUX 3.5.1-metadata.patch 1287 RMD160 649f7bf66b0ae5a5512f43a09d02cc707ce1a92f SHA1 e39480a88f0e865ffccfe31fea6715b459274ac9 SHA256 46b89bd6fa3aa53e1affb29061dc9bcdde3ba1f2987f206afd91a2e235b65ca6
 AUX 3.5.1-post_sync.patch 330 RMD160 44ca5416310253ffe6f7eb823f250025878efa75 SHA1 7ca8efb7813d4e796cdfd3441bd70f8d0568a20f SHA256 3908a6a8b885a830ab1c2bf69ecf7677cb493bb59873265af70758d4b1b8c71b
-DIST emerge-delta-webrsync-3.3 13030 RMD160 c8cc52bed02d101b4cc11199b9150297a2c6dbf1 SHA1 d59ff28e84c5186ed24b5d68bb5c6b46180d954f SHA256 dfc4e044103a24e3fb04f8b98b583ab12d5f98d4ee710fe4ad2d9fe0f4381888
 DIST emerge-delta-webrsync-3.5.1 13289 RMD160 02e7798183930fc8ef8d3b76f38c7393acf914b9 SHA1 b242519b6e585a3b39074e6dc62327786f56322e SHA256 663ce5e800dec988ba5e1bb283ca243205d1ebdc27e3d0c269e5c0bb198f7d4a
-EBUILD emerge-delta-webrsync-3.3.ebuild 1038 RMD160 b3590fb374507573bc11bfeb8690dae0c6a2aa7a SHA1 cbbe5f8b43cfb4a3ace05b43e2746c273ef911e7 SHA256 b526207d93b4f9544e8500fe1812ec965d8ef3f7ef7329ff46feb28f21e3a77d
-EBUILD emerge-delta-webrsync-3.5.1-r1.ebuild 1010 RMD160 be4be55d535553fe854d3de5cc4d1f3356d50f2e SHA1 034150e0dfef8466095f91893177b47f3b60f5d7 SHA256 7c74429d46d7db340cbc2c9c629c77eb3109710879c58a9e2291a40a81192297
-EBUILD emerge-delta-webrsync-3.5.1-r2.ebuild 1053 RMD160 5fb732da70d69da8c1cbc0726090b2bd313d668e SHA1 97091738121d2cfcbc0d05ea1431cde5487900dc SHA256 7f350a971fcbcd05f8abf6033d60e87d0ac90c154d4d5a21810b8431d5389ed0
-EBUILD emerge-delta-webrsync-3.5.1.ebuild 947 RMD160 5f3c3dcbd1133c787b873666bfcfe3e3d09722a3 SHA1 4f6f555c75f68bcd103ab8a3fa11aff641a02d45 SHA256 a3cf55384f0b51d157b03e3c602f02c0c04f8fd0863cec6e4301ec47d10f95f6
-MISC ChangeLog 5048 RMD160 aa95665f5f70c8e0dca37230dd10ce88c5b03aa2 SHA1 a73f241a816138069685fc7fd2f38366b595707a SHA256 8820c8a58c4c48b28cf135707f859b93e31c7880484b44b1b7c8ca984d7ee454
+EBUILD emerge-delta-webrsync-3.5.1-r3.ebuild 1225 RMD160 b4a7a30f29d1a60bd42a0bbf3a17cf48f6e0c943 SHA1 8c5a217e21a70a9e9a47bd57e6e9373c69b21496 SHA256 18789e1ab64ad32ea0578b48dd2a4e7830f0ab068a3288b39bb71aee08ae5e07
+MISC ChangeLog 5557 RMD160 8c5cb80f40f027c81b8c3a4e19d8658ecf21f144 SHA1 f0b4ea80389a9c4cff28fa1a87c087293755714d SHA256 20f158793eaaf2e5213b6ab09184c852870c54c2e12c7a5b103604e93497fb7d
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAktBELcACgkQ/ejvha5XGaOx7gCg39HWeSJwqhI8hlKahhXVs4cS
+th0An1wykPbBq7rxtN4AIYVtdy2GPGiv
+=YZKn
+-----END PGP SIGNATURE-----
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild
deleted file mode 100644
index f6d92ad65433..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild,v 1.9 2007/03/10 14:51:44 vapier Exp $
-
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="mirror://gentoo/${P}
-	http://dev.gentoo.org/~zmedico/portage/archives/${P}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-apps/portage
-	>=dev-util/diffball-0.6.5
-	x86? ( app-arch/tarsync )"
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die "failed cping $P"
-	sed -i -e 's:aparently:apparently:' "${WORKDIR}/${P}" || die "failed correcting minor typo"
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin "${WORKDIR}/${P}" "${PN}" || die "failed copying ${P}"
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	chgrp portage ${D}/var/delta-webrsync
-}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild
deleted file mode 100644
index 2122e4bf69bc..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild,v 1.3 2007/03/10 14:51:44 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="mirror://gentoo/${P}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/portage-2.1.1-r1
-	>=dev-util/diffball-0.6.5
-	x86? ( app-arch/tarsync )"
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die "failed cping $P"
-	epatch "${FILESDIR}/${PV}-metadata.patch"
-	epatch "${FILESDIR}/${PV}-md5sum.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin "${WORKDIR}/${P}" "${PN}" || die "failed copying ${P}"
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	chgrp portage ${D}/var/delta-webrsync
-}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r2.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r3.ebuild
index b6ec2adf224c..ee8b230e5d2d 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r2.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r2.ebuild,v 1.6 2007/03/10 14:51:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r3.ebuild,v 1.1 2010/01/03 21:47:20 zmedico Exp $
 
 inherit eutils
 
@@ -25,6 +25,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/3.5.1-metadata.patch
 	epatch "${FILESDIR}"/3.5.1-md5sum.patch
 	epatch "${FILESDIR}"/3.5.1-post_sync.patch
+	# Support years after 2010.
+	sed 's/portage-200\*/portage-2[[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]]/g' \
+		-i $P || die "sed failed"
 }
 
 src_compile() { :; }
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild
deleted file mode 100644
index 502999c24ada..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild,v 1.7 2007/03/10 14:51:44 vapier Exp $
-
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="mirror://gentoo/${P}
-	http://dev.gentoo.org/~zmedico/portage/archives/${P}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-apps/portage
-	>=dev-util/diffball-0.6.5
-	x86? ( app-arch/tarsync )"
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die "failed cping $P"
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin "${WORKDIR}/${P}" "${PN}" || die "failed copying ${P}"
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	chgrp portage ${D}/var/delta-webrsync
-}