[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5549/8267] python3: fix run-time deps for core python3 libraries

[Emmanuele Bassi <ebassi src gnome org>]

commit e9cf698d0928f986cc67e72246e3547d68785b0e
Author: Dmitry Rozhkov <dmitry rozhkov linux intel com>
Date:   Thu Apr 6 08:07:44 2017 +0300

    python3: fix run-time deps for core python3 libraries
    
    The http.server module from python3-netclient imports the html module
    which is in python3-html. Also xmlrpc.server imports pydoc which is a
    part of python3-pydoc. But those run-time dependencies are missing
    from python3-netclient and python3-xmlrpc respectively.
    
    Add the missing run-time dependencies.
    
    (From OE-Core rev: 8e30b726c44f873e5fd9d3f36c3464a29b97abd8)
    
    Signed-off-by: Dmitry Rozhkov <dmitry rozhkov linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../python/python-3.5-manifest.inc                 |    4 ++--
 scripts/contrib/python/generate-manifest-3.5.py    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc 
b/meta/recipes-devtools/python/python-3.5-manifest.inc
index 55bcc4b..ec30eb9 100644
--- a/meta/recipes-devtools/python/python-3.5-manifest.inc
+++ b/meta/recipes-devtools/python/python-3.5-manifest.inc
@@ -153,7 +153,7 @@ RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN
 FILES_${PN}-multiprocessing="${libdir}/python3.5/lib-dynload/_multiprocessing.*.so 
${libdir}/python3.5/lib-dynload/__pycache__/_multiprocessing.*.so ${libdir}/python3.5/multiprocessing 
${libdir}/python3.5/multiprocessing/__pycache__ "
 
 SUMMARY_${PN}-netclient="Python Internet Protocol clients"
-RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang 
${PN}-logging ${PN}-mime"
+RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang 
${PN}-logging ${PN}-mime ${PN}-html"
 FILES_${PN}-netclient="${libdir}/python3.5/*Cookie*.* ${libdir}/python3.5/__pycache__/*Cookie*.* 
${libdir}/python3.5/base64.* ${libdir}/python3.5/__pycache__/base64.* ${libdir}/python3.5/cookielib.* 
${libdir}/python3.5/__pycache__/cookielib.* ${libdir}/python3.5/ftplib.* 
${libdir}/python3.5/__pycache__/ftplib.* ${libdir}/python3.5/gopherlib.* 
${libdir}/python3.5/__pycache__/gopherlib.* ${libdir}/python3.5/hmac.* ${libdir}/python3.5/__pycache__/hmac.* 
${libdir}/python3.5/http* ${libdir}/python3.5/http*/__pycache__ ${libdir}/python3.5/httplib.* 
${libdir}/python3.5/__pycache__/httplib.* ${libdir}/python3.5/mimetypes.* 
${libdir}/python3.5/__pycache__/mimetypes.* ${libdir}/python3.5/nntplib.* 
${libdir}/python3.5/__pycache__/nntplib.* ${libdir}/python3.5/poplib.* 
${libdir}/python3.5/__pycache__/poplib.* ${libdir}/python3.5/smtplib.* 
${libdir}/python3.5/__pycache__/smtplib.* ${libdir}/python3.5/telnetlib.* 
${libdir}/python3.5/__pycache__/telnetlib.* ${libdir}/python3.5/urllib ${lib
 dir}/python3.5/urllib/__pycache__ ${libdir}/python3.5/uuid.* ${libdir}/python3.5/__pycache__/uuid.* 
${libdir}/python3.5/rfc822.* ${libdir}/python3.5/__pycache__/rfc822.* ${libdir}/python3.5/mimetools.* 
${libdir}/python3.5/__pycache__/mimetools.* "
 
 SUMMARY_${PN}-netserver="Python Internet Protocol servers"
@@ -273,7 +273,7 @@ RDEPENDS_${PN}-xml="${PN}-core ${PN}-re"
 FILES_${PN}-xml="${libdir}/python3.5/lib-dynload/_elementtree.*.so 
${libdir}/python3.5/lib-dynload/__pycache__/_elementtree.*.so ${libdir}/python3.5/lib-dynload/pyexpat.*.so 
${libdir}/python3.5/lib-dynload/__pycache__/pyexpat.*.so ${libdir}/python3.5/xml 
${libdir}/python3.5/xml/__pycache__ ${libdir}/python3.5/xmllib.* ${libdir}/python3.5/__pycache__/xmllib.* "
 
 SUMMARY_${PN}-xmlrpc="Python XML-RPC support"
-RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang"
+RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pydoc"
 FILES_${PN}-xmlrpc="${libdir}/python3.5/xmlrpclib.* ${libdir}/python3.5/__pycache__/xmlrpclib.* 
${libdir}/python3.5/SimpleXMLRPCServer.* ${libdir}/python3.5/__pycache__/SimpleXMLRPCServer.* 
${libdir}/python3.5/DocXMLRPCServer.* ${libdir}/python3.5/__pycache__/DocXMLRPCServer.* 
${libdir}/python3.5/xmlrpc ${libdir}/python3.5/xmlrpc/__pycache__ "
 
 SUMMARY_${PN}-modules="All Python modules"
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py
index 386bdfc..5835de8 100755
--- a/scripts/contrib/python/generate-manifest-3.5.py
+++ b/scripts/contrib/python/generate-manifest-3.5.py
@@ -340,7 +340,7 @@ if __name__ == "__main__":
     m.addPackage( "${PN}-multiprocessing", "Python multiprocessing support", "${PN}-core ${PN}-io ${PN}-lang 
${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap",
     "lib-dynload/_multiprocessing.*.so multiprocessing" ) # package
 
-    m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core 
${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime",
+    m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core 
${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime ${PN}-html",
     "*Cookie*.* " +
     "base64.* cookielib.* ftplib.* gopherlib.* hmac.* http* httplib.* mimetypes.* nntplib.* poplib.* 
smtplib.* telnetlib.* urllib  uuid.* rfc822.* mimetools.*" )
 
@@ -422,7 +422,7 @@ if __name__ == "__main__":
     m.addPackage( "${PN}-xml", "Python basic XML support", "${PN}-core ${PN}-re",
     "lib-dynload/_elementtree.*.so lib-dynload/pyexpat.*.so xml xmllib.*" ) # package
 
-    m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver 
${PN}-lang",
+    m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang 
${PN}-pydoc",
     "xmlrpclib.* SimpleXMLRPCServer.* DocXMLRPCServer.* xmlrpc" )
 
     m.addPackage( "${PN}-mailbox", "Python mailbox format support", "${PN}-core ${PN}-mime",