gentoo resync : 05.01.2018

3 files changed, 2 insertions, 45 deletions

diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index f6a2b53f4f0e..da30d8c096e8 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,10 +1,9 @@
-AUX safeeyes-2.0.1-setup-py.patch 1052 BLAKE2B 94661bab9ec4252f827956e3f39357734873bf950606dbff622d8a8287bf7a75fec0756ae922715fa94a126f6891b6799ca393c63de0b419d15d033db46b2985 SHA512 4a1556cb28c42a95c09833faa4c732a486f91f968fa4b5909059fafed54e8ff7e84197379415a1b6e94e5dd4aa992df6af73e06e4248064db00332716b351777
 DIST safeeyes-1.2.1.tar.gz 137676 BLAKE2B f19d4781b14a41aba79ba13a5adc52843111a2ea0056f6505ee08f21a6f16a17e8e89f29f719b114e275c4285dfec9431672dafe1ecfb4c57a974ca34786a263 SHA512 a2a31fd1b0e31403a8e2bd938e19b317a5ebcee66ce1fa29d1b00e4ed9f7b78281bfac5fff1486166f4093211c515e5d06577d47251a711e9b92af24c56f6b5c
 DIST safeeyes-1.2.2.tar.gz 146517 BLAKE2B 6df368e177c54b4221a88b4e01fe484bc0bfad52354976fed70f85f3271dcd7763ee6ed47f4250fae375b86ec26f2fbc93bf0411925666535419cb4080464c04 SHA512 3a693bd2976106c8b2e6e131acb1667a52610348c5f0cb6e76e9b1290bf633a0cbfe34632330163dd754df19f600a5781d5b2ef05102194dbcb0de4cc6a9869e
 DIST safeeyes-2.0.0.tar.gz 179036 BLAKE2B c35de1fb28076374ea112eae422f0ebeb8e0bdc1fd1060558436e3d4e1194a91df6f6e9f0cbbafa2b5919262f1678b946492305e9163d8a626487b22e8bbb7fc SHA512 b3a655a761fb24b8fee5455d29b2333b8d5b60a7c759a38df0fa1fd608e3a35dccb24a8aeaae87fde5e7cbe1df7569c2bb5897076e1d0cc4d96c98a029249881
-DIST safeeyes-2.0.1.tar.gz 211680 BLAKE2B fba6ed8bc3d9e9c4c953e4746c81faf96448b4bf5a15c8008061e596dfcd418d852e5c273a06dae70bdf7f6bc89bd0b142d602208efce8c6c076e04fad908b1d SHA512 77c26fd04d7a5a801bc12be182bb5b60e293b83acad88264b5d267b9a620d8300baf21399257765d7dd9a297cebd3acb256ffc1eff29fb478c22c5f9aa4f0de3
+DIST safeeyes-2.0.2.tar.gz 204210 BLAKE2B d2871b694c66746e7c931bad052fe48edfcda430b017de1d4a393b37d722be5fbaa4960bffa6dfb28920f7da261364374799775e539defd2df5aa86dd3658f83 SHA512 2b8e554e96f9b9e9b0513675bf2008f7f2d5308fa7af42a22ae91cbbf0b50a870d0a5c9db07233eb2eb3b03a064a12543d6b0ece95377f56713ecb72aac7c1e6
 EBUILD safeeyes-1.2.1.ebuild 1014 BLAKE2B 75126acad5608f52d3e959ea7ca7d72d14127ba1880b524361b18c39d9ae42dfc4f836cbdbd46efb42ee5e3294a39daf0190e13c6be3faa7701ac8dbbda8bd6b SHA512 8b88eeca9b1541bc9fac7f683489b64d626b8f45a422e9999191b49f28702bd953a39d1d46e37e35fe06d8816f8331b2e051e175d55e7571f5bfc759f14c8e6d
 EBUILD safeeyes-1.2.2.ebuild 1038 BLAKE2B 0a850aec599132ecab00acf9254b6b21129d451163ebd605527797c6671b5080d5d629d2cc2ebcc0889040656fa142c61730f55a351d27399eb86c53ff89dc9e SHA512 4bababf472ae47210b15fbb841fb51ccd4accb409c9d61c88ed7ef0e5586d4462fdbc1dccfd08795e25f4beb6fac40bab0a5f4e1ab1c9dffe1cfe32ed85e9964
 EBUILD safeeyes-2.0.0.ebuild 1038 BLAKE2B 0a850aec599132ecab00acf9254b6b21129d451163ebd605527797c6671b5080d5d629d2cc2ebcc0889040656fa142c61730f55a351d27399eb86c53ff89dc9e SHA512 4bababf472ae47210b15fbb841fb51ccd4accb409c9d61c88ed7ef0e5586d4462fdbc1dccfd08795e25f4beb6fac40bab0a5f4e1ab1c9dffe1cfe32ed85e9964
-EBUILD safeeyes-2.0.1.ebuild 1112 BLAKE2B db14ca142f317285d9516d3b414244ce697bafee0e71c983f772fba7bdbbb86624fbd6308cf0342f9c4465d54d843c96319214fbeedad98ae9fd4ba3dae7cb52 SHA512 03b7c769da02f1111f03cd4a463baed38b6c7b8644acd3c7d9e26169de9f45af63933b7641a4d3dfdba475c994a99c20f937675ca6a9edf46f9f29100b4d2607
+EBUILD safeeyes-2.0.2.ebuild 1038 BLAKE2B 38462f89636802722a414108f73fa548c840b2f7ec63b40244f2aec8d4d3b6019c5515cfd47e83bd3ef6f4ce300f2a3785c50196601eb071941d8be0a162ef7b SHA512 8d3cff54a9b5d87fd78708106c330977c193a3e7bc355363f7bda30442ff6121528645758950d3d779cb0682655abcea454aebd0fcbd9d48990b0bbd7ccf05c3
 MISC metadata.xml 346 BLAKE2B 317884987f99b4eb097fbd1b7166eefab1a7e565340c6dd28a8d485cf926cc8dc8b610a57bb39d6ccf03896bb09b50bff440c1066bf00cbfd059b7219fc4b5af SHA512 f73ca2191cf257ffe2fe79094187eee3cb8eb9eef4108f29e52713ab1e3ccab1148fb28a73e09c7cc723523fcf3b5fadd15528ca015864b38967207dcfb68609
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
deleted file mode 100644
index 777c5d2e5be3..000000000000
--- a/x11-misc/safeeyes/files/safeeyes-2.0.1-setup-py.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a3373aa9b0a5bf473357b337f5f0944552831262 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 3 Jan 2018 19:17:22 +0100
-Subject: [PATCH] Fix start-up crash from broken PyGObject dependency
-
-$ safeeyes
-Traceback (most recent call last):
-  File "/usr/lib/python-exec/python3.5/safeeyes", line 6, in <module>
-    from pkg_resources import load_entry_point
-  [..]
-  File "/usr/lib64/python3.5/site-packages/pkg_resources/__init__.py", line 870, in resolve
-    raise DistributionNotFound(req, requirers)
-pkg_resources.DistributionNotFound: The 'gi' distribution was not found and is required by safeeyes
-
-$ python3.5 -c 'import gi; print(gi.__file__)'
-/usr/lib64/python3.5/site-packages/gi/__init__.py
----
- setup.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index e6e4ef1..5dff037 100644
---- a/setup.py
-+++ b/setup.py
-@@ -6,8 +6,7 @@ import setuptools
- requires = [
-     'babel',
--    'dbus',
--    'gi',
-     'psutil',
-+    'PyGObject',
-     'python-xlib'
- ]
- 
--- 
-2.15.0
-
diff --git a/x11-misc/safeeyes/safeeyes-2.0.1.ebuild b/x11-misc/safeeyes/safeeyes-2.0.2.ebuild
index dfa294d11aac..ebf1e7c73477 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.2.ebuild
@@ -35,11 +35,6 @@ DOCS=(
 	README.md
 )
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-setup-py.patch
-	eapply_user
-}
-
 pkg_preinst() {
 	gnome2_icon_savelist
 }