From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B37EF59CA9 for ; Thu, 31 Mar 2016 04:13:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B67B21C018; Thu, 31 Mar 2016 04:13:05 +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 148C021C018 for ; Thu, 31 Mar 2016 04:13:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B99C5340D58 for ; Thu, 31 Mar 2016 04:13:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC9A285E for ; Thu, 31 Mar 2016 04:13:00 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1459397493.df259a18b9224191c6c409c7027d265469e9812c.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/weechat/weechat-1.4-r1.ebuild net-irc/weechat/weechat-9999.ebuild X-VCS-Directories: net-irc/weechat/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: df259a18b9224191c6c409c7027d265469e9812c X-VCS-Branch: master Date: Thu, 31 Mar 2016 04:13:00 +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: 0480e883-57a3-4b8c-84f9-7c2c3c388a8a X-Archives-Hash: 95b5767b4f071b567b1205fe619d3074 commit: df259a18b9224191c6c409c7027d265469e9812c Author: Tim Harder gentoo org> AuthorDate: Thu Mar 31 04:06:50 2016 +0000 Commit: Tim Harder gentoo org> CommitDate: Thu Mar 31 04:11:33 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df259a18 net-irc/weechat: respect PYTHON_SINGLE_TARGET setting Previously it would only build against python2.7. Patch thanks to Oleg in bug #577638. .../weechat/{weechat-9999.ebuild => weechat-1.4-r1.ebuild} | 12 +++++++++--- net-irc/weechat/weechat-9999.ebuild | 10 ++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-1.4-r1.ebuild similarity index 94% copy from net-irc/weechat/weechat-9999.ebuild copy to net-irc/weechat/weechat-1.4-r1.ebuild index da16374..a348523 100644 --- a/net-irc/weechat/weechat-9999.ebuild +++ b/net-irc/weechat/weechat-1.4-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/weechat/weechat.git" else SRC_URI="https://weechat.org/files/src/${P}.tar.bz2" - KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Portable and multi-interface IRC client" @@ -107,7 +107,6 @@ src_configure() { "-DENABLE_DEMO=OFF" "-DENABLE_GTK=OFF" "-DENABLE_JAVASCRIPT=OFF" - "-DPYTHON_EXECUTABLE=${PYTHON}" $(cmake-utils_use_enable alias) $(cmake-utils_use_enable doc) $(cmake-utils_use_enable charset) @@ -131,7 +130,14 @@ src_configure() { $(cmake-utils_use_enable trigger) $(cmake-utils_use_enable xfer) ) - [[ ${EPYTHON} == python3* ]] && mycmakeargs+=( $(cmake-utils_use_enable python PYTHON3) ) + + if use python; then + python_export PYTHON_LIBPATH + mycmakeargs+=( + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_LIBRARY="${PYTHON_LIBPATH}" + ) + fi cmake-utils_src_configure } diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild index da16374..2c9d55e 100644 --- a/net-irc/weechat/weechat-9999.ebuild +++ b/net-irc/weechat/weechat-9999.ebuild @@ -107,7 +107,6 @@ src_configure() { "-DENABLE_DEMO=OFF" "-DENABLE_GTK=OFF" "-DENABLE_JAVASCRIPT=OFF" - "-DPYTHON_EXECUTABLE=${PYTHON}" $(cmake-utils_use_enable alias) $(cmake-utils_use_enable doc) $(cmake-utils_use_enable charset) @@ -131,7 +130,14 @@ src_configure() { $(cmake-utils_use_enable trigger) $(cmake-utils_use_enable xfer) ) - [[ ${EPYTHON} == python3* ]] && mycmakeargs+=( $(cmake-utils_use_enable python PYTHON3) ) + + if use python; then + python_export PYTHON_LIBPATH + mycmakeargs+=( + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_LIBRARY="${PYTHON_LIBPATH}" + ) + fi cmake-utils_src_configure }