summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2016-12-15 11:07:12 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2016-12-15 11:07:12 +0000
commitefaab7f0c2fc56ec24ceeefec07235e54100116a (patch)
treea2a441b4f2276a65b6333609ef00b18792d3d203
parent2016-12-15 10:44:08 UTC (diff)
parentsci-geosciences/qgis: fix grass flag bug #601380 by Chris Mayo (diff)
downloadgentoo-efaab7f0c2fc56ec24ceeefec07235e54100116a.tar.gz
gentoo-efaab7f0c2fc56ec24ceeefec07235e54100116a.tar.bz2
gentoo-efaab7f0c2fc56ec24ceeefec07235e54100116a.zip
Merge updates from master
-rw-r--r--profiles/arch/hppa/package.use.mask4
-rw-r--r--profiles/default/bsd/fbsd/amd64/9.1/deprecated4
-rw-r--r--sci-geosciences/qgis/qgis-2.14.5.ebuild8
3 files changed, 5 insertions, 11 deletions
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 268e177cf49e..8e689b63e160 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,10 +4,6 @@
# DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
-# Sergey Popov <pinkbyte@gentoo.org> (15 Dec 2016)
-# Needs dev-libs/protobuf (bug #602740)
-net-misc/quagga protobuf
-
# Jeroen Roovers <jer@gentoo.org> (31 May 2016)
# Mask kde-frameworks/kapidox (bug #568972)
kde-frameworks/extra-cmake-modules doc
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/deprecated b/profiles/default/bsd/fbsd/amd64/9.1/deprecated
index 6cb175b4f354..97c7ad38d9f3 100644
--- a/profiles/default/bsd/fbsd/amd64/9.1/deprecated
+++ b/profiles/default/bsd/fbsd/amd64/9.1/deprecated
@@ -1,4 +1,4 @@
-default/bsd/fbsd/amd64/10.2
+default/bsd/fbsd/amd64/10.3
Please read carefully the wiki.
Might be your environment is broken if you do not perform the correct procedure.
-https://wiki.gentoo.org/wiki/Gentoo_FreeBSD#Upgrade_howto
+https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/sci-geosciences/qgis/qgis-2.14.5.ebuild b/sci-geosciences/qgis/qgis-2.14.5.ebuild
index d4088cdc5a2e..9884dff8df1e 100644
--- a/sci-geosciences/qgis/qgis-2.14.5.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5.ebuild
@@ -7,7 +7,7 @@ EAPI="6"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
-inherit eutils gnome2-utils cmake-utils python-single-r1
+inherit eutils multilib gnome2-utils cmake-utils python-single-r1
DESCRIPTION="User friendly Geographic Information System"
HOMEPAGE="http://www.qgis.org/"
@@ -96,12 +96,10 @@ src_configure() {
"-DWITH_INTERNAL_SIX=OFF"
"-DPEDANTIC=OFF"
"-DWITH_APIDOC=OFF"
- "-DWITH_SPATIALITE=ON"
- "-DWITH_INTERNAL_SPATIALITE=OFF"
+ "-WITH_QSPATIALITE=ON"
-DENABLE_TESTS=no
-DWITH_BINDINGS="$(usex python)"
- -DWITH_BINDINGS_GLOBAL_INSTALL="$(usex python)"
- -DWITH_GRASS="$(usex grass)"
+ -DWITH_GRASS7="$(usex grass)"
$(usex grass "-DGRASS_PREFIX=/usr/" "")
-DWITH_GSL="$(usex gsl)"
-DWITH_ORACLE="$(usex oracle)"