Attempted to address bug #313459

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

4 files changed, 29 insertions, 12 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/Manifest b/gnome-extra/gdesklets-core/Manifest
index f86589a7ee67..8dbb7a267cad 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,4 +1,4 @@
-AUX gdesklets-control-getid 1146 RMD160 e2a770486e996067c1484f24d73692ce4c34582b SHA1 59ee72ae2eab9f91d2e53bcf6d2113b148844b8f SHA256 a3d793c625b5205fd07fdc61d665a6720a2714b403139f5de6cd18fee1c20899
+AUX gdesklets-control-getid 1147 RMD160 503fd354ed2d2bce5fd66de0d4a809a1ebaf758a SHA1 6e7af47a28a9687bec9867092ad5d2ec891c516d SHA256 134d3f298b9abd5dee087a5a64b4e9b34719fcf55196a01b6e87d47a897ec414
 AUX gdesklets-core-0.36-python-2.6-fix.patch 531 RMD160 81940f4dfc1f8b21470eee369f0fdfe5187a7c9f SHA1 e1c801522b9039e9c57a09c824662093fa9cb776 SHA256 1281220ff4f599c1c0b513c4ef0d89670b0af04331cefed0d895b3dbd5a737a0
 AUX gdesklets-core-0.36.1-bash-completion 1425 RMD160 87724e2766e3d9ece61051b146210cc2ccaf0e94 SHA1 4e82336bbd694ed73824a533e1933d357d4df9eb SHA256 640f242d3481c9465a25a704fdbf3e3b370b91cad353fcfa2025b591345ee757
 AUX gdesklets-core-0.36.1-test-control.py-install-fix.patch 483 RMD160 a3a0b625c92738bb99d19f1332ded97fe717d387 SHA1 b088909f190a39479515b9501918fb7e31a03903 SHA256 2d3ef43385c3e2eb506a714ece81768abe6500f58392514a4b1e327bf098625d
@@ -8,6 +8,6 @@ DIST gDesklets-0.36.2.tar.bz2 3423236 RMD160 93b6c21848fe05cfda539173192901c5c32
 DIST gdesklets-0.36.1.tar.gz 3537820 RMD160 ff658aa32ee562ed0563f01e6c5c7267c0e1fa7c SHA1 a865fd5cd65f4e217fb2c16982961b7b1f6d54cc SHA256 5e0cfd4cd99437aba24dfca33a72b2b6aef33b4c1128064ce82a368280bc6d61
 EBUILD gdesklets-core-0.36.1-r2.ebuild 3771 RMD160 428dd73feae93c5bedee564e2eb654ed96224f7d SHA1 c867e0ba058728cf22c5411ea8067e838abe0da8 SHA256 654404ca92ab1b010e6f24592e2eb24af9d0c92971df86547cba3457cc81249f
 EBUILD gdesklets-core-0.36.1-r3.ebuild 3901 RMD160 07928240b4eb04157ef70b9cd36975dab1ed6c19 SHA1 77550eeb35606cd7aa861407d5f3a1c4acdc9fd6 SHA256 0f11c89cf4e5cd1185e8db01d3b34199e900113f93f93c478980dd0ebbb1fb89
-EBUILD gdesklets-core-0.36.2.ebuild 3436 RMD160 6ca5704adbe4ce758a5673545a5cbc111c0f2d44 SHA1 38744075e6e982ce63e7a3c1f76acd34905efc4d SHA256 c50659ed12329d9d22c8fb75ec9c03e3f76778a62ae1ca067e8bb4164a2f3df1
-MISC ChangeLog 23028 RMD160 4cd448fb517c5c099c224b0051bb5b350b0ddd60 SHA1 a61d08af9c957b20eac7d909669732d3bf1bf305 SHA256 03a44c04d47deb63da3ab0022924c6aa91a597cb1798872e629cce653805d6dc
+EBUILD gdesklets-core-0.36.2-r1.ebuild 3640 RMD160 e5f9577febdadc35f6856cc782a0eece6a4328b8 SHA1 ac814dee509567f7bdc2f036badd848e2ec87bb8 SHA256 6a69ef7755a20cf547caeee62c19f15dc22bfeff5e86a4e3e910eea2358c8bad
+MISC ChangeLog 23285 RMD160 2a12ccf2d968fd6e6148c70b040637d4ed94aaa1 SHA1 7b233b52f694676c478ad54fca2e0e0d6153b098 SHA256 0bf3c2795243ed68552f6d3d30da031a9e08e4c1ac5e823ef29f41943faee22f
 MISC metadata.xml 313 RMD160 a292cb05998c995298fead8eda4d51d81832fd97 SHA1 ec75a2fe8a0668f263858cf395321641d839e968 SHA256 d913b0c409eb9c0725471cd13f4ed893899f5a09881dfef10dea6cd658a7aad9
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