remove old patches

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 13 insertions, 88 deletions

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index 044f0f1c1db7..ef238e049d46 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/qgis
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.28 2013/02/11 02:38:51 hasufell Exp $
+
+  11 Feb 2013; Julian Ospald <hasufell@gentoo.org>
+  -files/qgis-1.7.4-gcc4.7.patch, -files/qgis-no-python-pyc.patch:
+  remove old patches
 
 *qgis-1.8.0 (11 Feb 2013)
 
@@ -117,4 +121,3 @@
   21 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> +qgis-1.3.0.ebuild,
   +files/qgis-1.3.0-sip.patch, +metadata.xml:
   Initial import. Thanks everyone in bug #56262
-
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5b3681dfd843..b656550cdb47 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX qgis-1.7.4-gcc4.7.patch 465 SHA256 6490beefda84d66dd507eabd15f4d328aec1682795f2fcc4e768d5028a901c5f SHA512 fca53f5c012336312f595306f442da7c0c2af7c5b5c346e84f7c46c339f578b14473a0816ecb1bf6d9c3ec318768c3dbb9bd5c230788cc540ffb509609a0a995 WHIRLPOOL f7b77cc56ff00f02b1bb7a20cc0ec1429fe0e9999352c5fd2a8dbd35363b28f875ba4fb241d4184c42190e8f1f665ca5555be792965e773327751a90517e389d
 AUX qgis-1.8.0-no-python-pyc.patch 1992 SHA256 c7b628112510a64443b562dcc18cfb91abe52f6b4a9029863a4b634c28401d34 SHA512 fd147a99cbcaa0bf9aa483b9b071d5cbf275b1bdd4e44961f8d7cd9113b8f3a9bd4d9eed5302ee7b96e453b6bd7a905c53bff823bcc5ac319748ebf9e93e6b4f WHIRLPOOL deb58e01046d558198ad44fb78d3ee4c1dccc091697fbb1416ca0ba757626ff186aff062dd56f4858efb77c3b79d30a7cc79179f4af54ae5972d91feb943f10a
-AUX qgis-no-python-pyc.patch 2352 SHA256 06fe67d39cae5bf98ff419916c1d2b0f2df377db39c3b24c2df61d95592090b5 SHA512 c916a5ab71045f8f7d491f08def858ecd97e34fd8aee7b84d66c45a5db3d6ccd05bd9d321456301945cf3d13a47aef60d50bb4c031ebafe3f729a3076d902e42 WHIRLPOOL f30e22dbe91d24aa0aefa81b19666025b2e80eee05da6ec0ebbd6bd7d7352598b6eb6648e445fecf6ec290db9b9bff4b0e89dc1dad416f051f76e56080025c0f
 DIST qgis-1.7.0.tar.bz2 23420823 SHA256 4b871e841832c9a4f3cee1981198c30850983d73c848684832fa913167671a34
 DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
 EBUILD qgis-1.7.0.ebuild 2460 SHA256 aabf8099f95372cc08f7301fd229cb3be301744d643698b3aae1f1dbe1e81649 SHA512 aefafebefb86ba213d3393e6237565efda71c1c66e95a86fcbedb390e27f21d29ef029a6053e4d11e0523b9bc2e3798647c0ce868a1fb775bc18b209b48fd317 WHIRLPOOL a7a1c3931d38de95a0739d0ae8eec2b9d7ebd0fde927c9f57619bcd47d2e0f603a3458ea94de68a7b0d17b669de3e5aab5900e1c883654295b71f244a5794553
 EBUILD qgis-1.8.0.ebuild 2885 SHA256 46b81319e3202377976c52984e67e1c699e903ddd358628b774747743b182854 SHA512 f47ac3cf74e3f075c269ecd668386786756921d3e6f1a28c70d4780e507c46a036b521b3493c766b19f030ed2776fe4c613faeb96bae85c0fc2e95483e1ba87f WHIRLPOOL 96ed7a2e7a8e43fa70e4f1f2969e704d24030a789c475f659ec1899be767429ec00f716d1e6a31b3e5435c57eee2bbdff9ead8d0ced7973810293b9cebdc91b5
-MISC ChangeLog 4479 SHA256 1d103f10113f10454d2e23f3b54dd04c65ace422f3b1520aac79c0fa5f8d7b0f SHA512 7f2873cb998ad878666c2b17279ff692d873c26f50d05ad66bc0d6bcc7a7082515c95f43249aa9a66f1abcdc8ffd0e3414cb9b98b2d8ce3145c4d78befa37c4a WHIRLPOOL d97259c5cb54cf8cc8e6cf15cc5c5dafae379d6d475118d1770c697a3c5592ff36bbfc339b2f2758c0f8ad0afdbf587c0140272421d21ec58b22904bdbae3b3b
+MISC ChangeLog 4618 SHA256 e18a933373bb189d17d8ad945b0dbbf9308c2a3ddc82ec2f89a163bff030772d SHA512 2c9d4c098b65b8eaa75c3bbc6be58c9bc767d5007b95f89ac44f1cf1d7b8be69b2408620685260f26758fd81c78e8e3c973779887fc6f0df61d8ec4e0dd2e558 WHIRLPOOL 9baaf5a41a96cca3a38ea6724c7db2c09b7b4d6af31701cbd3b7e674662ae597ab273979bd282512ff43c15d70654c7326f4717d216a667f4ded89b79fb26b86
 MISC metadata.xml 846 SHA256 ca59e1fb4e3e9842955f91fbe0320959b473371702aa35bc34872f09701242c1 SHA512 fb79acc00b4a8bc621933b960875cc11b21bf559153c361def3791856b77788896360a38231deb4584a334dadd7ae25b710bb4bf4d7883f5262e734390966f93 WHIRLPOOL 323fe3e34a5a629a7822b18960499de46a8ac8ac01758e2b44da93bfec3d2a206f753212bcea3c5ecbb1c3d35dece43f5a0d600c76ab7575d2a7639389fa4331
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRGFlzAAoJEFpvPKfnPDWzFq0H/1RyebPaNlUjKz0DF80zADni
-/uqnkY4esoTqlAMLNUJinUQ4EHyYI6wp/qNj7oe4dkBMb5MXqHeX7vfe1VUpETAy
-QvOQgbBMJqmmCVwDn/mI+Aia58FHOO5KiHCLsQZA85uPOgkA3cbQ1BusZCkaZqQI
-zuiTrB8g//InTA6dM4qVygGOB4BDREUBU6fNMEuDsqmPsxkMILr1bIMOBGrw/aED
-6DKZt//4tWddrcD4lnYs9+2HUJznS6o1kxzp5oWdHbxqVplVSxvsCBH6KNQIbEWA
-sD181Beo/JfWAtSGH4+Hcn5BO3ZKxgdPP1DiNDDQ7h3eBZCIeabgkET+fxDGcZg=
-=auAo
+iQEcBAEBCAAGBQJRGFm8AAoJEFpvPKfnPDWzawEH/0fnIwe9be4W9cTtPBIrCoXV
+6PreuKGwmcOsrCPCdcxHOnYhrx0pebbdnAizx8ORHy8lpq9XYnfoIqeY7s0MYuqc
+ZX4ZI/3YhgVmEw0d7/iUjLOZVEwbI94G+O9VJkMzuFx5pCCwSHn2u2ZgpeQLCjM5
+Co+a1oNojsEvDFJdBuq5ovXsGbnwCEPyPp43oRJxwbztquqxQJv0ShEMoikRrVVx
+fhMq2NXj9db1ZkkXL/B05MnoOCwAWzvlpdLMZbnnBCY9uP6NS5euqFCAqOUqZtCR
+DBnbV/pqRdgfgZnRG5zvJL+7wjnu54HYuX/z1tu17bbr2FOlljktRi6WuA2h9ME=
+=Ndkq
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch b/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch
deleted file mode 100644
index 858a42c94340..000000000000
--- a/sci-geosciences/qgis/files/qgis-1.7.4-gcc4.7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-+++ qgis-1.7.4/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2012-04-21 13:58:04.107239275 +0300
-@@ -26,6 +26,7 @@
- #include <sys/stat.h>
- #include <stdio.h>
- #include <cstring>
-+#include <unistd.h>
- 
- #ifdef WIN32
- #include <io.h>
-
-+++ qgis-1.7.4/src/core/spatialindex/tools/TemporaryFile.cc	2012-04-21 13:16:42.213690282 +0300
-@@ -20,7 +20,7 @@
- //    mhadji@gmail.com
- 
- #include <stdio.h>
--
-+#include <unistd.h>
- #include <Tools.h>
- 
- #ifdef WIN32
diff --git a/sci-geosciences/qgis/files/qgis-no-python-pyc.patch b/sci-geosciences/qgis/files/qgis-no-python-pyc.patch
deleted file mode 100644
index 7bb368b6c682..000000000000
--- a/sci-geosciences/qgis/files/qgis-no-python-pyc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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})