gentoo resync : 12.03.2021

4 files changed, 7 insertions, 280 deletions

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index c52a88107cf6..5403cd4c1c64 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,7 +1,5 @@
 AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
-DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1
 DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
-EBUILD grass-7.8.4.ebuild 6955 BLAKE2B 346e166fcfcf361898eb92ef2cc121cc45a7f1ed9ecfbf21c3f3378cb1960ef46eb159d3af8eaa9e5e579f79694ca2053293c6718d861f2be3d3fd5e93b66701 SHA512 7ef8a4655cfe07f4b7f1a904a49975fd40b475c8b3af375a11b00c31d7163a105e0e5d73130cb5bd2f1336bb484f47c9b588df5879a94c6ddb0c1f3e72f4e000
-EBUILD grass-7.8.5.ebuild 6943 BLAKE2B 4305e0aebe3a6003f9b5eba3f6bacbc77100dafdfad53c75ea8636de6d0a71e70f7f4f09f8529cb3ae12e555c0ba04cd69347a363bfe6ab3fa7c50c595a0391c SHA512 e860008ff54b797b70a5e3e15df40b422138ae25e1e2525960aa5c61b372eaf6b9e24e070c87aad50e823c75e106b204ce6e3a1df1dcd155fc10e28d84186463
-EBUILD grass-9999.ebuild 6938 BLAKE2B dc511eb75c66a24d3f9532e1b9ab6434db4ccfa75949ec39112629051274be8758c3a3e8f3dd7c2e898cf2c9ad500950db9b1f554985c03723b55595564a407b SHA512 dca61e9ec300dd15872e05cc68c12a69f2c1860005d344608d142cc3a3fae10da63a1908d3e5268f17095aa0666c254d234a3a985a2210558bc3507dddcb8fab
+EBUILD grass-7.8.5.ebuild 6941 BLAKE2B fb4f2f5cfa068cc90b45f94fd5ddc19415a66b7fce9f34b5b3c6d71002de226e192f4740e140e9444a616e8498bf4b616e3718448e21fd1d85df2d73cb42a9b7 SHA512 80397ff07c02942ddb2d7ffe2ade1ba88c6baa5563ceddf20d707cb522c2703c6615acd83e29581735f3d8e989436c2e1672be68d4e680032be38f9a9132b130
+EBUILD grass-9999.ebuild 6869 BLAKE2B a70777bdbcfa1bd020d7f64a6dbcd74194075c18a9bc753fa0cfaf7113c9a1fe8f087e6f3a7ec0ab77d6eca08eac0ce5bad401e95686baec0c3bd0c28618bda9 SHA512 20ff6e8b55ba0090f4beb9750ce67ed3746f443568397a636f4c82dac2eb705dfa73b3541c00ba6b232a7f609a891ef3424fa291cb104e59384d3cdc553346de
 MISC metadata.xml 1058 BLAKE2B fcaa70c36866e086db663b4f5fb00f7a0ba4d725af2c69752e060134203758bf8b094f958dae363c9343f60ced6f9958d59ad5cab775affbf4234ae39b227e92 SHA512 eefd4994f62f769eb2359c20871d2ad816713186e6b536afa4493d363b086a37d156a8220f54432fc94199854ba98a97eb995e1e00f228f0ea4add1f395ae6e0
diff --git a/sci-geosciences/grass/grass-7.8.4.ebuild b/sci-geosciences/grass/grass-7.8.4.ebuild
deleted file mode 100644
index 8b203f7441c8..000000000000
--- a/sci-geosciences/grass/grass-7.8.4.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop flag-o-matic 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.8.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 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
-	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}-7.8-flock.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
-
-	eapply_user
-}
-
-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="${ED}"/usr/$(get_libdir)/${MY_PM} \
-		prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
-		PREFIX="${ED}"/usr/ \
-		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/${MY_PM} || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
-		"${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
-
-	# set proper python interpreter
-	sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
-os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
-		-i "${ED}"/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 "${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-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild
index d75683b80dcf..eb00d1ab6a89 100644
--- a/sci-geosciences/grass/grass-7.8.5.ebuild
+++ b/sci-geosciences/grass/grass-7.8.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+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 zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index b2455ab8dc84..a77634827df1 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -10,9 +10,8 @@ WX_GTK_VER="3.0-gtk3"
 
 inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
 
-PV="7.9"
-MY_PM=${PN}$(ver_cut 1-2 ${PV})
-MY_PM=${MY_PM/.}
+MY_P="${PN}7.9"
+MY_PM="${MY_P/.}"
 
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
 HOMEPAGE="https://grass.osgeo.org/"
@@ -181,9 +180,8 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${ED}" \
-		INST_DIR="${ED}"/usr/$(get_libdir)/${MY_PM} \
-		prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
-		PREFIX="${ED}"/usr/ \
+		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
+		prefix=/usr/ BINDIR=/usr/bin \
 		install
 
 	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die