From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QJ29t-0007ji-B2 for garchives@archives.gentoo.org; Sun, 08 May 2011 11:28:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96E9C1C03F; Sun, 8 May 2011 11:27:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 68A8B1C03F for ; Sun, 8 May 2011 11:27:49 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B41D11B4015 for ; Sun, 8 May 2011 11:27:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D8C8145B2A for ; Sun, 8 May 2011 11:27:47 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <5912365c7a2e921dfe7e1211e342f7776bb0626e.scarabeus@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kgamma/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kgamma/kgamma-4.6.9999.ebuild kde-base/kgamma/kgamma-9999.ebuild X-VCS-Directories: kde-base/kgamma/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 5912365c7a2e921dfe7e1211e342f7776bb0626e Date: Sun, 8 May 2011 11:27:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 63b72c21b9b7049fd36dd7592c7174b9 commit: 5912365c7a2e921dfe7e1211e342f7776bb0626e Author: Tomas Chvatal gentoo org> AuthorDate: Sun May 8 11:27:31 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Sun May 8 11:27:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D5912365c [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/kga= mma-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=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdegraphics" -inherit kde4-meta +KDE_SCM=3D"git" +if [[ ${PV} =3D=3D *9999 ]]; then + eclass=3Dkde4-base +else + KMNAME=3D"kdegraphics" + eclass=3Dkde4-meta +fi + +inherit ${eclass} =20 DESCRIPTION=3D"KDE screen gamma values kcontrol module" KEYWORDS=3D"" @@ -21,8 +28,8 @@ DEPEND=3D"${RDEPEND} =20 src_unpack() { if use handbook; then - KMEXTRA+=3D" doc/kcontrol/kgamma" + KMEXTRA_NOFATAL+=3D" doc/kcontrol/kgamma" fi =20 - 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=3D4 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" if [[ ${PV} =3D=3D *9999 ]]; then - inherit kde4-base + eclass=3Dkde4-base else KMNAME=3D"kdegraphics" - inherit kde4-meta + eclass=3Dkde4-meta fi =20 +inherit ${eclass} + DESCRIPTION=3D"KDE screen gamma values kcontrol module" KEYWORDS=3D"" IUSE=3D"debug" @@ -24,12 +26,10 @@ DEPEND=3D"${RDEPEND} x11-proto/xf86vidmodeproto " =20 -if [[ ${PV} !=3D *9999 ]]; then src_unpack() { if use handbook; then - KMEXTRA+=3D" doc/kcontrol/kgamma" + KMEXTRA_NOFATAL+=3D" doc/kcontrol/kgamma" fi =20 - kde4-meta_src_unpack + ${eclass}_src_unpack } -fi