[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/, dev-util/catkin/

[Alexis Ballier]

commit:     3bc8f1430d487b57c71bb0129853466b6514afba
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 12:30:48 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 12:30:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc8f143

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

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

 .../{catkin-0.6.16-r1.ebuild => catkin-0.6.16-r2.ebuild}  |  1 +
 dev-util/catkin/catkin-9999.ebuild                        |  1 +
 dev-util/catkin/files/gnuinstalldirs.patch                | 15 +++++++++++++++
 3 files changed, 17 insertions(+)

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 b4904c8..1e11494 100644
--- 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 b4904c8..1e11494 100644
--- 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
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