[gentoo-commits] proj/gnome:master commit in: dev-util/dogtail/, dev-util/dogtail/files/

[gentoo-commits] proj/gnome:master commit in: dev-util/dogtail/, dev-util/dogtail/files/

[Alexandre Rostovtsev]

commit:     2a75928808bab67659bd8946fa5bdaf8cb383da2
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 21:56:34 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon May 25 21:58:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2a759288

dev-util/dogtail: fix paths, keyword x86

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 ...ogtail-0.9.0.ebuild => dogtail-0.9.0-r1.ebuild} |  9 ++++-
 .../dogtail/files/dogtail-0.9.0-gentoo-paths.patch | 43 ++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/dev-util/dogtail/dogtail-0.9.0.ebuild b/dev-util/dogtail/dogtail-0.9.0-r1.ebuild
similarity index 75%
rename from dev-util/dogtail/dogtail-0.9.0.ebuild
rename to dev-util/dogtail/dogtail-0.9.0-r1.ebuild
index f0a3bbc..91a19af 100644
--- a/dev-util/dogtail/dogtail-0.9.0.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 gnome2-utils fdo-mime
+inherit eutils distutils-r1 gnome2-utils fdo-mime
 
 DESCRIPTION="GUI test tool and automation framework using accessibility framework"
 HOMEPAGE="https://fedorahosted.org/dogtail/"
@@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -35,6 +35,11 @@ src_prepare() {
 	# Install docs in one place
 	sed "s:doc/${PN}:doc/${PF}:" -i setup.py || die
 
+	# Upstream loads resources relative to __file__, which doesn't work with
+	# gentoo's dev-lang/python-exec. So we need to add hard-coded paths.
+	epatch "${FILESDIR}"/${PN}-0.9.0-gentoo-paths.patch
+	sed -e "s:@EPREFIX_USR@:'${EPREFIX}/usr':" -i sniff/sniff || die "sed failed"
+
 	distutils-r1_src_prepare
 }
 

diff --git a/dev-util/dogtail/files/dogtail-0.9.0-gentoo-paths.patch b/dev-util/dogtail/files/dogtail-0.9.0-gentoo-paths.patch
new file mode 100644
index 0000000..7c4acfb
--- /dev/null
+++ b/dev-util/dogtail/files/dogtail-0.9.0-gentoo-paths.patch
@@ -0,0 +1,43 @@
+diff --git a/sniff/sniff b/sniff/sniff
+index 86771f9..05f4c6a 100755
+--- a/sniff/sniff
++++ b/sniff/sniff
+@@ -45,23 +45,14 @@ class SniffApp(object):
+         if os.path.exists('sniff.ui'):
+             self.builder.add_from_file('sniff.ui')
+         else:
+-            import os
+-            path = os.path.abspath(
+-                os.path.join(__file__, os.path.pardir, os.path.pardir))
+-            if path is '/': # in case the path is /bin/sniff
+-                path = '/usr'
+-            self.builder.add_from_file(path +
++            self.builder.add_from_file(@EPREFIX_USR@ +
+                                        '/share/dogtail/glade/sniff.ui')
+         self.app = self.builder.get_object(self.appName)
+         try:
+             self.app.set_icon_from_file('../icons/dogtail-head.svg')
+         except Exception:
+             import os
+-            path = os.path.abspath(
+-                os.path.join(__file__, os.path.pardir, os.path.pardir))
+-            if path is '/':
+-                path = '/usr'
+-            self.app.set_icon_from_file(os.path.join(path,
++            self.app.set_icon_from_file(os.path.join(@EPREFIX_USR@,
+                                                      'share/icons/hicolor/scalable/apps/dogtail-head.svg'))
+         self.setUpWidgets()
+         self.connectSignals()
+@@ -666,11 +657,7 @@ def loadIcon(iconName):
+         pixbuf = GdkPixbuf.Pixbuf.new_from_file('icons/' + iconName)
+     except GObject.GError:
+         import os
+-        path = os.path.abspath(
+-            os.path.join(__file__, os.path.pardir, os.path.pardir))
+-        if path is '/':
+-                path = '/usr'
+-        iconName = os.path.join(path, 'share/dogtail/icons/', iconName)
++        iconName = os.path.join(@EPREFIX_USR@, 'share/dogtail/icons/', iconName)
+         pixbuf = GdkPixbuf.Pixbuf.new_from_file(iconName)
+     return pixbuf
+