From: Alexis Ballier <aballier@gentoo.org>
Date: Sat, 14 Nov 2015 11:39:38 +0000 (+0100)
Subject: dev-ros/xmlrpcpp: do not leak SYSROOT in installed files. cmake should handle offsett... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9d83501b0fa7b2d126f14ae065e0634c8cbfbc27;p=gentoo.git

dev-ros/xmlrpcpp: do not leak SYSROOT in installed files. cmake should handle offsetting it properly.

Package-Manager: portage-2.2.24
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---

diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild
index b4772f1846dc..806b8bca772f 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild
@@ -22,6 +22,6 @@ PATCHES=( "${FILESDIR}/headers.patch" )
 src_configure() {
 	ros-catkin_src_configure
 	# Hack so that proper -I are added
-	sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${SYSROOT:-${EPREFIX}}/usr/include/xmlrpcpp\"#" \
+	sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${EPREFIX}/usr/include/xmlrpcpp\"#" \
 		-i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" ||	die
 }
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
index b4772f1846dc..806b8bca772f 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
@@ -22,6 +22,6 @@ PATCHES=( "${FILESDIR}/headers.patch" )
 src_configure() {
 	ros-catkin_src_configure
 	# Hack so that proper -I are added
-	sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${SYSROOT:-${EPREFIX}}/usr/include/xmlrpcpp\"#" \
+	sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${EPREFIX}/usr/include/xmlrpcpp\"#" \
 		-i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" ||	die
 }