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 1Q9MZC-0005if-Jn for garchives@archives.gentoo.org; Mon, 11 Apr 2011 19:14:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5D3E1C003; Mon, 11 Apr 2011 19:14:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 61B531C033 for ; Mon, 11 Apr 2011 19:14:23 +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 98D3B1B40CA for ; Mon, 11 Apr 2011 19:14:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 06EC580065 for ; Mon, 11 Apr 2011 19:14:22 +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: <68f8cbf78c7c64c4c89f0bf1ccb7c475f8dbb1a6.scarabeus@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/marble/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/marble/marble-4.6.9999.ebuild kde-base/marble/marble-9999.ebuild X-VCS-Directories: kde-base/marble/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 68f8cbf78c7c64c4c89f0bf1ccb7c475f8dbb1a6 Date: Mon, 11 Apr 2011 19:14:22 +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: ab18bdab01824d5ba7a1e085705b33e4 commit: 68f8cbf78c7c64c4c89f0bf1ccb7c475f8dbb1a6 Author: Tomas Chvatal gentoo org> AuthorDate: Mon Apr 11 19:14:13 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Mon Apr 11 19:14:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D68f8cbf7 [marble] Try to unfck the eclass calls. --- kde-base/marble/marble-4.6.9999.ebuild | 18 ++++++++++++------ kde-base/marble/marble-9999.ebuild | 14 +++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/kde-base/marble/marble-4.6.9999.ebuild b/kde-base/marble/mar= ble-4.6.9999.ebuild index 8c5e769..2287ced 100644 --- a/kde-base/marble/marble-4.6.9999.ebuild +++ b/kde-base/marble/marble-4.6.9999.ebuild @@ -5,10 +5,16 @@ EAPI=3D3 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdeedu" CPPUNIT_REQUIRED=3D"optional" PYTHON_DEPEND=3D"python? 2" -inherit python kde4-meta +if [[ ${PV} =3D=3D *9999 ]]; then + KDE_SCM=3D"git" + eclass=3D"kde4-base" +else + KMNAME=3D"kdeedu" + eclass=3D"kde4-meta" +fi +inherit ${eclass} python =20 DESCRIPTION=3D"Generic geographical map widget" KEYWORDS=3D"" @@ -33,11 +39,11 @@ PATCHES=3D( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) =20 pkg_setup() { python_set_active_version 2 - kde4-meta_pkg_setup + ${eclass}_pkg_setup } =20 src_prepare() { - kde4-meta_src_prepare + ${eclass}_src_prepare python_convert_shebangs -r $(python_get_version) . } =20 @@ -56,7 +62,7 @@ src_configure() { =20 find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed= -i 's/#include