gentoo auto-resync : 04:12:2022 - 21:03:51

10 files changed, 97 insertions, 99 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e0139f6ac2ea..467aab9b169d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 58d542e0faf7..4e73b368156e 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,5 +1,6 @@
 DIST safeeyes-2.1.3.tar.gz 354494 BLAKE2B 5f7977a8de280f5022cb226689c5b1d48f494932babd014b9ee8affcf9aaa0ef8dfe3ed18c33dbfa4ebaf1c5bfdbed4efc3b69c1ce3065e3ff3c82e83fa71723 SHA512 8a708b3e8f40f75659092a2effb0318b0fb7f47345e3f430f6b83ff2fc3c7de46b2dc881bf69902055bc8233f539946e60822e6ab7a6149f2c99441af1191f48
 DIST safeeyes-2.1.4.tar.gz 383245 BLAKE2B 307d58fd589c0a8b01f0c20c21f06a0f81b0d8a43f81e71e79a273a124e00df7cdd2c7c498a4918f6b56abc03fa7cb58db231124a96806a2fe60d6f9dab7f6c8 SHA512 547d00f18e06679464e225ab62f76c43e8efb733e945ae93c02c7cf55ab0bcf5fc078ffc41ad2842a324fff2513050cced404e8bd53d63b78ba7fb1f862c1ad3
 EBUILD safeeyes-2.1.3-r1.ebuild 968 BLAKE2B 5e1a806a624f0355aeb52f2d0e698e82187dc923d4f9789f2b2f5bf15666d30acef200c11d71dd95c0f94d6f2f811cda61adc10575fa730f1ffc21ef357b4a24 SHA512 7b0442c1016c2a8615df8c5228f357baa0f81aecabc3cc83f0292be953587770a36a5ec83064053d54fa1e9c3e29cbbcbdae26640e5375784f9fac9d1a968903
+EBUILD safeeyes-2.1.4-r1.ebuild 1107 BLAKE2B e7695893d5c7671998bf9f034d2b5bab824d3b7da4742a107a00c03f4e0fd2ce9538e6dfab2e7ca935c83839160c9a11eaebc88fa7bdd34b9fcc6ecf45b23996 SHA512 097cd52b58288a2636e2ec49fd627a1985c1ab6534733d44713ca9f063f2169d63fa95ce8d759514d5e4d622015ff49bc7887bf23a37819c0272fb1e7339bd22
 EBUILD safeeyes-2.1.4.ebuild 1027 BLAKE2B bd7c24f9cc7dffdb202cdea46863960143d8524fc50a952e25a816aa26268dfdba9119c966716c1a2e17eba407de069365761cf952a578fe994b5f207e70a565 SHA512 30203f315c1d76d0181c3c71c280a7cd3a30f9a3c97eea4d6ce7effd36f88f8a8c26162cd4412629308e65a55778750527b6a4e72ed3d43021fe130e00b5d73a
 MISC metadata.xml 347 BLAKE2B eda163f3ff13421872558f176120fc2fa5488afa1c9e2b2bd1c3aae6bf76e4e73758f35ba2af529beaf73d5677970ffe6319e8db22279c5eb7885f9f135e9243 SHA512 c09ce25d4d00dc7d322ab1505feb17b0bdec7aa1ec9e4a847705889ec38b76b03758d0a9bf1fc01fd6131d278850ae38462256ab8c968f183523e48dc2692aca
diff --git a/x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..18d803a78ba0
--- /dev/null
+++ b/x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="tk"  # for site-packages/Xlib/ext/randr.py
+
+inherit xdg distutils-r1
+
+DESCRIPTION="Linux alternative to EyeLeo"
+HOMEPAGE="https://github.com/slgobinath/SafeEyes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libappindicator:3[introspection]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/croniter[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	media-sound/alsa-utils
+	x11-apps/xprop
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-misc/xprintidle
+	"
+
+DOCS=(
+	README.md
+)
+
+src_prepare() {
+	default
+	find . -type f -name \*.pyc -delete  # bug #864765
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 7cdc7e9b9f8b..266ad518d666 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,6 +1,6 @@
+AUX xdg-utils-egrep.patch 760 BLAKE2B 641a75615aa54000acee26ad65e802245c12db388f372b1f7cfe4df29c025a8eb5e4523ef89a6e209e00c7ec0288c799f16a5d4ac04fa25da3375d2d128b1de2 SHA512 80976c70974c670432a48ab467ca68126f699816914b806a65f48b234c631cc470b7399b389a15a6181a0fbbf486692d0583f791c0592bdc70186df319075ac6
 DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51
-DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
 DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
-EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2075 BLAKE2B 299764eba14b1d6f5406abef797d2c28a6446e1e705b85c45d8b1b240039835c1d569088539cab2f92f1d7bcfcf5f3fdace40809f77b05d28561d443246c2870 SHA512 3422f1cb9ef212fc71a70e8f9f6f11e95b785958a16fd67c95f813e4939522b720cb66971483c09c7b2d86561a5c503208e8b6a3181032ad489af943508ab54c
+EBUILD xdg-utils-1.1.3_p20210805-r1.ebuild 2418 BLAKE2B 478dfc8810ca4eb5867f6864f50c9d341a992519c16b4c253e1d111d3b39888686ec4d986736f5719d2fc99ca6e5398a76aa054514769bb9d108bfe02bce5e29 SHA512 02497ebc89d0c955f3b50c76e5640aa43383ebdcbd0ea0c472b2e2a683e9e908d2869f4a8f860a7ab67fdcf708d00d9a4e191b76a43dfe972db9db33d3a20b0d
 EBUILD xdg-utils-1.1.3_p20210805.ebuild 2310 BLAKE2B f56c24d95bb66e5ee34b2d201a83472bd1ab0f81586e2017afe1e2f72620404b31250038924d6b7266e473a8f85cd66b4529c9cc3a57e3e8010c21b2b10ea99c SHA512 6208c19056110e361a0dbefea246a8caaf38ed502b41558b5dc30787d7035660342039291e14c3e9f93a229623eb15771ac5a6b51cf7423034148a66f9c2819b
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
new file mode 100644
index 000000000000..71608552a08b
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
@@ -0,0 +1,25 @@
+From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001
+From: E5ten <ethancsommer@gmail.com>
+Date: Thu, 16 Jan 2020 02:06:09 +0000
+Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E"
+
+---
+ scripts/xdg-open.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 202f3e3..35b0522 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -72,7 +72,7 @@ get_key()
+ is_file_url_or_path()
+ {
+     if echo "$1" | grep -q '^file://' \
+-            || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
++            || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
+         return 0
+     else
+         return 1
+-- 
+GitLab
+
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild
index 1ec5697fd2d0..7aec38025c3e 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools
 
-EGIT_COMMIT="9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197"
+MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9"
 DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-SRC_URI="
-	https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${EGIT_COMMIT}/${P}.tar.bz2"
-S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
+SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
+# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz"
+S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome"
 REQUIRED_USE="gnome? ( dbus )"
 
@@ -42,8 +44,15 @@ DOCS=( ChangeLog README RELEASE_NOTES TODO )
 # that block forever
 RESTRICT="test"
 
+PATCHES=(
+	"${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch
+	# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21
+	"${FILESDIR}"/${PN}-egrep.patch
+)
+
 src_prepare() {
 	default
+
 	# If you choose to do git snapshot instead of patchset, you need to remember
 	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
 	# all the files
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 3077ca6f9ab1..2c2b2b83a78f 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,6 +1,3 @@
-AUX xflux-gui-1.2.0-disable-gschemas-compiled.patch 1540 BLAKE2B c1071aecced986b9bf8662de558ce8cd3c822ebfcc7d3d6601eba9ec30438bfcbc763e26eb31113b00b75e07f463125872ed8897c490ddd32cf96b0798e72557 SHA512 bd03efe531f0b55df89bbf2b6e6dbdbf7c48c214b9969d3c458d093a13603011b956efc0cc6695401abc7abfea18ed29be6501784a66edcf63f8ebd6793b3c15
-DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
 DIST xflux-gui-2.0.tar.gz 35805 BLAKE2B 7a15371d682b31c900f35bebd36e12b70d6095c4cdc9c33f43bad031d72b82d8d3800f7f34f7e31965725dfe075dc6934512eeced98aa685d0023a57dfb61103 SHA512 4a5235feecb06ee95d28d4c05bb710014aea120943b3cbe23f2d2130486de82295891d8211a02e52385edb577da3438dd1c2ba45b209ab4359eb3469df08eade
-EBUILD xflux-gui-1.2.0-r3.ebuild 1084 BLAKE2B 3c2050dea25ae4cecd4696da3ce5c5411e023b60bb3d9f10cba7d0b754225fcb5ffc32e1e1259278da8a59a57d91291c1d6605e7c3da95ff506cd21fa1997f39 SHA512 a3b8f77e4e38d6c902de71865791ecb5b7f1c2f768f96e043bae7d498f73cbc3b2d54ccad3d38ac17334e9d02ceb422ef48540423b81e2a446063b2f1943f060
-EBUILD xflux-gui-2.0.ebuild 1036 BLAKE2B 2e37ed8bdbbf7a0f94dd080cee35f53142f2d4731b8d46212441346e90bd32add8adab4abeecbe53452c39a384edf22c42872b4303235f9c494ffbd36efc0b0b SHA512 215b0d71cd2c7103f4d6fec642249eb419e4f4caba46df5c6d79992759e70be4fe36ebeceddaf29a74516c3e8d91a981e5bf741c1b449d6df40e5f7532c06d02
+EBUILD xflux-gui-2.0.ebuild 1034 BLAKE2B 18bcd7301aed80a2d73b485fbc017f7f2a40d8c51247c01857b4cc1ae40eed1e39189c011c0459bb37c065440e8082c1e93e9651861ecbc95651af841a5bff8f SHA512 06c5b26cd5049f1673850138630ce7cefe76c732943f68c7297f9a12a98764b845936f4627e01395bdbbdaf4237b675baa8a96a7004d2d79d8f60be81440b750
 MISC metadata.xml 738 BLAKE2B 9cba265844f261bb6629334f0d7982791d198fd13fbb76ffde6c7755f1141ccc403a76a45ea1af0cff639dc5a631b72ca1c6e9c1fde0716d1b86a0f97a4c1847 SHA512 1c80057a213da1fed5890ef29fe32ef4308dc7f67db8340e07439d5521738955a4d9ce1fbd1a7bae1a6ee8cab68e644ed407fa9754e1322142aa3eb91b192529
diff --git a/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch b/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch
deleted file mode 100644
index dc14be17339b..000000000000
--- a/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 674d17b100f7b8a471d65b61749ca892567f8d58 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Fri, 16 Aug 2019 16:02:59 +0200
-Subject: [PATCH] setup.py: add posbility to disable compilation of gschema
-
-When you install fluxgui, it also compiles the gschema, which is for
-most distros fine. But on source distros like Gentoo, which do the
-compilation of gschema separately, this will lead to a file collision,
-as packages unter Gentoo are not allowed to install such files.
-
-So we introduce a new env variable called DISABLE_GSCHEMA_COMPILED which
-needs to be set to disable this behaviour.
-
-Closes: https://github.com/xflux-gui/fluxgui/issues/124
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- setup.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 8a8fa14..4bd404d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -76,9 +76,10 @@ def run(self):
-         super().run()
- 
-         # Compile '*.gschema.xml' to update or create 'gschemas.compiled'.
--        info("compiling gsettings schemas")
--        gschema_dir = os.path.join(self.install_dir, gschema_dir_suffix)
--        self.spawn(["glib-compile-schemas", gschema_dir])
-+        if os.environ.get('DISABLE_GSCHEMAS_COMPILED', None) is None:
-+            info("compiling gsettings schemas")
-+            gschema_dir = os.path.join(self.install_dir, gschema_dir_suffix)
-+            self.spawn(["glib-compile-schemas", gschema_dir])
- 
- setup(name = "f.lux indicator applet",
-     version = "1.2.1~pre",
diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild
deleted file mode 100644
index 80ea7e8c59b5..000000000000
--- a/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="A GUI for f.lux"
-HOMEPAGE="https://github.com/xflux-gui/fluxgui/"
-SRC_URI="https://github.com/${PN}/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/fluxgui-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-PATCHES=( "${FILESDIR}/${P}-disable-gschemas-compiled.patch" )
-
-RDEPEND="
-	dev-libs/libappindicator:3
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	x11-libs/libXxf86vm
-	x11-misc/xflux
-"
-
-python_install() {
-	# Don't let the package compiling the schemas,
-	# as this could cause a file collision
-	export DISABLE_GSCHEMAS_COMPILED="true"
-
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/xflux-gui/xflux-gui-2.0.ebuild b/x11-misc/xflux-gui/xflux-gui-2.0.ebuild
index 442492423668..4f75d03ddfb2 100644
--- a/x11-misc/xflux-gui/xflux-gui-2.0.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-2.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/fluxgui-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	dev-libs/libappindicator:3