pesa 14/11/10 15:21:40 Modified: qgis-1.8.0.ebuild qgis-1.7.0.ebuild ChangeLog Log: Fix build with new PyQt4 buildsystem. Patch by Martin von Gagern in bug 525700. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.6 sci-geosciences/qgis/qgis-1.8.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild?r1=1.5&r2=1.6 Index: qgis-1.8.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qgis-1.8.0.ebuild 3 Nov 2014 13:56:44 -0000 1.5 +++ qgis-1.8.0.ebuild 10 Nov 2014 15:21:40 -0000 1.6 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v 1.5 2014/11/03 13:56:44 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v 1.6 2014/11/10 15:21:40 pesa Exp $ EAPI=5 @@ -53,14 +53,15 @@ sys-devel/bison sys-devel/flex" +PATCHES=( + "${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch" + "${FILESDIR}/${PN}-1.8.0-no-python-pyc.patch" +) + pkg_setup() { python-single-r1_pkg_setup } -src_prepare() { - epatch "${FILESDIR}"/${P}-no-python-pyc.patch -} - src_configure() { local mycmakeargs=( "-DQGIS_MANUAL_SUBDIR=/share/man/" 1.9 sci-geosciences/qgis/qgis-1.7.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/qgis-1.7.0.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/qgis-1.7.0.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/qgis-1.7.0.ebuild?r1=1.8&r2=1.9 Index: qgis-1.7.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.7.0.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qgis-1.7.0.ebuild 3 Nov 2014 13:56:44 -0000 1.8 +++ qgis-1.7.0.ebuild 10 Nov 2014 15:21:40 -0000 1.9 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.7.0.ebuild,v 1.8 2014/11/03 13:56:44 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.7.0.ebuild,v 1.9 2014/11/10 15:21:40 pesa Exp $ EAPI=3 @@ -44,6 +44,9 @@ sys-devel/flex" DOCS=( BUGS ChangeLog CODING.pdf README ) +PATCHES=( + "${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch" +) # Does not find the test binaries at all RESTRICT="test" 1.34 sci-geosciences/qgis/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/ChangeLog?rev=1.34&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/ChangeLog?rev=1.34&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qgis/ChangeLog?r1=1.33&r2=1.34 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ChangeLog 3 Nov 2014 13:56:44 -0000 1.33 +++ ChangeLog 10 Nov 2014 15:21:40 -0000 1.34 @@ -1,6 +1,12 @@ # ChangeLog for sci-geosciences/qgis # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.33 2014/11/03 13:56:44 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.34 2014/11/10 15:21:40 pesa Exp $ + + 10 Nov 2014; Davide Pesavento <[email protected]> + +files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch, qgis-1.7.0.ebuild, + qgis-1.8.0.ebuild: + Fix build with new PyQt4 buildsystem. Patch by Martin von Gagern in bug + 525700. 03 Nov 2014; Aaron W. Swenson <[email protected]> qgis-1.7.0.ebuild, qgis-1.8.0.ebuild:
