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

[Gilles Dartiguelongue]

commit:     c94c2b25f275723cb84426e42f8241d2fd23e296
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 23:04:35 2017 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 23:21:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94c2b25

dev-util/dogtail: cleanup old revision

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-util/dogtail/Manifest                          |  1 -
 dev-util/dogtail/dogtail-0.9.0-r2.ebuild           | 61 ----------------------
 .../dogtail/files/dogtail-0.9.0-gentoo-paths.patch | 43 ---------------
 .../dogtail/files/dogtail-0.9.0-get-user.patch     | 28 ----------
 4 files changed, 133 deletions(-)

diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index 2a2c776316b..fb6b27d5aeb 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,3 +1,2 @@
-DIST dogtail-0.9.0.tar.gz 119882 SHA256 564dae5fba4fa3a7f6d53503e0877dad56ae8bce10e181d3d2c0bdbf063f4e36 SHA512 cf2956fad923f0f325f5dc3cd8f5a575491f6c455e2fa597b034b09e1579054b84b6ae80b67cbbe161c012c0de48457f872cfe27a5e0274447d32e21e4a8360d WHIRLPOOL 771606a4bc3d59bd75df85ab9ef3dd8bd4e28161e13fc792bb4108f7b058db18f42c1174499b90d3c307c3302e254278aecf94e03ff894222bc7f12021611c1f
 DIST dogtail-0.9.10.tar.gz 125995 SHA256 ab84f9e691fea621a178d89e8cbd00830dd2bcbd945f48b91b122a445b645e93 SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e WHIRLPOOL a3f973ad621ce79d57e460bc00591414ce804a0c61295982ab882ebf4f29f57cbe10d39b819b2c7cc4ddb2455109dfd1ee4ca5fed5c1c30222294f04e9345fa9
 DIST dogtail-0.9.9.tar.gz 123884 SHA256 5d94620bac19b23606d3ecb28e85628c5ceb505beb530af7023ce5bfb576bc5c SHA512 5283dea40b8193e7380aeebab6c7ad149c232ac3d7360df477bed0e623bacc79fc895694d2aff788dd5f986591c1460c447428d8c2acf25ba240946323eabef8 WHIRLPOOL 4d855893e9da54bca09260729f3dc551e973a47a0ef9db31507c071e0014bb70d809aebb50bb47355c9b536f499f912e6b75846a2fe98f3ed8a2a8df20f43a5f

diff --git a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
deleted file mode 100644
index c40e9462e0e..00000000000
--- a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1 gnome2-utils fdo-mime
-
-DESCRIPTION="GUI test tool and automation framework using accessibility framework"
-HOMEPAGE="https://fedorahosted.org/dogtail/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-base/xorg-server[xvfb]
-	x11-apps/xinit
-"
-DEPEND="${DEPEND}"
-
-src_prepare() {
-	# Install docs in one place
-	sed "s:doc/${PN}:doc/${PF}:" -i setup.py || die
-
-	# Fix current user detection, upstream bug #46
-	# Also, respect TMPDIR
-	epatch "${FILESDIR}"/${PN}-0.9.0-get-user.patch
-
-	# 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
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

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
deleted file mode 100644
index 7c4acfb6288..00000000000
--- a/dev-util/dogtail/files/dogtail-0.9.0-gentoo-paths.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
- 

diff --git a/dev-util/dogtail/files/dogtail-0.9.0-get-user.patch b/dev-util/dogtail/files/dogtail-0.9.0-get-user.patch
deleted file mode 100644
index 07a6ad80746..00000000000
--- a/dev-util/dogtail/files/dogtail-0.9.0-get-user.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Do not use USER as it can be unset.
-
-Use LOGNAME first as recommended by python documentation, then try alternatives.
-
-Also, use tempfile to respect environment variables changing tmpdir.
-
-Upstream: https://fedorahosted.org/dogtail/ticket/46
-Debian: http://bugs.debian.org/743500
-
---- a/dogtail/config.py	2015-06-08 22:59:08.664107350 +0200
-+++ b/dogtail/config.py	2015-06-08 22:57:54.433669729 +0200
-@@ -6,11 +6,15 @@ __author__ = "Zack Cerza <zcerza@××××××.com>, David Malcolm <dmalcolm@××××××.com
- import os
- import sys
- import locale
-+import tempfile
- 
- 
- def _userTmpDir(baseName):
-     # i.e. /tmp/dogtail-foo
--    return '-'.join(('/'.join(('/tmp', baseName)), os.environ['USER']))
-+    return '-'.join((
-+        '/'.join((tempfile.gettempdir(), baseName)),
-+        os.getenv('LOGNAME', os.getenv('USER', os.getlogin()))
-+    ))
- 
- 
- class _Config(object):