Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 693074 | Differences between
and this patch

Collapse All | Expand All

(-)gentoo/sci-geosciences/qgis/qgis-9999.ebuild (-7 / +11 lines)
Lines 53-59 Link Here
53
	>=sci-libs/gdal-2.2.3:=[geos]
53
	>=sci-libs/gdal-2.2.3:=[geos]
54
	sci-libs/geos
54
	sci-libs/geos
55
	sci-libs/libspatialindex:=
55
	sci-libs/libspatialindex:=
56
	sci-libs/proj
56
	|| (
57
		>=sci-libs/proj-6.1.1
58
		>=sci-libs/proj-4.9.3
59
		)
57
	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
60
	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
58
	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
61
	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
59
	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
62
	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
Lines 104-114 Link Here
104
RESTRICT="test"
107
RESTRICT="test"
105
108
106
PATCHES=(
109
PATCHES=(
107
	# git master
110
#	# git master
108
	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
111
#	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
109
	# TODO upstream
112
#	# TODO upstream
110
	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
113
#	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
111
	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
114
	"${FILESDIR}/${PN}-9999-default-qmldir.patch"
112
)
115
)
113
116
114
pkg_setup() {
117
pkg_setup() {
Lines 149-156 Link Here
149
	)
152
	)
150
153
151
	if use grass; then
154
	if use grass; then
155
		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"; readarray -d'.' -t v <<<"${f[2]}"; grassdir="grass${v[0]}${v[1]}";
152
		mycmakeargs+=(
156
		mycmakeargs+=(
153
			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
157
			-DGRASS_PREFIX7=/usr/$(get_libdir)/$grassdir
154
		)
158
		)
155
	fi
159
	fi
156
160

Return to bug 693074