From: Alexis Ballier <aballier@gentoo.org>
Date: Mon, 28 Nov 2016 13:55:54 +0000 (+0100)
Subject: dev-util/catkin: set global etc destination to /etc, part of bug #598537
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b33ece56c59ae0b1c186af967c552efaa9dcd361;p=gentoo.git

dev-util/catkin: set global etc destination to /etc, part of bug #598537

Package-Manager: portage-2.3.2
---

diff --git a/dev-util/catkin/catkin-0.7.4.ebuild b/dev-util/catkin/catkin-0.7.4-r1.ebuild
similarity index 99%
rename from dev-util/catkin/catkin-0.7.4.ebuild
rename to dev-util/catkin/catkin-0.7.4-r1.ebuild
index ada4a5e9254e..c98407801d62 100644
--- a/dev-util/catkin/catkin-0.7.4.ebuild
+++ b/dev-util/catkin/catkin-0.7.4-r1.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/gnuinstalldirs.patch"
 	"${FILESDIR}/catkin_prefix_path_util_py.patch"
 	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
 )
 
 src_prepare() {
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index ada4a5e9254e..c98407801d62 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/gnuinstalldirs.patch"
 	"${FILESDIR}/catkin_prefix_path_util_py.patch"
 	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
 )
 
 src_prepare() {
diff --git a/dev-util/catkin/files/etc.patch b/dev-util/catkin/files/etc.patch
new file mode 100644
index 000000000000..205aca92b62a
--- /dev/null
+++ b/dev-util/catkin/files/etc.patch
@@ -0,0 +1,13 @@
+Index: catkin-0.7.4/cmake/all.cmake
+===================================================================
+--- catkin-0.7.4.orig/cmake/all.cmake
++++ catkin-0.7.4/cmake/all.cmake
+@@ -163,7 +163,7 @@ unset(_CATKIN_CURRENT_PACKAGE)
+ 
+ # set global install destinations
+ set(CATKIN_GLOBAL_BIN_DESTINATION bin)
+-set(CATKIN_GLOBAL_ETC_DESTINATION etc)
++set(CATKIN_GLOBAL_ETC_DESTINATION ../etc)
+ set(CATKIN_GLOBAL_INCLUDE_DESTINATION include)
+ set(CATKIN_GLOBAL_LIB_DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ set(CATKIN_GLOBAL_LIBEXEC_DESTINATION libexec)