Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/safeeyes/, x11-misc/safeeyes/files/
Date: Thu, 04 Jan 2018 20:20:58
Message-Id: 1515097246.ddc495f8f5bb2db36f22aa6f953f961bfcc7216d.sping@gentoo
1 commit: ddc495f8f5bb2db36f22aa6f953f961bfcc7216d
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 20:20:01 2018 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 20:20:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc495f8
7
8 x11-misc/safeeyes: 2.0.2, remove 2.0.1
9
10 Related:
11 https://github.com/slgobinath/SafeEyes/issues/224
12
13 Package-Manager: Portage-2.3.16, Repoman-2.3.6
14
15 x11-misc/safeeyes/Manifest | 2 +-
16 .../safeeyes/files/safeeyes-2.0.1-setup-py.patch | 37 ----------------------
17 ...safeeyes-2.0.1.ebuild => safeeyes-2.0.2.ebuild} | 5 ---
18 3 files changed, 1 insertion(+), 43 deletions(-)
19
20 diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
21 index 94ddd15740b..c552b2657de 100644
22 --- a/x11-misc/safeeyes/Manifest
23 +++ b/x11-misc/safeeyes/Manifest
24 @@ -1,4 +1,4 @@
25 DIST safeeyes-1.2.1.tar.gz 137676 BLAKE2B f19d4781b14a41aba79ba13a5adc52843111a2ea0056f6505ee08f21a6f16a17e8e89f29f719b114e275c4285dfec9431672dafe1ecfb4c57a974ca34786a263 SHA512 a2a31fd1b0e31403a8e2bd938e19b317a5ebcee66ce1fa29d1b00e4ed9f7b78281bfac5fff1486166f4093211c515e5d06577d47251a711e9b92af24c56f6b5c
26 DIST safeeyes-1.2.2.tar.gz 146517 BLAKE2B 6df368e177c54b4221a88b4e01fe484bc0bfad52354976fed70f85f3271dcd7763ee6ed47f4250fae375b86ec26f2fbc93bf0411925666535419cb4080464c04 SHA512 3a693bd2976106c8b2e6e131acb1667a52610348c5f0cb6e76e9b1290bf633a0cbfe34632330163dd754df19f600a5781d5b2ef05102194dbcb0de4cc6a9869e
27 DIST safeeyes-2.0.0.tar.gz 179036 BLAKE2B c35de1fb28076374ea112eae422f0ebeb8e0bdc1fd1060558436e3d4e1194a91df6f6e9f0cbbafa2b5919262f1678b946492305e9163d8a626487b22e8bbb7fc SHA512 b3a655a761fb24b8fee5455d29b2333b8d5b60a7c759a38df0fa1fd608e3a35dccb24a8aeaae87fde5e7cbe1df7569c2bb5897076e1d0cc4d96c98a029249881
28 -DIST safeeyes-2.0.1.tar.gz 211680 BLAKE2B fba6ed8bc3d9e9c4c953e4746c81faf96448b4bf5a15c8008061e596dfcd418d852e5c273a06dae70bdf7f6bc89bd0b142d602208efce8c6c076e04fad908b1d SHA512 77c26fd04d7a5a801bc12be182bb5b60e293b83acad88264b5d267b9a620d8300baf21399257765d7dd9a297cebd3acb256ffc1eff29fb478c22c5f9aa4f0de3
29 +DIST safeeyes-2.0.2.tar.gz 204210 BLAKE2B d2871b694c66746e7c931bad052fe48edfcda430b017de1d4a393b37d722be5fbaa4960bffa6dfb28920f7da261364374799775e539defd2df5aa86dd3658f83 SHA512 2b8e554e96f9b9e9b0513675bf2008f7f2d5308fa7af42a22ae91cbbf0b50a870d0a5c9db07233eb2eb3b03a064a12543d6b0ece95377f56713ecb72aac7c1e6
30
31 diff --git a/x11-misc/safeeyes/files/safeeyes-2.0.1-setup-py.patch b/x11-misc/safeeyes/files/safeeyes-2.0.1-setup-py.patch
32 deleted file mode 100644
33 index 777c5d2e5be..00000000000
34 --- a/x11-misc/safeeyes/files/safeeyes-2.0.1-setup-py.patch
35 +++ /dev/null
36 @@ -1,37 +0,0 @@
37 -From a3373aa9b0a5bf473357b337f5f0944552831262 Mon Sep 17 00:00:00 2001
38 -From: Sebastian Pipping <sebastian@×××××××.org>
39 -Date: Wed, 3 Jan 2018 19:17:22 +0100
40 -Subject: [PATCH] Fix start-up crash from broken PyGObject dependency
41 -
42 -$ safeeyes
43 -Traceback (most recent call last):
44 - File "/usr/lib/python-exec/python3.5/safeeyes", line 6, in <module>
45 - from pkg_resources import load_entry_point
46 - [..]
47 - File "/usr/lib64/python3.5/site-packages/pkg_resources/__init__.py", line 870, in resolve
48 - raise DistributionNotFound(req, requirers)
49 -pkg_resources.DistributionNotFound: The 'gi' distribution was not found and is required by safeeyes
50 -
51 -$ python3.5 -c 'import gi; print(gi.__file__)'
52 -/usr/lib64/python3.5/site-packages/gi/__init__.py
53 ----
54 - setup.py | 3 +--
55 - 1 file changed, 1 insertion(+), 2 deletions(-)
56 -
57 -diff --git a/setup.py b/setup.py
58 -index e6e4ef1..5dff037 100644
59 ---- a/setup.py
60 -+++ b/setup.py
61 -@@ -6,8 +6,7 @@ import setuptools
62 - requires = [
63 - 'babel',
64 -- 'dbus',
65 -- 'gi',
66 - 'psutil',
67 -+ 'PyGObject',
68 - 'python-xlib'
69 - ]
70 -
71 ---
72 -2.15.0
73 -
74
75 diff --git a/x11-misc/safeeyes/safeeyes-2.0.1.ebuild b/x11-misc/safeeyes/safeeyes-2.0.2.ebuild
76 similarity index 93%
77 rename from x11-misc/safeeyes/safeeyes-2.0.1.ebuild
78 rename to x11-misc/safeeyes/safeeyes-2.0.2.ebuild
79 index dfa294d11aa..ebf1e7c7347 100644
80 --- a/x11-misc/safeeyes/safeeyes-2.0.1.ebuild
81 +++ b/x11-misc/safeeyes/safeeyes-2.0.2.ebuild
82 @@ -35,11 +35,6 @@ DOCS=(
83 README.md
84 )
85
86 -src_prepare() {
87 - eapply "${FILESDIR}"/${P}-setup-py.patch
88 - eapply_user
89 -}
90 -
91 pkg_preinst() {
92 gnome2_icon_savelist
93 }