Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

7 files changed, 28 insertions, 24 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 835536c28ca1..123185bcd5a6 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-applets
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.346 2011/12/07 07:32:41 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.347 2012/01/01 00:33:20 tetromino Exp $
+
+  01 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-applets-2.32.1.1.ebuild, gnome-applets-3.2.1.ebuild:
+  Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585).
 
   07 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-applets-2.32.1.1.ebuild:
diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
index 3b5622cd6160..86fababea136 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
@@ -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/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.16 2011/12/07 07:32:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.17 2012/01/01 00:33:20 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -90,8 +90,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-dbus-fix.patch
 
 	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	echo '#!/bin/sh' > py-compile
 
 	# Invest applet tests need gconf/proxy/...
 	sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
diff --git a/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild b/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild
index 67819a16faf3..c5c8bbec5a86 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild
@@ -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/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild,v 1.1 2011/11/06 02:05:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild,v 1.2 2012/01/01 00:33:20 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -84,8 +84,7 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	echo '#!/bin/sh' > py-compile
 
 	# Invest applet tests need gconf/proxy/...
 	# Note: for now, invest tests are commented out by upstream
diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index a06d64c02f50..8da9c20dace6 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-menus
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.172 2011/10/29 01:58:08 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.173 2012/01/01 00:36:46 tetromino Exp $
+
+  01 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-menus-2.30.5.ebuild, gnome-menus-3.0.1-r1.ebuild,
+  gnome-menus-3.2.0.1.ebuild:
+  Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585).
 
 *gnome-menus-3.2.0.1 (29 Oct 2011)
 *gnome-menus-3.0.1-r1 (29 Oct 2011)
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild
index 30e96de83b98..97cbd05ef6c2 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild
@@ -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/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild,v 1.9 2011/10/23 23:03:09 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild,v 1.10 2012/01/01 00:36:46 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -49,8 +49,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
 
 	# disable pyc compiling
-	mv py-compile py-compile-disabled
-	ln -s $(type -P true) py-compile
+	echo '#!/bin/sh' > py-compile
 
 	python_copy_sources
 }
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
index 828fe3cdd148..08235c1e6a5d 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
@@ -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/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild,v 1.1 2011/10/29 01:58:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild,v 1.2 2012/01/01 00:36:46 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -52,8 +52,7 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# disable pyc compiling
-	mv py-compile py-compile-disabled
-	ln -s $(type -P true) py-compile
+	echo '#!/bin/sh' > py-compile
 
 	python_copy_sources
 }
diff --git a/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
index 4bd8f8daa25b..6e657dcd903e 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
@@ -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/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild,v 1.1 2011/10/29 01:58:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild,v 1.2 2012/01/01 00:36:46 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -65,8 +65,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
 
 	# disable pyc compiling
-	mv py-compile py-compile-disabled
-	ln -s $(type -P true) py-compile
+	echo '#!/bin/sh' > py-compile
 
 	python_copy_sources
 }