From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 407B4139696 for ; Sat, 11 Feb 2017 21:26:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B53EE0C41; Sat, 11 Feb 2017 21:25:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D88E6E0C41 for ; Sat, 11 Feb 2017 21:25:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2BE4341236 for ; Sat, 11 Feb 2017 21:25:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2EC54485 for ; Sat, 11 Feb 2017 21:25:55 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1486847030.17df09aa6b27fc8df525472ce8d227ae7f4834f1.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/, kde-apps/cantor/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/cantor/cantor-16.12.49.9999.ebuild kde-apps/cantor/cantor-9999.ebuild kde-apps/cantor/files/cantor-16.12.2-bashism.patch X-VCS-Directories: kde-apps/cantor/ kde-apps/cantor/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 17df09aa6b27fc8df525472ce8d227ae7f4834f1 X-VCS-Branch: master Date: Sat, 11 Feb 2017 21:25:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4478e99d-ae0c-43cd-adf0-4c67c680f5b1 X-Archives-Hash: 02b1adb11a6d45c766ee326391f2a6e0 commit: 17df09aa6b27fc8df525472ce8d227ae7f4834f1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 11 21:03:50 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 11 21:03:50 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=17df09aa 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.49.9999.ebuild | 2 ++ kde-apps/cantor/cantor-9999.ebuild | 2 ++ kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 +++++++++++++ 3 files changed, 17 insertions(+) diff --git a/kde-apps/cantor/cantor-16.12.49.9999.ebuild b/kde-apps/cantor/cantor-16.12.49.9999.ebuild index 8952906c50..0db7d4c646 100644 --- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild +++ b/kde-apps/cantor/cantor-16.12.49.9999.ebuild @@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}" RESTRICT+=" test" +PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch ) + pkg_pretend() { kde5_pkg_pretend diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild index 8952906c50..0db7d4c646 100644 --- a/kde-apps/cantor/cantor-9999.ebuild +++ b/kde-apps/cantor/cantor-9999.ebuild @@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}" RESTRICT+=" test" +PATCHES=( "${FILESDIR}"/${PN}-16.12.2-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)