commit: 5b240aa12260678c766f1f7cc19ec7e405ff4440
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 2 12:00:40 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Nov 2 12:00:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b240aa1
dev-ros/xmlrpcpp: Install headers in a prefixed directory.
Fixes collisions with heimdal, bug #561208.
Package-Manager: portage-2.2.23
dev-ros/xmlrpcpp/files/headers.patch | 15 +++++++++++++++
...xmlrpcpp-1.11.15.ebuild => xmlrpcpp-1.11.15-r1.ebuild} | 8 ++++++++
dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild | 8 ++++++++
3 files changed, 31 insertions(+)
diff --git a/dev-ros/xmlrpcpp/files/headers.patch
b/dev-ros/xmlrpcpp/files/headers.patch
new file mode 100644
index 0000000..ed0cea6
--- /dev/null
+++ b/dev-ros/xmlrpcpp/files/headers.patch
@@ -0,0 +1,15 @@
+Index: ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt
+===================================================================
+--- ros_comm-1.11.15.orig/utilities/xmlrpcpp/CMakeLists.txt
++++ ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt
+@@ -30,9 +30,8 @@ if(WIN32)
+ target_link_libraries(xmlrpcpp ws2_32)
+ endif()
+
+-# FIXME the headers should be in a package-specific subfolder but can not be
for backward compatibility
+ install(DIRECTORY include/
+- DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
++ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+ FILES_MATCHING PATTERN "*.h")
+
+ install(TARGETS xmlrpcpp
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild
b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild
similarity index 54%
rename from dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild
rename to dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild
index a0ae0fd..b4772f1 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild
@@ -17,3 +17,11 @@ IUSE=""
RDEPEND="dev-ros/cpp_common"
DEPEND="${RDEPEND}"
+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\"#" \
+ -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 a0ae0fd..b4772f1 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
@@ -17,3 +17,11 @@ IUSE=""
RDEPEND="dev-ros/cpp_common"
DEPEND="${RDEPEND}"
+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\"#" \
+ -i
"${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die
+}
