From e5a802869b1eb1c8300176a550d290b24f347e78 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 28 Feb 2017 10:34:35 +0100
Subject: dev-python/python_orocos_kdl: Install package.xml in ros_packages and
 standard location.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 dev-python/python_orocos_kdl/files/gentoo.patch    |  3 +-
 .../python_orocos_kdl-1.3.1-r1.ebuild              | 57 ++++++++++++++++++++++
 .../python_orocos_kdl-1.3.1.ebuild                 | 57 ----------------------
 3 files changed, 59 insertions(+), 58 deletions(-)
 create mode 100644 dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild
 delete mode 100644 dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1.ebuild

(limited to 'dev-python')

diff --git a/dev-python/python_orocos_kdl/files/gentoo.patch b/dev-python/python_orocos_kdl/files/gentoo.patch
index f5e66384365b..571ee0348249 100644
--- a/dev-python/python_orocos_kdl/files/gentoo.patch
+++ b/dev-python/python_orocos_kdl/files/gentoo.patch
@@ -2,10 +2,11 @@ Index: python_orocos_kdl/CMakeLists.txt
 ===================================================================
 --- python_orocos_kdl.orig/CMakeLists.txt
 +++ python_orocos_kdl/CMakeLists.txt
-@@ -21,4 +21,4 @@ set(SIP_EXTRA_OPTIONS "-o")
+@@ -21,4 +21,5 @@ set(SIP_EXTRA_OPTIONS "-o")
  set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES})
  add_sip_python_module(PyKDL PyKDL/PyKDL.sip ${orocos_kdl_LIBRARIES})
  
 -install(FILES package.xml DESTINATION share/python_orocos_kdl)
 \ No newline at end of file
++install(FILES package.xml DESTINATION share/python_orocos_kdl)
 +install(FILES package.xml DESTINATION share/ros_packages/python_orocos_kdl)
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..227c40d706fd
--- /dev/null
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+fi
+
+inherit ${SCM} python-r1 cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+fi
+
+DESCRIPTION="Python bindings for KDL"
+HOMEPAGE="http://www.orocos.org/kdl"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-libs/orocos_kdl
+	dev-python/sip[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	S=${WORKDIR}/${P}/python_orocos_kdl
+else
+	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
+fi
+
+src_configure() {
+	python_foreach_impl cmake-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake-utils_src_install
+}
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1.ebuild
deleted file mode 100644
index 89a4b94a2885..000000000000
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-fi
-
-inherit ${SCM} python-r1 cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-fi
-
-DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="http://www.orocos.org/kdl"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-libs/orocos_kdl
-	dev-python/sip[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	S=${WORKDIR}/${P}/python_orocos_kdl
-else
-	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
-fi
-
-src_configure() {
-	python_foreach_impl cmake-utils_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
-	python_foreach_impl cmake-utils_src_install
-}
-- 
cgit v1.2.3