[gentoo-commits] repo/gentoo:master commit in: x11-misc/mugshot/files/, x11-misc/mugshot/

[Conrad Kostecki]

commit:     9301044fee6af9dddfff17c6eacb25c1a0c6d2ae
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 14:44:23 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 14:44:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9301044f

x11-misc/mugshot: drop old version

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 x11-misc/mugshot/Manifest                          |  1 -
 .../files/mugshot-0.4.1-missing_default_face.patch | 18 --------
 .../files/mugshot-0.4.1-use_office_phone.patch     | 23 ----------
 x11-misc/mugshot/mugshot-0.4.1.ebuild              | 52 ----------------------
 4 files changed, 94 deletions(-)

diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 164e42215dc..8d2ac185229 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,2 +1 @@
-DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe
 DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1

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 cc504d667af..00000000000
--- 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 07c2003f50d..00000000000
--- 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 b64746d894f..00000000000
--- 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
-}