gentoo resync : 16.02.1018

24 files changed, 31 insertions, 215 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0b3d22ea0dd3..e9d6acd708f7 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/mixer_app/Manifest b/x11-misc/mixer_app/Manifest
index 7ea0f0b30e7f..e4775ba72285 100644
--- a/x11-misc/mixer_app/Manifest
+++ b/x11-misc/mixer_app/Manifest
@@ -1,5 +1,5 @@
 AUX mixer_app-1.8.0-build.patch 1022 BLAKE2B bab0aace19b3952fae352ead05748166dd792edf05114d815049db2e4bd1b2f5e8d3b336292f81737762d279690841e09b1757a69f84370ae486e46463b667c1 SHA512 46c6e10f1e8dabede4dab55dc5293e24061ac45ea4c1d4dc114913d4cb2b8d2ca2a4ffe7b555de4001416ed56a67e74925da2a9f33d89a2e8a0037a58a59cad5
 DIST Mixer.app-1.8.0.tar.gz 37884 BLAKE2B 53c44947e59fa2b4f975a70a33cae76c1f721f3408021ffdbaa37750f26b67e2dc71457b5b08e7b29ea60dbafe34ed3a6ba0c22d7414c8f3bd0c5186207f62f0 SHA512 2b965cefda7ae93d8588b717becf25430f3dc5d1d6c3e38d24eac711999ced9c671cfdc76a0601022cf1fc7298d179b5780ce7a3bcf33291ac4d8ea215cd53f1
-EBUILD mixer_app-1.8.0-r1.ebuild 692 BLAKE2B ac9c342be8b3db5ca9570f42e8d8d7aebbbb51717dc192a808eeaa59b7caec8ad6cbbfd857346d03834e97eb1cc2277394406aa7962cb6e7b9abbebaad873f8b SHA512 4f1cc12b461be5361190350d41332f10df68b52b5255c6a83ac06ee53f3ff8d89f61bd73765095603135b4de3795df265483e6307c644bddfece54df23abaaa1
+EBUILD mixer_app-1.8.0-r1.ebuild 688 BLAKE2B 1cd11c754b1505cbdbd295d28f76f4e8623529957e2e64c1a414dd4ef98e295fc395c886c130833deede4fdb69ae42a81bf964a0b64d82ec52f4f2f236b58225 SHA512 bc3c345e359bb261abf795965d664ef70f9af1551522c5d0d6faf9b007200f41fcd0ffafd429df3a1fb61fb320542f6aba73b489694181cb9e66f0efa4ae2c64
 EBUILD mixer_app-1.8.0.ebuild 706 BLAKE2B 84630771fd74ad20e4ff028ba8c59c2fee8f8e33bb09ea2051ff1d424a17a3daf88e0f27f8bb0a35202648ec35875e5aeae71b21dad6adc298a49a0d27a9d70f SHA512 34521e19c17ceb74270e767ddd56d87653e061383ff87e181de7605f22bfed5269f8c50b2b82f21a767655dc9a7caef00d7f1725347024e16f893bd1e720a34c
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
index 45d98e6279df..9a519f57b17e 100644
--- a/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
+++ b/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://www.fukt.bsnet.se/~per/mixer/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index 44bbd294c15f..64a1791f836e 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -2,5 +2,5 @@ AUX peksystray-0.4.0-asneeded.patch 798 BLAKE2B fa17b9f091ccb94dc11c6086bc1bf648
 DIST peksystray-0.2.1.tar.gz 70261 BLAKE2B 8ff1d72e4cb0d35afc92b46acd7809095ded33630a896638e73bb64ad5b4eafbdcd02f53a4ef1251f567e7f9770dbce7161f47013b8e4543612506238c95b000 SHA512 c52fa6b7c8d5c57831fba993e85eb153d9b03ec04149b4d081bdde4854b099ccb423bb2e6eb36420093918f57449d208ed20dcca17344115eb989a095b69cbb2
 DIST peksystray-0.4.0.tar.bz2 73810 BLAKE2B 4ac452f14acff5afb8e14fc07a18d5efe6b68696c7063d8cd337c14b9bc0cdcb573ff830f9cc7e3b7057154a3e2a179da26977696101fbb56750320a3913b3d3 SHA512 9dc5d1df630b7447575011e971a9657a5987bdd6098c81444b7579c46bfd7747f4df18fa00376e70b046c52ae7ca95d6cb66ce8a57070795f2f8d497fa025341
 EBUILD peksystray-0.2.1.ebuild 606 BLAKE2B 993886553b8a18edc960ef0254ddee08f5f2dca7fa15ade3ce484d3e9eccf862c8ac6ec9972deb943bb01992fe3988c534dd48981e548bc058f6a4d0305f640b SHA512 e9de24dd129fc44d0f1396d679c6c1daebad62d33b3621a9cba9e4693ad947ebfefe129f42fe4e10f09ba9d39d09f1c1e1376e143e87633093b7c89f65991cea
-EBUILD peksystray-0.4.0.ebuild 556 BLAKE2B 5f4fc383bd0affcad37ed41f4b95866fd4b996e1ad6d9b1f3ede74a61c1df8e97869fe17a810c97cf94212a8fde5d5dff7cfd3f5d1bf9f299b4f4ce382079d02 SHA512 8a2637098ae9180420b5b8ac8abbbe227476ed4287b71247628468ecccbb6ce3fd632f16fe4626935431656c8fe4e00ebd86f9cd3f074d8a8ed427a39c4b1beb
+EBUILD peksystray-0.4.0.ebuild 554 BLAKE2B bfea69bc53205417709b9e6cb74e4cfa59319b3e76eb5bca9a50480a130dafaee741614aaaa2854f36d5419aa3bf62d526b48ca6ed05b4565d3cc555376f6720 SHA512 1f5cd4aa6252412b8870b1bfc5dcbc4137cf3a2ee156ec5a9326c3f1f57258ac04610134ecd081ea962432278abe3bd767026c1e732c32b6b46a9bbb79a8ef60
 MISC metadata.xml 300 BLAKE2B 750e120260f327b198e47b84c2ebfafad92c8e0e4565bf01b06df63ee8ba8c092d1a7f2474bc9b422d786393521c4a2439fdad56f7e5a90974872b904ec55eb0 SHA512 9a298c4fd2d42e5f14b22502fc97899123eb6bfa42143a1efd7df086c2bd97030ab04a731839e787774b216e08cbf829d7c9802b15a0a9ed412e94455e52f484
diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild
index d26a618d5297..7b9185bd136c 100644
--- a/x11-misc/peksystray/peksystray-0.4.0.ebuild
+++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc ~x86"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 0d39e043c2de..21d49c3ef377 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,10 +1,5 @@
-AUX qtfm-5.5-gcc6.patch 346 BLAKE2B 9b4757b2a6564c8842653c991b5c35e711a7291e0e745bdddffa1156cb0f4ae263aeb0573b998b0298f7c9b45dca7ff3990b4e18e055731f5794193dccf202e5 SHA512 e73c2be9cd2b5f3410500b813865c34458ec51a8902c4bf85faa607e7eb98f7e2f9c393a570dc6761938e2081cb43267bb8ab0a2d7450e10098b8f8db05a8634
-DIST qtfm-5.9.zip 172616 BLAKE2B 50219cb9afbca78b4fe7767631e91008254f6a4e745c3f1b87b821dc49655117d6d61a0aeb37cb1771641aac6b5ccfa8eefaa6e2f6d453c68061594e47bf5c5e SHA512 7686a84f1678e1f04f439d65290f5c93da25fbe80487a37f4ce32eae0d29d7a03a169d3dd9cbc81c2b678f54d9fdc01967b6c1b1cb8a19cf37a910a19918a2ba
-DIST qtfm-6.1.4.tar.gz 190220 BLAKE2B 31c9bc6564db111ac42451232470607d9327291296cf6c6fa02230c0285506f251bee03ca4f44570c0266cf51fddd3b4861137f67ed1983fda7cde118a20f0ab SHA512 492d4a5cd41320f0f69c6be6a0dbf8f9b13a2178e76dd79ac8c2a74952b482949073791ef247fc22e80fcdd7194f1b6db9cd489c10506b65e0c0b8918182d073
 DIST qtfm-6.1.5.tar.gz 217207 BLAKE2B 3a818458e6f3d1dfe91860681eb77b809a455d16eef7810aa06e73b9600e6d032c178624c1dbde6d609353eb79ad43e65205f3c3ba84f21b854b8ef93b65be72 SHA512 10a0e1fc8f8948b0564a9b78967403c4a10639c10194879b48bbe086110af0d611a310ab185a2351043df879dbba1e7849a03dde54b6554b74004cbcc27f3788
-DIST qtfm-6.1.6.tar.gz 247468 BLAKE2B 1775100281c25201e7abf1b8dcd47d9a10feae51d0d4cd9e2a62a7e739325207b0e9b15475acb29fe621c13ed7d2a7d96cef39f68f57a09a60d5721f22217a56 SHA512 7b7392ba79699ac479ae8618415d8fab8ad6129e132f54801560413e51e0e68932d325d9ca8462c4e02e2b7a7d05fcb7dcfe9b16c36212996061478171764867
-EBUILD qtfm-5.9-r1.ebuild 1062 BLAKE2B 2b6400a30076f222ed51970e1f53553ad77dcfa1716fa4f0855d075666fc3e5a7872870581691c573b8443865520c10638e43cdf6e749d5d8322ab33fffb5ea6 SHA512 a817ed1a3a1acad5ffad0ed6d8c9633867bb8bdf619979a2673a18de6b1dd1ea70dffa72b6064a542ef0a337c0361a93d7d6c7b544a90bd039ed0eb40d5ab55b
-EBUILD qtfm-6.1.4-r1.ebuild 959 BLAKE2B 069c0fd853b67f6b5da2887349c7b49ef11adf027a32de6d71b8c550f5b2d299d0cc6fa13a72590a9efbf4714e6a1c2166c79eaa8cdbc7edd686e51f6b0fb950 SHA512 e445eac16175f9d9090de0602354f405bcc6573b4d4ada6adb6b0c9cb0d66cac409e3272070cf479dd590827ddddbc0efd18bfb4d89a85e0c628a4e1df2d2dd0
+DIST qtfm-6.1.7.tar.gz 247617 BLAKE2B 4cd8cf22859d4d42f526d668fb1fb47a8a6d59c770c46cc1fb0fc05b752af8bb3c4bcaf81e977283544953c04006080754285cb411aa036c76a041ee2499f365 SHA512 04e14df63f9827fd00a923c91b6c66a022f3c2318df182222b15dc388a7c9fde579981b78d8057a57de29da348f42cfb0a1fe6169f3fbdc50a9f25f78d6d02a6
 EBUILD qtfm-6.1.5.ebuild 974 BLAKE2B 3d7249409b2be57539da80d0f8f704b02421d6899acad39a5d872cd51ea8c8bac02e1798236e365cf42ff8533698d6f505ab07aff0687faaecf3f9871ee45fad SHA512 b89233b56aa90bceab362084d284e224760b3c127ea34388d5e5717fd7cf42a9f1957fffded546fa02a3330801567aeaa39214875065c54528343dfb0f621233
-EBUILD qtfm-6.1.6.ebuild 976 BLAKE2B 81b75e3b80d44733006aa28a6310bd661ffb9bc8c154b06505ab5cc14ecfeda2d89e0870d62d02dbec33a5fa5f113d6fa4994c51bb6232e85675c509c9c893b2 SHA512 394b07655de26c7b0ab3c89ac352e35d924dd0ef202907b32ec3d078a7e24274fe879075eacc5dabc0dee8727b9a8de92764c2fffdc3bc32eab8aeeb24aa6dba
+EBUILD qtfm-6.1.7.ebuild 868 BLAKE2B 82c82d234eae4faf1599c6688d89820c02b3767e1de5da591a8259a48e41c5d976385fd15ff3ad2c18ad8e596922f7ba4a1a9a6654d0d0d127e2d88b50c0eb43 SHA512 72b513c67d291a6466469ed0ddd3454967c0c81185c19e8c878394074ce05ac2f00c7ef8c296b99d8ca7e04b6598c5663e52b0ceb3d67c4ccee7a4c505986489
 MISC metadata.xml 376 BLAKE2B 5ece57e5fdfd4b9837bd82904a447698fdca5d0f3a2b905a272c2364034984e7b207c58e5e2205d1602911b7e1e719698bef8aa9ee11448c8c6de14a0625155e SHA512 dcf748d475de6eadfc319fdef1bcbcdf9e597f4f14dffe6df90ecc68f7825973ea84a56b1569950bf0d3793b5960c479b616c398b7b763dc73f06cd6b9dd435d
diff --git a/x11-misc/qtfm/files/qtfm-5.5-gcc6.patch b/x11-misc/qtfm/files/qtfm-5.5-gcc6.patch
deleted file mode 100644
index 371ee6afa562..000000000000
--- a/x11-misc/qtfm/files/qtfm-5.5-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtfm-5.5/src/mymodel.cpp.old	2012-05-27 20:05:45.000000000 -0400
-+++ qtfm-5.5/src/mymodel.cpp	2017-03-17 15:41:37.136770140 -0400
-@@ -166,7 +166,7 @@
- 

-     if(item) return item->absoluteFilePath();

- 

--    return false;

-+    return NULL;

- }

- 

- //---------------------------------------------------------------------------------------

diff --git a/x11-misc/qtfm/qtfm-5.9-r1.ebuild b/x11-misc/qtfm/qtfm-5.9-r1.ebuild
deleted file mode 100644
index 7b60beb220b0..000000000000
--- a/x11-misc/qtfm/qtfm-5.9-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
-HOMEPAGE="http://www.qtfm.org/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-apps/file
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.5-gcc6.patch )
-
-S=${WORKDIR}/${PN}-master
-
-src_prepare() {
-	rm translations/${PN}_XX.ts || die
-
-	default
-
-	sed -i \
-		-e '/MimeType=/s|$|;|' \
-		-e '/Categories=/s|$|;System;FileTools;|' \
-		${PN}.desktop || die
-
-	sed -i -e '/^INSTALLS/s/docs//' ${PN}.pro || die
-}
-
-src_configure() {
-	"$(qt5_get_bindir)"/lrelease translations/*.ts || die
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/qtfm/qtfm-6.1.4-r1.ebuild b/x11-misc/qtfm/qtfm-6.1.4-r1.ebuild
deleted file mode 100644
index 22efcc7f255d..000000000000
--- a/x11-misc/qtfm/qtfm-6.1.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils gnome2-utils qmake-utils
-
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
-HOMEPAGE="https://qtfm.eu/"
-SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-apps/file
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-src_prepare() {
-	sed -i -e '/^docs.path/ s:$${TARGET}-$${VERSION}:'"${PF}"':g' fm/fm.pro || die
-	default
-}
-
-src_configure() {
-	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/qtfm/qtfm-6.1.6.ebuild b/x11-misc/qtfm/qtfm-6.1.7.ebuild
index df621215515e..47ad9c333070 100644
--- a/x11-misc/qtfm/qtfm-6.1.6.ebuild
+++ b/x11-misc/qtfm/qtfm-6.1.7.ebuild
@@ -27,11 +27,6 @@ DEPEND="
 	dev-qt/linguist-tools:5
 "
 
-src_prepare() {
-	sed -i -e '/^docs.path/ s:$${TARGET}-$${VERSION}:'"${PF}"':g' fm/fm.pro || die
-	default
-}
-
 src_configure() {
 	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
 }
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index e8eee702e2f6..3583c65a09c6 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -3,6 +3,6 @@ AUX spacefm-include-sysmacros.patch 449 BLAKE2B 29258b6d1a23291e51a5c4be6e579bca
 DIST spacefm-1.0.5.tar.gz 3491483 BLAKE2B c00ff3d92e01095b854ee4948ee8827ab32f454d4fd19e496f3d4a70dad2d8a98b67f6cca53d2026d15eddca23b1b6ac5f0394a66097a4efdd0f42beeabd4ffb SHA512 f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498
 DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
 EBUILD spacefm-1.0.5-r2.ebuild 2467 BLAKE2B 4da4b06f00fd300d98589abe6ae1314cf32aeedb8240a7bf0bc50b75fe2a92125f8c6ead158bc1a680db52154363ecab4e696da619c17248b6572f96568f997e SHA512 a3201aad465c716325eb234fee9f9fb295c9e145456ef2fdab51bd72508b9b6fc1ef147cdf62de181cfccb0c42b4d4d143aec7e53bb371a62b33fd170ac32e2e
-EBUILD spacefm-1.0.6.ebuild 2610 BLAKE2B 1bef8cbf50717d344dd6215087832e5016c3eca4b3779a9fa942f79fc9b6ba73eb28373bcd95a51e896c58cfc078f3a61a82fead06fb0369c988584cc609f4ba SHA512 b9d99e0b28fee5a2406b70012210cc0658bd8a066d2681068072dc0e6ac77f778c4ce909d4e50309f20f8342f5f9e884f6a0a764b1dfa1f83486229c6379ce16
+EBUILD spacefm-1.0.6.ebuild 2606 BLAKE2B e2a4dbcf40894a08f06beb51bfa8be7d0b89d67159211b68b22741911d6d4b5b7f1a950e802c666e506ea144ae68db89ed16240fb28f3b4c3a376affbd96574f SHA512 5f4f40a98d9e94b4cc4bcecb0469319e9d92d987cf5458268ed0059411b9a7bebfd94d4ba0e79960f45516e61bb53ebd98782bc971de36ebacac0f0c857ac11b
 EBUILD spacefm-9999.ebuild 2610 BLAKE2B 1bef8cbf50717d344dd6215087832e5016c3eca4b3779a9fa942f79fc9b6ba73eb28373bcd95a51e896c58cfc078f3a61a82fead06fb0369c988584cc609f4ba SHA512 b9d99e0b28fee5a2406b70012210cc0658bd8a066d2681068072dc0e6ac77f778c4ce909d4e50309f20f8342f5f9e884f6a0a764b1dfa1f83486229c6379ce16
 MISC metadata.xml 1201 BLAKE2B 139db734d4255de23a02e7458adfd425682ef2241c6fc890ba6ad7d7ed79b7ea75d71a64ff0d40141dbd2429e59d580c873ded77e3e8cbd4efad0a1e80086126 SHA512 62587e98d0e230afee44fae4c33c985d8f1d5841579465c2dfca33d7f373700e10c964bb7ef89c640e35d49e7e29b7fd7b8b2a1961940959cef0a52266c0831d
diff --git a/x11-misc/spacefm/spacefm-1.0.6.ebuild b/x11-misc/spacefm/spacefm-1.0.6.ebuild
index d7f32ee9c498..0c53c8c37fd2 100644
--- a/x11-misc/spacefm/spacefm-1.0.6.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="next"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 	SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index 9ad5c5698d0c..fa3bd8339acb 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,5 +1,5 @@
 DIST trayer-srg-1.1.6.tar.gz 27576 BLAKE2B 4daf93beffe3194a6cd9620826dea940d16670544bf8b382358b21414ab7d2a8a79bb165156cb556fc6ac2008931fc1010ed84bb67741954fe90ef10cc0c9806 SHA512 456af94277dc237c516fff1589060b0b656040811ae48bba3c021be6310d104881c0eee7391d228d197db78e9bfb04773d4282ab2fe31717a4779b38bdb6739d
 DIST trayer-srg-1.1.7.tar.gz 27987 BLAKE2B aaaa1609bebe91c7b2d3934d68075fa16f393896b7f9300dd6aecd7aa8666a7f3474711fbbc9dae5f72ed5ba8b63d0275f590a5a82ea4547b640a75a81012fc5 SHA512 5bb049af01c3f3f62dc8a5c1932985b92c98e4e2083aebd1dc09256746e097239be54ebc739801773878882a5c8f168a4a13bdac292388f79079ad52c41b2cad
 EBUILD trayer-srg-1.1.6-r1.ebuild 651 BLAKE2B ac903fee64af29c0089755972c799c05d828b7e56222b2df6a271873a25aa4cfa459d54eb664dd9db097e10744281097c2eb56387eee9892fcc14dffe4e79e29 SHA512 4611a742780e1c10ae142dc8799a88471f9063539142c67b168690a5e4fc12fc62c41cc7091649b1560c0519c66e12c3d29ac2e844ceb8e219358bc4dbcb12a1
-EBUILD trayer-srg-1.1.7.ebuild 756 BLAKE2B 77260820f9fe85a1365784565812a08924763a33f1f3e61f485e9f39431885623285b320e9d7550d24c8ab1f64306a2df5e63fcdcbabc146d56a9ac4422f301e SHA512 8e4a611d5b9c36480c1c35947aa8ff15c841f77484d2aa79ea1c5452d1d4271609efe86b2e995ff34cac70801861ee1e3f909f300459155503ca491030339b02
+EBUILD trayer-srg-1.1.7.ebuild 752 BLAKE2B b67198b29f126d064e4855e70e687a615ac2554f07e62235b5f83d8ab235f0ca2b0cef0a3e83707f7fb023b89e28fdc045260eb96cf91bef8ef4ae66d004034e SHA512 1bb1ee2f65746cbbcff4d3ff081f7adc3bb003e77696b1247a4904829d95afa36fd738216e9132dac062ced02ce04407793cc737797971fae2a758913a9fcd22
 MISC metadata.xml 249 BLAKE2B b308f3f4e67b02a37d7df053cda2ce801a2e355f212a680126aa3338811fc6127838aaceaafe156f9afb871de57a301056dd9af8d0cccd32fdc79e2abce4b56f SHA512 a354c9b99e5ee4dbc44e534e5764479ab0f2cac37ce7d9699f0bd668653352c25c630be27239a3a1c3e3ae391891df7c3855e08dac224b510f0feff0c060ea4f
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
index 2bbf335312e0..75138fe906a1 100644
--- a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index 9fff2d5987bd..6da53ecd2979 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -2,6 +2,5 @@ AUX trayer-1.0-as-needed-and-pre-stripped.patch 681 BLAKE2B 9cfc48673198f86c0596
 AUX trayer-1.0-dont-include-gdk-pixbuf-xlib.patch 1300 BLAKE2B 7badd5397e756d352f8f7afd0ef2008ff3907b3016a2062bbee263a93e064a912e110407d4099685d0196ebd590f42864a2af2154910f6f132df25092991d62e SHA512 76455b1cbe29979b14ea22a9978d1dff9fdee0ec08027464fd0e93d41ddd4fb5149e3936ff63fa0682e30c6ffe58bf11f7a78ce305fc5aac1d5fa4ebaa29a1e9
 AUX trayer-1.0-dont-include-libXmu.patch 524 BLAKE2B e81700086751d315feee7e00844866536daca99cd1caf04ab7fed2f2c90a16fdbb91c5110f887c66b0118eea178bb795faceaeceefbc91c4a4df402fbd57f84f SHA512 6dba64b746f655db3c7666f8504a4a3cff06bf91cd475d576a4e50839b3a2fb63c190f62082dec694559fc1d0cf7272d93f629b7ef6e49bf3599d6f36bc22dd0
 DIST trayer-1.0.tar.gz 30445 BLAKE2B f95df1496392064b803e712e57a4ec76ed6e9a62dadb254eb044954e38620590cd486dc37d46d56598a7f2db5f27051db47e78df2d788092ccf3cdb7707978e0 SHA512 c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7
-EBUILD trayer-1.0-r2.ebuild 1064 BLAKE2B ce27623dcb0ee7e4e1688e57f32fdcf96295004084a1e921be83a32800fee62d9bcbe8933a4f1c01a1b1af115b29f092afdccf64577c87dea7b75bd6d509615b SHA512 50a814f3e734a2674db2f2611f6689d1ca8f508e5295589090ccded2daeeecc8306532ddae3145e97ef9d3e499aa89ce715d6f353a6b240b20bffc8e893352c6
-EBUILD trayer-1.0-r3.ebuild 823 BLAKE2B e03efc65307c8a2ca071e1c6aa9081ca2275584c59633d455ae8b7639dc0cdb9cdc0332616cea6e1c319d8ee0c074549cf4c555dd6d8fc5374fe3176e636c0a7 SHA512 5b1981b561577ade4b2097553c683e978993edb670f76af33b143eaafd9e68f4a0b1f705ba9376e9ba1dc753f4a187928ad0236bf58f57fd5efbc97f58dad046
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD trayer-1.0-r3.ebuild 821 BLAKE2B 7029f6eec63577a2065505996e1cf6fe4f59a44f290086da6551e7782536a486978c451c36fcba0a653f9c2a986950dd3bd0c790e332965dbd0afb18d0120c1c SHA512 d93e6bb8119d547e2234ebd2463376002b5ca8088e04412b7a82e2cc6aa143d792fec0708644f916071b737ccd71ec856db0144d99e79f7bd650d1f0a309eb0b
+MISC metadata.xml 220 BLAKE2B 11299b6e9582bb55f5decff226d1917da6e8d665c1ff3f95a035963a51f1ab529c28963908fda5a64b9ba0e0b608b354a36d605ef5826cf1698937316c8b4932 SHA512 8e96ee3f78ee96ef4b61c89b6c82a43f03d0a96dcd3af136fbabd1cd2635a27d98d9ffdbe9a87d9fda9b0feca21c7d223cdbd89d35b1a096e7fe3655a9621607
diff --git a/x11-misc/trayer/metadata.xml b/x11-misc/trayer/metadata.xml
index 6f49eba8f496..cfab5bb7c8da 100644
--- a/x11-misc/trayer/metadata.xml
+++ b/x11-misc/trayer/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="project">
+<email>desktop-misc@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/trayer/trayer-1.0-r2.ebuild b/x11-misc/trayer/trayer-1.0-r2.ebuild
deleted file mode 100644
index 9876527f2e6f..000000000000
--- a/x11-misc/trayer/trayer-1.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
-HOMEPAGE="http://home.gna.org/fvwm-crystal/"
-SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gdk-pixbuf[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-dont-include-libXmu.patch )
-
-src_prepare() {
-	default
-	# fix for as-needed, bug #141707
-	# fix pre-stripped files, bug #252098
-	sed -i Makefile \
-		-e 's:$(LIBS) $(OBJ) $(SYSTRAYOBJ):$(OBJ) $(SYSTRAYOBJ) $(LIBS):' \
-		-e 's:strip:true:g' \
-		|| die
-	# fix underlinking, bug #369591
-	sed -i Makefile.common \
-		-e '/^LIBS/s:).*: x11):' \
-		-e '/^INC/s:).*: x11):' \
-		|| die
-}
-
-src_compile() {
-	emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
-}
-
-src_install() {
-	dobin trayer
-	doman trayer.1
-	einstalldocs
-}
diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild
index e0414fdaacec..1d79f1312512 100644
--- a/x11-misc/trayer/trayer-1.0-r3.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 61ae3afe77fb..30ab70c9fce1 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -2,6 +2,6 @@ AUX xdg-utils-1.1.1-ktraderclient5.patch 1542 BLAKE2B 4b6adf3d181f1a7869c14d475c
 AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bfe38d70e5b1d1f792c20ea4de166096137d0c393a38b4958e1044aa2a6afd4437b9e4eb40d1223ea6b7dd905e93e0499a88478a3 SHA512 fd30975e48a3a7607a812bcc87d5a9595875695693609d477acbe9826a52c53b14c66a4118888eb6d8fcb63630c5f614250f4c8640d1ea99710b26714920c019
 DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
-EBUILD xdg-utils-1.1.1-r1.ebuild 2181 BLAKE2B 18d2104aec42d81ff47e5ec2fe6659304217af3b36e76c8ab8212282c2cf3e75f087cc3787eeb76d4050742b59d35d12e62c99a4aecad3c17ba9f9369dc04ff3 SHA512 c6681cc7404329d3206a20188380c923ab24fdee29f917e42c55bdb3aa31a06b6711103d599f817f4c05121844c262489b2de374421796e4ba06c509d6d8c619
-EBUILD xdg-utils-1.1.3-r1.ebuild 2135 BLAKE2B 61faa38102e1ce409bac5f70256e1cd8aeb761654f24bf2e0ba642f380a868e952643ee46d6fc272433dd71c3b6d753d81773ba623367b934760de2722c0c5eb SHA512 90f9d2b5ccc24552e294adb881ccc8b438134db8ceec167b53016b02a4b43efaa31d558245df72abb821066b8d5b17cc7f1f95fdd78e422ca13e100ebea65b3d
+EBUILD xdg-utils-1.1.1-r1.ebuild 2193 BLAKE2B 0807a3c8c674f9c6a26fc6bf78a9448c3d65c6c092394cebd35a29cc3fc824af7a42747593b4ec7c38183021335708b8c1d88a6d18eb5898ff665588be9d3fea SHA512 53f1736f62c34e4baeaaad6451ce3476a52cfb2ddc82ccf5b71fcd2e96c0b87ede082cd30bf6c0e42aefb66af2f297fb8be93eea90ce29f531c8336d3cf33684
+EBUILD xdg-utils-1.1.3-r1.ebuild 2150 BLAKE2B c8ba1b1862a4caf91425fff76c879fd7178a00923b9bcecd57207b424a6b4ca62552276e3c81dab402d89d12baa01b8608bba5e21d14d6b55e3f9acfa6069749 SHA512 725485e88dfba73e17e7ba6f43828ae4943aa6606056e71442c538968d06d5e73baeb8902e6ae58d4e77658a4c7163f048876ddbaec38ff3b34fc2098d72d1e5
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
index af90774c45dd..78ef40a63faa 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -67,5 +67,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
+	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
 }
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index 17f10243d785..4e46bf29f1ae 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -74,5 +74,5 @@ src_install() {
 
 pkg_postinst() {
 	[[ -x $(type -P gtk-update-icon-cache) ]] \
-		|| elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
+		|| elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
 }
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index c39b12ef6510..7b238f4190af 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,6 @@
 DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
 DIST xkeyboard-config-2.26.tar.bz2 1061733 BLAKE2B d07bbe28d5621aa146fdca089f60ebf293aa9b39b60fb6f7335cef934ff9edc6a11475ff00b7279a960cd9941f91260f25b7502fbe421bd8bf5c0da53f7a3471 SHA512 5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef
 EBUILD xkeyboard-config-2.25.ebuild 1178 BLAKE2B 7eb3a66b616bbf51ff8f28ae9fae57f1842ca6af23956be1d3a97a7efe4378975f557cef979e0d91c34dc2610e97bce1e0549c54d7e1d445fc2d01b12b1cabc0 SHA512 fce43266643ef25c8274a6b0fe3812ae69c49fbe610835870e8a6bdd42667e0ca00d26c3ba9b229ca9b0c6c4e760af099ed1ccb1bf114ab3d1b47eeb5e05d890
-EBUILD xkeyboard-config-2.26.ebuild 1189 BLAKE2B 59522c85a56b7d9f606f33894e78bb12814a21b5aa82301260a53820885ad1bd363adf6f60a9d4a42406b02f6377f0251e3784c75c1e92affa98f71cb8693658 SHA512 d399e502fbd1018841199fb5068cff3728cc9cafa1897f027ddcbb2e6a4248a3c22fccffefce6e6502195507af9a8726771ec34cbd6e73cc94b3b7de9a05e5f6
-EBUILD xkeyboard-config-9999.ebuild 1189 BLAKE2B 59522c85a56b7d9f606f33894e78bb12814a21b5aa82301260a53820885ad1bd363adf6f60a9d4a42406b02f6377f0251e3784c75c1e92affa98f71cb8693658 SHA512 d399e502fbd1018841199fb5068cff3728cc9cafa1897f027ddcbb2e6a4248a3c22fccffefce6e6502195507af9a8726771ec34cbd6e73cc94b3b7de9a05e5f6
+EBUILD xkeyboard-config-2.26.ebuild 1189 BLAKE2B 5eb12b9045e87c0a139df9ff4c475d246fbf15ba9ea3347fa4f4ad9efb93f8ac0f0bbcc3cbecebc8f19630618bcfb99bb3e6a5049fa5e0de64836e21ed7599d5 SHA512 712068ad436d86e8bfc97e7654f30a0e6ecdc20b0fea81be2e4b9bf1136d3ec9c6e5512a0027d709eb147d50622c22cf442796875ea11918251934f01a86140f
+EBUILD xkeyboard-config-9999.ebuild 1189 BLAKE2B 5eb12b9045e87c0a139df9ff4c475d246fbf15ba9ea3347fa4f4ad9efb93f8ac0f0bbcc3cbecebc8f19630618bcfb99bb3e6a5049fa5e0de64836e21ed7599d5 SHA512 712068ad436d86e8bfc97e7654f30a0e6ecdc20b0fea81be2e4b9bf1136d3ec9c6e5512a0027d709eb147d50622c22cf442796875ea11918251934f01a86140f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild
index c66a3d428493..6ec7db351529 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild
@@ -21,6 +21,8 @@ SLOT="0"
 IUSE=""
 
 BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -29,8 +31,6 @@ RDEPEND="
 "
 DEPEND="
 	${LIVE_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
 "
 
 src_prepare() {
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index c66a3d428493..6ec7db351529 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -21,6 +21,8 @@ SLOT="0"
 IUSE=""
 
 BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -29,8 +31,6 @@ RDEPEND="
 "
 DEPEND="
 	${LIVE_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
 "
 
 src_prepare() {