diff mbox series

[16/34] python3-scons: update 4.7.0 -> 4.8.0

Message ID 20240827052354.1319810-16-alex.kanavin@gmail.com
State Accepted, archived
Commit 267b3c0c155addf77370a6355b6fdbb004d66240
Headers show
Series [01/34] selftest: always tweak ERROR_QA/WARN_QA per package | expand

Commit Message

Alexander Kanavin Aug. 27, 2024, 5:23 a.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

Manpages are no longer installed, and so the patch isn't needed.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Fix-man-page-installation.patch      | 29 -------------------
 ...-scons_4.7.0.bb => python3-scons_4.8.0.bb} | 13 +++------
 2 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch
 rename meta/recipes-devtools/python/{python3-scons_4.7.0.bb => python3-scons_4.8.0.bb} (70%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch b/meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch
deleted file mode 100644
index 6dffe648097..00000000000
--- a/meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-From 8b482e618047e94833545dce3a26924ef4f075db Mon Sep 17 00:00:00 2001
-From: Tim Orling <ticotimo@gmail.com>
-Date: Sat, 22 May 2021 11:20:46 -0700
-Subject: [PATCH] Fix man page installation
-
-Fixes:
-  error: can't copy 'build/doc/man/scons.1': doesn't exist or not a regular file
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Tim Orling <ticotimo@gmail.com>
-
----
- MANIFEST.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/MANIFEST.in b/MANIFEST.in
-index 04ec000..937f6f3 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -4,7 +4,7 @@ recursive-include SCons/Tool/docbook *
- include LICENSE
- 
- include scons.1 sconsign.1 scons-time.1
--recursive-include build/doc/man *.1
-+#recursive-include build/doc/man *.1
- 
- 
- 
diff --git a/meta/recipes-devtools/python/python3-scons_4.7.0.bb b/meta/recipes-devtools/python/python3-scons_4.8.0.bb
similarity index 70%
rename from meta/recipes-devtools/python/python3-scons_4.7.0.bb
rename to meta/recipes-devtools/python/python3-scons_4.8.0.bb
index f41b3e92711..b1348665e04 100644
--- a/meta/recipes-devtools/python/python3-scons_4.7.0.bb
+++ b/meta/recipes-devtools/python/python3-scons_4.8.0.bb
@@ -4,13 +4,13 @@  SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d903b0b8027f461402bac9b5169b36f7"
 
-SRC_URI += " file://0001-Fix-man-page-installation.patch"
-SRC_URI[sha256sum] = "d8b617f6610a73e46509de70dcf82f76861b79762ff602d546f4e80918ec81f3"
-
-PYPI_PACKAGE = "SCons"
+SRC_URI[sha256sum] = "2c7377ff6a22ca136c795ae3dc3d0824696e5478d1e4940f2af75659b0d45454"
+UPSTREAM_CHECK_PYPI_PACKAGE = "SCons"
 
 inherit pypi python_setuptools_build_meta
 
+S = "${WORKDIR}/SCons-${PV}"
+
 RDEPENDS:${PN}:class-target = "\
   python3-core \
   python3-compression \
@@ -23,11 +23,6 @@  RDEPENDS:${PN}:class-target = "\
   python3-pprint \
   "
 
-do_install:append() {
-    install -d ${D}${mandir}/man1
-    mv ${D}${prefix}/scons*.1 ${D}${mandir}/man1/
-}
-
 do_install:append:class-native() {
     create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1'
 }