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

4 files changed, 2 insertions, 91 deletions

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