+++ /dev/null
-diff -Naur orig/emerge-delta-webrsync modified-r1/emerge-delta-webrsync
---- emerge-delta-webrsync.old 2006-09-28 10:29:52.000000000 +0000
-+++ emerge-delta-webrsync-3.5.1 2006-09-30 12:09:41.000000000 +0000
-@@ -410,7 +410,7 @@
- echo "thus, bailing (sorry)"
- exit 5
- else
-- if ! fetch_from_mirrors "/snapshots/portage-${final_date}.tar.bz2.umd5sum" "portage-${final_date}.tar.bz2.umd5sum"; then
-+ if [[ ! -e portage-${final_date}.tar.bz2.umd5sum ]] && ! fetch_from_mirrors "/snapshots/portage-${final_date}.tar.bz2.umd5sum" "portage-${final_date}.tar.bz2.umd5sum"; then
- if ! fetch_from_mirrors "/snapshots/portage-${final_date}.tar.bz2.umd5sum" "portage-${final_date}.tar.bz2.umd5sum"; then
- echo "couldn't grab umd5sum (uncompressed md5sum) for ${final_date}."
- echo "can't compensate for bzip2 version differences iow."
-@@ -462,7 +462,7 @@
-
- echo "verifying generated tarball"
-
--if ! verify_md5_file "${TEMPDIR}/portage-${final_date}.tar.bz2"; then
-+if ! verify_md5_file "${TEMPDIR}/portage-${final_date}.tar.bz2" "${DISTDIR}/portage-${final_date}.tar.bz2.md5sum"; then
- if [[ -z $verified ]]; then
- echo "couldn't verify the generated tarball. bug, most likely."
- exit 5
+++ /dev/null
---- emerge-delta-webrsync-3.5.1_old 2006-08-07 20:54:08.000000000 +0200
-+++ emerge-delta-webrsync-3.5.1 2006-08-07 21:00:37.000000000 +0200
-@@ -8,10 +8,11 @@
- #initialization
- #------------------
-
--f=$(python -c'import portage; print "|".join([portage.settings[x] for x in ("PORTAGE_NICENESS", "GENTOO_MIRRORS", "PORTDIR", "FETCHCOMMAND", "USERLAND", "DISTDIR", "PORTAGE_TMPDIR")])')
-+f=$(python -c'import portage; print "|".join([portage.settings[x] for x in ("PORTAGE_NICENESS", "FEATURES", "GENTOO_MIRRORS", "PORTDIR", "FETCHCOMMAND", "USERLAND", "DISTDIR", "PORTAGE_TMPDIR")])')
-
- IFS='|'
- PORTAGE_NICENESS="${f%%|*}"; f="${f#*|}"
-+FEATURES="${f%%|*}" ; f="${f#*|}"
- GENTOO_MIRRORS="${f%%|*}" ; f="${f#*|}"
- PORTDIR="${f%%|*}" ; f="${f#*|}"
- FETCHCOMMAND="${f%%|*}" ; f="${f#*|}"
-@@ -20,6 +21,8 @@
- TMPDIR="${f%%|*}/snapshots"
- unset IFS
-
-+source /usr/lib/portage/bin/isolated-functions.sh || exit 1
-+
- if [ -z "$NICENESS_PULLED" ]; then
- if [ -n "${PORTAGE_NICENESS}" ]; then
- export NICENESS_PULLED=asdf
-@@ -217,8 +220,10 @@
- echo "cleaning up"
- rm -rf portage
- fi
-- echo "transferring metadata/cache"
-- emerge metadata
-+ if has metadata-transfer ${FEATURES} ; then
-+ echo "transferring metadata/cache"
-+ emerge --metadata
-+ fi
- }
-
- fetch_from_mirrors() {
+++ /dev/null
---- emerge-delta-webrsync 2006-10-15 00:18:06.000000000 +0300
-+++ emerge-delta-webrsync-3.5.1 2006-10-15 00:20:40.000000000 +0300
-@@ -224,6 +224,8 @@
- echo "transferring metadata/cache"
- emerge --metadata
- fi
-+ local post_sync=/etc/portage/bin/post_sync
-+ [[ -x "${post_sync}" ]] && ${post_sync}
- }
-
- fetch_from_mirrors() {