[gentoo-commits] proj/kde:master commit in: kde-base/kgamma/

[Tomas Chvatal]

commit:     5912365c7a2e921dfe7e1211e342f7776bb0626e
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 11:27:31 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May  8 11:27:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5912365c

[kde-base/kgamma] Use only ONE inherit line and fixup logic.

---
 kde-base/kgamma/kgamma-4.6.9999.ebuild |   15 +++++++++++----
 kde-base/kgamma/kgamma-9999.ebuild     |   12 ++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/kde-base/kgamma/kgamma-4.6.9999.ebuild b/kde-base/kgamma/kgamma-4.6.9999.ebuild
index 6ff8015..8b47313 100644
--- a/kde-base/kgamma/kgamma-4.6.9999.ebuild
+++ b/kde-base/kgamma/kgamma-4.6.9999.ebuild
@@ -5,8 +5,15 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdegraphics"
-inherit kde4-meta
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	eclass=kde4-base
+else
+	KMNAME="kdegraphics"
+	eclass=kde4-meta
+fi
+
+inherit ${eclass}
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
 KEYWORDS=""
@@ -21,8 +28,8 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	if use handbook; then
-		KMEXTRA+=" doc/kcontrol/kgamma"
+		KMEXTRA_NOFATAL+=" doc/kcontrol/kgamma"
 	fi
 
-	kde4-meta_src_unpack
+	${eclass}_src_unpack
 }

diff --git a/kde-base/kgamma/kgamma-9999.ebuild b/kde-base/kgamma/kgamma-9999.ebuild
index 270196a..8b47313 100644
--- a/kde-base/kgamma/kgamma-9999.ebuild
+++ b/kde-base/kgamma/kgamma-9999.ebuild
@@ -7,12 +7,14 @@ EAPI=4
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
 if [[ ${PV} == *9999 ]]; then
-	inherit kde4-base
+	eclass=kde4-base
 else
 	KMNAME="kdegraphics"
-	inherit kde4-meta
+	eclass=kde4-meta
 fi
 
+inherit ${eclass}
+
 DESCRIPTION="KDE screen gamma values kcontrol module"
 KEYWORDS=""
 IUSE="debug"
@@ -24,12 +26,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 "
 
-if [[ ${PV} != *9999 ]]; then
 src_unpack() {
 	if use handbook; then
-		KMEXTRA+=" doc/kcontrol/kgamma"
+		KMEXTRA_NOFATAL+=" doc/kcontrol/kgamma"
 	fi
 
-	kde4-meta_src_unpack
+	${eclass}_src_unpack
 }
-fi