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 1QEdzn-0002yl-QW for garchives@archives.gentoo.org; Tue, 26 Apr 2011 08:51:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 297321C007; Tue, 26 Apr 2011 08:51:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D83BE1C007 for ; Tue, 26 Apr 2011 08:51:39 +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 3C3621B4063 for ; Tue, 26 Apr 2011 08:51:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 45BB380505 for ; Tue, 26 Apr 2011 08:51:38 +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: <42a37aba38be1beb06686340c3594c990eb41ddb.scarabeus@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/step/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/step/step-4.6.9999.ebuild kde-base/step/step-9999.ebuild X-VCS-Directories: kde-base/step/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 42a37aba38be1beb06686340c3594c990eb41ddb Date: Tue, 26 Apr 2011 08:51:38 +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: 83f4f1e05380bd2916a73bbeb7f5274d commit: 42a37aba38be1beb06686340c3594c990eb41ddb Author: Tomas Chvatal gentoo org> AuthorDate: Tue Apr 26 08:51:32 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Tue Apr 26 08:51:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D42a37aba [kde-base/step] Fix the eclass handling properly. --- kde-base/step/step-4.6.9999.ebuild | 16 +++++++++++----- kde-base/step/step-9999.ebuild | 14 ++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/kde-base/step/step-4.6.9999.ebuild b/kde-base/step/step-4.6.= 9999.ebuild index 8dad66f..359a698 100644 --- a/kde-base/step/step-4.6.9999.ebuild +++ b/kde-base/step/step-4.6.9999.ebuild @@ -5,8 +5,15 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdeedu" -inherit kde4-meta +KDE_SCM=3D"git" +if [[ ${PV} =3D=3D *9999 ]]; then + eclass=3Dkde4-base +else + KMNAME=3D"kdeedu" + eclass=3Dkde4-meta +fi + +inherit ${eclass} =20 DESCRIPTION=3D"The KDE physics simulator" KEYWORDS=3D"" @@ -26,10 +33,9 @@ PATCHES=3D( ) =20 src_configure() { - mycmakeargs=3D( + local mycmakeargs=3D( $(cmake-utils_use_with gsl) $(cmake-utils_use_with qalculate) ) - - kde4-meta_src_configure + ${eclass}_src_configure } diff --git a/kde-base/step/step-9999.ebuild b/kde-base/step/step-9999.ebu= ild index 227ddde..359a698 100644 --- a/kde-base/step/step-9999.ebuild +++ b/kde-base/step/step-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"kdeedu" - inherit kde4-meta + eclass=3Dkde4-meta fi =20 +inherit ${eclass} + DESCRIPTION=3D"The KDE physics simulator" KEYWORDS=3D"" IUSE=3D"debug +gsl +qalculate" @@ -31,13 +33,9 @@ PATCHES=3D( ) =20 src_configure() { - mycmakeargs=3D( + local mycmakeargs=3D( $(cmake-utils_use_with gsl) $(cmake-utils_use_with qalculate) ) - if [[ ${PV} =3D=3D *9999 ]]; then - kde4-base_src_configure - else - kde4-meta_src_configure - fi + ${eclass}_src_configure }