Added patch to try to fix bug #314653

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

5 files changed, 33 insertions, 14 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index fa2bc5463744..56e9c26be823 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.122 2010/05/08 18:50:14 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.123 2010/05/08 19:04:24 nixphoeni Exp $
+
+*gdesklets-core-0.36.2-r2 (08 May 2010)
+
+  08 May 2010; Joe Sapp <nixphoeni@gentoo.org>
+  -gdesklets-core-0.36.2-r1.ebuild, +gdesklets-core-0.36.2-r2.ebuild,
+  files/gdesklets-control-getid, +files/gdesklets-core-getid-fix.patch:
+  Added patch to try to fix bug #314653
 
   08 May 2010; Joe Sapp <nixphoeni@gentoo.org>
   -gdesklets-core-0.36.1-r2.ebuild:
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index 16d55bb391d6..0b4248fdc2ce 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,12 +1,13 @@
-AUX gdesklets-control-getid 1147 RMD160 503fd354ed2d2bce5fd66de0d4a809a1ebaf758a SHA1 6e7af47a28a9687bec9867092ad5d2ec891c516d SHA256 134d3f298b9abd5dee087a5a64b4e9b34719fcf55196a01b6e87d47a897ec414
+AUX gdesklets-control-getid 1025 RMD160 8683ec0a308d50040352902962bdca70e7b013a1 SHA1 7fbbbd8c1ef9ca1cc5c0ab2432ded19b5df3ccf0 SHA256 5f53ea065e32ac686c9234935d55fce2a23693c9ba8a145eaca31d30b7795def
 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
 AUX gdesklets-core-0.36_beta-linguas.patch 1208 RMD160 5b691f445e73316232e394b8dca91601ac57d706 SHA1 d9fe4ed5775921c772b00399f3479afbb4a184d9 SHA256 760a79c3df6c6680ea6b76d787f666a603c919f7fac6b22869a4cb6ab7023b4b
+AUX gdesklets-core-getid-fix.patch 580 RMD160 d2be1e31658768b9d34d7500f9b6b76d524cec87 SHA1 b54a6a7b06b8634f9d07c0d98662db0164814ca5 SHA256 2be4b77748dc3ac89ad9709ff5f1fd014b78a4468542fad93183df539d77016a
 AUX gdesklets.desktop 265 RMD160 a6a84a28abf1120cc8df2e52505c119cdb82cca7 SHA1 a8a544d457cf613f939c45e29681bab307b0fa36 SHA256 8b38972217e4a923fb988b7982eb1e6655f1f885686a4b9585810999588c11ee
 DIST gDesklets-0.36.2.tar.bz2 3423236 RMD160 93b6c21848fe05cfda539173192901c5c3213e7a SHA1 56742080aa04c27548b8856b6e6aca8861a0d9b5 SHA256 178c651038f5943a714bfe632427d91d58d2caace95a645ecca7c9bd0552d6c8
 DIST gdesklets-0.36.1.tar.gz 3537820 RMD160 ff658aa32ee562ed0563f01e6c5c7267c0e1fa7c SHA1 a865fd5cd65f4e217fb2c16982961b7b1f6d54cc SHA256 5e0cfd4cd99437aba24dfca33a72b2b6aef33b4c1128064ce82a368280bc6d61
 EBUILD gdesklets-core-0.36.1-r3.ebuild 3901 RMD160 07928240b4eb04157ef70b9cd36975dab1ed6c19 SHA1 77550eeb35606cd7aa861407d5f3a1c4acdc9fd6 SHA256 0f11c89cf4e5cd1185e8db01d3b34199e900113f93f93c478980dd0ebbb1fb89
-EBUILD gdesklets-core-0.36.2-r1.ebuild 3640 RMD160 e5f9577febdadc35f6856cc782a0eece6a4328b8 SHA1 ac814dee509567f7bdc2f036badd848e2ec87bb8 SHA256 6a69ef7755a20cf547caeee62c19f15dc22bfeff5e86a4e3e910eea2358c8bad
-MISC ChangeLog 23390 RMD160 ea647798e436093e22f78a4ddfa6674b4fb13edd SHA1 bc08b01ac85379bd5e7373ab9f39084f535865f9 SHA256 be1b587969d81635b5568fb82352719ddb6f68ace22f1fe78417b20417d53f40
+EBUILD gdesklets-core-0.36.2-r2.ebuild 3684 RMD160 f7800700fc4b54014aadf157bb36b91dd08d0072 SHA1 d84aefc339d0f57e23c00b5425fdc88f6c9479be SHA256 ba89af124ba7178a55525d219dad64bd393e36fb76f9fa2429a5a1c41537cd51
+MISC ChangeLog 23661 RMD160 4278fc678f6dba8eadb7a0937af28b77bd3ef260 SHA1 5e51d433fdc1a2faf6e2638bdf846d06b5c0b986 SHA256 b83c7bd9800c2451cd21b98efb85e159f03074bad8cfc08752a8218f97a4d5ff
 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 f16771ad805b..9d55d0a5a542 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 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.4 2010/05/08 03:20:21 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.5 2010/05/08 19:04:24 nixphoeni Exp $
 # 
 # A simple script to get the name and id from a Control.
 # Pretty much copied from test-control.py
@@ -18,20 +18,16 @@ try:
     path = os.path.abspath(sys.argv[1])
     folder, base = os.path.split(path)
 except:
-    #sys.exit("Usage: gdesklets-control-getid <control-directory>")
-    print "ERROR_IN_CONTROL_INSTALLATION"
-    
+    sys.exit("ERROR IN CONTROL INSTALLATION")
+
 
 os.chdir(folder)
 try:
     module = __import__(base)
-    os.chdir(base)
     clss = module.get_class()
-    ctrl = clss()
-    
+
 except IOError:
-    #sys.exit("Could not load control %s." % (path))
-    print folder
+    sys.exit("Could not load control in %s!" % (folder))
 
 # Get the string in the form of "IMyControl:hash" and translate it to
 # "MyControl_hash"
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
new file mode 100644
index 000000000000..ae458a3bb2b1
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
@@ -0,0 +1,14 @@
+--- main/__init__.py  2009-09-20 20:02:48 +0000
++++ main/__init__.py  2010-05-08 15:41:26 +0000
+@@ -16,8 +16,11 @@
+     # case the DISPLAY variable doesn't contain the screen number)
+     DISPLAY = vfs.escape_path(gtk.gdk.Display(os.environ["DISPLAY"]).get_name()).replace("/", "_")
+ except:
+-    print "Error: could not open display", os.environ["DISPLAY"]
+-    sys.exit(1)
++    try:
++        print >> sys.stderr, "Error: could not open display", os.environ["DISPLAY"]
++    except:
++        print >> sys.stderr, "(could not get DISPLAY environment variable)"
++    DISPLAY = "0"
+
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild
index a08dab546d5f..f207a14a601d 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2010/05/08 03:20:20 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild,v 1.1 2010/05/08 19:04:24 nixphoeni Exp $
 
 EAPI=2
 # desklets don't run with USE=debug
@@ -54,6 +54,7 @@ pkg_setup() {
 
 src_prepare() {
 
+	epatch "${FILESDIR}/${PN}-getid-fix.patch"
 	gnome2_src_prepare
 
 	# Postpone pyc compiling until pkg_postinst