gentoo resync : 18.08.2019

26 files changed, 209 insertions, 90 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 5264ea7cf763..0de8df69ff81 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 990542d34fe7..fb8471b005b5 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,11 +1,8 @@
 AUX albert-0.14.22-qt-5.11.patch 703 BLAKE2B bac316c4a75d1bed79517f4e25c7844c5e3671f85051a9654c31a1337dbb692c6f52b2adee38c0ede081b0230db0c1cb4e963e875cfae717fc98839180dfd42c SHA512 e27bff9359ae9b3c7ee1be0ab1098073ccbaef65eca316351c63c616a4772be73cefabb9ee62f9b79238eb039520d89f4aecc79eca5f0bda7490e231000490eb
 DIST albert-0.14.22-plugins.tar.gz 540446 BLAKE2B 22cf69698614a1b0e97fd1f5e3224b9097141c4a32c7999b9468c3c59b6af0d7a753de59a7abeb07f9ef9655abc05b8cb5e5079c9b41eb9f51dc09291b89b635 SHA512 4cce6ad717991a6a2293b491f17838a01ba51e4222deb78d5b793ab3390692131f4938027b96863c6cd61ec7a764fa6d52b3c3ef33cadd3183b2fe1498b6d344
 DIST albert-0.14.22.tar.gz 84925 BLAKE2B b009bd0420f2e5894e2e71e526361c6b177ceb0ed9339efd276228e3cb8aed52eba811b8f2f6ade8f39357017458f2cbfddec25f0df4de8d12397451bd98cb57 SHA512 91c131140f666dda665e07e617ce0d2af5c776233f9cf1430aedfc18299dcc22c6dcdec4d82f15fc2d81fa44679f9d3608a47128d33bfbddeb97481b430608c8
-DIST albert-0.15.0-plugins.tar.gz 534292 BLAKE2B 1eef450bb575ffe3439248f49659e4e6535ae595c7a69dab7517e8bd1c4ce9a2a88ce370807fb1f0948a8da76758b6773b91e982fe8bbafe572b1071d1126265 SHA512 94b64e247dabcca11e54ac06ce57578709d9634768648ce8023c5f6065124077bba58c5913a191c27cdf189e9a40eb5b0abbd071a3080d3c950a753256445650
-DIST albert-0.15.0.tar.gz 86557 BLAKE2B 58fb745fcb2dce6f78d66c655e7051031f8578c12ff7cf680d6b5ae63bbc03b60d43605523f3d31dbc4972c92b8fae16880ab660427ec30c0048cf6273924248 SHA512 9ca5e419fe6314a81c03f8440219d9dc1b248504b8a0adcc42006c53e300e7f480081dfb90800c64b47a928ab669a6fbc8594d32a923443c0d9843133b2a5715
 DIST albert-0.16.1-plugins.tar.gz 534401 BLAKE2B e0713ee446b0c98a44489d8a45d60a1124cd45dd06af207ca8b8aeae4b6872a8705c3fa58e1636a4e0f95b4885253be4fd6f8376c12dc6b5110cbf2923af4d09 SHA512 3501efae9feeaf1090c1a1a3de9ed9e5788c8029dca76e06891683b43b69e5711f3c62187c273b11c418f824e9e0c0530bc5d248b37b96553fc5846c93c21224
 DIST albert-0.16.1.tar.gz 68739 BLAKE2B 4794c8aa4d2997ccf4c2d88a36c1e578ac3daa84fdd7dfebfa08941f692815a085ea2140aec9b3944c6ff8e71a4628510f9b28857137e39396be278606812640 SHA512 49dae5722982ba3fd4a25fcf5f398d8fe8d4bf66d15e2783a699174ff7196538c11ec9dde4201174c7fc7ac0852f2491b5b68abc196077305c89e22d8e1387ab
 EBUILD albert-0.14.22.ebuild 1407 BLAKE2B ee85919ed2a532f8498530daa20e748d2aa2327bade782b97d126e221c2211913584f787ebb653e136f70daf1a1911220daa987f73106a8fb3c1835fda543817 SHA512 fc71f4c8e139e1e0dc86fcd60dbba8f911a54eb989ab60957fb1fc9fba7314d5319cff2515c8b0ad246a8cda917a14b9a798e2493161db49f531c78c0892138f
-EBUILD albert-0.15.0.ebuild 1381 BLAKE2B 8f1f44142573fe82fd46fd9e2ec8b1982d9cd30bbcfadb5866614a4b6c1e3c9f720b3a298b89025e4df9ab4aa591f3705e3ed108ea7c5b985939ead85391e719 SHA512 3ba2e4252328a26371496de81b4d79785b33ed9bb5b94a15205289281ff355d00e2cc060bc410fd4ddfd8e60a5ee4521f73efe7f9001bb0d1151c4dea28aa001
 EBUILD albert-0.16.1.ebuild 1372 BLAKE2B 9283b51acf6d42fa4f19514edaf8b430f8ba157e8652551457fdc036563bcdc11c59a28e865bee8bef56ae73d28e1e211b16f564b5d0cfa23b31e26711d72c36 SHA512 ec4c97675af1e9e9668e91c60f32dbd705640228177f010acb5245a80da321074eb52a5755b4bad8a281feaeafaff275ad9cb511a444f989cec5815021f35392
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.15.0.ebuild b/x11-misc/albert/albert-0.15.0.ebuild
deleted file mode 100644
index aac09bb9cd80..000000000000
--- a/x11-misc/albert/albert-0.15.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLUGINS_HASH="2b232eb7fe87b6cdf861815ea2f4f7ba4e4c46c6"
-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/qtcharts:5
-	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 a711911bcea5..e44449e70078 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -8,5 +8,5 @@ DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72ad
 EBUILD dmenu-4.6.ebuild 1268 BLAKE2B 525a04d499b2b5f6cf2f3b4abede52af3c7cf637185cff3174841b2c833468887b16a54614c7ce97f5a74a924031bc971706a0b79b427197878087fabc6105cf SHA512 6950b25d07543312738ee66bd8031d6a12fa3b19aa9323f1a1847bcbdf79c18e5f23f813b40784b649f4543b64816d5c019b8e5c87c275ea1cf91e468cafd98d
 EBUILD dmenu-4.8.ebuild 1337 BLAKE2B 3982faa7c70a14d9af9172da682a27c40a631a001ec46cfa1f4a6b413a4db033f27f21b1ba9dad630bc726bfbcf2150826edada2e270e5aebf037e8b17f88059 SHA512 2c891ac9e9c21df2787f337a7bf8139e1c0efaeadaeccd9720f7bdf21c15ff23b0963029cebf1f38056ad5b8e124d16c346b9644085344de23b3f36781b24b2e
 EBUILD dmenu-4.9.ebuild 1424 BLAKE2B 3318e050fc27188448df4875d8f76bc2343fe83a6fb075e26ae712a1337aee3a0b3d2f0306bde2b4095f44ef83e4c5d954e5342e1fbf325bb0887d17041709ca SHA512 eeb74f5a268a799972f6d7b41d5ff8fd7dda864735e58a516c8d1ab6193f30f5b1502a6e9fce93c38b3d430261ed39a9519bc4ee085e1b26bbc139a384caef4d
-EBUILD dmenu-9999.ebuild 1370 BLAKE2B 158e394bd5b609af85717452f913921291556333224d07bd82b5b75d7e70a01d4be7ce17014d41a4647904715e97c004c700bc516f34b3ba0385489d7b3cb293 SHA512 71a19ebfb39776e2de6cdee238c59461ae2f95e24278ef6d3c84ad54c681e7deb39edddc7007d31b2135062912f40b9681716bc8a71eac4d242e2cd20a127dde
+EBUILD dmenu-9999.ebuild 1375 BLAKE2B 35a86f3d75697c2c2cdf2c7298103dcf0a97dec40b11432ebe571f3d0df3deee399035ea5a59ea2af5deddd768e5e7825e75ad02a32836153cf0b401aabe25aa SHA512 670b62a9a32187a0ec812c4d0069f9020e5711f46aad32fc8671b290a7e986ed544c04020b5706cef980801aa5265fe9091ece0db6e40aedf0cf9ae6f519ede8
 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 ac2f60df320b..3401a00001e7 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-4.9-gentoo.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/enlightenment-extra/Manifest b/x11-misc/enlightenment-extra/Manifest
index e42512c7ec91..9662662193b7 100644
--- a/x11-misc/enlightenment-extra/Manifest
+++ b/x11-misc/enlightenment-extra/Manifest
@@ -1,3 +1,3 @@
 DIST enlightenment-extra-0.0.1.tar.xz 374872 BLAKE2B f067ae5115033d5b87783584327ecd5e08b3b38998d2f9e20b70b135b7ec25106fd92abf5314c2af580cfbcc66ecd65ca7e434429708e1abe8d02dd4b0e2ba98 SHA512 40cf1a19c48cb6f14fd7fbed3223eabdbc69260834480e4463495af36fbfa1d00b7bfe3777998a17e5081b14e66080dc3013a6d3a6c610a175a08c99b4e5529a
-EBUILD enlightenment-extra-0.0.1.ebuild 848 BLAKE2B aa6c027f5b33009ca0fe4d39296b4947b5d0e4c30e897107e40a3c09f17e913a588afac77207539732ff4b45a3bd18b85876f0f9e748313e0f5e1291995dd787 SHA512 02caa297c9a9d718a8ac932ae6a493729cc0d375c318dfbfd9cf8ce22348f179ed0af6f3c4ea03cdd75cc1e8c8e5e3775fb1b21363369f2d548e0b5044156120
+EBUILD enlightenment-extra-0.0.1.ebuild 851 BLAKE2B 2b9771b8eff4ab903638c5885649543ec48493bfce9c2d634bf573d2264df8cf8fde23ff4903f613876f63a179c4d7db133380eac1b2cca7924b08648fd5813d SHA512 da363d5c03c857c66bdf5649d5a6b777ba318296cbafbcf235883f364472db53f4ddd6460ff5c18035777c472b1c2df21172169543e33fe81275f56af0a79bcd
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.ebuild b/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.ebuild
index a7d39571c7dd..376f6d84bf52 100644
--- a/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.ebuild
+++ b/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.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
@@ -16,10 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/efl-1.18[X]"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}"/"${MY_P}"
 
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index 5a08005181dc..1e43db797a42 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,6 +1,8 @@
 DIST gigolo-0.4.2.tar.bz2 243877 BLAKE2B 7536d8fc1a10abb465b2150785f593c88b4d0a40fc76e1f88388a1631f874ccf0169dec9328b1051c39d6334257c765b409aefeb008a4dfd30bdd9e61d43d269 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532
 DIST gigolo-0.4.91.tar.bz2 248666 BLAKE2B e258e494b4260158df4db4d3c6cea813667122a2b57059a71c35338d879a191264f8ed315bf686cb48fa3879ecf0f37c170852fb731f81020a69ee2dbaa71e1d SHA512 35cad4a072980ca688d414ae14c85c9463364c44dbccd0a3286a8fa767135cab24577ec6ca66dcd9f32263d04ea4ea4ada4330f849911ab3289ac9e6dd45583d
+DIST gigolo-0.5.0.tar.bz2 246473 BLAKE2B 23459a57467fefcc13c61483397837da51294fe7945619e0580b034dac14da192acb349b2334669f35ec43e1e421664b1765fb1e51164d7dca76769f27cef075 SHA512 5f33f24169c2a8e3a450926668e4611aa0a9c669edb6ef6e53bccd77228ac78b40c4916eb4a20afcd9d5d7e32373e8f13fd1cf43366e65166a9ef09366c9703b
 EBUILD gigolo-0.4.2-r1.ebuild 707 BLAKE2B 3e9ff659fa2c0c36ef33f71d62c4a706917e3d6e2074fe77644b283b7052d2ce0635a31d50686b4915efd1b2a18e161edc60c5b82f36a71e51d9db8e1ed2241c SHA512 f342f5f9aa1bc19757f599aa4dd78047d37bb0ef1df172b8f9139ad92a4e52386b22faa42cec253c6e11df7d88f18335de0c122daffd8034242754b7b1bed053
 EBUILD gigolo-0.4.91-r1.ebuild 849 BLAKE2B 3931d06fef3c8885abc8baa7d5a9c1c724cad0562d2f7cbc5c105b0ac6790ec640d0a10d1376c8c8ff4753da9913efa82b1696d617f24c6a5a784a1c38d28794 SHA512 c2b1cce69c9645eb87ffdaa37ec3b06c72212e2b861b3d9382821bfac3b63072725606b1b4abfa3a9ebcd1e44738c583e5adde1721a536e7ba53cf00bb8acf51
 EBUILD gigolo-0.4.91.ebuild 704 BLAKE2B 72ac4bd1f1071a5f48a6e01ef142952e19cc76f38b1165ff4df54ea3b09ff30073c4025f076a955e536a5033024420cacadb69a870f0fa01e652042c7e0858a4 SHA512 b9cf5b7c221121359edaa12046c26e517ed287da5ed3fe12422233f032b3ef6b55f545c7629e0422f3ff49acaa5cf46b929ade4ffc07f687657de130299443bb
+EBUILD gigolo-0.5.0.ebuild 704 BLAKE2B 254a89e7e5c4102a9bfbcbec7fa4065020ab3e192c0d439b70fcef75ffa989eda044d8467061c063d3f4a9e3187fe5c1e46ad0a8b71e7d6f92cd47798cb1846f SHA512 d9ef1ab87166707baa6f1a8c721fcd2e3e32e6208554addf37e56e7346609abdaf5082bd782ccc43ac9b7b856ec6c15e943a1612636f53cb9b7e66f443ab8bd1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.5.0.ebuild b/x11-misc/gigolo/gigolo-0.5.0.ebuild
new file mode 100644
index 000000000000..697b86b30161
--- /dev/null
+++ b/x11-misc/gigolo/gigolo-0.5.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
+HOMEPAGE="https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-3.14:3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm COPYING || die
+	default
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index 419a3e41fee8..6762f04b3282 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,5 +1,5 @@
-DIST kapow-1.5.7-src.tar.bz2 855284 BLAKE2B a153b8e6356850d66f3743d91b2be685c9c51d2f257fe37b89d95fc3fa640babcd53470de0a7097174b87c2ae2cbef530e09e58d53b024fb893959354d1ca4b1 SHA512 05244e3c76350af7e7e3c35d70eba30580221fcfe73d652944d8dda40d5d630b037440a4ca296773b404bb7555b3c4aaba988bc51593456150eb9b2f69d1d2bf
 DIST kapow-1.5.8-src.tar.bz2 834178 BLAKE2B dc24e2d47e3e8286336e4de509e2486f0b6f6c912e5be532e36035e6fbff09a0f0453108b061aff2aa7bab45e1c782b63ee94f6183d17b0b50e04c24611b2e7c SHA512 168e9581b360a905e24d8dc4d01af58823789f4ea6fe533744c14d9c6830720e640923859c2726c51aa9ef9064038a2bb920960c74ca858e3fdc6b0ff17cf861
-EBUILD kapow-1.5.7.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
+DIST kapow-1.5.9-src.tar.bz2 834677 BLAKE2B ed02b76e8c764ccf7f9fb752322dad61113c82348bc4e75af2858136369423a02114b312637460cfa1127fa0389f50ea951aed5e69b3e90d276aa10ea7e52be2 SHA512 a026b2254835b4eb2d211bb8b56d68e6f07c07beb79e2b019d2ce108b6197e812222b5964f889fe31b856a0081107f3fca314684883b3eb3f778f6fe7cceb0b6
 EBUILD kapow-1.5.8.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
+EBUILD kapow-1.5.9.ebuild 1270 BLAKE2B e1ebe6f085891173ca39f0173eaa089245633f90b31bc0eea507a6b825ba910b23a39d8facca6f264579419cf49b5fac5e647da47461cc03a097010c645516d7 SHA512 43aeacbb55847320bd466e12a04a86b967f3f0b5e3d9b303a765a2cb7284d2177f7f41aa7f17d606ec29332f82caf039b2ff38137d53da6c0a24636eb98865e2
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/kapow/kapow-1.5.7.ebuild b/x11-misc/kapow/kapow-1.5.9.ebuild
index 2dd79d2b2ec0..82f1e9777440 100644
--- a/x11-misc/kapow/kapow-1.5.7.ebuild
+++ b/x11-misc/kapow/kapow-1.5.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2-utils qmake-utils
+EAPI=7
+inherit qmake-utils xdg-utils
 
 DESCRIPTION="A punch clock program designed to easily keep track of your hours"
 HOMEPAGE="https://gottcode.org/kapow/"
@@ -59,9 +59,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 3a1c24da05fe..d5e277572367 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,5 +2,5 @@ DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c
 DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3ab4891a119f1d416c8011a80d06e1916ecb5903f4c1af432052cb05a72aa38cde38293dd90eed00295fec5ff758e78576e10e SHA512 1ae31a36e19a2e8825bb0bfe4eef51f317306636bc0f14df9ee4c89c81d60ce7193d74e053ce59ae50c6fe05d27be73fb5a83cce732a0df4a3b4390539418fad
 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
 EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2082 BLAKE2B f53208b088b0376a2206c982aa05240baa82701d8ce2da8b671dde208aebfdf8eb3b77d5ff496586df3344f186463021b50eac26bd330e3936d4278873df2754 SHA512 6765efd4eeba09f263eca279d9024d98c11e3f390db3cbd159b92245534d9eb435955f0ed9f8093c42d8c788d425994e0ea38ce68fc803ab4ecde173450fcca7
-EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2060 BLAKE2B f0f3559e127bc025fdd3bade81c66328b7c2cc688135624dd526f2d76b07432c1b7215795fbc4bb9bb55ae66209b0cafcb8c38736de0792196fdf0cf2aab521a SHA512 cf707052dcfc482d80dc93e0a5ea0919636e0bfbc7dbd1e2b9ffe73a11fbf8498c999d4d704f68abb6c31e0f3a654822c1667c4ecd49147d3503231d8426e7a5
+EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2067 BLAKE2B cc9bccbf51bf4442ce17517dbe2a8144428d4f5c66715dcd1730632a085c0c9e42acb4f659ec3b84b08063eb75884c5a3ddd8e4beed004d0c93a096329f76786 SHA512 daa125ad030a5eda55fc81ee3d411769e3fb4718613edfff9648f2df426d78c700a66094fa9971dad662f7b5e6d765241cc9dcbc6bea5753258007084522b497
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
index a849527c639a..fd4f5e0bfe13 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+downloa
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
 IUSE="ayatana branding"
 
 COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 4d1ec068828d..9c94ebc2118c 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -8,5 +8,5 @@ DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b71
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
 EBUILD lightdm-1.26.0-r1.ebuild 3851 BLAKE2B 818d44e66767fc8ca55c143ec008632aab9985abd2d00697db4ca46f129c7cde81f4a385b36f10ef67664142f4b464fa95519897c18d4af61f559587acb98765 SHA512 816e627aa18bb213f41e629160d6466494459720e264f0051e5888c870166f818dc5067a75341899d46b9e34f019cbd5cb1f160060666b849bc3bd0f3f1ec426
 EBUILD lightdm-1.28.0.ebuild 3919 BLAKE2B 16c4efeacce0d6b427377290028bcb9ce4a29d572937fd4e2571cab89b2705716d28d4a4dc5fe8bd7e7dd700162fbe6caaf2eaf0bc34b318ecb1c60a789a731a SHA512 5f093583e400151c196da0460f9bc95a7d1b8b8a5c1390caabac3d4b23d539aad4687c6f4cddda0e71abd566976d9b5f71f58300fee56183196e8a9f3768240c
-EBUILD lightdm-1.30.0.ebuild 4265 BLAKE2B 176bafae00f663bfd866b164ae00c11dae0979fe7fcd65e2c1b77996e7e86bb09c13ae5a89971f64018ea6d0de712714dd9d95afaa2e0c2fed04a146a1a61c87 SHA512 ee84c18e2778e4eb431f3d30ae2501f3df4e9e2bcb6d918b7702540281af94e12311d283bbfcfd45b5772457c3397b37c4ae779bf58ea01e3a74dad4c20b3030
+EBUILD lightdm-1.30.0.ebuild 4272 BLAKE2B 4b237666154d7bf814c566f653ecc730e0b01e9649fb45cb418d4f4ccb5118f60dc28990290a040b41e07694be4e11fa4a7239494e2ff848a2a9990c6919502f SHA512 78f56a3dd074c960cbfea0595ff4fcb3e9ce328717f4d26c328d0a6eb92ba2f0cdfe99f4c0f3fedad051c7b5e15224d392cd5067e3ea74870f59e2c544eb16d5
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0.ebuild
index 547beddb26df..ab19d4b3216e 100644
--- a/x11-misc/lightdm/lightdm-1.30.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="audit +gnome +gtk +introspection non_root qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 9855dec43040..54cceeed03e9 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,5 @@
 DIST mozo-1.22.0.tar.xz 178924 BLAKE2B 6cc74cbdb7342d926483948391798cc9b0be66b63bba758b7ec8cea3f5555ae01f1ecf279053612ed060a283076bdac1a9ef8bd15e3cfe61d96685aeee168ae0 SHA512 f3d60e94d9bf5fdd435320856563622f0687cc2844a3d51473bcef5c442f4938a4030533271ead2fd88fb0ce805c16b40d629e5a69fc642e7e670a1afd5745db
 DIST mozo-1.22.1.tar.xz 171976 BLAKE2B c4a1166b605d3fed68b71987dbf70b7f908aabc2c7266415b0d7ce4c8ccb93ad690c72ce83a708f9d3518cfba66128d2cd4bc5413432133299595cf4d2c5a43c SHA512 6cd4ed04d43ae064077fc78ed59644bf6efe4c65c26995742166c57333d470fbe95ca4f4037e786f16dc076e75d938868948e8c2e5c662f35d971b36992f1a9b
-EBUILD mozo-1.22.0.ebuild 1244 BLAKE2B ae23b51bacfed9815d26460f2c7c0242f4a3eb7c28d64e4fc53a73270268ffc684f02857fade291e1cbb808f8358516327b3ec1bfbf4fa7772f4339fc91d8cb2 SHA512 fa4dc0fb9fef1d17abe494d869739f0c80217dfdd7e12acfb312a6ea3ba1598526d9f2e4243367a913a03a8767c8a9d97be0bdc679c5a6503704b2636a3b7da1
-EBUILD mozo-1.22.1.ebuild 1246 BLAKE2B 592a0aefefe293aac4f5939dbd2273905ede3fcd2710b707da5951a91f0e3e172fa3e38ff1b718c27e07d0a7476a4b4c9d6dbaa2e9edfc1c8711d43f7d7b33d4 SHA512 a6a3d232d8ac51fe27eb3d399556831bd4cf40f339b3205ae063339c96ec3f5cec35d1255793b9c50890caef875ab696f2e46be8f97f534c0203c3cb926c7ec1
+EBUILD mozo-1.22.0.ebuild 1279 BLAKE2B 35c97cf13ab5d94ee02b4eedf407e4d2a1aca0db32a21efd3620f92072fbef091da3f10bf3380651e2343db32e0c58f63c007264911d68fc4bec8732d254d7ba SHA512 ce95203f31463a73f20309a8652e971acd8e0f903c8bff8509c03ada0abd934b20cca21a85e2d3ac84e7ca3236a70473eea88ea76bd95fb74432b57802254085
+EBUILD mozo-1.22.1.ebuild 1281 BLAKE2B 9363e08f061a6263bc6a0998aae8e31d42c544173c06f35d785cd257f6516a18b23c982a1c741d0feba7648e2f5169f41894e24a544db5d7d22d97c0a0742e39 SHA512 c5bc0fe3e604c44e265c2642c50a51334113543e1b510d3e7cdd28a5e45f6e7672360c16e26dc34f3b2cca6492e9df76b042f12d958c8eba8ebb80dd7b7a2c4f
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.22.0.ebuild b/x11-misc/mozo/mozo-1.22.0.ebuild
index 06ccd7815121..8becd64fa9d0 100644
--- a/x11-misc/mozo/mozo-1.22.0.ebuild
+++ b/x11-misc/mozo/mozo-1.22.0.ebuild
@@ -15,8 +15,8 @@ fi
 DESCRIPTION="Mozo menu editor for MATE"
 LICENSE="GPL-2"
 SLOT="0"
-
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
diff --git a/x11-misc/mozo/mozo-1.22.1.ebuild b/x11-misc/mozo/mozo-1.22.1.ebuild
index 9c950c49491a..dec4df03ee1f 100644
--- a/x11-misc/mozo/mozo-1.22.1.ebuild
+++ b/x11-misc/mozo/mozo-1.22.1.ebuild
@@ -15,8 +15,8 @@ fi
 DESCRIPTION="Mozo menu editor for MATE"
 LICENSE="GPL-2"
 SLOT="0"
-
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 4dbabeb3042d..8a9b5219879e 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -2,5 +2,5 @@ AUX rss-glx-0.9.1-asneeded.patch 263 BLAKE2B 281738a113dc81bd661f75982ef48d5b629
 AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71afed34bcb09243ef0f8a60d46ea63fb2286e3b467e27165d2f7bbff7d2eb04849cbe10c889351f428b882b1e6d828fb45195 SHA512 706bc00bd5904c78bfc2858e7b6718b7288b401837ef9abf092ec7669eaf7f81def42e0684f28f3d9195abf00c5ec1ef0df617d2bcb0f55987f79e1914284b5d
 AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
 DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
-EBUILD rss-glx-0.9.1-r1.ebuild 3727 BLAKE2B 29ca700f51e3f37072e8f427a0c5c6271a0f88cbe96af2b2e4ed7ea6dec438eabba005264ebdc747249f04a8dabd1c492db9f4b767512731780d05c49ced1894 SHA512 d5de768a3dc6a8f1a89dde65cb05d057868fda01a7e3d7cb326501135f5ba1e5d0902aecfebf8d78c9912b7337307cba573befd01a22493959a9a9f68a4d76ff
+EBUILD rss-glx-0.9.1-r1.ebuild 3733 BLAKE2B 2a75282ae7eef9d1db806e194567e24f8c6d7fd241997131964506f425e5217afaaca0d2ddb5941fc3b5dfbfc7916ae93ab047798b239c20968c68f21ceb4863 SHA512 fc857a7b7bebc88ad3ffcc55c97bd8f44223ae867e1f5242221e5941a227c08bd4c628ea603696c8fa9c00b3570b39ad5e381a5c9fbea2cef3c84ec363c4e852
 MISC metadata.xml 444 BLAKE2B efed936fd7e5f9ec41b4944de689f03be14cc92c75759f91cb0f488599beb09b6fbed538df863a38909a674c4da4aebfc93b190765c9194280c62ee1b42bf9b8 SHA512 05849c2a8dbfed55c72261d2d977ece92058ddfe14565eeb22edb7d57ba2fab707bf8d97948fcbafe6f53a0880dcb651a6f8b4caf8fcc6935415c94de9443e8d
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
index 0e1a4f94e36b..1157f402671d 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
 	>=media-libs/glew-1.5.1:=
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	>=media-gfx/imagemagick-6.4:=
 	>=x11-misc/xscreensaver-5.08-r2
 	bzip2? ( app-arch/bzip2 )
diff --git a/x11-misc/xflux/Manifest b/x11-misc/xflux/Manifest
index a5bcf1aa65c9..7112936f07e0 100644
--- a/x11-misc/xflux/Manifest
+++ b/x11-misc/xflux/Manifest
@@ -1,5 +1,7 @@
 DIST xflux-20130927.tar.gz 335911 BLAKE2B 56e683a6969f129c7dcdfd4b13a23523ca5ce3d19feae947a654ca02437e372bd998a71048d00c5b7bf653eb9fa57c696b8d5bb1b3dfd75a0b17e9213368c1bd SHA512 c35003b9cc6bc95f6ce98efc2e69ea94c99ed31671ec5d1f5919294edd7e504d23aa1df29ec0f1d1c68c4ceafbcd386e1207ef4c9957d7a5079ce96c2ac6d924
+DIST xflux12-20170103.tar.gz 340461 BLAKE2B 81e8567cb7ce0980cb2fbee4a455d023fd76ee40d949b9616a8f2c4d15a361a286769dc91d67eb6d4391851eddb93dc2fa56b78d0f5c620fb56e69e82083d7cb SHA512 752da038c5b57042dd624acfdbf64926e73ab559f8f069358969ab91de158e6688b0c9f0d681f4400d0bc8f1b7434b55bff7725288ce9e7def49d31382770fd3
 DIST xflux64-20130927.tar.gz 339845 BLAKE2B 15751b75b7c0603044c4e7e98a9b23ceab7e245b12833ed1b6e8bc1d1734c5838777b7561d035bdf6d6d781105cc48dbda6c262895c310cf9710529a088b0a97 SHA512 6204558b8fa1063ee19fe444f740ab4ddfdbc412459b2f5cea94ddbf11818e0c9bff7e066a4958c1ab5c160b1aedcd18fa7fc4cd800a67c5d51ad1206f203e52
 EBUILD xflux-20130927-r1.ebuild 637 BLAKE2B 9e69e04e8cb2feab648340ae3b76aaca316d9fb2d57ee22174f4cf6c7b9ed322deae0dd14730e084d7f1df41e6420d5dfcbb2e7bfaa7fa0dcf03e0ddca661c93 SHA512 4d145d9811958436ea856b62bc9c466c97e065335feb823aafca9e2c47d23799375bb84bb660b00a7a9aed33d5dd38039f88b798c29a2380f68ccd47535b2fdd
 EBUILD xflux-20130927.ebuild 652 BLAKE2B b0d542127d818f4f99e7f8cdd4dfb8a4dcfa06bb1a5abfd9972c5ed900d4b744cb229246a945fd296a2dc85ac9985be88768226057cb7221e41a5d0e8cb053cf SHA512 25ea901e469797293fcee0db63a415efa6f156c574f2174def009c71e91e9d36cf0560b37c21cc5d814ddf9a71b1a4ee2c124967209e38ad5a25fe4c0dcd73bd
+EBUILD xflux-20170103.ebuild 560 BLAKE2B d79cc80458d66259dab77b787ad76f22ec3eb27c0d128ecafc97d7b76dfdd73bcde96f9a2a77c9e9d5c00e431f4518a46513f6f4e46705a3d068c5d444e83658 SHA512 49735d7ec5f0a5e6689c50d82d0d3caa49a00132c34de1087b9b55a225426ffe6bfee808dea60d34860f94ed6615097baeb9820a33e40d8f2bb7d0fa2738fb65
 MISC metadata.xml 621 BLAKE2B d4a3d03b35bde34b0b6b1af8518d3b18486876766037a4bebcadeea32f247f2660c970d89638e91315dd7eff42ccf818bb868c92ea94e52db3793cc1285008e2 SHA512 9f2ae158aea2c8d2e0191c5df7825b0b6b802a564637ccfe8f431cd0dda9569a7af0c08925e804b2139de1ba1a8c346db0b305273b0f54fc1a4581bcdb959718
diff --git a/x11-misc/xflux/xflux-20170103.ebuild b/x11-misc/xflux/xflux-20170103.ebuild
new file mode 100644
index 000000000000..d5c90b003410
--- /dev/null
+++ b/x11-misc/xflux/xflux-20170103.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Makes the color of your computer's display adapt to the time of the day"
+HOMEPAGE="https://justgetflux.com/"
+SRC_URI="https://justgetflux.com/linux/${PN}12.tgz -> ${PN}12-${PV}.tar.gz"
+
+KEYWORDS="-* ~amd64"
+LICENSE="f.lux"
+SLOT="0"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/bin/xflux"
+
+src_install() {
+	newbin xflux12 xflux
+}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 782451aa2478..a07439643cd9 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -6,7 +6,9 @@ DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.56.tar.xz 1649808 BLAKE2B 82d56a3570bd1be52014503d7c0a36cf27f68aaf31fe4a7ed06159dc796dbd1410711a56fa8e72709499b1ceb3063b2acd9646ba38400669d3671d04e9fb5745 SHA512 1ae5cde5d0167897229e9cb8ebd15e26fdeadc9b0e2d221e6334980f23403385bf1adbd44a955b455e3ecdf8b02b18b0e06273d8dc566b17ac3692ee5ae44f4d
 DIST xlockmore-5.57.tar.xz 1835880 BLAKE2B b26a9792286ded7647c816b907107b9c524ddbf46afab94c5b6b5dc5d5c918f5715c914ce4246497018bd56fd11329bcd1afe07608e44a70d24dd2c4c3d97e38 SHA512 2107efc7e1e9c811b6f86e9bb048dae3861a4e2f421b3d963856a77746834c08c5d349dc15cb3bc9b9aaf21abdc8f0e4af9463a90359b575604f3393c325400f
+DIST xlockmore-5.58ALPHA.tar.xz 1849660 BLAKE2B 9b4be74fb1987bb1c946e63f8cf6ee596c0c0a7af4682cffe78c0341c5d444c111478f9849ff44db3f5d7dba317bcd464e0fc1bd070b5710250da56b392e36df SHA512 0457499376294d3aa295a24e7aa6d40f0da4e2b09aaf85bd0aaa32c9b7a5f52edefab69ec2815994e476f43719ced21f6cde30bcc42f6c0f2ad60884a405c80d
 EBUILD xlockmore-5.50.ebuild 2165 BLAKE2B feadf465ae112ad5d4b482a0a4fda8293eef90f2daf76076d37175182dfcd2491f7fde83af37298e35eedb65f7c27b3915e3f3ef60b4c3ec1ee6145dad125ee5 SHA512 982a26f33a14d5ccfee07f190cf4a4391c2f767b000e8ebdbe46a6f71650bb4beb9d1758fdf947f801b27bc3f331eac5c9e95d6cd779ebdb5d81e1cedf81c673
 EBUILD xlockmore-5.56.ebuild 2422 BLAKE2B 90a79533897d5e0cdab0d3b4fa4009894c50ee6b2f199078e38a9ff873da117dc9c0c5935435c5b640edf4d9c147512ab9e4a57fb70502b150782bc9ed3cfecc SHA512 6d88bf97b12a880203fe79d788db105685ab219c94ee5ccc33ff99d1120d39e3a8c7d5cd4cccddbfc507e13abe0710054e306c0442e5adee625bccf096526895
 EBUILD xlockmore-5.57.ebuild 2370 BLAKE2B f03ad7b49be9ca7967c40613573ca4d8559c670d7bbab6a68664467163d37dcfa9f8edd4fca6d695cebcd3c45d1fdaeb72806dddcb086cfecf8ed13972eef7bf SHA512 471580b4e69912f2977e5a7c0e6d6fce3fc5462d031aae67ca8f19aaa7c8df4a96e338d98a7f3ca881466de3e6bd2c890d165048090c24f54a9bc0e78ea6beba
+EBUILD xlockmore-5.58_alpha.ebuild 2370 BLAKE2B f03ad7b49be9ca7967c40613573ca4d8559c670d7bbab6a68664467163d37dcfa9f8edd4fca6d695cebcd3c45d1fdaeb72806dddcb086cfecf8ed13972eef7bf SHA512 471580b4e69912f2977e5a7c0e6d6fce3fc5462d031aae67ca8f19aaa7c8df4a96e338d98a7f3ca881466de3e6bd2c890d165048090c24f54a9bc0e78ea6beba
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.58_alpha.ebuild b/x11-misc/xlockmore/xlockmore-5.58_alpha.ebuild
new file mode 100644
index 000000000000..360f6c9070f1
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.58_alpha.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( virtual/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_unpack() {
+	unpack ${P/_alpha/ALPHA}.tar.xz
+	xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-flags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 7cb85899c3b5..2912ff460e79 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,4 +1,4 @@
 DIST xwallpaper-0.6.2.tar.xz 82600 BLAKE2B 2e2b1121fcc2481c4a1e3c78e357534b9609b4435c4364f22dbed78ee0de7c671d2044403c22d22b494a9c89efd17d843f32b296c863df3c0f5d7b3673ae361f SHA512 3713038ffe8fe1da117dc64db6e3c8642fe663473d1e9078963890fa08f21af6ace60e08773e23e6025fcf2116563e24c76d07a66ba02537b38aafa9ac99f395
-EBUILD xwallpaper-0.6.2-r1.ebuild 1016 BLAKE2B 37cf074248e7c12f5f64e68bd1b57a420232f037a1430b42e54d53316d3df8db1c06b463a24420a1ab101fd4af7231f4349d3c82481453108237b7889f7a9f32 SHA512 de81d03b18da49f63456120a21e90a3706f24cfe49d2c33e0bd6b931070734977e6fa1fb7dfa825e232666222bb1be3f7dd6b70c3de8d6275ec774a0b6c0a11a
+EBUILD xwallpaper-0.6.2-r1.ebuild 1023 BLAKE2B e285ddbab7b2fec704a7eff51e7b3a26eebd6c5e2c4721fcc8aa61ded8cfe20c54891930d4d53e36280c2a2e911cd9511bcae7b6d4f2430a4b0547f63bb1c7dd SHA512 810271ad0ce334df6adf60d69949f8a0e16b66753d872dd82190c66c97b7b37a98643b90ede10949a86086cf72e28ce36756cbcda5af9c90471b97056884a619
 EBUILD xwallpaper-9999.ebuild 1018 BLAKE2B e812a3fe52e010dbd3ac6b950a45a8e02a93f6cfa36f2f2f2016588465af6a25a2be264c748bcda18cc6010e4b10866c85a00f81bd95a46725a959c68018c418 SHA512 894e039552b341c29c207864e0c41fb3eb6d6fd93a819320e56350a1981c60c168231c6f65ad4373b1e708fb78b7cb47e5510990da0eae8061b5356eefe0b150
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild
index 752741136fc3..ed317b228bd9 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="ISC"