gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /x11-misc
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
81 files changed, 867 insertions, 664 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 639ab96ed872..00306c2d9f18 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 6147ea09b773..89f932785888 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,8 +1,8 @@
 AUX albert-0.14.22-qt-5.11.patch 703 BLAKE2B bac316c4a75d1bed79517f4e25c7844c5e3671f85051a9654c31a1337dbb692c6f52b2adee38c0ede081b0230db0c1cb4e963e875cfae717fc98839180dfd42c SHA512 e27bff9359ae9b3c7ee1be0ab1098073ccbaef65eca316351c63c616a4772be73cefabb9ee62f9b79238eb039520d89f4aecc79eca5f0bda7490e231000490eb
-DIST albert-0.14.21-plugins.tar.gz 538315 BLAKE2B 84c482bd2c9a7dfe38927da4531727a361014d0a8f6e4da923904253d5a322c37837f9eb7873621fd55581be7b0c1c7149b005f7729606444a9fc8b8e96b70fd SHA512 ae680b3ea8292c49858d029a16fb3ee6b5c33a96351afb9e962538ebb4d39fd5b862fe6da5592b03bfdc3c9622671a0d1140d6924e36ea2b67842490ffd102b0
-DIST albert-0.14.21.tar.gz 85541 BLAKE2B c8ddf61f3f001e92b3c889c8a3b748cb45ccf06896c990f1937484917496cb78510c17b479e61af8fbfc13c2ddc84ede7f70de15e09246c7dca4876eb644b910 SHA512 dc1e1121abb3534d32775cd8c8e3b832c037e997588b7e0d7356d933f6a1d15c669c3f0362c9c2bfb37256d80cef4175c9c8d22a095b5191453a44e0f20f9cc6
 DIST albert-0.14.22-plugins.tar.gz 540446 BLAKE2B 22cf69698614a1b0e97fd1f5e3224b9097141c4a32c7999b9468c3c59b6af0d7a753de59a7abeb07f9ef9655abc05b8cb5e5079c9b41eb9f51dc09291b89b635 SHA512 4cce6ad717991a6a2293b491f17838a01ba51e4222deb78d5b793ab3390692131f4938027b96863c6cd61ec7a764fa6d52b3c3ef33cadd3183b2fe1498b6d344
 DIST albert-0.14.22.tar.gz 84925 BLAKE2B b009bd0420f2e5894e2e71e526361c6b177ceb0ed9339efd276228e3cb8aed52eba811b8f2f6ade8f39357017458f2cbfddec25f0df4de8d12397451bd98cb57 SHA512 91c131140f666dda665e07e617ce0d2af5c776233f9cf1430aedfc18299dcc22c6dcdec4d82f15fc2d81fa44679f9d3608a47128d33bfbddeb97481b430608c8
-EBUILD albert-0.14.21.ebuild 1364 BLAKE2B 23c4f8216726ada93c05fdf7b951102ba6f2d940b7ee6300dbd319014f7141bcffe56c8ae2d1e97a234f88e71ca77363a9077dc509222f4a1a3c4a9466fa7dd0 SHA512 2228e31c4f9a751fccc113c85e78e29c49fcc82fcdf8e5c33fbf691cc9eb4edad7b5703ab82d1f1227c97a67f44a151a0cd99f48e11c9b3431a6518a90ee0cd6
-EBUILD albert-0.14.22.ebuild 1408 BLAKE2B b9cc7d816da0aa763e9fc9f04b835c734a5c3c2cb5bb6c7a80224a57c3536094fc463a33ac15a0ae999ee2a084b1107cc97e07cb12ba5a6668fe7e9dc279cd03 SHA512 62191f1b9a94682e602566d276f901e9b67a702a8446f94f51db54aa55e16f3c662c08bf25ca1616d0db1eb54302d64af3d67e17d7f8e2914100557985d75a2c
+DIST albert-0.15.0-plugins.tar.gz 534292 BLAKE2B 1eef450bb575ffe3439248f49659e4e6535ae595c7a69dab7517e8bd1c4ce9a2a88ce370807fb1f0948a8da76758b6773b91e982fe8bbafe572b1071d1126265 SHA512 94b64e247dabcca11e54ac06ce57578709d9634768648ce8023c5f6065124077bba58c5913a191c27cdf189e9a40eb5b0abbd071a3080d3c950a753256445650
+DIST albert-0.15.0.tar.gz 86557 BLAKE2B 58fb745fcb2dce6f78d66c655e7051031f8578c12ff7cf680d6b5ae63bbc03b60d43605523f3d31dbc4972c92b8fae16880ab660427ec30c0048cf6273924248 SHA512 9ca5e419fe6314a81c03f8440219d9dc1b248504b8a0adcc42006c53e300e7f480081dfb90800c64b47a928ab669a6fbc8594d32a923443c0d9843133b2a5715
+EBUILD albert-0.14.22.ebuild 1407 BLAKE2B ee85919ed2a532f8498530daa20e748d2aa2327bade782b97d126e221c2211913584f787ebb653e136f70daf1a1911220daa987f73106a8fb3c1835fda543817 SHA512 fc71f4c8e139e1e0dc86fcd60dbba8f911a54eb989ab60957fb1fc9fba7314d5319cff2515c8b0ad246a8cda917a14b9a798e2493161db49f531c78c0892138f
+EBUILD albert-0.15.0.ebuild 1381 BLAKE2B 8f1f44142573fe82fd46fd9e2ec8b1982d9cd30bbcfadb5866614a4b6c1e3c9f720b3a298b89025e4df9ab4aa591f3705e3ed108ea7c5b985939ead85391e719 SHA512 3ba2e4252328a26371496de81b4d79785b33ed9bb5b94a15205289281ff355d00e2cc060bc410fd4ddfd8e60a5ee4521f73efe7f9001bb0d1151c4dea28aa001
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.14.22.ebuild b/x11-misc/albert/albert-0.14.22.ebuild
index 7c672bb96f35..dddced7dd4ba 100644
--- a/x11-misc/albert/albert-0.14.22.ebuild
+++ b/x11-misc/albert/albert-0.14.22.ebuild
@@ -14,7 +14,7 @@ https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/albert/albert-0.14.21.ebuild b/x11-misc/albert/albert-0.15.0.ebuild
index 736b554f240d..aac09bb9cd80 100644
--- a/x11-misc/albert/albert-0.14.21.ebuild
+++ b/x11-misc/albert/albert-0.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PLUGINS_HASH="67a7a34734c4665dcb1a504432de5d2e5a56ac90"
+PLUGINS_HASH="2b232eb7fe87b6cdf861815ea2f4f7ba4e4c46c6"
 inherit cmake-utils gnome2-utils
 
 DESCRIPTION="Desktop agnostic launcher"
@@ -14,11 +14,12 @@ https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="debug"
 
 RDEPEND="
 	dev-cpp/muParser
+	dev-qt/qtcharts:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index 63ac7020a529..205be111f55c 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -1,5 +1,9 @@
 AUX dzen-0.9.5-config-default.patch 2649 BLAKE2B 1069b1d94482fd471387ceca9c727eaf65f9ecde401015a114e73498874d7d04e3c4ec2e7062e245bcfd26a2feb8db5d4b39e072e64899eedca34d3033813102 SHA512 4884455ff03197d718e5700106b4b5250343a69b11cdd6190580f89e70306d97a1dde8154baabc79a909ed571806a992fa643d7380830257331bec477e46c54d
 AUX dzen-0.9.5-off-by-one.patch 188 BLAKE2B edd3b393c3b4cfb3091cc7fe3ca156b06fd178e53a24ec08967765c90d60005415109f9c85e67680f735c037abe4150cf162b184bbd47f108ac37b26ec2618c8 SHA512 1a82875ee296af37d559b14da4cadef40f2cd6842d67cf6d761d0c65acd1bdb51b0d8096282f1172f109178ecd3f3c1debef809373a0e6ab04fb161d57e20f8d
+AUX dzen-0.9.5_p1-gentoo.patch 8159 BLAKE2B 1dde32a7522894bf5bf947651c7a0a1f64db40d1e4e439182dcc0982af21a7620c38fc8149aa9bb607ae7821acf094d7e2ed8b2547efcc389c234d4c6dcf3f36 SHA512 8c6eb3c45c12f095a41b1847967dfe42ddd1fd7572e48aef5673a548b7186f0ad4ea08c662e08a632c5bcb1e191f381f4ae57fc293920f77e541bbdc294f974c
+AUX dzen-0.9.5_p1-unused-but-set.patch 2024 BLAKE2B 6dbcb15ac1e62f34a54f96a0a39117b88c71944c6157ec44384aeddbb9e6bd6010b4b8504929e57c77f3911e5f1857bb323223b273ccb3a1461f4c501a470da9 SHA512 c5200e9d4a3519d9cf1439c6f171335c2eceacb3691e08bbcffc4431b420a1c5bfb1036ffffaf9b3307c5b940d546b2549e8fce42dd157d7b9d37920631e57a2
 DIST dzen-0.9.5.tar.gz 38167 BLAKE2B 92297cceca2215d812aa4536bd7421ab992a372667ca832de70a2bf43faea4b5e7beb147a454d7ced5be4e53085f4eaf15d752888ee019d799cd3bb8fcbdb6ba SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916
+DIST dzen-0.9.5_p1.tar.gz 38178 BLAKE2B 9ec81747d6eec9b7cca58b11096e00548cdca7ba21a179599979cf9b22ff84100d266d98e7a3e419960a56fee788ae96158650884a1b1322def6a98a70d6683b SHA512 239acfcacbc871ded5755ee0d5cca3185fcd93142bcf81552974f2ffc19d9f5ebdc02956108931f58b35c68ac57ec6e748bdb9cdbf7791ec6e224ef270bda300
 EBUILD dzen-0.9.5-r1.ebuild 1578 BLAKE2B d67c414c9ecfa47316f9f8df899928f2c0c0cf5eaa34898b2445be7c1923bc74c7896425969b96ee13b173efce4653e04a11016a8b97cf11bb38ee584b097925 SHA512 e5f07cb9df6dd14af89441659de778470924cc4c681feaa176e9282a05f03186e0e7d14b7782d4fe2334471f19995658c80a11411240fa06a9d80f1a455a513c
+EBUILD dzen-0.9.5_p1.ebuild 1447 BLAKE2B a1b3a79419d6b508893c7b3f9c008cc2383865c4364c00bf15dfd8e6509316341647f021bb0314944959153cf7fdd28d16717280b21d90c9afabe6afdb598743 SHA512 a9c5ed171ef2112945658a6f4d6e9c81443c04ed5cf5eed6cdda2f42ea538ed676bfe65d6dfa7c3679dd4a51c54301cc260586ae0848897ee4449befbd3c7a28
 MISC metadata.xml 642 BLAKE2B 28355993f6f8edc43e8af4717523ae4dc0b249f88ee5a85bc20e23d4942084dfc29d43a71c9163f2a3bfa4555dca5648bd7682429527124502be4f2eef10288d SHA512 3f7b850582bdc314f4bbf795a3171f27ac8e9c41eeb56221106cb70f039ce37e62b43b2a09c21862cb6efe50e22ddfa45b711c809ba8347c52010188c2207e81
diff --git a/x11-misc/dzen/dzen-0.9.5_p1.ebuild b/x11-misc/dzen/dzen-0.9.5_p1.ebuild
new file mode 100644
index 000000000000..38e2ad7461cd
--- /dev/null
+++ b/x11-misc/dzen/dzen-0.9.5_p1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+COMMITID="488ab66019f475e35e067646621827c18a879ba1"
+
+DESCRIPTION="A general purpose messaging, notification and menuing program for X11"
+HOMEPAGE="https://github.com/robm/dzen"
+SRC_URI="${HOMEPAGE}/tarball/${COMMITID} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal xft xinerama xpm"
+SLOT="2"
+
+RDEPEND="
+	x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-unused-but-set.patch
+)
+DOCS=( README )
+S=${WORKDIR}/robm-${PN}-${COMMITID:0:7}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	if use xinerama ; then
+		sed -e '/^LIBS/s|$| -lXinerama|' \
+			-e '/^CFLAGS/s|$| -DDZEN_XINERAMA|' \
+			-i config.mk || die
+	fi
+	if use xpm ; then
+		sed -e '/^LIBS/s|$| -lXpm|' \
+			-e '/^CFLAGS/s|$| -DDZEN_XPM|' \
+			-i config.mk || die
+	fi
+	if use xft ; then
+		sed -e '/^LIBS/s|$| $(shell ${PKG_CONFIG} --libs xft)|' \
+			-e '/^CFLAGS/s|$| -DDZEN_XFT $(shell ${PKG_CONFIG} --cflags xft)|' \
+			-i config.mk || die
+	fi
+}
+
+src_compile() {
+	default
+	use minimal || emake -C gadgets
+}
+
+src_install() {
+	default
+
+	if ! use minimal ; then
+		emake -C gadgets DESTDIR="${D}" install
+		dobin gadgets/*.sh
+		dodoc gadgets/README*
+	fi
+}
diff --git a/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch b/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch
new file mode 100644
index 000000000000..9ac204e6b28e
--- /dev/null
+++ b/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch
@@ -0,0 +1,252 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,45 +12,44 @@
+ 	@echo dzen2 build options:
+ 	@echo "CFLAGS   = ${CFLAGS}"
+ 	@echo "LDFLAGS  = ${LDFLAGS}"
+-	@echo "CC       = ${CC}"
++	@echo "CC       = $(CC)"
+ 	@echo "LD       = ${LD}"
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	$(CC) -c ${CFLAGS} $<
+ 
+ ${OBJ}: dzen.h action.h config.mk
+ 
+ dzen2: ${OBJ}
+ 	@echo LD $@
+-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+-	@strip $@
++	${LD} -o $@ ${OBJ} ${LDFLAGS}
+ 	@echo "Run ./help for documentation"
+ 
+ clean:
+ 	@echo cleaning
+-	@rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
++	rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
+ 
+ dist: clean
+ 	@echo creating dist tarball
+-	@mkdir -p dzen2-${VERSION}
+-	@mkdir -p dzen2-${VERSION}/gadgets
+-	@mkdir -p dzen2-${VERSION}/bitmaps
+-	@cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION}
+-	@cp -R gadgets/Makefile  gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets
+-	@cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm  dzen2-${VERSION}/bitmaps
+-	@tar -cf dzen2-${VERSION}.tar dzen2-${VERSION}
+-	@gzip dzen2-${VERSION}.tar
+-	@rm -rf dzen2-${VERSION}
++	mkdir -p dzen2-${VERSION}
++	mkdir -p dzen2-${VERSION}/gadgets
++	mkdir -p dzen2-${VERSION}/bitmaps
++	cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION}
++	cp -R gadgets/Makefile  gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets
++	cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm  dzen2-${VERSION}/bitmaps
++	tar -cf dzen2-${VERSION}.tar dzen2-${VERSION}
++	gzip dzen2-${VERSION}.tar
++	rm -rf dzen2-${VERSION}
+ 
+ install: all
+ 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f dzen2 ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
++	mkdir -p ${DESTDIR}${PREFIX}/bin
++	cp -f dzen2 ${DESTDIR}${PREFIX}/bin
++	chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+-	@rm -f ${DESTDIR}${PREFIX}/bin/dzen2
++	rm -f ${DESTDIR}${PREFIX}/bin/dzen2
+ 
+ .PHONY: all options clean dist install uninstall
+--- a/config.mk
++++ b/config.mk
+@@ -4,7 +4,7 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = ${PREFIX}/share/man
+ 
+ X11INC = /usr/X11R6/include
+@@ -18,61 +18,12 @@
+ # Uncomment: Remove # from the beginning of respective lines
+ # Comment  : Add # to the beginning of the respective lines
+ 
+-## Option 1: No Xinerama no XPM no XFT
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\"
+-
+-
+-## Option 2: No Xinerama with XPM
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
+-
+-
+-# Option 3: With Xinerama no XPM
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
+-
+-
+-## Option 4: With Xinerama and XPM
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+-
+-
+-## Option 5: With XFT
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
+-CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft`
+-
+-
+-## Option 6: With XPM and XFT
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm `pkg-config --libs xft`
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
+-
+-
+-## Option 7: With Xinerama and XFT
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama `pkg-config --libs xft`
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XFT `pkg-config --cflags xft`
+-
+-
+-## Option 8: With Xinerama and XPM and XFT
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
+-
+-
++LIBS = -lX11
++CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\"
+ 
+ # END of feature configuration
+ 
+-
+-LDFLAGS = ${LIBS}
+-
+-# Solaris, uncomment for Solaris
+-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+-#LDFLAGS = ${LIBS}
+-#CFLAGS += -xtarget=ultra
+-
+-# Debugging
+-#CFLAGS = ${INCS} -DVERSION=\"${VERSION}\" -std=gnu89 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -O2 -pipe -DDZEN_XFT `pkg-config --cflags xft`
+-#LDFLAGS = ${LIBS}
++LDFLAGS += ${LIBS}
+ 
+ # compiler and linker
+-CC = gcc
+-LD = ${CC}
++LD = $(CC)
+--- a/gadgets/Makefile
++++ b/gadgets/Makefile
+@@ -12,61 +12,57 @@
+ 	@echo dzen2 gadgets build options:
+ 	@echo "CFLAGS   = ${CFLAGS}"
+ 	@echo "LDFLAGS  = ${LDFLAGS}"
+-	@echo "CC       = ${CC}"
++	@echo "CC       = $(CC)"
+ 	@echo "LD       = ${LD}"
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	$(CC) -c ${CFLAGS} $<
+ 
+ ${OBJ}: dbar.h config.mk
+ 
+ dbar: ${OBJ}
+ 	@echo LD $@
+-	@${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
+-	@strip $@
++	${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
+ 
+ gdbar: ${OBJ}
+ 	@echo LD $@
+ #	@${LD} -o $@ gdbar.o dbar.o ${LDFLAGS} -L${X11LIB} -lX11
+-	@${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
+-	@strip $@
++	${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
+ 
+ gcpubar: ${OBJ}
+ 	@echo LD $@
+ #	@${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS} -L${X11LIB}
+-	@${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
+-	@strip $@
++	${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
+ 
+ textwidth: ${OBJ}
+ 	@echo LD $@
+-	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
+-	@strip $@
++	${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
+ 
+ clean:
+ 	@echo cleaning
+-	@rm -f ${OBJ} dbar
+-	@rm -f ${OBJ} gdbar
+-	@rm -f ${OBJ} gcpubar
+-	@rm -f ${OBJ} textwidth
++	rm -f ${OBJ} dbar
++	rm -f ${OBJ} gdbar
++	rm -f ${OBJ} gcpubar
++	rm -f ${OBJ} textwidth
+ 
+ install: all
+ 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f dbar ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
+-	@cp -f gdbar ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
+-	@cp -f gcpubar ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
+-	@cp -f textwidth ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
++	mkdir -p ${DESTDIR}${PREFIX}/bin
++	cp -f dbar ${DESTDIR}${PREFIX}/bin
++	chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
++	cp -f gdbar ${DESTDIR}${PREFIX}/bin
++	chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
++	cp -f gcpubar ${DESTDIR}${PREFIX}/bin
++	chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
++	cp -f textwidth ${DESTDIR}${PREFIX}/bin
++	chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+-	@rm -f ${DESTDIR}${PREFIX}/bin/dbar
+-	@rm -f ${DESTDIR}${PREFIX}/bin/gdbar
+-	@rm -f ${DESTDIR}${PREFIX}/bin/gcpubar
+-	@rm -f ${DESTDIR}${PREFIX}/bin/textwidth
++	rm -f ${DESTDIR}${PREFIX}/bin/dbar
++	rm -f ${DESTDIR}${PREFIX}/bin/gdbar
++	rm -f ${DESTDIR}${PREFIX}/bin/gcpubar
++	rm -f ${DESTDIR}${PREFIX}/bin/textwidth
+ 
+ .PHONY: all options clean install uninstall
+--- a/gadgets/config.mk
++++ b/gadgets/config.mk
+@@ -1,7 +1,7 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = ${PREFIX}/share/man
+ 
+ X11INC = /usr/X11R6/include
+@@ -10,9 +10,8 @@
+ X11LIB = /usr/X11R6/lib
+ LIBS = -L/usr/lib 
+ 
+-CFLAGS = -Os ${INCS} 
+-LDFLAGS = ${LIBS}
++CFLAGS += ${INCS} 
++LDFLAGS += ${LIBS}
+ 
+ # compiler and linker
+-CC = gcc
+ LD = ${CC}
diff --git a/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch b/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch
new file mode 100644
index 000000000000..70116ff66d2b
--- /dev/null
+++ b/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch
@@ -0,0 +1,72 @@
+--- a/main.c
++++ b/main.c
+@@ -293,7 +293,6 @@
+ static void
+ set_docking_ewmh_info(Display *dpy, Window w, int dock) {
+ 	unsigned long strut[12] = { 0 };
+-	unsigned long strut_s[4] = { 0 };
+ 	XWindowAttributes wa;
+ 	Atom type;
+ 	unsigned int desktop;
+@@ -339,8 +338,6 @@
+ 		strut[2] = si.y + wa.height;
+ 		strut[8] = wa.x;
+ 		strut[9] = wa.x + wa.width - 1;
+-
+-		strut_s[2] = strut[2];
+ 	}
+ 	else if((wa.y - si.y + wa.height) == si.height) {
+ #ifdef DZEN_XINERAMA
+@@ -358,8 +355,6 @@
+ #endif
+ 		strut[10] = wa.x;
+ 		strut[11] = wa.x + wa.width - 1;
+-
+-		strut_s[3] = strut[3];
+ 	}
+ 
+ 	if(strut[2] != 0 || strut[3] != 0) {
+@@ -832,11 +827,9 @@
+ 		XFreeStringList(missing);
+ 
+ 	if(dzen.fnpl[p].set) {
+-		XFontSetExtents *font_extents;
+ 		XFontStruct **xfonts;
+ 		char **font_names;
+ 		dzen.fnpl[p].ascent = dzen.fnpl[p].descent = 0;
+-		font_extents = XExtentsOfFontSet(dzen.fnpl[p].set);
+ 		n = XFontsOfFontSet(dzen.fnpl[p].set, &xfonts, &font_names);
+ 		for(i = 0, dzen.fnpl[p].ascent = 0, dzen.fnpl[p].descent = 0; i < n; i++) {
+ 			if(dzen.fnpl[p].ascent < (*xfonts)->ascent)
+--- a/gadgets/textwidth.c
++++ b/gadgets/textwidth.c
+@@ -62,11 +62,9 @@
+ 	if(missing)
+ 		XFreeStringList(missing);
+ 	if(font.set) {
+-		XFontSetExtents *font_extents;
+ 		XFontStruct **xfonts;
+ 		char **font_names;
+ 		font.ascent = font.descent = 0;
+-		font_extents = XExtentsOfFontSet(font.set);
+ 		n = XFontsOfFontSet(font.set, &xfonts, &font_names);
+ 		for(i = 0, font.ascent = 0, font.descent = 0; i < n; i++) {
+ 			if(font.ascent < (*xfonts)->ascent)
+--- a/gadgets/gcpubar.c
++++ b/gadgets/gcpubar.c
+@@ -40,7 +40,6 @@
+ 
+ int main(int argc, char *argv[]) {
+ 	int i, t;
+-	double total;
+ 	struct cpu_info mcpu;
+ 	FILE *statfp;
+ 	char buf[256], *ep;
+@@ -149,7 +148,6 @@
+ 		while(fgets(buf, sizeof buf, statfp)) {
+ 			if(!strncmp(buf, "cpu ", 4)) {
+ 				unsigned long long unice;
+-				double myload;
+ 				/* linux >= 2.6 */
+ 				if((sscanf(buf, "cpu %llu %llu %llu %llu %llu", 
+ 								&ncpu.user, &unice, &ncpu.sys, &ncpu.idle, &ncpu.iowait)) < 5) {
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index b5ed0a46f55c..b155f6741ffd 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,5 +1,4 @@
 DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
-EBUILD gccmakedep-1.0.3-r1.ebuild 952 BLAKE2B 7d1fd26ff879180bc37eb0be16c4c100a251082e8af794f76ff3f4981c3a8fdd87cebf5aa4b1f6976a933cd39f74ed75cd6ce02085925eeb4600b53a8ecb2679 SHA512 5d63b5fd8cb0e747a96e056bb5a69407f0f111aa9a8d3013347c3362f00d680c62c3ef70782a22584b65fc2de0a7cc90b6b24ca534bb5958f463d82791e12713
-EBUILD gccmakedep-1.0.3.ebuild 435 BLAKE2B 7bbbd10c509c457fab33b5d8d47a81db748109cc56be6244ca579bfbf3d674b861e4dda663b7f01faac17ec408fb8f16280a9d83814bea81cff67801f80cafff SHA512 458023a1f3ff10d0ed06af110f2b83f63995d154f46e6eb8d47af3cdf1686ed146a43b9730c5127ba01d6710399edd5b4b337c2227207d7ad022bd3ab6ac142f
+EBUILD gccmakedep-1.0.3-r1.ebuild 950 BLAKE2B b86f0fcf77d4d69a5ded9b584f416fdf3c007675023fd71e7b897a5cc0acd4e5cea6f89a71315e3ae1a86b8ea1fd3a4ad0d29ad066d1cf1b21ce0f0db6797015 SHA512 c7f63d800a7105cbdd9dbe3ef1602caa496dd1eb6315b1b417b83dacfa889a523cd1b905fd8c90f79952b173425a1e1b3264cc613380f72bff79969155586cb4
 EBUILD gccmakedep-9999.ebuild 962 BLAKE2B 6519051caec72def71150721a012341f3154621eca3e8f3d2f9a2235ce7fc9c405554630a312c56109e01d2a71d56b128d0a4cbb8644f55cbc818a2fd6da9b76 SHA512 342b430f8514825e8c450c4ca0ad54ed941e3fd22acc13d99f2328f9d0e59acfe00a339a984c8282bf254702b219b05a4f815d3978f81f3f7b614a7d4d461928
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index 6a322acff094..87b4031565b5 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
deleted file mode 100644
index 50a4017e5f14..000000000000
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 19b40756e2b9..c731d7aa9545 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,6 +1,5 @@
 AUX imake-1.0.7-sun-compiler.patch 462 BLAKE2B a1b0ce3d7776e855a9fc0d819f9338c4a4adab3f2491e52c7bfe674de1509120104ea7f042b2a6a61fa30ce1d5573289c01bfa63ff0826c9d76281ed927ada61 SHA512 c6eba0da6cc37702293273d762481b522467f3cd5ae7d216f397ff47657762db78deaa0780706c2e13d0010b739067e65d09b235ab9df379430a826c95e6fed8
 DIST imake-1.0.7.tar.bz2 156543 BLAKE2B 63e7f2fcd907ba5508e9e592602bd455d66ce134f82a3387ae9cee66a6b65190e38a0207980df62c2603d060acb5f380446dc6f117c75edc9c5c6f611d98dbe2 SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
-EBUILD imake-1.0.7-r1.ebuild 1160 BLAKE2B 147e956a4734d058b0460c16f25da38818b2467903a9a8218d7f497cb87ef19abe72849f67fddf0bf44c10b65fa3ea1adb838cdda8194c0cb79cdca2e3f6aca1 SHA512 95742cb8a5c43b4ad4fba7fb86f70662666011b84cdb32ffc0076e483eda7cadd7f355828e1299b8233f837740ad9ef960df38126c51106f6ff92a08d5cbe9ed
-EBUILD imake-1.0.7.ebuild 695 BLAKE2B babeab6a39b6abcdb2cfea2ad33a7a3bb904c579456aec83cd3afae75f034bb106b51edc1c14203f85a125b5580f58c5313bca6132cb7393cd1f2def734ff96f SHA512 6d99c87eb9899cb9e16bc827732fdfa4acba9e4db0d56dfdbc797976e727b3b065557748a140aa863f15489f6c93a6ca117d2a7b830d2ffcec6641358e7c4bf0
+EBUILD imake-1.0.7-r1.ebuild 1158 BLAKE2B cbc2d0a82cdc0202ef46b7c56c676edc160c0447f15ed4a92d0a771cb7674c06343d6c7b1542fe786d6cff06ffc006212cdebb7f908fa457add376a734756755 SHA512 e9aee670e8ef3ea3db798c98d01348f506befb3ad0aaec81981c9b17dffdf53a64cfe2986dd2aa5314084e8077122bc1972091a13608d14d23610b4fb24c93a8
 EBUILD imake-9999.ebuild 1170 BLAKE2B 4c9722b3260289f3244313ee6cb8cc352dfa8d419f40fc8d3332ea56916db9e66f8b40d7d911afd920ee05dc47b0493d95dc4bb0caed0e626fe39483b2b178f4 SHA512 89c11988a9d639352656d212d87e747c55d7e6fa8bdcbe34b84e45e4db08f8138d3d22fd9cf57b3fa2eccc112c4070fff0695fbbca3f28882a83139353cde921
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.7-r1.ebuild b/x11-misc/imake/imake-1.0.7-r1.ebuild
index df4b24e92c55..e58d443f1ed9 100644
--- a/x11-misc/imake/imake-1.0.7-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.7-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/imake/imake-1.0.7.ebuild b/x11-misc/imake/imake-1.0.7.ebuild
deleted file mode 100644
index 58f52c2cf955..000000000000
--- a/x11-misc/imake/imake-1.0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-misc/xorg-cf-files"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	# don't use Sun compilers on Solaris, we want GCC from prefix
-	sed -i \
-		-e "1s/^/#if defined(sun)\n# undef sun\n#endif/" \
-		imake.c imakemdep.h || die "sed failed"
-	xorg-2_src_prepare
-}
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 2841a304c287..6e492c6a2922 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,6 +1,6 @@
-DIST libinput-gestures-2.38.tar.gz 17054 BLAKE2B 037d095674df9b00c9d23762745d35beaab03d0f5b361030a9177f84c540ef2ef45fb6fa4b9fe80a6500c81a8973aac46019931d8a548b02a6527ba09ca1fc13 SHA512 3152bcb0fd78551be14dda23fdce9f9216fc56e7a2dc4734b73949b4bd9c87fe6c9e2fc95f65a328b46c577abc05889a3a6290c6eb9390a94d9eb254c2fc7550
 DIST libinput-gestures-2.39.tar.gz 18028 BLAKE2B f7d24a1ca8a6ba7064359d3f1c4e1cc72419205d94c9da7efc85b1fa0561f8353a50e126b6ec15cd79f6ef6c82b5d1ed94d44f0af6fcfc21eb2644695dd66337 SHA512 5aa54c9da01de76e279924bc2840b704f163512e06734fee1fa37e6905c33fa2aa734f4bfef6e8bc75a654f0345dfd8928be298d880229cc47be791a65ba1927
-EBUILD libinput-gestures-2.38.ebuild 1305 BLAKE2B d324f46c616f20588614678f741383cf5e2dc7f916f82e493bf282cfc4a9be6a0f2abebb7c819831ce6ed5a9fea30e009ec71ea323f66e44d614ad4c28d2c3e7 SHA512 f552a25ee6da9a229bbd1002dd905c6bfeb5f435cbefc9c549c5047f3faee1fa06b4c4f0bfa341c2c658a0c8aae5f29a03da456cdb6e4517a52ef8dba8474f3d
+DIST libinput-gestures-2.40.tar.gz 18082 BLAKE2B ef01449a6fa381361876909487460f2a11e86887b1a3885b1459c218206e80d76ccf53dbebe39d39c360bee5da7a32028673d2165c244df584ae6e8078957d33 SHA512 70c22f7225f4a1f7e0a4d0a83f84370f2649ef01d9a72756b2d4bb4be92ac2265c9aff9302642609065da0e1769b719f616e2d8ee843aca01ce66f1891732890
 EBUILD libinput-gestures-2.39.ebuild 1302 BLAKE2B 5616faf55e1b06d9286107f3b5f1ed335be2f90a7a0b4d81c197f8dfbc7d62ee1d1cf009cdb7df768dea8e0e65952c35542b04808a599d9d67929ab772b36701 SHA512 30a5b865bc890405023bab20036d1c353253c344850aa9b833e544ceba916fc57caecc672859e239f338d02836d1d9a08e159390591c32d40a8c55dc96f38dbe
+EBUILD libinput-gestures-2.40.ebuild 1302 BLAKE2B 5616faf55e1b06d9286107f3b5f1ed335be2f90a7a0b4d81c197f8dfbc7d62ee1d1cf009cdb7df768dea8e0e65952c35542b04808a599d9d67929ab772b36701 SHA512 30a5b865bc890405023bab20036d1c353253c344850aa9b833e544ceba916fc57caecc672859e239f338d02836d1d9a08e159390591c32d40a8c55dc96f38dbe
 EBUILD libinput-gestures-9999.ebuild 1305 BLAKE2B d324f46c616f20588614678f741383cf5e2dc7f916f82e493bf282cfc4a9be6a0f2abebb7c819831ce6ed5a9fea30e009ec71ea323f66e44d614ad4c28d2c3e7 SHA512 f552a25ee6da9a229bbd1002dd905c6bfeb5f435cbefc9c549c5047f3faee1fa06b4c4f0bfa341c2c658a0c8aae5f29a03da456cdb6e4517a52ef8dba8474f3d
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.38.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild
index 87acd6131454..ebd4d9f424c9 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.38.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index eaa37efaec73..6f7cc664b252 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,7 +1,7 @@
 AUX light-locker-1.7.0-systemd.patch 2393 BLAKE2B ecb060b9311b415d7d225b0c2d7148a7b17a914cba456bfd9d1aefba4c078ba2fc9d3e077e7af161932c9cb9e8ae071a0357558f14769b2cc7b6caf2de7f88d3 SHA512 7903288386daaaa8f63c472ba4956eae01db91006bfdfac53269bac7097fe422c3b8052d8f3dddffea8b4ca94ba31fdd4fba804a2a0747852213ce5c20082b90
 DIST light-locker-1.7.0.tar.bz2 530315 BLAKE2B b93247e730a4cd30469f7e0113df1641994b6d4f1a77c8394a70235949ec6965b3115c0889b5e9dd11ba8a0b9b7ae3704843620b6aed4c0c0400676ad7138885 SHA512 dcd524ed5bf8475743585ee5a6b35dfe396d17f307418e208450ccabc12ab6b3835818fdf11324b8c7dc63332b9faacea184409b7c9c0a242fbb9d6402a2d079
 DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
-EBUILD light-locker-1.7.0-r1.ebuild 1539 BLAKE2B a6046cb69aba09fa5eadcd9b2d89aa08d4f36c3be02d69b85c57acea8ff3613f13bd669fa1414ff83fe9e61afaa2f1e33bb7e4c8d3bb62c3d08c60dace21c00b SHA512 a8e016855ebfc65443947e540fdef62e88920f11446bcae4f2fd44946a85d6edae34d3256e14a91a309a4169345e8c3898cc9ab04584e8bb35ddc9256395474e
-EBUILD light-locker-1.7.0.ebuild 1409 BLAKE2B 192af69a6d388c481d8484a42dcd4ccf82cb953d7f227ffe4e2285aeb09d714643f455724b0350f139e008c15bf24bf67c5459ba36a3b717f97c30c98bf54036 SHA512 5e96e83cac55d95234b1e01f60e14a041035256c6fc2e6b6468818ccf4ac4bbff075637d13c8532923cf41f8316ea93730a47cc9421d411c98fff34b39a806a0
-EBUILD light-locker-1.8.0.ebuild 1409 BLAKE2B 192af69a6d388c481d8484a42dcd4ccf82cb953d7f227ffe4e2285aeb09d714643f455724b0350f139e008c15bf24bf67c5459ba36a3b717f97c30c98bf54036 SHA512 5e96e83cac55d95234b1e01f60e14a041035256c6fc2e6b6468818ccf4ac4bbff075637d13c8532923cf41f8316ea93730a47cc9421d411c98fff34b39a806a0
+EBUILD light-locker-1.7.0-r1.ebuild 1503 BLAKE2B 6d623f170b4fd0bdd53ac8662c3a1e86d4573959f315b888763b68bf3cf894f8331895d1ffb983ea87db65aed9666b3bf91a6e5e28a3a6827fbdd677591c250f SHA512 92a46afa1d2bb54d72c3b315323c96b8a292e5e1cb186e531e8932f359ef5f3cabf2fbcf6b5c788954b3ae1ea0288f355a80f78105dc5e627aba840e629b42a5
+EBUILD light-locker-1.7.0.ebuild 1373 BLAKE2B 43332df429845bca4244c1ade7ea6a3436fd4b2e338d57745adc06b2fa289fe22577a00c2ecc7e635ded00b0599d79eb79c53b920a6fc4eaec8806e6bf6c41a2 SHA512 415556f4491ec5232ab0f5ab0a1a930bf220fb298e5a0e3e41ff57d8e2bf5d2a534499a1f2847910268be086676141703e27c68df8d0f2e31f9f492364fd1a72
+EBUILD light-locker-1.8.0.ebuild 1373 BLAKE2B 43332df429845bca4244c1ade7ea6a3436fd4b2e338d57745adc06b2fa289fe22577a00c2ecc7e635ded00b0599d79eb79c53b920a6fc4eaec8806e6bf6c41a2 SHA512 415556f4491ec5232ab0f5ab0a1a930bf220fb298e5a0e3e41ff57d8e2bf5d2a534499a1f2847910268be086676141703e27c68df8d0f2e31f9f492364fd1a72
 MISC metadata.xml 698 BLAKE2B a8f5e435f66bea6fab128e600e4bfce575c819c2de03c141e9d5ba72880dc58017fce9e4355d700c01d441c4eec56d19f0f2ec8d27027700decedc685a8a2d38 SHA512 583d1108a9be5b71a9e3867b60b20dba60a1c999fe7a27634456b9102af8193dc22e6b7a5410c520f5aa13482a290d4e6cf6bdcde070788fd7ce8d2b74ece144
diff --git a/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
index 51411789d10f..e8c99ce5fec8 100644
--- a/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
+++ b/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="dev-libs/dbus-glib
 	gtk3? ( x11-libs/gtk+:3 )
 	screensaver? ( x11-libs/libXScrnSaver )
 	systemd? ( sys-apps/systemd )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+	upower? ( sys-power/upower )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
diff --git a/x11-misc/light-locker/light-locker-1.7.0.ebuild b/x11-misc/light-locker/light-locker-1.7.0.ebuild
index bb354a057397..e5e721f142e9 100644
--- a/x11-misc/light-locker/light-locker-1.7.0.ebuild
+++ b/x11-misc/light-locker/light-locker-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ RDEPEND="dev-libs/dbus-glib
 	gtk3? ( x11-libs/gtk+:3 )
 	screensaver? ( x11-libs/libXScrnSaver )
 	systemd? ( sys-apps/systemd )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+	upower? ( sys-power/upower )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
diff --git a/x11-misc/light-locker/light-locker-1.8.0.ebuild b/x11-misc/light-locker/light-locker-1.8.0.ebuild
index bb354a057397..e5e721f142e9 100644
--- a/x11-misc/light-locker/light-locker-1.8.0.ebuild
+++ b/x11-misc/light-locker/light-locker-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ RDEPEND="dev-libs/dbus-glib
 	gtk3? ( x11-libs/gtk+:3 )
 	screensaver? ( x11-libs/libXScrnSaver )
 	systemd? ( sys-apps/systemd )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+	upower? ( sys-power/upower )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index e05f0386c059..256bfbb896f2 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,5 +1,4 @@
 DIST makedepend-1.0.5.tar.bz2 143498 BLAKE2B 78a7911e1a433bd2839c2d1372883928dc018a2576781cc8e01ffea3d06ecaab494c11a9eb36045b36091f51c6363d4a903562431256abbab26dfbe7b3fb8289 SHA512 e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb
-EBUILD makedepend-1.0.5-r1.ebuild 996 BLAKE2B e78886be6759d91b4de8e5254e68e432b9f53d370293cf4f0768a5a4350a06d0b968bbdd395f94585619c822cccb21822998df353ea62e13fe83a9dc99ebe1e6 SHA512 0a3697895c0b812ac28459ad6f74cb0f30a018a3f9105c2b26a557e033a2f0193ecfd2dfa314e68ffcef41c52e5646a3d92e8b187fbde53eb73fbadb74aadf8a
-EBUILD makedepend-1.0.5.ebuild 440 BLAKE2B dcf171d21b1b6dda5d178c4d18ccd0f986f5d54f4841a3272f6869450d949c9cb74a83ac851752d62c6d966fc0c8ad28764aa62f87139cf4bc5c9100caf193c4 SHA512 c92afb4731680a0545da6ec2c8d3999105a234502dc8513dbb4a2cfddacb7e36cb8033af8adb1f50a67c934831214cd177b5694fa10d4e068d1198556fae23e3
+EBUILD makedepend-1.0.5-r1.ebuild 992 BLAKE2B 72f615f188cbb9b9ba290cf4da607903955fec96b50e95971e6cf86336c3dd9c13ca1670c38799807149005303dd9a1dfecf8eace9f3f02030abe26a5e5ef7a9 SHA512 31f82517d578055e973d06b974a2ce479b5f810ea4cbe431b7b3f82a4252601b7e187eb5235abb71340e7e7d2cdb611dfcdbfef0089c6fc83e3fbfae4df705c4
 EBUILD makedepend-9999.ebuild 1006 BLAKE2B 12477fa6688cf2471b147712eb4de65f3f3e6a6a6be374dd33035b3274557804c5c44d36b22188c636f92d3808952986c7760fd7a6b1d349dbb23afe68af39a0 SHA512 046738edb142cbac1b7eea3cf06f616b2b259a3fa420f7c91206ce298ece99657d13b23a5d5e9957522f12f6588e91f8534fe41f6cbc2526d3b054e570cf7251
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild b/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
index 8b75f8eafff8..4d6a30b7d6cb 100644
--- a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/makedepend/makedepend-1.0.5.ebuild b/x11-misc/makedepend/makedepend-1.0.5.ebuild
deleted file mode 100644
index 0b45317580d6..000000000000
--- a/x11-misc/makedepend/makedepend-1.0.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 7fa09218bcdf..0f6ef7227c36 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -7,5 +7,5 @@ DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b
 EBUILD notification-daemon-0.5.0.ebuild 969 BLAKE2B 2a68f40ddd286ffe671223695c6787b72572a20e5e65f1ec613c06a56b2acdd23c4ea3729b2fc6d3a17778756e057be117819349ab8eed9145a364526997f35b SHA512 c280d0805d07355a65b7dfc6de6f028eb73d153968a31cf3e41139b0dde29820b7ae8fa69542b6ec81618044113e783f63990f380b55567508dff9a321bfda3b
 EBUILD notification-daemon-3.14.1.ebuild 988 BLAKE2B 0faddfdb82d045022ce71e84d2193827379161abed2ff5384ee2b3ecee6fb4989bbf3e29579ac4435cde59bd1b0ca4711514d6f720ac8670bd01f0af8b49e6a7 SHA512 60f13a07051b020b47ff323a63313a41d7dd475d9eedd923beddedc9e41cb8dc77ec4bbae4f2bd46fc9d5a7d1539a86be89c95854623eea287f0d2d36b13ce97
 EBUILD notification-daemon-3.18.2.ebuild 962 BLAKE2B 62221336f94d9898d4d7922e967a78ec56e27069e44e8650cfeac3e2232ef97bf8267fbbe52b319008660f6402392568cf6f772481b075a140111adfa6f2346c SHA512 73fcddbe382e142bdaa74e4976e2b2555c9a086112374ec2b337ffbcf222c67bcfe6c65d121feea91eea80ae811385e9f21c3ebdb4de500f5093d25c1f14cea1
-EBUILD notification-daemon-3.20.0.ebuild 964 BLAKE2B 07218d5d4ab668635bcbb0711a4fcc02f2d26b2129ab6783a28aa02714549638fa34116a9b8a04fbac1173e7b884bb982ae0f130a6ab38fd07fb23a7b3192939 SHA512 c7852c7a31283bc71593663a31d5e37105ad56522046ada6d4f882c1487f32704643738d722cf4d5a0246636a36b4a464a6b6b92a0035962037683adbccb5787
+EBUILD notification-daemon-3.20.0.ebuild 958 BLAKE2B 2d70d6372c5a32cc15376e0e058e7be31a6c07e4b5da372350dc920737a18142ff96fa82436a3d24227c5241eca67b5bcae539300a8c7163882618e2d3edae0e SHA512 0fd75c5389ce28024e68c8dbf0bfa9d551a69270f9b921cd56e26fdeee2863c883ac84544be84c147d3fb00282faf63a5102cadba030a7a4e032e120bd59d311
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index efc0422e1d1f..93b3ba18d43c 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index d80f8b140156..4d3b3ad53631 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,3 +1,5 @@
 DIST obmenu-generator-0.66.tar.gz 19352 BLAKE2B e08591922c18b79f895f3080bd494287c227672603dcd224241c87295b3ace891f4e5419306d7065d7374d845ced06d109903382bd3a656348874c943d94b723 SHA512 75da0f62f591f9a9678d93560826829c0555ba5de3359be90c2cb16c4b8d07a9f10cbbd53f4a08cf93f75d6df8cb68381fb9a975cdb8500bed4ec7b51615e287
+DIST obmenu-generator-0.85.tar.gz 20558 BLAKE2B 526657eb9fc7ed0adc3681809d0f8b763f5faf7b2cb578962e1c2ab2e2bd488f386bcd6e7bf45e5752a2d339048af37f05bf31ef3947c2a9642f15e99db00eac SHA512 d6925ec8c2b75eec12bc23840799cedf4b882787b62a6b8814ca6c8b3bc5d22d2b8a4510fa6829d66541923caf3163a85eefc068a96ead631a3200467c563545
 EBUILD obmenu-generator-0.66.ebuild 577 BLAKE2B 306c1e1c5193bd2312ed88b8e3828b505aceee689e5a18231d3d5862bf9ab9a17c780d5fcf643dce119b82286bfc79c9bbb7e123a47071476b58f54c5d9111e5 SHA512 2548ce8d28ef16a95c257fb9a886affa9a3c0f067827d386263da831ec4c16818b0bc61717747946fdca08b4de9fcc35b7ba5128c872a6b82901c507b1bb3f6a
+EBUILD obmenu-generator-0.85.ebuild 559 BLAKE2B 94563f4460da98eb4bb7fcce5e2b79a6dca8567009dd965e34a168d913e593ce74f2483106c418c2529cee3ac2015f77de77287eefa0438ddb3c7f32c892b913 SHA512 d37cd81fa57d761a3481c445ec868f8286f9903f111cbac4ad72fe9cf9d6d554ae921761794bb5f95abeec9e60825f0780e4249c88b92fb19482f738ce875976
 MISC metadata.xml 340 BLAKE2B 32f667ce73d88ba8f4a05e61ec0cdaf65aec66f4bbef3fd869d07bbec2cae442daee546a971daf6940008723f2ff1023943b59a831586b56d3bc6153fa4f9692 SHA512 733e0e63de409ce14eb860ed17818025152b405496cf50ff6c6f7ac5f0f1729bdb0dd03d66ee90477b37dfab6081fa758b51ab40b932b55799e773a7297db3ef
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.85.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.85.ebuild
new file mode 100644
index 000000000000..b8277e4215f3
--- /dev/null
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.85.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
+HOMEPAGE="https://github.com/trizen/obmenu-generator"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Data-Dump
+	>=dev-perl/Linux-DesktopFiles-0.90.0
+	x11-wm/openbox
+"
+
+src_install() {
+	dobin ${PN}
+
+	insinto /etc/xdg/obmenu-generator
+	doins schema.pl
+
+	dodoc README.md
+}
diff --git a/x11-misc/qcomicbook/Manifest b/x11-misc/qcomicbook/Manifest
index 6ce6d71946d4..5dfec98f729f 100644
--- a/x11-misc/qcomicbook/Manifest
+++ b/x11-misc/qcomicbook/Manifest
@@ -1,3 +1,3 @@
 DIST qcomicbook-0.9.1.tar.gz 739887 BLAKE2B c4072e849f173bc6014e1765adc18ac359e5508b5c6bb110782bb92c81fe7683911a68910976cba16263950d9ac9b9ad53de44c4cd692d0bd24374c38012ebbe SHA512 87bd983c4442e220f1bc463e54e0ea583cddbc6becd9eec64801dc5e7e061cdac5805cba83167685ab454e41fcce329fa399d622d7f588940bf057ce4b1f423d
-EBUILD qcomicbook-0.9.1.ebuild 1546 BLAKE2B 303e76a7bda72de378d53d4ecb4d11551f3d9007a540fe81b3545acf653c6a8d33c6c989d2402b5e7a2fd4a355656410e39c1d12ae03eb9e66f84fca1094fb74 SHA512 7fc3d37480ee9aa029dbf0dd9013f8ddbba76aef19f9c83690933bcfa1aa4447532c7b5fb012ef3083a4f3a23d795d21be5958323b2486834c2e00caa4da4d89
+EBUILD qcomicbook-0.9.1.ebuild 1622 BLAKE2B f01a5f9074f03a7f054ff41cbdbe20ecef2e5c9ef4e944ca866ed5691abdfa61fdafd947a060d8c3e74899e5a142e8be26823a25d1a78ade001ce14d8f3f15ab SHA512 70d53b1c9b18a11be6ad20441a6354d124986abe24b273bfd1cae5202d57727fe39c6b96e328338a3b980f1a5c75f92f015e35a8c5cce7849ec26c12098d5bdc
 MISC metadata.xml 469 BLAKE2B 09213bed780c0d2f966fb7ba16c052ad397999be2e6e238c8e915ebbbb938f3210409e2d7961c629ae0d8abb20efa99b2b833d2cd268e7239ead845294b8fc68 SHA512 4c8f85cb1afed375e4b2c19e873c2c70ca7c11f139305af70a2b8556230ddd17f52753b1302c8d5547b4922e35c1922fdc001e62b420645f1c36097ebf5e855b
diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
index 5e6676e31c60..aaa44f685145 100644
--- a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
+++ b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
@@ -1,31 +1,36 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+MY_PN="QComicBook"
 CMAKE_IN_SOURCE_BUILD=1
 PLOCALES="cs_CZ de_DE es_ES fi_FI fr_CA fr_FR it_IT ko_KR nl_NL pl_PL pt_BR ru_RU uk_UA zh_CN"
-inherit cmake-utils flag-o-matic l10n vcs-snapshot
+inherit cmake-utils flag-o-matic l10n
 
 DESCRIPTION="A viewer for comic book archives containing jpeg/png images"
-HOMEPAGE="http://qcomicbook.org/"
-SRC_URI="https://github.com/stolowski/QComicBook/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/stolowski/QComicBook"
+SRC_URI="https://github.com/stolowski/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 
-DEPEND="app-text/poppler[qt5]
+RDEPEND="app-text/poppler[qt5]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_prepare() {
 	rm_loc() {
 	        rm "i18n/${PN}_${1}.ts" || die "removing ${1} locale failed"
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 387e21b399fd..b0aed1e3c2c8 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,4 +1,8 @@
 AUX qtfm-5.5-gcc6.patch 346 BLAKE2B 9b4757b2a6564c8842653c991b5c35e711a7291e0e745bdddffa1156cb0f4ae263aeb0573b998b0298f7c9b45dca7ff3990b4e18e055731f5794193dccf202e5 SHA512 e73c2be9cd2b5f3410500b813865c34458ec51a8902c4bf85faa607e7eb98f7e2f9c393a570dc6761938e2081cb43267bb8ab0a2d7450e10098b8f8db05a8634
 DIST qtfm-5.9.zip 172616 BLAKE2B 50219cb9afbca78b4fe7767631e91008254f6a4e745c3f1b87b821dc49655117d6d61a0aeb37cb1771641aac6b5ccfa8eefaa6e2f6d453c68061594e47bf5c5e SHA512 7686a84f1678e1f04f439d65290f5c93da25fbe80487a37f4ce32eae0d29d7a03a169d3dd9cbc81c2b678f54d9fdc01967b6c1b1cb8a19cf37a910a19918a2ba
+DIST qtfm-6.1.4.tar.gz 190220 BLAKE2B 31c9bc6564db111ac42451232470607d9327291296cf6c6fa02230c0285506f251bee03ca4f44570c0266cf51fddd3b4861137f67ed1983fda7cde118a20f0ab SHA512 492d4a5cd41320f0f69c6be6a0dbf8f9b13a2178e76dd79ac8c2a74952b482949073791ef247fc22e80fcdd7194f1b6db9cd489c10506b65e0c0b8918182d073
+DIST qtfm-6.1.5.tar.gz 217207 BLAKE2B 3a818458e6f3d1dfe91860681eb77b809a455d16eef7810aa06e73b9600e6d032c178624c1dbde6d609353eb79ad43e65205f3c3ba84f21b854b8ef93b65be72 SHA512 10a0e1fc8f8948b0564a9b78967403c4a10639c10194879b48bbe086110af0d611a310ab185a2351043df879dbba1e7849a03dde54b6554b74004cbcc27f3788
 EBUILD qtfm-5.9-r1.ebuild 1062 BLAKE2B 2b6400a30076f222ed51970e1f53553ad77dcfa1716fa4f0855d075666fc3e5a7872870581691c573b8443865520c10638e43cdf6e749d5d8322ab33fffb5ea6 SHA512 a817ed1a3a1acad5ffad0ed6d8c9633867bb8bdf619979a2673a18de6b1dd1ea70dffa72b6064a542ef0a337c0361a93d7d6c7b544a90bd039ed0eb40d5ab55b
+EBUILD qtfm-6.1.4-r1.ebuild 959 BLAKE2B 069c0fd853b67f6b5da2887349c7b49ef11adf027a32de6d71b8c550f5b2d299d0cc6fa13a72590a9efbf4714e6a1c2166c79eaa8cdbc7edd686e51f6b0fb950 SHA512 e445eac16175f9d9090de0602354f405bcc6573b4d4ada6adb6b0c9cb0d66cac409e3272070cf479dd590827ddddbc0efd18bfb4d89a85e0c628a4e1df2d2dd0
+EBUILD qtfm-6.1.5.ebuild 976 BLAKE2B 10d2e815421a0d0563419007368b0730e05ddd9d95f600452c3cfdb34e5b5f87c5fbbddb504d80faa082469db8f12968ad258ddbf42d154add04cff6f5250817 SHA512 8fea94c8d4de48f83f1521672834162d0cdf9e687d1331340f03f4b1774992b2ff7c77d985e532b8ee3c5aee4dc7b97656d5f274bad56e178f664a2e23fde45d
 MISC metadata.xml 376 BLAKE2B 5ece57e5fdfd4b9837bd82904a447698fdca5d0f3a2b905a272c2364034984e7b207c58e5e2205d1602911b7e1e719698bef8aa9ee11448c8c6de14a0625155e SHA512 dcf748d475de6eadfc319fdef1bcbcdf9e597f4f14dffe6df90ecc68f7825973ea84a56b1569950bf0d3793b5960c479b616c398b7b763dc73f06cd6b9dd435d
diff --git a/x11-misc/qtfm/qtfm-6.1.4-r1.ebuild b/x11-misc/qtfm/qtfm-6.1.4-r1.ebuild
new file mode 100644
index 000000000000..22efcc7f255d
--- /dev/null
+++ b/x11-misc/qtfm/qtfm-6.1.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit xdg-utils gnome2-utils qmake-utils
+
+DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+HOMEPAGE="https://qtfm.eu/"
+SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-apps/file
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
+
+src_prepare() {
+	sed -i -e '/^docs.path/ s:$${TARGET}-$${VERSION}:'"${PF}"':g' fm/fm.pro || die
+	default
+}
+
+src_configure() {
+	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/qtfm/qtfm-6.1.5.ebuild b/x11-misc/qtfm/qtfm-6.1.5.ebuild
new file mode 100644
index 000000000000..0803398ef3a2
--- /dev/null
+++ b/x11-misc/qtfm/qtfm-6.1.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit xdg-utils gnome2-utils qmake-utils
+
+DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+HOMEPAGE="https://qtfm.eu/"
+SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-apps/file
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
+
+src_prepare() {
+	sed -i -e '/^docs.path/ s:$${TARGET}-$${VERSION}:'"${PF}"':g' fm/fm.pro || die
+	default
+}
+
+src_configure() {
+	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index dd3d24074adb..d5c9593b04b7 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,3 +1,4 @@
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
+EBUILD redshift-1.12-r1.ebuild 1944 BLAKE2B a3d87bb5fb5835f3476e9e2e8ae5584de15a38aaa53d1133e03bac9047c0f9d7a0d3ee6d66ec7370718b635c6d2af366bc2d7ff90696f785da16b12ea39b0b1f SHA512 750df3819a7d20bbbad2a27caa9385c86f3d1db9e934661977930805c389b8dcb9dfc62e888aa7a2f1a2115dc50943de667a55799498190287422c895beaf6b3
 EBUILD redshift-1.12.ebuild 1930 BLAKE2B 0e03e5e7ab1fc0824597fee61d33221796920c2f8a41bf7714f7fc916e9efdb4828a72010062de7d41f4f6e71782eb195e54602e34431167e3170b8f15222b15 SHA512 4e5dacc4c9b84fa6f4103f0e37bb8fbe0607859b3216ba6fc3b858ca9eeedcd92d7a4f650bc68f4fcd953d06d4b72b723ae11d73f7570e86ac16e46bdc0e446d
 MISC metadata.xml 545 BLAKE2B db060df8f3a667a05c9517ed4181b722e4c2f987d7f5aa0085e3d8adf8a0d652fee0ca6901fcab4e75344f3337df4eb1ea15c7555fa2034709c185049155cd06 SHA512 5eb06d120a80deb3d70b3007a4bc8983b276cfb87a5471ca062675770e1e575e29e5b28562e53521976c9ba7c4cd6c95aee7fffb56aa2b1faaed098de42a2bc3
diff --git a/x11-misc/redshift/redshift-1.12-r1.ebuild b/x11-misc/redshift/redshift-1.12-r1.ebuild
new file mode 100644
index 000000000000..433d41e22857
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.12-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit systemd autotools eutils gnome2-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="ayatana geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	ayatana? ( dev-libs/libappindicator:3[introspection] )
+	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use gtk && python_setup
+
+	econf \
+		--disable-silent-rules \
+		$(use_enable nls) \
+		--enable-drm \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		\
+		--disable-corelocation \
+		$(use_enable geoclue geoclue2) \
+		\
+		$(use_enable gtk gui) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		--disable-apparmor \
+		--disable-quartz \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+			-C src/redshift-gtk install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/redshift-gtk
+		dosym redshift-gtk /usr/bin/gtk-redshift
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-misc/simpleswitcher/Manifest b/x11-misc/simpleswitcher/Manifest
index a473f46de317..6fe2e4eacb0c 100644
--- a/x11-misc/simpleswitcher/Manifest
+++ b/x11-misc/simpleswitcher/Manifest
@@ -1,2 +1,2 @@
 EBUILD simpleswitcher-9999.ebuild 599 BLAKE2B a3a998f3ef14b34c0ee7f42ca3a028fc31d5bb3fbd65eae2b3d373e8ca27734e98df13f886bced51b78314a76f487fd371a76dee29ca4d8ec2d4d7719457e514 SHA512 a08c9d24324e04499a27a3daa747396c3460ea240420a285ab946922bd323717a4af6de50ec96f78586cf72e1bd6f1f6b770ba46136ba3c96c5121f74da1074b
-MISC metadata.xml 334 BLAKE2B dfebb7140cb13ea341437fc263c27380855d6ddb262a6ed1f2ced4105b6bee74e74e94d7af50d0dc18c9af85c2f3836d2e8408d3e0c5397c3fcc5eb9a7d9dddf SHA512 05d87c23a4b55b20983bb0dd89b681e5dd8bdadfb33d94581c9bfe53017d2d7a465124e9387298984bd44314a72c4d1dfc7d1699d9dcb8934fcac13768946aff
+MISC metadata.xml 258 BLAKE2B b13585435606ce0d47777709352248b07a3d1470c74492fee9bbf9e80bf4c530077bd4ce95c9ad3df9c21bf8e3964fecefc7dd54196cc34f328765e7bb0f6faf SHA512 375cfb7d3f65fcf2e5e8509af04226e9b9f7c8b53de393bcac064238aeb9aaf9f9c07a4c24c90804c9ca47cb27a6ba7e11a6a9172c2e5b50171284ccfffe3aff
diff --git a/x11-misc/simpleswitcher/metadata.xml b/x11-misc/simpleswitcher/metadata.xml
index 992914752003..ee030c595f5f 100644
--- a/x11-misc/simpleswitcher/metadata.xml
+++ b/x11-misc/simpleswitcher/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seanpringle/simpleswitcher</remote-id>
 	</upstream>
diff --git a/x11-misc/touchcal/Manifest b/x11-misc/touchcal/Manifest
index fdad13199962..c629db17541c 100644
--- a/x11-misc/touchcal/Manifest
+++ b/x11-misc/touchcal/Manifest
@@ -1,3 +1,3 @@
 DIST touchcal_0.80.orig.tar.gz 109075 BLAKE2B d33c60c25502fd4dd5af1264b15a88732e392afb6ee5a0d0cc163f5e310c26c2c968e662da306107124fd5528e045ea9042c2525f911e11cb0fffb3298eab5f5 SHA512 e4687eb2b401d16814b256c97725d0ef7646e3fa1fc020dc0af41486d6a959c968095b6d2131d6042791db37ee02fc6c9d7cf06a61722af1b4aca5e7c0a3618d
-EBUILD touchcal-0.80.ebuild 436 BLAKE2B 8e543117429fafb4e6e93bed9ce069cb93cdeaee6435d39611a86f5e86b94e4dad88f9335f79fb8653dff1849e12e65dec48212efe9e70ac1c620888fc667ff7 SHA512 2104bc7e9f0fd1da35ce95dad2bffdba5363eab5a70d5c967baf75a6f646923311e74e9cb29f5deba3ea6dafe9f5ed6395f21a7facf5256fa70e32789fcc5499
+EBUILD touchcal-0.80.ebuild 435 BLAKE2B 22eff7f402f4804bbe36d369dd86652adcbef8e76554f645099b592a1e0d2f563bbe026948c15a0157a0eec7cc2083fc83745a468e88195410e5b10c80b0357c SHA512 b096d01a215fb4466ce1ebb68a64ca568399dbbe5d5b978a31d6e612a21bb176735657b892ff5655a54cf8f8422230502b4e4b8409417ac5d6993ceef829c3f1
 MISC metadata.xml 245 BLAKE2B ebe9520a9d0d939a66c4c1fe20f030c85f65af8acd55b823a037335957bad36fa7adf597f79d44c5d1475f4cf2caddb514e24739814a048906dfc83c5d6912f4 SHA512 a77a007ef0ae6b022a5d89748b262823a04305c08f618982472fe9e1cc5f59692516a4f11cab608ed4183f23e14de9c48a66ee2a1ac55479fd2a4cc7afeeba02
diff --git a/x11-misc/touchcal/touchcal-0.80.ebuild b/x11-misc/touchcal/touchcal-0.80.ebuild
index 3f8ab64754e3..86e873d57670 100644
--- a/x11-misc/touchcal/touchcal-0.80.ebuild
+++ b/x11-misc/touchcal/touchcal-0.80.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index d3d059927978..9ad5c5698d0c 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -2,4 +2,4 @@ DIST trayer-srg-1.1.6.tar.gz 27576 BLAKE2B 4daf93beffe3194a6cd9620826dea940d1667
 DIST trayer-srg-1.1.7.tar.gz 27987 BLAKE2B aaaa1609bebe91c7b2d3934d68075fa16f393896b7f9300dd6aecd7aa8666a7f3474711fbbc9dae5f72ed5ba8b63d0275f590a5a82ea4547b640a75a81012fc5 SHA512 5bb049af01c3f3f62dc8a5c1932985b92c98e4e2083aebd1dc09256746e097239be54ebc739801773878882a5c8f168a4a13bdac292388f79079ad52c41b2cad
 EBUILD trayer-srg-1.1.6-r1.ebuild 651 BLAKE2B ac903fee64af29c0089755972c799c05d828b7e56222b2df6a271873a25aa4cfa459d54eb664dd9db097e10744281097c2eb56387eee9892fcc14dffe4e79e29 SHA512 4611a742780e1c10ae142dc8799a88471f9063539142c67b168690a5e4fc12fc62c41cc7091649b1560c0519c66e12c3d29ac2e844ceb8e219358bc4dbcb12a1
 EBUILD trayer-srg-1.1.7.ebuild 756 BLAKE2B 77260820f9fe85a1365784565812a08924763a33f1f3e61f485e9f39431885623285b320e9d7550d24c8ab1f64306a2df5e63fcdcbabc146d56a9ac4422f301e SHA512 8e4a611d5b9c36480c1c35947aa8ff15c841f77484d2aa79ea1c5452d1d4271609efe86b2e995ff34cac70801861ee1e3f909f300459155503ca491030339b02
-MISC metadata.xml 325 BLAKE2B 7b300f939dedbc04caf17bab902add7df63aa6a878a79d69972411d0354a746c0d294464bf139b256294bde89a1cf7bc80777b42d07a746e833ab12ff0e4a533 SHA512 1c56dda5bd4c5ee284f46cecb8043b43510233276aa256d94cef179f444805d3935ab5238cb86715e7c98a096a1ff74540156df14f51bf73d24e59c6fb038867
+MISC metadata.xml 249 BLAKE2B b308f3f4e67b02a37d7df053cda2ce801a2e355f212a680126aa3338811fc6127838aaceaafe156f9afb871de57a301056dd9af8d0cccd32fdc79e2abce4b56f SHA512 a354c9b99e5ee4dbc44e534e5764479ab0f2cac37ce7d9699f0bd668653352c25c630be27239a3a1c3e3ae391891df7c3855e08dac224b510f0feff0c060ea4f
diff --git a/x11-misc/trayer-srg/metadata.xml b/x11-misc/trayer-srg/metadata.xml
index 2b3e45adfea6..cc2811834104 100644
--- a/x11-misc/trayer-srg/metadata.xml
+++ b/x11-misc/trayer-srg/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">sargon/trayer-srg</remote-id>
 	</upstream>
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 645c34b81c12..50ea4d1e1b88 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,7 +1,3 @@
-DIST util-macros-1.19.1.tar.bz2 83274 BLAKE2B 014cf10cb1389809c4de793d28aa7941403734bc0abb28d920b22be3f05b7597a7106d716b0f3b5de5dc945fa23095dfd032e103711dbcd0711b8634a5153b7e SHA512 d69a415d5922f072bab1ddf8984c98bc349a24ffc7a60184320a12992a76b04d7cb773b426b1a7000e6dc7983d59df51bbc8f2ff25273d63e4e238b4cd91eb38
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
-EBUILD util-macros-1.19.1-r1.ebuild 701 BLAKE2B c8718b974072425244c92bae1fd5082cb8a7006af17218cd19659c38907d995da94d08fc512e52dbd9eeb7bac7103e3bafb2b6ff712cf9dc6921aee186c5ee06 SHA512 5ba39f90314dcb22b4a873915e1d953e8ef185941dfb5b9c9ef7b2e7f6807f7f39606750968961a805a8f2e83d4ca7e0d8d50035f70af91a412c1aee73eeb5a0
-EBUILD util-macros-1.19.1.ebuild 483 BLAKE2B cf7ad79fa74ce7a9f3d50a4f4981970d85e11029bc2d05a1f2d1ae3964088255bbbb14aa99339e6055d093a698191c73876d2c2379064df2936b7e2e1b6689a3 SHA512 6107a49a06da5d5f508528eb4d0cb92559e33f0944f690bbf412b0858f3e2d6629c2a2286ae521b55f769ab69d0338873be05182a55d7a44fcf9d357ead14c64
-EBUILD util-macros-1.19.2-r1.ebuild 691 BLAKE2B bfabd62a9ff7ec96cd78b9754a63cd4bb8d634b6dd17bd28b962ba326bed03aa48f007982321790cfbc1a956889debc81e2fa75c53afdc67840cc4442de0be6d SHA512 7c896019024c64992822e375264e7300d3f80001da2088a8f42ebea76dd3009845ff4322a5eef0d322bf406721ade417ff430f82b6edd2b8896f5f833fef7baf
-EBUILD util-macros-1.19.2.ebuild 482 BLAKE2B e4d3f9ca69f9f0a76a8e08c0afcb4a673cbbfdd38c7ad2ebe73104cae39f4c84d63c72c4de0e3e68ad5d146b313322b20967416f7922718f973ada9d90115284 SHA512 79d70e4ee32a706daf0884a5839fcec36b63ea49abe7b9da80e56b445af32d8c288170ceee9179cd70a57bafe20afb8cf9f3b5376aea57a980a345b504d904fb
+EBUILD util-macros-1.19.2-r1.ebuild 688 BLAKE2B 0f5350fd97da3bfedce5440f8509745fafb8c88b40e7dd1d0e0fdc0eba35a7f07bebc83ef0df8fff9538dd72a1a545a46e26bd89a7258508c9042d71c430a9f3 SHA512 cb254e3d5c1925c780138cb6d28ac6b22a9ed454478127b769e740309bcb666b5bda8963c433927a0eccfe2d7dd6091e31fc43c250a59147b78b71dc82923c5f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.1-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.1-r1.ebuild
deleted file mode 100644
index dd326f167cc6..000000000000
--- a/x11-misc/util-macros/util-macros-1.19.1-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.Org autotools utility macros"
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
-SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# there is nothing to compile for this package, all its contents are produced by
-# configure. the only make job that matters is make install
-src_compile() { true; }
diff --git a/x11-misc/util-macros/util-macros-1.19.1.ebuild b/x11-misc/util-macros/util-macros-1.19.1.ebuild
deleted file mode 100644
index 51a04097da4f..000000000000
--- a/x11-misc/util-macros/util-macros-1.19.1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/macros.git"
-DESCRIPTION="X.Org autotools utility macros"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
index c0987abe7e25..788375df9175 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # there is nothing to compile for this package, all its contents are produced by
diff --git a/x11-misc/util-macros/util-macros-1.19.2.ebuild b/x11-misc/util-macros/util-macros-1.19.2.ebuild
deleted file mode 100644
index d97a6a0bf6d5..000000000000
--- a/x11-misc/util-macros/util-macros-1.19.2.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/macros.git"
-DESCRIPTION="X.Org autotools utility macros"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/x11-misc/wmname/Manifest b/x11-misc/wmname/Manifest
index 47da9c30f890..b2fef4b27a66 100644
--- a/x11-misc/wmname/Manifest
+++ b/x11-misc/wmname/Manifest
@@ -1,4 +1,4 @@
 AUX wmname-0.1-buildsystem.patch 504 BLAKE2B 7c15189ac398a4fd1fd082bda44bd2909fbe93d4b30a3b0ca7cd3a7126aa2f8028618e1e6f069aa4d1305b6c869573cac0995c5b8883bdbcbc21c1ab369063c5 SHA512 c30cc281e99d6ab72d214312ee4d5a7dfea176f7befc4d266faba373b322cd6f7bc4572c9565d460177878770d25197472d07a305d7da2e3f6cda9484d3399f6
 DIST wmname-0.1.tar.gz 2512 BLAKE2B 447df17111411533704898548263c3b6d40590b74761061517c779afa05fe5176a870490809d669e5a68bfdf8590abba91cd47969afc87d17925059e297a53af SHA512 e57100f8de2579f4090c0aaf5a5b134d03bcbcdca5c6d005b12ce39ad322d96651bb13d151cf259e935e6c50e7b21bde43a4eace112be80983a92f92b99f192f
 EBUILD wmname-0.1-r1.ebuild 659 BLAKE2B 2074ccb6832ad7417940f59c2789f69108a5d950d4e614cc9711994c2418cc74ed06376eafecfb3b6c43c85ce54643577a42ee19dbcae101b6ba5d38995eb64e SHA512 850c45258c7aa050b1eb665a7af145cc6fea2e70cffca9bf053cdfcb62ff144daf4b060de0fe0577217267a6fe02a74d106b11c7fa856971eecbf81b09d4e0ea
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/wmname/metadata.xml b/x11-misc/wmname/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/x11-misc/wmname/metadata.xml
+++ b/x11-misc/wmname/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 87fa885119e6..dc82f1a443c8 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,7 +1,3 @@
-DIST xbitmaps-1.1.1.tar.bz2 113346 BLAKE2B 2ecedf3208ca8d5e4802bccae0316e0dcb5ad9b1efede1ace2348779797f29adf6aa6b173fae4874cf7ab73341f87af0bdac645a9e378c8946fbd941739fefd3 SHA512 172a74014e699e5f295ae726a77f1669baf4ac00d64a138b77e5502102b2a02c10127f35ccea5b6af5479d17f60a6bb63ac0f943fd071ab8b396d43ef314ae61
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
-EBUILD xbitmaps-1.1.1-r1.ebuild 458 BLAKE2B 35ae63b53763a27ed807f566ac651db0d3a73302d5da24efb2fca5db30a47ac08e1e18af9b6c08520e0d19b4633fe7cd76daf657432bbf2e56610935ef15094f SHA512 5e0b91620f1e7ae829137f55c703e4bec814ab3847fee3ce69e2b13cdf63a052cf120509bc707a3c9c98343dbb7ffd9808c15826cc4da7dc7ac0fb802cf1bdad
-EBUILD xbitmaps-1.1.1-r2.ebuild 684 BLAKE2B 6080c273544e2d7b47f93e744fc37d5cefcbdeacdc748fdd90e669b3bdbaddb8e396484ec0a77bfb796a08826c4e936c8970ab538ad8b69957f3f2896c2d7a22 SHA512 c7aac8c5778b25adc8e899ab31bcb11a51b7c061a91af375378f70e6e8507d1faed2d0fdcf6b735e5168f0098b77216652ff68dcc674603b02eace2d602df91d
-EBUILD xbitmaps-1.1.2-r1.ebuild 674 BLAKE2B 87248ae5c46c14ee9f72fa4fd83aca1301e942559db4484d7bca9c621acc36c324d08b418f90d8ebb6d119237db413d58a54c030a376997f9a0f218e82c688b1 SHA512 85f126d695e25605aa371042ffda1a6488acaf00df555191f95b2ae7ea7487ed27b55e32670fb39ddc49c3d6609237fe97fa95410a9834c1fe1373fadc93b56e
-EBUILD xbitmaps-1.1.2.ebuild 457 BLAKE2B 41d5b8c90fac64bbb6c1d574ed28a56c227e2fbee1a4f211de03f6a3a855ba78a8ac35dc6acf4bcd38a3afc7e3d5a4d519f0dc904d374b9df42cf040dd62a9b5 SHA512 8cc4d29352d38b506e6a6f32f4221b52702b369e0ac585779769b2457624e7a4b2284d2cfd7eb8477f28c20b9a312196656f1b373daecf72ac904564cc76f4ef
+EBUILD xbitmaps-1.1.2-r1.ebuild 671 BLAKE2B 2f41c74b094f98b64c0516ac25d21c88bbfb0ebe10576dfdcd5752fe61904a41cb9dd73fc8515d474dc66fac3fecbfd29d404a587ed0b01e1957ef6e372e62b2 SHA512 b23495927e5e83c904fd07a7bb1574bbfbcf1a58e2fcf5a92c12e52d75ff2c26ac471ae01c580c4e30c48877c1a3b5d8ede89a3e3045bbcea0b16a9cf100fc5a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild
deleted file mode 100644
index 3b936b57bded..000000000000
--- a/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=data/
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild
deleted file mode 100644
index e389753a928d..000000000000
--- a/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.Org bitmaps data"
-HOMEPAGE="https://www.x.org/wiki/"
-SRC_URI="mirror://xorg/data/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-# there is nothing to compile for this package, all its contents are produced by
-# configure. the only make job that matters is make install
-src_compile() { true; }
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index 7af6e944ac24..0bb27cf96fc4 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xorg/data/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild
deleted file mode 100644
index 84fc20341b52..000000000000
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=data/
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/xcalib/Manifest b/x11-misc/xcalib/Manifest
index e9ef3bb6d12c..632375fba0a0 100644
--- a/x11-misc/xcalib/Manifest
+++ b/x11-misc/xcalib/Manifest
@@ -1,3 +1,3 @@
 DIST xcalib-0.9.0_p20161210.tar.gz 36687 BLAKE2B 7b1634a4390ba1aa90b246176e928d2bdc7f8478771744628dd454eab43ea9b42d479950c5748baadb8d081462ddc036a34f30653bc8f7871ed09e05441ad2c3 SHA512 31d9159a67082cd0c63d6ed0e34872cd776adbaf14dca754a6ae2355d24a972a6db5811a3d7e69e24c88534c7f63e8d1285304272bd293e3a93c35c240d99907
-EBUILD xcalib-0.9.0_p20161210.ebuild 577 BLAKE2B 8f87f0c41a836b38dea605c9f15c8e214fbb275b1ce187220af46e47d894e4387c19ac184f25f32137e02b06dc27b8ed09b1ca47907ba3b4333331d3a9e8d7ef SHA512 14d32b7327e2e9d20647fc2883f4363ff7165c65d61dd340a8d96507d769e5fda139a11872587e8497ca5b008adbe037b617443c2902bfaf22a3c26161c363b0
+EBUILD xcalib-0.9.0_p20161210.ebuild 579 BLAKE2B 73b25dfcfe1981a3d1a9682f2b6c0b76dc467145141ec26d33c6dbd4fc1e780f098ab1b9fc5bbd1de46c65750e54cbe822458eb18fbec34d1ac71a7e026bd177 SHA512 2f0bc696674d734e7f2f59d42de0c13dfef8cfa182018db61c3241518d203f518642cc31e58969670bab15ee144dbbf8d15cb4cb040f5cfb97c30cd7a81e5a9f
 MISC metadata.xml 261 BLAKE2B 42a18dafa16eda94e27fadafc73f3f15f247cc12ba0073ea96d0f1abd24860b2c2ad943174178d4ff96b8e05300570eae7550ae33f4048b8587e58e876479f85 SHA512 998e9c0c2f1a166088ec7e42ad68edc520448dcaf96eeac2eeaf329e5064ae216d025a483be6dfd9b22bb434e8675fe93a4e49beb745ef5b673a3670686caa28
diff --git a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild b/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
index 3a3511979e2a..39b237e5d264 100644
--- a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
+++ b/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xflux/Manifest b/x11-misc/xflux/Manifest
index 5c90d5dd1f0e..539eccfe2584 100644
--- a/x11-misc/xflux/Manifest
+++ b/x11-misc/xflux/Manifest
@@ -1,4 +1,5 @@
 DIST xflux-20130927.tar.gz 335911 BLAKE2B 56e683a6969f129c7dcdfd4b13a23523ca5ce3d19feae947a654ca02437e372bd998a71048d00c5b7bf653eb9fa57c696b8d5bb1b3dfd75a0b17e9213368c1bd SHA512 c35003b9cc6bc95f6ce98efc2e69ea94c99ed31671ec5d1f5919294edd7e504d23aa1df29ec0f1d1c68c4ceafbcd386e1207ef4c9957d7a5079ce96c2ac6d924
 DIST xflux64-20130927.tar.gz 339845 BLAKE2B 15751b75b7c0603044c4e7e98a9b23ceab7e245b12833ed1b6e8bc1d1734c5838777b7561d035bdf6d6d781105cc48dbda6c262895c310cf9710529a088b0a97 SHA512 6204558b8fa1063ee19fe444f740ab4ddfdbc412459b2f5cea94ddbf11818e0c9bff7e066a4958c1ab5c160b1aedcd18fa7fc4cd800a67c5d51ad1206f203e52
+EBUILD xflux-20130927-r1.ebuild 639 BLAKE2B 0f40bdd0f6c7e6df81a78f6cea1892f4fecb833ab88e4c698f453643d25007536eaf2033382e115b8cb0b2b1360f70ca7e0c88d47c217a22e9f66df05ccd79c1 SHA512 cda72609c5434435b92ce9ca2e9dd0eae002631c13188031aecb5046ef21ebc3b37f348df64be8f990bf4828b1ed793b94f268058c84615c379ad7955473ab29
 EBUILD xflux-20130927.ebuild 652 BLAKE2B b0d542127d818f4f99e7f8cdd4dfb8a4dcfa06bb1a5abfd9972c5ed900d4b744cb229246a945fd296a2dc85ac9985be88768226057cb7221e41a5d0e8cb053cf SHA512 25ea901e469797293fcee0db63a415efa6f156c574f2174def009c71e91e9d36cf0560b37c21cc5d814ddf9a71b1a4ee2c124967209e38ad5a25fe4c0dcd73bd
-MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
+MISC metadata.xml 621 BLAKE2B d4a3d03b35bde34b0b6b1af8518d3b18486876766037a4bebcadeea32f247f2660c970d89638e91315dd7eff42ccf818bb868c92ea94e52db3793cc1285008e2 SHA512 9f2ae158aea2c8d2e0191c5df7825b0b6b802a564637ccfe8f431cd0dda9569a7af0c08925e804b2139de1ba1a8c346db0b305273b0f54fc1a4581bcdb959718
diff --git a/x11-misc/xflux/metadata.xml b/x11-misc/xflux/metadata.xml
index 54d5423c4060..4eae2cce3dd6 100644
--- a/x11-misc/xflux/metadata.xml
+++ b/x11-misc/xflux/metadata.xml
@@ -9,4 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<longdescription>
+		F.lux makes your computer screen look like the room you're in, all the time.
+		When the sun sets, it makes your computer look like your indoor lights.
+		In the morning, it makes things look like sunlight again.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/xflux/xflux-20130927-r1.ebuild b/x11-misc/xflux/xflux-20130927-r1.ebuild
new file mode 100644
index 000000000000..49418c455247
--- /dev/null
+++ b/x11-misc/xflux/xflux-20130927-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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() {
+	dobin xflux
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 7a085fa2227f..ac5f73c2a491 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,11 +1,4 @@
-AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195fc7edf09996ec2de854c37893fbe0dca935ec0cedc8f80778c8c45088f7e6952073b34c854635212a79d068dd3c7c6c15a101ddf86aa856193 SHA512 7cd6193496ee9da7867d5121d995e360a3e2c31210794496b62338fae1eb0cf434712db11dfc2f25fd6eebffb92243589bddba98286c189757923bff39cd16bd
-DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
-DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0
 DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
-EBUILD xkeyboard-config-2.23.1-r1.ebuild 1131 BLAKE2B c959f3a2c32887490d4e5723b0b219c887f347d2c839a9038226065ba7d8d11d44c08857c352fd1f84973140adbff5f7c6d7e137f7fad5ed3c6a236a3b2d1193 SHA512 f212dc2bf40ca4297f4e0ec5f4faec599e4d836109282a511826186a9ebae190eae2e12a0f409e225756914c70715f09c2b896b86b1ad8567b0dfafc5ff5aab2
-EBUILD xkeyboard-config-2.23.1-r2.ebuild 1250 BLAKE2B 5a694d2394b39a7f998753cd77c8995aca9659845b56a4fd299d4c56d63f3f1abc0192a2888f7f3e36bd51e4cbce3e4b2fda502612d50271d64a2b928c267fbf SHA512 fe6e2b00bd09d9d4adcfc3683309e98350580f27ba965ca8ca8017ba666dc094a3746e6f4d38d0d96065b27af83d06cd1a4e180d7e2135c5e345b6af4bd08135
-EBUILD xkeyboard-config-2.24-r1.ebuild 1192 BLAKE2B fd3a5acdc4153a3c459cca540299a5ef52bf987df748bcc27fe0303d53ad9e450bf0f5ce81f4f95ec4ad1bed4ff81ee095ff1086cfae3920e0b74f362cf18a14 SHA512 2a06221496386dc2c3777a5209e54d931cc7bc91916e72804a63b5fa7fda1a6b4126bc4a2f96ab1a27d08eb16621c4d23ad6235dd1873badcc4332c18f63a135
-EBUILD xkeyboard-config-2.24.ebuild 1084 BLAKE2B 790e68a4f4b1ecb3c534d1ca086ee44746fd295bedcec05fa2edcad92a7c0ec60dc686bf7a9d39204b37c9e1b7498ebea69081b0c62cf1098f769f6a54cfd746 SHA512 1c2888737aea4b19df1dbc6d9d8859e54716986982ed961a160da1face286f6c4c702781987b4f6ec68a6b9f1a80d6e0d17eef714961b29a08ad3acf2a582222
-EBUILD xkeyboard-config-2.25.ebuild 1182 BLAKE2B 0f2f8dd9adc245080b1f690bf28cffd99cbb1e11759cd99f470988bc433317709f3b2e646fc898697c428daa0b653ed0d055d0aa4ad6991a0798c6cae07068e9 SHA512 0ba5b4ed1ac1365038f0eb6678f6d36004ad119e1f94451ae3b4a295f7ad6085377f73440509cd22cc4274711538e59c937946dbabe2b454f9ea880f70718700
+EBUILD xkeyboard-config-2.25.ebuild 1180 BLAKE2B 326631f041704b22acf168278744373ae93e00d126572ccb45904d4276544736a5b39276939318f296489440450e362077897fd93e58d82564fc41db05d48d0d SHA512 13248a3d3d036d394163eaee853fef2c316a8e80b5337fc3bc624dd675636a03e5b6e23c31c704e6ce44941c07f2fea4db59887d399c67b1e0f44c83e1a7a2a6
 EBUILD xkeyboard-config-9999.ebuild 1189 BLAKE2B 28da1b87ddede17e959e2e41334f008628c574a67c17338c3178eda168c02ff142ab8806e06de6503451065772d2eb96f44a69e73c9581446c322f4dfb8f1a0e SHA512 5f76c09ba657c602fab4337afceb1087629ef4caac8988dcc2cd877db264ed4ac63804d5502adbdcb20f87bb5130dc6fd259a192b2e8674017d90a34a6292200
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch
deleted file mode 100644
index 7d9e6fca2dca..000000000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001
-From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
-Date: Thu, 1 Feb 2018 15:37:46 +0100
-Subject: Fix typo in Polish symbols file
-
-https://bugs.freedesktop.org/show_bug.cgi?id=104904
----
- symbols/pl | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/symbols/pl b/symbols/pl
-index 52e7959..800cb85 100644
---- a/symbols/pl
-+++ b/symbols/pl
-@@ -497,7 +497,6 @@ partial alphanumeric_keys
-        include "sun_vndr/pl(sun_type6)"
- };
- 
--------------------------------
- //Glagolica
- partial alphanumeric_keys
- xkb_symbols "glagolica"
--- 
-cgit v1.1
-
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
deleted file mode 100644
index 34dead4f82a4..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3"
-DEPEND="
-	sys-devel/gettext
-	dev-util/intltool"
-
-PATCHES=( "${FILESDIR}"/${P}_fix_typo_in_polish.patch )
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-	--enable-compat-rules
-	# do not check for runtime deps
-	--disable-runtime-deps
-	--with-xkb-rules-symlink=xorg
-)
-
-src_prepare() {
-	xorg-2_src_prepare
-	if [[ ${XORG_EAUTORECONF} != no ]]; then
-		intltoolize --copy --automake || die
-	fi
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild
deleted file mode 100644
index 8ee5f1f9f5f1..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
-	inherit autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_fix_typo_in_polish.patch
-)
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild
deleted file mode 100644
index e517c9fc8366..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
-	inherit autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild
deleted file mode 100644
index 46745dbde703..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3"
-DEPEND="
-	sys-devel/gettext
-	dev-util/intltool"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-	--enable-compat-rules
-	# do not check for runtime deps
-	--disable-runtime-deps
-	--with-xkb-rules-symlink=xorg
-)
-
-src_prepare() {
-	xorg-2_src_prepare
-	if [[ ${XORG_EAUTORECONF} != no ]]; then
-		intltoolize --copy --automake || die
-	fi
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
index caac1366e392..4800e8660599 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index c7503475f753..51c451b4cd5f 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,5 +1,4 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6-r1.ebuild 2103 BLAKE2B 8eb901e84582c25e39761d3b696baca9289cccecc0a99a53ce1c9c3cc61b67f92396cfb49e0b880c180bd0c87c3ac7e598d682b6021142052bd717d95114914f SHA512 2e5cc3c55b172a28b98b30397c463901e3440e122c0f9286c22aa1a88d1ed0a21ddd8e84296c9eebe0092fc42aaee58ed64cec2ab33f3fd035a9aca6ba27ba78
-EBUILD xorg-cf-files-1.0.6.ebuild 1807 BLAKE2B f308e9bf32d0be178acf80a53e0ad94602dfe491fd7993d0957f115f84bc3b43c1678b6b71937b810604005baead00048085f5912a9e89ebe95dc2ba27045abc SHA512 22dd481f7266f56dd2628c7353686c58a4ee5fe0d9998bb1f3e4f6c90292aff1ad388cda7d6f9132a4eb07a1add8b14e2380fa54528790106d756b9d397c8f64
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2101 BLAKE2B c24f3e8f35492095918d1d7c05d21b60070f754a9190cff6e83d90fd0da2ecfb61b8a9f6772fcaae0414d2ca6d28b303f57beec849192dc5825308bad03dc110 SHA512 e3849d9072447decabc3e10b4076b1872800ba54c3ca5e38adcff7c4b3703569798f41b28a7258ad8540da9fad428f9eb813c8a8ce6c69174f1095ad7c32fa05
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 2dda467e5bf9..3f17605c8b80 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
deleted file mode 100644
index 6c6d7152945c..000000000000
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Old Imake-related build files"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
-)
-
-src_install() {
-	xorg-2_src_install
-	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> "${ED}"/usr/$(get_libdir)/X11/config/host.def || die
-	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
-	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
-	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
-	sed -i -e "/#  define Solaris64bitSubdir/d" "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-	sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-
-	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-}
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index 7caaa1e18db5..00761517c9e4 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,7 +1,7 @@
 DIST xpad-4.2.tar.bz2 244275 BLAKE2B e7552d4788c8182f696010faa1600c783999bd8b8d87e421f85ec9cc8e36a89b112e4f30d0d2205ba1f12915dc88d2aea98890aef8ab9ac0a6290b7d14837597 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7
-DIST xpad-5.0.0.tar.bz2 150887 BLAKE2B df46d24388f73605253d7cfa0c8e3c7d802c876e0ef72946dbea888546c3a21b320e256ae203c0d20b70b93d55b63fc9e6549d0b537fef292ff0995980e91c3b SHA512 c014c553c961a6cf11529849ae9fd11738644b939cd0738a0a076c3eb1be2fd46afa0dfb9933e5f6433cb043a4a19e82476a9e6c5533d7e675ed1d3c7965865e
 DIST xpad-5.1.0.tar.bz2 152853 BLAKE2B f0ccfee8649d59554c7e7f903cba067f40bde76855545283e254b114a9439d514111e2829b002c7d27fd4c97f6d21533b89d1cadd7c494d0639be5d1bd9d0267 SHA512 9999ccc14a3086cbe720f1ce0edfcb0c3840c5253c04aa64652988ce3b15230cca2c181f446239ef4bce3d4058d35e52aa69f2a115e0615cd670221bdde0bce4
+DIST xpad-5.2.0.tar.bz2 157906 BLAKE2B 9913809522573d12315744d6d0d156ef941be4c6db6d37f32807ce812a17c6c28a887aa110f277dc970b1ae86a3345511b242acd15d0ed245f49895c4bc89c62 SHA512 f3d0dc2d654613eec6316beca66c2250c4bb4060f144884c5280510f8e6d45799e13488a4d3c827135db697c1214fd8c7e997acfc8741b06ef0fb4cea1434f93
 EBUILD xpad-4.2.ebuild 574 BLAKE2B 16154fba76fb1d4db26feadc5cbaa0b1902e6bee8ee7d0cb23280bf574fdab4014905f89e70fa8c7d92df9485473905f23a82da79332f889be2382b366a2f3af SHA512 3c22e6a96effe2daa82ef879f9cbafd5ea1c37375e4c20b96f8ed333a980c53c9b568012f4afc4d69929ffba1001ce2a54aaaaf89c145266afb039134a1d126c
-EBUILD xpad-5.0.0.ebuild 731 BLAKE2B 11bdcc9c0cc469f5ce132cb6c293bf4a0e5e38160f272086716cb2e535c12e5dcaf8fa2cc19b53bf58e065bfcf2a903d3408aa373382bc6736a8413b2ab0d34b SHA512 76f173387ac950f5b94b08a3feaa8101c6e6194c16b257cc55f56e510c726ef4ab1c04aa54f50b1ace3bc5509d07c22e29c2c426d29a2a9c4681cb20eb204f00
 EBUILD xpad-5.1.0.ebuild 738 BLAKE2B 40f69bc6d3e5c9300c45d31e3a92156d248ebe1937cb38bfa3c107cb25657205cb95e4506eb30eb3e661cafb69efebb2c510584c3e4fec56a840692c92047d2e SHA512 f78741d761dbfe71b8ae3684a6bc5149814f09424a434a99f6b4439c48c5be506f69ff8af3517a1511d3937955f63daf1ac9afdbec5cb087a3d8557c29e27bae
+EBUILD xpad-5.2.0.ebuild 735 BLAKE2B 2f90ea91117fe65a7033eca864e2ccfceba9f70d5848dbcd3f84b74de6119292a1819f7e6abed452d84ea64e2b77c078338dbeb8f675382a388cb56d7866e5dc SHA512 fee743fc98eeccbab4b00e063653ce04ac8371b4cf52dc99fc88513c90b52a3962ee20882772663249bf319f557f0159c713501c786561750f961171eddcf315
 MISC metadata.xml 424 BLAKE2B fa08ddf7fe7b630108f7f6c67abb3bb80ee3530d24f20f92bf1d0232a445eaea1878d96731b076d29599ea329fd405e0afa56c284a98b76c60eaa9608f4e3cf5 SHA512 b9eab4ffef3b831a8c2fdaac0ffa5d4d32b7083d54746130c4cd0e38556238ae40574d9f759f411ba070ad967675944c090214ee66b9c300b9a459cca6927235
diff --git a/x11-misc/xpad/xpad-5.0.0.ebuild b/x11-misc/xpad/xpad-5.2.0.ebuild
index 6cccd2701639..41d1ce652648 100644
--- a/x11-misc/xpad/xpad-5.0.0.ebuild
+++ b/x11-misc/xpad/xpad-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
 
 RDEPEND="
-	dev-libs/glib:2
+	>=dev-libs/glib-2.56:2
 	app-accessibility/at-spi2-atk
 	dev-libs/atk
 	sys-devel/gettext
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 01aee22c2a76..10ab94f1d947 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1,5 +1,7 @@
 DIST xtermcontrol-3.3.tar.gz 141972 BLAKE2B c357a7c5e236100c77459cba3ff92d7cf9874646f125bf812b48fa66000f751deb00ccd86550cf5da08f40cb7cf359ee4cd913bea5d4b53819cc53ba1f6b187a SHA512 625b1ad93110032244eb277621676d89113a4c45642538b029dd36ab31e2fe9d2603c41236d2a1ffb22b2fd7feb61335f35397814569a634eb0a7d4b71961d1b
 DIST xtermcontrol-3.4.tar.gz 140662 BLAKE2B 8d151cf323899363e094a9d64776a80b700e959601b6c95d81fe251527187a7f5589c000b8593e059e230d46e3286732869b5d0134efdcf893eb7f4fe434e026 SHA512 a3666fc78cd8276443c8b5027ea04fec01f469e44d8b97bb9cff4159e5906e0a6b8b56069aa8d134a9d76fc19de2a7e9bd802e0d1fce6a46e164142766aef513
+DIST xtermcontrol-3.6.tar.gz 151916 BLAKE2B d5ade1c89d0bb45b401b59e5e13586d54c55226e1c647cbb60d047bdd0e0a61e871b0c405adac8a4bb71d5addd5a8bb11d1ac45aff9cf456a17600f099e04d02 SHA512 f59e729a9bd6739604c0c687ca93fb9091d69d7c28624d514baecf6839db9897a919adeda6e6d02e368b5f8a980c3f616155da955d5581415625a5757df650c1
 EBUILD xtermcontrol-3.3.ebuild 374 BLAKE2B bf70633c9c4afb87202812152092510c5766ba2df6bbbf31ac7cdb1928ebdb81d4d55316638cb2d9fcf6cd616964cbce8765d3ec3336189d719556d3500b3ba1 SHA512 448e85ed7404095ca0ad64d75b4a713895fc1f2a168d0ed8fc668241c731615c2e7e825078011fede0720ac204dbab792bf8f1da8b91f5ff0af8dcb549c86e91
 EBUILD xtermcontrol-3.4.ebuild 373 BLAKE2B 836d55e50d4021a1d005c4b111cb88e11498b36ad837233e3dad2ac2424f1a4398647818674122c7ba39a5b79996e5e7ad2f650039bfc7c6e4abf46c7c55e61f SHA512 f02e93b2c590a6f4d9a70b896eeccaab5d42e383b64252baa1be51c6de53362f91704ca6491b16af3a6c4333d15920c20baaef20275319e28d35eae4637d22bc
+EBUILD xtermcontrol-3.6.ebuild 376 BLAKE2B a404dd6099e71f8206987827d9a79e97470f14418c636cb96b450c7cb4ff1dd74455762a3adbebbd743f3615bbc799dc7383f8ef8264ffa7c54f23899e9f754e SHA512 31dc63172fe7979505b2312972ed13262bba53b08df068f4aaa306053dbc7d1d865d03f0d3631ca05bd93ee1bd52e4be6ed63c8eda459812be65eea1a2ec95ec
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
new file mode 100644
index 000000000000..3a592732de18
--- /dev/null
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
+HOMEPAGE="https://www.thrysoee.dk/xtermcontrol/"
+SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index e6a7741e6e23..6586cd926e81 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,4 +1,8 @@
 DIST xwallpaper-0.3.0.tar.gz 104300 BLAKE2B 23ec3b4ccbaf910c9ba4afbd1d9237223654a85c90b0a147141b017a9b3917316f745e1dd70a89e385110d380d5bbba8ee7c2d1ed4188d87a98ba0e94c5a7b6c SHA512 c73583fdbd573329951178d7db36fb1ae18a4294207de85dfb93e367be0ed103e8de7e2dd8ec61a0a23541457c930e8b0e5eb12dd5024808de3e02ddefb6b4a3
+DIST xwallpaper-0.4.0.tar.gz 105879 BLAKE2B af1b2912ae35ff10c6138c72cbaab43996eddf6d2474dafe2ab7f8ea0216e71d3912a1340592c99e7f3ce3d3779bcccfe8285c48c44c6d3895cd79c73ac7d81b SHA512 43e7c047001a60badb7d81897087800eec4668dd9f0fa2ce06bc2c98d34d8e7fca8d5a922589b2836767e5cfa5c356b410ef32d60f9e0f76f899248d3c75fe98
+DIST xwallpaper-0.4.1.tar.gz 106110 BLAKE2B 13d40274910b5a82271207292ef7b5d5aeb21fe015c0f3a9780d164d805b9f212a017b4aea8cc8c92ad3a9392eb01c3ea5cddf66888ac4ec146d12109675bdd8 SHA512 febfca202d3356c5a2f584921eace61a6f16e19bf0b0812604bccb441b11a0748c997d0818fb8d9f6a37f502a0a38f13b78f7f61c2de2768a85807a8725c070c
 EBUILD xwallpaper-0.3.0.ebuild 984 BLAKE2B 57285f28d6321e391eb65d1263dc41e65d6a393451aa25ae1601b7ae0ac89d56e3c756e5967eee7ade1b1cc1e7b219b9b99046a6a2e544663ca65bd3d9c475aa SHA512 64b915f529ce987bceac1d59b86dbfec49dd4b7e67725beb7b11c5607de5213ea6743af0d1f24225a35405557eb0e808b3c2f07ea188a6a7508a073a63490299
-EBUILD xwallpaper-9999.ebuild 989 BLAKE2B 99fb573839f4990f7a3ab6b0ece3e87f8389b66e4dac4a303fb5372d143c008b808fc06a0ca43636d612d6c976717cea5d7f8cd711136476a837bf7f3a26fbec SHA512 b338de596750da56107cf760420451b129ead2bd233b593012e921fd86bd5b19554b74e1304442a038c79a1542ad64a2e9016d9212f30a5d783020b95204da19
+EBUILD xwallpaper-0.4.0.ebuild 1007 BLAKE2B 5455f935a2be3830aed06b8b6ad6de82cb7fccde7a0730a5a9963667d21805ac9a0ffa96e7cdf78caa1f32f358d20204970b7b28d2f6091c255e4c5d27ab285c SHA512 8056fef55ea35da5f24523174b24d0fbce21233881101b89edba64d5f8685c5e783f09446d4cca7e97105638ba43b89b89586c7d410064c9cd48beb28a8ca50f
+EBUILD xwallpaper-0.4.1.ebuild 1007 BLAKE2B 5455f935a2be3830aed06b8b6ad6de82cb7fccde7a0730a5a9963667d21805ac9a0ffa96e7cdf78caa1f32f358d20204970b7b28d2f6091c255e4c5d27ab285c SHA512 8056fef55ea35da5f24523174b24d0fbce21233881101b89edba64d5f8685c5e783f09446d4cca7e97105638ba43b89b89586c7d410064c9cd48beb28a8ca50f
+EBUILD xwallpaper-9999.ebuild 1007 BLAKE2B 5455f935a2be3830aed06b8b6ad6de82cb7fccde7a0730a5a9963667d21805ac9a0ffa96e7cdf78caa1f32f358d20204970b7b28d2f6091c255e4c5d27ab285c SHA512 8056fef55ea35da5f24523174b24d0fbce21233881101b89edba64d5f8685c5e783f09446d4cca7e97105638ba43b89b89586c7d410064c9cd48beb28a8ca50f
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.4.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.4.0.ebuild
new file mode 100644
index 000000000000..6fdbe38a6273
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.4.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
+else
+	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="jpeg png seccomp xpm"
+
+RDEPEND="
+	x11-libs/pixman
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	jpeg? ( virtual/jpeg:0= )
+	png? ( media-libs/libpng:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	xpm? ( x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+src_configure() {
+	local myconf=(
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with seccomp)
+		$(use_with xpm)
+		--with-randr
+		--with-zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+	)
+	econf "${myconf[@]}"
+}
diff --git a/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild
new file mode 100644
index 000000000000..6fdbe38a6273
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
+else
+	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="jpeg png seccomp xpm"
+
+RDEPEND="
+	x11-libs/pixman
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	jpeg? ( virtual/jpeg:0= )
+	png? ( media-libs/libpng:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	xpm? ( x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+src_configure() {
+	local myconf=(
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with seccomp)
+		$(use_with xpm)
+		--with-randr
+		--with-zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+	)
+	econf "${myconf[@]}"
+}
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index 45080788129f..6fdbe38a6273 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ LICENSE="ISC"
 SLOT="0"
 IUSE="jpeg png seccomp xpm"
 
-DEPEND="
+RDEPEND="
 	x11-libs/pixman
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
@@ -29,7 +29,9 @@ DEPEND="
 	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
 	xpm? ( x11-libs/libXpm )"
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
diff --git a/x11-misc/xwinwrap/Manifest b/x11-misc/xwinwrap/Manifest
index 411c125445bc..d0a06f542859 100644
--- a/x11-misc/xwinwrap/Manifest
+++ b/x11-misc/xwinwrap/Manifest
@@ -1,3 +1,3 @@
 DIST xwinwrap-0_p4.tar.gz 4905 BLAKE2B 38ef0a61e7a90ec2bad798b6ec2cff6d22082d001c2cb8cc39cec905d0acf9c6cd2f01c852d60dc72b45ae8c98b961db2963e033f08a0cc98270e6b0a95b24c5 SHA512 c209e1e0be366e63180f1e58844e7870d83786e912edd2e21912c6d404b44e9186a5f91be6f12ccb78c96c5bac23df02cc6d3d8fdb54743be3ef2586604bd853
 EBUILD xwinwrap-0_p4-r1.ebuild 779 BLAKE2B 1f3c45e78e7db21d04a1add122e1a0656a92428b615023d8c912bf12c84438a95a827796307adb379d690c3e5f98c8c9a1e21942a3e9fa6ca7fa15a47a4c49c8 SHA512 098e10ee32191ad09007e581de99cc77c50b01e302b8479ac9d06ca1743f8859aebc626cf618b3acbcce494bc6fad4a29990e6b57fdf7c382e6619ba4fd377ff
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/xwinwrap/metadata.xml b/x11-misc/xwinwrap/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/x11-misc/xwinwrap/metadata.xml
+++ b/x11-misc/xwinwrap/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index d68abf35fdcd..284eb9c68211 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,12 +1,8 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
-DIST zim-0.66.tar.gz 2020216 BLAKE2B 7a2af3dca2ff72dd94c605c4fa89b0d3be1413643c781aa151483445e6a029db6021ed84df797b6d9aaac05fd791fe50e4bdc9f1682d252e80f083bf37a10602 SHA512 9693dba8ee6ad915a85ca999674350b278043559ba4adf93c03c8815211ecab451a6e2dceaf62ea7048609eb86f19485f2dd77dbaaf6f2d81f97f6450bf25ca9
-DIST zim-0.67.tar.gz 2034747 BLAKE2B 47e49191e699f93727f566593d616ef0da5b826dccb2f952c6220627d67f295d40e57b9e00dec8395a933a0378c0b1b05c25db7a2cb30fd4509e6ee06269c831 SHA512 0f3387a74a9d6a1e972b4ad411230b9318c58432bd853ef6d45cd535dcdef901369a70dd619b842f1e6564a4b583075865d30acb75cc7649facf5acfe43d8b94
-DIST zim-0.68-rc1.tar.gz 2602967 BLAKE2B 7a1eed33e8d7f27ea287c993f1dde5e8d89cc9435f909ede5696f80ceaee454a38d0ab903313d6a07375797bd43cf48925e81be725094d4a4ce188f750fcac9e SHA512 60c2c654f6b40edcf029efb8367e18a8c4cca7fde11339f4ab9b3724f07f4041aae5740cd7a42fe3b2f836537c699ad597cef0eaec0b0511cb7c65b40ea6e04e
 DIST zim-0.68.tar.gz 2044224 BLAKE2B 5c53c3197bc5de90c38059e7323366ed5b7600ebf0b3575d81e618d972d0360f67660da4637f1e6f1459549b21525ed17183e9c2f57f8ab0b27236e36bda9666 SHA512 4ab7f2b55e37ae917a7faa0018a36cbad2534bb43146f47810479155009eb2ccbf4f8ab185d8b4cd3ba7e22a4e2fc5eb08c4bae0688186c13d31dfcab23b0048
+DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
-EBUILD zim-0.66.ebuild 1779 BLAKE2B b3f4597786e61255a1cfc5990ea88354be0db3f86e0c1fab2472bbccf4e7384b596bd1e6ea795a5debe3a7fb8a5fe9d539f58cb269e7a170d5f81000bffebde2 SHA512 e2f1e3bc0f287beeb2e7b1fbabb0225fc06776682bdc832d6c874f8159a64a750bbaeb73461bc81ca40f03780f44d3a7f2dc2a26aa08b9102d808c200d39dd0e
-EBUILD zim-0.67.ebuild 1828 BLAKE2B b6fc04b1b8166a2c4e4539ce1533f41d9d40ba7798031886b508fefa34ee71b554135f8962bb6d4c7e075b13b219e6354ecc233c98b549804f65cebfc218ab16 SHA512 d735ebe9821d634fff6ee707b2694cc347b32a7d65b88a0f7a179171496088714ac4fb6cce5806c60881d5149971b41438c2707b52457e4daa8d08f0e4bd71d3
 EBUILD zim-0.68.ebuild 1847 BLAKE2B 12615ea89e434348ff24ed1f492a09c11944c54c1bc4931f8a555b04eed4bb909a205e7b980ae1a6e63054441cafb854c5b76b21b068ad2b62daa51a76e69238 SHA512 5fe0bd6aa83e1645b630a70c287fe50e16a60fc6bdb966fb768be2052d65bd4c484ee1896379fd6990d30614b4048834460813ffa15179ac57127946a51504d5
-EBUILD zim-0.68_rc1.ebuild 1871 BLAKE2B 9bcd6204f6e7c06face149cfa2b77fafcc90dc69c2e55359fe1b5df83ee0735368be03a527ca5d7bd811b0da242b2ecd740dc46d8a39526778420f226d6e807e SHA512 4d6f5ffd3247519248ee30c48f922b576526e954280ef76b954145bd368cbb10a2c8304d1dc9de12c526be1802a381cbe2f84ee0e080be0551ae94529da685f0
+EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.66.ebuild b/x11-misc/zim/zim-0.66.ebuild
deleted file mode 100644
index 700a474fba4d..000000000000
--- a/x11-misc/zim/zim-0.66.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-misc/xdg-utils
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch
-)
-
-python_prepare() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
-}
-
-python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please emerge these packages for additional functionality"
-		einfo "    dev-lang/R"
-		einfo "    dev-python/gtkspell-python"
-		einfo "    dev-vcs/bzr"
-		einfo "    media-gfx/graphviz"
-		einfo "    media-gfx/imagemagick"
-		einfo "    media-gfx/scrot"
-		einfo "    media-sound/lilypond"
-		einfo "    sci-visualization/gnuplot"
-		einfo "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/zim/zim-0.68_rc1.ebuild b/x11-misc/zim/zim-0.68_rc1.ebuild
deleted file mode 100644
index 5ab885f471df..000000000000
--- a/x11-misc/zim/zim-0.68_rc1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-MY_P=${P/_/-}
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-misc/xdg-utils
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-DOCS=( CHANGELOG.txt README.txt HACKING )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
-}
-
-python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please emerge these packages for additional functionality"
-		einfo "    dev-lang/R"
-		einfo "    dev-python/gtkspell-python"
-		einfo "    dev-vcs/bzr"
-		einfo "    media-gfx/graphviz"
-		einfo "    media-gfx/imagemagick"
-		einfo "    media-gfx/scrot"
-		einfo "    media-sound/lilypond"
-		einfo "    sci-visualization/gnuplot"
-		einfo "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/zim/zim-0.67.ebuild b/x11-misc/zim/zim-0.69.ebuild
index 11ad63086c0f..ba87523f013c 100644
--- a/x11-misc/zim/zim-0.67.ebuild
+++ b/x11-misc/zim/zim-0.69.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
 
 DESCRIPTION="A desktop wiki"
 HOMEPAGE="http://zim-wiki.org/"
@@ -18,15 +16,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
 	x11-misc/xdg-utils
 	test? (
 		dev-vcs/bzr
 		dev-vcs/git
-		dev-vcs/mercurial )"
-
+		dev-vcs/mercurial
+	)
+"
 DOCS=( CHANGELOG.txt README.txt HACKING )
 PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
 
@@ -54,15 +56,12 @@ python_install() {
 	distutils-r1_python_install --skip-xdg-cmd
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
+	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
 	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please emerge these packages for additional functionality"
+		einfo "Please install these packages for additional functionality"
 		einfo "    dev-lang/R"
 		einfo "    dev-python/gtkspell-python"
 		einfo "    dev-vcs/bzr"
@@ -76,6 +75,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /x11-misc
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)