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 B412B138334 for ; Sun, 21 Apr 2019 11:31:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAE74E08D1; Sun, 21 Apr 2019 11:31:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 930ABE08D1 for ; Sun, 21 Apr 2019 11:31:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B960341BE9 for ; Sun, 21 Apr 2019 11:31:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78F3F5BD for ; Sun, 21 Apr 2019 11:31:35 +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: <1555846256.b59c06bbdbec6b256da79694928c72c121850fd6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ki18n/files/, kde-frameworks/ki18n/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch kde-frameworks/ki18n/ki18n-5.57.0.ebuild X-VCS-Directories: kde-frameworks/ki18n/files/ kde-frameworks/ki18n/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b59c06bbdbec6b256da79694928c72c121850fd6 X-VCS-Branch: master Date: Sun, 21 Apr 2019 11:31:35 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d6678df-f7fe-4f31-a136-725e3117b5df X-Archives-Hash: d2421aed411c4ab8b9018343c60f6433 commit: b59c06bbdbec6b256da79694928c72c121850fd6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 20 19:04:17 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 11:30:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b59c06bb kde-frameworks/ki18n: Fix build with python2_7 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch | 11 +++++++++++ kde-frameworks/ki18n/ki18n-5.57.0.ebuild | 2 ++ 2 files changed, 13 insertions(+) diff --git a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch new file mode 100644 index 00000000000..8b863e4e0fc --- /dev/null +++ b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch @@ -0,0 +1,11 @@ +--- a/cmake/KF5I18nMacros.cmake.in 2019-04-07 09:28:26.000000000 +0200 ++++ b/cmake/KF5I18nMacros.cmake.in 2019-04-20 20:56:41.628484762 +0200 +@@ -31,7 +31,7 @@ + # solution if it cannot be found in $PATH when building applications. + set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@") + +-find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python) ++find_program(KI18N_PYTHON_EXECUTABLE NAMES python) + if(NOT KI18N_PYTHON_EXECUTABLE) + set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}") + endif() diff --git a/kde-frameworks/ki18n/ki18n-5.57.0.ebuild b/kde-frameworks/ki18n/ki18n-5.57.0.ebuild index 0793540bf12..cd5cad14afb 100644 --- a/kde-frameworks/ki18n/ki18n-5.57.0.ebuild +++ b/kde-frameworks/ki18n/ki18n-5.57.0.ebuild @@ -22,6 +22,8 @@ DEPEND="${RDEPEND} test? ( $(add_qt_dep qtconcurrent) ) " +PATCHES=( "${FILESDIR}/${P}-python.patch" ) + pkg_setup() { kde5_pkg_setup python-single-r1_pkg_setup