From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C0D82138350 for ; Sun, 9 Feb 2020 16:36:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DC24E089A; Sun, 9 Feb 2020 16:36:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDCA1E089A for ; Sun, 9 Feb 2020 16:36:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A95834E8CF for ; Sun, 9 Feb 2020 16:36:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFACB13A for ; Sun, 9 Feb 2020 16:36:32 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1581266127.bf6ba2fa05581e64b9a63a4e3f77c73f3c6218bb.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qgis/qgis-3.10.2-r1.ebuild sci-geosciences/qgis/qgis-3.10.2.ebuild sci-geosciences/qgis/qgis-3.4.12.ebuild sci-geosciences/qgis/qgis-9999.ebuild X-VCS-Directories: sci-geosciences/qgis/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bf6ba2fa05581e64b9a63a4e3f77c73f3c6218bb X-VCS-Branch: master Date: Sun, 9 Feb 2020 16:36:32 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 47dad93e-2485-4b54-9446-092387963e98 X-Archives-Hash: 2f5e399339399539798eca3b68f6f3fe commit: bf6ba2fa05581e64b9a63a4e3f77c73f3c6218bb Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 19:03:29 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 16:35:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6ba2fa sci-geosciences/qgis: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> .../{qgis-3.10.2.ebuild => qgis-3.10.2-r1.ebuild} | 34 ++++++++++++---------- sci-geosciences/qgis/qgis-3.4.12.ebuild | 34 ++++++++++++---------- sci-geosciences/qgis/qgis-9999.ebuild | 34 ++++++++++++---------- 3 files changed, 54 insertions(+), 48 deletions(-) diff --git a/sci-geosciences/qgis/qgis-3.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild similarity index 84% rename from sci-geosciences/qgis/qgis-3.10.2.ebuild rename to sci-geosciences/qgis/qgis-3.10.2-r1.ebuild index 232d4a5b49c..cc6d86b4b70 100644 --- a/sci-geosciences/qgis/qgis-3.10.2.ebuild +++ b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild @@ -73,22 +73,24 @@ COMMON_DEPEND=" postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + dev-python/httplib2[${PYTHON_MULTI_USEDEP}] + dev-python/jinja[${PYTHON_MULTI_USEDEP}] + dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] + dev-python/owslib[${PYTHON_MULTI_USEDEP}] + dev-python/pygments[${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + dev-python/pytz[${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sip:=[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) + ') ) qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild index ae1b97d37ba..d5cb18ca5d4 100644 --- a/sci-geosciences/qgis/qgis-3.4.12.ebuild +++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild @@ -71,22 +71,24 @@ COMMON_DEPEND=" postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + dev-python/httplib2[${PYTHON_MULTI_USEDEP}] + dev-python/jinja[${PYTHON_MULTI_USEDEP}] + dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] + dev-python/owslib[${PYTHON_MULTI_USEDEP}] + dev-python/pygments[${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + dev-python/pytz[${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sip:=[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) + ') ) qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 14ca3c37210..74129055f6b 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -73,22 +73,24 @@ COMMON_DEPEND=" postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + dev-python/httplib2[${PYTHON_MULTI_USEDEP}] + dev-python/jinja[${PYTHON_MULTI_USEDEP}] + dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] + dev-python/owslib[${PYTHON_MULTI_USEDEP}] + dev-python/pygments[${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + dev-python/pytz[${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sip:=[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) + ') ) qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )