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 1Ri3U6-0007N6-Oj for garchives@archives.gentoo.org; Tue, 03 Jan 2012 12:28:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5355821C022; Tue, 3 Jan 2012 12:28:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1FDE821C022 for ; Tue, 3 Jan 2012 12:28:46 +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 943531B4011 for ; Tue, 3 Jan 2012 12:28:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B533780042 for ; Tue, 3 Jan 2012 12:28:44 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/, eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2-live.eclass eclass/gnome2-python.eclass media-sound/rhythmbox/rhythmbox-9999.ebuild X-VCS-Directories: media-sound/rhythmbox/ eclass/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: dcf94371ba4d57f35224496126e475b736060d0f Date: Tue, 3 Jan 2012 12:28:44 +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: f719e585-090e-4636-b5ab-1215285141e9 X-Archives-Hash: d922daf8b6e0fe00949120d9e5d933dc commit: dcf94371ba4d57f35224496126e475b736060d0f Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Jan 3 12:27:36 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Jan 3 12:27:47 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Ddcf94371 Sync py-compile disabling code with gentoo-x86, also revert commit 280c8f= 78 * The rhythmbox ebuild is supposed to work for both trunk and snapshots, re-enable py-compile disabling. --- eclass/gnome2-live.eclass | 3 ++- eclass/gnome2-python.eclass | 6 ++++-- media-sound/rhythmbox/rhythmbox-9999.ebuild | 7 +++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass index bf6ca7f..109473e 100644 --- a/eclass/gnome2-live.eclass +++ b/eclass/gnome2-live.eclass @@ -151,7 +151,8 @@ gnome2-live_src_prepare() { fi =20 # Disable pyc compiling. Doesn't harm if DNE - > py-compile + echo > py-compile + chmod +x py-compile =20 ### Keep this in-sync with gnome2.eclass! =20 diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass index 6fbe441..8eb7cfa 100644 --- a/eclass/gnome2-python.eclass +++ b/eclass/gnome2-python.eclass @@ -29,8 +29,10 @@ gnome2-python_pkg_setup() { =20 gnome2-python_src_prepare() { # disable pyc compiling - if [ -f py-compile ]; then - > py-compile + if [[ -f py-compile ]]; then + rm py-compile + echo > py-compile + chmod +x py-compile fi =20 gnome2_src_prepare diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rh= ythmbox/rhythmbox-9999.ebuild index c698719..908f29a 100644 --- a/media-sound/rhythmbox/rhythmbox-9999.ebuild +++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild @@ -150,6 +150,13 @@ pkg_setup() { export GST_INSPECT=3D/bin/true } =20 +src_prepare() { + gnome2_src_prepare + + # Disable pyc compiling + echo > py-compile +} + src_test() { unset SESSION_MANAGER unset DBUS_SESSION_BUS_ADDRESS