New automake uses $(SHELL) py-compile, which fails if py-compile is a symlink to...

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index d023fac229e45bac8c6b60f0bafdd900a1dbbdcf..633e45758f4fa41f1806db6fd13efa5407d23a4d 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.69 2012/01/03 08:59:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.70 2012/01/03 12:18:17 nirbheek Exp $
+
+  03 Jan 2012; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnome-python-common.eclass:
+  New automake uses $(SHELL) py-compile, which fails if py-compile is a symlink
+  to /bin/true. Make it an executable empty file instead.
 
   03 Jan 2012; Justin Lecher <jlec@gentoo.org> eutils.eclass:
   Convert make_desktop_entry() comment block to be eclass-manpages conform,

diff --git a/eclass/gnome-python-common.eclass b/eclass/gnome-python-common.eclass
index 21cc37c1543c386ab9e6005db4bef95e27f32d07..19d978a823559e3c0dbb5edc3e5e0e8c1de1e496 100644 (file)
--- a/eclass/gnome-python-common.eclass
+++ b/eclass/gnome-python-common.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome-python-common.eclass,v 1.13 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome-python-common.eclass,v 1.14 2012/01/03 12:18:17 nirbheek Exp $
 
 # Original Author: Arun Raghavan <ford_prefect@gentoo.org> (based on the
 #                 gnome-python-desktop eclass by Jim Ramsay <lack@gentoo.org>)
@@ -89,7 +89,8 @@ gnome-python-common_src_prepare() {
        # disable pyc compiling
        if [[ -f py-compile ]]; then
                rm py-compile
-               ln -s $(type -P true) py-compile
+               echo > py-compile
+               chmod +x py-compile
        fi
 
        # The .pc file is installed by respective gnome-python*-base package