| 1 |
scarabeus 10/04/26 22:50:43 |
| 2 |
|
| 3 |
Modified: ChangeLog qgis-1.4.0.ebuild |
| 4 |
Removed: qgis-1.3.0.ebuild |
| 5 |
Log: |
| 6 |
Update to use python correctly. Drop old. Per bug #316215. |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 sci-geosciences/qgis/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/qgis/ChangeLog?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/qgis/ChangeLog?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/qgis/ChangeLog?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- ChangeLog 9 Mar 2010 12:09:12 -0000 1.5 |
| 23 |
+++ ChangeLog 26 Apr 2010 22:50:43 -0000 1.6 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sci-geosciences/qgis |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.5 2010/03/09 12:09:12 abcd Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.6 2010/04/26 22:50:43 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 26 Apr 2010; Tomáš Chvátal <scarabeus@g.o> -qgis-1.3.0.ebuild, |
| 31 |
+ -files/qgis-1.3.0-sip.patch, qgis-1.4.0.ebuild: |
| 32 |
+ Update to use python correctly. Drop old. Per bug #316215. |
| 33 |
|
| 34 |
09 Mar 2010; Jonathan Callen <abcd@g.o> qgis-1.3.0.ebuild, |
| 35 |
qgis-1.4.0.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 sci-geosciences/qgis/qgis-1.4.0.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: qgis-1.4.0.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- qgis-1.4.0.ebuild 9 Mar 2010 12:09:12 -0000 1.2 |
| 52 |
+++ qgis-1.4.0.ebuild 26 Apr 2010 22:50:43 -0000 1.3 |
| 53 |
@@ -1,10 +1,12 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild,v 1.2 2010/03/09 12:09:12 abcd Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild,v 1.3 2010/04/26 22:50:43 scarabeus Exp $ |
| 58 |
|
| 59 |
EAPI="2" |
| 60 |
|
| 61 |
-inherit cmake-utils eutils |
| 62 |
+PYTHON_USE_WITH="sqlite" |
| 63 |
+PYTHON_DEPEND="python? 2" |
| 64 |
+inherit python cmake-utils eutils |
| 65 |
|
| 66 |
DESCRIPTION="User friendly Geographic Information System" |
| 67 |
HOMEPAGE="http://www.qgis.org/" |
| 68 |
@@ -24,17 +26,28 @@ |
| 69 |
x11-libs/qt-sql:4 |
| 70 |
sci-libs/geos |
| 71 |
sci-libs/proj |
| 72 |
- gps? ( dev-libs/expat sci-geosciences/gpsbabel ) |
| 73 |
- grass? ( >=sci-geosciences/grass-6 sci-geosciences/gdal-grass ) |
| 74 |
+ gps? ( |
| 75 |
+ dev-libs/expat |
| 76 |
+ sci-geosciences/gpsbabel |
| 77 |
+ ) |
| 78 |
+ grass? ( |
| 79 |
+ >=sci-geosciences/grass-6 |
| 80 |
+ sci-geosciences/gdal-grass |
| 81 |
+ ) |
| 82 |
gsl? ( sci-libs/gsl ) |
| 83 |
postgres? ( >=virtual/postgresql-base-8 ) |
| 84 |
- python? ( dev-lang/python[sqlite] dev-python/PyQt4[sql,svg] ) |
| 85 |
+ python? ( dev-python/PyQt4[sql,svg] ) |
| 86 |
sqlite? ( dev-db/sqlite:3 )" |
| 87 |
|
| 88 |
DEPEND="${RDEPEND} |
| 89 |
sys-devel/bison |
| 90 |
sys-devel/flex" |
| 91 |
|
| 92 |
+pkg_setup() { |
| 93 |
+ python_set_active_version 2 |
| 94 |
+ python_pkg_setup |
| 95 |
+} |
| 96 |
+ |
| 97 |
src_configure() { |
| 98 |
local mycmakeargs |
| 99 |
mycmakeargs+=( |
| 100 |
@@ -66,9 +79,9 @@ |
| 101 |
|
| 102 |
src_install() { |
| 103 |
cmake-utils_src_install |
| 104 |
- dodoc AUTHORS BUGS ChangeLog README SPONSORS CONTRIBUTORS |
| 105 |
+ dodoc AUTHORS BUGS ChangeLog README SPONSORS CONTRIBUTORS || die |
| 106 |
|
| 107 |
- newicon images/icons/qgis-icon.png qgis.png |
| 108 |
+ newicon images/icons/qgis-icon.png qgis.png || die |
| 109 |
make_desktop_entry qgis "Quantum GIS " qgis |
| 110 |
|
| 111 |
if use examples; then |
Archives