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>

5 files changed, 30 insertions, 30 deletions

diff --git a/recipes/abiword/abiword-plugins_2.5.1.bb b/recipes/abiword/abiword-plugins_2.5.1.bb
index e9c6f6c970..cca2d6b805 100644
--- a/recipes/abiword/abiword-plugins_2.5.1.bb
+++ b/recipes/abiword/abiword-plugins_2.5.1.bb
@@ -9,8 +9,8 @@ PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
-           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \
 	   "
 
 inherit autotools
@@ -39,7 +39,7 @@ RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
 FILES_${PN}-dbg += "${libdir}/abiword-2.5/plugins/.debug"
 
 
-SRC_URI[md5sum] = "b1ce7ca49a0ee4e04f828e10eaebe6a9"
-SRC_URI[sha256sum] = "37faf6ea346c9b6473c5b2dfd1bb599457faa06b6a7cdef58e3e9f3e2773976b"
-SRC_URI[md5sum] = "11d022458e0e090846b35ed4873c2e6e"
-SRC_URI[sha256sum] = "482891fb0e376e2aaeee25afa8b4913e6dc50f4fdc280f9f152b3ee8745d735d"
+SRC_URI[plugins.md5sum] = "b1ce7ca49a0ee4e04f828e10eaebe6a9"
+SRC_URI[plugins.sha256sum] = "37faf6ea346c9b6473c5b2dfd1bb599457faa06b6a7cdef58e3e9f3e2773976b"
+SRC_URI[archive.md5sum] = "11d022458e0e090846b35ed4873c2e6e"
+SRC_URI[archive.sha256sum] = "482891fb0e376e2aaeee25afa8b4913e6dc50f4fdc280f9f152b3ee8745d735d"
diff --git a/recipes/abiword/abiword-plugins_2.5.2.bb b/recipes/abiword/abiword-plugins_2.5.2.bb
index 8c3cca521c..9310031401 100644
--- a/recipes/abiword/abiword-plugins_2.5.2.bb
+++ b/recipes/abiword/abiword-plugins_2.5.2.bb
@@ -9,8 +9,8 @@ PR = "r1"
 
 DEFAULT_PREFERENCE = "1"
 
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
-           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \
 	   "
 
 inherit autotools
@@ -40,7 +40,7 @@ RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
 FILES_${PN}-dbg += "${libdir}/abiword-2.5/plugins/.debug"
 
 
-SRC_URI[md5sum] = "0ad700d0cb6d176b39a191b16e3886c0"
-SRC_URI[sha256sum] = "5714753ce1e89e72c2ba7e7d7d95546d9965a4e86bf76c060a8779b08fc2ae85"
-SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
-SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
+SRC_URI[plugins.md5sum] = "0ad700d0cb6d176b39a191b16e3886c0"
+SRC_URI[plugins.sha256sum] = "5714753ce1e89e72c2ba7e7d7d95546d9965a4e86bf76c060a8779b08fc2ae85"
+SRC_URI[archive.md5sum] = "bbc9c124f8072875129bd67092f0fa0b"
+SRC_URI[archive.sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f"
diff --git a/recipes/abiword/abiword-plugins_2.6.0.bb b/recipes/abiword/abiword-plugins_2.6.0.bb
index d46c8812cb..0c54b43441 100644
--- a/recipes/abiword/abiword-plugins_2.6.0.bb
+++ b/recipes/abiword/abiword-plugins_2.6.0.bb
@@ -5,8 +5,8 @@ LICENSE = "GPLv2"
 DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
 RDEPENDS = "abiword"
 
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
-           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \
            file://abiword-cxx-for-ld-fix.patch;patch=1 \
 	   "
 
@@ -43,7 +43,7 @@ RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
 FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
 
 
-SRC_URI[md5sum] = "ebdc165d1b6c3c69f11148cf7841f257"
-SRC_URI[sha256sum] = "329521398105348ff466b90e1a7567574bd690639b048b6356ddc353d864b785"
-SRC_URI[md5sum] = "d627a5d1061160c683f2257da498355b"
-SRC_URI[sha256sum] = "35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb"
+SRC_URI[plugins.md5sum] = "ebdc165d1b6c3c69f11148cf7841f257"
+SRC_URI[plugins.sha256sum] = "329521398105348ff466b90e1a7567574bd690639b048b6356ddc353d864b785"
+SRC_URI[archive.md5sum] = "d627a5d1061160c683f2257da498355b"
+SRC_URI[archive.sha256sum] = "35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb"
diff --git a/recipes/abiword/abiword-plugins_2.6.4.bb b/recipes/abiword/abiword-plugins_2.6.4.bb
index cf526ddddd..f3ec196a9f 100644
--- a/recipes/abiword/abiword-plugins_2.6.4.bb
+++ b/recipes/abiword/abiword-plugins_2.6.4.bb
@@ -7,8 +7,8 @@ RDEPENDS = "abiword"
 
 PR = "r1"
 
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
-           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \
 #           file://abiword-cxx-for-ld-fix.patch;patch=1 \
 	   "
 
@@ -61,7 +61,7 @@ RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
 FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
 
 
-SRC_URI[md5sum] = "3bf973c5a1446ef3eaf980724821d6e9"
-SRC_URI[sha256sum] = "ec561e865387fa0a108ac135fc39ef0aa18e0dddd99f1f92749f67b029ba30eb"
-SRC_URI[md5sum] = "16748b2d6e318e0e2a25581005e1943a"
-SRC_URI[sha256sum] = "4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe"
+SRC_URI[plugins.md5sum] = "3bf973c5a1446ef3eaf980724821d6e9"
+SRC_URI[plugins.sha256sum] = "ec561e865387fa0a108ac135fc39ef0aa18e0dddd99f1f92749f67b029ba30eb"
+SRC_URI[archive.md5sum] = "16748b2d6e318e0e2a25581005e1943a"
+SRC_URI[archive.sha256sum] = "4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe"
diff --git a/recipes/abiword/abiword-plugins_2.6.8.bb b/recipes/abiword/abiword-plugins_2.6.8.bb
index 05283f5f05..ca2146cdaa 100644
--- a/recipes/abiword/abiword-plugins_2.6.8.bb
+++ b/recipes/abiword/abiword-plugins_2.6.8.bb
@@ -6,8 +6,8 @@ DEPENDS = "asio boost loudmouth libwpd librsvg goffice poppler libglade"
 RDEPENDS = "abiword"
 
 
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
-           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \
 #           file://abiword-cxx-for-ld-fix.patch;patch=1 \
 	   "
 
@@ -60,7 +60,7 @@ RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
 FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
 
 
-SRC_URI[md5sum] = "421c49723e209c971ddb0798c1b313a9"
-SRC_URI[sha256sum] = "151517ae94e0f4c26370f31c903078bd0561b8088a63b532408ca128f0e65448"
-SRC_URI[md5sum] = "fab04d8ef999c303f720197adf261310"
-SRC_URI[sha256sum] = "b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93"
+SRC_URI[plugins.md5sum] = "421c49723e209c971ddb0798c1b313a9"
+SRC_URI[plugins.sha256sum] = "151517ae94e0f4c26370f31c903078bd0561b8088a63b532408ca128f0e65448"
+SRC_URI[archive.md5sum] = "fab04d8ef999c303f720197adf261310"
+SRC_URI[archive.sha256sum] = "b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93"