[gentoo-commits] repo/gentoo:master commit in: app-portage/emerge-delta-webrsync/files/

[gentoo-commits] repo/gentoo:master commit in: app-portage/emerge-delta-webrsync/files/

[Patrice Clement]

commit:     72689c6fdda2f4bf1e12bc17d7c4ad2165a4ed7a
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jul 13 18:40:31 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 16:07:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72689c6f

app-portage/emerge-delta-webrsync: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/1883

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../emerge-delta-webrsync/files/3.5.1-md5sum.patch | 21 ------------
 .../files/3.5.1-metadata.patch                     | 37 ----------------------
 .../files/3.5.1-post_sync.patch                    | 11 -------
 3 files changed, 69 deletions(-)

diff --git a/app-portage/emerge-delta-webrsync/files/3.5.1-md5sum.patch b/app-portage/emerge-delta-webrsync/files/3.5.1-md5sum.patch
deleted file mode 100644
index 7ee19a8..0000000
--- a/app-portage/emerge-delta-webrsync/files/3.5.1-md5sum.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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

diff --git a/app-portage/emerge-delta-webrsync/files/3.5.1-metadata.patch b/app-portage/emerge-delta-webrsync/files/3.5.1-metadata.patch
deleted file mode 100644
index 9958df1..0000000
--- a/app-portage/emerge-delta-webrsync/files/3.5.1-metadata.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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() {

diff --git a/app-portage/emerge-delta-webrsync/files/3.5.1-post_sync.patch b/app-portage/emerge-delta-webrsync/files/3.5.1-post_sync.patch
deleted file mode 100644
index 94e82e4..0000000
--- a/app-portage/emerge-delta-webrsync/files/3.5.1-post_sync.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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() {