[gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/, eclass/

[Nirbheek Chauhan]

commit:     dcf94371ba4d57f35224496126e475b736060d0f
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 12:27:36 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 12:27:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dcf94371

Sync py-compile disabling code with gentoo-x86, also revert commit 280c8f78

* 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
 
 	# Disable pyc compiling. Doesn't harm if DNE
-	> py-compile
+	echo > py-compile
+	chmod +x py-compile
 
 	### Keep this in-sync with gnome2.eclass!
 

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() {
 
 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
 
 	gnome2_src_prepare

diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/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=/bin/true
 }
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# Disable pyc compiling
+	echo > py-compile
+}
+
 src_test() {
 	unset SESSION_MANAGER
 	unset DBUS_SESSION_BUS_ADDRESS