gentoo resync : 11.05.2018

17 files changed, 86 insertions, 105 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c6e1f6265167..f31d829eb4d5 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index d2981e7535d1..6d453e465c9e 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-default-sysconfdir.patch 373 BLAKE2B 4483b6c4e838559997acff86c46a879206decc0e834bd92cf8573eab28f5ce3ec74f186ce53fe3e2a69f8e7006265ce956f677470828f8b3e1bc40b5ab925abe SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554
 DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
-EBUILD i3blocks-1.4-r1.ebuild 765 BLAKE2B f78f6c9679177c67850967d807adf81492c6452b6fd33792b2c6e3254ec08d6a57e8447f7feabf88a56f9c0c4e56a702c59efe1ada2edb5250c7cf7145ff34b7 SHA512 20afea069ee5cfafaf46045af8352cfb5c19815df6b4ba13ec851dbd913fa185d32f02e8e6be9eb4c8f59d6d45cb162b3f92b9b034f5f8b12973284a2d2e12ed
+EBUILD i3blocks-1.4-r1.ebuild 765 BLAKE2B 02caadce1f62ed54ee08e5dec2e2d43dd0e0b6ef5d315b9802ab659314c6d997d39f0774f36f07ae61dd0eb45b898395dd5c47a5dc4a371181636025cfc526fa SHA512 f9ba4dbab272cfe526ebee27f9280d33a3bfc930ef1cdd63fed7d340d9aba3cc7c44e2d4b96e9bfc66faade5c37c8cf6dd1f3f1edb926990d9f22ba8cf16e020
 MISC metadata.xml 331 BLAKE2B 4e906b5d485968ff9cc55dca82cbd704cc57a5ecf77c230bb7fd6e2a910c236bc0afa1d457f4b90b758ca5ecba0b2505512fc21f7dd12179d2b275d425430a14 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index e1e28279d73d..426e5ac2b8e4 100644
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ DESCRIPTION="highly flexible status line for the i3 window manager"
 HOMEPAGE="https://github.com/vivien/i3blocks"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vivien/${PN}"
-	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
@@ -24,7 +23,7 @@ RDEPEND="app-admin/sysstat
 	media-sound/playerctl
 	sys-apps/lm_sensors
 	sys-power/acpi
-	x11-wm/i3"
+	|| ( x11-wm/i3 x11-wm/i3-gaps )"
 
 DEPEND="app-text/ronn"
 
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 5f6559b96392..ecc11dfa76d5 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,6 @@
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.1.0.tar.gz 418298 BLAKE2B 1c7394a17ff1ec5b0dec519b7aa58e63cfcec0f104d4302051f6e12753b7074c3d85072a3d78e7ce135c53d4ddd4a6f68ea61ffb7b2ad04997bbf0c836115046 SHA512 6d8759d9f750c2abfa79fe735615b0ed3d1827e3a88561317712c6f02cb32a0a77726f97cb419f3a040ae9085a34a23cb1aad0aacf3f14e56c542977b89036b2
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
-EBUILD polybar-3.1.0.ebuild 1631 BLAKE2B b62ddadaf5523f707314aeb4ab579550cbbd3b0c6187e1d3f5577d9a47c48192c298be1645788dbafbb70e268d0f47cc22338671aeb704f8e71e774577b74fff SHA512 1dd20cb7739e24957d6a59ec53359b2440efcc1ceb74eec73e510b65104f1506dec2a4b005e878435c184902234f311a488825222447935727d2ce81a291a38e
-EBUILD polybar-9999.ebuild 1138 BLAKE2B 50a918fb6b09b958966e0e240b70802bc4859bc9506bd92ff188e02bd82d3e494f16f5993a6b896af1be6480ff716211a65547067a6931a7ea10274eb0716029 SHA512 91482dc564743240d37dae10143a62e6a5d6ae13659cf8f9390918df0f396e7bd2fcb85efcb8e19188844deba567e4df9df1b6e80ab3d7426fb4d39cfbcd9b16
+EBUILD polybar-3.1.0.ebuild 1686 BLAKE2B c33777ea01c09a1314300efc8b6c73407dec67548329c57b33c122c9d1520a5cd918c5598df8de444b1d1563ffabd1938f92088dc6647bf303428e231c99e700 SHA512 2b862b85a3504d23118805d11bdf09201f80fccfde7732f688e823b4be09b0efc33d818403af9bd30b568e2a1f76d72b51640bd3a047baed1c9947286e1221a8
+EBUILD polybar-9999.ebuild 1177 BLAKE2B edd1dcc60f26bd303199f5a9b5a3e631cafd14c959731f36d34b68cbc96f6e19469cadbea788f179682d79f6f635bf22b16923985a16742d8a56b92d705ddb56 SHA512 1fc3f570215ca8569c46c431d83fd5dbc35f12a6ac2dcc8802de2981c54d24b1c83e53a9c4fbcac18fb7b66c3051e7ff1ad7ba2b6261c9fd69858c2483536636
 MISC metadata.xml 696 BLAKE2B 2b2762500174e5b8674161433cc5c862158dc1db4e057b4e92d3c7433e8c286a80111dd311bba04631f71d2a58817ed2c745f024da1a39b5622fafc57525e346 SHA512 a3fbaea3fa687472a671c7b209bcabaf8a3fcab86b53aa357aa776cc3b57a565eae933b50a6238dc73d46659ddd893ad1dbe9f312d828d05c26cf0945818d322
diff --git a/x11-misc/polybar/polybar-3.1.0.ebuild b/x11-misc/polybar/polybar-3.1.0.ebuild
index a04e956a0e9e..f9be038f16c0 100644
--- a/x11-misc/polybar/polybar-3.1.0.ebuild
+++ b/x11-misc/polybar/polybar-3.1.0.ebuild
@@ -26,9 +26,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
+	x11-libs/cairo
 	x11-libs/libxcb
-	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
 	i3wm? ( dev-libs/jsoncpp )
@@ -39,7 +41,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	rmdir "${S}"/lib/xpp || die
 	mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
index b21888340078..7a1abcf47ee7 100644
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ b/x11-misc/polybar/polybar-9999.ebuild
@@ -21,9 +21,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
+	x11-libs/cairo
 	x11-libs/libxcb
-	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
 	i3wm? ( dev-libs/jsoncpp )
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index 8e89a260f752..42f180679589 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,8 +1,5 @@
-AUX xbattbar-1.4.3.patch 1206 BLAKE2B 1d014f0995d6f3ad7826e579c41948663e30d7ad78463dda180916dbf06d7eb6cf1268ef7c45df37eff67e6b89d9508a86a07a08b324efede4f9fe9bd447ba5a SHA512 e8adf912868b6fef383b9c09783c7a74c74e95446c3d4e37555b2b8cec1d7753ad6ba50de308c51f3a536dc19f616e1bf1363e98153d33e87988ba3fe3d2aa5a
 AUX xbattbar-1.4.5.patch 1427 BLAKE2B 06142c445fbce221b8ca871c2717790e1bbe6b56f50d3003e82eb024ad012fc2677cbc4cbebaac7284e3291a9e95754c19f773fc3cfc1dd3ad9ee8c15b4dd451 SHA512 190df4894fcb29f5b2b5387523429947b967e48fb710ad256f8ba31bf33d22e04b4325ba3d6b3228aee14257e241815a5b99c4284d1cedb6b4e977e47a9c54df
 AUX xbattbar-1.4.8-const.patch 303 BLAKE2B d33ff7f8bc273e1ef3e493e2411b4aff025a36316163b31df52299a77c6409023b069a7ef2d2f55a189e2848b8e73d37a54a8957c9f71fdc3e51b6a48a179bda SHA512 987116af9d8e50b6ef96924199e5d348a9910030adbe2b2a8de0425107eee93cfe04740b343542c97edc6ed846bcff05724470b6fff1f5209c92c42e8648af0b
-DIST xbattbar_1.4.3.orig.tar.gz 15722 BLAKE2B 85a6dbce98ec0109360881763fdf57501e0db21ab2d614b583996d2164c0d8aed94f3e20968cb6c91cf34a7181c66efe94a6e6f32007f6dc26dd94c163bb9d46 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32
 DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191
-EBUILD xbattbar-1.4.3.ebuild 902 BLAKE2B 7c00dd2d955179f5d6c64eb973e839edffb9d85e0b15f3b142aa6857fa2b733115d7f123a9db1d859270daa5ba0e20ae65f49020d3031e19e76ee179b8023efb SHA512 34696dc48ee16955280f979adf447e1622c2436d230852a6bf9021e1e4d98ec978025d273d482079a11de2f996e3690f03af68777ff54113345957ac88c866f2
-EBUILD xbattbar-1.4.8.ebuild 1086 BLAKE2B 44a2366a1d20de10b4da868033e9dd7b493d732afe13a5d22d95ecfbe17048d745d0c663b718fea4589e2ed0594b7b99cc9427cd04bcda08e9ad041b9b6a59ee SHA512 1bc10247f586ac957127a831027de6ea2116dee702aaec642458a02e958df5c0e11360616f4128330244d0e6561af5e36f9171117e51737f562fcb322de3078f
+EBUILD xbattbar-1.4.8.ebuild 1085 BLAKE2B e546287ae2c16206eb9ba5d81ad0950ff82b8cfca610c9ede4b6e511be31cf38cce352bb0d0846f58e06a89e7ef628f90f8ffa1f15c2304241b52258a956f1cd SHA512 f2447d4f3bd865106114fc467828dab08c0940e3de7cc465af046dc203f02f4d2373e97609978d68c741cffd91d9657e34f13c4323abfe9a6ca6979d5661b4de
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
deleted file mode 100644
index ad5b9e49c1fa..000000000000
--- a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -8,16 +8,16 @@
- all: $(TARGET) $(APM_CHECK)
- 
- $(TARGET): obj/xbattbar.o
--	gcc -o $@ $< -lX11
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11
- 
- obj/xbattbar.o: xbattbar.c obj/stamp
--	gcc -MMD -o $@ -c $<
-+	$(CC) $(CFLAGS) -MMD -o $@ -c $<
- 
- $(APM_CHECK): obj/xbattbar-check-apm.o
--	gcc -o $@ $<
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
- 
- obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
--	gcc -MMD -D$(OS_TYPE) -o $@ -c $<
-+	$(CC) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
- 
- obj/stamp:
- 	mkdir obj
-@@ -29,11 +29,11 @@
- 
- 
- install: $(TARGET) $(APM_CHECK)
--	install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
-+	install -d -m 0755 $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)
- 	install -d -m 0755 $(DESTDIR)/usr/bin
- 	install -d -m 0755 $(DESTDIR)/usr/share/man/man1
--	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
--	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
-+	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
-+	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
- 	install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
- 	install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 
- 
diff --git a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
deleted file mode 100644
index 50b76944e6f3..000000000000
--- a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Advanced Power Management battery status display for X"
-HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	x11-libs/libX11"
-RDEPEND="${DEPEND}
-	!ppc? ( >=sys-power/acpi-1.5 )" # ppc has APM
-
-# XXX: Avoiding imake in purpose here.
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-
-	sed -i \
-		-e "s:usr/lib:usr/$(get_libdir):" \
-		xbattbar.c || die
-}
-
-src_compile() {
-	[[ $(tc-arch) == amd64 ]] && export LIB_SUFFIX=64
-	tc-export CC
-	use kernel_linux && append-flags -Dlinux
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
index 8e044840e00e..07f440b75dcb 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 916c0934e34e..4233714fa08d 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,3 +1,4 @@
+AUX xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch 1747 BLAKE2B 0b638c7884cac5684e85070342e24ffc310645372290b50c3e7c92b536db1c64d2cc2642e353ca88dbd2ebee86898c7f2e6586cf6ea2233c452cfacc37161491 SHA512 119f56f8afb4f8eaa2f739ef06aff06747fedd9036da9a70a57f8e13410d540532378841e9b7c54de1d7e6941cc254ad6927d0f4b83f330623a088866cbd6b5a
 DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351
-EBUILD xfe-1.42.ebuild 1501 BLAKE2B 762aae1813d757093b1262edabdcf952f6be3d3e217ccb17bab63fa574c4762c20549c1e369fcfb71e59543ff29d7309ce42e08d4a1ee723b5ecbbbcb822f5c9 SHA512 9dfe2f4abf6e1a1b2d04e0d4feee6890b9f2fca96a7ab7332c68449568eb135a2a1b2442e82ab38a3fb17e040a3a5133b9c614a41b2f4a1a4c31a5bacbd9add5
+EBUILD xfe-1.42.ebuild 1602 BLAKE2B 9b2e59f05bf959868b6be3fbc4d819095b153baf87a9bc57fac2bedf2c80ebafe5704f815bdc4a692ad941f96ba67070be42b28c80438814527a8d896f2a21df SHA512 a87c6c76316e9e7f49799b29bb1562c2fc7dafb6688d5e87dbee28de19af542fae385e80eaed4b9d16d842eab93ff797c76a5dc7e5f717603bfa58352416441c
 MISC metadata.xml 349 BLAKE2B 1f855ee2a581396591ea01b3b1d00fe0dba88e564d38186f738d797eb50554593c2d2bf396f8a616329855ebe829b1da5461705965e252b2994545353e26f475 SHA512 08958aec505d6e35611988ed33f184112fecea69197b2f2e5d784d2db216a0b643d27c6ac24ca265fd89d612b67586925d6b768bdf86aa0060919c96ecda48cb
diff --git a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
new file mode 100644
index 000000000000..1394f59abc2c
--- /dev/null
+++ b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
@@ -0,0 +1,57 @@
+--- xfe-1.42/configure.ac
++++ xfe-1.42/configure.ac
+@@ -29,6 +29,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++PKG_PROG_PKG_CONFIG
+ 
+ 
+ # Internationalization
+@@ -109,16 +110,13 @@
+ 	
+ 	echo "checking whether FOX was compiled with Xft support... yes"
+ 
+-	# Check for FreeType2 headers
+-	freetype_config=''
+-	AC_CHECK_PROGS(freetype_config,freetype-config,)
+-	if test -n "$freetype_config"; then
+-	  freetype_cflags=`$freetype_config --cflags`
+-	  freetype_libs=`$freetype_config --libs`
+-	  LIBS="$LIBS $freetype_libs"
+-	  CPPFLAGS="$freetype_cflags $CPPFLAGS"
+-	fi
+-	AC_CHECK_HEADER(config/ftheader.h,,[AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h not found"))])
++	# Check for FreeType2
++	PKG_CHECK_MODULES(FREETYPE, freetype2, [
++		freetype_cflags="$FREETYPE_CFLAGS"
++		freetype_libs="$FREETYPE_LIBS"
++		LIBS="$LIBS $freetype_libs"
++		CPPFLAGS="$freetype_cflags $CPPFLAGS"
++	], AC_MSG_ERROR("freetype not found"))
+ 
+ 	# Check for Xft headers
+ 	xft_config=''
+@@ -131,15 +129,13 @@
+ 	  CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+ 	else
+ 		# On some systems (e.g. Fedora) xft-config is deprecated and pkg-config should be used instead
+-		pkg_config=''
+-		AC_CHECK_PROGS(pkg_config,pkg-config,)
+-		if test -n "$pkg_config"; then
+-		  xft_cflags=`$pkg_config --cflags xft`
+-		  xft_libs=`$pkg_config --libs xft`
+-		  LIBS="$LIBS $xft_libs"
+-		  CPPFLAGS="$xft_cflags $CPPFLAGS"
+-		  CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+-		fi
++		PKG_CHECK_MODULES(XFT, xft, [
++			xft_cflags="$XFT_CFLAGS"
++			xft_libs="$XFT_LIBS"
++			LIBS="$LIBS $xft_libs"
++			CPPFLAGS="$xft_cflags $CPPFLAGS"
++			CXXFLAGS="$CXXFLAGS -DHAVE_XFT_H"
++		], AC_MSG_ERROR("Xft not found"))
+ 	fi
+ 	AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found"))
+ 
diff --git a/x11-misc/xfe/xfe-1.42.ebuild b/x11-misc/xfe/xfe-1.42.ebuild
index df2bd089efc3..dd6e5a79a2de 100644
--- a/x11-misc/xfe/xfe-1.42.ebuild
+++ b/x11-misc/xfe/xfe-1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,6 +36,8 @@ DEPEND="
 
 DOCS=( AUTHORS BUGS ChangeLog README TODO )
 
+PATCHES=( "${FILESDIR}/${PN}-1.42-use_pkgconfig_for_freetype_and_xft.patch" )
+
 src_prepare() {
 	default
 
@@ -62,15 +64,15 @@ src_prepare() {
 		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
 		configure.ac || die
 
-	eapply_user
-
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable startup-notification sn) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable startup-notification sn)
 		--enable-minimalflags
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 7e7bbc6cde77..492789bfaf27 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,3 +1,3 @@
 DIST xflux-gui-1.1.10.tar.gz 18828 BLAKE2B a249533ace4ff6293ff9b99a455943c1f099628bec97c2730473f8a9550ba38e78e775a10a0f77c160180f5f5d354ac8c8ac924c1a2eb9f48861491583c93285 SHA512 5e8057e47fe2cc8a59758e9ab6b3adc6a8281b42f6b517e3e1327e5470c82a326c853d5d389fd62f6d6c439be4ab70a6c8771ece87e5b8c90a33775f8b7cd54d
-EBUILD xflux-gui-1.1.10.ebuild 851 BLAKE2B ae12ae2e1a0e5c837112dc7087af23dc8bbf7f0f0ceb4d65c3bf99137a1503acbaf6c935e0e3304eb989ac0668df275e36a46579e08954078dc796edeb3019b7 SHA512 5f34660fe85e0a916cd05ef39034a89ef116b91cd0bd335f78a0c2f0caf081d673c8faf1972816a579a91140f3ae4fbbc9c57d9986c9f29ec0b6ae25d5a7dbed
+EBUILD xflux-gui-1.1.10.ebuild 850 BLAKE2B dbffba8824bd5afb7a743b902fb549bf692285e1350f2b128fdc6cd9641c73ce5059842569d67d1feb99dda8554e911b76da48d21a30b292593296606416de97 SHA512 5333d53788145b32e13bdbf92ff52fb6e2cd1a3ee80d3a3450e8fd52ffced4380132dee758ea005ea57f71c76a01482902c7e9f6948316c46026e744b7495b7f
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/x11-misc/xflux-gui/xflux-gui-1.1.10.ebuild b/x11-misc/xflux-gui/xflux-gui-1.1.10.ebuild
index af40017b69c0..b3557c1eb8a1 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.1.10.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.1.10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A GUI for f.lux"
 HOMEPAGE="https://justgetflux.com/"
 SRC_URI="https://github.com/xflux-gui/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/x11-misc/xflux/Manifest b/x11-misc/xflux/Manifest
index 4b19b543ec61..5c90d5dd1f0e 100644
--- a/x11-misc/xflux/Manifest
+++ b/x11-misc/xflux/Manifest
@@ -1,4 +1,4 @@
 DIST xflux-20130927.tar.gz 335911 BLAKE2B 56e683a6969f129c7dcdfd4b13a23523ca5ce3d19feae947a654ca02437e372bd998a71048d00c5b7bf653eb9fa57c696b8d5bb1b3dfd75a0b17e9213368c1bd SHA512 c35003b9cc6bc95f6ce98efc2e69ea94c99ed31671ec5d1f5919294edd7e504d23aa1df29ec0f1d1c68c4ceafbcd386e1207ef4c9957d7a5079ce96c2ac6d924
 DIST xflux64-20130927.tar.gz 339845 BLAKE2B 15751b75b7c0603044c4e7e98a9b23ceab7e245b12833ed1b6e8bc1d1734c5838777b7561d035bdf6d6d781105cc48dbda6c262895c310cf9710529a088b0a97 SHA512 6204558b8fa1063ee19fe444f740ab4ddfdbc412459b2f5cea94ddbf11818e0c9bff7e066a4958c1ab5c160b1aedcd18fa7fc4cd800a67c5d51ad1206f203e52
-EBUILD xflux-20130927.ebuild 653 BLAKE2B 3e21f3a51af67572b555d9f54e5667078cc8b984c8dc42e51fe9c793091d6582c3216d8c759196fe0308792fe7f101f059ca82e39744c5d0d6defa3a0b7bb6ce SHA512 0f1ed2101461666853302e74d7123d4a0aaf47b01ee60b27da3239c01506e70c3acb871784961aa6ddd7fc7e981f88b0cc97af6d05c2aedfb0201476c4e7a52f
+EBUILD xflux-20130927.ebuild 652 BLAKE2B b0d542127d818f4f99e7f8cdd4dfb8a4dcfa06bb1a5abfd9972c5ed900d4b744cb229246a945fd296a2dc85ac9985be88768226057cb7221e41a5d0e8cb053cf SHA512 25ea901e469797293fcee0db63a415efa6f156c574f2174def009c71e91e9d36cf0560b37c21cc5d814ddf9a71b1a4ee2c124967209e38ad5a25fe4c0dcd73bd
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/x11-misc/xflux/xflux-20130927.ebuild b/x11-misc/xflux/xflux-20130927.ebuild
index 8abc561dc3de..39d471769061 100644
--- a/x11-misc/xflux/xflux-20130927.ebuild
+++ b/x11-misc/xflux/xflux-20130927.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="-* amd64 x86"
 LICENSE="f.lux"
 SLOT="0"