Fix recording and reading PE in shlib dependencies

Now the variables in memory use the PE:PV format, only the *.list
files should store PE#PV so their format it not broken.
The conversion happens when writing a packages' own *.list files
and when reading other packages' files.

Signed-off-by: Zoltán Böszörményi <zboszor@pr.hu>

meta/classes/package.bbclass

@@ -1671,7 +1671,7 @@ python package_do_shlibs() {
 
         pkgpe = d.getVar('PE')
         if pkgpe:
-            pkgver = pkgpe + '#' + pkgver
+            pkgver = pkgpe + ':' + pkgver
 
         needed[pkg] = []
         sonames = list()
@@ -1701,7 +1701,7 @@ python package_do_shlibs() {
                     if old_pkg != pkg:
                         bb.warn('%s-%s was registered as shlib provider for %s, changing it to %s-%s because it was built later' % (old_pkg, old_pkgver, s[0], pkg, pkgver))
                 bb.debug(1, 'registering %s-%s as shlib provider for %s' % (pkg, pkgver, s[0]))
-                fd.write(s[0] + ':' + s[1] + ':' + s[2] + '\n')
+                fd.write(s[0] + ':' + s[1] + ':' + s[2].replace(':', '#', 1) + '\n')
                 if s[0] not in shlib_provider:
                     shlib_provider[s[0]] = {}
                 shlib_provider[s[0]][s[1]] = (pkg, pkgver)
@@ -1764,7 +1764,7 @@ python package_do_shlibs() {
                         continue
 
                     if ver_needed:
-                        dep = "%s (>= %s)" % (dep_pkg, ver_needed.replace('#', ':', 1))
+                        dep = "%s (>= %s)" % (dep_pkg, ver_needed)
                     else:
                         dep = dep_pkg
                     if not dep in deps:

meta/lib/oe/package.py

@@ -258,7 +258,7 @@ def read_shlib_providers(d):
                     s = l.strip().split(":")
                     if s[0] not in shlib_provider:
                         shlib_provider[s[0]] = {}
-                    shlib_provider[s[0]][s[1]] = (dep_pkg, s[2])
+                    shlib_provider[s[0]][s[1]] = (dep_pkg, s[2].replace('#', ':', 1))
     return shlib_provider