summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2020-10-20 04:00:00 +0000
committerMike Gilbert <floppym@gentoo.org>2020-10-20 16:35:51 -0400
commitf13e38f0cb7d1b13b57302a36fad3b3004427a02 (patch)
treed495a52753eabe218c27dfaad48667e53710735a /net-irc
parentnet-irc/kvirc: Drop support for Python 3.6. Add support for Python 3.9. (diff)
downloadgentoo-f13e38f0cb7d1b13b57302a36fad3b3004427a02.tar.gz
gentoo-f13e38f0cb7d1b13b57302a36fad3b3004427a02.tar.bz2
gentoo-f13e38f0cb7d1b13b57302a36fad3b3004427a02.zip
net-irc/kvirc: Update usage of python-utils-r1.eclass.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild8
-rw-r--r--net-irc/kvirc/kvirc-9999.ebuild8
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 6b8e708f3842..f73ede8d1ee5 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 e8d81b04f4f2..5e4569dadd03 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