public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/
@ 2011-06-24 17:09 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     fbf040fcc91ccb910ac6fc0c4b38fbcea56c4fca
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 15:00:52 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 15:00:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fbf040fc

Sort inherit and/or USE

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-geosciences/qgis/qgis-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index c2dad77..9975c7a 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="2"
 
 PYTHON_USE_WITH="sqlite"
 PYTHON_DEPEND="python? 2"
-inherit python cmake-utils subversion
+inherit cmake-utils python subversion
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/
@ 2012-05-23 19:56 Kacper Kowalik
  0 siblings, 0 replies; 9+ messages in thread
From: Kacper Kowalik @ 2012-05-23 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     5ee596e504739d9028210dd55ab9194fb8401cba
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 19:51:44 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Wed May 23 19:51:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5ee596e5

[sci-geosciences/qgis] add eutils.eclass for make_desktop_entry

---
 sci-geosciences/qgis/qgis-9999.ebuild |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 9975c7a..fb5932e 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,8 @@ EAPI="2"
 
 PYTHON_USE_WITH="sqlite"
 PYTHON_DEPEND="python? 2"
-inherit cmake-utils python subversion
+
+inherit cmake-utils python subversion eutils
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/
@ 2013-03-03 17:52 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2013-03-03 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     444f3f87c3d7428256993d850db350b4c9fad5a5
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 17:41:25 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 17:41:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=444f3f87

sci-geosciences/qgis: Update to new qt deps names

Package-Manager: portage-2.2.0_alpha164

---
 sci-geosciences/qgis/ChangeLog        |    5 ++++-
 sci-geosciences/qgis/metadata.xml     |   11 +++++------
 sci-geosciences/qgis/qgis-9999.ebuild |   12 ++++++------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index 37b1b3e..f0698c4 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-geosciences/qgis
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Mar 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild, metadata.xml:
+  Update to new qt deps names
+
   29 Jun 2010; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild:
   Python ABI fixes
 

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 21f7628..9121bac 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<longdescription lang='en'>
+  <herd>sci-geosciences</herd>
+  <longdescription lang="en">
   Quantum GIS (QGIS) is a user friendly Open Source Geographic
   Information System (GIS). QGIS supports vector, raster, and database
   formats. QGIS lets you browse and create map data on your
@@ -10,8 +10,7 @@
   ShapeFile, geotiff). QGIS supports plugins to do things like display
   tracks from your GPS. 
 </longdescription>
-<use>
-  <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
-</use>
+  <use>
+    <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+  </use>
 </pkgmetadata>
-

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index fb5932e..fbf9b01 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -20,11 +20,11 @@ KEYWORDS=""
 IUSE="examples gps grass gsl postgres python sqlite"
 
 RDEPEND=">=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?]
-	x11-libs/qt-core:4[qt3support]
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-webkit:4
+	dev-qt/qtcore:4[qt3support]
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
 	sci-libs/geos
 	gps? (
 		dev-libs/expat


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/
@ 2013-10-15 17:17 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2013-10-15 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     a0f54adb0f928612567f33d88ac55bfb58fabf52
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 13:16:49 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 17:17:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a0f54adb

sci-geosciences/qgis: Bump to python r1 eclasses

Package-Manager: portage-2.2.7

---
 sci-geosciences/qgis/ChangeLog        |  3 +++
 sci-geosciences/qgis/qgis-9999.ebuild | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index f0698c4..aaa2668 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Oct 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild:
+  Bump to python r1 eclasses
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild, metadata.xml:
   Update to new qt deps names
 

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index fbf9b01..11436db 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=5
 
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="python? 2"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
 
-inherit cmake-utils python subversion eutils
+inherit cmake-utils python-single-r1 subversion eutils
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
@@ -19,7 +19,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="examples gps grass gsl postgres python sqlite"
 
-RDEPEND=">=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?]
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?]
 	dev-qt/qtcore:4[qt3support]
 	dev-qt/qtgui:4
 	dev-qt/qtsvg:4
@@ -39,7 +42,7 @@ RDEPEND=">=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?]
 			>=dev-db/postgresql-server-8.4
 		)
 	)
-	python? ( dev-python/PyQt4[sql,svg] )
+	python? ( ${PYTHON_DEPS} dev-python/PyQt4[sql,svg] )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
@@ -47,8 +50,7 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/
@ 2013-10-15 17:17 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2013-10-15 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     01d643081be2ba5663e0688254b29c4c4c94d8a2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 13:21:02 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 17:17:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=01d64308

sci-geosciences/qgis: Import tree changes

Package-Manager: portage-2.2.7

---
 sci-geosciences/qgis/ChangeLog        |  3 +++
 sci-geosciences/qgis/qgis-9999.ebuild | 32 +++++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index aaa2668..fcbba1f 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   15 Oct 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild:
+  Import tree changes
+
+  15 Oct 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild:
   Bump to python r1 eclasses
 
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild, metadata.xml:

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 11436db..eec9d6e 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="sqlite"
 
-inherit cmake-utils python-single-r1 subversion eutils
+inherit cmake-utils gnome2-utils multilib python-single-r1 subversion eutils
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
@@ -42,7 +42,10 @@ RDEPEND="
 			>=dev-db/postgresql-server-8.4
 		)
 	)
-	python? ( ${PYTHON_DEPS} dev-python/PyQt4[sql,svg] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/PyQt4[sql,svg,${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}] )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
@@ -68,24 +71,34 @@ src_configure() {
 		$(cmake-utils_use_with gps QWT)
 		$(cmake-utils_use_with gsl)
 		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use_with sqlite SPATIALITE)
+		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
+		$(cmake-utils_use_with spatialite SPATIALITE)
+		$(cmake-utils_use_enable test TESTS)
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
 	)
-	use grass && mycmakeargs+=( "-DGRASS_PREFIX=/usr/" )
 
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	dodoc AUTHORS BUGS ChangeLog README SPONSORS CONTRIBUTORS || die
+	dodoc BUGS ChangeLog CODING README
 
-	newicon images/icons/qgis-icon.png qgis.png || die
+	newicon -s 128 images/icons/qgis-icon.png qgis.png
 	make_desktop_entry qgis "Quantum GIS " qgis
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/qgis_sample_data/* || die "Unable to install examples"
+		doins -r "${WORKDIR}"/qgis_sample_data/*
 	fi
+	python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+	python_optimize "${D}"/usr/share/qgis/python/plugins \
+		"${D}"/$(python_get_sitedir)/qgis \
+		"${D}"/usr/share/qgis/grass/scripts
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
@@ -94,4 +107,9 @@ pkg_postinst() {
 		elog "you should install:"
 		elog "   dev-db/postgis"
 	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/
@ 2013-10-16  4:49 Nicolas Bock
  0 siblings, 0 replies; 9+ messages in thread
From: Nicolas Bock @ 2013-10-16  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     94bb343542a261f8ca11aa89199e9870696e4548
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 13:21:02 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Oct 15 13:21:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=94bb3435

sci-geosciences/qgis: Import tree changes

Package-Manager: portage-2.2.7

---
 sci-geosciences/qgis/ChangeLog        |  3 +++
 sci-geosciences/qgis/qgis-9999.ebuild | 32 +++++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index aaa2668..fcbba1f 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   15 Oct 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild:
+  Import tree changes
+
+  15 Oct 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild:
   Bump to python r1 eclasses
 
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild, metadata.xml:

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 11436db..eec9d6e 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="sqlite"
 
-inherit cmake-utils python-single-r1 subversion eutils
+inherit cmake-utils gnome2-utils multilib python-single-r1 subversion eutils
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
@@ -42,7 +42,10 @@ RDEPEND="
 			>=dev-db/postgresql-server-8.4
 		)
 	)
-	python? ( ${PYTHON_DEPS} dev-python/PyQt4[sql,svg] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/PyQt4[sql,svg,${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}] )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
@@ -68,24 +71,34 @@ src_configure() {
 		$(cmake-utils_use_with gps QWT)
 		$(cmake-utils_use_with gsl)
 		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use_with sqlite SPATIALITE)
+		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
+		$(cmake-utils_use_with spatialite SPATIALITE)
+		$(cmake-utils_use_enable test TESTS)
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
 	)
-	use grass && mycmakeargs+=( "-DGRASS_PREFIX=/usr/" )
 
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	dodoc AUTHORS BUGS ChangeLog README SPONSORS CONTRIBUTORS || die
+	dodoc BUGS ChangeLog CODING README
 
-	newicon images/icons/qgis-icon.png qgis.png || die
+	newicon -s 128 images/icons/qgis-icon.png qgis.png
 	make_desktop_entry qgis "Quantum GIS " qgis
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/qgis_sample_data/* || die "Unable to install examples"
+		doins -r "${WORKDIR}"/qgis_sample_data/*
 	fi
+	python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+	python_optimize "${D}"/usr/share/qgis/python/plugins \
+		"${D}"/$(python_get_sitedir)/qgis \
+		"${D}"/usr/share/qgis/grass/scripts
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
@@ -94,4 +107,9 @@ pkg_postinst() {
 		elog "you should install:"
 		elog "   dev-db/postgis"
 	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/
@ 2013-10-16  4:49 Nicolas Bock
  0 siblings, 0 replies; 9+ messages in thread
From: Nicolas Bock @ 2013-10-16  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     919ba8b8520e126335bea049ac88ab9d191d1e47
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 13:16:49 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Oct 15 13:16:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=919ba8b8

sci-geosciences/qgis: Bump to python r1 eclasses

Package-Manager: portage-2.2.7

---
 sci-geosciences/qgis/ChangeLog        |  3 +++
 sci-geosciences/qgis/qgis-9999.ebuild | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index f0698c4..aaa2668 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Oct 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild:
+  Bump to python r1 eclasses
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild, metadata.xml:
   Update to new qt deps names
 

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index fbf9b01..11436db 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=5
 
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="python? 2"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
 
-inherit cmake-utils python subversion eutils
+inherit cmake-utils python-single-r1 subversion eutils
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
@@ -19,7 +19,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="examples gps grass gsl postgres python sqlite"
 
-RDEPEND=">=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?]
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?]
 	dev-qt/qtcore:4[qt3support]
 	dev-qt/qtgui:4
 	dev-qt/qtsvg:4
@@ -39,7 +42,7 @@ RDEPEND=">=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?]
 			>=dev-db/postgresql-server-8.4
 		)
 	)
-	python? ( dev-python/PyQt4[sql,svg] )
+	python? ( ${PYTHON_DEPS} dev-python/PyQt4[sql,svg] )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
@@ -47,8 +50,7 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/
@ 2015-09-21 19:05 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-09-21 19:05 UTC (permalink / raw
  To: gentoo-commits

commit:     01e078b018ae83609915c82388712260c9e94e05
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 18:15:35 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 18:15:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=01e078b0

sci-geosciences/qgis: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index e7589a5..37d37bf 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,7 +32,7 @@ RDEPEND="
 	gps? (
 		dev-libs/expat
 		sci-geosciences/gpsbabel
-		x11-libs/qwt
+		x11-libs/qwt:6=
 	)
 	grass? ( >=sci-geosciences/grass-6.4.0_rc6[postgres?,python?,sqlite?] )
 	gsl? ( sci-libs/gsl )


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/
@ 2015-09-22  8:19 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-09-22  8:19 UTC (permalink / raw
  To: gentoo-commits

commit:     d15f494fe76edd80a86dacf6e09f33bb2a4dec86
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 07:36:18 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 07:36:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d15f494f

sci-geosciences/qgis: Fix unknown deps

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 37d37bf..b260f58 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -36,12 +36,7 @@ RDEPEND="
 	)
 	grass? ( >=sci-geosciences/grass-6.4.0_rc6[postgres?,python?,sqlite?] )
 	gsl? ( sci-libs/gsl )
-	postgres? (
-		|| (
-			>=dev-db/postgresql-base-8.4
-			>=dev-db/postgresql-server-8.4
-		)
-	)
+	postgres? ( dev-db/postgresql:* )
 	python? (
 		${PYTHON_DEPS}
 		dev-python/PyQt4[sql,svg,${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2015-09-22  8:19 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-03 17:52 [gentoo-commits] proj/sci:master commit in: sci-geosciences/qgis/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2015-09-22  8:19 Justin Lecher
2015-09-21 19:05 Justin Lecher
2013-10-16  4:49 Nicolas Bock
2013-10-16  4:49 Nicolas Bock
2013-10-15 17:17 Justin Lecher
2013-10-15 17:17 Justin Lecher
2012-05-23 19:56 Kacper Kowalik
2011-06-24 17:09 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox