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 F4149138350 for ; Sun, 9 Feb 2020 15:54:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFA82E084A; Sun, 9 Feb 2020 15:54:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7DEB1E084A for ; Sun, 9 Feb 2020 15:54:30 +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 28CAF34E8B8 for ; Sun, 9 Feb 2020 15:54:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC45F126 for ; Sun, 9 Feb 2020 15:54:26 +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: <1581263657.ab0afda12a94a22da7afdfb42bcd6f2f6c0742f8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/basemap/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/basemap/basemap-1.0.7-r1.ebuild dev-python/basemap/basemap-1.0.7-r2.ebuild dev-python/basemap/basemap-1.0.7-r3.ebuild dev-python/basemap/basemap-1.0.7-r4.ebuild X-VCS-Directories: dev-python/basemap/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ab0afda12a94a22da7afdfb42bcd6f2f6c0742f8 X-VCS-Branch: master Date: Sun, 9 Feb 2020 15:54:26 +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: c55e6638-ca3b-4005-b6ce-8e49bc058e4e X-Archives-Hash: 169342154a07732265e172f796eed6e7 commit: ab0afda12a94a22da7afdfb42bcd6f2f6c0742f8 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 8 11:26:34 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 15:54:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0afda1 dev-python/basemap: Switch to python-single-r1 basemap needs to be single-r1 since its dependency sci-libs/geos is. Signed-off-by: Michał Górny gentoo.org> ...map-1.0.7-r1.ebuild => basemap-1.0.7-r2.ebuild} | 28 ++++++++++++---------- ...map-1.0.7-r3.ebuild => basemap-1.0.7-r4.ebuild} | 28 ++++++++++++---------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild similarity index 79% rename from dev-python/basemap/basemap-1.0.7-r1.ebuild rename to dev-python/basemap/basemap-1.0.7-r2.ebuild index 21c1f248697..f6f47617922 100644 --- a/dev-python/basemap/basemap-1.0.7-r1.ebuild +++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild @@ -3,6 +3,7 @@ EAPI=5 +DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 flag-o-matic @@ -16,20 +17,21 @@ SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" LICENSE="MIT GPL-2" -CDEPEND="sci-libs/shapelib - || ( - >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}] - >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}] - ) - >=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]" +DEPEND="sci-libs/shapelib + $(python_gen_cond_dep ' + || ( + >=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}] + >=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}] + ) + ') + >=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]" -DEPEND="${CDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -RDEPEND="${CDEPEND} - >=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/dap[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} + $(python_gen_cond_dep ' + >=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}] + dev-python/httplib2[${PYTHON_MULTI_USEDEP}] + dev-python/dap[${PYTHON_MULTI_USEDEP}] + ')" DOCS="FAQ API_CHANGES" #REQUIRED_USE="test? ( examples )" diff --git a/dev-python/basemap/basemap-1.0.7-r3.ebuild b/dev-python/basemap/basemap-1.0.7-r4.ebuild similarity index 79% rename from dev-python/basemap/basemap-1.0.7-r3.ebuild rename to dev-python/basemap/basemap-1.0.7-r4.ebuild index 97bcfc3f839..38c0bfb4645 100644 --- a/dev-python/basemap/basemap-1.0.7-r3.ebuild +++ b/dev-python/basemap/basemap-1.0.7-r4.ebuild @@ -3,6 +3,7 @@ EAPI=5 +DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 flag-o-matic @@ -16,20 +17,21 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" LICENSE="MIT GPL-2" -CDEPEND="sci-libs/shapelib - || ( - >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}] - >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}] - ) - >=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]" +DEPEND="sci-libs/shapelib + $(python_gen_cond_dep ' + || ( + >=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}] + >=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}] + ) + ') + >=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]" -DEPEND="${CDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -RDEPEND="${CDEPEND} - >=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/dap[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} + $(python_gen_cond_dep ' + >=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}] + dev-python/httplib2[${PYTHON_MULTI_USEDEP}] + dev-python/dap[${PYTHON_MULTI_USEDEP}] + ')" DOCS="FAQ API_CHANGES" #REQUIRED_USE="test? ( examples )"