[patch] e-build patch against qgis-9999

qgis-live.patch (text/plain), 1.19 KB, created by José de Paula Rodrigues on 2019-08-29 16:19:46 UTC

--- gentoo/sci-geosciences/qgis/qgis-9999.ebuild	2019-08-28 19:10:16.966154812 -0300
+++ localrepo/sci-geosciences/qgis/qgis-9999.ebuild	2019-08-29 04:37:02.702778307 -0300
@@ -53,7 +53,10 @@
 	>=sci-libs/gdal-2.2.3:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	sci-libs/proj
+	|| (
+		>=sci-libs/proj-6.1.1
+		>=sci-libs/proj-4.9.3
+		)
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
@@ -104,11 +107,11 @@
 RESTRICT="test"
 
 PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+#	# git master
+#	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+#	# TODO upstream
+#	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+	"${FILESDIR}/${PN}-9999-default-qmldir.patch"
 )
 
 pkg_setup() {
@@ -149,8 +152,9 @@
 	)
 
 	if use grass; then
+		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"; readarray -d'.' -t v <<<"${f[2]}"; grassdir="grass${v[0]}${v[1]}";
 		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/$grassdir
 		)
 	fi