gentoo resync : 10.02.2020

3 files changed, 36 insertions, 32 deletions

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index e0cbe2282c7a..0b6d52c3fc46 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +1,5 @@
 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-r2.ebuild 7377 BLAKE2B 9a57d8e09c6a00371569730cbf81d80005de31f053f9818d50b2dafe755ef6b047cba59d513c2cb7a568bba4bb49162842017ca3349bf8646fb2a8691b745e09 SHA512 f7ee0cb8a850bcb6318962197123f5ea0f2f4e8c347386a400e8905556ab5a9ecb152cb1f7ba16ba07252667af22258ce3ad0396933f13f4c5548fcc51390c2b
-EBUILD grass-7.4.4.ebuild 7388 BLAKE2B aa8f400ff439b80be56b82c143d66839d28ce107183f6041e6d40af21205cd12d028598280567777f2a8842c41027a5da888226e94dbfc1077560a12723f5606 SHA512 811b4d33adec006ff2c9d40682d6e7e04953a0225101fadeb8292df4327c2c4b2b305cf131455dd6119c615c5b3b83d8afe6808e06bfb581f401ae324213db14
+EBUILD grass-7.4.4-r3.ebuild 7400 BLAKE2B 8dde00d639e28c3d53b9ca02ff7b4b1bcc2424b121dbad8b24645c5f26ef252dc62c695a7a1c87d58b8992ca859c2425b85fdcaa1204a04d5f7f4bdd3b61d256 SHA512 69a41763c2d3a60cdab2756fe5e4643e47b67f681fa548a6d055bb630c09e001d066196964a26d53407e580e57438e94b0052063ee1fe16c3796081ab45a74ab
+EBUILD grass-7.4.4.ebuild 7411 BLAKE2B c4b0539103c65e5c5f3275a51a60ef48000f898e72395f779c0178de598eaee745aada62cb5f3c2c682cdef1b2d962b0490f82ada644a137c69b81b2fecac1fa SHA512 71dd5f7e0e3972d89e3e29fa6dfe593697606188dd6318b7267f6793a87499d253952faa3f951659d22d9c4ccb9438e8b752f0c1b18f57408edc71380b8bd8d0
 MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635
diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
index 4fc916183868..595f714b7b87 100644
--- a/sci-geosciences/grass/grass-7.4.4-r2.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
@@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm
 
 RDEPEND="${PYTHON_DEPS}
 	>=app-admin/eselect-1.2
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
+	$(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
@@ -150,23 +152,23 @@ src_configure() {
 		setup-wxwidgets
 	fi
 
-	addwrite "${EPREFIX%/}/dev/dri/renderD128"
+	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/"
+		--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 mysql mysql-includes "${EPREFIX}/usr/include/mysql")
 		$(use_with sqlite)
 		$(use_with opengl)
 		$(use_with odbc)
@@ -175,16 +177,16 @@ src_configure() {
 		$(use_with lapack)
 		$(use_with X cairo)
 		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2")
+		$(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 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 netcdf netcdf "${EPREFIX}/usr/bin/nc-config")
+		$(use_with geos geos "${EPREFIX}/usr/bin/geos-config")
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
@@ -244,7 +246,7 @@ src_install() {
 
 	# get proper fonts path for fontcap
 	sed -i \
-		-e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \
+		-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
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
index e875e74c7586..af8e8a283be9 100644
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm
 
 RDEPEND="${PYTHON_DEPS}
 	>=app-admin/eselect-1.2
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
+	$(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
@@ -150,23 +152,23 @@ src_configure() {
 		setup-wxwidgets
 	fi
 
-	addwrite "${EPREFIX%/}/dev/dri/renderD128"
+	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/"
+		--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 mysql mysql-includes "${EPREFIX}/usr/include/mysql")
 		$(use_with sqlite)
 		$(use_with opengl)
 		$(use_with odbc)
@@ -175,16 +177,16 @@ src_configure() {
 		$(use_with lapack)
 		$(use_with X cairo)
 		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2")
+		$(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 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 netcdf netcdf "${EPREFIX}/usr/bin/nc-config")
+		$(use_with geos geos "${EPREFIX}/usr/bin/geos-config")
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
@@ -244,7 +246,7 @@ src_install() {
 
 	# get proper fonts path for fontcap
 	sed -i \
-		-e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \
+		-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