dev-util/catkin: include GNUInstallDirs in all.cmake so that LIBDIR is always defined...

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

diff --git a/dev-util/catkin/catkin-0.6.16-r1.ebuild b/dev-util/catkin/catkin-0.6.16-r2.ebuild
similarity index 98%
rename from dev-util/catkin/catkin-0.6.16-r1.ebuild
rename to dev-util/catkin/catkin-0.6.16-r2.ebuild
index b4904c8bbb25e6492f6bf534ed9d919c4ff6bdf1..1e114945e04a1853b55481d0237ad37a871930b8 100644 (file)
--- a/dev-util/catkin/catkin-0.6.16-r1.ebuild
+++ b/dev-util/catkin/catkin-0.6.16-r2.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
        "${FILESDIR}/tests.patch"
        "${FILESDIR}/distutils.patch"
        "${FILESDIR}/catkin_prefix_path.patch"
+       "${FILESDIR}/gnuinstalldirs.patch"
 )
 
 src_prepare() {

diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index b4904c8bbb25e6492f6bf534ed9d919c4ff6bdf1..1e114945e04a1853b55481d0237ad37a871930b8 100644 (file)
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
        "${FILESDIR}/tests.patch"
        "${FILESDIR}/distutils.patch"
        "${FILESDIR}/catkin_prefix_path.patch"
+       "${FILESDIR}/gnuinstalldirs.patch"
 )
 
 src_prepare() {

diff --git a/dev-util/catkin/files/gnuinstalldirs.patch b/dev-util/catkin/files/gnuinstalldirs.patch
new file mode 100644 (file)
index 0000000..795eafc
--- /dev/null
+++ b/dev-util/catkin/files/gnuinstalldirs.patch
@@ -0,0 +1,15 @@
+Index: catkin-0.6.16/cmake/all.cmake
+===================================================================
+--- catkin-0.6.16.orig/cmake/all.cmake
++++ catkin-0.6.16/cmake/all.cmake
+@@ -108,6 +108,10 @@ endif()
+ # include CMake functions
+ include(CMakeParseArguments)
+ 
++# include GNUInstallDirs for LIBDIR
++# https://bugs.gentoo.org/show_bug.cgi?id=566670
++include(GNUInstallDirs)
++
+ # functions/macros: list_append_unique, safe_execute_process
+ # python-integration: catkin_python_setup.cmake, interrogate_setup_dot_py.py, templates/__init__.py.in, templates/script.py.in, templates/python_distutils_install.bat.in, templates/python_distutils_install.sh.in, templates/safe_execute_install.cmake.in
+ foreach(filename