gentoo resync : 25.08.2018

8 files changed, 51 insertions, 97 deletions

diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index db0f598bb36f..cfd9bc2d3115 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,6 +1,5 @@
-AUX fix_env_spawn_args.patch 1542 BLAKE2B d106f8c488b5a5a7343ce822d8e6dacb1e2a0c9c09b56548e7eb0dc40e6e7d9d6c2192abd80a748e724194001b8e2b6e78465e5652e70306293e4c33f85fb4e1 SHA512 83018570ac1663abc5f7210075bfaf9d9220bf32d516e34b0146adb589964f0bdcbbc9fb4d8cd8f9f535bf766a87d47682bb8e3196edd4a7039793c811fc6677
-AUX missing_default_face.patch 785 BLAKE2B 43646f826480e6def661ff7dff3aa84d8b2b789ce977a9f321b8f66dce4e0a3a4c822e91d341101ce12a6df9384268156d14badf5b57bc5cb638d661a27c6749 SHA512 e855d9491a2d45322041de653cc3d852d79b80e27ea0c7064f65d61d9c69a001602f63043ad847ce399f80e2afce662874aeeaa09b47fe41e2af8cb797fbcd31
-AUX use_office_phone.patch 712 BLAKE2B d94a87060e67be5b82ee97266fb0300d14b42932657db332a8d73b5cbd6ac82df989b6a24ed2d774f3e7eaf64efe80934e12aff6bd8577a654e510e0c26f6735 SHA512 7d8ebd02d5472d08b73360744b13dab238dbc15d8a5daa31c5458c09ee7d74210be9be2f36446f6c71d3765a041c72f2b449cffcf6655944d2246559f45909a3
-DIST mugshot-0.4.0.tar.gz 126101 BLAKE2B be0d84fd09a1ff6477d32a77d979b1606597b2ca38524b9cc65c254dd9d5d43697123b10d2b836c1193a9ba0f3dadebb15d1fe89ab7fb1743cc7b4d177ace65d SHA512 5936ec3def5a70db21f9bcc7fce873ce374f8df0795fb944593f398704dcba8c81be30393603e1753e176da87f4a6fd8a3218de2aeb7f33ea6018735ce1b2c09
-EBUILD mugshot-0.4.0.ebuild 1499 BLAKE2B fc7340c94b69abc32bb530b55bfbd8e947445cb8182e407484df3ec24e0053e45339b7e3b0b10e7b3820f39a6ac74ff81b2fcc02f917f9f68b4aaaf5e37568ed SHA512 0dd112ce2a18517b9c9ed374e74367abfce0e0a509f937c52055fc5510f39095fa4f5bc022775332bf1a5c963fde2ed0e0dd68cc354adc5402d40384ad0472d1
-MISC metadata.xml 1139 BLAKE2B 761c09b3f9f3f81667a253876b89dafc107f503cbc9ca20242e3974c011077bdbabe0206d59cf4504328c49ef4f87c0716330e78ff1f0b953b9bb380c5820d06 SHA512 7ac0a6925a7b55f59410444537ee944c5491204f7257eaa215b599dbc31e1a183c124815a3761295058aa5a61dafae2b4bd9bf4659e76cc3deca5690e7f70cb1
+AUX mugshot-0.4.1-missing_default_face.patch 782 BLAKE2B be9ef8633839b505c37ae13430ebca92b95a0632fed667c49b5885cc393ee0bb6743453e9e5fa621959113c43b87590842e56d735f8666533bb22a6522606027 SHA512 5abb02cd511482c3f32e56a7f121bf6cce102dab7dfee196a105ff5ed2cbf3d9ee3f20f0d75eecfe192d0c16603dd80555fcdc872cc85bffa74de7d0bbab79b1
+AUX mugshot-0.4.1-use_office_phone.patch 996 BLAKE2B 4c8647647f424775a1557f176b271e7f23d5df99a4db3246c37f7d108640a1d18bb6a8185f1e1bdd2f31bba2cbc62fc4d39df5172edc72e3142dd3954afee329 SHA512 488f99fde5c09aa2e15bf9b78bb19b6e244476a1b0e8053f3af5e0e6ef70febbc92d3970f774332dd961af7893e29a5fab7cc7e964d24ffc46d67c9567e2579c
+DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe
+EBUILD mugshot-0.4.1.ebuild 1390 BLAKE2B c20c882dce7770975b3617698ad76d9c5ca4e8ee5b32650a4bda9b52c67ad8474b01bc7cdc88f3d6b10961f207328c37fb97ea4c5ec4430185698490f1c10ef0 SHA512 97c1fe8f870d3d1700f13e90b05e43a5c49e985118383c8cb1c0a2a30c55e1ab8775fef24d0469b173507d684901ec361aebab39570489c845de4a8d5ed0ac04
+MISC metadata.xml 1046 BLAKE2B a0aed33d0d8110e8fc4038e3831d39f4696dfc712d4fe0c7e963c9f5861b2bbf7f087d6d74e519f1fbd8cc1212110c7298617bf5e9481dffbb7da820580440d3 SHA512 3c2cad8d7defa4719ba1497605dab8a3ef271decceddb690f2e5c5a24d4caad53dca82e347f65eda7cf70af29f558105b7daa4d0ed55891d2ff1a38565ec923a
diff --git a/x11-misc/mugshot/files/fix_env_spawn_args.patch b/x11-misc/mugshot/files/fix_env_spawn_args.patch
deleted file mode 100644
index bb24418a7dbc..000000000000
--- a/x11-misc/mugshot/files/fix_env_spawn_args.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/mugshot_lib/SudoDialog.py	2018-04-12 00:23:21.000000000 +0200
-+++ b/mugshot_lib/SudoDialog.py	2018-06-22 22:21:10.876589365 +0200
-@@ -48,7 +48,7 @@
-             return False
- 
-     # Check for LANG requirements
--    child = env_spawn('sudo -v', 1)
-+    child = env_spawn('sudo', ['-v'], 1)
-     if child.expect([".*ssword.*", "Sorry",
-                      pexpect.EOF,
-                      pexpect.TIMEOUT]) == 3:
-@@ -57,7 +57,7 @@
-     child.close()
- 
-     # Check for sudo rights
--    child = env_spawn('sudo -v', 1)
-+    child = env_spawn('sudo', ['-v'], 1)
-     try:
-         index = child.expect([".*ssword.*", "Sorry",
-                               pexpect.EOF, pexpect.TIMEOUT])
-@@ -76,14 +76,14 @@
-     return False
- 
- 
--def env_spawn(command, timeout):
-+def env_spawn(command, args, timeout):
-     """Use pexpect.spawn, adapt for timeout and env requirements."""
-     env = os.environ
-     env["LANG"] = "C"
-     if use_env:
--        child = pexpect.spawn(command, env)
-+        child = pexpect.spawn(command, args, env)
-     else:
--        child = pexpect.spawn(command)
-+        child = pexpect.spawn(command, args)
-     child.timeout = timeout
-     return child
- 
-@@ -304,7 +304,7 @@
-         Return True if successful.
-         '''
-         # Set the pexpect variables and spawn the process.
--        child = env_spawn('sudo /bin/true', 1)
-+        child = env_spawn('sudo', ['/bin/true'], 1)
-         try:
-             # Check for password prompt or program exit.
-             child.expect([".*ssword.*", pexpect.EOF])
diff --git a/x11-misc/mugshot/files/missing_default_face.patch b/x11-misc/mugshot/files/missing_default_face.patch
deleted file mode 100644
index 0d25fb610137..000000000000
--- a/x11-misc/mugshot/files/missing_default_face.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/mugshot/MugshotWindow.py	2018-04-12 00:23:21.000000000 +0200
-+++ b/mugshot/MugshotWindow.py	2018-06-22 22:27:05.515588012 +0200
-@@ -257,10 +257,11 @@
-             logger.debug('Found profile image: %s' % str(image))
- 
-             if os.path.isfile(face):
--                if os.path.samefile(image, face):
--                    self.updated_image = face
--                else:
--                    self.updated_image = None
-+                if os.path.exists(image):
-+                    if os.path.samefile(image, face):
-+                        self.updated_image = face
-+                    else:
-+                        self.updated_image = None
-                 self.set_user_image(face)
-             elif os.path.isfile(image):
-                 self.updated_image = image
diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch b/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch
new file mode 100644
index 000000000000..cc504d667af9
--- /dev/null
+++ b/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch
@@ -0,0 +1,18 @@
+--- a/mugshot/MugshotWindow.py	2018-08-08 11:22:42.000000000 +0200
++++ b/mugshot/MugshotWindow.py	2018-08-15 22:48:39.998699923 +0200
+@@ -256,10 +256,11 @@
+ 
+             if os.path.isfile(face):
+                 try:
+-                    if os.path.samefile(image, face):
+-                        self.updated_image = face
+-                    else:
+-                        self.updated_image = None
++                    if os.path.exists(image):
++                        if os.path.samefile(image, face):
++                            self.updated_image = face
++                        else:
++                            self.updated_image = None
+                 except FileNotFoundError:
+                     self.updated_image = None
+                 self.set_user_image(face)
diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch b/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch
new file mode 100644
index 000000000000..07c2003f50d8
--- /dev/null
+++ b/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch
@@ -0,0 +1,23 @@
+--- a/mugshot/MugshotWindow.py	2018-08-08 11:22:42.000000000 +0200
++++ b/mugshot/MugshotWindow.py	2018-08-15 22:47:02.108700297 +0200
+@@ -617,14 +617,18 @@
+         # chfn 2.29 uses "-p" as parameter for changing the office-phone (LP: #1699285)
+         p_command = "%s -p \"%s\" %s" % (chfn, office_phone, username)
+ 
+-        # other (newer, older?) use "-w"
++        # other (newer, older?) use "-o" or "-w"
++        o_command = "%s -o \"%s\" %s" % (chfn, office_phone, username)
+         w_command = "%s -w \"%s\" %s" % (chfn, office_phone, username)
+ 
+         if self.process_terminal_password(p_command, password) or \
+                 self.process_terminal_password(w_command, password):
+             self.office_phone = office_phone
+         else:
+-            success = False
++            if self.process_terminal_password(command2, password):
++                self.office_phone = office_phone
++            else:
++                success = False
+ 
+         return (success, response)
+ 
diff --git a/x11-misc/mugshot/files/use_office_phone.patch b/x11-misc/mugshot/files/use_office_phone.patch
deleted file mode 100644
index bea3f7ce4dae..000000000000
--- a/x11-misc/mugshot/files/use_office_phone.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/mugshot/MugshotWindow.py	2018-06-22 22:33:03.980586645 +0200
-+++ b/mugshot/MugshotWindow.py	2018-06-22 22:41:44.120584661 +0200
-@@ -614,10 +614,14 @@
- 
-         logger.debug('Updating Office Phone...')
-         command = "%s -w \"%s\" %s" % (chfn, office_phone, username)
-+        command2 = "%s -o \"%s\" %s" % (chfn, office_phone, username)
-         if self.process_terminal_password(command, password):
-             self.office_phone = office_phone
-         else:
--            success = False
-+            if self.process_terminal_password(command2, password):
-+                self.office_phone = office_phone
-+            else:
-+                success = False
- 
-         return (success, response)
- 
diff --git a/x11-misc/mugshot/metadata.xml b/x11-misc/mugshot/metadata.xml
index 9e143660d318..70aef0f5e797 100644
--- a/x11-misc/mugshot/metadata.xml
+++ b/x11-misc/mugshot/metadata.xml
@@ -17,7 +17,6 @@
 	<use>
 		<flag name="gnome">Add support for <pkg>gnome-base/gnome-control-center</pkg></flag>
 		<flag name="libreoffice">Add support for <pkg>app-office/libreoffice</pkg> and <pkg>app-office/libreoffice-bin</pkg></flag>
-		<flag name="pidgin">Add support for setting the avatar in <pkg>net-im/pidgin</pkg> </flag>
 		<flag name="webcam">Add support for setting a profile photo in <pkg>media-video/cheese</pkg></flag>
 	</use>
 	<upstream>
diff --git a/x11-misc/mugshot/mugshot-0.4.0.ebuild b/x11-misc/mugshot/mugshot-0.4.1.ebuild
index 23ceab58d94c..d8635da5b1e2 100644
--- a/x11-misc/mugshot/mugshot-0.4.0.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 eapi7-ver gnome2-utils
 
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome libreoffice pidgin webcam"
+IUSE="gnome libreoffice webcam"
 
 RDEPEND="dev-libs/gobject-introspection
 	dev-python/dbus-python[${PYTHON_USEDEP}]
@@ -25,7 +25,6 @@ RDEPEND="dev-libs/gobject-introspection
 	x11-libs/gtk+:3
 	gnome? ( gnome-base/gnome-control-center )
 	libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) )
-	pidgin? ( net-im/pidgin[${PYTHON_USEDEP}] )
 	webcam? ( media-libs/gstreamer:1.0
 		media-libs/gst-plugins-good:1.0
 		gnome? ( media-libs/clutter-gtk[introspection]
@@ -36,11 +35,10 @@ DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]
 	${RDEPEND}"
 
 PATCHES=(
-	# https://bugs.launchpad.net/ubuntu/+source/mugshot/+bug/1443283
-	"${FILESDIR}/fix_env_spawn_args.patch"
 	# Both patches are taken from Arch Linux
-	"${FILESDIR}/missing_default_face.patch"
-	"${FILESDIR}/use_office_phone.patch"
+	# and adapted to newest version
+	"${FILESDIR}"/${P}-missing_default_face.patch
+	"${FILESDIR}"/${P}-use_office_phone.patch
 )
 
 pkg_postinst() {