Gentoo Archives: gentoo-commits

From: Alexey Shvetsov <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdebase-wallpapers/
Date: Fri, 01 Jul 2011 19:13:13
Message-Id: 4d8effc9d38a7f88d6c38a1d688016bb35d5ad6b.alexxy@gentoo
1 commit: 4d8effc9d38a7f88d6c38a1d688016bb35d5ad6b
2 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 1 19:12:12 2011 +0000
4 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 1 19:12:12 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4d8effc9
7
8 fix kdebase-wallpapers-4.6.5
9
10 ---
11 .../kdebase-wallpapers-4.6.49.9999.ebuild | 18 +++++++++++++-----
12 .../kdebase-wallpapers-4.6.5.ebuild | 18 +++++++++++++-----
13 2 files changed, 26 insertions(+), 10 deletions(-)
14
15 diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild
16 index 89f6e94..ffc7fbd 100644
17 --- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild
18 +++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild
19 @@ -4,10 +4,18 @@
20
21 EAPI=4
22
23 -KMNAME="kde-wallpapers"
24 -KMMODULE="wallpapers"
25 -KDE_SCM="svn"
26 -inherit kde4-base
27 +if [[ $PV == *9999* ]]; then
28 + KMNAME="kde-wallpapers"
29 + KMMODULE="wallpapers"
30 + KDE_SCM="svn"
31 + kde_eclass=kde4-base
32 +else
33 + KMNAME="kdebase-workspace"
34 + KMMODULE="wallpapers"
35 + kde_eclass=kde4-meta
36 +fi
37 +
38 +inherit ${kde_eclass}
39
40 DESCRIPTION="KDE wallpapers"
41 KEYWORDS=""
42 @@ -16,5 +24,5 @@ IUSE=""
43 src_configure() {
44 mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
45
46 - kde4-base_src_configure
47 + ${kde_eclass}_src_configure
48 }
49
50 diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild
51 index 2c7af8a..8d7b55d 100644
52 --- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild
53 +++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild
54 @@ -4,10 +4,18 @@
55
56 EAPI=4
57
58 -KMNAME="kde-wallpapers"
59 -KMMODULE="wallpapers"
60 -KDE_SCM="svn"
61 -inherit kde4-base
62 +if [[ $PV == *9999* ]]; then
63 + KMNAME="kde-wallpapers"
64 + KMMODULE="wallpapers"
65 + KDE_SCM="svn"
66 + kde_eclass=kde4-base
67 +else
68 + KMNAME="kdebase-workspace"
69 + KMMODULE="wallpapers"
70 + kde_eclass=kde4-meta
71 +fi
72 +
73 +inherit ${kde_eclass}
74
75 DESCRIPTION="KDE wallpapers"
76 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
77 @@ -16,5 +24,5 @@ IUSE=""
78 src_configure() {
79 mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
80
81 - kde4-base_src_configure
82 + ${kde_eclass}_src_configure
83 }