gentoo resync : 16.01.2021

5 files changed, 13 insertions, 178 deletions

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index e1162e5eb12a..191418f36c50 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,8 +1,7 @@
-AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690477c2997c36fb5e3261ae64d1d3445b3fb4a241a39c504591b07af121e92f1ef9f9efb3ade01e82974f8955a SHA512 1dc95cddca38ea5e8200176a92bb412f4a3295eae18e770a6db3aa0d8cfbf11116dce1c9970bd03d78ee69d23254d2e85637f0a00208aff7aa428e52d631121b
 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.0RC1.tar.gz 64800389 BLAKE2B b17282f8465bc62979867aa6a8402912901189dc8f9584aacb3b47553874e08fd98572aa34ad6885b5361246f4620775075cc6fcbad66a7e1bb7c6d9acd9196c SHA512 fe7497d362539c0e4241cfe5a98d7f79f8c3e7376f7a630f6aa260195bf8eb546d0b8821208255ae831da31de4dfe988bbdb5c89273ba6ebc0566d99a3c5e664
+DIST grass-8.0.0RC2.tar.gz 64942585 BLAKE2B fc7499def2029acb9b547c688eaaad986daae5c80b085bbe876d7bca4d4c7547867375edee752705e30ab215d0b8e0c7f017e94802a549569a525196bbd7bcb4 SHA512 9e624c54974e253dce1b93a0ce1c51eaa421d8baacdf61b03893d34c5cd36af76915ab035fb9bb78af4c16e1efc12bb501a707e335e312a12cf2c17a2b0d6f61
 EBUILD grass-7.8.6-r1.ebuild 7055 BLAKE2B e38aeec61d89be4a584760e6af906e8ff1e080176110a05a27fe8610b3b87109a49a2ab7160c2f7fe47047d203cdb52ac7be917982e744b4e827e746c34ff7d2 SHA512 3bf3595b0f1a1dc296f6c2f8a05eef8b6621ef6609e4f207d1710a916f9b8b6791e4424b0806b032fc3f925d7b714f43a48e9750aa700075e4c99a955d0ad930
-EBUILD grass-8.0.0_rc1.ebuild 7100 BLAKE2B e89a9b0c322ff59622c020fecd242382348f82dccf5dcd91df50ec714491a78594b07914375540f394f410840e18360ea2f754436d37297855a7ac3cd83ba2a8 SHA512 cad285bc9af71481f229276fe31f7f8a5bbd6b8a231a29ff28e5ef417527db4afc0ccdbca2913bcd06a8aca06cff1706ed69819bccc97b8c20ce49f31e5557a0
-EBUILD grass-9999.ebuild 6912 BLAKE2B 970a289a4d42a6bbf9f89a1be493ae63a52c11406193ef0d79e1c9121a4c77a60eb46fb2ddc88b91c95fae83dc304b6111b7c5f51132c4061e5d511581f83b60 SHA512 6660185d96d3de73f08ed14c869c0cf4bf845e3da2e6626a5d216657eb3af844019f11878fa0d90c4eb2cccbac482f272815c4fbea7a0e51c5fcc7282d917965
-MISC metadata.xml 1165 BLAKE2B 5cfa38c94f3855681ac0f61ae88c58de766eab048601d8c45324f192de975287088ab424030857f4a84ae6eea01fc0e9033ab36c00e679645545cd857722d060 SHA512 58a86942daa71543093c95015366a08f75fa88075330ffda2431e47d93d79f60c8f60b90c05e2a068283045f54db8f8f45dcb36664268a1207e90fa90bd6d63b
+EBUILD grass-8.0.0_rc2.ebuild 7100 BLAKE2B e89a9b0c322ff59622c020fecd242382348f82dccf5dcd91df50ec714491a78594b07914375540f394f410840e18360ea2f754436d37297855a7ac3cd83ba2a8 SHA512 cad285bc9af71481f229276fe31f7f8a5bbd6b8a231a29ff28e5ef417527db4afc0ccdbca2913bcd06a8aca06cff1706ed69819bccc97b8c20ce49f31e5557a0
+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-7.8.5-bool.patch b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
deleted file mode 100644
index fddcb9f6df88..000000000000
--- a/sci-geosciences/grass/files/grass-7.8.5-bool.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git a/include/gis.h b/include/gis.h
-index 46bb06c52f..333651b938 100644
---- a/include/gis.h
-+++ b/include/gis.h
-@@ -23,6 +23,8 @@
- /* System include files */
- #include <stdio.h>
- #include <stdarg.h>
-+#include <stdbool.h>
-+
- 
- /* Grass and local include files */
- #include <grass/config.h>
-@@ -51,13 +53,14 @@ static const char *GRASS_copyright __attribute__ ((unused))
- #define G_gisinit(pgm) G__gisinit(GIS_H_VERSION, (pgm))
- #define G_no_gisinit() G__no_gisinit(GIS_H_VERSION)
- 
--/* Define TRUE and FALSE for boolean comparisons */
-+/* For boolean values and comparisons use the C99 type 'bool' with values 'true' */
-+/* and 'false' For historical reasons 'TRUE' and 'FALSE' are still valid.        */
- #ifndef TRUE
--#define TRUE 1
-+#define TRUE true
- #endif
- 
- #ifndef FALSE
--#define FALSE 0
-+#define FALSE false
- #endif
- 
- #if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || (__APPLE__ && __LP64__)
-diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
-index 89a25de3bf..978894ea74 100644
---- a/lib/lidar/lidar.h
-+++ b/lib/lidar/lidar.h
-@@ -62,9 +62,6 @@
-     /* INTERPOLATOR */
- #define P_BILINEAR 		1
- #define P_BICUBIC 		0
--    /* Boolean definitions */
--#define TRUE 			1
--#define FALSE 			0
- 
- /*----------------------------------------------------------------------------------------------------------*/
-     /*STRUCTS DECLARATION */
-diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
-index 9c1dab4e81..2512fedaa2 100644
---- a/raster/r.param.scale/param.h
-+++ b/raster/r.param.scale/param.h
-@@ -18,8 +18,6 @@
- 				/* 'blank' edge around raster.          */
- #define MAX_WSIZE 499		/* Maximum dimensions of window.        */
- 				/* Some useful labels.                  */
--#define TRUE 1
--#define FALSE 0
- 
- #define RAD2DEG M_R2D
- #define DEG2RAD M_D2R
-diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
-index 33164f43cb..47028e7444 100644
---- a/raster/r.surf.idw/main.h
-+++ b/raster/r.surf.idw/main.h
-@@ -1,8 +1,6 @@
- #include <grass/raster.h>
- 
- #define         SHORT           short
--#define         TRUE    1
--#define         FALSE   0
- 
- #define MELEMENT        struct Melement
- MELEMENT {
-diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
-index fb3b79882f..ae3ec3933a 100644
---- a/raster3d/r3.showdspf/Ball.c
-+++ b/raster3d/r3.showdspf/Ball.c
-@@ -7,8 +7,6 @@
- #include "Ball.h"
- #include "BallMath.h"
- #include <stdio.h>
--#define TRUE 1
--#define FALSE 0
- 
- HMatrix mId = { {1, 0, 0, 0}
- , {0, 1, 0, 0}
-diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
-index 589f243a8d..b48236b33f 100644
---- a/raster3d/r3.showdspf/togif.c
-+++ b/raster3d/r3.showdspf/togif.c
-@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
-  *
-  *****************************************************************************/
- 
--#define TRUE 1
--#define FALSE 0
--
- 
- /************************** BumpPixel() ********************************/
- /*
-diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
-index 1ad97396fa..584af5d8ba 100644
---- a/vector/v.hull/chull.c
-+++ b/vector/v.hull/chull.c
-@@ -29,10 +29,6 @@
- 
- #include "globals.h"
- 
--/*Define Boolean type */
--typedef enum
--{ BFALSE, BTRUE } bool;
--
- /* Define vertex indices. */
- #define X   0
- #define Y   1
-@@ -76,10 +72,10 @@ struct tFaceStructure
- };
- 
- /* Define flags */
--#define ONHULL   	BTRUE
--#define REMOVED  	BTRUE
--#define VISIBLE  	BTRUE
--#define PROCESSED	BTRUE
-+#define ONHULL   	true
-+#define REMOVED  	true
-+#define VISIBLE  	true
-+#define PROCESSED	true
- 
- /* Global variable definitions */
- tVertex vertices = NULL;
-@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
-     tFace f;
-     tEdge e, temp;
-     long int vol;
--    bool vis = BFALSE;
-+    bool vis = false;
- 
- 
-     /* Mark faces visible from p. */
-@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
- 
- 	if (vol < 0) {
- 	    f->visible = VISIBLE;
--	    vis = BTRUE;
-+	    vis = true;
- 	}
- 	f = f->next;
-     } while (f != faces);
-@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
-     /* If no faces are visible from p, then p is inside the hull. */
-     if (!vis) {
- 	p->onhull = !ONHULL;
--	return BFALSE;
-+	return false;
-     }
- 
-     /* Mark edges in interior of visible region for deletion.
-@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
- 	    e->newface = MakeConeFace(e, p);
- 	e = temp;
-     } while (e != edges);
--    return BTRUE;
-+    return true;
- }
- 
- /*---------------------------------------------------------------------
diff --git a/sci-geosciences/grass/grass-8.0.0_rc1.ebuild b/sci-geosciences/grass/grass-8.0.0_rc2.ebuild
index 1a9dc30646ec..1a9dc30646ec 100644
--- a/sci-geosciences/grass/grass-8.0.0_rc1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0_rc2.ebuild
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 4e0eaf89a49f..d0b73c80b283 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,15 +9,15 @@ WX_GTK_VER="3.0-gtk3"
 
 inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
 
-MY_P="${PN}8.0"
-MY_PM="${MY_P/.}"
-
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
 HOMEPAGE="https://grass.osgeo.org/"
 EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
 
 LICENSE="GPL-2"
-SLOT="0/8.0"
+SLOT="0/8.1"
+GVERSION=${SLOT#*/}
+MY_P="${PN}${GVERSION}"
+MY_PM="${MY_P/.}"
 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}
@@ -234,9 +234,9 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
 os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
 		-i "${ED}"/usr/bin/grass || die
 
-	# set proper GISDBASE directory path in the demolocation .grassrc80 file
+	# set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
 	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
-		-i "${ED}"${gisbase}/demolocation/.grassrc80 || die
+		-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
 
 	if use X; then
 		local GUI="-gui"
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index b1f11eec9478..5114a3d95217 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -15,8 +15,8 @@
 	</maintainer>
 	<longdescription>
 		The original GIS, yes the first one, developed by the US
-		Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation
-		Project for more info http://grass.itc.it/gdp/index.php
+		Army Corp of Engineers, now an active free and open source GIS. See the GRASS Documentation
+		Project for more info https://grass.osgeo.org/.
 	</longdescription>
 	<use>
 		<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag>