version bump wrt #421093, remove broken wrt #449348

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

5 files changed, 119 insertions, 60 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/Manifest b/sci-geosciences/qgis/Manifest
index 07a30e09c643..5b3681dfd843 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,29 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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 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
+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 metadata.xml 846 SHA256 ca59e1fb4e3e9842955f91fbe0320959b473371702aa35bc34872f09701242c1 SHA512 fb79acc00b4a8bc621933b960875cc11b21bf559153c361def3791856b77788896360a38231deb4584a334dadd7ae25b710bb4bf4d7883f5262e734390966f93 WHIRLPOOL 323fe3e34a5a629a7822b18960499de46a8ac8ac01758e2b44da93bfec3d2a206f753212bcea3c5ecbb1c3d35dece43f5a0d600c76ab7575d2a7639389fa4331
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQEcBAEBCAAGBQJRGFlzAAoJEFpvPKfnPDWzFq0H/1RyebPaNlUjKz0DF80zADni
+/uqnkY4esoTqlAMLNUJinUQ4EHyYI6wp/qNj7oe4dkBMb5MXqHeX7vfe1VUpETAy
+QvOQgbBMJqmmCVwDn/mI+Aia58FHOO5KiHCLsQZA85uPOgkA3cbQ1BusZCkaZqQI
+zuiTrB8g//InTA6dM4qVygGOB4BDREUBU6fNMEuDsqmPsxkMILr1bIMOBGrw/aED
+6DKZt//4tWddrcD4lnYs9+2HUJznS6o1kxzp5oWdHbxqVplVSxvsCBH6KNQIbEWA
+sD181Beo/JfWAtSGH4+Hcn5BO3ZKxgdPP1DiNDDQ7h3eBZCIeabgkET+fxDGcZg=
+=auAo
 -----END PGP SIGNATURE-----
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
 }