summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-01 00:33:20 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-01 00:33:20 +0000
commitc0394e324537e746084ff4aff0f45988ff4ae983 (patch)
tree40fbdb71ffe1f8387876971526d3763c73978f78 /gnome-base/gnome-applets
parentFix py-compile idiom for automake-1.11.2 compatibility (bug #396585). (diff)
downloadgentoo-2-c0394e324537e746084ff4aff0f45988ff4ae983.tar.gz
gentoo-2-c0394e324537e746084ff4aff0f45988ff4ae983.tar.bz2
gentoo-2-c0394e324537e746084ff4aff0f45988ff4ae983.zip
Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-applets')
-rw-r--r--gnome-base/gnome-applets/ChangeLog8
-rw-r--r--gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild7
-rw-r--r--gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild7
3 files changed, 12 insertions, 10 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