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>

4 files changed, 24 insertions, 24 deletions

diff --git a/recipes/xml-commons/dom4j_1.6.1.bb b/recipes/xml-commons/dom4j_1.6.1.bb
index 59476b55c3..45f4ebe42b 100644
--- a/recipes/xml-commons/dom4j_1.6.1.bb
+++ b/recipes/xml-commons/dom4j_1.6.1.bb
@@ -6,8 +6,8 @@ HOMEPAGE = "http://dom4j.org
 DEPENDS = "fastjar-native xerces-j xalan-j xpp2 xpp3 jaxen"
 
 SRC_URI = "\
-	${SOURCEFORGE_MIRROR}/dom4j/${P}.tar.gz \
-	http://apache.org/dist/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz \
+	${SOURCEFORGE_MIRROR}/dom4j/${P}.tar.gz;name=archive \
+	http://apache.org/dist/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz;name=jaxme \
 	file://debian.patch;patch=1 \
 	"
 
@@ -29,7 +29,7 @@ do_compile() {
 }
 
 
-SRC_URI[md5sum] = "1e7ef6d20939315714de4a8502f27b2d"
-SRC_URI[sha256sum] = "01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f"
-SRC_URI[md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
-SRC_URI[sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
+SRC_URI[archive.md5sum] = "1e7ef6d20939315714de4a8502f27b2d"
+SRC_URI[archive.sha256sum] = "01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f"
+SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
+SRC_URI[jaxme.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
diff --git a/recipes/xml-commons/jaxen_1.1.1.bb b/recipes/xml-commons/jaxen_1.1.1.bb
index 840fdc842f..7180dda4bb 100644
--- a/recipes/xml-commons/jaxen_1.1.1.bb
+++ b/recipes/xml-commons/jaxen_1.1.1.bb
@@ -6,8 +6,8 @@ HOMEPAGE = "http://jaxen.codehaus.org/
 DEPENDS = "fastjar-native xerces-j xom"
 
 SRC_URI = "\
-	http://dist.codehaus.org/jaxen/distributions/jaxen-${PV}-src.tar.gz \
-	http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz \
+	http://dist.codehaus.org/jaxen/distributions/jaxen-${PV}-src.tar.gz;name=archive \
+	http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz;name=jdom \
 	"
 
 inherit java-library
@@ -27,7 +27,7 @@ do_compile() {
 }
 
 
-SRC_URI[md5sum] = "b598ae6b7e765a92e13667b0a80392f4"
-SRC_URI[sha256sum] = "f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca"
-SRC_URI[md5sum] = "22745cbaaddb12884ed8ee09083d8fe2"
-SRC_URI[sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056"
+SRC_URI[archive.md5sum] = "b598ae6b7e765a92e13667b0a80392f4"
+SRC_URI[archive.sha256sum] = "f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca"
+SRC_URI[jdom.md5sum] = "22745cbaaddb12884ed8ee09083d8fe2"
+SRC_URI[jdom.sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056"
diff --git a/recipes/xml-commons/jaxme_0.5.2.bb b/recipes/xml-commons/jaxme_0.5.2.bb
index 2b4a1003eb..4fa9cdfce0 100644
--- a/recipes/xml-commons/jaxme_0.5.2.bb
+++ b/recipes/xml-commons/jaxme_0.5.2.bb
@@ -5,8 +5,8 @@ AUTHOR = "Apache Software Foundation"
 HOMEPAGE = "http://ws.apache.org/jaxme"
 
 SRC_URI = "\
-	http://apache.org/dist/ws/jaxme/source/ws-${P}-src.tar.gz \
-	http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2 \
+	http://apache.org/dist/ws/jaxme/source/ws-${P}-src.tar.gz;name=archive \
+	http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2;name=ant \
 	"
 
 S = "${WORKDIR}/ws-${P}"
@@ -65,7 +65,7 @@ jaxme_build() {
   fastjar -C $2 -c -f $4 .
 }
 
-SRC_URI[md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
-SRC_URI[sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
-SRC_URI[md5sum] = "0d68db4a1ada5c91bcbf53cefd0c2fd7"
-SRC_URI[sha256sum] = "4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6"
+SRC_URI[archive.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
+SRC_URI[archive.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
+SRC_URI[ant.md5sum] = "0d68db4a1ada5c91bcbf53cefd0c2fd7"
+SRC_URI[ant.sha256sum] = "4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6"
diff --git a/recipes/xml-commons/xom_1.1.bb b/recipes/xml-commons/xom_1.1.bb
index 1b91e70b2a..c9acd19ee6 100644
--- a/recipes/xml-commons/xom_1.1.bb
+++ b/recipes/xml-commons/xom_1.1.bb
@@ -4,8 +4,8 @@ LICENSE = "LGPL"
 HOMEPAGE = "http://xom.nu"
 
 SRC_URI = "\
-	http://www.cafeconleche.org/XOM/${P}-src.tar.gz \
-	http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.tar.gz \
+	http://www.cafeconleche.org/XOM/${P}-src.tar.gz;name=archive \
+	http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.tar.gz;name=jaxen \
 	file://04_remove_sun_import.patch;patch=1 \
 	"
 
@@ -36,7 +36,7 @@ do_compile() {
   fastjar -C build -c -f ${JARFILENAME} .
 }
 
-SRC_URI[md5sum] = "e5ae82568d7b1faeb950140c34fbbcb1"
-SRC_URI[sha256sum] = "d648fd1f7b7437123afa63df06f6a6409a0487c99ca8f8beba75aaa474d65818"
-SRC_URI[md5sum] = "b598ae6b7e765a92e13667b0a80392f4"
-SRC_URI[sha256sum] = "f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca"
+SRC_URI[archive.md5sum] = "e5ae82568d7b1faeb950140c34fbbcb1"
+SRC_URI[archive.sha256sum] = "d648fd1f7b7437123afa63df06f6a6409a0487c99ca8f8beba75aaa474d65818"
+SRC_URI[jaxen.md5sum] = "b598ae6b7e765a92e13667b0a80392f4"
+SRC_URI[jaxen.sha256sum] = "f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca"