commit: b33ece56c59ae0b1c186af967c552efaa9dcd361 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Mon Nov 28 13:55:54 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Mon Nov 28 15:04:28 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33ece56
dev-util/catkin: set global etc destination to /etc, part of bug #598537 Package-Manager: portage-2.3.2 .../catkin/{catkin-0.7.4.ebuild => catkin-0.7.4-r1.ebuild} | 1 + dev-util/catkin/catkin-9999.ebuild | 1 + dev-util/catkin/files/etc.patch | 13 +++++++++++++ 3 files changed, 15 insertions(+) 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 ada4a5e..c984078 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 ada4a5e..c984078 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 00000000..205aca9 --- /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)