gentoo resync : 03.03.2021

4 files changed, 2 insertions, 122 deletions

diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 11de694075a4..8036541eda1c 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,6 +1,3 @@
-AUX mugshot-0.4.2-python39.patch 1369 BLAKE2B e006525dae248e4e8d04a01932f74371846c2757c085f5a0afc634f2c163c81918e6130ca796bcf122645bb7bd4e33348eea3ed0d926ff867028ab84641bf67a SHA512 c3868bec2772e7834bae8de87c2407986aacca1d32125631da92788ac9ae03e5a688b36ff6090792990f6c3163ecae1623eccd84349dc0099b4809258f14793b
-DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
 DIST mugshot-0.4.3.tar.gz 128500 BLAKE2B 88ed4a9a0efa70a14d90b831d00ad8c98d7c6dc4eff0e319e5ad08e904b0c0cf2c15bb26198f4ae1248e85959c08af165c9b6dc917dce35d986fdd73ff67eed8 SHA512 b5e91288b4de30124bd84c44b8f2a70e043af12e1f9580d07b13344b6c0343399037aadf153ea216d61cd12e4891ebb15557f1ad62c3b4d7c49584fa004ae65c
-EBUILD mugshot-0.4.2-r1.ebuild 1587 BLAKE2B 1a9e12cfa704ffdd94f1e5d604430235d0f310047b9c1fcc8f80d2b87066f67c17f8dd644313bd16eab075ded788e2016b2949484d14737bf40bafcd9707fe97 SHA512 522f910f8c4453cde563dcef3ba9a8f605bf582eb9ca6af491d3055b12bab8a6738221c276df914fec9662e7bfb3d9ac3a3cefb5e4b043d45d5006a500d5331b
-EBUILD mugshot-0.4.3.ebuild 1535 BLAKE2B 8008535ae4ece7b4d07589f88bb9aa7bf87f15953e9450d177669abc6b7828b967e796a20049de2ef25534c47bb2be8697cc2adf636ee30c51887f841c68ae15 SHA512 aed45e5798726e84a664ab168c7876847c74a0b987fe9f5295b2fe2d792ba53d8894e0cd51982e2e1444f4d6809dd599fea8270e1fdb22de22a98beecefd6ef0
+EBUILD mugshot-0.4.3.ebuild 1533 BLAKE2B 9ef49b35bc106191757cfde43ba1334c9d496d817d0174746bb1688d776a14f5665c780bc2deaaf50ff9abf4e421924b2475f88fdd1b4ed2b22811bc2d08556c SHA512 d34e6e05781b8843352996bc9cd95d11e9eafb302ffbabb83e84ed22e0d3048a62c319cdcf4ac7c7647fc991dd21a25c011fe5984952db62afd216c6a66b3748
 MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
diff --git a/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch b/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch
deleted file mode 100644
index b0443f7a3d33..000000000000
--- a/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 643b3d005a8865c961b836aeae4c1f76711646e9 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Mon, 24 Aug 2020 23:58:10 +0200
-Subject: [PATCH] Add python3.9 compatiblity
-
-Starting with python3.9, launching of mugshot will fail,
-as getiterator() been deprecated since Python 2.7,
-and has been removed in Python 3.9. Using iter() will fix that.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- mugshot_lib/Builder.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mugshot_lib/Builder.py b/mugshot_lib/Builder.py
-index 7297541..6c08d70 100644
---- a/mugshot_lib/Builder.py
-+++ b/mugshot_lib/Builder.py
-@@ -89,7 +89,7 @@ def add_from_file(self, filename):
-         tree = ElementTree()
-         tree.parse(filename)
- 
--        ele_widgets = tree.getiterator("object")
-+        ele_widgets = tree.iter("object")
-         for ele_widget in ele_widgets:
-             name = ele_widget.attrib['id']
-             widget = self.get_object(name)
-@@ -111,7 +111,7 @@ def add_from_file(self, filename):
-             if connections:
-                 self.connections.extend(connections)
- 
--        ele_signals = tree.getiterator("signal")
-+        ele_signals = tree.iter("signal")
-         for ele_signal in ele_signals:
-             self.glade_handler_dict.update(
-                 {ele_signal.attrib["handler"]: None})
diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
deleted file mode 100644
index d6005fd6a5bd..000000000000
--- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="A lightweight user-configuration application"
-HOMEPAGE="https://github.com/bluesabre/mugshot"
-SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome libreoffice webcam"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	sys-apps/accountsservice
-	sys-apps/shadow
-	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="
-	${COMMON_DEPEND}
-	x11-libs/gtk+:3[introspection]
-"
-
-BDEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-util/intltool
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.2-python39.patch" )
-
-python_install() {
-	distutils-r1_python_install
-
-	python_optimize
-
-	# Since DOCS are installed twice, remove the wrong path
-	rm -r "${ED}"/usr/share/doc/mugshot || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/mugshot/mugshot-0.4.3.ebuild b/x11-misc/mugshot/mugshot-0.4.3.ebuild
index 6400bbcad709..2504ff5e3d9d 100644
--- a/x11-misc/mugshot/mugshot-0.4.3.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.3.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="