| 1 |
commit: 72689c6fdda2f4bf1e12bc17d7c4ad2165a4ed7a |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jul 13 18:40:31 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 14 16:07:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72689c6f |
| 7 |
|
| 8 |
app-portage/emerge-delta-webrsync: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/1883 |
| 11 |
|
| 12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 13 |
|
| 14 |
.../emerge-delta-webrsync/files/3.5.1-md5sum.patch | 21 ------------ |
| 15 |
.../files/3.5.1-metadata.patch | 37 ---------------------- |
| 16 |
.../files/3.5.1-post_sync.patch | 11 ------- |
| 17 |
3 files changed, 69 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
deleted file mode 100644 |
| 21 |
index 7ee19a8..0000000 |
| 22 |
--- a/app-portage/emerge-delta-webrsync/files/3.5.1-md5sum.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,21 +0,0 @@ |
| 25 |
-diff -Naur orig/emerge-delta-webrsync modified-r1/emerge-delta-webrsync |
| 26 |
---- emerge-delta-webrsync.old 2006-09-28 10:29:52.000000000 +0000 |
| 27 |
-+++ emerge-delta-webrsync-3.5.1 2006-09-30 12:09:41.000000000 +0000 |
| 28 |
-@@ -410,7 +410,7 @@ |
| 29 |
- echo "thus, bailing (sorry)" |
| 30 |
- exit 5 |
| 31 |
- else |
| 32 |
-- if ! fetch_from_mirrors "/snapshots/portage-${final_date}.tar.bz2.umd5sum" "portage-${final_date}.tar.bz2.umd5sum"; then |
| 33 |
-+ 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 |
| 34 |
- if ! fetch_from_mirrors "/snapshots/portage-${final_date}.tar.bz2.umd5sum" "portage-${final_date}.tar.bz2.umd5sum"; then |
| 35 |
- echo "couldn't grab umd5sum (uncompressed md5sum) for ${final_date}." |
| 36 |
- echo "can't compensate for bzip2 version differences iow." |
| 37 |
-@@ -462,7 +462,7 @@ |
| 38 |
- |
| 39 |
- echo "verifying generated tarball" |
| 40 |
- |
| 41 |
--if ! verify_md5_file "${TEMPDIR}/portage-${final_date}.tar.bz2"; then |
| 42 |
-+if ! verify_md5_file "${TEMPDIR}/portage-${final_date}.tar.bz2" "${DISTDIR}/portage-${final_date}.tar.bz2.md5sum"; then |
| 43 |
- if [[ -z $verified ]]; then |
| 44 |
- echo "couldn't verify the generated tarball. bug, most likely." |
| 45 |
- exit 5 |
| 46 |
|
| 47 |
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 |
| 48 |
deleted file mode 100644 |
| 49 |
index 9958df1..0000000 |
| 50 |
--- a/app-portage/emerge-delta-webrsync/files/3.5.1-metadata.patch |
| 51 |
+++ /dev/null |
| 52 |
@@ -1,37 +0,0 @@ |
| 53 |
---- emerge-delta-webrsync-3.5.1_old 2006-08-07 20:54:08.000000000 +0200 |
| 54 |
-+++ emerge-delta-webrsync-3.5.1 2006-08-07 21:00:37.000000000 +0200 |
| 55 |
-@@ -8,10 +8,11 @@ |
| 56 |
- #initialization |
| 57 |
- #------------------ |
| 58 |
- |
| 59 |
--f=$(python -c'import portage; print "|".join([portage.settings[x] for x in ("PORTAGE_NICENESS", "GENTOO_MIRRORS", "PORTDIR", "FETCHCOMMAND", "USERLAND", "DISTDIR", "PORTAGE_TMPDIR")])') |
| 60 |
-+f=$(python -c'import portage; print "|".join([portage.settings[x] for x in ("PORTAGE_NICENESS", "FEATURES", "GENTOO_MIRRORS", "PORTDIR", "FETCHCOMMAND", "USERLAND", "DISTDIR", "PORTAGE_TMPDIR")])') |
| 61 |
- |
| 62 |
- IFS='|' |
| 63 |
- PORTAGE_NICENESS="${f%%|*}"; f="${f#*|}" |
| 64 |
-+FEATURES="${f%%|*}" ; f="${f#*|}" |
| 65 |
- GENTOO_MIRRORS="${f%%|*}" ; f="${f#*|}" |
| 66 |
- PORTDIR="${f%%|*}" ; f="${f#*|}" |
| 67 |
- FETCHCOMMAND="${f%%|*}" ; f="${f#*|}" |
| 68 |
-@@ -20,6 +21,8 @@ |
| 69 |
- TMPDIR="${f%%|*}/snapshots" |
| 70 |
- unset IFS |
| 71 |
- |
| 72 |
-+source /usr/lib/portage/bin/isolated-functions.sh || exit 1 |
| 73 |
-+ |
| 74 |
- if [ -z "$NICENESS_PULLED" ]; then |
| 75 |
- if [ -n "${PORTAGE_NICENESS}" ]; then |
| 76 |
- export NICENESS_PULLED=asdf |
| 77 |
-@@ -217,8 +220,10 @@ |
| 78 |
- echo "cleaning up" |
| 79 |
- rm -rf portage |
| 80 |
- fi |
| 81 |
-- echo "transferring metadata/cache" |
| 82 |
-- emerge metadata |
| 83 |
-+ if has metadata-transfer ${FEATURES} ; then |
| 84 |
-+ echo "transferring metadata/cache" |
| 85 |
-+ emerge --metadata |
| 86 |
-+ fi |
| 87 |
- } |
| 88 |
- |
| 89 |
- fetch_from_mirrors() { |
| 90 |
|
| 91 |
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 |
| 92 |
deleted file mode 100644 |
| 93 |
index 94e82e4..0000000 |
| 94 |
--- a/app-portage/emerge-delta-webrsync/files/3.5.1-post_sync.patch |
| 95 |
+++ /dev/null |
| 96 |
@@ -1,11 +0,0 @@ |
| 97 |
---- emerge-delta-webrsync 2006-10-15 00:18:06.000000000 +0300 |
| 98 |
-+++ emerge-delta-webrsync-3.5.1 2006-10-15 00:20:40.000000000 +0300 |
| 99 |
-@@ -224,6 +224,8 @@ |
| 100 |
- echo "transferring metadata/cache" |
| 101 |
- emerge --metadata |
| 102 |
- fi |
| 103 |
-+ local post_sync=/etc/portage/bin/post_sync |
| 104 |
-+ [[ -x "${post_sync}" ]] && ${post_sync} |
| 105 |
- } |
| 106 |
- |
| 107 |
- fetch_from_mirrors() { |
Archives