Generate .py[co] files at pkg_postinst (bug #215538)

Package-Manager: portage-2.1.5.2

3 files changed, 32 insertions, 8 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 88c452b08009..f51e0843b7eb 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.87 2008/04/22 02:32:54 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.88 2008/05/30 23:25:07 nixphoeni Exp $
+
+  30 May 2008; Joe Sapp <nixphoeni@gentoo.org>
+  gdesklets-core-0.36-r1.ebuild:
+  Generate .py[co] files at pkg_postinst so they're compiled for the target
+  machine. See bug #215538 (thanks eva).
 
   22 Apr 2008; Joe Sapp <nixphoeni@gentoo.org>
   +files/gdesklets-core-0.36_beta-linguas.patch:
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index f30070a781af..9a4408a1deea 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -16,7 +16,7 @@ EBUILD gdesklets-core-0.35.2-r1.ebuild 2711 RMD160 f475048360bf062a57a8465fbfb4e
 EBUILD gdesklets-core-0.35.3-r1.ebuild 2938 RMD160 9b2c52d3844ade0c9ef1a0fe8e871d090fc6578e SHA1 ff6da5458ce895f06d52e79e628dc7f621168c15 SHA256 fbcfdc34840378bb8b6427696e461acf6c94d7367fabf7428ba56e0df4d61177
 EBUILD gdesklets-core-0.35.3.ebuild 2888 RMD160 ee71584824fec3ae206276467e25f419db93d40c SHA1 6133b98273403ce1bc444c99ba359dc945c6808b SHA256 938518859691fbe93195fbf5bef36ba53b529204d9565064a494fbd57c0df5f3
 EBUILD gdesklets-core-0.35.4.ebuild 3092 RMD160 dba557e7f6dd8652d22a9c880b8967da49d3bd71 SHA1 fec772158a14703f6debb2a33339e0710b4e6c85 SHA256 c39a3a977ed38b7a781733bde3ffb253ed801026603b00b408ee6d47d1dda0a3
-EBUILD gdesklets-core-0.36-r1.ebuild 2607 RMD160 14cb525eb46e536a3bc69d023478848422e63c6b SHA1 8a5e07debd3b333beb5a0fc39c15b15105f44bf0 SHA256 646013afccb89237607c6aaa1dc029a960149a3d15f2fcc654393751bbab57cd
+EBUILD gdesklets-core-0.36-r1.ebuild 3193 RMD160 9e81b7cff160cbf5cc72c9095c4f8b3d30c3d98f SHA1 e0c136c1f794e3ca909be6ed945f692b093cd38d SHA256 3b956e39c94014745f5d09ef492a65c35d8b6f1a71a0f55937e6dfdbccf6cf6b
 EBUILD gdesklets-core-0.36.ebuild 2457 RMD160 e05523a52c09f33ab642c92929d7bc0dd946090f SHA1 0bb8fadedba6cf4eab806238860fb29358e54ac3 SHA256 d800a6f8341e19b0c2a3aae17fff17a8574cdea27468926998f300c3fec30f6e
-MISC ChangeLog 16719 RMD160 a9a68ba9b84e46b4a4a70fc537432344ea639e22 SHA1 e7a1ba6cd222efe1c214849f03b99d586be1141c SHA256 131e969fdec7d2553dc022283cdb59e97a166cac9bdc7c9121edae6781298ade
+MISC ChangeLog 16917 RMD160 8979d4910ebcab04ba4bbad0cb53ac5ca127df45 SHA1 634f6bba6dd86a29c86c25fef2765bd45c27b98a SHA256 71df8f9b4a57895b906a0c4935572fd7a580690fa6f24a482375e81e8bf2738d
 MISC metadata.xml 225 RMD160 84ee2a2d6e82c97c9059ca7cfc17f222f18e4431 SHA1 54492f0c3ac21555e1a60882fa7b92103fc3d2c8 SHA256 49feb5b4f0a008e92acb1626adf763199e38ad92f465e41943a89941213ffeef
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild
index a1cc0335bb23..7a3cb2d34b38 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild,v 1.1 2008/04/20 05:08:54 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild,v 1.2 2008/05/30 23:25:07 nixphoeni Exp $
 
 # We want the latest autoconf and automake (the default)
-inherit gnome2 eutils autotools multilib
+inherit gnome2 python eutils autotools multilib
 
 MY_PN="gdesklets"
 MY_P="${MY_PN}-${PV/_/}"
@@ -46,6 +46,10 @@ src_unpack() {
 
 	gnome2_src_unpack
 
+	# Postpone pyc compiling until pkg_postinst
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
 	# Use po/LINGUAS - see gnome bug #506828
 	epatch "${FILESDIR}/${PN}-0.36_beta-linguas.patch"
 
@@ -73,16 +77,22 @@ pkg_postinst() {
 
 	gnome2_pkg_postinst
 
+	# Compile pyc files on target system
+	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/gdesklets
+
 	echo
 	elog "gDesklets Displays are required before the library"
-	elog "will be usable. The displays are found in -"
+	elog "will be usable.  Core displays (Calendar, Clock, Quote-of-the-Day,"
+	elog "and the 15pieces game) are already installed in"
+	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/Displays"
+	elog "Additional displays can be found in -"
 	elog "           x11-plugins/desklet-* ,"
 	elog "at http://www.gdesklets.de, or at http://gdesklets.zencomputer.ca"
 	elog
 	elog "Next you'll need to start gdesklets using"
 	elog "           ${ROOT}usr/bin/gdesklets start"
-	elog "If you're using GNOME this can be done conveniently"
-	elog "through Applications->Accessories->gDesklets"
+	elog "If you're using GNOME this can be done conveniently through"
+	elog "Applications->Accessories->gDesklets"
 	elog
 	elog "If you're updating from a version less than 0.35_rc1,"
 	elog "you can migrate your desklet configurations by"
@@ -96,3 +106,12 @@ pkg_postinst() {
 	epause 9
 
 }
+
+pkg_postrm() {
+
+	gnome2_pkg_postrm
+	# Cleanup after our cavalier python compilation
+	# The function takes care of ${ROOT} for us
+	python_mod_cleanup /usr/$(get_libdir)/gdesklets
+
+}