gentoo resync : 23.09.2020

11 files changed, 2 insertions, 670 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 5e625d9d1788..48eec5c44172 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest
deleted file mode 100644
index f57ef0bab81a..000000000000
--- a/sci-geosciences/gdal-grass/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gdal-grass-2.1.3.tar.gz 54478 BLAKE2B 172200d8362b12583f0f73316b8c6d34875682c9d76c095745152c8d4fd1da1d9d1e94df5928225f6fda5712e987379c7c3192fa81d02b9cee9145fb577faee1 SHA512 c11776f92e591f1c0136e439ab6c672015171c5b750cb9332c73b49b3173c1d57efb4854b152a1d8e1b438c68a1130b4a46a189e1be0b99af9a8fb931f246e39
-EBUILD gdal-grass-2.1.3.ebuild 1338 BLAKE2B 8446c1ca6087b98fd7bf66f7f9533d2325503fce01935ad7245c8073abe9b583b4026bfe7cec66f07620acbffc77beef136fe527cbbab9f60aeb047a91b6a663 SHA512 0f31ea8d593720ea177a47c7aa96f04381aee17115ee0023ddebe5600ed60b0952a306478e5b46f4f48d53b83ef257158567c456739c7b21e3a15a307967d0e2
-MISC metadata.xml 374 BLAKE2B e5c65df3d92edf2be292e76594e43f701f3a3dc25af1ed82daedfa550a65f698c867d840eb926e8d114ceb86c659c8d4db16fc90f8b6936f5670d1465cc88afb SHA512 be40eaf2149affadb4a8bbdc2817f44ea5d7117ad09797fb1ffe1db4a146129cde3955ad8b8c7e9283f9c2b8b86a6dc3bcf3d889d14c00481936ed388d632898
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild
deleted file mode 100644
index 745a05ffcfa8..000000000000
--- a/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GDAL plugin to access GRASS data"
-HOMEPAGE="https://www.gdal.org/"
-SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="postgres"
-RDEPEND="
-	>=sci-libs/gdal-2.0.0:=
-	sci-geosciences/grass:=
-"
-DEPEND="${RDEPEND}
-	postgres? ( dev-db/postgresql )"
-
-# these drivers are copied at install from the already installed GRASS
-QA_PREBUILT="/usr/share/gdal/grass/driver/db/*"
-
-src_prepare() {
-	sed -e 's:mkdir ${GRASSTABLES_DIR}$:mkdir -p ${GRASSTABLES_DIR}:' \
-		-i Makefile.in || die
-	default
-}
-
-src_configure() {
-	local grassp=$(best_version sci-geosciences/grass)
-	local grasspv=$(echo ${grassp/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
-	local grasspm=$(ver_cut 1-2 ${grasspv})
-	local myeconfargs=(
-		--with-grass="/usr/$(get_libdir)/grass$(ver_rs 1 '' ${grasspm})"
-		--with-gdal="/usr/bin/gdal-config"
-		$(use_with postgres postgres-includes "/usr/include/postgresql")
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	#pass the right variables to 'make install' to prevent a sandbox access violation
-	emake DESTDIR="${D}" \
-		GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \
-		AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \
-		install
-}
diff --git a/sci-geosciences/gdal-grass/metadata.xml b/sci-geosciences/gdal-grass/metadata.xml
deleted file mode 100644
index 4c161841a958..000000000000
--- a/sci-geosciences/gdal-grass/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-geosciences@gentoo.org</email>
-    <name>Gentoo Geosciences Project</name>
-  </maintainer>
-  <use>
-    <flag name="postgres">Include support for <pkg>dev-db/postgresql</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
deleted file mode 100644
index 593904799767..000000000000
--- a/sci-geosciences/grass/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX grass-7.0.1-declare-inespg.patch 647 BLAKE2B ec303cc88965ff24d9521a3d2fdec3cd62f14bb9830a37942aa3373acc5351b07022f782c8f22f560bbf1f794fd46fa524b7ddab07a360c3e6f34cf3c1258972 SHA512 9206619090c0f138c734f7fe48467cd343cd01120ac4d7eaec3d822b7cac1cbc6e4630bfedd68e7bdd6966716116a1d6714faf373a1eceb08726acd16ca34bb4
-DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83
-EBUILD grass-7.4.4-r3.ebuild 7416 BLAKE2B 0de9b85e9faf9ee9c207ea7bdd748191d889d59e432271982caf742eacfe9bc1d1c3e79c218c7f05a2252d41544aeae249bd2e654ba8a7fe61b47bcb4ae5b4d1 SHA512 b6b472d0b5e8d8e702382ffda40376d146ba2fd84091330938b7a2adea17e53f13203081c6f60ae8aaeed878f2068a7d5996222b0e23b28a8868e9d67e42cddc
-EBUILD grass-7.4.4.ebuild 7427 BLAKE2B 901d179a5744f1e62ae83768d5792b041431e8a9891240954f3b3b9811391c01aec4fa99a4a919006699fc905b9d5a78a405e7e2a241be88d4ac93404bd159c6 SHA512 9c1e65cf52d8b0ea7ad82d0c323364ddf907ea26c6854114a86cc5382340ddd152548895c8865631d070d10a36f404df04ae0009f33e62c7b8fd01fa19933ada
-MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635
diff --git a/sci-geosciences/grass/files/grass-7.0.1-declare-inespg.patch b/sci-geosciences/grass/files/grass-7.0.1-declare-inespg.patch
deleted file mode 100644
index 91f33a202635..000000000000
--- a/sci-geosciences/grass/files/grass-7.0.1-declare-inespg.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/general/g.proj/main.c b/general/g.proj/main.c
-index 21d7b95..f81b392 100644
---- a/general/g.proj/main.c
-+++ b/general/g.proj/main.c
-@@ -41,8 +41,8 @@ int main(int argc, char *argv[])  # undeclared var if OSG disabled
- 	*forcedatumtrans;	/* Force override of datumtrans parameters  */
-     
-     struct Option *location,	/* Name of new location to create           */
--#ifdef HAVE_OGR
- 	*inepsg,		/* EPSG projection code                     */
-+#ifdef HAVE_OGR
- 	*inwkt,			/* Input file with projection in WKT format */
- 	*inproj4,		/* Projection in PROJ.4 format              */
- 	*ingeo,			/* Input geo-referenced file readable by 
-
diff --git a/sci-geosciences/grass/grass-7.4.4-r3.ebuild b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
deleted file mode 100644
index 8abc0e1da2b7..000000000000
--- a/sci-geosciences/grass/grass-7.4.4-r3.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER=3.0
-
-inherit autotools desktop eapi7-ver 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/7.4.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		|| (
-			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	media-libs/libprojectm
-	sci-libs/gdal
-	sys-libs/gdbm
-	sys-libs/ncurses:0=
-	sci-libs/proj
-	sci-libs/xdrfile
-	sys-libs/zlib
-	blas? (
-		virtual/cblas
-		virtual/blas
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
-	lapack? ( virtual/lapack )
-	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:3.0[cairo,opengl?]
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? (
-		dev-lang/swig
-		x11-base/xorg-proto
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch )
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack
-		mylapack=$(eselect lapack show) || die
-		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
-		myblas=$(eselect blas show) || die
-		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
-	local pyver=${EPYTHON/python/}
-	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	# fix header being unconditionally included
-	# see upstream https://trac.osgeo.org/grass/ticket/2779
-	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
-		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
-
-	default
-	eautoconf
-
-	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
-	mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	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
-		WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite "${EPREFIX}/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/libprojectM"
-		--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)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		INST_DIR="${D}/usr/$(get_libdir)/${MY_PM}" \
-		prefix="${D}/usr/" BINDIR="${D}/usr/bin" \
-		PREFIX="${D}/usr/" \
-		install
-
-	pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# manuals
-	dodir /usr/share/man/man1
-	rm -rf man/ || die
-
-	# translations
-	if use nls; then
-		dodir /usr/share/locale/
-		mv locale/* "${D}/usr/share/locale/" || die
-	fi
-
-	popd &> /dev/null || die
-
-	# link libraries in the ~standard~ place
-	for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do
-		dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}"
-	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
-	scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/"
-	for mkFile in $(ls "${scriptMakeDir}"); do
-		echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
-		sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
-	done
-
-	# get proper folder for grass path in script
-	local gisbase
-	gisbase="${ROOT}/usr/$(get_libdir)/${MY_PM}"
-	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
-		-i "${D}/usr/bin/${MY_PM}" || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
-		"${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
-
-	# set proper python interpreter
-	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}/usr/bin/${MY_PM}" || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/${MY_PM} ${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 "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-
-	ewarn "GRASS addons may fail due to Python 3 incompatibility."
-	ewarn "If that is tha case you can change the shebang a the beginning of"
-	ewarn "the script to enforce Python 2 usage."
-	ewarn "#!/usr/bin/env python"
-	ewarn "Should be changed into"
-	ewarn "#!/usr/bin/env python2"
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
deleted file mode 100644
index fc33e46cfef1..000000000000
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER=3.0
-
-inherit autotools desktop eapi7-ver 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/7.4.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		|| (
-			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	media-libs/libprojectm
-	sci-libs/gdal
-	sys-libs/gdbm
-	sys-libs/ncurses:0=
-	sci-libs/proj
-	sci-libs/xdrfile
-	sys-libs/zlib
-	blas? (
-		sci-libs/cblas-reference
-		virtual/blas
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
-	lapack? ( virtual/lapack )
-	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:3.0[cairo,opengl?]
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? (
-		dev-lang/swig
-		x11-base/xorg-proto
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch )
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack
-		mylapack=$(eselect lapack show) || die
-		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
-		myblas=$(eselect blas show) || die
-		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
-	local pyver=${EPYTHON/python/}
-	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	# fix header being unconditionally included
-	# see upstream https://trac.osgeo.org/grass/ticket/2779
-	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
-		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
-
-	default
-	eautoconf
-
-	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
-	mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	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
-		WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite "${EPREFIX}/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/libprojectM"
-		--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)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		INST_DIR="${D}/usr/$(get_libdir)/${MY_PM}" \
-		prefix="${D}/usr/" BINDIR="${D}/usr/bin" \
-		PREFIX="${D}/usr/" \
-		install
-
-	pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# manuals
-	dodir /usr/share/man/man1
-	rm -rf man/ || die
-
-	# translations
-	if use nls; then
-		dodir /usr/share/locale/
-		mv locale/* "${D}/usr/share/locale/" || die
-	fi
-
-	popd &> /dev/null || die
-
-	# link libraries in the ~standard~ place
-	for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do
-		dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}"
-	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
-	scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/"
-	for mkFile in $(ls "${scriptMakeDir}"); do
-		echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
-		sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
-	done
-
-	# get proper folder for grass path in script
-	local gisbase
-	gisbase="${ROOT}/usr/$(get_libdir)/${MY_PM}"
-	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
-		-i "${D}/usr/bin/${MY_PM}" || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
-		"${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
-
-	# set proper python interpreter
-	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}/usr/bin/${MY_PM}" || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/${MY_PM} ${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 "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-
-	ewarn "GRASS addons may fail due to Python 3 incompatibility."
-	ewarn "If that is tha case you can change the shebang a the beginning of"
-	ewarn "the script to enforce Python 2 usage."
-	ewarn "#!/usr/bin/env python"
-	ewarn "Should be changed into"
-	ewarn "#!/usr/bin/env python2"
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
deleted file mode 100644
index 61353627f8de..000000000000
--- a/sci-geosciences/grass/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-geosciences@gentoo.org</email>
-		<name>Gentoo Geosciences Project</name>
-	</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
-</longdescription>
-	<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="opencl">Enable OpenCL support</flag>
-	</use>
-</pkgmetadata>
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index e4ccf404fd72..85558ee0e426 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -7,4 +7,4 @@ DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e26
 EBUILD qgis-3.10.7.ebuild 5445 BLAKE2B f706ee24d324b05712d761b4bf2cf363bb0678d900b114f6b879908386eeda6da458df6c86d668f13bfb4208432b40b14e952fdae4d61df0a1de00e63fa8f3e4 SHA512 98d6a84452b8dcb44d35e2c87f0b9a00b29cae9630437b8320ecee06de8e14e0ad59008dfeb3f6b65c86bae0a461c157070a7a439cb8e44d0f0938a3e36de7e1
 EBUILD qgis-3.10.9.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
 EBUILD qgis-9999.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
-MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
+MISC metadata.xml 1386 BLAKE2B f5e9142fe248a2482ca29fe1b03aa585fb5b2eb4f0e1a1f0bf8d4a643034fffb9d37c3595170c9fea7b3b2dc0dcbec0e94dcc0bef2af6ea2da29a48d6880a7c3 SHA512 0ef09ee19b881d9ecc04884bc568e17013cb6794c666e75993031f798dca5f80b60b3c9ecded1183e0ac004a65ab0cf4f5af973132991e0b5a51674a6daab0ce
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 56b0fd7a351e..6d6203f5ceac 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -16,7 +16,7 @@
 	<use>
 		<flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag>
 		<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
-		<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+		<flag name="grass">Add support for grass</flag>
 		<flag name="hdf5">Enable MDAL support for <pkg>sci-libs/hdf5</pkg></flag>
 		<flag name="mapserver">Determines whether mapserver should be built</flag>
 		<flag name="netcdf">Enable MDAL support for GRIB and XMDF formats</flag>