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.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

6 files changed, 65 insertions, 139 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/Manifest b/sci-geosciences/qgis/Manifest
index 68439f568d0a..bfe0833631ff 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX qgis-1.4.0-gcc45.patch 536 RMD160 78966492091d7b9a249fce13d892881d82d25d5a SHA1 6ea4ea20d346a4f4df7bb043f779afebd831a606 SHA256 909d0699d8c203ff3198261d46de770ed3b6da3b9d77be7315c895539564b922
+AUX qgis-1.7.4-gcc4.7.patch 465 RMD160 0552c55d9d5ad1aa688422202cab33bf4f15da70 SHA1 b284a203b99e8789c96b0d106d8f005bd703bbfc SHA256 6490beefda84d66dd507eabd15f4d328aec1682795f2fcc4e768d5028a901c5f
 DIST qgis-1.7.0.tar.bz2 23420823 RMD160 49303eab754f1e7febce388e657253563f65abed SHA1 e60f40e72c92f187d3725e6b93c13691d63a7fa7 SHA256 4b871e841832c9a4f3cee1981198c30850983d73c848684832fa913167671a34
-DIST qgis-1.7.3.tar.bz2 25328792 RMD160 830202899996013cd296dca8a5fa2440e85e4d27 SHA1 97ad40ada045fcecbd858114527820f1e3f0eae1 SHA256 945195cab34a10466bf26c7057e37a02ad15d0b9c0c0c4b36e7c05eab5fc9bbc
-DIST qgis_1.4.0.tar.gz 17285943 RMD160 47486732c8fe37aa6864d09c7420be22de5ea802 SHA1 105f353f36e9625d1eb15f1a315882f214dbe026 SHA256 bbe07eedec4bda95cca994002941b91fd0e50d5cdee2bf79be0c4f7b930cc7da
+DIST qgis-1.7.4.tar.bz2 25618352 RMD160 dae51556b09a57ce9537ca4ed75830f15e3be5a4 SHA1 0dae5cb933d1ce621e5fe30c1937887d813a2098 SHA256 e302bd676b755676a6fa6da0c416d73694eca24e67ae8e34bbf78d13ee3b7ea6
 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
-EBUILD qgis-1.4.0.ebuild 2586 RMD160 019baa3ea8a25f85a593f6c7105ecaffd50df281 SHA1 8ebd4ea0557cba7fb812d5ebdb1c850fe6ec867a SHA256 486b542309952b84497ee7fb36155196f48390743c61263b6d27d3d45ff73115
 EBUILD qgis-1.7.0.ebuild 2460 RMD160 80dedc58ceec89b59a50902d08c4138d2f046d32 SHA1 a26ce8d1ecf0356ae56aa6e415fbe37b93581a88 SHA256 aabf8099f95372cc08f7301fd229cb3be301744d643698b3aae1f1dbe1e81649
-EBUILD qgis-1.7.3.ebuild 2462 RMD160 a03b792d66dd4e9fbbbc5c4f4bec021b032ab095 SHA1 d19bf0c3343194ece6a50cb5b40e9b4fc20bea47 SHA256 6597a2f28c7b736ef5f75aafb9f9212088c1c1075c8b7d453bdf278b94c11525
-MISC ChangeLog 3747 RMD160 4d93f7425f09ef23e101ee3aed6a48aa0308cce0 SHA1 b702f27c5c2c7b5708ef3cdc3f7d8790d8cf4520 SHA256 99eaabd13c81719735b36e335ecc28ce32f7341a041b8d94181c61aa2618f14e
+EBUILD qgis-1.7.4.ebuild 2529 RMD160 4f04b894437dab04c80e59ec52996d04c0e40e4c SHA1 f923e4302e2bc940715fce07e07ea40ee51ab8c1 SHA256 1087d2c0ee61ede0c661254eb3ea634624e0b48b88b5e7c36e08771f18ec7e14
+MISC ChangeLog 4116 RMD160 ca599b0f824470fa746296e8b699664db58e848b SHA1 425a2a2f6cf9e4bdf4c3e581a80c7fa2d45117da SHA256 2099ae7a72623b0dd5e6ebce7b78606bb6b0c13e256924fd874babe428be3209
 MISC metadata.xml 761 RMD160 c816141f62d6691afab93ab748b0fe4c1eac8673 SHA1 8983496bf9a7f8165afd202ece387f8f7f19de43 SHA256 2a660183723328a9eed16e5f1ee4804399881cc3e8c559210796335ef457adcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8t4cUACgkQC77qH+pIQ6QJZwD/SjfaNsimdiuLX6xiRQcu+3QS
-sBy4hiyzsI8xxt1jk88BAK05imocVhypOaZykGzIp2R2/5WB/SI1DrjqigRyaIQ2
-=BTZa
+iQIcBAEBAgAGBQJPvi1bAAoJEOSiRoyO7jvocg0P/0m/X4ghmSXmupLjtFY6PXpa
+h8gNkaFWsaanHqoCD/0UQ4DRGwGp9XJU7dvDvxBFBFRk6zev9qq71OSne9SK0Tts
+JfqgS/hpGZZRziQ/xKRAOIh+4Rwxzm5QEfYsYMgCAa0SUtWIneU6m5Vy8fy4yVcR
+j+FrPxXBa59Rp1VMXV9ezqg6E4UReYIojILkHbW+P5SZdMipKh5V7rnI4aYiMYWx
++Q+aYohfDfp4tPZ0T5/dr1PQSGkcU1soSkTe89vkvOjZBpqua+hDyWGcx1XSap9l
+VqOXECVb+bFpc4VStHs8mVIrS/16P+lZ+6prB27dPspBw/vhPX981rR4QFMM9St1
+4ie+LhAErGLYX+BdNZ1uc5MRCOWFTiQ2ivx1fqSWtpXYogXQggKNFxg9hCajtXuy
+6EMGj+MYE3AH27UJAFVwh8S3tgpQzvCgJjbZr6xByOL0uEZ3S69wGiniJ83/ix5m
+mDJnBOLGxRLW1Rsa/89r/hnvV2ooiDKed0aT0/8ucj+b/Ixu3wfEkKaGIGYpxHKu
+xXsls6mOhKYMZHUZPQiCnAo7BNInRQxo1gwGtXfenzhL04pj51I/6k9U8d4Te9BS
+F2jIaDxp5IZm7ufANjelgGMXcAiNIS7k9HHBoFgUP5deSfj9myAX5tLH+rkVSMX3
+71+vYkGEOeumvHfWIRus
+=BNc1
 -----END PGP SIGNATURE-----
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
 }