python3-docutils: upgrade to 0.22

License-Update: the code that was ZPL-licensed has been removed[1].

Explicitly set a non-GPLv3 LICENSE on the output package as we don't
actually ship the GPLv3 file.

This fixes the incorrect hashbangs, so we can remove the manual seds.

Signed-off-by: Ross Burton <ross.burton@arm.com>
[1] https://sourceforge.net/p/docutils/code/9977/

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/python/python3-docutils_0.21.2.bb b/meta/recipes-devtools/python/python3-docutils_0.21.2.bb
deleted file mode 100644 (file)
index 237cabb..0000000
--- a/meta/recipes-devtools/python/python3-docutils_0.21.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Docutils is a modular system for processing documentation into useful formats"
-HOMEPAGE = "http://docutils.sourceforge.net"
-SECTION = "devel/python"
-LICENSE = "CC0-1.0 & ZPL-2.1 & BSD-2-Clause & GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=382430a09a4453818aa6618f2090491b"
-
-SRC_URI[sha256sum] = "3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f"
-
-inherit pypi python_flit_core
-
-RDEPENDS:${PN} += " \
-                   python3-pprint \
-"
-
-do_install:append() {
-       # Make sure we use /usr/bin/env python3
-       for PYTHSCRIPT in `grep -rIl '^#!.*python' ${D}`; do
-               sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT
-       done
-}
-
-BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/recipes-devtools/python/python3-docutils_0.22.bb b/meta/recipes-devtools/python/python3-docutils_0.22.bb
new file mode 100644 (file)
index 0000000..2dafa03
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-docutils_0.22.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Docutils is a modular system for processing documentation into useful formats"
+HOMEPAGE = "http://docutils.sourceforge.net"
+SECTION = "devel/python"
+LICENSE = "CC0-1.0 & BSD-2-Clause & GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING.rst;md5=ce467b04b35c7ac3429b6908fc8b318e"
+
+SRC_URI[sha256sum] = "ba9d57750e92331ebe7c08a1bbf7a7f8143b86c476acd51528b042216a6aad0f"
+
+inherit pypi python_flit_core
+
+RDEPENDS:${PN} += "python3-pprint"
+
+# We don't install the emacs lisp, which is the only piece of GPLv3
+LICENSE:${PN} = "CC0-1.0 & BSD-2-Clause"
+
+BBCLASSEXTEND = "native nativesdk"