Don't use the package system to byte-compile python, bug 381587. Patch from Chris Mayo.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 34 insertions, 7 deletions

diff --git a/gnome-extra/gnome-dvb-daemon/ChangeLog b/gnome-extra/gnome-dvb-daemon/ChangeLog
index 94471134ea82..7d263c567f3a 100644
--- a/gnome-extra/gnome-dvb-daemon/ChangeLog
+++ b/gnome-extra/gnome-dvb-daemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-dvb-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/ChangeLog,v 1.3 2011/08/31 23:18:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/ChangeLog,v 1.4 2011/09/06 18:40:49 mattst88 Exp $
+
+  06 Sep 2011; Matt Turner <mattst88@gentoo.org> gnome-dvb-daemon-0.2.2.ebuild:
+  Don't use the package system to byte-compile python, bug 381587. Patch from
+  Chris Mayo.
 
   31 Aug 2011; Matt Turner <mattst88@gentoo.org> gnome-dvb-daemon-0.2.2.ebuild:
   Pass --with-totem-plugin-dir since totem-2 doesn't ship a .pc file, bug
diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
index 8735326a4b41..49869416aa85 100644
--- a/gnome-extra/gnome-dvb-daemon/Manifest
+++ b/gnome-extra/gnome-dvb-daemon/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST gnome-dvb-daemon-0.2.2.tar.bz2 765800 RMD160 b05e43a7ddd29f006b4d4f415954aff37333d0de SHA1 5d3cf1073e25452b41d599d2096973c0c5ba0e72 SHA256 f1fe5e7be77a830cf8c4901bb2948dbece2a12fa289598ec4c68b6456ba5bf55
-EBUILD gnome-dvb-daemon-0.2.2.ebuild 1374 RMD160 b7b47f4baadf19bfdd740f2e0eb84a09476b6761 SHA1 d142555d4a839b9e72e1b5d41867847334bc7a13 SHA256 d5552d6c82a9f96ab7188e9cfc85c63b56efc8a336096a69fee4171879010992
-MISC ChangeLog 711 RMD160 07ac2b3bfdf27578720665630626e301cef91e7c SHA1 be8eb3661de28d52f26804c8ae0cc66ab9efe689 SHA256 2777450f814907400351120c975ae42c3efb3cfd1368939a6df5bb3aff7a6cad
+EBUILD gnome-dvb-daemon-0.2.2.ebuild 1793 RMD160 85062b82260b87f027e6b4b5b1caf6a6da0c27fc SHA1 99f122365271605157b400ef88e2b6eb63fc5de0 SHA256 6ff19ed632a39b52ae02383a17ba7fd556f340b72e4bed05871f5c87db97b875
+MISC ChangeLog 884 RMD160 a602a3143a8c700b319ccdcd5505aad9dbe79ce9 SHA1 a3f926fcc6440c4b90feca7720dddfa9c5f5e193 SHA256 5cd6c70ebf9cd6d615ae62065f89eec377cb2b256db5cd9f6b06a0d95a18a430
 MISC metadata.xml 402 RMD160 2e016355dc47222ec0d3a7274220eb087768931c SHA1 1bd70b82e81820dbf36e882381b3b263ade14679 SHA256 00919ebb5f2e26cfac5fc6f9a1f956360b6b0bd6515f508c59a55ab02442b82b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5ewUgACgkQTVUdg23rv51oVACdGnwsg89j1pV3euCGaYCd8ym0
-5lYAoIGy3mgqiQsTfJut1KEcel3ZtgtJ
-=IGAk
+iEYEARECAAYFAk5maTUACgkQTVUdg23rv53TowCaAgIHyp8KWH+wEY9d+Os5Ekgq
+bI8AoIzu3aFfm9GcG6zIv16L1bUJlf8/
+=KHtZ
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.2.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.2.ebuild
index ec04fc11087c..32bb85619981 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.2.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.2.ebuild,v 1.2 2011/08/31 23:18:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.2.ebuild,v 1.3 2011/09/06 18:40:49 mattst88 Exp $
 
 EAPI="3"
 
@@ -45,3 +45,26 @@ pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 }
+
+src_prepare() {
+	# Disable byte-compilation of Python modules.
+	ln -s $(type -P true) py-compile
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	python_mod_optimize gnomedvb
+	if use totem; then
+		python_mod_optimize "/usr/$(get_libdir)/totem/plugins"
+	fi
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup gnomedvb
+	if use totem; then
+		python_mod_cleanup "/usr/$(get_libdir)/totem/plugins"
+	fi
+	gnome2_pkg_postrm
+}