From 12dc69fe9f4400fd3e3811ffe4f1ff093bc8653b Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 11 Feb 2013 02:37:34 +0000 Subject: version bump wrt #421093, remove broken wrt #449348 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) --- sci-geosciences/qgis/ChangeLog | 10 +- .../qgis/files/qgis-1.8.0-no-python-pyc.patch | 54 ++++++++++ sci-geosciences/qgis/metadata.xml | 1 + sci-geosciences/qgis/qgis-1.7.4.ebuild | 112 -------------------- sci-geosciences/qgis/qgis-1.8.0.ebuild | 115 +++++++++++++++++++++ 5 files changed, 178 insertions(+), 114 deletions(-) create mode 100644 sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch delete mode 100644 sci-geosciences/qgis/qgis-1.7.4.ebuild create mode 100644 sci-geosciences/qgis/qgis-1.8.0.ebuild (limited to 'sci-geosciences') diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog index 8a0835aafa03..044f0f1c1db7 100644 --- a/sci-geosciences/qgis/ChangeLog +++ b/sci-geosciences/qgis/ChangeLog @@ -1,6 +1,12 @@ # 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.26 2012/05/24 12:53:24 scarabeus Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.27 2013/02/11 02:37:34 hasufell Exp $ + +*qgis-1.8.0 (11 Feb 2013) + + 11 Feb 2013; Julian Ospald +qgis-1.8.0.ebuild, + +files/qgis-1.8.0-no-python-pyc.patch: + version bump wrt #421093, remove broken wrt #449348 24 May 2012; Tomáš Chvátal +files/qgis-no-python-pyc.patch, qgis-1.7.4.ebuild: diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch b/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch new file mode 100644 index 000000000000..ec3e1c2dccf6 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch @@ -0,0 +1,54 @@ +--- cmake/PythonMacros.cmake ++++ cmake/PythonMacros.cmake +@@ -22,40 +22,4 @@ + # Install the source file. + INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR}) + +- # Byte compile and install the .pyc file. +- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) +- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) +- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) +- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) +- +- if(WIN32) +- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") +- endif(WIN32) +- +- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) +- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) +- +- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) +- +- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") +- +- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) +- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. +- ADD_CUSTOM_COMMAND( +- TARGET compile_python_files +- COMMAND ${CMAKE_COMMAND} -E echo ${message} +- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} +- DEPENDS ${_absfilename} +- ) +- ELSE(_abs_bin_py STREQUAL ${_absfilename}) +- ADD_CUSTOM_COMMAND( +- TARGET compile_python_files +- COMMAND ${CMAKE_COMMAND} -E echo ${message} +- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} +- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} +- DEPENDS ${_absfilename} +- ) +- ENDIF(_abs_bin_py STREQUAL ${_absfilename}) +- +- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR}) + ENDMACRO(PYTHON_INSTALL) +--- python/CMakeLists.txt ++++ python/CMakeLists.txt +@@ -102,8 +102,6 @@ + + SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis) + +-ADD_CUSTOM_TARGET(compile_python_files ALL) +- + ADD_CUSTOM_COMMAND(TARGET compile_python_files + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E make_directory ${QGIS_PYTHON_OUTPUT_DIRECTORY} diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index 04d4f42c5540..68abd3f85b73 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -11,6 +11,7 @@ tracks from your GPS. + Use internal copy of x11-libs/qwtpolar Add support for sci-geosciences/grass Enable Spatial DBMS over sqlite dev-db/spatialite diff --git a/sci-geosciences/qgis/qgis-1.7.4.ebuild b/sci-geosciences/qgis/qgis-1.7.4.ebuild deleted file mode 100644 index 0400d6bfd489..000000000000 --- a/sci-geosciences/qgis/qgis-1.7.4.ebuild +++ /dev/null @@ -1,112 +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.7.4.ebuild,v 1.2 2012/05/24 12:53:24 scarabeus Exp $ - -EAPI=4 - -PYTHON_USE_WITH="sqlite" -PYTHON_DEPEND="python? 2" -inherit python base cmake-utils eutils multilib - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="http://www.qgis.org/" -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 spatialite test" - -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 - x11-libs/qwt:5[svg] - =sci-geosciences/grass-6.4.0_rc6[python?] ) - postgres? ( >=dev-db/postgresql-base-8.4 ) - python? ( -