* [gentoo-commits] repo/gentoo:master commit in: x11-misc/mugshot/files/, x11-misc/mugshot/
@ 2018-07-11 8:29 Tony Vroon
0 siblings, 0 replies; 5+ messages in thread
From: Tony Vroon @ 2018-07-11 8:29 UTC (permalink / raw
To: gentoo-commits
commit: 9e7f4a57a39ce46146eb00c02409367b69b569d1
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sat Jul 7 22:11:08 2018 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 08:29:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7f4a57
x11-misc/mugshot: New package
Closes: https://bugs.gentoo.org/571382
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9103
Closes: https://bugs.gentoo.org/571382
x11-misc/mugshot/Manifest | 1 +
x11-misc/mugshot/files/fix_env_spawn_args.patch | 47 ++++++++++++++++++++
x11-misc/mugshot/files/missing_default_face.patch | 18 ++++++++
x11-misc/mugshot/files/use_office_phone.patch | 18 ++++++++
x11-misc/mugshot/metadata.xml | 27 ++++++++++++
x11-misc/mugshot/mugshot-0.4.0.ebuild | 54 +++++++++++++++++++++++
6 files changed, 165 insertions(+)
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
new file mode 100644
index 00000000000..6328edd164f
--- /dev/null
+++ b/x11-misc/mugshot/Manifest
@@ -0,0 +1 @@
+DIST mugshot-0.4.0.tar.gz 126101 BLAKE2B be0d84fd09a1ff6477d32a77d979b1606597b2ca38524b9cc65c254dd9d5d43697123b10d2b836c1193a9ba0f3dadebb15d1fe89ab7fb1743cc7b4d177ace65d SHA512 5936ec3def5a70db21f9bcc7fce873ce374f8df0795fb944593f398704dcba8c81be30393603e1753e176da87f4a6fd8a3218de2aeb7f33ea6018735ce1b2c09
diff --git a/x11-misc/mugshot/files/fix_env_spawn_args.patch b/x11-misc/mugshot/files/fix_env_spawn_args.patch
new file mode 100644
index 00000000000..bb24418a7db
--- /dev/null
+++ b/x11-misc/mugshot/files/fix_env_spawn_args.patch
@@ -0,0 +1,47 @@
+--- 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
new file mode 100644
index 00000000000..0d25fb61013
--- /dev/null
+++ b/x11-misc/mugshot/files/missing_default_face.patch
@@ -0,0 +1,18 @@
+--- 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/use_office_phone.patch b/x11-misc/mugshot/files/use_office_phone.patch
new file mode 100644
index 00000000000..bea3f7ce4da
--- /dev/null
+++ b/x11-misc/mugshot/files/use_office_phone.patch
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 00000000000..9e143660d31
--- /dev/null
+++ b/x11-misc/mugshot/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Mugshot is a lightweight user configuration utility.
+ Mugshot allows you to easily set profile image
+ and user details for your user profile and any supported applications.
+ </longdescription>
+ <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>
+ <bugs-to>https://bugs.launchpad.net/mugshot</bugs-to>
+ <remote-id type="launchpad">mugshot</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-misc/mugshot/mugshot-0.4.0.ebuild b/x11-misc/mugshot/mugshot-0.4.0.ebuild
new file mode 100644
index 00000000000..23ceab58d94
--- /dev/null
+++ b/x11-misc/mugshot/mugshot-0.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+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 pidgin 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 ) )
+ 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]
+ media-video/cheese[introspection] ) )"
+
+DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ dev-util/intltool
+ ${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"
+)
+
+pkg_postinst() {
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/mugshot/files/, x11-misc/mugshot/
@ 2018-08-19 22:52 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2018-08-19 22:52 UTC (permalink / raw
To: gentoo-commits
commit: db5e58ad876f2afe19396695c184a133312a7146
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Wed Aug 15 21:22:02 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Aug 19 22:50:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db5e58ad
x11-misc/mugshot: version bump to 0.4.1.
Closes: https://bugs.gentoo.org/663740
Package-Manager: Portage-2.3.45, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9586
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 insertions(+)
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 6328edd164f..8d4365f855c 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1 +1,2 @@
DIST mugshot-0.4.0.tar.gz 126101 BLAKE2B be0d84fd09a1ff6477d32a77d979b1606597b2ca38524b9cc65c254dd9d5d43697123b10d2b836c1193a9ba0f3dadebb15d1fe89ab7fb1743cc7b4d177ace65d SHA512 5936ec3def5a70db21f9bcc7fce873ce374f8df0795fb944593f398704dcba8c81be30393603e1753e176da87f4a6fd8a3218de2aeb7f33ea6018735ce1b2c09
+DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe
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 00000000000..cc504d667af
--- /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 00000000000..07c2003f50d
--- /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/mugshot-0.4.1.ebuild b/x11-misc/mugshot/mugshot-0.4.1.ebuild
new file mode 100644
index 00000000000..d8635da5b1e
--- /dev/null
+++ b/x11-misc/mugshot/mugshot-0.4.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/mugshot/files/, x11-misc/mugshot/
@ 2020-02-08 14:46 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2020-02-08 14:46 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/mugshot/files/, x11-misc/mugshot/
@ 2020-08-24 22:33 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2020-08-24 22:33 UTC (permalink / raw
To: gentoo-commits
commit: f66e7565d64dc115843848fe50322778c2db2ec8
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 22:03:22 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 22:32:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66e7565
x11-misc/mugshot: add python3.9 support
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../mugshot/files/mugshot-0.4.2-python39.patch | 36 ++++++++++++++++++++++
x11-misc/mugshot/mugshot-0.4.2-r1.ebuild | 4 ++-
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch b/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch
new file mode 100644
index 00000000000..b0443f7a3d3
--- /dev/null
+++ b/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch
@@ -0,0 +1,36 @@
+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
index c547ba1e953..a39fccdd02a 100644
--- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
inherit distutils-r1 gnome2-utils xdg-utils
@@ -59,6 +59,8 @@ BDEPEND="
S="${WORKDIR}/${PN}-${P}"
+PATCHES=( "${FILESDIR}/${PN}-0.4.2-python39.patch" )
+
python_install() {
distutils-r1_python_install
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/mugshot/files/, x11-misc/mugshot/
@ 2021-03-02 17:01 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2021-03-02 17:01 UTC (permalink / raw
To: gentoo-commits
commit: 02ec2b281901031a33a04d108d92ae9b22cbd19d
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 2 17:01:30 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Mar 2 17:01:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ec2b28
x11-misc/mugshot: drop old version
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
x11-misc/mugshot/Manifest | 1 -
.../mugshot/files/mugshot-0.4.2-python39.patch | 36 ----------
x11-misc/mugshot/mugshot-0.4.2-r1.ebuild | 81 ----------------------
3 files changed, 118 deletions(-)
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 48e2bcc5bee..166650ae51c 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,2 +1 @@
-DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
DIST mugshot-0.4.3.tar.gz 128500 BLAKE2B 88ed4a9a0efa70a14d90b831d00ad8c98d7c6dc4eff0e319e5ad08e904b0c0cf2c15bb26198f4ae1248e85959c08af165c9b6dc917dce35d986fdd73ff67eed8 SHA512 b5e91288b4de30124bd84c44b8f2a70e043af12e1f9580d07b13344b6c0343399037aadf153ea216d61cd12e4891ebb15557f1ad62c3b4d7c49584fa004ae65c
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 b0443f7a3d3..00000000000
--- 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 d6005fd6a5b..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-02 17:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-24 22:33 [gentoo-commits] repo/gentoo:master commit in: x11-misc/mugshot/files/, x11-misc/mugshot/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2021-03-02 17:01 Conrad Kostecki
2020-02-08 14:46 Conrad Kostecki
2018-08-19 22:52 Patrice Clement
2018-07-11 8:29 Tony Vroon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox