gentoo resync : 25.09.2019

19 files changed, 118 insertions, 49 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 83d04c833270..24dcc9f0cc63 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/fluxter/Manifest b/x11-misc/fluxter/Manifest
index 2f9b1c3198a2..cab282afd9b8 100644
--- a/x11-misc/fluxter/Manifest
+++ b/x11-misc/fluxter/Manifest
@@ -1,4 +1,4 @@
 AUX fluxter-0.1.0-asneeded.patch 1127 BLAKE2B 8e2da410cdbc5b0ea94767099696c0b161b7f90bba0ae79f198ab0bf67166318707c9d94dca8dc0b8d450f97483bb41e762b4b1f2d11e29d62f5c381b86c8f78 SHA512 33861bc6f8e5acf31c83207c10e5953bb8bf49837bf55f0006db9d2d547e96208278cac742c5ce124a5c95afd5a385ae3cf1c46fc914af06fda55792ab5caf16
 DIST fluxter-0.1.0.tar.gz 99522 BLAKE2B 9586d3d48cdf299e5a850110b5549ca784e4af4f1d3c2385883c5e2e920f19ad42234c264da25b34896173d8dd64a809fab3b0540a31bae0d478444806474888 SHA512 92dbb74072b33a59fd356ca055e3b183276f314753f42591da0ecb845de271869a7717bd206e041e6d7a077cc8f931df3cfa1ec671a1ecf36ef565ed21382786
 EBUILD fluxter-0.1.0.ebuild 646 BLAKE2B bdf4f235abeccbc60b178cb4fa829ef5f69dd5f190b9f26724bd7d55068e5a3e142d22481916414f7004c9fd351ab50db54736d62c497b794f67c11ea668126c SHA512 0b28b5361b137d258cef43f9ff588feaad6c74b916a919834a17266181ec5dd9137f19a8ecb72fc5d87d806be0187bcd29a27d243adac53e516a6effce3127f4
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/fluxter/metadata.xml b/x11-misc/fluxter/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/x11-misc/fluxter/metadata.xml
+++ b/x11-misc/fluxter/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/pathfinder/Manifest b/x11-misc/pathfinder/Manifest
index bc6f914bacfb..9e5112d82763 100644
--- a/x11-misc/pathfinder/Manifest
+++ b/x11-misc/pathfinder/Manifest
@@ -1,3 +1,3 @@
 DIST fox-1.7.49.tar.gz 5336321 BLAKE2B 0fc905c77bcf32783a04b573a18ef79b9017e92126028bf7ec344fc388d3935fabab3d988787c08ea26e2783eb81418d84168e1c1eb733297624a0169a5b45f7 SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9
 EBUILD pathfinder-1.7.49.ebuild 565 BLAKE2B e7cf3856c66cfef3b9484a41ab3e478e2fc1f2867f73bad6a5d18c56ce068422affcc92c33a97dc9fcaef5524b00fd164fa577cd9a303e2df7a74e3d097a4f66 SHA512 33996f8d8b34cac1f25dddab363e124f57017de653c62af0812fbd28b9dbef6619247b8efe2fd0eb2678e5f59193a211598798e8868cebd156c8579ff4a28f15
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/pathfinder/metadata.xml b/x11-misc/pathfinder/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/x11-misc/pathfinder/metadata.xml
+++ b/x11-misc/pathfinder/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 762ffecf8ef6..68baebc976ae 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,6 +1,8 @@
 AUX qt5ct-0.35-fix-qtdbus-automagic.patch 1194 BLAKE2B 7a076ca63cdbcae61a517f91c501eeb48a93dd484b6472d95fca2e4ffcbd7240b2169d316e9f5f10385c7fadcfd89195ed13ab673b2de8769d71520e7f594874 SHA512 e90688a59a3fe81cb8ffcce290d061728dcc662b3763e258745361e2eea2a6b32efd51e0e338378b83d2fe5ba73c7984e8d5f858e8ad772ffc19246b4465de60
 DIST qt5ct-0.35.tar.bz2 62547 BLAKE2B dd61f151e1c6c58095889b90cb30bb2baaf21fd8f181af37ee43c1d00404655d57c941cee905e737aff29122ae3f588d5c7ba46dc80ca76d749cc2dd66f35d57 SHA512 2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a
 DIST qt5ct-0.36.tar.bz2 68181 BLAKE2B b2bf21a1e3f4c6045af5f2e633c2a839bdb49165eb7f3a7d84021faa1c178e4ab84556460c2aa5e2b530fa32fdf29e0f7d3b37c9c839b7bbc7cfc8b77dffbb70 SHA512 dfd6f85328fe8f14c8f2349bc0cac698e549350e2c000a73ac26474ca38ec5f44fd4ebed9b6976fc3423dda8322fd80355eafa6ecbec17495d1e2278c3189a88
+DIST qt5ct-0.41.tar.bz2 73009 BLAKE2B de6360feb16a82b262c13e6a3cbe226b7be7c3e95b1f1262b3802de59fc3bb8820c935b170a15a88e80164e6167f6259777c65fda6a3f8fbf1d115a63ddcc1f2 SHA512 a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009
 EBUILD qt5ct-0.35.ebuild 1092 BLAKE2B e429fdfa2eb628ad2b6ca420258dc45873fb1b4d3d904905c06dd9489bb69a913b8c69c6e5136e0f422700c8c9f32717b36c4ba3dd8d6e4bdc29096d09f88578 SHA512 57ae70772ae917725776b4debcd2a90264655d2c4c5705fb7c07c12da2fba77917152f47832dcb537990803649e0152e16a09ad25750a2c954868ea2b612f600
 EBUILD qt5ct-0.36.ebuild 1006 BLAKE2B 8fa017e3c33f1b112eea963812b79d68e631e4ba7a80f4feab0d9c9d3ed9bdc864d4d7c80f096372f5a39e181224c98c2deb4d2261c4a9aebc1aa1959e32284b SHA512 6ead937acf5c95faeb93cd4d4cebfbf97dfeea957c603b0e17860434596d67f53be5fe479726da3cbdbed67268bfe9cc91e71aca6ad67cd75b68f73ef56d91cc
-MISC metadata.xml 685 BLAKE2B a1a01cf474fd069651dd4bdddd4b58e7b352f91bcf147dbaf6ab0c6992d4f5636abbd6514be1c125802c21c4f8fb7ef3220474f45c55f3aa570b1128ae6148c7 SHA512 0fb47a823c4ef40aecf8775ae89dacfc8b4c16fef6baceafd3a36ff2864bbe63f40b2bbab0ac4ab16dd3e15f6e618be050f515af2d474e2752035bf311fb0d0a
+EBUILD qt5ct-0.41.ebuild 1028 BLAKE2B 2181cc64c94ab108d01ac515edc841c49d590cdd913e546e81f04cc2be1490799209714b68360560903f9d239a20d34af669a885bb5f983b5b3e82e7758208ce SHA512 e80db966a56257d75f7e3c13f708b05682701902d877d4ee4a3b1ae8cc8f86a70a2282b93e4bbdb672192083407a0a574b391beddcb9f56d07d501e14169b3f5
+MISC metadata.xml 566 BLAKE2B dbb30222ccd1079489ce54e50d5d4ce9a3b9e9acf38d4cc30a402f81418685a3cf86f1adae23d85a409f9866ca11ec1321e543e14bd37ed13a45d02a32accc15 SHA512 d40c24dd0cc2d0b2c79251cf1fb2540dbec484653817469198f4ad7e41164a8c518442c5d11764f0c8aa53bd7ae9758629acc7ba4a4c9f2a374af13cbdaf67c1
diff --git a/x11-misc/qt5ct/metadata.xml b/x11-misc/qt5ct/metadata.xml
index 86b995aa8038..431c089faf5d 100644
--- a/x11-misc/qt5ct/metadata.xml
+++ b/x11-misc/qt5ct/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>itumaykin+gentoo@gmail.com</email>
-		<name>Coacher</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
 	</maintainer>
 	<longdescription>
 		This program allows users to configure Qt5 settings (theme, font,
diff --git a/x11-misc/qt5ct/qt5ct-0.41.ebuild b/x11-misc/qt5ct/qt5ct-0.41.ebuild
new file mode 100644
index 000000000000..cb755d5ac746
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-0.41.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5[dbus]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+src_configure() {
+	eqmake5 DISABLE_DBUS=$(usex dbus 0 1)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "qt5ct configuration won't be applied to the currently running sessions."
+		ewarn "Please relogin."
+	fi
+	if ! has_version 'dev-qt/qtsvg:5'; then
+		elog
+		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
+		elog
+	fi
+}
diff --git a/x11-misc/shutterbug/Manifest b/x11-misc/shutterbug/Manifest
index b851cb05d5fe..e29fcfaed3b7 100644
--- a/x11-misc/shutterbug/Manifest
+++ b/x11-misc/shutterbug/Manifest
@@ -1,3 +1,3 @@
 DIST fox-1.7.49.tar.gz 5336321 BLAKE2B 0fc905c77bcf32783a04b573a18ef79b9017e92126028bf7ec344fc388d3935fabab3d988787c08ea26e2783eb81418d84168e1c1eb733297624a0169a5b45f7 SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9
 EBUILD shutterbug-1.7.49.ebuild 571 BLAKE2B 77383793a87fb273244218fd17d1564348d08a83c33e8e4a8143814289fab9af3051590526e4174566492dbc08002b9bc512696d20680e72bf94b352b958891d SHA512 1ca55aa86a6139571c461cc26e7a36f83743c4efe361bd1c6adfb26c674084c2d154acd3c97b206c056d32c0884cae671be323f25a722062fffe505eaddab818
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/shutterbug/metadata.xml b/x11-misc/shutterbug/metadata.xml
index 58f638b2ac3e..7a38bb900964 100644
--- a/x11-misc/shutterbug/metadata.xml
+++ b/x11-misc/shutterbug/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/urxvt-tabbedex/Manifest b/x11-misc/urxvt-tabbedex/Manifest
index c286963285ac..27fda4710374 100644
--- a/x11-misc/urxvt-tabbedex/Manifest
+++ b/x11-misc/urxvt-tabbedex/Manifest
@@ -1,3 +1,3 @@
 DIST urxvt-tabbedex-19.21.tar.gz 32208 BLAKE2B 6951472a21988a4673ef7716c945de6b256ab45c152e9b58729df45a868efb37ec8a82bd564dc9f1c5ab349e4b7c869dd8f2044f54528071953c69fb47f78977 SHA512 8ffb97e80b023d84ec0ba8c49001f3e05cd9dee4b64a1ef87fb44a41a27e609ad73ecf4f21af6335fff2ce750297603facd5e403a2bfdf38b13908cdc66abe33
-EBUILD urxvt-tabbedex-19.21.ebuild 678 BLAKE2B 9a48c811c877f21b7887d5c7ae9584111b1a9f05b60f082dc7a6621a93c9359373b9909ea5ba44e5031ba143a22c5f8b874773662d474df39f2fbeff6d11545e SHA512 46a989980e6a640115e3af34291ed1cb8168bc229c5bcdfafa0dd6968a1db093904ea0cec5631fe826457ce3901b92467fe6c416d4935a911fd4ea1983de9d19
+EBUILD urxvt-tabbedex-19.21.ebuild 676 BLAKE2B b0f3fc6758317f4bd3e61d7a9683de5fd68fb4d27bbf5d88b1000e2bf5d4c73605062a0454155f5033ba4aab06c9081f85a3f3ff2e5b67876b2ad7d42ba427da SHA512 20525a9413005b1ce4e121878d500bff665801bdac50322de5fcee39e84cacf4181b86951a58568e05c88a552790f02685a283e2876ab0bd864815a0817060dc
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-19.21.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-19.21.ebuild
index c2f95aaa6791..f9845c7725d8 100644
--- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-19.21.ebuild
+++ b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-19.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=x11-terms/rxvt-unicode-9.21[perl]"
 
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 <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.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
index 17a3f60962e4..1eaaa8fe5745 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.2.0.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="A GUI for f.lux"
 HOMEPAGE="https://justgetflux.com/"
@@ -15,6 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
+PATCHES=( "${FILESDIR}/${P}-disable-gschemas-compiled.patch" )
+
 RDEPEND="
 	dev-libs/libappindicator:3
 	dev-python/pexpect[${PYTHON_USEDEP}]
@@ -26,12 +28,21 @@ RDEPEND="
 
 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/Manifest b/x11-misc/xflux/Manifest
index 7112936f07e0..afa560311ed1 100644
--- a/x11-misc/xflux/Manifest
+++ b/x11-misc/xflux/Manifest
@@ -2,6 +2,5 @@ DIST xflux-20130927.tar.gz 335911 BLAKE2B 56e683a6969f129c7dcdfd4b13a23523ca5ce3
 DIST xflux12-20170103.tar.gz 340461 BLAKE2B 81e8567cb7ce0980cb2fbee4a455d023fd76ee40d949b9616a8f2c4d15a361a286769dc91d67eb6d4391851eddb93dc2fa56b78d0f5c620fb56e69e82083d7cb SHA512 752da038c5b57042dd624acfdbf64926e73ab559f8f069358969ab91de158e6688b0c9f0d681f4400d0bc8f1b7434b55bff7725288ce9e7def49d31382770fd3
 DIST xflux64-20130927.tar.gz 339845 BLAKE2B 15751b75b7c0603044c4e7e98a9b23ceab7e245b12833ed1b6e8bc1d1734c5838777b7561d035bdf6d6d781105cc48dbda6c262895c310cf9710529a088b0a97 SHA512 6204558b8fa1063ee19fe444f740ab4ddfdbc412459b2f5cea94ddbf11818e0c9bff7e066a4958c1ab5c160b1aedcd18fa7fc4cd800a67c5d51ad1206f203e52
 EBUILD xflux-20130927-r1.ebuild 637 BLAKE2B 9e69e04e8cb2feab648340ae3b76aaca316d9fb2d57ee22174f4cf6c7b9ed322deae0dd14730e084d7f1df41e6420d5dfcbb2e7bfaa7fa0dcf03e0ddca661c93 SHA512 4d145d9811958436ea856b62bc9c466c97e065335feb823aafca9e2c47d23799375bb84bb660b00a7a9aed33d5dd38039f88b798c29a2380f68ccd47535b2fdd
-EBUILD xflux-20130927.ebuild 652 BLAKE2B b0d542127d818f4f99e7f8cdd4dfb8a4dcfa06bb1a5abfd9972c5ed900d4b744cb229246a945fd296a2dc85ac9985be88768226057cb7221e41a5d0e8cb053cf SHA512 25ea901e469797293fcee0db63a415efa6f156c574f2174def009c71e91e9d36cf0560b37c21cc5d814ddf9a71b1a4ee2c124967209e38ad5a25fe4c0dcd73bd
 EBUILD xflux-20170103.ebuild 560 BLAKE2B d79cc80458d66259dab77b787ad76f22ec3eb27c0d128ecafc97d7b76dfdd73bcde96f9a2a77c9e9d5c00e431f4518a46513f6f4e46705a3d068c5d444e83658 SHA512 49735d7ec5f0a5e6689c50d82d0d3caa49a00132c34de1087b9b55a225426ffe6bfee808dea60d34860f94ed6615097baeb9820a33e40d8f2bb7d0fa2738fb65
 MISC metadata.xml 621 BLAKE2B d4a3d03b35bde34b0b6b1af8518d3b18486876766037a4bebcadeea32f247f2660c970d89638e91315dd7eff42ccf818bb868c92ea94e52db3793cc1285008e2 SHA512 9f2ae158aea2c8d2e0191c5df7825b0b6b802a564637ccfe8f431cd0dda9569a7af0c08925e804b2139de1ba1a8c346db0b305273b0f54fc1a4581bcdb959718
diff --git a/x11-misc/xflux/xflux-20130927.ebuild b/x11-misc/xflux/xflux-20130927.ebuild
deleted file mode 100644
index 39d471769061..000000000000
--- a/x11-misc/xflux/xflux-20130927.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Makes the color of your computer's display adapt to the time of the day"
-HOMEPAGE="https://justgetflux.com/"
-SRC_URI="amd64? ( https://justgetflux.com/linux/${PN}64.tgz -> ${PN}64-${PV}.tar.gz )
-	x86? ( https://justgetflux.com/linux/${PN}-pre.tgz -> ${P}.tar.gz )"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="f.lux"
-SLOT="0"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/bin/xflux"
-
-src_install() {
-	# Install binary
-	dobin xflux
-}
diff --git a/x11-misc/xmonad-log-applet/Manifest b/x11-misc/xmonad-log-applet/Manifest
index c81c487fc065..67333cd48778 100644
--- a/x11-misc/xmonad-log-applet/Manifest
+++ b/x11-misc/xmonad-log-applet/Manifest
@@ -1,4 +1,4 @@
 AUX xmonad.hs 1801 BLAKE2B e8235819cbd5086141def1d45652750129c8153e65c52b9e72ee9b42d3dd6110e9d1b6e3da651ff18beb9b3c61e3afaa83fff9059a7d2113a0a445d2e07e0b99 SHA512 3d20f037dabff24c69811672850734396a4c4f57a9e33e03a15f93d8e5b4edcf43dadf9d95ab82c310dbf0064e8fb7a6a0e8e330c5b51997e0dffe719dd0cb21
 DIST xmonad-log-applet-2.0.0.tar.gz 82881 BLAKE2B a059158558cc2fcb150e90cbd055cf50367dbed464c46891b6c63d49d2b5e2974ea3fc859afe8f1115af78fae60e639bde0aec37af8be693720eca80905712b8 SHA512 1885ac97569d909ab1c6af99d9b271d0f782de905dfe035df27524f428d09cefa20a468103477132656dea8945faf886270fd70a49e5a08be538e04f3f05baca
-EBUILD xmonad-log-applet-2.0.0-r301.ebuild 916 BLAKE2B bdcf4d94badbcd9fd65123118ad294f1fb59a03e8478b7f91982ed1c60dbe452e0d6e671339ed583b181422c02c2a7723700a03dff234ef7a419266ec7623284 SHA512 89d6035f79606dec069588ea2d0eae4cb51e2a48b14f071a342321e719de367da93d78d555b3d635268440bb341e575a7970461e53418ef16c1d90da1ce21497
+EBUILD xmonad-log-applet-2.0.0-r301.ebuild 929 BLAKE2B 6002ba6efb52cd4fc216421d146b2ffd62beae91287fc010db976e53b73f4e60692fe0387137dac3ee37b73b3c1055dffdcc43126dd5a26ef8fe124f0e836f7f SHA512 77d4c9c8c82761f62de6c382af27211842c06780e5b28f63dad436c2f94afa3d62b2ff11ab06efa9f7c9e2f2c8976dccf08fd96b1db9e6460b2033de155ec3de
 MISC metadata.xml 647 BLAKE2B 0af322628cb650feee33ab99817bdd2955689b9cfa2c4bd736d9363b1de33be9913972884792d98cfd827cbb5133e5c52ae92e747df80ba6636be8ad64f12226 SHA512 92739437a732ad395f4af992972cd4be68abb931a26e1b47e0035b0e681fa5095e5019b4f0fda178f53197fd42cdbd679b6673727fc5ac425437768f8ad12fff
diff --git a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
index aec50da5dd58..9038beb0ce04 100644
--- a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
+++ b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
@@ -6,7 +6,7 @@ inherit autotools gnome2
 
 DESCRIPTION="Gnome and XFCE applet for displaying XMonad log"
 HOMEPAGE="https://github.com/alexkay/xmonad-log-applet"
-SRC_URI="mirror://github/alexkay/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/alexkay/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"