gentoo resync : 29.12.2022

8 files changed, 24 insertions, 622 deletions

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ebeb0f7299f7..abc63235731c 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,14 +1,11 @@
-AUX grass-8.0.0-mkhtml.patch 10339 BLAKE2B 39b55a1c33b751508128533bcfb513d3aab9227985ff142eb346c02997599afc228274a7aa8b02258def491816b98fb52b307007facfcb00b79657afd42a88c7 SHA512 a4eca79ccadf77b863b254a83fab8eaa096bbf977bfe54cd4de3ee914f55e3499fe42615904b1717ffbb0da06334306543f0562203793adaa0770926498dfece
-AUX grass-8.0.1-lib_imagery.patch 340 BLAKE2B f71e447c87a373f16780002206e9b77f0d276de24df51f43a9601a638a4761de131287df35361eaba73e423c03fe9c0562d30d933c425d76d9b683b837e24520 SHA512 a211391372af17417a18e7ff4c32d0fc0e4d33a5baff4f4ad77b5aa389637fee12d9436c3240668231ac66c2c5d0922f5b3dec4fd6d08f396acc7e6fda07bd97
 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
 DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
-DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
-DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
+DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 496dab376b38c74d2206096f8b1bf848888c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f SHA512 fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c
+DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930
 EBUILD grass-7.8.6-r1.ebuild 7055 BLAKE2B e38aeec61d89be4a584760e6af906e8ff1e080176110a05a27fe8610b3b87109a49a2ab7160c2f7fe47047d203cdb52ac7be917982e744b4e827e746c34ff7d2 SHA512 3bf3595b0f1a1dc296f6c2f8a05eef8b6621ef6609e4f207d1710a916f9b8b6791e4424b0806b032fc3f925d7b714f43a48e9750aa700075e4c99a955d0ad930
 EBUILD grass-7.8.7.ebuild 7037 BLAKE2B 6c49c86b9360199a2b47340241d6ba7d350e91dcedf9d5e8f732e97ec624b312b75a36e520949a38a9c5684c0fac3fd85113fcebb0ea0886ec815045566cb3a0 SHA512 e24b41c9754db9edc469d9095d9f97303ad703e047e0ab6810afb5f7b42e28c453a5c0f2292f71b6bc2acd0fa4157e172fbae7966f456ef2eb7fb938f747bb75
-EBUILD grass-8.0.0.ebuild 7138 BLAKE2B 3a28346c1ea888baa94e3b8c4b2b8028ee69f3d8f1caa671c1d9d11c8d65ca27ce8ce3c99c525d75f8dd06eee2f2bde54c6dc4ef666f0fe5691d7d2b1f4143a5 SHA512 3f755b7f3d077d4a4e003b88d08e541cb8efcca07a9864b73e858db1917867ebcb284928e55207c89ebdc800586bfc4cab32ad75d3b01e408c48eea77a8b69ff
-EBUILD grass-8.0.1-r1.ebuild 7294 BLAKE2B 8ae093187946ff42510d0f891fcdc98547bd4c01061c27eb1635af2d14c02d7f4547e9a92d316ed0cdd1c45c96dfb565bfafa229c7e0ffad50c04b25f94659b1 SHA512 2dab8480e003051848df87a6989eb3fb5aa6c5f8f676e81e007d60ac8b2b3cd125cb3b70eb92e9ec8112414a6520bc04b5111334b423ecce6d765b4e4119692e
-EBUILD grass-8.0.1.ebuild 7254 BLAKE2B 8f3108175b283249d0168cff29adef6371ea01f50d0fa618e0e6b6a8c0c9c6c2a74cdea51d4c44d8af614d58a25f53f1ade91aeaa68764dd6783ffce1d54874a SHA512 7e2bbfa06148c10fc1e08062820c335e2ceb96d54f12d65d508876249647acd5fe92d2e35a9a8e08ed737e88ed58d1df1185f5514a15653a5b066d8d3e0cb63d
-EBUILD grass-9999.ebuild 7196 BLAKE2B f895558bb5ab4779e48d5ceb0e10dfb83160d57a9407d6ccec0ace03b8a9c2e48a398a66dc615070320e92005d4c28a41fbaaf841e701e36b690d0f71b44d21e SHA512 1d6d747956c124d59c4afadd1053c4f649d4fa3e939d56754d3f8ad1220572bdbeb28bb2930f3891022a66ad8ac1e22ebaee314e0d597b47808de1855540322d
-MISC metadata.xml 1166 BLAKE2B ae97d82be74c6782d74f256a40fbdb13590f5434f19f9980dbd51f182c687f24bd6068ab37a23958f583b299a3b4a5949526c0a9791a5620e1774db768f46f07 SHA512 c9b5cc9316da6e3fe396550bb1216f8a3376b6e6a088b6a289b0b008b0c34b0486dc357893ec19868023e800533f5e354addfca1a07d5e070dd4a556b96cd446
+EBUILD grass-8.0.2.ebuild 7395 BLAKE2B 26056fd3435579cd5c3582eb161a5555480da272f451c079eda08682d1b4c9abd2bf8c1dc0d0f03f9339c39357d91850a27317101fe4f50599da04df327609be SHA512 d3dfdcc2e453fbf902418bb0f6240e1a9abcbade55b9419ec0e5cc75ec1949219c2e411b1512d1e0a5e876366fb0bfd2fc34f7c3bb9d8428f67366b6fafae9a8
+EBUILD grass-8.2.0.ebuild 7397 BLAKE2B a6bb4a9721446eaf6ee91fe5f29153b7d7326d2d0c1eb5aeaa3bac6245e53c3c07abe0be711289981ce7a5e69a716b4a1086de948b80711e75048b132931c6f7 SHA512 2af79f67086685086cdf3b838f985a93e95543ceb3784fdaee48b30de85360722f83bb7075082637dbdeb500bc3a84b91b39adee7467e0dffc9bd65d435929b8
+EBUILD grass-9999.ebuild 7337 BLAKE2B 9e735ae65498174408f482f8f5f568c57c351113390a1836227f9787a5c5cde9fbcd22191ecda0dc1078e3ec7cb3b4a39bf75d087d6d23dfd36c892d479ac525 SHA512 364c581b765c13026d59f41123c34943b40e87307102a41f3b2906232cc70c7dad423c2fcc2bd3ebddd77bb8c36be78d206a218665365804a16567578fb0c43d
+MISC metadata.xml 1286 BLAKE2B 0f08cfaa427449162c2820db80f4d306c73bdf6a9edd337be482df034e40ace5fad0ab2f7acb08b3bde5e1db54ed9f9ac38669ab689968c30964aae15b4134a7 SHA512 2adc25985ec839ba9d1b9b15a196b3477f4a92cda7d83dfafa9259d88768bcc57ab559f45820314b9ad7dc8ce3d25332eb6a8e7500ce26d7b53011a90bc99211
diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
deleted file mode 100644
index 1eb46012f6a4..000000000000
--- a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
+++ /dev/null
@@ -1,316 +0,0 @@
---- 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/files/grass-8.0.1-lib_imagery.patch b/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
deleted file mode 100644
index 1eca86750ecd..000000000000
--- a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://github.com/OSGeo/grass/pull/2269
---- a/lib/imagery/Makefile
-+++ b/lib/imagery/Makefile
-@@ -7,7 +7,6 @@
- 
- include $(MODULE_TOPDIR)/include/Make/Lib.make
- include $(MODULE_TOPDIR)/include/Make/Doxygen.make
--include $(MODULE_TOPDIR)/include/Make/Grass.make
- 
- # images
- IMGSRC := $(wildcard *.png) $(wildcard *.jpg) $(wildcard *.gif)
diff --git a/sci-geosciences/grass/grass-8.0.0.ebuild b/sci-geosciences/grass/grass-8.0.0.ebuild
deleted file mode 100644
index 3ab8a5a5d5f2..000000000000
--- a/sci-geosciences/grass/grass-8.0.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
-
-MY_PM=${PN}$(ver_cut 1-2 ${PV})
-MY_PM=${MY_PM/.}
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8.0"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="amd64 ~ppc x86"
-fi
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal:=
-	sys-libs/gdbm:=
-	sys-libs/ncurses:0=
-	sci-libs/proj:=
-	sci-libs/xdrfile
-	sys-libs/zlib
-	media-libs/libglvnd
-	media-libs/glu
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos:= )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	liblas? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:0= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		dev-python/wxpython:4.0
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-flock.patch"
-	"${FILESDIR}/${PN}-${PV}-mkhtml.patch"
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*atlas.*/}" ]]; then
-			ewarn "You need to set lapack to atlas or reference. Do:"
-			ewarn "   eselect lapack set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	if use blas; then
-		local myblas=$(eselect blas show)
-		if [[ -z "${myblas/.*reference.*/}" ]] && \
-			[[ -z "${myblas/.*atlas.*/}" ]]; then
-			ewarn "You need to set blas to atlas or reference. Do:"
-			ewarn "   eselect blas set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-	eautoreconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	if use X; then
-		local WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite /dev/dri/renderD128
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
-		--with-proj-includes="${EPREFIX}"/usr/include/proj
-		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
-		--with-proj-share="${EPREFIX}"/usr/share/proj/
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
-		$(use_with X wxwidgets "${WX_CONFIG}")
-		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
-		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
-		$(use_with X x)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
-		prefix=/usr/ BINDIR=/usr/bin \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	done
-
-	# link headers in the ~standard~ place
-	dodir /usr/include/
-	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
-
-	# fix paths in addons makefile includes
-	local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
-	for f in "${scriptMakeDir}"/*; do
-		file="${f##*/}"
-		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-	done
-
-	# get proper folder for grass path in script
-	local gisbase=/usr/$(get_libdir)/${MY_PM}
-	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
-GISBASE = os.path.normpath(\"${gisbase}\"):" \
-		-i "${ED}"/usr/bin/grass || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
-		"${ED}"${gisbase}/etc/fontcap || die
-
-	# set proper python interpreter
-	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
-os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/grass || die
-
-	# set proper GISDBASE directory path in the demolocation .grassrc80 file
-	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
-		-i "${ED}"${gisbase}/demolocation/.grassrc80 || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/grass-8.0.1.ebuild b/sci-geosciences/grass/grass-8.0.2.ebuild
index f2a791cdcee7..ff4658b5ba17 100644
--- a/sci-geosciences/grass/grass-8.0.1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.2.ebuild
@@ -32,7 +32,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
+IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	opengl? ( X )"
@@ -59,7 +59,7 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0= )
 	geos? ( sci-libs/geos:= )
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	liblas? ( sci-geosciences/liblas )
+	las? ( sci-geosciences/liblas )
 	mysql? ( dev-db/mysql-connector-c:= )
 	netcdf? ( sci-libs/netcdf:= )
 	odbc? ( dev-db/unixODBC )
@@ -184,7 +184,7 @@ src_configure() {
 		$(use_with threads pthread)
 		$(use_with openmp)
 		$(use_with opencl)
-		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
+		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
 		$(use_with X wxwidgets "${WX_CONFIG}")
 		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
 		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
@@ -274,6 +274,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
 
 pkg_postinst() {
 	use X && xdg_pkg_postinst
+	ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
+	ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
 }
 
 pkg_postrm() {
diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild b/sci-geosciences/grass/grass-8.2.0.ebuild
index 92ed99c98cc2..d326298a52b2 100644
--- a/sci-geosciences/grass/grass-8.0.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu
 HOMEPAGE="https://grass.osgeo.org/"
 
 LICENSE="GPL-2"
-SLOT="0/8.0"
+SLOT="0/8.2"
 
 GVERSION=${SLOT#*/}
 MY_PM="${PN}${GVERSION}"
@@ -32,7 +32,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
+IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	opengl? ( X )"
@@ -59,7 +59,7 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0= )
 	geos? ( sci-libs/geos:= )
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	liblas? ( sci-geosciences/liblas )
+	las? ( sci-geosciences/liblas )
 	mysql? ( dev-db/mysql-connector-c:= )
 	netcdf? ( sci-libs/netcdf:= )
 	odbc? ( dev-db/unixODBC )
@@ -93,7 +93,6 @@ BDEPEND="
 PATCHES=(
 	# bug 746590
 	"${FILESDIR}/${PN}-flock.patch"
-	"${FILESDIR}/${P}-lib_imagery.patch"
 )
 
 pkg_setup() {
@@ -185,7 +184,7 @@ src_configure() {
 		$(use_with threads pthread)
 		$(use_with openmp)
 		$(use_with opencl)
-		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
+		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
 		$(use_with X wxwidgets "${WX_CONFIG}")
 		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
 		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
@@ -275,6 +274,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
 
 pkg_postinst() {
 	use X && xdg_pkg_postinst
+	ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
+	ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
 }
 
 pkg_postrm() {
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 31ad3a913914..33808453c9c7 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu
 HOMEPAGE="https://grass.osgeo.org/"
 
 LICENSE="GPL-2"
-SLOT="0/8.1"
+SLOT="0/8.3"
 
 GVERSION=${SLOT#*/}
 MY_PM="${PN}${GVERSION}"
@@ -32,7 +32,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
+IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	opengl? ( X )"
@@ -59,7 +59,7 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0= )
 	geos? ( sci-libs/geos:= )
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	liblas? ( sci-geosciences/liblas )
+	las? ( sci-geosciences/liblas )
 	mysql? ( dev-db/mysql-connector-c:= )
 	netcdf? ( sci-libs/netcdf:= )
 	odbc? ( dev-db/unixODBC )
@@ -179,7 +179,7 @@ src_configure() {
 		$(use_with threads pthread)
 		$(use_with openmp)
 		$(use_with opencl)
-		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
+		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
 		$(use_with X wxwidgets "${WX_CONFIG}")
 		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
 		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
@@ -269,6 +269,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
 
 pkg_postinst() {
 	use X && xdg_pkg_postinst
+	ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
+	ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
 }
 
 pkg_postrm() {
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 5114a3d95217..66b650a3707b 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -21,6 +21,7 @@
 	<use>
 		<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag>
 		<flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
+		<flag name="las">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
 		<flag name="opencl">Enable OpenCL support</flag>
 	</use>
 	<upstream>