gentoo resync : 10.02.2020

5 files changed, 2 insertions, 99 deletions

diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 01a3a0b11eee..6a6e4d92d404 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,7 +1,3 @@
-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
 DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
-EBUILD mugshot-0.4.1.ebuild 1379 BLAKE2B 37f3ac78d45003c6ea1ff7ae2962df1b8570bede4855fb3c31dd3e3efd7f62b111b23ee84277ebb1648d9b2e996231b9897c38e2d7c3a3f4b7808bfcbc3807d6 SHA512 d17b643af0187e52ab4749c0e02059f4b814ac6ab6adeb3401d0574c8137fb7568df8e4966d522cc79b8a695d0c4039b997b90ac4fb5bd0dd9dc6133b9827ae6
-EBUILD mugshot-0.4.2-r1.ebuild 1535 BLAKE2B 350e700b586efa542926143101f4fe664125faf7fff5c4b0900219ac0542a2dbe70e09f1278eb40a9f168336a0bb41f9dfe4e67bbc8ddcd49dc0fc9e84e29efc SHA512 d452547817dafd12c8c51eeef333969ddb939ef55af28e689377ea87a1c64939eda40dc483c92343f8e4717f829df341f95706809a9239833ace3e79cbd25f86
+EBUILD mugshot-0.4.2-r1.ebuild 1534 BLAKE2B 9ec842e924950051e7e65eea7c10afea40fe9802e69fad07098e78b76c179908e177fa1f7326b68813ea3f573892326f660b5899814b517a37629c547502dcfe SHA512 44934fa75f7554eac3a914742ce8d08003a8f17583dc7d2eb14cd66059d86bb3fc697ea60f95f50dbba8829154edb01586f5d53307d4f3bed560c9bff038267c
 MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
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
deleted file mode 100644
index cc504d667af9..000000000000
--- a/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index 07c2003f50d8..000000000000
--- a/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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/mugshot-0.4.1.ebuild b/x11-misc/mugshot/mugshot-0.4.1.ebuild
deleted file mode 100644
index b64746d894fc..000000000000
--- a/x11-misc/mugshot/mugshot-0.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eapi7-ver gnome2-utils
-
-DESCRIPTION="A lightweight user-configuration application"
-HOMEPAGE="https://launchpad.net/mugshot"
-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 webcam"
-
-RDEPEND="dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	sys-apps/accountsservice
-	x11-libs/gtk+:3
-	gnome? ( gnome-base/gnome-control-center )
-	libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) )
-	webcam? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-good:1.0
-		gnome? ( media-libs/clutter-gtk[introspection]
-			media-video/cheese[introspection] ) )"
-
-DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-util/intltool
-	${RDEPEND}"
-
-PATCHES=(
-	# Both patches are taken from Arch Linux
-	# and adapted to newest version
-	"${FILESDIR}"/${P}-missing_default_face.patch
-	"${FILESDIR}"/${P}-use_office_phone.patch
-)
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
index bd4ac251e3f1..c547ba1e9538 100644
--- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome libreoffice webcam"
 
 COMMON_DEPEND="