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: Sat, 02 Jul 2011 12:54:59
Message-Id: 85a55c250bafdf261b61479b97eb30857012739f.alexxy@gentoo
1 commit: 85a55c250bafdf261b61479b97eb30857012739f
2 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 2 12:51:12 2011 +0000
4 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 2 12:53:58 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=85a55c25
7
8 kde released kde-walpapers-4.6.5.tar.bz2
9
10 Revert "fix kdebase-wallpapers-4.6.5"
11
12 This reverts commit 4d8effc9d38a7f88d6c38a1d688016bb35d5ad6b.
13
14 ---
15 .../kdebase-wallpapers-4.6.49.9999.ebuild | 18 +++++-------------
16 .../kdebase-wallpapers-4.6.5.ebuild | 18 +++++-------------
17 2 files changed, 10 insertions(+), 26 deletions(-)
18
19 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
20 index ffc7fbd..89f6e94 100644
21 --- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild
22 +++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild
23 @@ -4,18 +4,10 @@
24
25 EAPI=4
26
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 +KMNAME="kde-wallpapers"
40 +KMMODULE="wallpapers"
41 +KDE_SCM="svn"
42 +inherit kde4-base
43
44 DESCRIPTION="KDE wallpapers"
45 KEYWORDS=""
46 @@ -24,5 +16,5 @@ IUSE=""
47 src_configure() {
48 mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
49
50 - ${kde_eclass}_src_configure
51 + kde4-base_src_configure
52 }
53
54 diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild
55 index 8d7b55d..2c7af8a 100644
56 --- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild
57 +++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild
58 @@ -4,18 +4,10 @@
59
60 EAPI=4
61
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 +KMNAME="kde-wallpapers"
75 +KMMODULE="wallpapers"
76 +KDE_SCM="svn"
77 +inherit kde4-base
78
79 DESCRIPTION="KDE wallpapers"
80 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
81 @@ -24,5 +16,5 @@ IUSE=""
82 src_configure() {
83 mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
84
85 - ${kde_eclass}_src_configure
86 + kde4-base_src_configure
87 }