Attempted to address bug #313459

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 26 insertions, 9 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 19b5074ed711..1ea6d060d610 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.120 2010/04/07 04:22:57 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.121 2010/05/08 03:20:20 nixphoeni Exp $
+
+*gdesklets-core-0.36.2-r1 (08 May 2010)
+
+  08 May 2010; Joe Sapp <nixphoeni@gentoo.org>
+  -gdesklets-core-0.36.2.ebuild, +gdesklets-core-0.36.2-r1.ebuild,
+  files/gdesklets-control-getid:
+  Attempted to address bug #313459; fixed typo in postinst message
 
   07 Apr 2010; Jeremy Olexa <darkside@gentoo.org>
   gdesklets-core-0.36.1-r2.ebuild, gdesklets-core-0.36.1-r3.ebuild,
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-control-getid b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
index 8b309a2c98b9..f16771ad805b 100755
--- a/gnome-extra/gdesklets-core/files/gdesklets-control-getid
+++ b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
@@ -1,7 +1,7 @@
-#!/usr/bin/env python
-# Copyright 1999-2005 Gentoo Foundation
+#!/usr/bin/env python2
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.3 2005/08/30 19:29:27 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.4 2010/05/08 03:20:21 nixphoeni Exp $
 # 
 # A simple script to get the name and id from a Control.
 # Pretty much copied from test-control.py
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild
index 56c65740135a..a08dab546d5f 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 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.2.ebuild,v 1.2 2010/04/07 04:22:57 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild,v 1.1 2010/05/08 03:20:20 nixphoeni Exp $
 
 EAPI=2
 # desklets don't run with USE=debug
-#GCONF_DEBUG="no"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.4"
 
-# We want the latest autoconf and automake (the default)
 inherit gnome2 python eutils autotools multilib bash-completion
 
 MY_PN="gDesklets"
@@ -43,6 +43,14 @@ MAKEOPTS="${MAKEOPTS} -j1"
 # Force using MAKEOPTS with emake
 USE_EINSTALL="0"
 DOCS="AUTHORS ChangeLog NEWS README TODO"
+CONVERT_SHEBANGS="ctrlinfo gdesklets gdesklets-daemon gdesklets-logview \
+	gdesklets-shell test-control.py contrib/gdesklets-migration-tool"
+
+pkg_setup() {
+
+	python_set_active_version 2
+
+}
 
 src_prepare() {
 
@@ -55,6 +63,8 @@ src_prepare() {
 	eautoreconf
 	intltoolize --force || die
 
+	python_convert_shebangs 2 ${CONVERT_SHEBANGS}
+
 }
 
 src_install() {
@@ -85,7 +95,7 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 	python_need_rebuild
 	# Compile pyc files on target system
-	python_mod_optimize "${ROOT:-/}usr/$(get_libdir)/gdesklets"
+	python_mod_optimize "/usr/$(get_libdir)/gdesklets"
 
 	echo
 	elog "gDesklets Displays are required before the library"
@@ -105,7 +115,7 @@ pkg_postinst() {
 	elog "If you're updating from a version less than 0.35_rc1,"
 	elog "you can migrate your desklet configurations by"
 	elog "running"
-	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/gdesklets-migration-tool"
+	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/contrib/gdesklets-migration-tool"
 	elog "after the first time you run gDesklets"
 	elog