gentoo resync : 21.01.2018

20 files changed, 165 insertions, 172 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a57b08b5eae4..ee45894ea9c9 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/basqet/Manifest b/x11-misc/basqet/Manifest
deleted file mode 100644
index 836e57393135..000000000000
--- a/x11-misc/basqet/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX basqet-0.2.0-desktop.patch 251 BLAKE2B fd7fcc7232fd8c07f07d3f8b681153b84e06ee0d7a77b63341aaba513b3552320389fb3d850eadd6d0e802c0f3da5f6d7d6fde175c8c4d09b7487665b516def8 SHA512 4418f86cc7c62c8992bf348de2b25b73d391337b95a5e4ff92729971609ada9ecfb2765f1a80fc3d26742992937393472fec377124ca06de4aae1814197c1d47
-DIST basqet_0.2.0-src.tgz 471700 BLAKE2B f4a37b17085826e4d50934491378ca0d8fac41b8abe4a623cefe678dc90935474d039603c77e80b651934b28c737a3bd220bfa8976f438e4edf0564291d2b0e4 SHA512 4153105f73161d02df611d9adf87508b0b35a6be95bfc3b3854319b9e38fa89ea12bcfc68ea186b21d7fe91c7f0a4e82d949eddfebff415b55c5f7f687df83e8
-EBUILD basqet-0.2.0-r1.ebuild 652 BLAKE2B 419ed0c3c4fe53f957f8fea9f40a8792bedeccf5ff228b3698aa33fa15238646212c91a2a56af3d208362f8e59f031bf9b2b1caf7af3e9f99ce243a490b38c9d SHA512 cf38194e7a4244e72b89160511a9f9c05412205975ac1f044c047e24ae2adc98c884deff1e2663d71016aafe1f6967bfec17e8b2ed6cc0af548377a630125219
-MISC metadata.xml 381 BLAKE2B 17023fe578cad2454b2da77c689c57b89d87b98d7ad7f8754777475ab842c7e44aa6435f2319bdc00e48ca83b17f6a4833b5576c65839014ece6c605b398d065 SHA512 c9e2dc6ac67dcd2878d0c39482e5d4c85789354178aae017d578dbe4e9d07d3aba673a13e7c67ec3b83ead766c6dd853276bdc9dccfa173e8198acb49d82a703
diff --git a/x11-misc/basqet/basqet-0.2.0-r1.ebuild b/x11-misc/basqet/basqet-0.2.0-r1.ebuild
deleted file mode 100644
index 3dac0761f60c..000000000000
--- a/x11-misc/basqet/basqet-0.2.0-r1.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
-
-inherit qmake-utils
-
-DESCRIPTION="Keep your notes, pictures, ideas, and information in Baskets"
-HOMEPAGE="https://bitbucket.org/ridderby/basqet"
-SRC_URI="https://basqet.googlecode.com/files/${PN}_${PV}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/release_${PV}
-
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/x11-misc/basqet/files/basqet-0.2.0-desktop.patch b/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
deleted file mode 100644
index d0320a6f6377..000000000000
--- a/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/basqet.desktop
-+++ b/basqet.desktop
-@@ -1,9 +1,9 @@
- [Desktop Entry]
--Version=0.2.0
-+Version=1.0
- Terminal=false
- TryExec=basqet
- Exec=basqet
--Icon=basqet.png
-+Icon=basqet
- Type=Application
- Categories=Office;WordProcessor;
- StartupNotify=false
diff --git a/x11-misc/basqet/metadata.xml b/x11-misc/basqet/metadata.xml
deleted file mode 100644
index 2e46c1d05256..000000000000
--- a/x11-misc/basqet/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">basqet</remote-id>
-		<remote-id type="bitbucket">ridderby/basqet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index ee2f92b9757f..90bfe188bb63 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -6,6 +6,6 @@ AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.18.3.tar.xz 503968 BLAKE2B ec1fa0a62880708d223da972b3d9c2f2961e3e8f8baf6da9012de98818b27e0bc0e37cb6f460a25821779d83e9da1cd632484ad75ba95cb26cb9d23254600024 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234
 DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5041dbb81ceaa59c4296b2e4b069f90d9f09a4289376cb34e11331c39740f4e5370273d1315c75a9a35bd01cbb0 SHA512 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8
-EBUILD lightdm-1.18.3.ebuild 3920 BLAKE2B 9a4ea6fc82f58f947ba07f91a7152e4bd4b84b531efc8bf84ca1d8763034cb3cf2b2375b5f5120f2802b3ad06ea7abc5d26a91a449dba78273efc9a33340030e SHA512 5036bdf80315812097f920a67b7e1918c2f9a6ade4b5822ceabe40c33c4fbdbf38020546b3249671603d55c176aeb37e39420e850812ffa41052bddbb4b91790
+EBUILD lightdm-1.18.3-r1.ebuild 3843 BLAKE2B df02964e4d7dda106cda753c5e818f693439451fecffd80d90ae528ca50eeb9a1f631183492c3b94b790efcc475a09230a1d826af7d5b356009a50b36817428f SHA512 a27e900a20d647a314bca9bf0c43ceac843906319d82ad54b471d37ebf6b83286551ff2b38285d8211606ddaff136955b487e39cbf8436c41bdca2056629af5f
 EBUILD lightdm-1.24.0-r1.ebuild 3808 BLAKE2B 3bfcf409671d5100ccb2f69d041685775884ea616204e55a0b8a1be605d0a055354b70ef65daf33945e193025dd7358c3ef33686c2e3b20a4dec497ea24149a2 SHA512 a35fddc94af5527d74839969034264c388c0204b204b9448adb700fb60dd93bbbcec2b1a8de32c7fe59fe69127ec85ff99b877b6a29c38ad22a482b8c69b60c0
 MISC metadata.xml 391 BLAKE2B c6a14fded4791158cfe9c26a70c9c4de8638ab6e9ad1f683cbf94a522f456f36f0aaf2db26d88ac9dab5bf7818d18d4dbf793ef7a6970e91f16e9642d8cbc91b SHA512 c3856bf443309731ef7ea0d849f76219f69552475a88e5c5fb54ca73f30f223da44d2f4eb6d37cfc5f305757c6654573f3d639fa87818318f7afa4dc57dce466
diff --git a/x11-misc/lightdm/lightdm-1.18.3.ebuild b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
index 549dc488a540..cd5bfce7b439 100644
--- a/x11-misc/lightdm/lightdm-1.18.3.ebuild
+++ b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.x
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
-IUSE="audit +introspection qt4 qt5 +gnome"
+IUSE="audit +introspection qt5 +gnome"
 
 COMMON_DEPEND="audit? ( sys-process/audit )
 	>=dev-libs/glib-2.32.3:2
@@ -23,11 +23,6 @@ COMMON_DEPEND="audit? ( sys-process/audit )
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
 	introspection? ( >=dev-libs/gobject-introspection-1 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
@@ -94,7 +89,7 @@ src_configure() {
 		--disable-tests \
 		$(use_enable audit libaudit) \
 		$(use_enable introspection) \
-		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt \
 		$(use_enable qt5 liblightdm-qt5) \
 		--with-user-session=${_session} \
 		--with-greeter-session=${_greeter} \
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 13399baf7d08..e4f6f60183da 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,3 +1,5 @@
 DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
+DIST menulibre-2.1.4.tar.gz 414546 BLAKE2B 4c6420e6559415dd4be6aee37af43f820f85bb5d98ce4c3b475d977c1511d4ad30f1fb3db8aff94569a3dc0afa4d75887bed8247cd8d48c673bcb106cfa11b52 SHA512 48322d7187d77a63253ee5d8d269b473e36bab4d02f1442b8e4c66070d372e3eba4247b923932688640092e16d51ea41bef42571694980099c279a3526b9e56a
 EBUILD menulibre-2.1.3.ebuild 1726 BLAKE2B 25f6a035bb3a32ff4ec22a6c0147c0b4c6e23501d030a5620a9068f223d17d34f70a09b3b27fe68dbd9ada6a2183d0c57aac7261c065ac033ba1ca0d61cc50d6 SHA512 35b0a13f101aa205ce6fce26f345b46d5fae1131e4bce61caf8630bbc1109f7e4e353da300e83b921c5edf33421b9f6d3951de38bf6c38baeb3e546eb14551cb
+EBUILD menulibre-2.1.4.ebuild 1728 BLAKE2B 90daacc086f6f5f06721a9427b5426fd90c2ede7f5cab19dbfacb52ecc58998614ab68682548deb0ae924316a1088fc5c7d0c61b5a7c9867a875d9f647be7866 SHA512 ede22acec5b50f1f181430840ca679900c8dc23435a96768c6b07f340f807cf28e470b7ec777c0a49b624312563c4e8ab19078802a71d493a7ac6877d577bbe8
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.1.4.ebuild b/x11-misc/menulibre/menulibre-2.1.4.ebuild
new file mode 100644
index 000000000000..f05ba92dfc02
--- /dev/null
+++ b/x11-misc/menulibre/menulibre-2.1.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 eutils gnome2-utils versionator
+
+DESCRIPTION="Advanced freedesktop.org compliant menu editor"
+HOMEPAGE="https://bluesabre.org/projects/menulibre/"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	gnome-base/gnome-menus[introspection]
+	x11-libs/gdk-pixbuf[X,introspection]
+	x11-libs/gtk+:3[X,introspection]
+	x11-libs/gtksourceview:3.0[introspection]
+	x11-themes/hicolor-icon-theme
+"
+
+python_prepare_all() {
+	# too many categories
+	sed -i \
+		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		menulibre.desktop.in || die
+
+	local i
+	# fix incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm po/${i}.po || die
+			fi
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/okindd/Manifest b/x11-misc/okindd/Manifest
deleted file mode 100644
index 79f9fb14535a..000000000000
--- a/x11-misc/okindd/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX okindd-0.6.1-gcc-4.7.patch 193 BLAKE2B 88f0268c4ddd08c928cd702f6e18c164c98cff0da648850f34233c8503f11a78646a35b7f739eb9071b285072244b8c6ba4f9264d41eb391f19346b930fe7283 SHA512 89eecfa9ca5ea1b0c209db41d929750ecebf7fc77cee17f2df8b2ee20c979fec9e48539ee432c28b6db6a9522bf83c8f71d178b12fe0dd40137f53099368c3ac
-DIST okindd-0.6.1-23-20120304.tar.bz2 14778 BLAKE2B 778ecb3f07e7c57b5c1d131872955759c3d1c9f7da4f33492c168f1c71fefe179b087295cd50a1b066e2a429ce204b39b752b6cfdf7b9b2853ca9155569e1a48 SHA512 107d59b96363faac0a9394ad217b3ace0ac7d6eb003c34ea7b96760cba7d8e9abb7ef4e22222ab260dfc425099c8b6733ebd002dea79857b9080a30e1bc2d682
-EBUILD okindd-0.6.1.ebuild 944 BLAKE2B e91767d2bb3f6ba6c0ff7c8de12ae5f43aa067f273cb481d192fa4c2e717af9575216a060a112195785a523100930a0553aadddfb38d4e38169fca8ab8bd2d60 SHA512 61082937ce7771a62bf4af0e241f9f344dc12cbd223018cf9ffe87d57d3af4659d40ea292460a4240f7a837ed26bccd94725779cf6e41fd70e10d831ebbc7676
-MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/x11-misc/okindd/files/okindd-0.6.1-gcc-4.7.patch b/x11-misc/okindd/files/okindd-0.6.1-gcc-4.7.patch
deleted file mode 100644
index 4cf7e4f20571..000000000000
--- a/x11-misc/okindd/files/okindd-0.6.1-gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/okindd.h
-+++ src/okindd.h
-@@ -9,6 +9,7 @@
- #include "text.h"
- #include "menu.h"
- #include "global.h"
-+#include <unistd.h>
- #include <QApplication>
- #include <QLabel>
- #include <QtDBus>
diff --git a/x11-misc/okindd/metadata.xml b/x11-misc/okindd/metadata.xml
deleted file mode 100644
index 17237689dcfd..000000000000
--- a/x11-misc/okindd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/x11-misc/okindd/okindd-0.6.1.ebuild b/x11-misc/okindd/okindd-0.6.1.ebuild
deleted file mode 100644
index 43ae236466cc..000000000000
--- a/x11-misc/okindd/okindd-0.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2
-
-MY_P=${P}-23-20120304
-
-DESCRIPTION="On Screen Display (OSD) for KDE 4.x - works on any Qt desktop"
-HOMEPAGE="http://sites.kochkin.org/okindd/Home"
-SRC_URI="http://sites.kochkin.org/okindd/Home/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-DOCS="changelog"
-PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
-
-src_install() {
-	qt4-r2_src_install
-
-	rm -rf "${ED}"usr/share/doc/${PN}
-	docinto examples
-	dodoc conf/okinddrc.{example,my} scripts/*
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	elog "You can find an example configuration file at"
-	elog "    ${EROOT}usr/share/doc/${PF}/examples/okinddrc.example"
-	elog "It should be placed inside \${HOME}/.okindd/"
-}
diff --git a/x11-misc/qsynergy/Manifest b/x11-misc/qsynergy/Manifest
deleted file mode 100644
index 2d722147f8a3..000000000000
--- a/x11-misc/qsynergy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qsynergy-0.9.1.tar.gz 158259 BLAKE2B 121413506aec277b0faf3c61416b74478cb62e1e40391fbb6e125c156ef2165a01ba534ad1d676ff51650a73179806b9781d1609a04504d31f4c108e1ae2bed0 SHA512 90632fe2a360e455b93aee4725f0130426e842a574dd17b2a36b6a23a646ded4f7998781e48599edb3ad962b0cb32c7ae5ad3bd2275a1a421c143f9ea2cec55f
-EBUILD qsynergy-0.9.1-r1.ebuild 460 BLAKE2B f32c68f84167e1e6983fad290914a6d05e82c945cc5da5a1b7a4dfff6a431db2731761293cd41e7ec392f4b25a6f9eceea59c40ba847b3760abff96c8860bed3 SHA512 18451b7bab00f94484f514453e412aba9b0ce1a1bb1a236e23bbf6d33494af4939e95f8e8651e08b32be2f2a18f102cd9c4f3e01a8e43299c6e6b3cd8f2d99bd
-MISC metadata.xml 325 BLAKE2B 4a0863d62bf04ba178f031c16bc9de79be061fef605dff69703e7f7517564be9c10f73576d2f2a219257c866ce9c50a4546c9fa4d7f0f6eb56feec22cc3c31fc SHA512 bcc1e93a079819fabc43579dd52f334ba3551a8484763584de34c9e6bd6e5c3e59dba8f0a760efe881da8411bd10930dbe1f576490d83c9eb469d5f485d252ab
diff --git a/x11-misc/qsynergy/metadata.xml b/x11-misc/qsynergy/metadata.xml
deleted file mode 100644
index e45e4468f381..000000000000
--- a/x11-misc/qsynergy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">qsynergy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild b/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
deleted file mode 100644
index ecacdcad396d..000000000000
--- a/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="A comprehensive and easy to use graphical front end for Synergy"
-HOMEPAGE="http://www.volker-lanz.de/en/software/qsynergy/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	x11-misc/synergy"
-
-DOCS=( README )
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 024c093ed345..03af5648f9d5 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -6,8 +6,10 @@ DIST tint2-0.12.12.tar.gz 469724 BLAKE2B cfb9eb702680e23f7f9c9b98c8853d1e059a4d1
 DIST tint2-0.14.6.tar.gz 466533 BLAKE2B c7308771e8a5a7d49410d99779ee54fd19b7d5b71d6c04eb3835100f74df5c12d692b50ce57a2a31f4956c09e404acd8cfd2bd1ef87e6fc55f21f583f5a13977 SHA512 eb1505bef932aa0cd0291dc762d3c9cbe760e3fea0684fc604aa3cae3f5ddf63e5b791db745eb29384e4732e6de09a01084f3ce2a92931b431cdf69a59b1f6da
 DIST tint2-15.3.tar.gz 500301 BLAKE2B b8b405f1c56c3de41f672dc02acef893b0650fadca9a4823c7b249661e8675e01c92c9c1588d32c2836596f34c4dbc1e5d2608cff3c75590d7eeac9e925eb874 SHA512 41ae8f8e3aac6fe55539c531889ec2883534072ad398f0693e4bfd39c80dd4c64d635a36e063f741fe89fd461f66f92adf6acdde553e0f8b169992d94dc0e344
 DIST tint2-16.1.tar.gz 534354 BLAKE2B 540287bd952ba8b54372d45055efe216dc4d9d192e33d6f83f2c734e97b9e350c7be0cb3e19d414f4e11c0bb7b505307899dea9c10ac382737a2507f7df4fdcc SHA512 c6319d5692d53e56c150906c32c794ee4237e06455efb68527b379b4ae00c48d996c63ea02ee6aefc70266335eb4cb08b4731556075c46d435b7861de6eefd3c
+DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe
 EBUILD tint2-0.12.12.ebuild 1400 BLAKE2B 9f386182995036c6f99f279c461f26486d3ec05bb3f6fc4eb7e94f12c002f6a2404b3f408e2704f144d26949780dfc6c3686708a3a762479edc4ca5aa1cd3ed8 SHA512 97b0a093ba91d254201b1105524c5eb087d09589be1560f5adfd76da26b803da3efff44f3974e273d694086dc3f50693c6a5cae1798fd1e11be98d6942167d0d
 EBUILD tint2-0.14.6-r2.ebuild 1341 BLAKE2B 8a26bdde86b7c5c0b44e05c184c7f6f2994c1ba52884025032aa71058a6ea3a3f0a35ba0abe69429ba608dc389c28ba609d868bea58a6b4a6ad08981fedb1637 SHA512 a76155df865a0b6dd2c12709f42e2848b9330e51a0c55392c42caa76f017550a94343469b741cfbee375f527b711a8a158efdccf315f3917442f13fec91d19f7
 EBUILD tint2-15.3.ebuild 1273 BLAKE2B f481e61000569a5491f3d02a03fbf74d2e824ece425c38c6ebe2a9d342c53881ac6a53c02c962e783dd609d8cfa4d9ebbd34374f5e2226980c17fa92462a89c9 SHA512 661effd4bf12390e7fdcd08e363ae7d8dc8aa9d4388c65b7f0360d6f9529ac60223edfe0f993cf99edeffe7f002f8e0eab436c58261be7f77f9e933e17667c8e
 EBUILD tint2-16.1.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899
+EBUILD tint2-16.2.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/tint2-16.2.ebuild b/x11-misc/tint2/tint2-16.2.ebuild
new file mode 100644
index 000000000000..f7cbd25ca6f4
--- /dev/null
+++ b/x11-misc/tint2/tint2-16.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils vcs-snapshot
+
+DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="battery svg startup-notification tint2conf"
+
+DEPEND="
+	dev-libs/glib:2
+	svg? ( gnome-base/librsvg:2 )
+	>=media-libs/imlib2-1.4.2[X,png]
+	x11-libs/cairo[X]
+	x11-libs/pango
+	tint2conf? ( x11-libs/gtk+:2 )
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	>=x11-libs/libXrandr-1.3
+	x11-libs/libXrender
+	startup-notification? ( x11-libs/startup-notification )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_BATTERY="$(usex battery)"
+		-DENABLE_TINT2CONF="$(usex tint2conf)"
+		-DENABLE_SN="$(usex startup-notification)"
+		-DENABLE_RSVG="$(usex svg)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/xprintidle/Manifest b/x11-misc/xprintidle/Manifest
index 3bd7c8e0d5d2..2e90ae0526e5 100644
--- a/x11-misc/xprintidle/Manifest
+++ b/x11-misc/xprintidle/Manifest
@@ -1,3 +1,5 @@
 DIST xprintidle-2.0.tar.gz 87308 BLAKE2B b2ef3cd82f7208b2c2a2a2cf3fcff028c318e682b7b1e5de4982a50bb757b263044cf54edcd5452fea7fd93f435b86da3da6d0ef38dbacee761bc77399f43665 SHA512 cc2f62b33ef387366246ee9a195be4cde68b2d13a49a4d1299640da2d42f7042152bfdf6932e7904a7f4211b0dc22486bbd62b47fdaf9d5d3db895e296b5f2f9
+DIST xprintidle-2.1.tar.gz 92360 BLAKE2B 9bfc08151a18200eb83b6569c2e9d79cbeb6326c39f0e8b9f5e400d0d3e28baa889ada32e3e0452197af77f90bae50d1094bae6972aeb0c3dbe81732246b6f1f SHA512 12393e10a6e53491f3e803fb2e946cc5e20d9fb6198c95d53512b3418034d0f262fddafe9fa10e1aa3f335940134365dcdecb0ac00216e32a2bc4cc5be1c8ec5
 EBUILD xprintidle-2.0.ebuild 653 BLAKE2B 8f17fd7c476ec814022435caba734d1cbe0cb21dc8d9c522d52a267304efd1ab0b96f73166e6ca0efdc63d793fff03f674bd094857fb36108c5e35c9788f3e18 SHA512 94c94b601d05b720c99c080074af43276a74415f3ecd670a517298945f96c5efdfa393483028edbb35ef7f4a6fe4a80ccf35b44cdb0466205f1b540c081a343a
+EBUILD xprintidle-2.1.ebuild 509 BLAKE2B 65a28dffed956eddfc9c550608ef5074697b293aef5ed3bbeac1d26bbecef6482d8febbefcc6e0c1f40901098d4c663fdcb8f8c7f0574b629ca05b7ea39ce848 SHA512 9d3b0afd5ed483b4779fc7b6e8a82840e7d5db97e23c5b62f3e2a5ff8e7d157c4e6b22d832282c1670cfa565fa8ba7d8caa7d7a261f0b683e0664162425db899
 MISC metadata.xml 304 BLAKE2B fe9f1bed50a82bcefcf1ecdd2196e57f2176ec406b13d707a4bc6013930127a61b515e66ba382a2f6a9bb01a59f6cc4b6d757a0ea1ec988c0315eb5bedb5ffba SHA512 3f2adb57b1759967aefe91475feac1723efe2e29c86f1111635f9f1c1d909ab518a80e60666cb500247b6a66772067901a3513d1b01a39ad42cbe3044c96e875
diff --git a/x11-misc/xprintidle/xprintidle-2.1.ebuild b/x11-misc/xprintidle/xprintidle-2.1.ebuild
new file mode 100644
index 000000000000..4b37635dfb0a
--- /dev/null
+++ b/x11-misc/xprintidle/xprintidle-2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Prints user's X server idle time in milliseconds"
+HOMEPAGE="https://github.com/lucianposton/xprintidle"
+SRC_URI="https://github.com/lucianposton/xprintidle/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXScrnSaver
+	"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+)
+