gentoo resync : 28.04.2018

30 files changed, 200 insertions, 213 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 62d6dfb8dea8..20b0941a4b32 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index c30176678616..07e141eb26e6 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -2,6 +2,9 @@ DIST albert-0.14.15-plugins.tar.gz 540189 BLAKE2B b8243917cdd30c74f26ad852421cf5
 DIST albert-0.14.15.tar.gz 84875 BLAKE2B 80e173100a0d135a18b20482ef0eb103634207b1e1a7284b2c5245750bc22478026b25982b714b3fcd079ed7674075a6853917d789f99628a368c6a9c6fd344d SHA512 9a6efd9203f7b96aa14c063a9de8c59e6b4bb0a5c55a64662ec170b75fc71247b7313a1252f71ab2516b4b62538f4c89778a43b8804915996636f49d4e0a6d31
 DIST albert-0.14.16-plugins.tar.gz 540297 BLAKE2B e859ff84332fe32ca0513700dd3ee099ef99f240823c70387f630877f972fccf86baab477d0ec5fe166bb979fb6509e9a3ef5e9bb04ba365e789da74d3508555 SHA512 06cefb99ec2da0ccd4ad1f4729cb5626611ba3b226ccae9c8448ad2c58e61790dfd391dcd963524762587b82739f2267aea6b2a2b7affa4c946d6ba438678383
 DIST albert-0.14.16.tar.gz 84708 BLAKE2B e901518cf36fd3a68e6b5ddd4f0937ed0cff62f9a8e541b8319670893e2a38c47d222c6e3f25a9673bd1e11ad357382a3441e55497609d049f2b287c97ce6484 SHA512 92708909ed8a91ac2c16ba967c8506a15d4cc74cbb88111761ab18941c3bbab040f5b379b8c780887024b53710b05ad1ce80ffe41bd252358daf80c19b2c953b
+DIST albert-0.14.18-plugins.tar.gz 538138 BLAKE2B baa48198aabf0d5f4ffad46ce9243a733502af93d4b10fab4fd2927524ffe80240859bce2e98316a6ed677474b7fa47cf9255641559ee76d2a760bd32c3cd514 SHA512 c8676b22fa7e6e2ebb8ad12a000402b8e41f710dcb5278f7ad5f87d1319d4eff75a3912870474a2ae153353eba607d579f28c32c6de90b60ee7761071a555c43
+DIST albert-0.14.18.tar.gz 84883 BLAKE2B 706312cc3f29aaf9309c7cddb0f22aec2324560f78ed5a5418f6984e0a037b779d38be3d607c2fe287654b02db4aa125505b0716fc431e7bf679f108fa190555 SHA512 47110ba711b76d5d202a0b42c8442a5a242ca67869094bcb31daa5ca760b05e1b0ccdfbd88d5fdf3d23bb2838e3d4efbaf1a45733ae7612b0941360c2dfe5654
 EBUILD albert-0.14.15.ebuild 1346 BLAKE2B 7a1916d46b46373c184fb7dde8748d247eefb4d95e2d04127597c97c1fe4eda6be3bb03bc9eb938aceaf3e3e01c5de4f2c357781e2a359cdb3c27371530a54ce SHA512 a6ff9c7d06c9182f9fc62de3489c8fc0b3a5172432faa0512c0e1142d004e53c58fa22adb03730e7878c029fc3eb83ac603c94feeb85e8080243b33368f6858c
 EBUILD albert-0.14.16.ebuild 1347 BLAKE2B 07b1ddacfe18837b4a0a71281d0c8cc88b88536a3014d2e6f218e0f609fd2e88598a81c017aa1d5478d7070d030ec375a04629e72834224a2e886c93a9a7715d SHA512 d37c18a94e1790d5882f7545e7b09c0afe86ac536dc1cb950cfb2f378da6944bcabad541a8eff503b88ed3d280ad6fbd82298bcbe3d89782c968da29c71b4df8
+EBUILD albert-0.14.18.ebuild 1365 BLAKE2B 7a9be1cf66e9a6dbd4af40cff2d52792805b216454f7cd5120a2ecf42a2813b3105e780f9a034979f68da01a872b0a64e7ef8f606ac45b7f5b59d6af9f81e7a0 SHA512 15e6f3e2f0013b34bfb9f1bd443c956970efa8bf0b82c475ff007300a54584b140e3f61c4a40fec502906d8514ce6fcc680d17f6e74636c2affd83c1c837f459
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.14.18.ebuild b/x11-misc/albert/albert-0.14.18.ebuild
new file mode 100644
index 000000000000..8b2d94aa9b36
--- /dev/null
+++ b/x11-misc/albert/albert-0.14.18.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLUGINS_HASH="ea3a077cc6fa6e5977441e9c49781a6925d068e4"
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
+SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DEBUG=$(usex debug)
+		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
+		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 10a0b79d2fa3..968d285f1c9a 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,11 +1,11 @@
 AUX dmenu-4.6-gentoo.patch 1134 BLAKE2B 4df80fcec2f35777ff25e0600798e1101bcc7f1c9cbbe45b59bd88cef6290d119ba45f9a53f5a54bbc9240440807fffe6a5a3400e3cfc6042651a26de5ef11cc SHA512 50e236783df1d27f3968c182a32689ddc33c45cce5c9dad91e8a2d1e1515b2e03113d0f2b9c67b0d239625198f35918b46bebeb6454ae7c2649c58b5943d4481
 AUX dmenu-4.7-gentoo.patch 1153 BLAKE2B eebeac590f6fd759a5524c2613419ef65ddc6f9c4b3f8c24ed9e734a244ae14c8787dbd67c1a6d8d4d94f09f8b6cd73f2672dd321761beba82e7425086f1479c SHA512 14e286b582895985403babc6084b096075f759e0e4a8acf231508cbf4fd5a70e95638f9f99aa35bef72e656b85642bb088f5b4052d703a2b852a787902b23e27
-AUX dmenu-9999-gentoo.patch 1039 BLAKE2B 4162428ac6451475f7213da37c01eae631678791bab72f3231fe957f6a734bdc7caee88d2c349edafcaf28b99f8b8fc49358d2dfe373bdfcf0f02b1cf1bef26b SHA512 a470b8314be5c084b33060fd851def2dcd0fbea939be91b43076a1179cb34c464f978724d65f3c3ab999e7a7af0afdb130171c3cb1d942436350b869eb98262b
+AUX dmenu-9999-gentoo.patch 564 BLAKE2B bd1d71e7e234c00a6d8b2f099b50e04fa6ba848ccd9f97e24adb69711b316a52b08632c8bdec94d60a1b4a5c38cda65287484a3880e57a3d5cbed06d28a36dfc SHA512 ecf1005f6d41244929de9e1f7a9486dc4359974bf763b522cab920cf13b65a26d8e12d3b1ddcf12b98e20d4007472c5fd6e240aa33892564e2c06b603c965b3a
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.7.tar.gz 15597 BLAKE2B d942c541a0e76d7287c85073324b0107224256d944a87f575e02238a10f16eb62d1eee06182da91242c049e3b17fa4068be72ffd1c70f6a7bbf5a0596fe62162 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 EBUILD dmenu-4.6.ebuild 1304 BLAKE2B 3ee7a6e77913cb0f56cc993a53a2e0aa6db9e672492fdcba04c3a0ae37156325f4a7a872a52fd038f8065586abb6cfc41b6f0128965c48394ea7d167ced7d1a8 SHA512 7f18e03b71c1624a8e12d3afaac86471d45fbd1112474d13c3e09f32d05f08aa70104e694e467b98f22ea7174396c682e2febefa78d4104a16dc063c421a5e3f
 EBUILD dmenu-4.7-r1.ebuild 1363 BLAKE2B 50df42df0d21c21e021dc65b00e6631f9bd5929ac91cc456e041346dfd62c829e277a1eaf8258596d3ae42dfc2ebf86898429c1a6a2dffcf976c523efb759554 SHA512 ce758035973b61c24c01d23e96cae27e519698a2230ebd5366daf8126a7e065bbc3bc300467264c6f658042834f1fa4d46839894593c2bbd6caf3054f3fc15ac
 EBUILD dmenu-4.8.ebuild 1363 BLAKE2B 327c0395748865b5f653bd983aa24a4f8ae2c4938644149f3517d700c29c8187c55abb57b104202859291bfca2b878cd3db8e7d96ed6367341a4d3acd89ead41 SHA512 ef85769d84e91bcf8ebeff02b9c58d913ba6294fca1690d536cfc1f2529b66068b887a059b3b0b9c0f512be8b45e8174bcebb88a7919b9c2a8b32375da723fc4
-EBUILD dmenu-9999.ebuild 1316 BLAKE2B 2a50e97a10ac4d108afd87bd4cb84a728426fd1d864fd4baaa2b6c5c3f99b99bd7afa1f9e8ea2d861d94138daa174301a51c35ecb714c103b4d36849ae88459b SHA512 84690f28a5a3e65b933e8340d46adfe93ddc7c08f088d4af999118b1c6d13d796b1ba80c4e22507f5be0f586a66ab355c6fa193e31e1fa535c0a24f6ce52011b
+EBUILD dmenu-9999.ebuild 1187 BLAKE2B 43bb2a12438cd4e0b025807cae79940d6af7b1b92ec23ec742d8a81b09c32a6907e1647fe2723924ceaeeae79250151a317e215c39bd58da4f85b249bb829e12 SHA512 90a387bb053d733ee3616d23e227e0620750fa6140e587eee2ad7516f8e97276b4660782c175cf94e23f7d06dc51a14ddcf9b0253a35b76e3a57688f04d66c03
 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index e55ea2292231..5cb15906696b 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,16 +42,15 @@ src_prepare() {
 
 src_compile() {
 	emake CC=$(tc-getCC) \
-		"FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
-		"FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
-		"XINERAMAFLAGS=$(
-			usex xinerama "-DXINERAMA $(
-				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
-			)" ''
-		)" \
-		"XINERAMALIBS=$(
-			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
-		)"
+		INCS=" \
+			$(usex xinerama "-DXINERAMA" '') \
+			$(
+				$(tc-getPKG_CONFIG) --cflags fontconfig freetype2 x11 xft $(usex xinerama xinerama '')
+			)" \
+		LIBS=" \
+			$(
+				$(tc-getPKG_CONFIG) --libs fontconfig x11 xft $(usex xinerama xinerama '')
+			)"
 }
 
 src_install() {
diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
index faeed310c886..75a1f89415ec 100644
--- a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
+++ b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
@@ -1,37 +1,15 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -5,8 +5,8 @@
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
- 
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = -I/usr/X11R6/include
-+X11LIB = -L/usr/X11R6/lib
- 
- # Xinerama, comment if you don't want it
- XINERAMALIBS  = -lXinerama
-@@ -14,18 +14,18 @@
- 
- # freetype
- FREETYPELIBS = -lfontconfig -lXft
--FREETYPEINC = /usr/include/freetype2
-+FREETYPEINC = -I/usr/include/freetype2
- # OpenBSD (uncomment)
- #FREETYPEINC = ${X11INC}/freetype2
- 
- # includes and libs
--INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+INCS = ${X11INC} ${FREETYPEINC}
-+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+@@ -23,9 +23,9 @@
+ LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
  
  # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS  = -s ${LIBS}
-+CFLAGS   = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS  = ${LIBS}
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+-LDFLAGS  = -s $(LIBS)
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
++CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS  += $(LIBS)
  
  # compiler and linker
  CC = cc
diff --git a/x11-misc/e16keyedit/Manifest b/x11-misc/e16keyedit/Manifest
index 36f0756b2adc..4ad621142410 100644
--- a/x11-misc/e16keyedit/Manifest
+++ b/x11-misc/e16keyedit/Manifest
@@ -1,3 +1,3 @@
 DIST e16keyedit-0.7.tar.gz 88323 BLAKE2B dde8bcfb18f6c2f2c52357b7951cefd2f3e96b272320c0991ea4a665dbadcf5026e74ac59bacdd728b9534b818c73d778a804d3bbf598d82d5c64d30dd0ca75e SHA512 6178977bd9e1dfd337717660be8102f5c3f0a6d29d4b0b1ae67a7fa9a812ab46c4fee67e52282ca38d429d16697935e25e7c046f22d7f3bb06b7b3933e6d557b
-EBUILD e16keyedit-0.7.ebuild 558 BLAKE2B 7a34d52c069934768dcdbc406983259616830b09871e679d0cc853c886a96f4ae6bf72f6ea3f18ffafe85092a89a18efe6b1772b010fffef43613ed924415752 SHA512 fbed73fc07ed7ed65d8347b0210fca5e5f29fb671855ae45cc3bcbf0416aa173ce6175044a7e09e9a67f0914afad3f65bb88c68202ef7c3efc57cec543b55cc8
+EBUILD e16keyedit-0.7.ebuild 459 BLAKE2B ab38100f74c663271be8c7588691ad20eef0bd10d566d87fe70438c619382b52a413b4f4d7c037902ae1d8bb6c4bea07ba187795317a56b521382969c0cd6cc4 SHA512 d4de07f9076f740c151d066120e1d47d7ffe255a31bbe627b362cc678eb2c75c2551e1f532c7b43d81c5b7b8090e7d5ce9997acd3b8e991b51a145dfc9724308
 MISC metadata.xml 355 BLAKE2B ee02369040e2c94e11922137b3f49c596f63c2ffe8a5ddf776b750f38800a6cfd18a6810403df276a6915e4e7ba19c1b4ea4d540265af3dcad163670481e02ad SHA512 734fc27afcce73c91e7bb00d3809a477b68d92b00a95a9b3dddb5f95ad5786799832b5932cd085ebf0b071879973bd4816eecaf31f869f794d50830eb82f7307
diff --git a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
index 77ee2bbb1a43..922f01990443 100644
--- a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
+++ b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Key binding editor for enlightenment 16"
 HOMEPAGE="https://www.enlightenment.org/"
 SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
@@ -14,12 +16,6 @@ RDEPEND="=x11-libs/gtk+-2*"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_compile() {
-	econf --enable-gtk2 || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc README ChangeLog AUTHORS
+src_configure() {
+	econf --enable-gtk2
 }
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 847c16f3d461..15272b7ba810 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,12 +1,6 @@
-DIST libinput-gestures-2.15.tar.gz 11468 BLAKE2B cdcdea40a00eafc84f0a42a7f050c5f484c742c07ad008507881aca19296c93d9e486944d381e94240fd97e1f4740d2a2ba956e8152c1cbe2ab69c0685cf258e SHA512 b0449ce3355e700655cf450b62e239566f2a49127bb4afeda659e04026657d86f13dbfd101399428771b92323e6c55cf40f75bad79025ff80eb9003d85345c23
-DIST libinput-gestures-2.19.tar.gz 13031 BLAKE2B 0f34b0c66ea30cba789cad0f3e82cc9756d48ba6769c63a04d1983f49695e7953b8f60fed3c640e505458ed54e3fbca93be0b9c65fca746c52a13b17f63ed4a2 SHA512 d67e5180e89dd1032fc16be6c6bb8b17f413bc41ebf2d92735fa444b23b5001ae37e243d1089f96308ea22a015b38c066ad8ca2a8f33feea247a51d6bf049d10
-DIST libinput-gestures-2.26.tar.gz 15016 BLAKE2B a61404a6e09f24b6919e1af627eb18c8572195fa1b6a5316dc1e02cb8dcd9738e2663833ac5aa9a372100c1cd3a492205aad8d5e51e592f90db3debd8d79d957 SHA512 375c457c04f74d140693f6db0594b38f09c1a60eec89fa6e4b6da9b1d8d62abe42cf9e1a74214534f2b2f2a36d323521860bea722045b467d6bf2720a9c8c772
-DIST libinput-gestures-2.30.tar.gz 15462 BLAKE2B 35b0dac4c729beb3e10830f8344012f7ab181ad0af68eba65ab5d4c8543dc6c6b636be004ee7faf3138f651fae726d50d0052854b2fbda41cc7cb035deac7e4d SHA512 846e069835eda2c5a36aeafaed3f94d792a0227838622875014f2021531d9e08151900f3cf2188f8edf013d310e2444738d8deea525486349bea6589d09ccce2
 DIST libinput-gestures-2.31.tar.gz 15872 BLAKE2B 0fe671f50ee6e7b06362591d68d259587347794c80df27c73d833e459eb9499ae919bf3e4f12e1dfc2852fd9b70c3962963f3a291107bab8ea0a8f1576dddde4 SHA512 fc3c90025486c8da5b2419f99666737dca40dfc962a549bd1955ea792137a1377a9697c8cab908991503fa9dd6d72520a04ac2dbc9463bc228566569be43ca67
-EBUILD libinput-gestures-2.15.ebuild 759 BLAKE2B b501b62c0e471b403ab713bc8c48599152347669f62df632192f41da6d8d307c6c95f60f25e8c561bd7e243964b35dbe64131d767dab1976c84f5ba32f020547 SHA512 120065e75ee119865923e4f1bd05d960c457971802100fdbb7e34ba755574ec5ebc1677649e8ef15a7989c46cef67956b860789fb5073372f41ba0f1d44ed451
-EBUILD libinput-gestures-2.19.ebuild 759 BLAKE2B bc1e7bcf80e47b317d80517008f18bc6ace0d0c1bd1badd5a6c7af4ed10fc28a181c22a8eab049293a6d003cb1c0383d2d064f91d42f07cf68f812061f566839 SHA512 351167d64286f3024fdd49eb4b96d587c588113ae7edbbc99c738d634ad87e49a9f6400db198dc3382f041711e02662edef81f12b3e0a3e57f9383fff1e92f93
-EBUILD libinput-gestures-2.26.ebuild 779 BLAKE2B c375406ce910a6f6a80ed73782cca048e9d1fde71dfe9e18eb1706573c6e2ca99d36dbb3084ae1d95718f48da666d9f5deba6c2b676db43fc7b00c1ce08bc807 SHA512 6213d21385271e59ca451702f9320503dfaafb090a7a3404131c4d4853856f0a551db966e48d7ccd520d9da64580c05d6d4a10a70dc5c35c79dd87dee47336fb
-EBUILD libinput-gestures-2.30.ebuild 1005 BLAKE2B dedabe01ea832b21b2130222249d9821b418293d6381bdfb47cd8ce624254ed97d0734c455784bb4fc1918f120a39b116eaec5647c56dc33f8a6fb27110c0614 SHA512 1bea80d8d4f9b6612bbd5829e8ee433cab015f709e863f08b97ae3e91aa330d7de29b77ed9f1d300241e05745146252ec6b725467a28dad9ddac711033f4b6d0
-EBUILD libinput-gestures-2.31.ebuild 1005 BLAKE2B dedabe01ea832b21b2130222249d9821b418293d6381bdfb47cd8ce624254ed97d0734c455784bb4fc1918f120a39b116eaec5647c56dc33f8a6fb27110c0614 SHA512 1bea80d8d4f9b6612bbd5829e8ee433cab015f709e863f08b97ae3e91aa330d7de29b77ed9f1d300241e05745146252ec6b725467a28dad9ddac711033f4b6d0
-EBUILD libinput-gestures-9999.ebuild 986 BLAKE2B 97abbaf3ff5bcb6ecc3fde720ea2fe75de7ae56c711c5d279728f33390a6adf6913fea8bdb2c086a5104f46eb63b23d1753aa43ff727c4df7544e0ce2e8c6e77 SHA512 38102dea2f745286b6d13e2d4a5dfad88a725f4363b56c150c43cb3078b4a39d8ad4ed7294603d047cd1fe14cf2774b80b32ab5d271cfb6ccc9d4b7c7c3b4dc9
+DIST libinput-gestures-2.34.tar.gz 16321 BLAKE2B ae1fc850a075fd0b8e4aec6b94f0257f10f309a28a4893aad608eff59afede28b4126734a14f510ca569f64d79492461000dfca8c34e614a5e99839f3c5d952d SHA512 47ffa36b9abb01e62a046d1135cf3ec2773285f94ba68d66c03f877b6acf057491fb4a7645198d8c3bde39e38e12e039f3b10c6987d5765798d969d23359269f
+EBUILD libinput-gestures-2.31.ebuild 1017 BLAKE2B 611b39ec192cc040fd79ef4d262fc15ee31515ebafa478d1a406f64b4da6d32679945d5e0554df832a73cc7ed19c1cc41e830205f3fbced34f40c54f44542a7e SHA512 26486d673e801c4af689661765eca932cc46bf1abc68f67038455ccdeef036bed0ec579bebf3bb6abe74f8daaf12df9772d9e938bc70de314fc3a23fd68ec9a7
+EBUILD libinput-gestures-2.34.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
+EBUILD libinput-gestures-9999.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild
deleted file mode 100644
index 98e1c98335ad..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kde gtk"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libinput
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND="dev-libs/libinput
-	dev-util/desktop-file-utils
-	gtk? ( x11-libs/gtk+:3 )
-	kde? ( kde-plasma/kde-cli-tools:5 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_postinst() {
-	elog "You must be in the input group to read the touchpad device."
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.19.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.19.ebuild
deleted file mode 100644
index 766fd4ddfc59..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.19.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk kde"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libinput
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND="dev-libs/libinput
-	dev-util/desktop-file-utils
-	gtk? ( x11-libs/gtk+:3 )
-	kde? ( kde-plasma/kde-cli-tools:5 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_postinst() {
-	elog "You must be in the input group to read the touchpad device."
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.26.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.26.ebuild
deleted file mode 100644
index 5f7ead386f54..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.26.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk kde"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libinput-1.8.0
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils
-	gtk? ( x11-libs/gtk+:3 )
-	kde? ( kde-plasma/kde-cli-tools:5 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_postinst() {
-	elog "You must be in the input group to read the touchpad device."
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild
index a9187de1a09c..abfc20a74249 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit python-single-r1
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
+HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
 SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.30.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.34.ebuild
index a9187de1a09c..39fb049c736d 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.30.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.34.ebuild
@@ -5,15 +5,20 @@ EAPI=6
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
-inherit python-single-r1
+inherit gnome2-utils python-single-r1
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
+else
+	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -25,7 +30,16 @@ DEPEND=">=dev-libs/libinput-1.8.0
 	dev-util/desktop-file-utils
 	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
 
+src_prepare() {
+	default
+
+	# Fix docdir installation path
+	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+}
+
 pkg_postinst() {
+	gnome2_icon_cache_update
+
 	elog "You must be in the input group to read the touchpad device."
 
 	if ! has_version x11-libs/gtk+:3 ; then
@@ -35,3 +49,7 @@ pkg_postinst() {
 		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
 	fi
 }
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index 17387ae8a397..39fb049c736d 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -5,16 +5,20 @@ EAPI=6
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
-inherit git-r3 python-single-r1
+inherit gnome2-utils python-single-r1
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-SRC_URI=""
+HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
+else
+	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -26,7 +30,16 @@ DEPEND=">=dev-libs/libinput-1.8.0
 	dev-util/desktop-file-utils
 	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
 
+src_prepare() {
+	default
+
+	# Fix docdir installation path
+	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+}
+
 pkg_postinst() {
+	gnome2_icon_cache_update
+
 	elog "You must be in the input group to read the touchpad device."
 
 	if ! has_version x11-libs/gtk+:3 ; then
@@ -36,3 +49,7 @@ pkg_postinst() {
 		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
 	fi
 }
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 4f76b926c930..6f66c52d4502 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -6,5 +6,5 @@ DIST lightdm-gtk-greeter-2.0.4.tar.gz 566819 BLAKE2B 21b11a12e2af82e5548a72617da
 DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3ab4891a119f1d416c8011a80d06e1916ecb5903f4c1af432052cb05a72aa38cde38293dd90eed00295fec5ff758e78576e10e SHA512 1ae31a36e19a2e8825bb0bfe4eef51f317306636bc0f14df9ee4c89c81d60ce7193d74e053ce59ae50c6fe05d27be73fb5a83cce732a0df4a3b4390539418fad
 EBUILD lightdm-gtk-greeter-2.0.1-r1.ebuild 1794 BLAKE2B b2d0c60a37398e03020c45919f8f0d759500226b048ef9d95832e61ec6623ed6dccec7a5debbe735ae36d60a7ede626b82d6db3c8890e59752d223457a9525c8 SHA512 00b4731815c52b6051ccdaf9246bd618747f33ba7c6f648596c0c53d61c5dfdabb84fdc4b0ad11782f7423965de9fa4a04ad543c45cf7c8e2c9d14faf35c7d01
 EBUILD lightdm-gtk-greeter-2.0.4-r1.ebuild 1996 BLAKE2B 636c4b4ff35b636c65558a9c6c0396f1141e1d452077f1661f217c551efa8f1dcb6c654b79060bb9f1d1a116f90e0f90e03c981c5df896fe4a265ffc8ef5464a SHA512 442bd92e1e239182357831e2581f9063edbbaf1e674b8d72979dd6ea8106078ee2ac17a8c13d32142525051eb992d44118f8fea06549b27f0d7fbd9f484f7910
-EBUILD lightdm-gtk-greeter-2.0.5.ebuild 1996 BLAKE2B 636c4b4ff35b636c65558a9c6c0396f1141e1d452077f1661f217c551efa8f1dcb6c654b79060bb9f1d1a116f90e0f90e03c981c5df896fe4a265ffc8ef5464a SHA512 442bd92e1e239182357831e2581f9063edbbaf1e674b8d72979dd6ea8106078ee2ac17a8c13d32142525051eb992d44118f8fea06549b27f0d7fbd9f484f7910
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2092 BLAKE2B 0e8ec3cbf51a55d14bff6b2a2b5a86745ea3c1906c73fe856429b8fbfb03a7e9af1b508edf0411955487f54579a5324b77662cf2f44f11daea44c479c4340135 SHA512 5b7bbe6a61ad4b689397d1cbbeca0fec6dc4ba5b9092b0863b83df0b7c48d12274fc3f7a302d0a2beeb9d51935d0b0878791e7874775674d4064dc585b11639c
 MISC metadata.xml 337 BLAKE2B 3c65fc50a54a761aacd4a8fa45fac5867cfc1831f596d6cacb9b84f649ef3b4827647c8f57590a16a5075ebfccad378b552fc2dbb07190ad8fb7c23ae8c84e34 SHA512 7819a26eb1d16acc0eaeb89c43ae27520ed527e4bc3166e3f5e582cb3c693cba07270e0864e2c57dfc005b4f27cae2b9bfad3f83be24990b6ecb1d0049c5efe6
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index 248aa5ef01e4..58691be1904c 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit versionator gnome2-utils
+inherit autotools gnome2-utils versionator
 
 DESCRIPTION="LightDM GTK+ Greeter"
 HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
@@ -46,6 +46,10 @@ src_prepare() {
 			>> "${WORKDIR}"/${PN}.conf || die
 	fi
 	default
+
+	# Fix docdir
+	sed "/^docdir/s@${PN}@${PF}@" -i data/Makefile.am || die
+	eautoreconf
 }
 
 src_configure() {
diff --git a/x11-misc/lineakd/Manifest b/x11-misc/lineakd/Manifest
index ec068d8c029d..617ea52e71bd 100644
--- a/x11-misc/lineakd/Manifest
+++ b/x11-misc/lineakd/Manifest
@@ -2,5 +2,5 @@ AUX lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch 795 BLAKE2B ebf8e451208c38cd77ba
 AUX lineakd-0.9.0-gcc43.patch 772 BLAKE2B 48346e5d1a3978be0964dd6844991c58da30a036fdb12bec9b1970c3aac9d130f81891e69ed59ef772ca4b6dbfbd71effdc2556b800f6008505322c8aaa67c91 SHA512 0ade361637b26db613c5a3915d8b364cf14eda14eb744618c03440ead5f0774f853dba7c0518432ae4f872e201d5bb0503fa7e4b5eadd71d049adf5b654c8407
 DIST lineakd-0.9.tar.gz 991376 BLAKE2B 70c19d446b814562a4d9efa90b4492cc5a3fa63c8d252e6e2bcd418c1fee177924e61ec7ebfb0471fdd18eee5f7f3e4ed0fda17bff5b216cad9caffd06d68783 SHA512 e30a2e111832e3f08bbff858647536aaeb75d20008618b8c7555836104fd5a66d8e3173d0f9da76906caf13e9c9753c9140cd22dbb96fde464ed5d5f254d721e
 EBUILD lineakd-0.9.0-r1.ebuild 1214 BLAKE2B 0ade68aaddb816c872e231e168da1658388943d8ba5a1edee81eaeb1bc890322d831d48cd62d91aa19b7a2124ad39b389efffce0597275a4fa88813e3c61ab71 SHA512 7d4192a6fbe53f4f4e94d4a8902b6bcc82afc7324f9ceb7ea7d73b9a9d47fb7b7ae36bcbe9708f829074ee29770bca9f5f0c22cce838a12d7fdf44d4dc22fa18
-EBUILD lineakd-0.9.0-r2.ebuild 1098 BLAKE2B 6a60f3612ccb047e54c45b399e12cd9c0c6c99be5a897e22965582c5413d16c0d288595b6d31529f01de78865843cd441badc78709195743e5414e9aa6cdbf6e SHA512 26e6c49894f699f3bb02c84795b0bcc3a085919ef645536ad67b287dba895db69a8990a50a6f48011bd0213f5c1de3b837d0f2456a63b6be508988eeea5b0446
+EBUILD lineakd-0.9.0-r2.ebuild 1097 BLAKE2B ce2dd5cb3897fb3ac96dd239d7569fc28d62ca52694c81dd0e6ebb7468b5b1f024b260bbeeaf66bdb22ed2ce7a376c7d063ddaa4bb0eca4bd57004b931cceb77 SHA512 2a3fdfff3c775ad1d3efacc744725d92ad3c2261ffcc055b232083528978cb8b7148365410c66d34a19f99c7279e62bc0432303d3f2f605fc0a5fcec8b46f0d0
 MISC metadata.xml 352 BLAKE2B 4110d9b5e116df93d0d52f464d392dc4b55d95615b20db7c92e8792ff684e60c84ed9c9703272eb7ce70688de54ce1943c99d90b2f6d81ed8342898fbe710346 SHA512 1abdaf434e7034702a0dfceff233083abc0bdaea90e215687ace13b6d005502da7193794cdc7beda708e741c5562313b93fd41677fa07d4f68bf8ef7cfa81939
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
index d14a5e0265e8..2d09ca519372 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index c509767db487..6e31491ff54d 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,5 +1,5 @@
 AUX slop-6.3.46-fix-build-system.patch 2274 BLAKE2B cec202a664d3329d7354f63d20e5a197363296d1506e46900ae51d542bc44279ac62fb9668dcaa2cbade49688d210f9fbac7cbbb706feb5382921536b8471c2b SHA512 344396f7cc8c60f09647c434b78183264dede5548e243df3408f46486f489eb14353fa770ba1f604f604a15417a92f84cd51c561b7026b74b854d8ba7d02cc67
-DIST slop-6.3.46.tar.gz 89391 BLAKE2B 0150ca63e4a598e892abd5505e867f01204f29796dc378a7f3d0c041c1a27f000e98962c41cbf8109573575b37449c1869f29f988c5d2046b504382b2a56779d SHA512 9f44bbb8e14e71a17858711d8da902cb9cf5dc65ed47284be15122f2d1793544deab7f0700517bd07e44613662bfbc7f0991f3d36dcf74af6f90de5fbbd79558
-EBUILD slop-6.3.46.ebuild 601 BLAKE2B 769a13a66a24a8067fdafbb6d3cce48090d4193fb40a14a98cd56d1d4d331e642ec50e601b8944e7276037e07cd52b27c0cb0b79295820c1305f63c8601f3051 SHA512 e96b0e0d8f2562f40a8770980dd46b0f7bbce5588b4fb1cb7d62c88a10fa9ae5880d40918db178f5f4ac5ce6c46957a685af528f795009c8094375738308fce4
-EBUILD slop-9999.ebuild 835 BLAKE2B 61cb3e26bd37c07451421c20765ab2b1b9ff518b8f6482a39a36dbd907eb22cf1cc892565355c478a7defd51d9cf3707150ada82fb6aa261875d265c88924f7d SHA512 a00c371cfabfcf239e37874dbf9b140ced681a25aaa78ffd9a11c65405826548752ef5f8e59b3bd0e49d783e371eebadef4ee042253cf8b657e9b8f040b2610a
+DIST slop-7.4.tar.gz 50079 BLAKE2B 20815270bf1bffe0ef26630fd31d0d4cc7261633cef389e64c232a89033b6e8b5e1651fb5c882e2870808107734c4c088123b85675fa2aae932570d770344dc8 SHA512 13d09c2c9f05760ee0a273edb6d40da8a87989d3f071a8c868a0c7e535ba89b9eb934c79d56212cd689687f86e3683cef1b749ef7b37be3805ea8eb05c796e58
+EBUILD slop-7.4.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
+EBUILD slop-9999.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
 MISC metadata.xml 630 BLAKE2B dbf7d848908c12d7104c7cd18cd2ca16114073803bd4600e10906a1fc4f86ddeb646359d26885551d998a279d1e11f0d74ad21b135e14a2bea827ef21ade15f7 SHA512 98eea5cce0e8a692076b5cb423a2f0522151d716ef0c9f346e915bfee8590d32dab59c183180ea7f87561bfb92e3840ad710f890a734640173bbcd471d779b0e
diff --git a/x11-misc/slop/slop-6.3.46.ebuild b/x11-misc/slop/slop-6.3.46.ebuild
deleted file mode 100644
index 796bb1f9b9dc..000000000000
--- a/x11-misc/slop/slop-6.3.46.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An application that queries the user for a selection for printing"
-HOMEPAGE="https://github.com/naelstrof/slop"
-SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/icu:=
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender"
-DEPEND="
-	${RDEPEND}
-	media-libs/glm"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.3.46-fix-build-system.patch )
diff --git a/x11-misc/slop/slop-7.4.ebuild b/x11-misc/slop/slop-7.4.ebuild
new file mode 100644
index 000000000000..a61629c541d3
--- /dev/null
+++ b/x11-misc/slop/slop-7.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils
+
+DESCRIPTION="An application that queries the user for a selection for printing"
+HOMEPAGE="https://github.com/naelstrof/slop"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/naelstrof/slop.git"
+else
+	SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="opengl"
+
+RDEPEND="
+	dev-libs/icu:=
+	x11-libs/libX11
+	x11-libs/libXext
+	opengl? (
+		media-libs/glew:0=
+		virtual/opengl
+		x11-libs/libXrender:=
+	)"
+DEPEND="
+	${RDEPEND}
+	media-libs/glm"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSLOP_OPENGL=$(usex opengl)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-misc/slop/slop-9999.ebuild b/x11-misc/slop/slop-9999.ebuild
index 1d4abcaf3e88..a61629c541d3 100644
--- a/x11-misc/slop/slop-9999.ebuild
+++ b/x11-misc/slop/slop-9999.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE="opengl"
 
 RDEPEND="
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 7a44e0c0c1c0..3bfa9a57108b 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -11,8 +11,8 @@ DIST synergy-1.8.6.tar.gz 13497043 BLAKE2B f74f6d48203bc49d7a74cf2f951ea506a1887
 DIST synergy-1.8.8.tar.gz 13498599 BLAKE2B 40c52ed036ef21594d330f1b4e32b647bdb3076147d40f2437f649a54700cb4a7822137587c129f9bede26a93e872961135ee27dfb3b8f4256153a5e982737a1 SHA512 b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6
 DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
-EBUILD synergy-1.6.3.ebuild 2411 BLAKE2B f54b04049f2b5266a7ba8a626505b224e55055a3deb49e1700d376306d0fc6ab79ba33e39aed7b9aadccdd39f7e13358e78bd82ea3528a8a2cc8128e2126fc9d SHA512 d4786305b14787df6f98980941f142bbf794c6d69ceff56ad5c8dfec39084b46b1e8fdaed0ad38538ec4a1ae215e24a573850b546627844e6129e090821164ad
+EBUILD synergy-1.6.3.ebuild 2412 BLAKE2B 4ca64747eca5280decc5e74d153f8ebfc3048e8c2ac2ba2f01d916a71905003b0a96d031aa557af22af3ae7fb036a87e889f1eaad6cd6ec309e0bf41841cbe12 SHA512 9aefd0f61ad9a40b11c97d0821dc7b1640d48ef8028ca18bd69ddbe655ad9c1e3f9da1608b22525d7c6dc2d3803d23b0ab687ad702d8829c4427e3e56513fc91
 EBUILD synergy-1.8.6.ebuild 2260 BLAKE2B bf5c5e1b68f5b2c352b7e9321859f718475c0af20a1172f5e7a2f47029831c2459e3800cb1b9fca7b4503734c8a387f133f873eb2af48ca674ae9093a12ce7f6 SHA512 9df3c38dbfd69f202e7807a45ddb27d370fb98bee63569101c6e784aecfe7d0a891f3b20e2ac877c677a2a4f9902bef38fdec01636ad9aec96ec0e47d9e7af10
 EBUILD synergy-1.8.8.ebuild 2220 BLAKE2B 08ae66225fefd47b405db383241937cd138ba8edb3842385237f1581b3ee9ea3c86b2620b2c77f99e3e58b45bc1fcdbfe7177adb787f5b86c0fece5d7d4f377b SHA512 3e60699cec7c71626ecbaae3c7d3fab34918a1340fb0f63c25d731398919339597990c25431b1b28efa746313c27fa8bf0a6822f1fd87a8c4a30f94034cf025f
-EBUILD synergy-2.0.0.ebuild 1526 BLAKE2B 5a36366f8a9a0d1a47dba57e195489bb2a0d6df1c40dd3e77e8836c0161538058741155aff638fa17473452594aeaa65fde0096de7dc09aae691d8912420e79b SHA512 c4240fb956051750a15d5e49b6cd6a94885a593de3e9491fe25a6e10aa85d34995b5578a0f2c206476cd34aec8fa88625c87de51a34d45b8998d0f60ded1aee7
+EBUILD synergy-2.0.0.ebuild 1525 BLAKE2B 350eab710ba71bf5ae7f1c25d4a9830c6eeb5500ef306fae6628c9fefb02e441b3f54ae0afc815025c8ac4b5389aca56db55309d5409a2ca4fd001c1bd7c021d SHA512 312e7107eccf03ad4022c9e6d28bb2b6c75ec4594e8585cf1bd27badf52d496fd9096a97fde4f5104486f5abe7aeed7c2bd3eaa1b4c52294a7f4510de3115038
 MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
diff --git a/x11-misc/synergy/synergy-1.6.3.ebuild b/x11-misc/synergy/synergy-1.6.3.ebuild
index 50182237b940..ec6ab70007c5 100644
--- a/x11-misc/synergy/synergy-1.6.3.ebuild
+++ b/x11-misc/synergy/synergy-1.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="qt4 test"
 
 COMMON_DEPEND="
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
-	test? ( >=dev-cpp/gmock-1.6.0 )
+	test? ( >=dev-cpp/gtest-1.8.0 )
 	x11-proto/kbproto
 	x11-proto/randrproto
 	x11-proto/xextproto
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index 331de8b07877..e39361604e42 100644
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl"
 
 S=${WORKDIR}/${PN}-core-${PV}-stable
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 7451b56e550b..0e2046741521 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,4 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
 DIST xdg-user-dirs-0.16.tar.gz 255933 BLAKE2B 827e1ec8265592cc2abe4861945fc0cb32ce777fc951df3a00e4f7e53f53f49e1c57ae242c6d3ff62eacd75ff7965fbb482aa4f8d2b4c2aece3b535e3a83ee47 SHA512 245513d1b16adc970b4a3c0b4a078cdeda62d36b39e4561754d8331e76ee0013a769d8c2e43c94f8b5c378619ee58bca534721a8675ceaeccbb3fdf69cf6f7ae
-EBUILD xdg-user-dirs-0.16.ebuild 959 BLAKE2B 36080eb6514d9b536481282d200d632e0278b4b7b6e07d565929510229048ad243c8e36a0665eb6a67119a0b649c9ce3ec1a6edb3b2439ca867de63b2b72d4bc SHA512 48190c1c871cc07cb546ff8a3945ef49561bfa3032e214916aada73a68e7d9ab69d5f340c551a3b600b03a5398d9c61c1e53af17c1df18ec9650802e89ec0a55
+EBUILD xdg-user-dirs-0.16.ebuild 958 BLAKE2B 8bc39473a803fbdc008203ac14d524b3052920a2477dfcbcaa152ffa229712a149f5f4653817482582bd0a69677e49c70ba7ae0d22605e6c483a01d0126f7d0c SHA512 b3bd6a03aa1a11cfb3303cd94c3409d9b4dff9507015a014c60b4e35905d42b3679d1d02d8ad2e31d15bbe80760cd454e0e4f178e56e4eab220faad783398c37
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
index 95cd41166a69..2fe86c80de66 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xrestop/Manifest b/x11-misc/xrestop/Manifest
index a59374d2aebe..a7b5bcdd0dcf 100644
--- a/x11-misc/xrestop/Manifest
+++ b/x11-misc/xrestop/Manifest
@@ -1,4 +1,4 @@
 AUX xrestop-0.4-tinfo.patch 291 BLAKE2B b96d892c87a8133987baa94e5cb4917bc5d743c24ec11a2ec67afafc7206654b88c17f54377f2d1bf0c9fb92df8de16c99e4d0f9a15ff80a9417da2de31bc6fa SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f
 DIST xrestop-0.4.tar.gz 92308 BLAKE2B 5bfe6e9ccd49038e7884be8379e79f3de2bc960588dc21fbbe40d2acb89c6505efd78a9415e0ba8feb24986f11f066ce641b9c933f241776bbc1b3e59fd520f0 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6
-EBUILD xrestop-0.4.ebuild 657 BLAKE2B e7d3214b597af1e6ad63156d2194772219277f7df0ebfc07d7070dd64e877e821dc4cf0255a8b737f6973239b059bddf0b976a8b01f47acd44059001ec23e9a8 SHA512 f02ec8026181ca1dd6404a45418b6c842269e522e9218719ba0eb6d24be08f0607a6733c098e7c21cbdf968b517ce6c4bf72f7a5b427784b29ef3b614ed58965
+EBUILD xrestop-0.4.ebuild 664 BLAKE2B a5dcfe1994b1cb191ba6500de9f5d4a2fdad7f54d879ac884e13fdd31ad3afc9d3d8ab8aa120478e4ee84e3cc8bc3e1b4f0a79ca1b3a966c017d02c8de496332 SHA512 7484fc5c3eeaebf020f056b40e1b1f68b15f7a8c70f7c20eac3db89997b56ea6f1dbc5a0038eea569bcf5a1b850e19e36a85d423d0e11f583250603d5a3ebb80
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild
index be03d09d0d16..4ddbab73daf2 100644
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-misc/xrestop/xrestop-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	x11-libs/libX11