Add := to dev-python/sip dependency wrt bug 462712. Drop obsolete python2_6 target.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index f35959417c7a41ac38000d571c00aac1f3893c0f..61c1c0083e3e1616ad5b465b6ac99d1b784328ab 100644 (file)
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/qgis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.34 2014/11/10 15:21:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.35 2014/12/26 22:08:14 pesa Exp $
+
+  26 Dec 2014; Davide Pesavento <pesa@gentoo.org> qgis-1.8.0.ebuild:
+  Add := to dev-python/sip dependency wrt bug 462712. Drop obsolete python2_6
+  target.
 
   10 Nov 2014; Davide Pesavento <pesa@gentoo.org>
   +files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch, qgis-1.7.0.ebuild,

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 2ba8aec02720035af562a17ecda4cd398d2e00ef..0917c7b68a3b5ac9e7f45ef7d8493adee780a8bf 100644 (file)
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -7,25 +7,25 @@ DIST qgis-1.7.0.tar.bz2 23420823 SHA256 4b871e841832c9a4f3cee1981198c30850983d73
 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 2506 SHA256 b5905dc9fbed7eeb067700a4aabdb946450be0a24caf9b81a1a72a2f9a4719c9 SHA512 d4b4d0d77e6b5d0b1e5b79dd61bdb396bc02935c52924fb99f321143b4eda95c3f08e6be70aec58358e332a4f926945768df18bbf3636c89a74894c6cbece0ff WHIRLPOOL 304113cb7f74a02a7c07c439f60f5988fff746ede49432c696b197a2faac944366d6a4cffa0d2633aabc2b0fd82a5c5bd2fc4d62774f91ca546840eb8e6afea0
-EBUILD qgis-1.8.0.ebuild 2977 SHA256 0dae080c50cd2f837b0361dc7a5275ac75db7d3a8ef0f42b9a7679bbb48ece2f SHA512 49ff3e233a978ffbc5dd8ad22db61cee94f100b75a4cfc509853171d4b6aa5457a9350fbfa783fc30ecac1442ee01dc23b5f8899c27bd9791c77fd86fda9ab71 WHIRLPOOL 446f3a735e384054935455027469dc88ef3513374284c30db8b09d0be513ec71ad80476db6131ef15eee741d3bd23b52a9a6f12be0863dbfd24d3efbbf19f7f1
-MISC ChangeLog 5519 SHA256 bcd0f76ac806826c9e7009841f810bb7e5250023839884065bf43d2781d14988 SHA512 3684d492ea58077abb24c8daf574ee0361416e74969881cce8d480840e80f5bc8ef54e5b8659dce05167f790958af431114380123951fcb5944cf4d1ca90775f WHIRLPOOL 6353171e3302cf4ba34cfdd16b906072a896cdfbc653c3ff2a7dc33e128986689dba2c232a14d85e4676fe7197cbc01906a1153a406db780f0968c4d9272ec57
+EBUILD qgis-1.8.0.ebuild 2943 SHA256 4be95161c899f8334e314fa58afb1a34cee45aacd6b6cf54e9b6ae2ece648748 SHA512 53c4cb972d9826a5ee10c1ad678a0aa8fcb51950644ce4c66406c3a7ae6f6f9efd152d88386c45482432ccd2a0ac6cf970a274a6b6f43a6f4a4b45803115f42f WHIRLPOOL dfdc76769344de0177c67127ef15bfd4f23afddf91beff7cd4e520fb80fc368bee86a1d4671799a29a4f706140b72b3af3210d8a1f7b8765a4fadd318710ead3
+MISC ChangeLog 5677 SHA256 214345b9a7c2048e1b33760d24a75872790dca35330aaae4b16872a3d5123668 SHA512 f62e16fa16adb8dfe9fe5c8b5c1fe1d4eaf3f1bb67f930e301bcb01f08e5cf8eecd16a1c0f3f4ad05f4d35e5fd0fed5d7ae1f95a5c1031c11dafdb2f267199c7 WHIRLPOOL f2d7432e8c905e0bbb29418bb5a962ddbad2024b556d1b087736cb28c343956b3d949b2f218c5ac17ff67cc435a02ec8f8f4405ca39953586b9d1c4c771a3971
 MISC metadata.xml 856 SHA256 13d42ab9e1157d249cb431aecc96b56e1de66c0d81e5a9323d0c878e0cc3b16d SHA512 2a88daa49b4107439665a3352e17ced39e132d031910a66f3d75e89122540db0854261cccbd2beb6eb396d8390e3c916796fd4af37fe7af15676ab6cf850a516 WHIRLPOOL b8e1f1ee238cd8dea0daf3b66fc64a8eac81ef38dbf46d82c9f154340afcef881d8aae3cca0967b694383a8fd37a4cf06d033efbd9938675992605fc1cdbd7fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUYNgMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUndxdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9c90P/27okMp1jXzJuUjAbSJ5Xbdm
-gXPY79tok9jf5oeCBDJKYS8Hpya0YZrFqP/gXOO9APVhD85TmPYAjP6URLCDdFd/
-LEMpp4LEfzbzo3ZK8lTItCzkytC1p/CIxsgqDT79YpLM1fjXUlK0cI9WmR0x0v8s
-yAXpdDu9NgwKQhy6Ek+nov5kk1MbCs7z2TXl/Jsgikw2J70o/XunfrKTVIG3RPjs
-SbiQW4Bb8nWJiCgYS3D11ZiUvrDupGhDdOcieWSFROL/HFBtRU8+A0JSbfc5Lkqr
-Hv79t2ElCCC2dWcXBYHKSf4W6zvaJuNf9TAEHYm+uPLIuhorO09CgrietoKykbzx
-B1qnn9lip9EFl+aCi15F9TBpQfzIJuZ3v8aDBV6kxX9YPFvB824hKtpIQNW/Kl0q
-z7Zq3HXecnlH21StOMNPZnKF/LKFqNZ3djBX5Ozr+t3h8qmZaBFRlcSSWm/Xooey
-Ol4PuMDgXZMFyGs66HNkrwP3Jh5ABuPRXjyMAYiHLdY5xHF2wROaHGG3pb15e1ik
-hCnZCQYUGvRCAuecE+0XaUS7KXbidYDMhJbL1tr9XOBg58cReAmB00q7HFU1FoO4
-iY2W50HdHG/vlDkdpsM8GCXF0rVZ/2Wa+CrKiztg0AqW/DB3ykrpgbZq/rWTxc0p
-auFrgKj0lO+G96eaQgC2
-=Apcv
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Vt8P/RUU5p6PX3YYad/6q2ofbrj+
+63KtlrRGxXBc82WKb7Vq9yYDAsjMyUr+AxxgtkzMKNO9PDWIR8ILCB2OPTfzqaM6
+VECugaXf85tHGuRrE4cuwVQ8ed6JBfwq2eUXFSxmi+aVyu/6aFNcsfvDpJCWD+ob
+acQTch7S+J9IJBBjMRqwiCj+ckmLiP7B5tkjhaioX3zj6+FXu/XjXR1IPHinkZrT
+Zr/Jf7YBVbneyvSeNcR8UnQ92JjOovFGzzz07Etw0EfghIPEwiWL30+o0ov2ZIY0
+L3CVn4KVT8PsvvO2QlypM9eGd0k05gzlahb4PddBscuBY/FsMZxrDmSatwSU9koh
+o90kJ6A+/7bIQkPZ7R5xMC6dS5n3QCimi3cKrcz0KdQUFKr0EAVA/DGVIoIU4QLR
+I5OXAiOxdV2l2n7kbmWrHG5vwHrt3t5ug4QhDYkQ4ye0tW1GVknVOrjmKYhlXY4V
+W7ET8vrLsfVPjInb+U30M5cx+nhoP3sfJxFEjF8lRl2aqp+3OPco8p6V2GAroUbs
+M1ybzzM4GTnlyLvbvEG/1cjLEUqIW4wEvM7HWTixxtiNMijKJcY8UPBW3xzI0Qcw
+9EWzV4dj6VCNwoaRwDnbkeWqAmJdynnejkINiBbb1Zxc2F47tf6ysSeZ+yS96Zn1
+ob9EApvdXJCt9C6eNqvF
+=PHx5
 -----END PGP SIGNATURE-----

diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
index c123ea1bc970e0cd8947a90d0f890663e8b59bc5..f6b7b327070d50c1773570c54f5dfce46031eef2 100644 (file)
--- a/sci-geosciences/qgis/qgis-1.8.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.8.0.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v 1.6 2014/11/10 15:21:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v 1.7 2014/12/26 22:08:14 pesa Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils multilib gnome2-utils cmake-utils python-single-r1
+inherit eutils gnome2-utils multilib cmake-utils python-single-r1
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
-       http://qgis.org/downloads/qgis-${PV}.tar.bz2
+SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
        examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
 
 LICENSE="GPL-2"
@@ -25,25 +24,24 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
        ${PYTHON_DEPS}
        dev-libs/expat
+       dev-qt/qtcore:4
+       dev-qt/qtgui:4
+       dev-qt/qtsvg:4
+       dev-qt/qtsql:4
+       dev-qt/qtwebkit:4
        sci-geosciences/gpsbabel
        >=sci-libs/gdal-1.6.1[geos,python?]
        sci-libs/geos
        sci-libs/gsl
        sci-libs/libspatialindex
        sci-libs/proj
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4
-       dev-qt/qtsvg:4
-       dev-qt/qtsql:4
-       dev-qt/qtwebkit:4
        x11-libs/qwt:5[svg]
        !bundled-libs? ( <x11-libs/qwtpolar-1 )
        grass? ( >=sci-geosciences/grass-6.4.0_rc6[python?] )
        postgres? ( >=virtual/postgresql-8.4 )
        python? (
                dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
-               dev-python/sip[${PYTHON_USEDEP}]
-               ${PYTHON_DEPS}
+               dev-python/sip:=[${PYTHON_USEDEP}]
        )
        spatialite? (
                dev-db/sqlite:3
@@ -80,7 +78,6 @@ src_configure() {
                $(cmake-utils_use_enable test TESTS)
                $(usex grass "-DGRASS_PREFIX=/usr/" "")
        )
-
        cmake-utils_src_configure
 }