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 A5498139694 for ; Tue, 18 Apr 2017 18:22:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6D2BE0E57; Tue, 18 Apr 2017 18:22:40 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93D0AE0E57 for ; Tue, 18 Apr 2017 18:22:40 +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 548653416BF for ; Tue, 18 Apr 2017 18:22:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C7E273F3 for ; Tue, 18 Apr 2017 18:22:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1492539747.3d2f3b95a33db7b630e93463583b1e8b23312e89.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/ros-catkin.eclass X-VCS-Directories: eclass/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3d2f3b95a33db7b630e93463583b1e8b23312e89 X-VCS-Branch: master Date: Tue, 18 Apr 2017 18:22:37 +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: 5d64fd68-a74e-48d9-9e12-7468b624c945 X-Archives-Hash: 38cd448571941d1c7609bb180d524d56 commit: 3d2f3b95a33db7b630e93463583b1e8b23312e89 Author: David Seifert gentoo org> AuthorDate: Tue Apr 18 17:57:39 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Apr 18 18:22:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d2f3b95 ros-catkin.eclass: Fix python handling * Add missing REQUIRED_USE which otherwise could lead to spurious failures during the build. * Do not directly depend on dev-lang/python-exec, this is done properly via ${PYTHON_DEPS}. * python-utils-r1 never needs to be inherited explicitly. Closes: https://github.com/gentoo/gentoo/pull/4444 eclass/ros-catkin.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index fec873a922c..feb626341eb 100644 --- a/eclass/ros-catkin.eclass +++ b/eclass/ros-catkin.eclass @@ -48,7 +48,7 @@ fi PYTHON_ECLASS="" CATKIN_PYTHON_USEDEP="" if [ -n "${PYTHON_COMPAT}" ] ; then - PYTHON_ECLASS="python-r1 python-utils-r1" + PYTHON_ECLASS="python-r1" fi inherit ${SCM} ${PYTHON_ECLASS} cmake-utils flag-o-matic @@ -57,6 +57,7 @@ CATKIN_DO_PYTHON_MULTIBUILD="" if [ -n "${PYTHON_COMPAT}" ] ; then CATKIN_PYTHON_USEDEP="[${PYTHON_USEDEP}]" CATKIN_DO_PYTHON_MULTIBUILD="yes" + REQUIRED_USE="${PYTHON_REQUIRED_USE}" fi IUSE="test" @@ -67,7 +68,7 @@ RDEPEND=" DEPEND="${RDEPEND}" if [ -n "${CATKIN_DO_PYTHON_MULTIBUILD}" ] ; then - RDEPEND="${RDEPEND} dev-lang/python-exec:2 ${PYTHON_DEPS}" + RDEPEND="${RDEPEND} ${PYTHON_DEPS}" DEPEND="${DEPEND} ${PYTHON_DEPS}" fi