gentoo resync : 16.06.2018

22 files changed, 116 insertions, 193 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0abaea3c4825..ca7497eb1c98 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 257529c07278..0b1884a2f491 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -6,8 +6,11 @@ DIST albert-0.14.18-plugins.tar.gz 538138 BLAKE2B baa48198aabf0d5f4ffad46ce9243a
 DIST albert-0.14.18.tar.gz 84883 BLAKE2B 706312cc3f29aaf9309c7cddb0f22aec2324560f78ed5a5418f6984e0a037b779d38be3d607c2fe287654b02db4aa125505b0716fc431e7bf679f108fa190555 SHA512 47110ba711b76d5d202a0b42c8442a5a242ca67869094bcb31daa5ca760b05e1b0ccdfbd88d5fdf3d23bb2838e3d4efbaf1a45733ae7612b0941360c2dfe5654
 DIST albert-0.14.19-plugins.tar.gz 538257 BLAKE2B 74736ac5be02f98aa38b865499c264911da64d600dddfb11c90f4b701a56723648c48eb82e035fa751f2640749a2ce9c6fbf39fee44421f8e52023c05f2986b2 SHA512 b0f511e7ecaa48a40b0b3ec770946f9198f9649af1e9c1f428608140761ac5a7c6393932ac34ad093f2299134f623d83f6f10a313f497b1a37223eb7660b2b50
 DIST albert-0.14.19.tar.gz 85203 BLAKE2B 3997b337fe3957d1e1ccdb62250085f70be462b93ebb68e65e70d2f83b30b2eea840983bbec76bc81a0d045a1600d1c1cc4c2ca2bb0933b6832e45373744a82a SHA512 bb3130aa93edb92008fa66ea527675d4cee89dff587ae07f6983c315be7c8bc2461491a771ba817de2d113c1eee98b3a7eb2d0b5e228811db06a28bef2e7bf30
+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
 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
 EBUILD albert-0.14.19.ebuild 1365 BLAKE2B 27aab4439cb5b987744ed8f2b6e811cfa67d1607dc93aa7f66fe8c8b78b8dc3d426efc0af753ed0b86f14fe823df886bece604c228f59b484ffe22b58b496127 SHA512 4999dcc903abe36dcc8ed1020479b94efb6a16db44a1b3c600dd70f3b6590acf2c01f7effa4183d7224a97231c4627364099a1816f9cb2e0730f552f1614d434
+EBUILD albert-0.14.21.ebuild 1365 BLAKE2B 96a751e3625a50707e4674d490371ea918214cdeaac40bc413bc65dd8e042183ec2794f174c5bfcbb43626aa03c0bf8d9cf7fa46da600c1c0c25a1292b748549 SHA512 3f19d47a0d8c9fc79e38ac1b9c1d171efe36f06d5cb8ce99fd5e1f67797f165fd0b79ec2e695b4bc26ab72bcc2fcdeab69ea2fe51246eaee17857f8c68c381da
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.14.21.ebuild b/x11-misc/albert/albert-0.14.21.ebuild
new file mode 100644
index 000000000000..e4a6b9e780d4
--- /dev/null
+++ b/x11-misc/albert/albert-0.14.21.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="67a7a34734c4665dcb1a504432de5d2e5a56ac90"
+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/lineakd/Manifest b/x11-misc/lineakd/Manifest
index 54a2d905d713..2e3d513e0487 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 1174 BLAKE2B b020defba8ce6a0233e15e8aa763333a75dee41162629996339306468cab16a40d64f84b4d3f3b4de6f724fabafd619a75d4cdacfc19b8ba4a0e5aa31ff16c77 SHA512 0601941d689633369f9721a55d59b76f82ac8e8bfb8259455d823f58527c2017e98b58fef421bc837daf1627a2fd592ee9443af1f764c8c7800bdfdb62e9b3be
-EBUILD lineakd-0.9.0-r2.ebuild 1057 BLAKE2B b138bb15380921ff73d41b87519c9ab55486f62c96212979a8915b1c45010bf7ea39bea17dd25243c8ab23d8b9125f722f8cb5d99e8296bbbe75923f0ea91f91 SHA512 bde81b54941d865c7ecaf657ea31a1ad22f2675686d3836298d3d6a4e5e323bc13adbc81f0c1c9138880f0c4095e3d5faccd5cea30c047b76a5912ced41a79b1
+EBUILD lineakd-0.9.0-r2.ebuild 1056 BLAKE2B 7b946b432e8be57f06641b60767ad848325d1da54fb384a363e2bc4b85f6c9e4c977a209ae89a356e6c35289b14fcf7e09b64a7d170ac770406bb2923e22c0b1 SHA512 e070f0225b51bbbf618fc9fdce573da8f09abb0d64cedf7275724e33fb4611e87d59af2542f6addd0fce672ad1b888ba6006ecfc7ec254f4e52f7c8fc174a450
 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 2ff6da09dbc1..15c080440109 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/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 2d8fd8dc161c..09e3861e7139 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,3 @@
-DIST pcmanfm-qt-0.10.0.tar.xz 228540 BLAKE2B 08691b9a4851bea0490242bf76919bc3ea064b7ed85dcd3ddd3a0672acd28801ade245a85bc39361da62aaad2fb8c26df27d5e985165ebca9ee30c390f6e0ee3 SHA512 1b4ec2a746767e28a851f702a6a0897327cefe08b06cb25d63a1c9dddaed4aeefdbe25ee7d6431c94266e0071d5d25e3591c588c484ad097b10ce601e9a18201
 DIST pcmanfm-qt-0.11.1.tar.xz 92916 BLAKE2B 8f71b5c1845ac4761fe8ba48734905e63011b98a4856b1d7759259b387d897483315dbadc6d68aa588f1ad223c4a3cefd83b00979a04723cc706d75cb26611c4 SHA512 860a0853b6c42e04ba6cdbe617d4c5f61e0033c9ae5483c5b8a457368fe23084af813feab5fa50accecc8d21055a5ef073731b94ea3eb4b3ca6eacb0dbe41450
-EBUILD pcmanfm-qt-0.10.0.ebuild 1219 BLAKE2B 8c6e90ea28da4c1faed1ccee0c8c59c9b2c7fa12a7fa2f009374833d7b20fc234f537c4eef2242038d1659fbc1972566839611f59d83e380da2b859285c91b0f SHA512 c15e532da641a19c6387aca2bb7ad98ac11db51d751fd52c0cd3d21c56f4edb4c299331e8c41c7074a6aa16b5182c4c8431cf158d31c50371505b5385f3ba7e0
 EBUILD pcmanfm-qt-0.11.1.ebuild 976 BLAKE2B 54a2e5395fc1ed8f0ee47b0110225dd996d773f4ea3b0ce6fae89b9a85b2d09cbef9273fb3ca8ea24a669a637cf327b87c4c7ccd7173da9f091061b238396288 SHA512 b9d6f0335b90d524eb8921a94891d715603f3a90f62874bac37fd052d1ba1ae1ea96054867d450503437e8f0e723625341598bcc1e6a30b45fda4315b710c121
 MISC metadata.xml 380 BLAKE2B a792f445534940d13fd5ee89806df73aaa1cc14898d842760ea14bf0c42b30937984232a5e3647971b639bc19f1da31247fef82db6953228448f3452a06b4810 SHA512 2e8cb06bf3dd84a80a12c072f3493b4cfd5a0f0d92a7809da89d059d71a012b536996e0a3ce6732e131f423fead8b93d413c090ce9cc439f812df5b3b32f77fd
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild
deleted file mode 100644
index 4ad9ae3b85f3..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib readme.gentoo
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-CDEPEND=">=dev-libs/glib-2.18:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-0.4.1
-	>=x11-libs/libfm-1.2.0
-	x11-libs/libxcb:=
-"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix multilib
-	sed -i -e "/LIBRARY\ DESTINATION/s:lib:$(get_libdir):" \
-		libfm-qt/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	DOC_CONTENTS="Be sure to set an icon theme in Edit > Preferences > User Interface"
-	readme.gentoo_src_install
-}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index ecc11dfa76d5..2ded8b194c09 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,6 @@
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.1.0.tar.gz 418298 BLAKE2B 1c7394a17ff1ec5b0dec519b7aa58e63cfcec0f104d4302051f6e12753b7074c3d85072a3d78e7ce135c53d4ddd4a6f68ea61ffb7b2ad04997bbf0c836115046 SHA512 6d8759d9f750c2abfa79fe735615b0ed3d1827e3a88561317712c6f02cb32a0a77726f97cb419f3a040ae9085a34a23cb1aad0aacf3f14e56c542977b89036b2
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
-EBUILD polybar-3.1.0.ebuild 1686 BLAKE2B c33777ea01c09a1314300efc8b6c73407dec67548329c57b33c122c9d1520a5cd918c5598df8de444b1d1563ffabd1938f92088dc6647bf303428e231c99e700 SHA512 2b862b85a3504d23118805d11bdf09201f80fccfde7732f688e823b4be09b0efc33d818403af9bd30b568e2a1f76d72b51640bd3a047baed1c9947286e1221a8
-EBUILD polybar-9999.ebuild 1177 BLAKE2B edd1dcc60f26bd303199f5a9b5a3e631cafd14c959731f36d34b68cbc96f6e19469cadbea788f179682d79f6f635bf22b16923985a16742d8a56b92d705ddb56 SHA512 1fc3f570215ca8569c46c431d83fd5dbc35f12a6ac2dcc8802de2981c54d24b1c83e53a9c4fbcac18fb7b66c3051e7ff1ad7ba2b6261c9fd69858c2483536636
+EBUILD polybar-3.1.0.ebuild 1691 BLAKE2B 4af6ba35fc69031427004e98db18444a3abfc070b68405a5191ef0a154da09c8862f98c0948bbc684225dc0f17b4c2fe4046c61088ad54214003cc9dba47209c SHA512 382c6cb1353be1b7c5975d63b12d42f39ffbf6e11b2b730cf49f8aa1b6759e4e36b5fb1ab61abcbf4d9b1558b3def3b036a9a13086ea2f9ae4f392d797f9671d
+EBUILD polybar-9999.ebuild 1182 BLAKE2B e457c43df7e40835a0ad863a3583d9389ae7871b61a89a9dd4530757c539c8843eccb08865d4cf169a1d452dcb3665766a577ae01bb165c24872d335fe279bee SHA512 99b4e170edd51117bbb326379b66a325da1c179980d68404d2e6d0ca18e6f11c8c692f44d548a94b3e6b04560cc34086cf7e5d3099278e235f9f06e00e84d1a0
 MISC metadata.xml 696 BLAKE2B 2b2762500174e5b8674161433cc5c862158dc1db4e057b4e92d3c7433e8c286a80111dd311bba04631f71d2a58817ed2c745f024da1a39b5622fafc57525e346 SHA512 a3fbaea3fa687472a671c7b209bcabaf8a3fcab86b53aa357aa776cc3b57a565eae933b50a6238dc73d46659ddd893ad1dbe9f312d828d05c26cf0945818d322
diff --git a/x11-misc/polybar/polybar-3.1.0.ebuild b/x11-misc/polybar/polybar-3.1.0.ebuild
index f9be038f16c0..1d10b8eee8b4 100644
--- a/x11-misc/polybar/polybar-3.1.0.ebuild
+++ b/x11-misc/polybar/polybar-3.1.0.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
 	x11-libs/cairo
-	x11-libs/libxcb
+	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
index 7a1abcf47ee7..7bc1f90e2291 100644
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ b/x11-misc/polybar/polybar-9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
 	x11-libs/cairo
-	x11-libs/libxcb
+	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index f723be7c0684..9704ff010160 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,5 +1,5 @@
 DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17db3bd8419ea13e6d7c7fafc2e2d9476bdeadb231c73a71e299ecf9e62dfe7830187167ac40b92ef6e65e54c509c SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
-EBUILD read-edid-1.4.2.ebuild 440 BLAKE2B c551ee207dca22b26bd1cb71e24f7f33ef4a4af7c0eb26c676c89b326b2d0443dd31697d5c82373a9439ff0e3e4b50d5854157a22836fac6246573423200cb92 SHA512 f70478551e95427e12a50b366647dc4dc170dffdd0969bb614e194b2f763b0e5f349eb724d692eb85c56d1d1b36609f1b31947758c3ca7da5e8001d49d1af4b4
-EBUILD read-edid-3.0.2.ebuild 548 BLAKE2B 83966348fbe6c111ccc6ceb7fa6a6b2552a5a0070383d83aafd140bebd4b24cc6dc5e212e4d609e3849a1891668717ec72f595d00c37eb917130dab95d60829d SHA512 62a20ac04ba9abbb03b6c2699e92230ff2a97eaa83513ea0ccf237f377cbc87845bd48bab625315cb1766f07fcb09c015f8b39fc46f3a5a892dfe3f94305bb56
+EBUILD read-edid-1.4.2.ebuild 400 BLAKE2B 0c5fdcb34750b780f21f8513694e1c847d1253cb1929191ff37b4c1049fa068473bc87d2ffc0bd095b8918c836e52989df74abdbfe39febdb5c4d19273becbb5 SHA512 e38bdc0f35d86af70be326ae546dcd8b08aa0b23ffe14f45daeef57ae47bf20ebb4e0925928ef0224dedecd46d95ad66e799ed4be55361b8356fff0f716e5ae7
+EBUILD read-edid-3.0.2.ebuild 551 BLAKE2B 8541c5618c393db44d2539493359f208bf93bedda9caf459bfc747a90efbccfc4b7ecd3a2745da05e8f024f3e39e85e02fb6ca64f5e3c102051e4e27f7f2b415 SHA512 6eaa79e6baba59e7d25b0be19ec1dffac224fd906ba3eaebafb9235f89ab9a931436a637dbbdefe7d77b56439494264f7a6c8fa62ff2757091d295aa509942f3
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/read-edid/read-edid-1.4.2.ebuild b/x11-misc/read-edid/read-edid-1.4.2.ebuild
index 057a1743fdc7..a84c9594c75b 100644
--- a/x11-misc/read-edid/read-edid-1.4.2.ebuild
+++ b/x11-misc/read-edid/read-edid-1.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Get EDID information from a PnP monitor"
 HOMEPAGE="http://www.polypux.org/projects/read-edid/"
@@ -11,8 +11,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ~sparc x86"
 
-DOCS=( AUTHORS ChangeLog NEWS README )
-
 src_configure() {
 	econf --mandir=/usr/share/man
 }
diff --git a/x11-misc/read-edid/read-edid-3.0.2.ebuild b/x11-misc/read-edid/read-edid-3.0.2.ebuild
index 7c9d0bb7c563..f55ccb264aa2 100644
--- a/x11-misc/read-edid/read-edid-3.0.2.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-utils
 
 DESCRIPTION="Program that can get information from a PnP monitor"
@@ -13,7 +14,7 @@ SLOT="0"
 KEYWORDS="-* amd64 x86"
 
 DEPEND=">=dev-libs/libx86-1.1"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -i -e 's|COPYING||g;s|share/doc/read-edid|&-'"${PV}"'|g' \
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 2aa5f7d21fde..e4f49c3cc31a 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -3,5 +3,5 @@ AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
 DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6 SHA512 a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
-EBUILD virtualgl-2.5.2.ebuild 2500 BLAKE2B ba0f29fdaa60aef649e1e2db4acdab97ffc1dec3e94daa3624161313fe98d98c16630630974dec9b128773ff74bf8409aa00be2eb9d645383369da68f93e8df6 SHA512 1cd347416c201c238720c911cb006be783286a50dc7ab49f008e1f435c8955ca65aebae2d89284195f9e94ff3ae80dcb29133a31d2a3b5032f43f668215f7a18
+EBUILD virtualgl-2.5.2.ebuild 2507 BLAKE2B 70374ee9d5ac16a917e3755d3fa2e6228a045e502d57d7060f2a63a7e457524422e588a693870a3ea3da15462925e1a4f761a8a7de868090436afbaccd9b9c17 SHA512 c30fa84d7876b8389a81d52f4f6981419ef3630acbd54ffe8263b5c9beec71c59e14a270a6138e7be10de668b2aaf9c6054e70eb57ac22d9f8b86de905c37f81
 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
index ba85f086bb2a..7b5b05a5b7cf 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="libressl ssl"
 
 RDEPEND="
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index 32d93b51c150..8cdf109f2804 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,4 +1,3 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
 EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1122 BLAKE2B 577885776234f0d6aeef63a39be55b63276a235ceb982ae2ddf23c0009bfe58a8885d83b8f3a47f93443be33b5e68741568d44429ade2887fd25a250712bee7b SHA512 552c83d6480c78b59804773150434e25aa9923ca397a3e0d63ad16d882c3a6649b66bb2ad54cf60f85cf324e6fa9c7c88fd4526070dfd1157f8aa34ee17d283f
-EBUILD xdg-user-dirs-gtk-0.10.ebuild 971 BLAKE2B 9306d5924f7f693a53fc7f20762bbe08e019ea20631ae81eb240011ecf00b44a96302c33cafbcf0a102aedeb33b4df9403babf2114ba0740b4497795b5234a18 SHA512 a0329ae6018e58854ee3af912f16b079f919c3a90628d3cdc683774b7a5ec54baf8149746d16eb75c0628e093bfadbfef0df7700886783d0b660877194a49f0f
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
deleted file mode 100644
index 7e92c01704fa..000000000000
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome.org readme.gentoo
-
-DESCRIPTION="Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-
-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"
-IUSE=""
-
-RDEPEND="
-	>=x11-misc/xdg-user-dirs-0.14
-	>=x11-libs/gtk+-3.5.1:3
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="
-	This package tries to automatically use some sensible default
-	directories for your documents, music, video and other stuff.
-	If you want to change those directories to your needs, see
-	the settings in ~/.config/user-dirs.dirs
-"
-
-src_prepare() {
-	sed -i \
-		-e '/Encoding/d' \
-		-e 's:OnlyShowIn=GNOME;LXDE;Unity;:NotShowIn=KDE;:' \
-		user-dirs-update-gtk.desktop.in || die
-}
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 0e2046741521..13e4b0e08470 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,4 +1,6 @@
 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
+DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
 EBUILD xdg-user-dirs-0.16.ebuild 958 BLAKE2B 8bc39473a803fbdc008203ac14d524b3052920a2477dfcbcaa152ffa229712a149f5f4653817482582bd0a69677e49c70ba7ae0d22605e6c483a01d0126f7d0c SHA512 b3bd6a03aa1a11cfb3303cd94c3409d9b4dff9507015a014c60b4e35905d42b3679d1d02d8ad2e31d15bbe80760cd454e0e4f178e56e4eab220faad783398c37
+EBUILD xdg-user-dirs-0.17.ebuild 967 BLAKE2B cec83d601a974c7a89a837d5462270f3bf0fa7d926db956045f936c28ce6f85640d0ab779f7951bb5bbe26f2ac604c7538617479cea017127334b8d442223077 SHA512 88539c0c075b9f1434e2922ca4f347b3740eb73acbe8aa416696a7121c56083c8f4c8e3fd59817ae1f0b6c12292c53d17d1e8b72d3670d79eb7867595a893cec
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
new file mode 100644
index 000000000000..4930c2e21787
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tool to help manage 'well known' user directories"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
+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"
+IUSE="gtk"
+
+RDEPEND=""
+# libxslt is mandatory because 0.15 tarball is broken, re:
+# https://bugs.freedesktop.org/show_bug.cgi?id=66251
+BDEPEND="app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	sys-devel/gettext"
+PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+PATCHES=( "${FILESDIR}"/${PN}-0.15-libiconv.patch )
+
+src_prepare() {
+	default
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032
+	eautoreconf # for the above patch
+}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 7e2904ed068c..a1b7a792014c 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,8 +1,6 @@
 AUX xdg-utils-1.1.1-ktraderclient5.patch 1542 BLAKE2B 4b6adf3d181f1a7869c14d475cf156ed5952d2995243086f276aa3dace6382ba55a47cc83bf4b06da60d1363ef5fa4b815adf159b682629cb87dc4030211fae2 SHA512 a9c1def45928026cbc460527862c73e78074e924fdf088c20afeda74c64103c42f9c551123bee3e627f0d41be632c4f4d250722719a33de20c88085d1d712b4d
 DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
-DIST xdg-utils-1.1.2.tar.gz 296735 BLAKE2B 0d68fee2581075ca4b6beb0f7db77eee76d30afe8e8a3da904451f3c8e1a123f2fa2dc68aa15f7697f2ed532ffc14122cae308776b559c628751514e063ba11e SHA512 1927506065788b5f8bba8b0617a8ee585265342fa40c4b73000d320acd5909036daef94d49495b00982dbb67b7706b2f1ed949cb4cc519dfa534be2c1c8f74db
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
 EBUILD xdg-utils-1.1.1-r1.ebuild 2222 BLAKE2B 5074042cf9a2538fb9183366831424808342ee66d5211dd1fee1a52f366d119ad78d689d748dc9642feec470ae7352c75d084e5e1e4bf325dad9eafe4372cf8e SHA512 4bacdde96a5be5a1c4265c83ac17ad0342021fb14e7e4fd2ee9009614836891bff4b14571f497fa1f8c1b39e6d2476065a44e5dda337360aa092b91a0756764f
-EBUILD xdg-utils-1.1.2-r1.ebuild 2217 BLAKE2B 5ce80e46b49b70c79a5eb172737f31b592c674824c250ae865deba7b52e166a5b94148328ef89825f9fe4fb2032b1e5d29b7d23d45434087eacd30f2d929dfa7 SHA512 9d7be6be2ba5d7edf823f4ebddf3d922b92e813e9ddd18cc5c43bf298e75a828ea82352cdd50c5290250dc281b97369bea95e464f989e55f6f761ccc4ee1efb8
 EBUILD xdg-utils-1.1.3.ebuild 2223 BLAKE2B 9153c33784772b40796b5c35abe03dc93a7b025c812ff5fbb26636dfb70d3b227f448e8e672f187b18dd6651c7ffcf4abb7965fff576cce9f545e43f6afd0b5f SHA512 1aee4d905c11ea039569bf330d44a33889acf84e6a88688f24ac31d27e93c143b94dd5129f4cf6fe07db2c2f7c91cbfe8ec70e23131704b674462f8b161a087f
-MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
+MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/metadata.xml b/x11-misc/xdg-utils/metadata.xml
index fb76b944f2da..95e86c12108a 100644
--- a/x11-misc/xdg-utils/metadata.xml
+++ b/x11-misc/xdg-utils/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>freedesktop-bugs@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.2-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.2-r1.ebuild
deleted file mode 100644
index 9856867b8fb8..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-#SRC_URI="https://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
-#	https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
-SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="
-	dev-util/desktop-file-utils
-	dev-perl/File-MimeInfo
-	dev-perl/Net-DBus
-	dev-perl/X11-Protocol
-	sys-apps/dbus
-	x11-misc/shared-mime-info
-	x11-apps/xprop
-	x11-apps/xset
-"
-DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
-
-DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
-
-RESTRICT="test" # Disabled because of sandbox violation(s)
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	# If you choose to do git snapshot instead of patchset, you need to remember
-	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
-	# all the files
-	if [[ -d "${WORKDIR}/patch" ]]; then
-		eapply patch
-	fi
-	eautoreconf
-
-	if pushd scripts &>/dev/null ; then
-		make scripts-clean
-		popd &>/dev/null
-	fi
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-}
-
-src_install() {
-	default
-
-	newdoc scripts/xsl/README README.xsl
-	use doc && dodoc -r scripts/html
-
-	# Install default XDG_DATA_DIRS, bug #264647
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
-	doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
-}