Add python pyc patch for bug#381481. Patch by Chris Mayo.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

3 files changed, 68 insertions, 2 deletions

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index fd5c864d39a8..8a0835aafa03 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2012/05/24 12:43:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.26 2012/05/24 12:53:24 scarabeus Exp $
+
+  24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/qgis-no-python-pyc.patch, qgis-1.7.4.ebuild:
+  Add python pyc patch for bug#381481. Patch by Chris Mayo.
 
 *qgis-1.7.4 (24 May 2012)
 
diff --git a/sci-geosciences/qgis/files/qgis-no-python-pyc.patch b/sci-geosciences/qgis/files/qgis-no-python-pyc.patch
new file mode 100644
index 000000000000..7bb368b6c682
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-no-python-pyc.patch
@@ -0,0 +1,56 @@
+diff -ur qgis-1.7.0.orig//cmake/PythonMacros.cmake qgis-1.7.0/cmake/PythonMacros.cmake
+--- qgis-1.7.0.orig//cmake/PythonMacros.cmake	2011-06-05 12:59:48.000000000 +0100
++++ qgis-1.7.0/cmake/PythonMacros.cmake	2011-09-01 20:36:09.285050896 +0100
+@@ -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)
+diff -ur qgis-1.7.0.orig//python/CMakeLists.txt qgis-1.7.0/python/CMakeLists.txt
+--- qgis-1.7.0.orig//python/CMakeLists.txt	2011-06-05 12:59:48.000000000 +0100
++++ qgis-1.7.0/python/CMakeLists.txt	2011-09-01 20:35:57.429003659 +0100
+@@ -82,8 +82,6 @@
+ 
+ SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)
+ 
+-ADD_CUSTOM_TARGET(compile_python_files ALL)
+-
+ PYTHON_INSTALL(__init__.py ${QGIS_PYTHON_DIR})
+ PYTHON_INSTALL(utils.py    ${QGIS_PYTHON_DIR})
+ PYTHON_INSTALL(console.py  ${QGIS_PYTHON_DIR})
diff --git a/sci-geosciences/qgis/qgis-1.7.4.ebuild b/sci-geosciences/qgis/qgis-1.7.4.ebuild
index 67b61bbe4460..0400d6bfd489 100644
--- a/sci-geosciences/qgis/qgis-1.7.4.ebuild
+++ b/sci-geosciences/qgis/qgis-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2012/05/24 12:43:45 scarabeus Exp $
+# $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
 
@@ -50,6 +50,7 @@ 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
@@ -103,4 +104,9 @@ pkg_postinst() {
 		elog "you should install:"
 		elog "   dev-db/postgis"
 	fi
+	use python && python_mod_optimize qgis /usr/share/qgis/python/plugins
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup qgis /usr/share/qgis/python/plugins
 }