gentoo xmass resync : 25.12.2021

4 files changed, 65 insertions, 31 deletions

diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 382c7b145d62..c95d7b0413b5 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,7 +1,8 @@
+AUX linkchecker-10.1.0-version.patch 947 BLAKE2B 50ba94c0247bf4045d826e138e3608d69c8a15aa87c47567354e964bb6f691f659b2343a62f46fbc7dcba93f7df65fb3bed13f2ecd89546bddf241951b57126a SHA512 e1f0f43940e0a18fe4a093218cd504acc29b3a5339923347e6593a80e741f0de215a41382abbb68a91fe8d9937c65b436fc9b5e9069c25c9d319d6587b217abc
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
-DIST linkchecker-10.0.0_pre20200729.tar.gz 401694 BLAKE2B f1a0918c30b292e569fd3168eee152e63ba7266f0ef848a55601e0205d8b0521cb653db77c8dc7b5d1140b493c95e50d76acba44e961586159f2b691e6898353 SHA512 35c49ca5de06688667e39f4eb0d8a048e565fe460a4aff125a484e3966c62cbea95fd95154cb2b544c0f4987f66012793726cf890d604321ed83970654a318f6
 DIST linkchecker-10.0.1.tar.gz 512649 BLAKE2B f0373da6c1b4c18394500f32936065dca8b4a92532f5da6f15a4470c2e458df147009599939a41fc36f5ae4941c0fdd97aa9bf77a7237544f3df3bf5772ed884 SHA512 2d57092591187f62f7ae685b867ab02d08108ce3a687ea7da444e57cbe5e9f74220747beee322ccfec0ce4319c95cc37ba0908ba8fae6a8d88bdb0928d099099
-EBUILD linkchecker-10.0.0_pre20200729.ebuild 1503 BLAKE2B efefa0b2ee492950885de3aaa4714e8f44498167fa497415630a7abfac5b070cd8cb2525d03bad5e1af6e7840e284b946b3c00de9e86d189184c3b5a98843c35 SHA512 6a03aee8aaf6203fd93f69046af29e90a976f2c1f914f0ea55a7e481850fd4ac66a68e880ea8b36369c843d8754ab1dbf38697de7ae4f7285c7743e52b811153
+DIST linkchecker-10.1.0.tar.gz 521214 BLAKE2B 767c1176751a2011e0e175eb7c9e7b3704bda0d469bad7b38ac1481db62b470fbb69a62bf11316699e15fd1ca822f801a1237c798754353aba5c559ccd9d3274 SHA512 a6ba57ef9c617ece2c53d54cf460571561bfa60831e038e31e520e7fbee789566616b6e5b0b98529376510ef4e228bebdb6e6e011fb986b74d837ebc69323085
 EBUILD linkchecker-10.0.1.ebuild 1345 BLAKE2B 1ca9ab55b77fddac197d73fd2d87ddae39ee0761c00e2bad6a44b1778b152a4c313f953e22c98c67428d79b2b3dd81f6a3afc7c0277d6bd9cfec8ccd44b31568 SHA512 6d55b89966170c6aff0ebe9747d4a7e1010723a07f21adcbe2eb09965752c2381a48978be295fcb7edcdc09ea0d53c02b8b0b91255068e28c92d5e9b62007fa7
-EBUILD linkchecker-9999.ebuild 1328 BLAKE2B 36a61c89164199abb6cd093f92c1790a8097154feb95b0b7cc9e559758610f5138473d9ae78ad549924901d228dfd27679aa8247443266d1523c21d1407425c8 SHA512 ce2c3f5728ed400e28dcdb3de3260215173605c5d6bc93f05afc55c8c88421d6313eeac517e2c1436369399bc23e4732ac15bc7fcf7026de2b56fd062720d9d9
+EBUILD linkchecker-10.1.0.ebuild 1518 BLAKE2B c11b135340af996d7984d3bc4739345f544268a483d55bd0fbb3f853adca753b60ea49f71c3633acfd5ffe388da82c760bb7f025347ad32d38d66fdbbd994fb1 SHA512 29bc79c992d4fbb63135e6c67d18743bc4e76baaeac0086f8e2233f8308b66be8accb996521b7baed7a00ebe8978f9dce3e7175f3a9aa3e85e7769c382456a5a
+EBUILD linkchecker-9999.ebuild 1373 BLAKE2B 561a9093ba81a165c1e301cce9dba2bfd20a13b45076d2abbb5e65272f74c144c8c67dff35f118ed8b76390ae35123f69fcca435e0344f722667248ce3cedecb SHA512 99404928f407ca31554048fd3a417d034c9d731ab7ab04f979617a966c2f52a05ebf68d6d6097b4518b14252c5aabf0936b47155f11240c37728eac56fcce2aa
 MISC metadata.xml 575 BLAKE2B 6996e2d330f7c0e9976cf1cc2964ce3d426f5527c491dfb0630630bddee0c932f28b0ff9fe1c9d4778ad7d73bbb69816d8740f7b3b1b5fb5545dacd073c51aaf SHA512 567a432bd5410dddf0589eaadc6ea81f516c131ce84c3ba2e1a42757d32362821f3ea1bb832d4f41381d4ee62152c019b8daa46685353cba8a6da89bb892a989
diff --git a/net-analyzer/linkchecker/files/linkchecker-10.1.0-version.patch b/net-analyzer/linkchecker/files/linkchecker-10.1.0-version.patch
new file mode 100644
index 000000000000..f0132a8a8089
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-10.1.0-version.patch
@@ -0,0 +1,32 @@
+diff --git a/setup.py b/setup.py
+index c00bdc0..8493d09 100755
+--- a/setup.py
++++ b/setup.py
+@@ -56,6 +56,7 @@ else:
+ 
+ # the application name
+ AppName = "LinkChecker"
++AppVersion = "LINKCHECKER_VERSION"
+ Description = "check links in web documents or full websites"
+ 
+ RELEASE_DATE_FILE = "_release_date"
+@@ -340,10 +341,7 @@ if os.name == "posix":
+ 
+ setup(
+     name=AppName,
+-    use_scm_version={
+-        "local_scheme": "node-and-timestamp",
+-        "version_scheme": "post-release",
+-    },
++    version=AppVersion,
+     description=Description,
+     keywords="link,url,site,checking,crawling,verification,validation",
+     author=myname,
+@@ -383,7 +381,6 @@ setup(
+     options={},
+     # Requirements, usable with setuptools or the new Python packaging module.
+     python_requires=">= 3.6",
+-    setup_requires=["setuptools_scm"],
+     install_requires=[
+         "importlib_metadata;python_version<'3.8'",
+         "requests >= 2.4",
diff --git a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild b/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
index f087ac9b1512..c839792807fa 100644
--- a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="sqlite?"
 
 inherit bash-completion-r1 distutils-r1 optfeature
@@ -15,16 +15,14 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git"
 	inherit git-r3
 else
-	GIT_COMMIT="a977e4d7129450ba9fda8389724c80c1bde66883"
-	SRC_URI="https://github.com/linkchecker/linkchecker/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/linkchecker/linkchecker/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="sqlite"
-# requires py2 only libs
+# requires libs not present in portage yet
 RESTRICT="test"
 
 RDEPEND="
@@ -34,21 +32,23 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 "
 
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-9.3-bash-completion.patch"
-	)
+PATCHES=(
+	"${FILESDIR}/${PN}-9.3-bash-completion.patch"
+	"${FILESDIR}/${PN}-10.1.0-version.patch"
+)
+
+DOCS=(
+	doc/changelog.txt
+	doc/upgrading.txt
+)
 
+python_prepare_all() {
 	distutils-r1_python_prepare_all
+	sed -e "s/LINKCHECKER_VERSION/${PV}/g" -i setup.py || die
 }
 
 python_install_all() {
-	local DOCS=(
-		doc/changelog.txt
-		doc/upgrading.txt
-	)
 	distutils-r1_python_install_all
-
 	newbashcomp config/linkchecker-completion ${PN}
 }
 
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index 1d23dd82d824..9bcf1112b5ea 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="sqlite?"
 
 inherit bash-completion-r1 distutils-r1 optfeature
@@ -22,7 +22,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="sqlite"
-# requires py2 only libs
+# requires libs not present in portage yet
 RESTRICT="test"
 
 RDEPEND="
@@ -30,23 +30,24 @@ RDEPEND="
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
 
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-9.3-bash-completion.patch"
-	)
+PATCHES=(
+	"${FILESDIR}/${PN}-9.3-bash-completion.patch"
+)
+
+DOCS=(
+	doc/changelog.txt
+	doc/upgrading.txt
+)
 
+python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
 python_install_all() {
-	local DOCS=(
-		doc/changelog.txt
-		doc/upgrading.txt
-	)
 	distutils-r1_python_install_all
-
 	newbashcomp config/linkchecker-completion ${PN}
 }