From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Thu, 5 Jan 2012 06:38:12 +0000 (+0000)
Subject: Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=640d6e473599adadce1608172ce66d2290cacf3e;p=gentoo.git

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

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

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 8600c1122d65..f9b62c916641 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/rhythmbox
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.208 2011/10/01 16:42:01 nirbheek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.209 2012/01/05 06:38:12 tetromino Exp $
+
+  05 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  rhythmbox-0.12.8-r1.ebuild, rhythmbox-0.13.3.ebuild,
+  rhythmbox-2.90.1_pre20111001.ebuild:
+  Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585).
 
 *rhythmbox-2.90.1_pre20111001 (01 Oct 2011)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 6eec41e72dec..549cd5d0b6d9 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX rhythmbox-0.12-python-initialization.patch 5167 RMD160 cacae6274841d595a0d55ed92c42815793081176 SHA1 0b306455b027f8f9c73e185acdbbb1d041ce882d SHA256 54f3f492d4c3204b93a1fed3886ca76aa42d36737e66c6424426fc0116b25d3e
 AUX rhythmbox-0.12.8-libnotify-0.7.patch 1156 RMD160 78ce782ffc424eefbe9fc59cb94e245714377c61 SHA1 cef431a34f3e82d3475229b3111ca234af8aee7d SHA256 39b66a3b8e439f0e0dbde63a1d7f5472c262f344db1334b24591e18be22fb46d
@@ -7,25 +7,15 @@ AUX rhythmbox-0.12.8-namespace-conflict.patch 2155 RMD160 2ed6fe3966c860845d0d12
 DIST rhythmbox-0.12.8.tar.bz2 5358950 RMD160 072d4fa06408ebc181b40147db1575d0ef4c99fe SHA1 5d27923cc29b81d7bfbc73d867d7976a5295f964 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
 DIST rhythmbox-0.13.3.tar.bz2 9978135 RMD160 f6f155768ce9c87d844ee47f7f1cc4f167d05052 SHA1 1c6e83972dcd7de8fc1a71586843e29092a0c706 SHA256 ad6532864bb4df30f1014ec81ddc0d2d3f69241235627f46abe5578cf629052a
 DIST rhythmbox-2.90.1_pre20111001.tar.xz 5630728 RMD160 a0feae3fd5b449e17783a3143d7b05162909bbd9 SHA1 d5aa06613a919f01ba348bd91b0b8783a57802da SHA256 092379718e17e81d0f9a35802489f091d7bb4b675da592dc4e90b11a41c7413f
-EBUILD rhythmbox-0.12.8-r1.ebuild 5091 RMD160 fa5d35f6fad8308d826f0aa55054d92f33ca088c SHA1 688683ef5eee4f6836d7e3f929ea38ab0531edd3 SHA256 9f5e57e54db6fb62d96ce49710060835d3987dd2c1c4d2c5f569cab9d5c85b55
-EBUILD rhythmbox-0.13.3.ebuild 4991 RMD160 66c370eb7aa09e644e93d044283122ebf6a705a6 SHA1 b628ce8e0ae75d32cf504024d849b48f30b76adc SHA256 0ed57788ecd9b5603f25c7bf95d199d8aa465d6e87032801af270fb434ceb875
-EBUILD rhythmbox-2.90.1_pre20111001.ebuild 5908 RMD160 183711cf93d7e2eae5c8248ee56c6e89ddd1b92f SHA1 eb92741f5ab6567c9033816d31c4adf30a9d52ad SHA256 25ec563315abf5e1924b0c734d60094b713f2c92abd0e7fc2c3c99ccc0b35b52
-MISC ChangeLog 32130 RMD160 f98e81544ae6da43994098ff3ad83f12054fb0ee SHA1 a69a84045a5fb83d0b837f8fd6768c94413c794d SHA256 4309485d8cf684ef9b61051ea7f18ec04a09c7d977d9d9d89d1353db60cb6654
+EBUILD rhythmbox-0.12.8-r1.ebuild 5045 RMD160 5afd5034a2d17f67059ad389272bea8fa90bd48f SHA1 5283c2df6122b664a86bce9775f860f3797b9041 SHA256 808ee057d3edd83a9e49679eb390e2c8bd8160a199078d777319d3a3577719c2
+EBUILD rhythmbox-0.13.3.ebuild 4949 RMD160 91e6cec296b225d01aad68df5771be56c2523968 SHA1 e4257f20c5ab91bf4873fe296c41effe564394c9 SHA256 a462cd5198c0edf79fc9146f112ff38d256dc5e8a1b1db700182db4343786fed
+EBUILD rhythmbox-2.90.1_pre20111001.ebuild 5892 RMD160 c6cb271724e94199f341fc4c0bddda052859b1df SHA1 301ea10fa767efa86d926efa367065d508bb7cc4 SHA256 31cb48179d3da1e213c7e499a18467f5738c5102061490c422030f87bec7dead
+MISC ChangeLog 32357 RMD160 428ba8c3fa06380790c8fd9bdbaf15890de6ab7a SHA1 cead65b66ae48dc0ccffcb977cdc4d2c7b72bba8 SHA256 7da1e7ad3a8aae5383af1c82c3237d6960088f417fa963ae6c2df2128558a572
 MISC metadata.xml 1223 RMD160 f0e09761fed896f0fcd8d8fc1aea9301e223e3f6 SHA1 616307df851f306c7bcf25dd4c27447715d67a91 SHA256 1619b8bc7ab2a9473b2b27ce7317137325dbfac8dd7322517084b9e038988e53
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOh0LdAAoJEO/kOhxWD91k2C8P/2prfqv5QbzIDdBsDRfIUccJ
-po+lMSOnPpxB1x15N06PVajVzkgPaEXXLeTWvZVkcXL73NoCuzM1k/Tn/pxwKIxq
-89uKchvv1W/ps6b/l8aA8EVoWez0AdT/d2NA30PrfU+c0omV/ULZXU10FqGYJYmZ
-hdak+VoeB6GcsUw2V01J7BA3Svr87DzEYi0eGWAQBxLauatVYs+hvXW51Z0P7sFC
-ZeJLgJwso1g5MfyPdlMjYYz9ch2CqkNdzfXxVFL9p41waLT/ExzhiIEYIr3WpvCT
-Ktgz7qoezzAqmFBWct4NePMWcfVSq6qsMG44OpuwPRbFxz/+ACIw7hyibnyN+QHE
-pxM40aT0DT6jvUv/tNPJnO+2aJIE04tD7DZJBLfH3tZL3WhjE+jjSxcEgGD6q4bd
-0xuEpf3zya1k4qOrhBX5PFEm67i17TQbeASv7lyOKh/wmQOIFTBIv1ePjiTX/Msc
-uAGaWSegKFv0rqbF2AnBzFauazI0n6i88GlvUhE2jf4VueIsD9VLqoudL6pzXM6g
-5a10Dz5lE9dC2HqsSQ8tKyJqC8QydoCGFVZI3hioDUmCPNNgmxiCa/Fskcus8BCM
-HbTT2srwEYIbuL8ge2wb/c4s4+nBsPEg4SqYnkesgdvVcC9nd6vmM2D3fpbCH/KD
-Rsduxxkj8HfjyMgV8IxL
-=En9i
+iF4EAREIAAYFAk8FRVoACgkQdjK8w9WeBnDOQAD/Qd2ivmGMj/ElNQ54bVaYMTKt
+2+M7pFIhZHu16wT+EhUA+wYhQZhp+bXf4uTScBa76NvBAuT3vfneCVR93hEV8Gev
+=8VvW
 -----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
index 551b5bd3a5ff..b2a3e9521663 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.8-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/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.17 2011/07/26 16:28:51 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.18 2012/01/05 06:38:12 tetromino Exp $
 
 EAPI="3"
 
@@ -145,8 +145,7 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	echo > py-compile
 
 	# Fix python initialization problems, bug #318333
 	epatch "${FILESDIR}/${PN}-0.12-python-initialization.patch"
diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
index c2b9133b8200..db86b67c5ae4 100644
--- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.13.3.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/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.5 2011/06/09 01:21:35 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.6 2012/01/05 06:38:12 tetromino Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.4"
@@ -153,8 +153,7 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	echo > py-compile
 }
 
 src_compile() {
diff --git a/media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.ebuild b/media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.ebuild
index 8671187c1783..65315afb14fd 100644
--- a/media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.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/media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.ebuild,v 1.1 2011/10/01 16:42:01 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.90.1_pre20111001.ebuild,v 1.2 2012/01/05 06:38:12 tetromino Exp $
 
 EAPI="3"
 GNOME2_LA_PUNT="yes"
@@ -187,7 +187,7 @@ src_prepare() {
 	eautoreconf
 
 	# disable pyc compiling
-	ln -sfn $(type -P true) py-compile
+	echo > py-compile
 }
 
 src_test() {