commit: cf887f3461c8200af65cf3c88f5dfc5979ae19f1 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Dec 4 14:33:58 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Dec 4 14:33:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf887f34
x11-misc/xflux-gui: drop 1.2.0-r3 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> x11-misc/xflux-gui/Manifest | 1 - ...xflux-gui-1.2.0-disable-gschemas-compiled.patch | 37 ---------------- x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild | 49 ---------------------- 3 files changed, 87 deletions(-) diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest index f64818024827..dd41064d8892 100644 --- a/x11-misc/xflux-gui/Manifest +++ b/x11-misc/xflux-gui/Manifest @@ -1,2 +1 @@ -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 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 <con...@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 <con...@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 -}
