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 DCB62139694 for ; Thu, 23 Feb 2017 09:45:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F01CE0DD5; Thu, 23 Feb 2017 09:45:00 +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 526CAE0DD5 for ; Thu, 23 Feb 2017 09:45:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4739B3414D6 for ; Thu, 23 Feb 2017 09:44:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9C6151AA for ; Thu, 23 Feb 2017 09:44:57 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1487843092.2eea25efd90d77eff2d6d56d6c9944097e78d615.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/catkin/catkin-0.7.6.ebuild dev-util/catkin/catkin-9999.ebuild dev-util/catkin/files/sitedir.patch X-VCS-Directories: dev-util/catkin/ dev-util/catkin/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 2eea25efd90d77eff2d6d56d6c9944097e78d615 X-VCS-Branch: master Date: Thu, 23 Feb 2017 09:44: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: a6b81496-d847-4586-8cdf-e8a2f0e09657 X-Archives-Hash: 44f7631755e28e4ccce53f423af3fb00 commit: 2eea25efd90d77eff2d6d56d6c9944097e78d615 Author: Alexis Ballier gentoo org> AuthorDate: Thu Feb 23 09:31:52 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Feb 23 09:44:52 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eea25ef dev-util/catkin: Add pypy support. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-util/catkin/catkin-0.7.6.ebuild | 3 ++- dev-util/catkin/catkin-9999.ebuild | 3 ++- dev-util/catkin/files/sitedir.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dev-util/catkin/catkin-0.7.6.ebuild b/dev-util/catkin/catkin-0.7.6.ebuild index 206cc51814..2bce0e1b50 100644 --- a/dev-util/catkin/catkin-0.7.6.ebuild +++ b/dev-util/catkin/catkin-0.7.6.ebuild @@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/ros/catkin" fi -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) inherit ${SCM} cmake-utils python-r1 python-utils-r1 @@ -43,6 +43,7 @@ PATCHES=( "${FILESDIR}/catkin_prefix_path_util_py.patch" "${FILESDIR}/package_xml.patch" "${FILESDIR}/etc.patch" + "${FILESDIR}/sitedir.patch" ) src_prepare() { diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild index 206cc51814..2bce0e1b50 100644 --- a/dev-util/catkin/catkin-9999.ebuild +++ b/dev-util/catkin/catkin-9999.ebuild @@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/ros/catkin" fi -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) inherit ${SCM} cmake-utils python-r1 python-utils-r1 @@ -43,6 +43,7 @@ PATCHES=( "${FILESDIR}/catkin_prefix_path_util_py.patch" "${FILESDIR}/package_xml.patch" "${FILESDIR}/etc.patch" + "${FILESDIR}/sitedir.patch" ) src_prepare() { diff --git a/dev-util/catkin/files/sitedir.patch b/dev-util/catkin/files/sitedir.patch new file mode 100644 index 0000000000..61fcad29d0 --- /dev/null +++ b/dev-util/catkin/files/sitedir.patch @@ -0,0 +1,15 @@ +Pass --install-lib to setup.py install. +pypy installs in /usr/site-packages otherwise... + +Index: catkin-0.7.6/cmake/templates/python_distutils_install.sh.in +=================================================================== +--- catkin-0.7.6.orig/cmake/templates/python_distutils_install.sh.in ++++ catkin-0.7.6/cmake/templates/python_distutils_install.sh.in +@@ -30,4 +30,6 @@ echo_and_run /usr/bin/env \ + build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \ + install \ + $DESTDIR_ARG \ +- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" ++ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" \ ++ --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" \ ++ --install-lib="@CMAKE_INSTALL_PREFIX@/@PYTHON_INSTALL_DIR@"