From: "Tomas Chvatal" <scarabeus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kgamma/
Date: Sun, 8 May 2011 11:27:47 +0000 (UTC) [thread overview]
Message-ID: <5912365c7a2e921dfe7e1211e342f7776bb0626e.scarabeus@gentoo> (raw)
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
next reply other threads:[~2011-05-08 11:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-08 11:27 Tomas Chvatal [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-06-09 1:46 [gentoo-commits] proj/kde:master commit in: kde-base/kgamma/ Marc Schiffbauer
2011-06-08 22:49 Andreas Hüttel
2011-06-08 22:08 Andreas Hüttel
2011-05-26 5:14 Jorge Manuel B. S. Vicetto
2011-04-02 11:39 Andreas K. Huettel
2011-03-27 0:31 Jonathan Callen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5912365c7a2e921dfe7e1211e342f7776bb0626e.scarabeus@gentoo \
--to=scarabeus@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox