Gentoo Archives: gentoo-commits

From: Tomas Chvatal <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, eclass/
Date: Sun, 01 May 2011 13:49:16
Message-Id: e3c9090012987beff049435c08cab376d1331d71.scarabeus@gentoo
1 commit: e3c9090012987beff049435c08cab376d1331d71
2 Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 13:48:13 2011 +0000
4 Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 13:48:13 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e3c90900
7
8 [gcc-check] fixup inherits
9
10 ---
11 eclass/kde4-base.eclass | 2 +-
12 eclass/kde4-meta.eclass | 2 +-
13 kde-base/kdelibs/kdelibs-4.6.3.ebuild | 2 +-
14 kde-base/kdelibs/kdelibs-4.6.9999.ebuild | 2 +-
15 kde-base/kdelibs/kdelibs-9999.ebuild | 2 +-
16 5 files changed, 5 insertions(+), 5 deletions(-)
17
18 diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
19 index a1700d9..2e5ebd0 100644
20 --- a/eclass/kde4-base.eclass
21 +++ b/eclass/kde4-base.eclass
22 @@ -20,7 +20,7 @@
23 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
24 : ${VIRTUALX_REQUIRED:=manual}
25
26 -inherit kde4-functions fdo-mime gnome2-utils base virtualx versionator eutils
27 +inherit kde4-functions toolchain-funcs fdo-mime gnome2-utils base virtualx versionator eutils
28
29 if [[ ${BUILD_TYPE} = live ]]; then
30 case ${KDE_SCM} in
31
32 diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
33 index 6dcd13d..cf03d27 100644
34 --- a/eclass/kde4-meta.eclass
35 +++ b/eclass/kde4-meta.eclass
36 @@ -14,7 +14,7 @@
37
38 [[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
39
40 -inherit kde4-base toolchain-funcs versionator
41 +inherit kde4-base versionator
42
43 KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
44 EXPORT_FUNCTIONS ${KDEMETA_EXPF}
45
46 diff --git a/kde-base/kdelibs/kdelibs-4.6.3.ebuild b/kde-base/kdelibs/kdelibs-4.6.3.ebuild
47 index 9e28ada..16068a3 100644
48 --- a/kde-base/kdelibs/kdelibs-4.6.3.ebuild
49 +++ b/kde-base/kdelibs/kdelibs-4.6.3.ebuild
50 @@ -9,7 +9,7 @@ DECLARATIVE_REQUIRED="always"
51 OPENGL_REQUIRED="optional"
52 WEBKIT_REQUIRED="always"
53 KDE_SCM="git"
54 -inherit kde4-base fdo-mime
55 +inherit kde4-base fdo-mime toolchain-funcs
56
57 DESCRIPTION="KDE libraries needed by all KDE programs."
58 HOMEPAGE="http://www.kde.org/"
59
60 diff --git a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
61 index 97fe65f..4eed990 100644
62 --- a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
63 +++ b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
64 @@ -9,7 +9,7 @@ DECLARATIVE_REQUIRED="always"
65 OPENGL_REQUIRED="optional"
66 WEBKIT_REQUIRED="always"
67 KDE_SCM="git"
68 -inherit kde4-base fdo-mime
69 +inherit kde4-base fdo-mime toolchain-funcs
70
71 DESCRIPTION="KDE libraries needed by all KDE programs."
72 HOMEPAGE="http://www.kde.org/"
73
74 diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
75 index 5f121ea..570f419 100644
76 --- a/kde-base/kdelibs/kdelibs-9999.ebuild
77 +++ b/kde-base/kdelibs/kdelibs-9999.ebuild
78 @@ -9,7 +9,7 @@ DECLARATIVE_REQUIRED="always"
79 OPENGL_REQUIRED="optional"
80 WEBKIT_REQUIRED="always"
81 KDE_SCM="git"
82 -inherit kde4-base fdo-mime
83 +inherit kde4-base fdo-mime toolchain-funcs
84
85 DESCRIPTION="KDE libraries needed by all KDE programs."
86 HOMEPAGE="http://www.kde.org/"