10 files changed, 108 insertions, 140 deletions
diff --git a/dev-util/c-for-go/c-for-go-0.1.0_pre20171012.ebuild b/dev-util/c-for-go/c-for-go-0.1.0_pre20171012.ebuild
index ee92ee92c87d..ba44d82555b1 100644
--- a/dev-util/c-for-go/c-for-go-0.1.0_pre20171012.ebuild
+++ b/dev-util/c-for-go/c-for-go-0.1.0_pre20171012.ebuild
@@ -23,7 +23,7 @@ GOLANG_PKG_DEPENDENCIES=(
 inherit golang-single
 
 DESCRIPTION="Automatic C-Go Bindings Generator for Go Programming Language"
-HOMEPAGE="https://sphere.software/c-for-go"
+HOMEPAGE="https://c.for-go.com/"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-util/c-for-go/c-for-go-0.1.0_pre20180214.ebuild b/dev-util/c-for-go/c-for-go-0.1.0_pre20180214.ebuild
index 75b4848e90cb..0668498c2ed5 100644
--- a/dev-util/c-for-go/c-for-go-0.1.0_pre20180214.ebuild
+++ b/dev-util/c-for-go/c-for-go-0.1.0_pre20180214.ebuild
@@ -23,7 +23,7 @@ GOLANG_PKG_DEPENDENCIES=(
 inherit golang-single
 
 DESCRIPTION="Automatic C-Go Bindings Generator for Go Programming Language"
-HOMEPAGE="https://sphere.software/c-for-go"
+HOMEPAGE="https://c.for-go.com/"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-util/diff-cover/metadata.xml b/dev-util/diff-cover/metadata.xml
index 53c5cdf5c8dd..25f5d75eb7f0 100644
--- a/dev-util/diff-cover/metadata.xml
+++ b/dev-util/diff-cover/metadata.xml
@@ -5,6 +5,8 @@
   <email>williamh@gentoo.org</email>
   <name>William Hubbs</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="pypi">diff-cover</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 2fd07bd152a3..81324b770f23 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,5 +1,3 @@
-DIST pkgdev-0.1.2.tar.gz 32579 BLAKE2B 42ecd7403dcb49b256539e12c22a6bca72884bf55139c5f0972961fbebf4f976dedd3a4fac1186cc1d5af62d339ac7dd3eb20106ff1dcc7b8c264e1c4c53c3de SHA512 c224a054612fd6caa9c66855be9bb5ed439c3ac2abf5b32c4ac516d87fa4e345fc8bc328aa74b4fec44d7fd319322bb42af48f6dfdfff941e3b819a75b9fae9b
-DIST pkgdev-0.1.5.tar.gz 54386 BLAKE2B 1e3b87cbae263dba5dbb46f6a5df95d1f2b76382e52bff10a445abcf9af7c965cadd6e0134c3cfdb550fcdd9c96e0f4f40f3f4d6d9097913ef3ba9f309885b98 SHA512 4617f5f2e15bd3833debf76fdf02cdb9bc10e27285e18ca5958e197ab89d7392731a7f5e3846e92764d90b643f38eb1834c8d0a724e934f623edd1675a705b9e
 DIST pkgdev-0.1.6.tar.gz 55644 BLAKE2B 70c0c040ca277b108515d6c3fcbdecbf7ee20963bdc2d19218855a8261830f1509073e5a09d0daf6ccb6a276dd19401c9266d74e5c5c0b60ceb234a63779f38e SHA512 5f274d0ddbff0535862827e3e97d3378cc53c3fa2528e35ac4ef8c4bc3215de4eac2b62b2f2fc1c499f360a0594fecdb722613592ac86d01bef3f6abfc522c1f
 DIST pkgdev-0.1.7.tar.gz 55781 BLAKE2B 218842bbba75a0cc3d6005e75859ec679d2c03019c92e813c174554262f7d63bdfe1176faca102e91cfbec073d2197792c85b9c46318e6a86d7fa74d9780303a SHA512 bf68367e13298845c08089cad47a7ccd536bee43d6fb6993f3d0ba283331045032ab1b82d195cffe5368e844ea05ad8cee5b5cd248b69d18f021bb26a26145ff
-DIST pkgdev-0.1.8.tar.gz 57106 BLAKE2B 7ac98887e12a5b08a9fc7b9ba3ecc0c7bece9afa874ddd767e38e4cc2c5d809aa5d5fdab2ad56ad0c309b0d59c11457fe61bd6e1ef7e97ddb6512f61ff2d2af5 SHA512 08c5c457af8bb898948907fb9f9e8a854d3a9ccb16b1ff6fad8540f79eb0f94e674616c1f55991c49ec966d6c5b1133740316c55d43b905cc73c2275a437acc6
+DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
diff --git a/dev-util/pkgdev/pkgdev-0.1.2.ebuild b/dev-util/pkgdev/pkgdev-0.1.2.ebuild
deleted file mode 100644
index 163235024052..000000000000
--- a/dev-util/pkgdev/pkgdev-0.1.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_install_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
-
-	# HTML pages only
-	sphinx_compile_all
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgdev/pkgdev-0.1.5.ebuild b/dev-util/pkgdev/pkgdev-0.1.5.ebuild
deleted file mode 100644
index 7c16c37e4b45..000000000000
--- a/dev-util/pkgdev/pkgdev-0.1.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_install_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
-
-	# HTML pages only
-	sphinx_compile_all
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgdev/pkgdev-0.1.8.ebuild b/dev-util/pkgdev/pkgdev-0.1.9.ebuild
index a8d3f7b0a6a9..a8d3f7b0a6a9 100644
--- a/dev-util/pkgdev/pkgdev-0.1.8.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.9.ebuild
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index e06a5d473ee9..a8d3f7b0a6a9 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x64-macos"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -31,9 +31,9 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
 	"
 fi
 
diff --git a/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch b/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch
new file mode 100644
index 000000000000..a075fec91d22
--- /dev/null
+++ b/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch
@@ -0,0 +1,96 @@
+From b6ba1f2b1feda529eca20fb8980f7c6c52397df6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 10 May 2018 08:01:08 +0200
+Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
+
+---
+ SCons/Platform/posix.py | 21 +++++++++++++++++++++
+ SCons/Tool/cc.py        |  3 ++-
+ SCons/Tool/cxx.py       |  3 ++-
+ SCons/Tool/link.py      |  3 ++-
+ 4 files changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
+index 37cd2377f..1246781de 100644
+--- a/src/SCons/Platform/posix.py
++++ b/src/SCons/Platform/posix.py
+@@ -33,6 +33,7 @@ import subprocess
+ from SCons.Platform import TempFileMunge
+ from SCons.Platform.virtualenv import ImportVirtualenv
+ from SCons.Platform.virtualenv import ignore_virtualenv, enable_virtualenv
++import SCons.Util
+ 
+ exitvalmap = {
+     2 : 127,
+@@ -86,6 +87,26 @@ def generate(env):
+         if 'ENV' in env:
+             new_env.update(env['ENV'])
+         env['ENV'] = new_env
++
++        # Furthermore, force common compiler/linker variables as well
++        envvar_mapping = {
++            'AR': 'AR',
++            'AS': 'AS',
++            'ASFLAGS': 'ASFLAGS',
++            'CC': 'CC',
++            'CXX': 'CXX',
++            'CFLAGS': 'CFLAGS',
++            'CXXFLAGS': 'CXXFLAGS',
++            'CPPFLAGS': 'CPPFLAGS',
++            'LDFLAGS': 'LINKFLAGS',
++        }
++
++        for envvar, toolvar in envvar_mapping.items():
++            if toolvar not in env and envvar in env['ENV']:
++                val = env['ENV'][envvar]
++                if toolvar.endswith('FLAGS'):
++                    val = SCons.Util.CLVar(val)
++                env[toolvar] = val
+     else:
+         if 'ENV' not in env:
+             env['ENV']        = {}
+diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py
+index 590ec5fd3..5f9229a02 100644
+--- a/src/SCons/Tool/cc.py
++++ b/src/SCons/Tool/cc.py
+@@ -80,7 +80,8 @@ def generate(env):
+ 
+     if 'CC' not in env:
+         env['CC']    = env.Detect(compilers) or compilers[0]
+-    env['CFLAGS']    = SCons.Util.CLVar('')
++    if 'CFLAGS' not in env:
++        env['CFLAGS'] = SCons.Util.CLVar('')
+     env['CCCOM']     = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+     env['SHCC']      = '$CC'
+     env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
+diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py
+index 128cdc4f6..1f852b64c 100644
+--- a/src/SCons/Tool/cxx.py
++++ b/src/SCons/Tool/cxx.py
+@@ -69,7 +69,8 @@ def generate(env):
+ 
+     if 'CXX' not in env:
+         env['CXX']    = env.Detect(compilers) or compilers[0]
+-    env['CXXFLAGS']   = SCons.Util.CLVar('')
++    if 'CXXFLAGS' not in env:
++        env['CXXFLAGS'] = SCons.Util.CLVar('')
+     env['CXXCOM']     = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+     env['SHCXX']      = '$CXX'
+     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
+diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py
+index 24d17a31f..4ea9917e8 100644
+--- a/src/SCons/Tool/link.py
++++ b/src/SCons/Tool/link.py
+@@ -49,7 +49,8 @@ def generate(env):
+ 
+     env['SMARTLINK'] = smart_link
+     env['LINK'] = "$SMARTLINK"
+-    env['LINKFLAGS'] = SCons.Util.CLVar('')
++    if 'LINKFLAGS' not in env:
++        env['LINKFLAGS'] = SCons.Util.CLVar('')
+ 
+     # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
+     env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
+-- 
+2.32.0
+
diff --git a/dev-util/scons/scons-4.2.0.ebuild b/dev-util/scons/scons-4.2.0-r1.ebuild
index 1f0edbf391b0..7ffd88b150e5 100644
--- a/dev-util/scons/scons-4.2.0.ebuild
+++ b/dev-util/scons/scons-4.2.0-r1.ebuild
@@ -38,7 +38,7 @@ PATCHES=(
 	# support env passthrough for Gentoo ebuilds
 	"${FILESDIR}"/scons-4.1.0-env-passthrough.patch
 	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
+	"${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
 )
 
 src_unpack() {