Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kde-wallpapers/, kde-apps/kde-base-artwork/
Date: Fri, 31 Jul 2015 21:55:32
Message-Id: 1438379409.5a5b4ed634c5d6161812fa60b8123c74bf20e069.johu@gentoo
1 commit: 5a5b4ed634c5d6161812fa60b8123c74bf20e069
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Fri Jul 31 20:56:35 2015 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 31 21:50:09 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a5b4ed6
7
8 [kde-apps] Migrate to kde5.eclass
9
10 Fixes use of KDE_SCM=svn
11
12 Package-Manager: portage-2.2.20
13
14 kde-apps/kde-base-artwork/kde-base-artwork-15.08.49.9999.ebuild | 2 +-
15 kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild | 2 +-
16 kde-apps/kde-wallpapers/kde-wallpapers-15.08.49.9999.ebuild | 7 +++++--
17 kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild | 7 +++++--
18 4 files changed, 12 insertions(+), 6 deletions(-)
19
20 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
21 index 78c3315..ca7fa7c 100644
22 --- a/kde-apps/kde-base-artwork/kde-base-artwork-15.08.49.9999.ebuild
23 +++ b/kde-apps/kde-base-artwork/kde-base-artwork-15.08.49.9999.ebuild
24 @@ -5,7 +5,7 @@
25 EAPI=5
26
27 KDE_SCM="svn"
28 -inherit kde4-base
29 +inherit kde5
30
31 DESCRIPTION="KDE base artwork"
32 IUSE=""
33
34 diff --git a/kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild b/kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild
35 index 78c3315..ca7fa7c 100644
36 --- a/kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild
37 +++ b/kde-apps/kde-base-artwork/kde-base-artwork-9999.ebuild
38 @@ -5,7 +5,7 @@
39 EAPI=5
40
41 KDE_SCM="svn"
42 -inherit kde4-base
43 +inherit kde5
44
45 DESCRIPTION="KDE base artwork"
46 IUSE=""
47
48 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
49 index 88403b3..6ff27d1 100644
50 --- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.49.9999.ebuild
51 +++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.49.9999.ebuild
52 @@ -5,15 +5,18 @@
53 EAPI=5
54
55 KMNAME="kde-wallpapers"
56 +KDE_AUTODEPS="false"
57 KDE_SCM="svn"
58 -inherit kde4-base
59 +inherit kde5
60
61 DESCRIPTION="KDE wallpapers"
62 KEYWORDS=""
63 IUSE=""
64
65 +RDEPEND="!kde-apps/kde-wallpapers:4"
66 +
67 src_configure() {
68 local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
69
70 - kde4-base_src_configure
71 + kde5_src_configure
72 }
73
74 diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild
75 index 88403b3..6ff27d1 100644
76 --- a/kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild
77 +++ b/kde-apps/kde-wallpapers/kde-wallpapers-9999.ebuild
78 @@ -5,15 +5,18 @@
79 EAPI=5
80
81 KMNAME="kde-wallpapers"
82 +KDE_AUTODEPS="false"
83 KDE_SCM="svn"
84 -inherit kde4-base
85 +inherit kde5
86
87 DESCRIPTION="KDE wallpapers"
88 KEYWORDS=""
89 IUSE=""
90
91 +RDEPEND="!kde-apps/kde-wallpapers:4"
92 +
93 src_configure() {
94 local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
95
96 - kde4-base_src_configure
97 + kde5_src_configure
98 }