scons: 4.1.0 -> 4.2.0

3 files changed, 46 insertions, 15 deletions

diff --git a/scons/.footprint b/scons/.footprint
index 24075cd5e..aea2f6ab3 100644
--- a/scons/.footprint
+++ b/scons/.footprint
@@ -6,14 +6,14 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.9/
 drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/SCons-4.1.0-py3.9.egg-info/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.1.0-py3.9.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.1.0-py3.9.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.1.0-py3.9.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.1.0-py3.9.egg-info/entry_points.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.1.0-py3.9.egg-info/not-zip-safe
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.1.0-py3.9.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.1.0-py3.9.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/SCons-4.2.0-py3.9.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.2.0-py3.9.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.2.0-py3.9.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.2.0-py3.9.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.2.0-py3.9.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.2.0-py3.9.egg-info/not-zip-safe
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.2.0-py3.9.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons-4.2.0-py3.9.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/SCons/
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Action.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Builder.py
@@ -1857,6 +1857,29 @@ drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/SCons/Tool/linkCommon/__pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/mwcc.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/mwld.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/nasm.py
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/Globals.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/Methods.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/NinjaState.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/Overrides.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/Rules.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/Utils.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Globals.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Globals.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Methods.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Methods.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/NinjaState.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/NinjaState.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Overrides.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Overrides.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Rules.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Rules.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Utils.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/Utils.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/__init__.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/ninja/__pycache__/__init__.cpython-39.pyc
 drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/SCons/Tool/packaging/
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/Tool/packaging/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/SCons/Tool/packaging/__pycache__/
@@ -2026,3 +2049,9 @@ drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/SCons/compat/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/cpp.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/dblite.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/SCons/exitfuncs.py
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/scons-time.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/scons.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/sconsign.1.gz
diff --git a/scons/.signature b/scons/.signature
index 4d7b2e4b6..e4e802940 100644
--- a/scons/.signature
+++ b/scons/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dtcciVRNEfhjTtihtiwvykOYbsl76yCoQnkz2rmH2wBzCDAKLKcqiw+BpbQXYCTib6thuDSkiuzUrY5cQiRzwo=
-SHA256 (Pkgfile) = 5505dfd92612a0294d4a3e3596120e8a2e5d0badd3a427234547e76e4fc2aab3
-SHA256 (.footprint) = c5fac6dc9673a46d8468c39f3622b1eaaa2c5d079b6dfa53cde3d057abe4c1bc
-SHA256 (scons-4.1.0.tar.gz) = 7662af76d971bae3e9c01e6d025d4ff0f547b64cac081298fc19015c9c242311
+RWSE3ohX2g5d/c+mWRZhiKB6qDlWeobWS6/73vOut7ohihHV5TgW7/ZcSebDi1Ws+G3HMmkhQUsSDXzU+ZtQ9h6PRmB+3m+yoAE=
+SHA256 (Pkgfile) = 24517d3a70828fee32fcb96096c9a8cf639b0f8b80a1b040cf260e231327408f
+SHA256 (.footprint) = 7e43f140588281ed9e38610dc178530e23ebc55af239602a6f2ddbe51118b909
+SHA256 (scons-4.2.0.tar.gz) = 1d8f70fe836015b9906db14e34b45a594846d90fe7d15a80aeb06c07a1947bc0
diff --git a/scons/Pkgfile b/scons/Pkgfile
index 510d2d6af..be845d772 100644
--- a/scons/Pkgfile
+++ b/scons/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: python3-setuptools
 
 name=scons
-version=4.1.0
+version=4.2.0
 release=1
 source=(https://github.com/SCons/scons/archive/$version/$name-$version.tar.gz)
 
@@ -12,9 +12,11 @@ build() {
 	cd $name-$version
 
 	# manpage install is completely broken
-	sed -i -e '/build\/doc\/man/d' setup.cfg
+	sed -e 's/bdist_wheel/bdist/g' -i SConstruct
+	/usr/bin/python3 scripts/scons.py --include-dir= -j1
+	cp -av build/doc/man/* .
 
 	/usr/bin/python3 setup.py build
 	/usr/bin/python3 setup.py install --root=$PKG --skip-build  --optimize=1 \
-		--install-data=/usr/share
+		--install-data=/usr/share/man/man1/
 }