gentoo resync : 02.02.2022

3 files changed, 320 insertions, 2 deletions

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 191418f36c50..d14dde13bc6d 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,7 +1,8 @@
+AUX grass-8.0.0-mkhtml.patch 10339 BLAKE2B 39b55a1c33b751508128533bcfb513d3aab9227985ff142eb346c02997599afc228274a7aa8b02258def491816b98fb52b307007facfcb00b79657afd42a88c7 SHA512 a4eca79ccadf77b863b254a83fab8eaa096bbf977bfe54cd4de3ee914f55e3499fe42615904b1717ffbb0da06334306543f0562203793adaa0770926498dfece
 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
-DIST grass-8.0.0RC2.tar.gz 64942585 BLAKE2B fc7499def2029acb9b547c688eaaad986daae5c80b085bbe876d7bca4d4c7547867375edee752705e30ab215d0b8e0c7f017e94802a549569a525196bbd7bcb4 SHA512 9e624c54974e253dce1b93a0ce1c51eaa421d8baacdf61b03893d34c5cd36af76915ab035fb9bb78af4c16e1efc12bb501a707e335e312a12cf2c17a2b0d6f61
+DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
 EBUILD grass-7.8.6-r1.ebuild 7055 BLAKE2B e38aeec61d89be4a584760e6af906e8ff1e080176110a05a27fe8610b3b87109a49a2ab7160c2f7fe47047d203cdb52ac7be917982e744b4e827e746c34ff7d2 SHA512 3bf3595b0f1a1dc296f6c2f8a05eef8b6621ef6609e4f207d1710a916f9b8b6791e4424b0806b032fc3f925d7b714f43a48e9750aa700075e4c99a955d0ad930
-EBUILD grass-8.0.0_rc2.ebuild 7100 BLAKE2B e89a9b0c322ff59622c020fecd242382348f82dccf5dcd91df50ec714491a78594b07914375540f394f410840e18360ea2f754436d37297855a7ac3cd83ba2a8 SHA512 cad285bc9af71481f229276fe31f7f8a5bbd6b8a231a29ff28e5ef417527db4afc0ccdbca2913bcd06a8aca06cff1706ed69819bccc97b8c20ce49f31e5557a0
+EBUILD grass-8.0.0.ebuild 7140 BLAKE2B 5422398098357271b96af670b425a18f8b4b4c961dc584813c71b76293d0ee43de5140406e2f6eb8fb582d6dcd5eeb868042ed5b0661662a5c2c55c651e091ba SHA512 0873ee2a14e77cd5ff8ab62407e116e54b4606afcbca0b83f584327e4b0f0602ca7fa5b001f1cd20fb5661963e746589a669fa1fcaf6dfecada7a6c5483c1d83
 EBUILD grass-9999.ebuild 6963 BLAKE2B cae7116cd7dbeb06f66c6f33237b4f10d5aa339d86bbf34a416c71bb82d37bacdc68a628a6b40b3ba97aa77bc586dc2bc731faf740aecbc17c84fbac0e427840 SHA512 2792f7a120049a58541433ac119f7358c07cb403c35c07ffd34a5f7d55eb67232e49ff9c2acc5d5a5ec7be5cd16b03ba97ff6e54a00536282975986ef4b0ecf3
 MISC metadata.xml 1166 BLAKE2B ae97d82be74c6782d74f256a40fbdb13590f5434f19f9980dbd51f182c687f24bd6068ab37a23958f583b299a3b4a5949526c0a9791a5620e1774db768f46f07 SHA512 c9b5cc9316da6e3fe396550bb1216f8a3376b6e6a088b6a289b0b008b0c34b0486dc357893ec19868023e800533f5e354addfca1a07d5e070dd4a556b96cd446
diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
new file mode 100644
index 000000000000..1eb46012f6a4
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
@@ -0,0 +1,316 @@
+--- a/lib/init/variables.html
++++ b/lib/init/variables.html
+@@ -234,12 +234,7 @@ PERMANENT
+   <dt>GRASS_PERL</dt>
+   <dd>[used during install process for generating man pages]<br>
+     set Perl with path.</dd>
+-
+-  <dt>GRASS_PROXY</dt>
+-  <dd>[used during addon install/reinstall process for generating man
+-    pages (download commit from GitHub API server and remote modules.xml file)]<br>
+-    set the proxy with: <tt>GRASS_PROXY="http=&lt;value&gt;,ftp=&lt;value&gt;"</tt>.</dd>
+-
++  
+   <dt>GRASS_SKIP_MAPSET_OWNER_CHECK</dt>
+   <dd>By default it is not possible to work with MAPSETs that are
+     not owned by current user. Setting this variable to any non-empty value
+--- a/scripts/g.extension/g.extension.py
++++ b/scripts/g.extension/g.extension.py
+@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format, *args, **kwargs):
+                 ),
+             )
+         return response
++
+     except HTTPError as err:
+         if err.code == 403 and err.msg == "rate limit exceeded":
+             gscript.warning(
+@@ -2588,8 +2589,6 @@ def main():
+         proxy = urlrequest.ProxyHandler(PROXIES)
+         opener = urlrequest.build_opener(proxy)
+         urlrequest.install_opener(opener)
+-        # Required for mkhtml.py script (get addon git commit from GitHub API server)
+-        os.environ["GRASS_PROXY"] = options["proxy"]
+ 
+     # define path
+     options["prefix"] = resolve_install_prefix(
+--- a/utils/mkhtml.py
++++ b/utils/mkhtml.py
+@@ -16,7 +16,6 @@
+ #
+ #############################################################################
+ 
+-import http
+ import sys
+ import os
+ import string
+@@ -25,9 +24,6 @@ from datetime import datetime
+ import locale
+ import json
+ import pathlib
+-import shutil
+-import subprocess
+-import time
+ 
+ try:
+     # Python 2 import
+@@ -35,26 +31,11 @@ try:
+ except ImportError:
+     # Python 3 import
+     from html.parser import HTMLParser
+-
+-from six.moves.urllib import request as urlrequest
+-from six.moves.urllib.error import HTTPError, URLError
+-
+ try:
+     import urlparse
+ except ImportError:
+     import urllib.parse as urlparse
+ 
+-try:
+-    import grass.script as gs
+-except ImportError:
+-    # During compilation GRASS GIS
+-    gs = None
+-
+-HEADERS = {
+-    "User-Agent": "Mozilla/5.0",
+-}
+-HTTP_STATUS_CODES = list(http.HTTPStatus)
+-
+ if sys.version_info[0] == 2:
+     PY2 = True
+ else:
+@@ -65,24 +46,6 @@ if not PY2:
+     unicode = str
+ 
+ 
+-grass_version = os.getenv("VERSION_NUMBER", "unknown")
+-trunk_url = ""
+-addons_url = ""
+-if grass_version != "unknown":
+-    major, minor, patch = grass_version.split(".")
+-    grass_git_branch = "releasebranch_{major}_{minor}".format(
+-        major=major,
+-        minor=minor,
+-    )
+-    base_url = "https://github.com/OSGeo"
+-    trunk_url = "{base_url}/grass/tree/{branch}/".format(
+-        base_url=base_url, branch=grass_git_branch
+-    )
+-    addons_url = "{base_url}/grass-addons/tree/grass{major}/".format(
+-        base_url=base_url, major=major
+-    )
+-
+-
+ def _get_encoding():
+     encoding = locale.getdefaultlocale()[1]
+     if not encoding:
+@@ -105,151 +68,6 @@ def decode(bytes_):
+     return unicode(bytes_)
+ 
+ 
+-def urlopen(url, *args, **kwargs):
+-    """Wrapper around urlopen. Same function as 'urlopen', but with the
+-    ability to define headers.
+-    """
+-    request = urlrequest.Request(url, headers=HEADERS)
+-    return urlrequest.urlopen(request, *args, **kwargs)
+-
+-
+-def set_proxy():
+-    """Set proxy"""
+-    proxy = os.getenv("GRASS_PROXY")
+-    if proxy:
+-        proxies = {}
+-        for ptype, purl in (p.split("=") for p in proxy.split(",")):
+-            proxies[ptype] = purl
+-        urlrequest.install_opener(
+-            urlrequest.build_opener(urlrequest.ProxyHandler(proxies))
+-        )
+-
+-
+-set_proxy()
+-
+-
+-def download_git_commit(url, response_format, *args, **kwargs):
+-    """Download module/addon last commit from GitHub API
+-
+-    :param str url: url address
+-    :param str response_format: content type
+-
+-    :return urllib.request.urlopen or None response: response object or
+-                                                     None
+-    """
+-    try:
+-        response = urlopen(url, *args, **kwargs)
+-        if not response.code == 200:
+-            index = HTTP_STATUS_CODES.index(response.code)
+-            desc = HTTP_STATUS_CODES[index].description
+-            gs.fatal(
+-                _(
+-                    "Download commit from <{url}>, return status code "
+-                    "{code}, {desc}".format(
+-                        url=url,
+-                        code=response.code,
+-                        desc=desc,
+-                    ),
+-                ),
+-            )
+-        if response_format not in response.getheader("Content-Type"):
+-            gs.fatal(
+-                _(
+-                    "Wrong downloaded commit file format. "
+-                    "Check url <{url}>. Allowed file format is "
+-                    "{response_format}.".format(
+-                        url=url,
+-                        response_format=response_format,
+-                    ),
+-                ),
+-            )
+-        return response
+-    except HTTPError as err:
+-        gs.warning(
+-            _(
+-                "The download of the commit from the GitHub API "
+-                "server wasn't successful, <{}>. Commit and commit "
+-                "date will not be included in the <{}> addon html manual "
+-                "page.".format(err.msg, pgm)
+-            ),
+-        )
+-    except URLError:
+-        gs.warning(
+-            _(
+-                "Download file from <{url}>, failed. Check internet "
+-                "connection. Commit and commit date will not be included "
+-                "in the <{pgm}> addon manual page.".format(url=url, pgm=pgm)
+-            ),
+-        )
+-
+-
+-def get_last_git_commit(src_dir, is_addon, addon_path):
+-    """Get last module/addon git commit
+-
+-    :param str src_dir: module/addon source dir
+-    :param bool is_addon: True if it is addon
+-    :param str addon_path: addon path
+-
+-    :return dict git_log: dict with key commit and date, if not
+-                          possible download commit from GitHub API server
+-                          values of keys have "unknown" string
+-    """
+-    unknown = "unknown"
+-    git_log = {"commit": unknown, "date": unknown}
+-    datetime_format = "%A %b %d %H:%M:%S %Y"  # e.g. Sun Jan 16 23:09:35 2022
+-    if is_addon:
+-        grass_addons_url = (
+-            "https://api.github.com/repos/osgeo/grass-addons/commits?path={path}"
+-            "&page=1&per_page=1&sha=grass{major}".format(
+-                path=addon_path,
+-                major=major,
+-            )
+-        )  # sha=git_branch_name
+-    else:
+-        core_module_path = os.path.join(
+-            *(set(src_dir.split(os.path.sep)) ^ set(topdir.split(os.path.sep)))
+-        )
+-        grass_modules_url = (
+-            "https://api.github.com/repos/osgeo/grass/commits?path={path}"
+-            "&page=1&per_page=1&sha={branch}".format(
+-                branch=grass_git_branch,
+-                path=core_module_path,
+-            )
+-        )  # sha=git_branch_name
+-
+-    if shutil.which("git"):
+-        if os.path.exists(src_dir):
+-            git_log["date"] = time.ctime(os.path.getmtime(src_dir))
+-        stdout, stderr = subprocess.Popen(
+-            args=["git", "log", "-1", src_dir],
+-            stdout=subprocess.PIPE,
+-            stderr=subprocess.PIPE,
+-        ).communicate()
+-        stdout = decode(stdout)
+-        stderr = decode(stderr)
+-
+-        if stderr and "fatal: not a git repository" in stderr:
+-            response = download_git_commit(
+-                url=grass_addons_url if is_addon else grass_modules_url,
+-                response_format="application/json",
+-            )
+-            if response:
+-                commit = json.loads(response.read())
+-                if commit:
+-                    git_log["commit"] = commit[0]["sha"]
+-                    git_log["date"] = datetime.strptime(
+-                        commit[0]["commit"]["author"]["date"],
+-                        "%Y-%m-%dT%H:%M:%SZ",
+-                    ).strftime(datetime_format)
+-        else:
+-            if stdout:
+-                commit = stdout.splitlines()
+-                git_log["commit"] = commit[0].split(" ")[-1]
+-                commit_date = commit[2].lstrip("Date:").strip()
+-                git_log["date"] = commit_date.rsplit(" ", 1)[0]
+-    return git_log
+-
+-
+ html_page_footer_pages_path = (
+     os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")
+     if os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")
+@@ -261,6 +79,14 @@ pgm = sys.argv[1]
+ src_file = "%s.html" % pgm
+ tmp_file = "%s.tmp.html" % pgm
+ 
++grass_version = os.getenv("VERSION_NUMBER", "unknown")
++trunk_url = ""
++addons_url = ""
++if grass_version != "unknown":
++    major, minor, patch = grass_version.split(".")
++    trunk_url = f"https://github.com/OSGeo/grass/tree/releasebranch_{major}_{minor}/"
++    addons_url = f"https://github.com/OSGeo/grass-addons/tree/grass{major}/"
++
+ header_base = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <html>
+ <head>
+@@ -295,9 +121,6 @@ sourcecode = string.Template(
+   <a href="${URL_SOURCE}">${PGM} source code</a>
+   (<a href="${URL_LOG}">history</a>)
+ </p>
+-<p>
+-  ${DATE_TAG}
+-</p>
+ """
+ )
+ 
+@@ -624,7 +447,6 @@ else:
+     source_url = addons_url
+     pgmdir = os.path.sep.join(curdir.split(os.path.sep)[-3:])
+ url_source = ""
+-addon_path = None
+ if os.getenv("SOURCE_URL", ""):
+     addon_path = get_addon_path()
+     if addon_path:
+@@ -655,23 +477,11 @@ if index_name:
+     else:
+         url_log = url_source.replace(tree, commits)
+ 
+-    git_commit = get_last_git_commit(
+-        src_dir=curdir,
+-        addon_path=addon_path if addon_path else None,
+-        is_addon=True if addon_path else False,
+-    )
+-    if git_commit["commit"] == "unknown":
+-        date_tag = "Accessed: {date}".format(date=git_commit["date"])
+-    else:
+-        date_tag = "Latest change: {date} in commit: {commit}".format(
+-            date=git_commit["date"], commit=git_commit["commit"]
+-        )
+     sys.stdout.write(
+         sourcecode.substitute(
+             URL_SOURCE=url_source,
+             PGM=pgm,
+             URL_LOG=url_log,
+-            DATE_TAG=date_tag,
+         )
+     )
+     sys.stdout.write(
diff --git a/sci-geosciences/grass/grass-8.0.0_rc2.ebuild b/sci-geosciences/grass/grass-8.0.0.ebuild
index 1a9dc30646ec..598e8b0ea52d 100644
--- a/sci-geosciences/grass/grass-8.0.0_rc2.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0.ebuild
@@ -85,6 +85,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	# bug 746590
 	"${FILESDIR}/${PN}-flock.patch"
+	"${FILESDIR}/${PN}-${PV}-mkhtml.patch"
 )
 
 pkg_setup() {