commit:     0f26d1d5372e5f6aa500708b3a1e38fa4743aa3e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 18:42:51 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 18:42:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0f26d1d5

kde-apps/kdebase-kioslaves: EAPI 6

Package-Manager: portage-2.2.28

 .../kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild    | 15 ++++++++-------
 .../kdebase-kioslaves-16.04.49.9999.ebuild                | 15 ++++++++-------
 kde-apps/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild  | 15 ++++++++-------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild 
b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild
index 9de3765..55f7c49 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"
@@ -40,12 +40,13 @@ KMEXTRA="
 src_configure() {
        local mycmakeargs=(
                -DWITH_SLP=OFF
-               $(cmake-utils_use_with bzip2 BZip2)
-               $(cmake-utils_use_with exif Exiv2)
-               $(cmake-utils_use_with lzma LibLZMA)
-               $(cmake-utils_use_with openexr OpenEXR)
-               $(cmake-utils_use_with samba)
-               $(cmake-utils_use_with sftp LibSSH)
+               -DWITH_BZip2=$(usex bzip2)
+               -DWITH_Exiv2=$(usex exif)
+               -DWITH_LibLZMA=$(usex lzma)
+               -DWITH_OpenEXR=$(usex openexr)
+               -DWITH_Samba=$(usex samba)
+               -DWITH_LibSSH=$(usex sftp)
        )
+
        kde4-meta_src_configure
 }

diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.49.9999.ebuild 
b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.49.9999.ebuild
index a7247cf..a4cbb13 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.49.9999.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"
@@ -40,12 +40,13 @@ KMEXTRA="
 src_configure() {
        local mycmakeargs=(
                -DWITH_SLP=OFF
-               $(cmake-utils_use_with bzip2 BZip2)
-               $(cmake-utils_use_with exif Exiv2)
-               $(cmake-utils_use_with lzma LibLZMA)
-               $(cmake-utils_use_with openexr OpenEXR)
-               $(cmake-utils_use_with samba)
-               $(cmake-utils_use_with sftp LibSSH)
+               -DWITH_BZip2=$(usex bzip2)
+               -DWITH_Exiv2=$(usex exif)
+               -DWITH_LibLZMA=$(usex lzma)
+               -DWITH_OpenEXR=$(usex openexr)
+               -DWITH_Samba=$(usex samba)
+               -DWITH_LibSSH=$(usex sftp)
        )
+
        kde4-meta_src_configure
 }

diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild 
b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
index a7247cf..a4cbb13 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"
@@ -40,12 +40,13 @@ KMEXTRA="
 src_configure() {
        local mycmakeargs=(
                -DWITH_SLP=OFF
-               $(cmake-utils_use_with bzip2 BZip2)
-               $(cmake-utils_use_with exif Exiv2)
-               $(cmake-utils_use_with lzma LibLZMA)
-               $(cmake-utils_use_with openexr OpenEXR)
-               $(cmake-utils_use_with samba)
-               $(cmake-utils_use_with sftp LibSSH)
+               -DWITH_BZip2=$(usex bzip2)
+               -DWITH_Exiv2=$(usex exif)
+               -DWITH_LibLZMA=$(usex lzma)
+               -DWITH_OpenEXR=$(usex openexr)
+               -DWITH_Samba=$(usex samba)
+               -DWITH_LibSSH=$(usex sftp)
        )
+
        kde4-meta_src_configure
 }

Reply via email to