From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1216627-garchives=archives.gentoo.org@lists.gentoo.org> 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 C1DE213835B for <garchives@archives.gentoo.org>; Tue, 20 Oct 2020 20:36:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C302E0AC8; Tue, 20 Oct 2020 20:36:02 +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 84DA4E0AC8 for <gentoo-commits@lists.gentoo.org>; Tue, 20 Oct 2020 20:36:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 56A1733BDE4 for <gentoo-commits@lists.gentoo.org>; Tue, 20 Oct 2020 20:36:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0DC73B3 for <gentoo-commits@lists.gentoo.org>; Tue, 20 Oct 2020 20:35:59 +0000 (UTC) From: "Mike Gilbert" <floppym@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org> Message-ID: <1603226151.f13e38f0cb7d1b13b57302a36fad3b3004427a02.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild net-irc/kvirc/kvirc-9999.ebuild X-VCS-Directories: net-irc/kvirc/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: f13e38f0cb7d1b13b57302a36fad3b3004427a02 X-VCS-Branch: master Date: Tue, 20 Oct 2020 20:35:59 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1852441-8679-4d4c-8ef8-4aca7de9d3a2 X-Archives-Hash: 887461affd8c0f0a8bf9b9cacba1fad4 commit: f13e38f0cb7d1b13b57302a36fad3b3004427a02 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Tue Oct 20 04:00:00 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Oct 20 20:35:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13e38f0 net-irc/kvirc: Update usage of python-utils-r1.eclass. Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild | 8 +++----- net-irc/kvirc/kvirc-9999.ebuild | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild index 6b8e708f384..f73ede8d1ee 100644 --- a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild +++ b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild @@ -67,8 +67,8 @@ DEPEND="dev-qt/qtcore:5 python? ( ${PYTHON_DEPS} ) spell? ( app-text/enchant:0= ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) ) theora? ( media-libs/libogg @@ -141,11 +141,9 @@ src_configure() { -DWANT_QTSVG=OFF ) if use python; then - local PYTHON_INCLUDEDIR PYTHON_LIBPATH - python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH mycmakeargs+=( - -DPython3_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" - -DPython3_LIBRARY="${PYTHON_LIBPATH}" + -DPython3_INCLUDE_DIR="$(python_get_includedir)" + -DPython3_LIBRARY="$(python_get_library_path)" ) fi diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild index e8d81b04f4f..5e4569dadd0 100644 --- a/net-irc/kvirc/kvirc-9999.ebuild +++ b/net-irc/kvirc/kvirc-9999.ebuild @@ -67,8 +67,8 @@ DEPEND="dev-qt/qtcore:5 python? ( ${PYTHON_DEPS} ) spell? ( app-text/enchant:0= ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) ) theora? ( media-libs/libogg @@ -141,11 +141,9 @@ src_configure() { -DWANT_QTSVG=OFF ) if use python; then - local PYTHON_INCLUDEDIR PYTHON_LIBPATH - python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH mycmakeargs+=( - -DPython3_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" - -DPython3_LIBRARY="${PYTHON_LIBPATH}" + -DPython3_INCLUDE_DIR="$(python_get_includedir)" + -DPython3_LIBRARY="$(python_get_library_path)" ) fi