[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/

[Alexis Ballier]

commit:     008d1bf0f3319806bc22f82d50ad9e9b5420a159
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 17:07:33 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 17:46:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=008d1bf0

dev-util/catkin: Pass PYTHON_INSTALL_DIR to cmake too.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/catkin/catkin-0.7.4-r1.ebuild | 8 ++++++--
 dev-util/catkin/catkin-9999.ebuild     | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dev-util/catkin/catkin-0.7.4-r1.ebuild 
b/dev-util/catkin/catkin-0.7.4-r1.ebuild
index c98407801d..6dda0014e8 100644
--- a/dev-util/catkin/catkin-0.7.4-r1.ebuild
+++ b/dev-util/catkin/catkin-0.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -58,7 +58,11 @@ src_prepare() {
 }
 
 catkin_src_configure_internal() {
-       mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+       local sitedir="$(python_get_sitedir)"
+       mycmakeargs+=(
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+       )
        python_export PYTHON_SCRIPTDIR
        cmake-utils_src_configure
 }

diff --git a/dev-util/catkin/catkin-9999.ebuild 
b/dev-util/catkin/catkin-9999.ebuild
index c98407801d..6dda0014e8 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -58,7 +58,11 @@ src_prepare() {
 }
 
 catkin_src_configure_internal() {
-       mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+       local sitedir="$(python_get_sitedir)"
+       mycmakeargs+=(
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+       )
        python_export PYTHON_SCRIPTDIR
        cmake-utils_src_configure
 }