version bump wrt #421093, remove broken wrt #449348

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 100 insertions, 36 deletions

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 <hasufell@gentoo.org> +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 <scarabeus@gentoo.org>
   +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. 
 </longdescription>
 	<use>
+		<flag name="bundled-libs">Use internal copy of <pkg>x11-libs/qwtpolar</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>
diff --git a/sci-geosciences/qgis/qgis-1.7.4.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
index 0400d6bfd489..41d7afea7a05 100644
--- a/sci-geosciences/qgis/qgis-1.7.4.ebuild
+++ b/sci-geosciences/qgis/qgis-1.8.0.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v 1.1 2013/02/11 02:37:34 hasufell Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="python? 2"
-inherit python base cmake-utils eutils multilib
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit eutils multilib gnome2-utils cmake-utils python-single-r1
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
-SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
+SRC_URI="http://qgis.org/downloads/qgis-${PV}.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"
+IUSE="bundled-libs examples gps grass gsl postgres python spatialite test"
 
 RDEPEND="
 	dev-libs/expat
@@ -24,54 +24,46 @@ RDEPEND="
 	>=sci-libs/gdal-1.6.1[geos,python?]
 	sci-libs/geos
 	sci-libs/gsl
+	sci-libs/libspatialindex
+	sci-libs/proj
 	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]
-	<x11-libs/qwtpolar-1
+	!bundled-libs? ( <x11-libs/qwtpolar-1 )
 	grass? ( >=sci-geosciences/grass-6.4.0_rc6[python?] )
 	postgres? ( >=dev-db/postgresql-base-8.4 )
 	python? (
-		<dev-python/PyQt4-4.9[X,sql,svg]
-		<dev-python/sip-4.13
+		dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
 	)
 	spatialite? (
 		dev-db/sqlite:3
 		dev-db/spatialite
 	)"
-
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-DOCS=( BUGS CHANGELOG CODING.pdf README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc4.7.patch"
-	"${FILESDIR}/${PN}-no-python-pyc.patch"
-)
-
-# Does not find the test binaries at all
-RESTRICT="test"
-
 pkg_setup() {
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-python-pyc.patch
 }
 
 src_configure() {
-	local 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=OFF"
-		"-DWITH_INTERNAL_QWTPOLAR=OFF"
+		"-DWITH_INTERNAL_QWTPOLAR=$(usex bundled-libs "ON" "OFF")"
 		"-DPEDANTIC=OFF"
 		"-DWITH_APIDOC=OFF"
 		$(cmake-utils_use_with postgres POSTGRESQL)
@@ -80,22 +72,32 @@ src_configure() {
 		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
 		$(cmake-utils_use_with spatialite SPATIALITE)
 		$(cmake-utils_use_enable test TESTS)
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
 	)
-	use grass && mycmakeargs+=( "-DGRASS_PREFIX=/usr/" )
 
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
+	dodoc BUGS ChangeLog CODING README
 
-	newicon images/icons/qgis-icon.png qgis.png
-	make_desktop_entry qgis "Quantum GIS" qgis
+	newicon -s 128 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/*
 	fi
+
+	python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+	python_optimize "${D}"/usr/share/qgis/python/plugins \
+		"${D}"/$(python_get_sitedir)/qgis \
+		"${D}"/usr/share/qgis/grass/scripts
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
@@ -104,9 +106,10 @@ pkg_postinst() {
 		elog "you should install:"
 		elog "   dev-db/postgis"
 	fi
-	use python && python_mod_optimize qgis /usr/share/qgis/python/plugins
+
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup qgis /usr/share/qgis/python/plugins
+	gnome2_icon_cache_update
 }