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

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 84 insertions, 17 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/Manifest b/sci-geosciences/qgis/Manifest
index bfe0833631ff..07a30e09c643 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,27 +2,28 @@
 Hash: SHA1
 
 AUX qgis-1.7.4-gcc4.7.patch 465 RMD160 0552c55d9d5ad1aa688422202cab33bf4f15da70 SHA1 b284a203b99e8789c96b0d106d8f005bd703bbfc SHA256 6490beefda84d66dd507eabd15f4d328aec1682795f2fcc4e768d5028a901c5f
+AUX qgis-no-python-pyc.patch 2352 RMD160 8fbd845962e5b7fb6bcfd6fb54dadb7ada884bef SHA1 cec0fe942b23698d816119633253acb2bf4b379e SHA256 06fe67d39cae5bf98ff419916c1d2b0f2df377db39c3b24c2df61d95592090b5
 DIST qgis-1.7.0.tar.bz2 23420823 RMD160 49303eab754f1e7febce388e657253563f65abed SHA1 e60f40e72c92f187d3725e6b93c13691d63a7fa7 SHA256 4b871e841832c9a4f3cee1981198c30850983d73c848684832fa913167671a34
 DIST qgis-1.7.4.tar.bz2 25618352 RMD160 dae51556b09a57ce9537ca4ed75830f15e3be5a4 SHA1 0dae5cb933d1ce621e5fe30c1937887d813a2098 SHA256 e302bd676b755676a6fa6da0c416d73694eca24e67ae8e34bbf78d13ee3b7ea6
 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
 EBUILD qgis-1.7.0.ebuild 2460 RMD160 80dedc58ceec89b59a50902d08c4138d2f046d32 SHA1 a26ce8d1ecf0356ae56aa6e415fbe37b93581a88 SHA256 aabf8099f95372cc08f7301fd229cb3be301744d643698b3aae1f1dbe1e81649
-EBUILD qgis-1.7.4.ebuild 2529 RMD160 4f04b894437dab04c80e59ec52996d04c0e40e4c SHA1 f923e4302e2bc940715fce07e07ea40ee51ab8c1 SHA256 1087d2c0ee61ede0c661254eb3ea634624e0b48b88b5e7c36e08771f18ec7e14
-MISC ChangeLog 4116 RMD160 ca599b0f824470fa746296e8b699664db58e848b SHA1 425a2a2f6cf9e4bdf4c3e581a80c7fa2d45117da SHA256 2099ae7a72623b0dd5e6ebce7b78606bb6b0c13e256924fd874babe428be3209
+EBUILD qgis-1.7.4.ebuild 2729 RMD160 cbc758939b6c2b920cc6ad5a9cb2a7aec4f92123 SHA1 e593a246c83ba431cedd06d45b284e207381268a SHA256 6b7ac4dec15327ef26e51fff13c87f2033149b446d239ddd63ae50c4c21219b8
+MISC ChangeLog 4286 RMD160 6d65657ba0e76a698ce79dd6e1810c50d77da04b SHA1 18090a4053c0c395ce18545b0aa3b2e3be6d2c04 SHA256 a03c8f5116f9c85f9098d9e4e00dc93ffad865cec938d877d2281488f9253f28
 MISC metadata.xml 761 RMD160 c816141f62d6691afab93ab748b0fe4c1eac8673 SHA1 8983496bf9a7f8165afd202ece387f8f7f19de43 SHA256 2a660183723328a9eed16e5f1ee4804399881cc3e8c559210796335ef457adcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvi1bAAoJEOSiRoyO7jvocg0P/0m/X4ghmSXmupLjtFY6PXpa
-h8gNkaFWsaanHqoCD/0UQ4DRGwGp9XJU7dvDvxBFBFRk6zev9qq71OSne9SK0Tts
-JfqgS/hpGZZRziQ/xKRAOIh+4Rwxzm5QEfYsYMgCAa0SUtWIneU6m5Vy8fy4yVcR
-j+FrPxXBa59Rp1VMXV9ezqg6E4UReYIojILkHbW+P5SZdMipKh5V7rnI4aYiMYWx
-+Q+aYohfDfp4tPZ0T5/dr1PQSGkcU1soSkTe89vkvOjZBpqua+hDyWGcx1XSap9l
-VqOXECVb+bFpc4VStHs8mVIrS/16P+lZ+6prB27dPspBw/vhPX981rR4QFMM9St1
-4ie+LhAErGLYX+BdNZ1uc5MRCOWFTiQ2ivx1fqSWtpXYogXQggKNFxg9hCajtXuy
-6EMGj+MYE3AH27UJAFVwh8S3tgpQzvCgJjbZr6xByOL0uEZ3S69wGiniJ83/ix5m
-mDJnBOLGxRLW1Rsa/89r/hnvV2ooiDKed0aT0/8ucj+b/Ixu3wfEkKaGIGYpxHKu
-xXsls6mOhKYMZHUZPQiCnAo7BNInRQxo1gwGtXfenzhL04pj51I/6k9U8d4Te9BS
-F2jIaDxp5IZm7ufANjelgGMXcAiNIS7k9HHBoFgUP5deSfj9myAX5tLH+rkVSMX3
-71+vYkGEOeumvHfWIRus
-=BNc1
+iQIcBAEBAgAGBQJPvi9MAAoJEOSiRoyO7jvoZsYP/jPhud8SHXxeOBGX6eVCe83p
+q4imI3MgHZwS0sbbj5wZeMnYlSE2SA+LcGP8jCatbm2BtizwVKh7VuANNgb+4omc
+rbPCfLMRTIKDpZdcW6TfZehLsM2AImgxmeBMX2gK2PNHMR96A2RWH/1lKvOSNrhw
+SbB8+aJPN8nOOOOYMR9sS8CfqhSqxXustbJwlNBj7Otj/XaOJh9SveXhb6O1aVxF
+dTybWZvrUMDGJ7OmNodHErah6RWCO8WphBstY2jB7y/mhkCXO4/7bL+W+A6S50bw
+KU9Xo8E1PFVsFqOq82dFA+HjydnWY9fg/AQ6wtwdlCSpf5dOqHp3y8JZAd2B5uXS
+f6M9wQLmwNHOYqcJCYWlgG1akcEr+3JOZ8c9Qfem49aeBBzr3dHJmkFLfu3xzAqn
+5HkmPqJW2L8SQ48ZBLV3T/Cc7BbjZPXE86QnPgW71Y+6VFnTzHPl/8hNmyBXaE28
+bD5fHF+0jnWnedsdN5QOlF23Iyj9hzjAlW2u5hErKTNa5yhxZbORtuMWgLUTfepo
+NUK6hZCtkOLFg12atWbkf9+9nqUBVnYMChkJR9Rt30Nme6+hGnnbDqbZFnEnH9ND
+DgULMYq6Vy6qtuhfvdVbB3mS/lQ4Wa5ryqyRtoWD1KnKRw/+To2Iim4o5JQlUbkg
+ktiy1E/K4IOkaE1BB8eY
+=wpUx
 -----END PGP SIGNATURE-----
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
 }