Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585); move gnome2_src_prepare after eautoreconf.

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

4 files changed, 23 insertions, 30 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 817e0aed4f46..ee15d850c765 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/totem
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.327 2011/11/25 15:52:19 nirbheek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.328 2012/01/05 08:06:19 tetromino Exp $
+
+  05 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  totem-2.32.0-r2.ebuild, totem-3.2.1.ebuild:
+  Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585); move
+  gnome2_src_prepare after eautoreconf.
 
   25 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -totem-2.32.0.ebuild,
   totem-2.32.0-r2.ebuild:
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 97911d22528a..12870b28f7a0 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX totem-2.30.2-mp2t-support.patch 522 RMD160 098ad431572647b1f84fa53d79e599dd68db479f SHA1 c1f437b3dd864589b2a8d45aa5b58087ad164edb SHA256 fd75446210f92e4abfb0d80018f1e5aad7fc0d4ad586c222b9984e0207dde963
 AUX totem-2.32.0-smclient-target-detection.patch 1546 RMD160 d26dad41d63e3ce2c819fa0be5844b2797d7fdbd SHA1 103b3182229b54e5b11ab6e941af110ee2761483 SHA256 c2c454e1a1776cc7c07ba4ee069105f6010e92478e9598af23956fac0fb13e63
 DIST totem-2.32.0-patches.tar.bz2 13355 RMD160 9974653c46247d37d14f441c8d6f458e2e8fbd2f SHA1 1c575377a610ca672b670107c822970f90edc356 SHA256 fdf1d04e5c2325ba5b982a4fb59b9c70bbdf018418dfc7d0fa8bd28929335a30
 DIST totem-2.32.0.tar.bz2 3278758 RMD160 5312aa67e3ff611be0626fd72da66e1c26d6eb4d SHA1 46589181aee29e021d686a4804bbbb04149a61dc SHA256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47
 DIST totem-3.2.1.tar.xz 3132760 RMD160 d4283ba926f57cd253ae305cd6f67b161e9ae8c8 SHA1 36370da6475652526facd8511a8be0d615058060 SHA256 e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4
-EBUILD totem-2.32.0-r2.ebuild 5927 RMD160 93bb42178da04e7a86b54a550ea98b4568cc3b23 SHA1 6a9b613323474571e7c2b85055621239de771201 SHA256 f9d88adad7ff657c942b1a38eb4142cb59f3f60f13a37d4e7c2aca42d4f00c3e
-EBUILD totem-3.2.1.ebuild 5085 RMD160 f862666ba0a976ba58cb02eae0c7ad631f08571b SHA1 a7291569d2b04c1045e68cdfa934fa2250fabb9c SHA256 6c980be63d2590a9b8c1f22f6d8b4a0da75e20958c09218094022f844a003a45
-MISC ChangeLog 48543 RMD160 f45a83a4a23f8781956002a6069eea585f0f6e1f SHA1 dd21c36f64d3c23872ecb333f7135cbc75c0a7a7 SHA256 aefad02ead48959454091a9a7d708725bcad5e727b1b15f49a65e8a99937efb5
+EBUILD totem-2.32.0-r2.ebuild 5882 RMD160 a025159708e4e89203096f843cda9968bc770fcd SHA1 d7114fd15ad0d448131f8b3785613c5c4abcc24a SHA256 dedda171e6aaf5ea764f33f85f1aefcefb07ff964efecced44264452ec52c767
+EBUILD totem-3.2.1.ebuild 5039 RMD160 f99a2bd876a8839450ea1a44f266c2ecf74a6b40 SHA1 9c4e0f440d2731871880ddc4ee84aba63c720d8c SHA256 a299068ff8a2f394475326fbadd2b3833ba61834556f9276d7342fdeaa08ccae
+MISC ChangeLog 48767 RMD160 ce099b18b8509f9cfd9e28c1b84afb85c1f02539 SHA1 a989a4a3710896556d6358d34493e164f34c277c SHA256 57eb6b2dfc9f8c7d25c5bf84df175b507c49f3e5f238153c1ab957890971ea0b
 MISC metadata.xml 1677 RMD160 59d7896204f7ec816dfb328963ee5b778183444a SHA1 83e27c979fe6052f731f0fcb279cdf1079f01a9d SHA256 1d1ade7ca3b0fca0d74ae45fa77521ac58481bac8cba3345d662ecc80fd2c3d1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOz7ncAAoJEO/kOhxWD91ktzQP/i7ny4DNuiHLKFt0L1qquJMz
-Gjpk5lW5+pXBIbOCYuWgVyFqiV2JNZYLpN6tdyzmdgs7URk6SpswtDqGxoLIojcO
-AHC3oqm/V4c9RWsnJuoWPdAfIsjuhf007HZ3YlkBD2sGifgU6rG+iqWQuwu5NtBx
-IEP3N0SQXeMiy95IsA7NeWEQW4r8SyRMLHoMP3hyzxBaqqi/P9JECB7C7gUVT48y
-5WOogQVfu7dRhK0gEZv1MRkt0e3dJmcBJi0vti/LiylB08TU53GkPcQKcm2HoyQ6
-5U8/Dqpc1FAspMWgu+YvPHxJDcuNrAGsTSXqFf5N48jFUtSELeDAfZ+Ehx4jGVbM
-iPDXXQh4BYhG4REq1guRMJ48wOLh57ijvFOJnaHBI0Wlz19dac7tMXFEWbigFn5X
-PAZ6k7/FzeSuAhPzVHROMoQQXqo3YlruriNSHCnl1yrqZfeQJcmsMcrlei9KG3iS
-AzZgLyz4B8ya7dlap0X54zFxHPy1K0xJwRXh1bPUTd5k13YUAZ8u1wfoYfrybysw
-e4b+Z5pbC9pJDgJt1h1xbmXudrBVaTu0prKo98rIyaDuskBPouZgQT6fEQ9fjj3e
-oPB+LPNN6koAaYNVt9fgL6LZ0wHMWkv0cnVhJoki0rxAGRR1gQ6jvSDj/ErHVzIl
-mI9diEOUvT2A+gGvRpjy
-=GdNC
+iF4EAREIAAYFAk8FWgEACgkQdjK8w9WeBnAt2wD+PaYvTPziwiRKcOhQqB5rIMvi
+V1pfBrOHaKu1ROMSKtoA/i8k6a56pNechgKgNRScRYYZG/YT+w/h2Lg8NdBXYSpH
+=lrz9
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-2.32.0-r2.ebuild b/media-video/totem/totem-2.32.0-r2.ebuild
index 920102896495..9fba6ce387e0 100644
--- a/media-video/totem/totem-2.32.0-r2.ebuild
+++ b/media-video/totem/totem-2.32.0-r2.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-video/totem/totem-2.32.0-r2.ebuild,v 1.7 2011/11/25 15:52:19 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.8 2012/01/05 08:06:20 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -142,8 +142,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Use fixed gnome-doc-utils.make, bug #348403 (can be dropped in next bump)
 	cp -f /usr/share/gnome-doc-utils/gnome-doc-utils.make . || die
 
@@ -156,9 +154,10 @@ src_prepare() {
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 
+	gnome2_src_prepare
+
 	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	echo > py-compile
 }
 
 src_configure() {
diff --git a/media-video/totem/totem-3.2.1.ebuild b/media-video/totem/totem-3.2.1.ebuild
index bdeb866e2679..6e39486cc795 100644
--- a/media-video/totem/totem-3.2.1.ebuild
+++ b/media-video/totem/totem-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/media-video/totem/totem-3.2.1.ebuild,v 1.1 2011/11/03 06:18:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.1.ebuild,v 1.2 2012/01/05 08:06:19 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -150,8 +150,7 @@ src_prepare() {
 	#fi
 
 	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	echo > py-compile
 
 	gnome2_src_prepare
 }