From f44f9b521150adead631fdee000f8136f29fb977 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 28 Feb 2017 11:41:51 +0100
Subject: sci-libs/orocos_kdl: Install package.xml in our custom gentoo path
 from ebuild instead of patching

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 sci-libs/orocos_kdl/files/gentoo.patch         | 10 ----
 sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild | 72 ++++++++++++++++++++++++++
 sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild    | 69 ------------------------
 sci-libs/orocos_kdl/orocos_kdl-9999.ebuild     |  7 ++-
 4 files changed, 77 insertions(+), 81 deletions(-)
 delete mode 100644 sci-libs/orocos_kdl/files/gentoo.patch
 create mode 100644 sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
 delete mode 100644 sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild

diff --git a/sci-libs/orocos_kdl/files/gentoo.patch b/sci-libs/orocos_kdl/files/gentoo.patch
deleted file mode 100644
index 3766e12f589b..000000000000
--- a/sci-libs/orocos_kdl/files/gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: orocos_kdl/CMakeLists.txt
-===================================================================
---- orocos_kdl.orig/CMakeLists.txt
-+++ orocos_kdl/CMakeLists.txt
-@@ -114,4 +114,4 @@ INSTALL(FILES ${PROJECT_BINARY_DIR}/oroc
- INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake DESTINATION share/orocos_kdl)
- INSTALL(EXPORT OrocosKDLTargets DESTINATION share/orocos_kdl)
- 
--INSTALL(FILES package.xml DESTINATION share/orocos_kdl)
-+INSTALL(FILES package.xml DESTINATION share/ros_packages/orocos_kdl)
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..8207c1ea2f3c
--- /dev/null
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+fi
+
+inherit ${SCM} 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="Kinematics and Dynamics Library (KDL)"
+HOMEPAGE="http://www.orocos.org/kdl"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc test examples models"
+
+RDEPEND="dev-cpp/eigen:3"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )
+	doc? ( app-doc/doxygen )"
+REQUIRED_USE="examples? ( models )"
+
+DOCS=( README )
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	S=${WORKDIR}/${P}/orocos_kdl
+else
+	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/orocos_kdl
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake-utils_use_enable test TESTS)"
+		"$(cmake-utils_use_enable examples EXAMPLES)"
+		"-DBUILD_MODELS=$(usex models ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	cd "${BUILD_DIR}"
+	use doc && emake docs
+}
+
+src_test() {
+	cd "${BUILD_DIR}"
+	emake check
+}
+
+src_install() {
+	cmake-utils_src_install
+	cd "${BUILD_DIR}"
+	use doc && dohtml -r doc/api/html/*
+	use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
+
+	# Need to have package.xml in our custom gentoo path
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild
deleted file mode 100644
index fac689144b57..000000000000
--- a/sci-libs/orocos_kdl/orocos_kdl-1.3.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-fi
-
-inherit ${SCM} 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="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="http://www.orocos.org/kdl"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc test examples models"
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )
-	doc? ( app-doc/doxygen )"
-REQUIRED_USE="examples? ( models )"
-
-DOCS=( README )
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	S=${WORKDIR}/${P}/orocos_kdl
-else
-	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/orocos_kdl
-fi
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use_enable test TESTS)"
-		"$(cmake-utils_use_enable examples EXAMPLES)"
-		"-DBUILD_MODELS=$(usex models ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake docs
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-	emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/api/html/*
-	use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
-}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index fac689144b57..8207c1ea2f3c 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-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$
 
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="examples? ( models )"
 
 DOCS=( README )
-PATCHES=( "${FILESDIR}/gentoo.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	S=${WORKDIR}/${P}/orocos_kdl
@@ -66,4 +65,8 @@ src_install() {
 	cd "${BUILD_DIR}"
 	use doc && dohtml -r doc/api/html/*
 	use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
+
+	# Need to have package.xml in our custom gentoo path
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
 }
-- 
cgit v1.2.3-65-gdbad