From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Ri2yg-0008DS-9L for garchives@archives.gentoo.org; Tue, 03 Jan 2012 11:56:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95D8421C0DA; Tue, 3 Jan 2012 11:56:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5C19D21C0B3 for ; Tue, 3 Jan 2012 11:56:18 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8B7A1B4012 for ; Tue, 3 Jan 2012 11:56:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E777C80042 for ; Tue, 3 Jan 2012 11:56:16 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <226b8ca0b690510e9336c5f01e2137f84badbd71.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2-live.eclass eclass/gnome2-python.eclass X-VCS-Directories: eclass/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 226b8ca0b690510e9336c5f01e2137f84badbd71 Date: Tue, 3 Jan 2012 11:56:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: fefc4ba4-fe28-4194-bc98-379a914b0ec1 X-Archives-Hash: 6eb540fd1ef2022a6a85e52e9b81c010 commit: 226b8ca0b690510e9336c5f01e2137f84badbd71 Author: Priit Laes plaes org> AuthorDate: Tue Jan 3 11:50:17 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Tue Jan 3 11:50:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D226b8ca0 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 =20 # Disable pyc compiling. Doesn't harm if DNE - ln -sf $(type -P true) py-compile + > py-compile =20 ### Keep this in-sync with gnome2.eclass! =20 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() { } =20 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 =20 gnome2_src_prepare