Fix bug #539638, thanks a lot to Agustin Ferrari

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 115 insertions, 23 deletions

diff --git a/x11-misc/gdevilspie/ChangeLog b/x11-misc/gdevilspie/ChangeLog
index 80d5c48d7b79..44c77de61e1c 100644
--- a/x11-misc/gdevilspie/ChangeLog
+++ b/x11-misc/gdevilspie/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/gdevilspie
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdevilspie/ChangeLog,v 1.8 2014/08/10 20:02:27 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdevilspie/ChangeLog,v 1.9 2015/04/26 12:22:43 pacho Exp $
+
+*gdevilspie-0.5-r1 (26 Apr 2015)
+
+  26 Apr 2015; Pacho Ramos <pacho@gentoo.org> +files/gdevilspie-0.5-paths.patch,
+  +gdevilspie-0.5-r1.ebuild, -gdevilspie-0.5.ebuild:
+  Fix bug #539638, thanks a lot to Agustin Ferrari
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> gdevilspie-0.5.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/x11-misc/gdevilspie/Manifest b/x11-misc/gdevilspie/Manifest
index 94324eb3aa6c..236d9724c55f 100644
--- a/x11-misc/gdevilspie/Manifest
+++ b/x11-misc/gdevilspie/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gdevilspie-0.5.tar.bz2 29028 SHA256 e03ab813e56b6dc6d868db7c318d280c9864cfa6e8a4ca84a5bb5d05542f55ff
-EBUILD gdevilspie-0.5.ebuild 829 SHA256 4cf247e15bc6038948a201088895ef19a1f0d1e75ee69c2c84b05aae01cb8866 SHA512 ed15fb08c094e5e1a0c3962d35cdb9b8f7b1313b2178b9c96e1f73be184c9e123279f6f1862e171537ea65f7925521dae7c06616049cf1f3d6ba34c5f93b7aa8 WHIRLPOOL 06113fcc08c0d47dd5b0132306305d3a263b94d451cb36a79fdb25eb4dc2d90268e60cd56251b343d4b72bac02f0298b5fae679e1b593d194f484aa282f306a0
-MISC ChangeLog 1202 SHA256 f5662e26919530d514883a0184bdd2c2904da6952e66a000b47aee5a1ed8659e SHA512 ed47d7155c1dba5a25add35e934cf09246492b536b664f405db427eb37d61bd141988d42db4dd79132276696c44c6c4acdb004538760fa3ca3d952a6298142f2 WHIRLPOOL 000d0423ac8e06ee46d507ea13e32bf66eaaf6d230f285d4d88fe7f63f2534454b7af2de0299519dfc00d5c794e62eafa523d10bc5fb2ca19020b4914a05f0ef
+AUX gdevilspie-0.5-paths.patch 4329 SHA256 02b1b93631e517a6f24620dfebdc6a6deaabf08368fb0b07bbcd52587f7dba2c SHA512 700ddd456121561ac2932480115b041b024bf205e0883383cfe0cb8f4d0df4d2ae59fdac4ba9bc92865f1a388a6202c34d72a0360505dfc05972ecbba8913272 WHIRLPOOL 8ab0540f9ece8d4d15ebce879b9f6a226e2b06c0e915512b841dd3778ee9fc3f98bed8e2a399ac300d7ac1d1abc69628e008dc613ca30a9a3c56f364af5b6a15
+DIST gdevilspie-0.5.tar.bz2 29028 SHA256 e03ab813e56b6dc6d868db7c318d280c9864cfa6e8a4ca84a5bb5d05542f55ff SHA512 0426b58c37b3078185abf8f3100f1da982b58e789c68b8f2f1b4e6e6f4befbaf12782b9790be5a1e90ee432a46cc1a91a69997c54796c756276e59533dccb388 WHIRLPOOL 43c7220c44ef005289bb3f9eaada51eb6bac42dba00920e4d55c029262289ee43b6d8c498c8daa48bffb0194c93d852bc471d98e09a808799b58f59e12636454
+EBUILD gdevilspie-0.5-r1.ebuild 891 SHA256 6d1d7bcc471c0d75fc94a74508c1f29c5b67e52a1c19718168eb97f53a64cc04 SHA512 85e33a84b3483f411e0dc4d7f166289d7da97698001269d1fcb0d86540c51fee184473c3d3e7cbc4776d054775168c1af8fb7ea129f5348e7c79d9bc9053effb WHIRLPOOL 0d3738e62cb7cb05341760f6505b09fdf575801eabbfac9f1e8e99e0d06c6d6ec96d4519ccacf12a90ff1adbc19019976afcc9b5ce3114b05ea44c3cb7ae5d60
+MISC ChangeLog 1421 SHA256 90e5dc58e4123aee3603d71a4392d03d6536a10b861baceffc275745dbd34949 SHA512 e36e345507a9daa0f9b0abe31174dbecaa4833dd5059fe096897cd0735a7c068e73e607bd220f8b8170c3780717882fd484a9cf7903133a70d12469f33b24d49 WHIRLPOOL a08d23078b2774bacd90cc7f92327d6d644c0c06dfafad8e8b5c710a73cbad02b7b3f8bca1419a428d964a852d0620b89e1ab7fd0d8c747a444ce8aed441e0e0
 MISC metadata.xml 246 SHA256 e8ab9feb923faf91d39f4b1ee9eb12aa6bb7e41af762f2a606046ee349e4e8fc SHA512 662f6f12ad06a42250682b14f392a8a5dd5046a9cc28a0bd9015f1d9c2a978ff1408897d8b99634b710ad00a4c09a0a0b27e145c242581166f3aa732640b75fe WHIRLPOOL 3a5d4b3c482c4096f79d25a07ec39528c91bff6474e7a915c65ba00978bae092aaf1008a4f64080eac85dc3a392e07a6e0a3ce67790de837982eefedf70f7038
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPnz9QACgkQcaHudmEf86pkdwCfapl+i+14uHW8Wf7rBR4gu+4M
-GqkAn3REiN17niZYwVW1JmGs6y7pQbMS
-=bTrD
+iEYEAREIAAYFAlU82JQACgkQCaWpQKGI+9QangCfYBJ4LXuAdfBladvTYcC2JaJ7
+mvgAn2Ha/skF8wCg4o0AXGbw+Y9HMXht
+=fkc2
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/gdevilspie/files/gdevilspie-0.5-paths.patch b/x11-misc/gdevilspie/files/gdevilspie-0.5-paths.patch
new file mode 100644
index 000000000000..771501b0045e
--- /dev/null
+++ b/x11-misc/gdevilspie/files/gdevilspie-0.5-paths.patch
@@ -0,0 +1,84 @@
+--- /home/usuario/Escritorio/gdevilspie	2015-04-26 03:30:16.760326671 -0300
++++ /usr/lib/python-exec/python2.7/gdevilspie	2015-04-26 03:32:11.247227671 -0300
+@@ -48,6 +48,10 @@
+ DISABLE_XDG=""
+ try:
+     import xdg.DesktopEntry
++    if xdg.DesktopEntry.__dict__.has_key('xdg_config_home') == True:
++        xdg_config_home = xdg.DesktopEntry.xdg_config_home 
++    else:
++        xdg_config_home = os.path.join(os.environ["HOME"], "config")
+ except:
+ 	error = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Make sure that Python-xdg is correctly installed if you need autostart handling.")
+ 	response = error.run()
+@@ -300,22 +304,32 @@
+ 	return strous
+ 
+ # Glade file used in all classes
+-if os.path.isfile(os.path.dirname(sys.argv[0])+'/gdevilspie.glade'):
+-	gladefile = os.path.dirname(sys.argv[0])+'/gdevilspie.glade'
+-elif os.path.isfile(os.path.dirname(sys.argv[0]) + '/../share/gdevilspie/gdevilspie.glade'):
+-	gladefile = os.path.dirname(sys.argv[0])+'/../share/gdevilspie/gdevilspie.glade'
+-else:
+-	gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Glade file not found, exiting.").run()
+-	quit()
++for syspath in os.environ["PATH"].split(":"):
++	if os.path.isfile(os.path.dirname(syspath) + '/../share/gdevilspie/gdevilspie.glade'):
++		gladefile = os.path.dirname(syspath)+'/../share/gdevilspie/gdevilspie.glade'
++		break
++if "gladefile" not in globals():
++	if os.path.isfile(os.path.dirname(sys.argv[0])+'/gdevilspie.glade'):
++		gladefile = os.path.dirname(sys.argv[0])+'/gdevilspie.glade'
++	elif os.path.isfile(os.path.dirname(sys.argv[0]) + '/../share/gdevilspie/gdevilspie.glade'):
++		gladefile = os.path.dirname(sys.argv[0])+'/../share/gdevilspie/gdevilspie.glade'
++	else:
++		gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Glade file not found, exiting.").run()
++		quit()
+ 
+ 
+ # icon used
+-if os.path.isfile(os.path.dirname(sys.argv[0])+'/gdevilspie.png'):
+-	gdevilspie_icon = os.path.dirname(sys.argv[0])+'/gdevilspie.png'
+-elif os.path.isfile(os.path.dirname(sys.argv[0]) + '/../share/gdevilspie/gdevilspie.png'):
+-	gdevilspie_icon = os.path.dirname(sys.argv[0])+'/../share/gdevilspie/gdevilspie.png'
+-else:
+-	gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Icon file not found.").run()
++for syspath in os.environ["PATH"].split(":"):
++	if os.path.isfile(os.path.dirname(syspath) + '/../share/gdevilspie/gdevilspie.png'):
++		gdevilspie_icon = os.path.dirname(syspath)+'/../share/gdevilspie/gdevilspie.png'
++		break
++if "gdevilspie_icon" not in globals():
++	if os.path.isfile(os.path.dirname(sys.argv[0])+'/gdevilspie.png'):
++		gdevilspie_icon = os.path.dirname(sys.argv[0])+'/gdevilspie.png'
++	elif os.path.isfile(os.path.dirname(sys.argv[0]) + '/../share/gdevilspie/gdevilspie.png'):
++		gdevilspie_icon = os.path.dirname(sys.argv[0])+'/../share/gdevilspie/gdevilspie.png'
++	else:
++		gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Icon file not found.").run()
+ 
+ # Directory where we store .ds files
+ dir = os.path.expanduser("~/.devilspie")
+@@ -542,12 +556,12 @@
+ 		if ( DISABLE_XDG == "True" ):
+ 				self.DaemonAutostart.set_sensitive(False)
+ 		else:
+-				if (os.path.exists(xdg.DesktopEntry.xdg_config_home + "/autostart/devilspie.desktop")):
+-					df = xdg.DesktopEntry.DesktopEntry(xdg.DesktopEntry.xdg_config_home + "/autostart/devilspie.desktop")
++				if (os.path.exists(xdg_config_home + "/autostart/devilspie.desktop")):
++					df = xdg.DesktopEntry.DesktopEntry(xdg_config_home + "/autostart/devilspie.desktop")
+ 					if (df.get('X-GNOME-Autostart-enabled') == 'true'):
+ 							self.DaemonAutostart.set_active(True)
+ 				else:
+-						df = xdg.DesktopEntry.DesktopEntry(xdg.DesktopEntry.xdg_config_home + "/autostart/devilspie.desktop")
++						df = xdg.DesktopEntry.DesktopEntry(xdg_config_home + "/autostart/devilspie.desktop")
+ 						df.set('Name','Devilspie')
+ 						df.set('Exec','devilspie')
+ 						df.set('X-GNOME-Autostart-enabled','false')
+@@ -555,7 +569,7 @@
+ 
+ 					
+   def on_DaemonAutostart_toggled(self,widget):
+-			df = xdg.DesktopEntry.DesktopEntry(xdg.DesktopEntry.xdg_config_home + "/autostart/devilspie.desktop")
++			df = xdg.DesktopEntry.DesktopEntry(xdg_config_home + "/autostart/devilspie.desktop")
+ 			if (widget.get_active()):
+ 					df.set('X-GNOME-Autostart-enabled','true')
+ 					df.write()
diff --git a/x11-misc/gdevilspie/gdevilspie-0.5.ebuild b/x11-misc/gdevilspie/gdevilspie-0.5-r1.ebuild
index a4b30f189941..7e4c189c4eb6 100644
--- a/x11-misc/gdevilspie/gdevilspie-0.5.ebuild
+++ b/x11-misc/gdevilspie/gdevilspie-0.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdevilspie/gdevilspie-0.5.ebuild,v 1.2 2014/08/10 20:02:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdevilspie/gdevilspie-0.5-r1.ebuild,v 1.1 2015/04/26 12:22:43 pacho Exp $
 
-EAPI=4
-PYTHON_DEPEND="2:2.6"
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="A user friendly interface to the devilspie window matching daemon, to create rules easily"
 HOMEPAGE="http://code.google.com/p/gdevilspie/"
@@ -16,19 +16,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=dev-python/pygtk-2*
-	dev-python/libwnck-python"
+DEPEND="
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/libwnck-python[${PYTHON_USEDEP}]
+"
 RDEPEND="${DEPEND}
-	x11-misc/devilspie"
+	x11-misc/devilspie
+"
 
-PYTHON_MODNAME="gDevilspie"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
+PATCHES=(
+	# Fix paths for finding XDG and glade file, bug #539638 
+	"${FILESDIR}/${P}-paths.patch"
+)
 
 src_prepare() {
 	sed -i -e "s:doc/gdevilspie:doc/${PF}:" setup.py || die
-	distutils_src_prepare
+	distutils-r1_src_prepare
 }