[gentoo-commits] gentoo-x86 commit in gnome-extra/gdesklets-core: ChangeLog gdesklets-core-0.36-r1.ebuild

[Joe Sapp (nixphoeni)]

nixphoeni    08/05/30 23:25:08

  Modified:             ChangeLog gdesklets-core-0.36-r1.ebuild
  Log:
  Generate .py[co] files at pkg_postinst (bug #215538)
  (Portage version: 2.1.5.2)

Revision  Changes    Path
1.88                 gnome-extra/gdesklets-core/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog?r1=1.87&r2=1.88

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog	22 Apr 2008 02:32:54 -0000	1.87
+++ ChangeLog	30 May 2008 23:25:07 -0000	1.88
@@ -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@g.o>
+  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@g.o>
   +files/gdesklets-core-0.36_beta-linguas.patch:



1.2                  gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild?r1=1.1&r2=1.2

Index: gdesklets-core-0.36-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdesklets-core-0.36-r1.ebuild	20 Apr 2008 05:08:54 -0000	1.1
+++ gdesklets-core-0.36-r1.ebuild	30 May 2008 23:25:07 -0000	1.2
@@ -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 @@
 
 	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 @@
 
 	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 @@
 	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
+
+}



-- 
gentoo-commits@l.g.o mailing list