[gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/

[Mike Gilbert]

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