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 1RM0ot-0005tq-Dq for garchives@archives.gentoo.org; Thu, 03 Nov 2011 17:11:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A84F021C035; Thu, 3 Nov 2011 17:11:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4EDC821C035 for ; Thu, 3 Nov 2011 17:11:06 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA2261B4019 for ; Thu, 3 Nov 2011 17:11:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 044A380042 for ; Thu, 3 Nov 2011 17:11:05 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/marble/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/marble/marble-4.7.49.9999.ebuild kde-base/marble/marble-9999.ebuild X-VCS-Directories: kde-base/marble/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: b782d52008d0096712edc86497ce04693d774e12 Date: Thu, 3 Nov 2011 17:11:05 +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: db13e69c-994f-41a2-9e56-d4f09dd4c4b0 X-Archives-Hash: 80c80dce806cbf6dc53136568e855bb8 commit: b782d52008d0096712edc86497ce04693d774e12 Author: Andreas K. Huettel physik uni-r <= DOT> de> AuthorDate: Thu Nov 3 17:10:17 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Thu Nov 3 17:10:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Db782d520 [kde-base/marble] Dont try to install non-existing FindMarbleWidget.cmake (Portage version: 2.1.10.32/git/Linux x86_64, signed Manifest commit with= key 7887F787) --- kde-base/marble/marble-4.7.49.9999.ebuild | 10 +--------- kde-base/marble/marble-9999.ebuild | 10 ++++++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/= marble-4.7.49.9999.ebuild index bf31559..e66e234 100644 --- a/kde-base/marble/marble-4.7.49.9999.ebuild +++ b/kde-base/marble/marble-4.7.49.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuil= d,v 1.1 2011/07/31 18:24:35 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v= 1.2 2011/11/03 10:52:25 tampakrap Exp $ =20 EAPI=3D4 =20 @@ -63,11 +63,3 @@ src_configure() { =20 kde4-base_src_configure } - -src_install() { - if use plasma; then - insinto /usr/share/apps/cmake/modules - doins "${S}"/cmake/modules/FindMarbleWidget.cmake - fi - kde4-base_src_install -} diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-= 9999.ebuild index b4f1435..e66e234 100644 --- a/kde-base/marble/marble-9999.ebuild +++ b/kde-base/marble/marble-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuil= d,v 1.1 2011/07/31 18:24:35 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v= 1.2 2011/11/03 10:52:25 tampakrap Exp $ =20 EAPI=3D4 =20 @@ -30,6 +30,10 @@ RDEPEND=3D"${DEPEND} =20 REQUIRED_USE=3D"plasma? ( kde )" =20 +PATCHES=3D( + "${FILESDIR}/${PN}-4.7-magic-r1.patch" +) + pkg_setup() { python_set_active_version 2 kde4-base_pkg_setup @@ -39,10 +43,12 @@ pkg_setup() { src_prepare() { kde4-base_src_prepare python_convert_shebangs -r $(python_get_version) . + + find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed= -i 's/#include