From ad6182343997a405079870a2fe91c4e0c6b94595 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Sep 2019 19:33:39 +0100 Subject: gentoo resync : 25.09.2019 --- x11-misc/xflux-gui/Manifest | 3 +- ...xflux-gui-1.2.0-disable-gschemas-compiled.patch | 37 +++++++++++++++++ x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild | 48 ++++++++++++++++++++++ x11-misc/xflux-gui/xflux-gui-1.2.0.ebuild | 37 ----------------- 4 files changed, 87 insertions(+), 38 deletions(-) create mode 100644 x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch create mode 100644 x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild delete mode 100644 x11-misc/xflux-gui/xflux-gui-1.2.0.ebuild (limited to 'x11-misc/xflux-gui') diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest index 61f51045dbdd..df073d3389c8 100644 --- a/x11-misc/xflux-gui/Manifest +++ b/x11-misc/xflux-gui/Manifest @@ -1,5 +1,6 @@ +AUX xflux-gui-1.2.0-disable-gschemas-compiled.patch 1540 BLAKE2B c1071aecced986b9bf8662de558ce8cd3c822ebfcc7d3d6601eba9ec30438bfcbc763e26eb31113b00b75e07f463125872ed8897c490ddd32cf96b0798e72557 SHA512 bd03efe531f0b55df89bbf2b6e6dbdbf7c48c214b9969d3c458d093a13603011b956efc0cc6695401abc7abfea18ed29be6501784a66edcf63f8ebd6793b3c15 DIST fluxgui-a3b55da976053fc978b29d191db52dfb8da2f8ee.tar.gz 30667 BLAKE2B bb9b3d3fa2f40acf3248e5cdd91a82c3f736937c03451aba41280b25fc541a3db23c6a57f2ef97ac1ce415d289c0442a387462415827009c68f169f91da589e2 SHA512 d4571f3a64c1f532642f86d4de50d5807afb856179debab77e4495dc48060c68a635d38990d174fbb67169317d7107356344507285271b0bb058f056c1e39a37 DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2 EBUILD xflux-gui-1.1.10_p20180910.ebuild 844 BLAKE2B f8231a19a24ade0d53346f97fb9fdb1e8608950428cdcf29ad3b93ef11a7519db043e42d469139242160819ffd756de36bb63d5cf0b468908929f092f340a436 SHA512 6d8ed009b5122d454bac9439cb1fe0ba6f9856d2572edf6509918e6a5939442e3648d85f00e22046b488f5cb19876ff2c9d8d32bb51e4b668765962e748f3352 -EBUILD xflux-gui-1.2.0.ebuild 740 BLAKE2B a347c5cb94da0f97adae63ae50bc903c99bba474364ab2bd0a3208c8a23abb9d67c1f7506146d3a0089656feae6e5bf96d6316820d0115b63243e17e28b1702e SHA512 204c588e6a0a53f5bf3b2ac80a56df556825f80ff3cb1e66d844eaf6d38bc37687a4c81f60e08e0460b2d11a348e5e7c8af69033a73f67b0ca2bd7daf89a6dd8 +EBUILD xflux-gui-1.2.0-r1.ebuild 1041 BLAKE2B 78b1f82eeee02410f65563282d2762164342cae045bbc01051f3b23163f6f35d507ec2b18d1df1e719bc6b33437fbc2f75354ef8c86ae98d238652a470d03fb3 SHA512 29c014290b2acb163faee1b190c076dbfe3cb49e1d79a34f86000cfc2bac7781b3002feffc0762a31f70d785c15aad65a6317a6fee8d7838d5f94a965a14fef5 MISC metadata.xml 856 BLAKE2B a9b5a2682ebacdebcceccafbacc98785964a37d32067bb358d01957fd62b57d2ea897d63abd7d7ab091aab2ea5baa401423656a038478610ea7425f74a09da35 SHA512 584c1896675cab40d1e0dee33deabda4b1cf951fbc4ff8e6c98b05334492db575effb91e801da76db2599f3860871e7150135b0596400484d4e7ad00d7abb82e 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 new file mode 100644 index 000000000000..dc14be17339b --- /dev/null +++ b/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch @@ -0,0 +1,37 @@ +From 674d17b100f7b8a471d65b61749ca892567f8d58 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +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 +--- + 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-r1.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild new file mode 100644 index 000000000000..1eaaa8fe5745 --- /dev/null +++ b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit distutils-r1 gnome2-utils xdg-utils + +DESCRIPTION="A GUI for f.lux" +HOMEPAGE="https://justgetflux.com/" +SRC_URI="https://github.com/${PN}/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +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 +" + +S="${WORKDIR}/fluxgui-${PV}" + +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-1.2.0.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0.ebuild deleted file mode 100644 index 17a3f60962e4..000000000000 --- a/x11-misc/xflux-gui/xflux-gui-1.2.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7} ) - -inherit distutils-r1 xdg-utils - -DESCRIPTION="A GUI for f.lux" -HOMEPAGE="https://justgetflux.com/" -SRC_URI="https://github.com/${PN}/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" - -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 -" - -S="${WORKDIR}/fluxgui-${PV}" - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} -- cgit v1.2.3