Version bump to latest version. Try to restrain python sip versions to actually work. Add patch to build with gcc-4.7. Fixes bug#405997. Remove older.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

5 files changed, 47 insertions, 129 deletions

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index 908e481084c2..fd5c864d39a8 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-geosciences/qgis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.24 2012/02/05 01:56:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.25 2012/05/24 12:43:45 scarabeus Exp $
+
+*qgis-1.7.4 (24 May 2012)
+
+  24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/qgis-1.7.4-gcc4.7.patch, +qgis-1.7.4.ebuild,
+  -files/qgis-1.4.0-gcc45.patch, -qgis-1.4.0.ebuild, -qgis-1.7.3.ebuild:
+  Version bump to latest version. Try to restrain python sip versions to
+  actually work. Add patch to build with gcc-4.7. Fixes bug#405997. Remove
+  older.
 
   05 Feb 2012; Mike Gilbert <floppym@gentoo.org> qgis-1.4.0.ebuild,
   qgis-1.7.0.ebuild, qgis-1.7.3.ebuild:
diff --git a/sci-geosciences/qgis/files/qgis-1.4.0-gcc45.patch b/sci-geosciences/qgis/files/qgis-1.4.0-gcc45.patch
deleted file mode 100644
index 2195a2a90834..000000000000
--- a/sci-geosciences/qgis/files/qgis-1.4.0-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing gcc-4.5 compilation failure
-
-http://bugs.gentoo.org/show_bug.cgi?id=320787
-
---- src/app/composer/qgscomposer.cpp
-+++ src/app/composer/qgscomposer.cpp
-@@ -1030,7 +1030,7 @@
-   QSettings settings;
-   restoreGeometry( settings.value( "/Composer/geometry" ).toByteArray() );
-   QVariant splitterState = settings.value( "/Composer/splitterState" );
--  if ( splitterState != QVariant::QVariant() )
-+  if ( splitterState != QVariant() )
-   {
-     //mSplitter->restoreState(settings.value("/Composer/splitterState").toByteArray());
-   }
diff --git a/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch b/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch
new file mode 100644
index 000000000000..858a42c94340
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch
@@ -0,0 +1,20 @@
++++ qgis-1.7.4/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2012-04-21 13:58:04.107239275 +0300
+@@ -26,6 +26,7 @@
+ #include <sys/stat.h>
+ #include <stdio.h>
+ #include <cstring>
++#include <unistd.h>
+ 
+ #ifdef WIN32
+ #include <io.h>
+
++++ qgis-1.7.4/src/core/spatialindex/tools/TemporaryFile.cc	2012-04-21 13:16:42.213690282 +0300
+@@ -20,7 +20,7 @@
+ //    mhadji@gmail.com
+ 
+ #include <stdio.h>
+-
++#include <unistd.h>
+ #include <Tools.h>
+ 
+ #ifdef WIN32
diff --git a/sci-geosciences/qgis/qgis-1.4.0.ebuild b/sci-geosciences/qgis/qgis-1.4.0.ebuild
deleted file mode 100644
index d522f512a95c..000000000000
--- a/sci-geosciences/qgis/qgis-1.4.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild,v 1.10 2012/02/05 01:56:14 floppym Exp $
-
-EAPI="2"
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="python? 2"
-inherit python cmake-utils eutils multilib
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-SRC_URI="http://download.osgeo.org/${PN}/src/${PN}_${PV}.tar.gz
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples gps grass gsl postgres python sqlite"
-
-RDEPEND=">=sci-libs/gdal-1.6.1
-	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
-	sci-libs/geos
-	sci-libs/proj
-	gps? (
-		dev-libs/expat
-		sci-geosciences/gpsbabel
-	)
-	grass? (
-		>=sci-geosciences/grass-6
-		sci-geosciences/gdal-grass
-	)
-	gsl? ( sci-libs/gsl )
-	postgres? ( >=dev-db/postgresql-base-8 )
-	python? ( dev-python/PyQt4[sql,svg] )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-}
-
-src_configure() {
-	local mycmakeargs
-	mycmakeargs+=(
-		"-DQGIS_MANUAL_SUBDIR=/share/man/"
-		"-DBUILD_SHARED_LIBS:BOOL=ON"
-		"-DBINDINGS_GLOBAL_INSTALL:BOOL=ON"
-		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
-		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
-		$(cmake-utils_use_with postgres POSTGRESQL)
-		$(cmake-utils_use_with grass)
-		$(cmake-utils_use_with gps EXPAT)
-		$(cmake-utils_use_with gsl)
-		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use_with sqlite SPATIALITE)
-	)
-
-	if use grass; then
-		GRASS_ENVD="/etc/env.d/99grass /etc/env.d/99grass-6 /etc/env.d/99grass-cvs";
-		for file in ${GRASS_ENVD}; do
-			if test -r ${file}; then
-				GRASSPATH=$(sed -n 's/LDPATH="\(.*\)\/lib"$/\1/p' ${file});
-			fi
-		done
-		mycmakeargs+=(
-			"-DGRASS_PREFIX=${GRASSPATH}"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS BUGS ChangeLog README SPONSORS CONTRIBUTORS || die
-
-	newicon images/icons/qgis-icon.png qgis.png || die
-	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"
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	fi
-}
diff --git a/sci-geosciences/qgis/qgis-1.7.3.ebuild b/sci-geosciences/qgis/qgis-1.7.4.ebuild
index a57037a1f843..67b61bbe4460 100644
--- a/sci-geosciences/qgis/qgis-1.7.3.ebuild
+++ b/sci-geosciences/qgis/qgis-1.7.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.7.3.ebuild,v 1.2 2012/02/05 01:56:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.7.4.ebuild,v 1.1 2012/05/24 12:43:45 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 PYTHON_USE_WITH="sqlite"
 PYTHON_DEPEND="python? 2"
@@ -30,10 +30,13 @@ RDEPEND="
 	x11-libs/qt-sql:4
 	x11-libs/qt-webkit:4
 	x11-libs/qwt:5[svg]
-	x11-libs/qwtpolar
+	<x11-libs/qwtpolar-1
 	grass? ( >=sci-geosciences/grass-6.4.0_rc6[python?] )
 	postgres? ( >=dev-db/postgresql-base-8.4 )
-	python? ( dev-python/PyQt4[X,sql,svg] )
+	python? (
+		<dev-python/PyQt4-4.9[X,sql,svg]
+		<dev-python/sip-4.13
+	)
 	spatialite? (
 		dev-db/sqlite:3
 		dev-db/spatialite
@@ -45,12 +48,18 @@ DEPEND="${RDEPEND}
 
 DOCS=( BUGS CHANGELOG CODING.pdf README )
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc4.7.patch"
+)
+
 # Does not find the test binaries at all
 RESTRICT="test"
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }
 
 src_configure() {
@@ -79,12 +88,12 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	newicon images/icons/qgis-icon.png qgis.png || die
+	newicon 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
 }