[gentoo-commits] proj/gnome:master commit in: eclass/

["Priit Laes" <plaes@plaes.org>]

commit:     226b8ca0b690510e9336c5f01e2137f84badbd71
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan  3 11:50:17 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan  3 11:50:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=226b8ca0

Compatibility fix for automake-1.11.2's py-compile changes

Thanks to nirbheek and ssuominen for suggestions and solutions.

---
 eclass/gnome2-live.eclass   |    2 +-
 eclass/gnome2-python.eclass |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 1d9988a..bf6ca7f 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -151,7 +151,7 @@ gnome2-live_src_prepare() {
 	fi
 
 	# Disable pyc compiling. Doesn't harm if DNE
-	ln -sf $(type -P true) py-compile
+	> py-compile
 
 	### Keep this in-sync with gnome2.eclass!
 

diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
index d4dc393..6fbe441 100644
--- a/eclass/gnome2-python.eclass
+++ b/eclass/gnome2-python.eclass
@@ -28,10 +28,9 @@ gnome2-python_pkg_setup() {
 }
 
 gnome2-python_src_prepare() {
+	# disable pyc compiling
 	if [ -f py-compile ]; then
-		# disable pyc compiling
-		mv py-compile py-compile.orig
-		ln -s $(type -P true) py-compile
+		> py-compile
 	fi
 
 	gnome2_src_prepare