From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D4B161381F4 for ; Mon, 10 Dec 2012 01:57:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97F4E21C004; Mon, 10 Dec 2012 01:56:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0221D21C004 for ; Mon, 10 Dec 2012 01:56:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6CF433D8A3 for ; Mon, 10 Dec 2012 01:56:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 56A22E543C for ; Mon, 10 Dec 2012 01:56:49 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1355104509.28e0d2b7f333845e26f365dd7abf245ebd3dc2b5.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild gnome-base/gnome-applets/gnome-applets-9999.ebuild X-VCS-Directories: gnome-base/gnome-applets/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 28e0d2b7f333845e26f365dd7abf245ebd3dc2b5 X-VCS-Branch: master Date: Mon, 10 Dec 2012 01:56:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3012dd9f-26ba-4a0e-90a9-670132da47ad X-Archives-Hash: c42ef042bb0212dbee4dead540d5c0e4 commit: 28e0d2b7f333845e26f365dd7abf245ebd3dc2b5 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon Dec 10 01:55:09 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Mon Dec 10 01:55:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=28e0d2b7 gnome-base/gnome-applets: punt silly check for pygobject:2 Sed to avoid autoreconf; patch submitted upstream at https://bugzilla.gnome.org/show_bug.cgi?id=660550 --- .../gnome-applets/gnome-applets-3.6.0.ebuild | 15 +++++++++------ gnome-base/gnome-applets/gnome-applets-9999.ebuild | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild index 9893917..132a845 100644 --- a/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild +++ b/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild @@ -53,7 +53,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3 >=gnome-extra/gucharmap-2.33.0:2.90 >=gnome-base/libgtop-2.11.92 - >=dev-python/pygobject-2.26:2[introspection] + dev-python/pygobject:3 gnome-base/gconf[introspection] gnome-base/gnome-panel[introspection] x11-libs/gdk-pixbuf[introspection] @@ -71,6 +71,11 @@ DEPEND="${RDEPEND} virtual/pkgconfig" pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { DOCS="AUTHORS ChangeLog NEWS README" # We don't want HAL or battstat. # mixer applet uses gstreamer, conflicts with the mixer provided by g-s-d @@ -85,11 +90,9 @@ pkg_setup() { $(use_enable networkmanager) $(use_enable policykit polkit)" - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { + # Remove silly check for pygobject:2 + # https://bugzilla.gnome.org/show_bug.cgi?id=660550 + sed -e 's/pygobject-2.0/pygobject-3.0/' -i configure || die "sed failed" gnome2_src_prepare python_clean_py-compile_files diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild index 9893917..132a845 100644 --- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild +++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild @@ -53,7 +53,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3 >=gnome-extra/gucharmap-2.33.0:2.90 >=gnome-base/libgtop-2.11.92 - >=dev-python/pygobject-2.26:2[introspection] + dev-python/pygobject:3 gnome-base/gconf[introspection] gnome-base/gnome-panel[introspection] x11-libs/gdk-pixbuf[introspection] @@ -71,6 +71,11 @@ DEPEND="${RDEPEND} virtual/pkgconfig" pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { DOCS="AUTHORS ChangeLog NEWS README" # We don't want HAL or battstat. # mixer applet uses gstreamer, conflicts with the mixer provided by g-s-d @@ -85,11 +90,9 @@ pkg_setup() { $(use_enable networkmanager) $(use_enable policykit polkit)" - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { + # Remove silly check for pygobject:2 + # https://bugzilla.gnome.org/show_bug.cgi?id=660550 + sed -e 's/pygobject-2.0/pygobject-3.0/' -i configure || die "sed failed" gnome2_src_prepare python_clean_py-compile_files