diff options
Diffstat (limited to 'sci-geosciences/qgis')
| -rw-r--r-- | sci-geosciences/qgis/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-1.5.0-qset.patch | 44 | ||||
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-1.5.0-sip.patch | 76 | ||||
| -rw-r--r-- | sci-geosciences/qgis/metadata.xml | 3 | ||||
| -rw-r--r-- | sci-geosciences/qgis/qgis-1.7.0.ebuild (renamed from sci-geosciences/qgis/qgis-1.5.0.ebuild) | 66 |
5 files changed, 42 insertions, 156 deletions
diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog index 6cb2d85b7f12..6737986b182b 100644 --- a/sci-geosciences/qgis/ChangeLog +++ b/sci-geosciences/qgis/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-geosciences/qgis # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.18 2011/03/06 09:17:46 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.19 2011/06/12 17:09:56 scarabeus Exp $ + +*qgis-1.7.0 (12 Jun 2011) + + 12 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -qgis-1.5.0.ebuild, + -files/qgis-1.5.0-qset.patch, -files/qgis-1.5.0-sip.patch, + +qgis-1.7.0.ebuild, metadata.xml: + Version bump to the latest. Drop 1.5.0. 06 Mar 2011; Justin Lecher <jlec@gentoo.org> qgis-1.5.0.ebuild: Moved to slotted qwt diff --git a/sci-geosciences/qgis/files/qgis-1.5.0-qset.patch b/sci-geosciences/qgis/files/qgis-1.5.0-qset.patch deleted file mode 100644 index 418b90092659..000000000000 --- a/sci-geosciences/qgis/files/qgis-1.5.0-qset.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur qgis-1.5.0/python/CMakeLists.txt qgis-1.5.0-patched/python/CMakeLists.txt ---- qgis-1.5.0/python/CMakeLists.txt 2011-01-23 14:24:20.655999989 +0200 -+++ qgis-1.5.0-patched/python/CMakeLists.txt 2011-01-23 14:29:03.930999748 +0200 -@@ -43,6 +43,10 @@ - SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION) - ENDIF(NOT PYQT4_VERSION_NUM LESS 263941) - -+IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802 -+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION) -+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194) -+ - # core module - FILE(GLOB sip_files_core core/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${sip_files_core}) -diff -ur qgis-1.5.0/python/core/conversions.sip qgis-1.5.0-patched/python/core/conversions.sip ---- qgis-1.5.0/python/core/conversions.sip 2011-01-23 14:24:20.656999987 +0200 -+++ qgis-1.5.0-patched/python/core/conversions.sip 2011-01-23 14:30:08.901999769 +0200 -@@ -15,6 +15,7 @@ - */ - - %Feature QSETINT_CONVERSION -+%Feature QSETTYPE_CONVERSION - - %ModuleHeaderCode - // From Python 2.5, some functions use Py_ssize_t instead of int -@@ -321,7 +322,7 @@ - }; - %End - -- -+%If (QSETTYPE_CONVERSION) - template <TYPE> - %MappedType QSet<TYPE> - { -@@ -395,8 +396,7 @@ - %End - - }; -- -- -+%End - - template<TYPE> - %MappedType QMap<int, QMap<int, TYPE> > diff --git a/sci-geosciences/qgis/files/qgis-1.5.0-sip.patch b/sci-geosciences/qgis/files/qgis-1.5.0-sip.patch deleted file mode 100644 index 61fc44e67aac..000000000000 --- a/sci-geosciences/qgis/files/qgis-1.5.0-sip.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -rc qgis-1.5.0/cmake/FindSIP.cmake qgis-1.5.0-patched/cmake/FindSIP.cmake -*** qgis-1.5.0/cmake/FindSIP.cmake Sat Jan 16 12:08:04 2010 ---- qgis-1.5.0-patched/cmake/FindSIP.cmake Wed Nov 17 16:46:34 2010 -*************** -*** 36,41 **** ---- 36,42 ---- - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} OUTPUT_VARIABLE sip_config) - IF(sip_config) - STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config}) -+ STRING(REGEX REPLACE ".*\nsip_version_num:([^\n]+).*$" "\\1" SIP_VERSION_NUM ${sip_config}) - STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config}) - STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config}) - STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) -diff -rc qgis-1.5.0/cmake/FindSIP.py qgis-1.5.0-patched/cmake/FindSIP.py -*** qgis-1.5.0/cmake/FindSIP.py Sat Jan 16 12:04:41 2010 ---- qgis-1.5.0-patched/cmake/FindSIP.py Wed Nov 17 16:46:57 2010 -*************** -*** 9,14 **** ---- 9,15 ---- - - sipcfg = sipconfig.Configuration() - print("sip_version:%06.0x" % sipcfg.sip_version) -+ print("sip_version_num:%d" % sipcfg.sip_version) - print("sip_version_str:%s" % sipcfg.sip_version_str) - print("sip_bin:%s" % sipcfg.sip_bin) - print("default_sip_dir:%s" % sipcfg.default_sip_dir) -diff -rc qgis-1.5.0/python/CMakeLists.txt qgis-1.5.0-patched/python/CMakeLists.txt -*** qgis-1.5.0/python/CMakeLists.txt Sat May 15 10:21:42 2010 ---- qgis-1.5.0-patched/python/CMakeLists.txt Wed Nov 17 16:47:57 2010 -*************** -*** 39,44 **** ---- 39,48 ---- - SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY) - ENDIF(PYQT4_VERSION_NUM LESS 263680) - -+ IF(NOT PYQT4_VERSION_NUM LESS 263941) # 0x040705 -+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION) -+ ENDIF(NOT PYQT4_VERSION_NUM LESS 263941) -+ - # core module - FILE(GLOB sip_files_core core/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${sip_files_core}) -diff -rc qgis-1.5.0/python/core/conversions.sip qgis-1.5.0-patched/python/core/conversions.sip -*** qgis-1.5.0/python/core/conversions.sip Tue Apr 20 14:25:42 2010 ---- qgis-1.5.0-patched/python/core/conversions.sip Wed Nov 17 16:45:03 2010 -*************** -*** 14,19 **** ---- 14,21 ---- - - QMap<int, QgsOverlayObject*>* - */ - -+ %Feature QSETINT_CONVERSION -+ - %ModuleHeaderCode - // From Python 2.5, some functions use Py_ssize_t instead of int - // thus this typedef is for maintaining backward compatibility -*************** -*** 265,270 **** ---- 267,273 ---- - - - -+ %If (QSETINT_CONVERSION) - %MappedType QSet<int> - { - %TypeHeaderCode -*************** -*** 316,321 **** ---- 319,325 ---- - %End - - }; -+ %End - - - template <TYPE> diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index 21f7628c88ff..c7a4ff725300 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -11,7 +11,8 @@ tracks from your GPS. </longdescription> <use> - <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag> + <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag> + <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag> </use> </pkgmetadata> diff --git a/sci-geosciences/qgis/qgis-1.5.0.ebuild b/sci-geosciences/qgis/qgis-1.7.0.ebuild index f3c31e364e3e..f17a4a13b337 100644 --- a/sci-geosciences/qgis/qgis-1.5.0.ebuild +++ b/sci-geosciences/qgis/qgis-1.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild,v 1.4 2011/03/06 09:17:46 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.7.0.ebuild,v 1.1 2011/06/12 17:09:56 scarabeus Exp $ EAPI=3 @@ -10,45 +10,43 @@ inherit python base cmake-utils eutils DESCRIPTION="User friendly Geographic Information System" HOMEPAGE="http://www.qgis.org/" -SRC_URI="http://download.osgeo.org/${PN}/src/${PN}_${PV}.tar.gz +SRC_URI="http://qgis.org/downloads/${P}.tar.bz2 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" +IUSE="examples gps grass gsl postgres python spatialite test" -RDEPEND=">=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?] - x11-libs/qt-core:4[qt3support] +RDEPEND=" + dev-libs/expat + sci-geosciences/gpsbabel + >=sci-libs/gdal-1.6.1[geos,python?] + sci-libs/geos + sci-libs/gsl + x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-svg:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 - sci-libs/geos - gps? ( - dev-libs/expat - sci-geosciences/gpsbabel - x11-libs/qwt:5 - ) - 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 - ) - ) + x11-libs/qwt:5[svg] + x11-libs/qwtpolar + grass? ( >=sci-geosciences/grass-6.4.0_rc6[python?] ) + postgres? ( >=dev-db/postgresql-base-8.4 ) python? ( dev-python/PyQt4[X,sql,svg] ) - sqlite? ( dev-db/sqlite:3 )" + spatialite? ( + dev-db/sqlite:3 + dev-db/spatialite + )" DEPEND="${RDEPEND} sys-devel/bison sys-devel/flex" -PATCHES=( - "${FILESDIR}/${P}-sip.patch" - "${FILESDIR}/${P}-qset.patch" -) +DOCS=( AUTHORS BUGS ChangeLog CODING.pdf README SPONSORS CONTRIBUTORS ) + +# Does not find the test binaries at all +RESTRICT="test" pkg_setup() { python_set_active_version 2 @@ -56,21 +54,22 @@ pkg_setup() { } src_configure() { - local mycmakeargs - mycmakeargs+=( + local mycmakeargs+=( "-DQGIS_MANUAL_SUBDIR=/share/man/" "-DBUILD_SHARED_LIBS=ON" "-DBINDINGS_GLOBAL_INSTALL=ON" "-DQGIS_LIB_SUBDIR=$(get_libdir)" "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis" - "-DWITH_INTERNAL_SPATIALITE:BOOL=OFF" + "-DWITH_INTERNAL_SPATIALITE=OFF" + "-DWITH_INTERNAL_QWTPOLAR=OFF" + "-DPEDANTIC=OFF" + "-DWITH_APIDOC=OFF" $(cmake-utils_use_with postgres POSTGRESQL) - $(cmake-utils_use_with grass) - $(cmake-utils_use_with gps EXPAT) - $(cmake-utils_use_with gps QWT) - $(cmake-utils_use_with gsl) + $(cmake-utils_use_with grass GRASS) $(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) ) use grass && mycmakeargs+=( "-DGRASS_PREFIX=/usr/" ) @@ -79,10 +78,9 @@ 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 + make_desktop_entry qgis "Quantum GIS" qgis if use examples; then insinto /usr/share/doc/${PF}/examples |