Merge openembedded@openembedded.bkbits.net:packages

into linux.local:/home/kergoth/code/packages

2004/04/01 21:08:03+02:00 vanille.de!mickey
eliminate the usage of the deprecated 'string' module. please don't use it anymore. see diff for how to rewrite this stuff

BKrev: 406c6894YHeawcERN76y3eOgFVsoMw

diff --git a/flnx/flnx_0.18.oe b/flnx/flnx_0.18.oe
index c262e99..af74fc3 100644 (file)
--- a/flnx/flnx_0.18.oe
+++ b/flnx/flnx_0.18.oe
@@ -17,9 +17,8 @@ python do_fetch () {
 }
 
 python do_unpack () {
-       import string
        src_uri = oe.data.getVar("SRC_URI", d)
-       src_uri = string.replace(src_uri, "-tar", ".tar")
+       src_uri = src_uri.replace("-tar", ".tar")
        oe.data.setVar("SRC_URI", src_uri, d)
        oe.build.exec_func("base_do_unpack", d)
 }

diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index e800257..d7996bd 100644 (file)
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -69,14 +69,14 @@ do_stage () {
 }
 
 python populate_packages_prepend () {
-       import string, os
+       import os
        def do_split(root, pattern, format, description, postinst):
                dvar = oe.data.getVar('D', d, 1)
                if not dvar:
                        oe.error("D not defined")
                        return
 
-               packages = string.split(oe.data.getVar('PACKAGES', d, 1))
+               packages = oe.data.getVar('PACKAGES', d, 1).split()
                if not packages:
                        oe.error("PACKAGES not defined")
                        return
@@ -97,7 +97,7 @@ python populate_packages_prepend () {
                        oe.data.setVar('DESCRIPTION_' + pkg, description % on, d)
                        oe.data.setVar('pkg_postinst_' + pkg, postinst, d)
 
-               oe.data.setVar('PACKAGES', string.join(packages, ' '), d)
+               oe.data.setVar('PACKAGES', ' '.join(packages), d)
 
        libdir = oe.data.getVar('libdir', d, 1)
        if not libdir:

diff --git a/ipkg/ipkg_0.99.108.oe b/ipkg/ipkg_0.99.108.oe
index 98b4557..86a0a63 100644 (file)
--- a/ipkg/ipkg_0.99.108.oe
+++ b/ipkg/ipkg_0.99.108.oe
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PROVIDES = "virtual/ipkg"
 DEPENDS = "virtual/libc"
 
-SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + string.replace(oe.data.getVar('PV',d,1), '.', '-')} \
+SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
         file://${FILESDIR}/libipkg-dev.patch;patch=1"
 S = "${WORKDIR}/ipkg/C"
 

diff --git a/ipkg/ipkg_0.99.114.oe b/ipkg/ipkg_0.99.114.oe
index 6ce0cf3..d6de6c5 100644 (file)
--- a/ipkg/ipkg_0.99.114.oe
+++ b/ipkg/ipkg_0.99.114.oe
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PROVIDES = "virtual/ipkg"
 DEPENDS = "virtual/libc"
 
-SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + string.replace(oe.data.getVar('PV',d,1), '.', '-')}"
+SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')}"
 S = "${WORKDIR}/ipkg/C"
 
 inherit autotools

diff --git a/ipkg/ipkg_0.99.116.oe b/ipkg/ipkg_0.99.116.oe
index 6ce0cf3..d6de6c5 100644 (file)
--- a/ipkg/ipkg_0.99.116.oe
+++ b/ipkg/ipkg_0.99.116.oe
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PROVIDES = "virtual/ipkg"
 DEPENDS = "virtual/libc"
 
-SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + string.replace(oe.data.getVar('PV',d,1), '.', '-')}"
+SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')}"
 S = "${WORKDIR}/ipkg/C"
 
 inherit autotools

diff --git a/ipkg/ipkg_0.99.118.oe b/ipkg/ipkg_0.99.118.oe
index 12c70ac..bb3c3f7 100644 (file)
--- a/ipkg/ipkg_0.99.118.oe
+++ b/ipkg/ipkg_0.99.118.oe
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PROVIDES = "virtual/ipkg"
 DEPENDS = "virtual/libc"
 
-SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + string.replace(oe.data.getVar('PV',d,1), '.', '-')}"
+SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')}"
 S = "${WORKDIR}/ipkg/C"
 
 inherit autotools libtool

diff --git a/ipkg/ipkg_0.99.84.oe b/ipkg/ipkg_0.99.84.oe
index 6ce0cf3..d6de6c5 100644 (file)
--- a/ipkg/ipkg_0.99.84.oe
+++ b/ipkg/ipkg_0.99.84.oe
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PROVIDES = "virtual/ipkg"
 DEPENDS = "virtual/libc"
 
-SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + string.replace(oe.data.getVar('PV',d,1), '.', '-')}"
+SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')}"
 S = "${WORKDIR}/ipkg/C"
 
 inherit autotools

diff --git a/ipkg/ipkg_0.99.91.oe b/ipkg/ipkg_0.99.91.oe
index 6ce0cf3..d6de6c5 100644 (file)
--- a/ipkg/ipkg_0.99.91.oe
+++ b/ipkg/ipkg_0.99.91.oe
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PROVIDES = "virtual/ipkg"
 DEPENDS = "virtual/libc"
 
-SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + string.replace(oe.data.getVar('PV',d,1), '.', '-')}"
+SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')}"
 S = "${WORKDIR}/ipkg/C"
 
 inherit autotools

diff --git a/ipkg/ipkg_0.99.95.oe b/ipkg/ipkg_0.99.95.oe
index 6ce0cf3..d6de6c5 100644 (file)
--- a/ipkg/ipkg_0.99.95.oe
+++ b/ipkg/ipkg_0.99.95.oe
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PROVIDES = "virtual/ipkg"
 DEPENDS = "virtual/libc"
 
-SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + string.replace(oe.data.getVar('PV',d,1), '.', '-')}"
+SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')}"
 S = "${WORKDIR}/ipkg/C"
 
 inherit autotools

diff --git a/pango/pango_1.2.5.oe b/pango/pango_1.2.5.oe
index f023f15..68155cd 100644 (file)
--- a/pango/pango_1.2.5.oe
+++ b/pango/pango_1.2.5.oe
@@ -30,14 +30,14 @@ do_stage () {
 }
 
 python populate_packages_prepend () {
-       import string, os
+       import os
        def do_split(root, pattern, format, description, postinst):
                dvar = oe.data.getVar('D', d, 1)
                if not dvar:
                        oe.error("D not defined")
                        return
 
-               packages = string.split(oe.data.getVar('PACKAGES', d, 1))
+               packages = oe.data.getVar('PACKAGES', d, 1).split()
                if not packages:
                        oe.error("PACKAGES not defined")
                        return
@@ -58,7 +58,7 @@ python populate_packages_prepend () {
                        oe.data.setVar('DESCRIPTION_' + pkg, description % on, d)
                        oe.data.setVar('pkg_postinst_' + pkg, postinst, d)
 
-               oe.data.setVar('PACKAGES', string.join(packages, ' '), d)
+               oe.data.setVar('PACKAGES', ' '.join(packages), d)
 
        libdir = oe.data.getVar('libdir', d, 1)
        if not libdir: