[gentoo-commits] proj/kde:master commit in: kde-apps/kde-wallpapers/, kde-apps/kde-base-artwork/

[Johannes Huber]

commit:     5a5b4ed634c5d6161812fa60b8123c74bf20e069
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 31 20:56:35 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 21:50:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a5b4ed6

[kde-apps] Migrate to kde5.eclass

Fixes use of KDE_SCM=svn

Package-Manager: portage-2.2.20

 kde-apps/kde-base-artwork/kde-base-artwork-15.08.49.9999.ebuild | 2 +-
 kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild          | 2 +-
 kde-apps/kde-wallpapers/kde-wallpapers-15.08.49.9999.ebuild     | 7 +++++--
 kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild              | 7 +++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kde-base-artwork/kde-base-artwork-15.08.49.9999.ebuild 
b/kde-apps/kde-base-artwork/kde-base-artwork-15.08.49.9999.ebuild
index 78c3315..ca7fa7c 100644
--- a/kde-apps/kde-base-artwork/kde-base-artwork-15.08.49.9999.ebuild
+++ b/kde-apps/kde-base-artwork/kde-base-artwork-15.08.49.9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 KDE_SCM="svn"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="KDE base artwork"
 IUSE=""

diff --git a/kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild 
b/kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild
index 78c3315..ca7fa7c 100644
--- a/kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild
+++ b/kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 KDE_SCM="svn"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="KDE base artwork"
 IUSE=""

diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.49.9999.ebuild 
b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.49.9999.ebuild
index 88403b3..6ff27d1 100644
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.49.9999.ebuild
+++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.49.9999.ebuild
@@ -5,15 +5,18 @@
 EAPI=5
 
 KMNAME="kde-wallpapers"
+KDE_AUTODEPS="false"
 KDE_SCM="svn"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="KDE wallpapers"
 KEYWORDS=""
 IUSE=""
 
+RDEPEND="!kde-apps/kde-wallpapers:4"
+
 src_configure() {
        local mycmakeargs=( 
-DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
 
-       kde4-base_src_configure
+       kde5_src_configure
 }

diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild 
b/kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild
index 88403b3..6ff27d1 100644
--- a/kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild
+++ b/kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild
@@ -5,15 +5,18 @@
 EAPI=5
 
 KMNAME="kde-wallpapers"
+KDE_AUTODEPS="false"
 KDE_SCM="svn"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="KDE wallpapers"
 KEYWORDS=""
 IUSE=""
 
+RDEPEND="!kde-apps/kde-wallpapers:4"
+
 src_configure() {
        local mycmakeargs=( 
-DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
 
-       kde4-base_src_configure
+       kde5_src_configure
 }