[gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/

[Andreas Sturmlechner]

commit:     9be309db2b2c026522ff84601e8cef1c8a1eb9d3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 21:03:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 23:34:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be309db

kde-apps/cantor: Fix bashism

Gentoo-bug: 596940
Thanks-to: Michael Palimaka (kensington)

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.2.ebuild              |  2 ++
 kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild b/kde-apps/cantor/cantor-16.12.2.ebuild
index 96540cab7f..a1f359a35e 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}"
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}"/${P}-bashism.patch )
+
 pkg_pretend() {
 	kde5_pkg_pretend
 

diff --git a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
new file mode 100644
index 0000000000..424ca4d15a
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake
+index 6303417..6494884 100644
+--- a/cmake/FindR.cmake
++++ b/cmake/FindR.cmake
+@@ -31,7 +31,7 @@ IF(R_EXECUTABLE)
+         OUTPUT_VARIABLE R_INCLUDE_DIR)
+     ELSE(WIN32)
+       EXECUTE_PROCESS(
+-        COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR"
++        COMMAND ${R_EXECUTABLE} CMD sh -c "printf $R_INCLUDE_DIR"
+         OUTPUT_VARIABLE R_INCLUDE_DIR)
+     ENDIF(WIN32)
+   ENDIF(NOT R_INCLUDE_DIR)