net-irc/kvirc: Update ebuild. Use cmake.eclass.
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Fri, 17 Jan 2020 18:07:32 +0000 (18:07 +0000)
committerMike Gilbert <floppym@gentoo.org>
Fri, 17 Jan 2020 19:08:55 +0000 (14:08 -0500)
https://github.com/kvirc/KVIrc/commit/2c881f711d518bbe4db95bf183ddc946c12f7751

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
net-irc/kvirc/kvirc-9999.ebuild

index 76c8d1a158fd890b774ad7f88dc2c5cbdf64d43d..8be4b3e7e2e9deaa92cce23ced0ce3ac8b4abee7 100644 (file)
@@ -1,11 +1,11 @@
-# Copyright 2009-2019 Gentoo Authors
+# Copyright 2009-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 CMAKE_MAKEFILE_GENERATOR="emake"
 PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
-inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
+inherit cmake flag-o-matic python-single-r1 xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
        inherit git-r3
@@ -34,6 +34,7 @@ IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="dev-lang/perl:0
+       >=dev-util/cmake-3.16
        virtual/pkgconfig
        doc? ( app-doc/doxygen )
        kde? ( kde-frameworks/extra-cmake-modules:5 )
@@ -79,10 +80,6 @@ if [[ "${PV}" != "9999" ]]; then
        S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
 fi
 
-PATCHES=(
-       "${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
-)
-
 DOCS=()
 
 pkg_setup() {
@@ -92,7 +89,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        if [[ "${PV}" == "9999" ]]; then
                KVIRC_GIT_REVISION="$(git show -s --format=%H)"
@@ -140,20 +137,28 @@ src_configure() {
                # COMPILE_SVG_SUPPORT not used in source code.
                -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}"
+               )
+       fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 
        if use doc; then
-               cmake-utils_src_compile devdocs
+               cmake_src_compile devdocs
        fi
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use doc; then
                (