From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DA3B21384B4 for ; Wed, 30 Dec 2015 17:42:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 147AC21C00F; Wed, 30 Dec 2015 17:42:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E86921C004 for ; Wed, 30 Dec 2015 17:42:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D98034072E for ; Wed, 30 Dec 2015 17:42:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8DBB750 for ; Wed, 30 Dec 2015 17:41:57 +0000 (UTC) From: "Amy Winston" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Winston" Message-ID: <1451497198.dcf5b5f7dbee28d9eaad3796ea6b368c76823a0d.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qgis/qgis-1.8.0.ebuild X-VCS-Directories: sci-geosciences/qgis/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Winston X-VCS-Revision: dcf5b5f7dbee28d9eaad3796ea6b368c76823a0d X-VCS-Branch: master Date: Wed, 30 Dec 2015 17:41:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ef9f763d-b3b4-42ea-83ab-ffc5b661575a X-Archives-Hash: 87f68ae71992fcf1d22ef0c6e80c2443 commit: dcf5b5f7dbee28d9eaad3796ea6b368c76823a0d Author: Amy Winston gentoo org> AuthorDate: Wed Dec 30 17:22:47 2015 +0000 Commit: Amy Winston gentoo org> CommitDate: Wed Dec 30 17:39:58 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf5b5f7 sci-geosciences/qgis: useflags repaired bug #508320 and bug #476460 Package-Manager: portage-2.2.24 sci-geosciences/qgis/qgis-1.8.0.ebuild | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild index 1fe1c59..5d9d726 100644 --- a/sci-geosciences/qgis/qgis-1.8.0.ebuild +++ b/sci-geosciences/qgis/qgis-1.8.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="http://qgis.org/downloads/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="bundled-libs examples gps gsl postgres python spatialite test" +IUSE="bundled-libs examples gsl postgres python spatialite test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -32,14 +32,14 @@ RDEPEND=" sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1[geos,python?] sci-libs/geos - sci-libs/gsl sci-libs/libspatialindex sci-libs/proj x11-libs/qwt:5[svg] !bundled-libs? ( =dev-db/postgresql-8.4 ) + gsl? ( sci-libs/gsl ) + postgres? ( >=dev-db/postgresql-8.4:= ) python? ( - dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}] + dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] ) spatialite? ( @@ -91,10 +91,8 @@ src_install() { 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 + "${D}"/$(python_get_sitedir)/qgis } pkg_preinst() {