recipes: move checksums to recipes from checksums.ini, part 2 manual adjustement

* all: multiple checked items in SRC_URI (needs name= param)
* other fixes like non-existent URL, checksums moved ot .inc or included .bb (ie for -native)
* ...
* tested with micro/micro-uclibc/Angstrom/SHR with
  SOURCE_MIRROR_FETCH="True" (ignoring COMPATIBLE_*
* also tested -c fetch with s/SRC_URI_append_[^ ]*/SRC_URI_append/g and
  s/SRC_URI_[^ ]*/SRC_URI_append/g to catch all URLs used only for
  distro/machine/virtual override (see
  http://build.shr-project.org/tests/jama/SRC_URI.removeOverrides.patch)
* in case I downloaded different checksum then what was in checksums.ini
  I used the old one from checksums.ini and put my checksum in comment
* I'll send to ML list of recipes which cannot be downloaded (weren't
  converted) and where I got different checksums

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 27 insertions, 27 deletions

diff --git a/recipes/mutt/mutt_1.5.15.bb b/recipes/mutt/mutt_1.5.15.bb
index 1dc4418c4a..f338fc0525 100644
--- a/recipes/mutt/mutt_1.5.15.bb
+++ b/recipes/mutt/mutt_1.5.15.bb
@@ -8,10 +8,10 @@ searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
 PR = "r0"
-SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
-           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.nntp.2.gz;patch=1 \
-           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.initials.gz;patch=1 \
-           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.quote.gz;patch=1 \
+SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz;name=archive \
+           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.nntp.2.gz;patch=1;name=patch1 \
+           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.initials.gz;patch=1;name=patch2 \
+           http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.quote.gz;patch=1;name=patch3 \
            file://patch-1.5.15.sidebar.20070408.txt;patch=1 \
            file://makedoc.patch;patch=1 "
 
@@ -26,11 +26,11 @@ do_compile_prepend () {
 	${BUILD_CC} makedoc.c -o makedoc
 }
 
-SRC_URI[md5sum] = "b2c1eb45fd958f6589ee52a98f2a3ce1"
-SRC_URI[sha256sum] = "03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a"
-SRC_URI[md5sum] = "f4724392ca865125bc2be80b643d175c"
-SRC_URI[sha256sum] = "ed0dc2337148ab4a884a94fd9472a76a13f74659372facef771f8b0eda5e4846"
-SRC_URI[md5sum] = "414606ce18de730d1bb6478899532644"
-SRC_URI[sha256sum] = "9385915adb106abba6f1576be58901f368688b1d55ef454e3993394828ee17e1"
-SRC_URI[md5sum] = "93276f86e544e69a0e83808279f3b175"
-SRC_URI[sha256sum] = "4afe6cc178b08ebd735d04053198f6539c87a0cdc1c5a8a51affc3598504e3a5"
+SRC_URI[archive.md5sum] = "b2c1eb45fd958f6589ee52a98f2a3ce1"
+SRC_URI[archive.sha256sum] = "03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a"
+SRC_URI[patch1.md5sum] = "f4724392ca865125bc2be80b643d175c"
+SRC_URI[patch1.sha256sum] = "ed0dc2337148ab4a884a94fd9472a76a13f74659372facef771f8b0eda5e4846"
+SRC_URI[patch2.md5sum] = "414606ce18de730d1bb6478899532644"
+SRC_URI[patch2.sha256sum] = "9385915adb106abba6f1576be58901f368688b1d55ef454e3993394828ee17e1"
+SRC_URI[patch3.md5sum] = "93276f86e544e69a0e83808279f3b175"
+SRC_URI[patch3.sha256sum] = "4afe6cc178b08ebd735d04053198f6539c87a0cdc1c5a8a51affc3598504e3a5"
diff --git a/recipes/mutt/mutt_1.5.4i.bb b/recipes/mutt/mutt_1.5.4i.bb
index f4f9030c62..f30845afb6 100644
--- a/recipes/mutt/mutt_1.5.4i.bb
+++ b/recipes/mutt/mutt_1.5.4i.bb
@@ -8,11 +8,11 @@ searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
 PR = "r1"
-SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
-	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz;patch=1 \
-	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.nntp.gz;patch=1 \
-	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.initials.gz;patch=1 \
-	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.quote.gz;patch=1 \
+SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz;name=archive \
+	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz;patch=1;name=patch1 \
+	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.nntp.gz;patch=1;name=patch2 \
+	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.initials.gz;patch=1;name=patch3 \
+	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.quote.gz;patch=1;name=patch4 \
 	   file://cppflags.patch;patch=1 \
 	   file://posix1_lim.patch;patch=1 \
 	   file://keymap.h.patch;patch=1 \
@@ -28,13 +28,13 @@ do_compile_prepend () {
 	${BUILD_CC} makedoc.c -o makedoc
 }
 
-SRC_URI[md5sum] = "3d4088f25892af6d71148eef26604f33"
-SRC_URI[sha256sum] = "f89af1816b839736eaf5fd188c4574fc52bdd37a7dabc465edafe6d8c3914847"
-SRC_URI[md5sum] = "a7b37150c35ea65049b3cd1edab5079d"
-SRC_URI[sha256sum] = "a4780e1dcfe717567ef6a676fa4f9b9d9f2d44bb27dbc2374d7e3a01667f53bd"
-SRC_URI[md5sum] = "d0cb0f609aa0461d1b17137bd49c14cb"
-SRC_URI[sha256sum] = "f3e5fd05f7a1b9d57513f369c85c3af56bc4c7e75d765506da53b43c342073d4"
-SRC_URI[md5sum] = "d92517da934f5c32692aecf7ece596b7"
-SRC_URI[sha256sum] = "16b5845600aa2839d0ea2ff71868f2a15109542a693b8b2f305c0a18574cab4f"
-SRC_URI[md5sum] = "80d91491679b426b0f670fa965ae3777"
-SRC_URI[sha256sum] = "92e2dc76784a3cb49ac4d03b80d47830ee4cafd2d48323ddb81382a6f249d428"
+SRC_URI[archive.md5sum] = "3d4088f25892af6d71148eef26604f33"
+SRC_URI[archive.sha256sum] = "f89af1816b839736eaf5fd188c4574fc52bdd37a7dabc465edafe6d8c3914847"
+SRC_URI[patch1.md5sum] = "a7b37150c35ea65049b3cd1edab5079d"
+SRC_URI[patch1.sha256sum] = "a4780e1dcfe717567ef6a676fa4f9b9d9f2d44bb27dbc2374d7e3a01667f53bd"
+SRC_URI[patch2.md5sum] = "d0cb0f609aa0461d1b17137bd49c14cb"
+SRC_URI[patch2.sha256sum] = "f3e5fd05f7a1b9d57513f369c85c3af56bc4c7e75d765506da53b43c342073d4"
+SRC_URI[patch3.md5sum] = "d92517da934f5c32692aecf7ece596b7"
+SRC_URI[patch3.sha256sum] = "16b5845600aa2839d0ea2ff71868f2a15109542a693b8b2f305c0a18574cab4f"
+SRC_URI[patch4.md5sum] = "80d91491679b426b0f670fa965ae3777"
+SRC_URI[patch4.sha256sum] = "92e2dc76784a3cb49ac4d03b80d47830ee4cafd2d48323ddb81382a6f249d428"