gentoo resync : 09.03.2018

24 files changed, 422 insertions, 136 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 413bfeea7164..16f5239060eb 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index b6e1dbb5f2b0..266bff4b03e5 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,9 +1,4 @@
-DIST albert-0.12.0.tar.gz 404748 BLAKE2B f6f62201a104b51a381036ba44197adc157a472b75636a3e7c391f3cd79ab9cb8f8b5951142df02b9b249e950a2482070e05c81deb779d5442d22dbe363d835c SHA512 56d141a2c6b98744c0b34a7adbbca8b6af93545a7b067263acf59fc63d99ec7d9f19f2f3c73f477e5f35448ae8a563c9f132bed87be135467f8f0c1462f9b031
-DIST albert-0.14.14-plugins.tar.gz 540053 BLAKE2B eeb63b8c884d832907938015c5e444289a04c33fdbec1106fe75259abc031cff579b1137b3d68b786b4af797ce59938a96bd81e7e27e3fb1db0bcef84cb11ec7 SHA512 6e7942911da26672cbf0789ccae06af237794190f10bf91cb261e77c2c6be61201385a202de2798ac2794fb96737ea5055588a4efb1fb5266b0dc09364c4aa1e
-DIST albert-0.14.14.tar.gz 84931 BLAKE2B bf2a6cf7c0a05597fd0c3baf01fafab92e8783d4fde85bb80ebb85692d3166c8d451ffa61f3508cd4f4c99559ad1f0905b96d88ef2c39fc9f6f80e48b69968a0 SHA512 f48357b0611928398c4b55236472bac2db842d971288e863df9d35956864145a1ba22f6e264c6f50357c791064bd5bde1a84f7db5a54bd9c48a91093c830dccf
 DIST albert-0.14.15-plugins.tar.gz 540189 BLAKE2B b8243917cdd30c74f26ad852421cf525047694aaae2ec170a31d6239f7fa704de72f9ef67564282136ca15ec1960a1c882c193a2339541e0bf40986ee10588cb SHA512 1af59c65bd91ac626abd8777b350c92a4532a88119bd9ec6ff55f9f3ad72e5cfd6987c9b34f1c32ca854891e91f79ffbea04ed23fa85a18826e9aa890b400079
 DIST albert-0.14.15.tar.gz 84875 BLAKE2B 80e173100a0d135a18b20482ef0eb103634207b1e1a7284b2c5245750bc22478026b25982b714b3fcd079ed7674075a6853917d789f99628a368c6a9c6fd344d SHA512 9a6efd9203f7b96aa14c063a9de8c59e6b4bb0a5c55a64662ec170b75fc71247b7313a1252f71ab2516b4b62538f4c89778a43b8804915996636f49d4e0a6d31
-EBUILD albert-0.12.0.ebuild 1016 BLAKE2B 54f8d09b961bc677a6df82470c592ff98368e569c89aea2f2b14a0c21dfe9e13a3ee9ae550583a5ce6fc05b41a317a90c866e380b631689935c1da554bba69c9 SHA512 7047299581650cf9f31a3c71259dcab00707b73e9ae22115c512c47b536bf3103cdb120691e80caaef98714d3f70b1467930600f5c911565f4e5658a7cc11796
-EBUILD albert-0.14.14.ebuild 1347 BLAKE2B bf4d3ce890c415b3518dfdf8a548cd8245e838d959e26b0fe5239ecc85aad20d4ed65e96b817c0db1a4deba4603cd848b4cbd27265f283855dfa7edc2724654a SHA512 26c312d14894f43a5e948b09f1f9bde313552c527d13322cb60b8591189c0fd80e32bf47c790ea854a32fbebb0d9c854d8768b408a74f1937a4bcb27202b09bb
-EBUILD albert-0.14.15.ebuild 1347 BLAKE2B 1c33a88c32578369efb8265c4ed1be182750a6f734b3ca766fe5d8e94e398fe8dc10125032981fd0269c66933c4eb1ce078bf6fa0de17371349f5f31d3934733 SHA512 cd990c1e0eb6b32aceac853a1f05b7e96c069602382cc02f810c2a4cc7966165654a339a3aa325ef5865f3bb98094904809ffaae34b75dc274a0475997a4dd10
+EBUILD albert-0.14.15.ebuild 1346 BLAKE2B 7a1916d46b46373c184fb7dde8748d247eefb4d95e2d04127597c97c1fe4eda6be3bb03bc9eb938aceaf3e3e01c5de4f2c357781e2a359cdb3c27371530a54ce SHA512 a6ff9c7d06c9182f9fc62de3489c8fc0b3a5172432faa0512c0e1142d004e53c58fa22adb03730e7878c029fc3eb83ac603c94feeb85e8080243b33368f6858c
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.12.0.ebuild b/x11-misc/albert/albert-0.12.0.ebuild
deleted file mode 100644
index 525fa9c94c3b..000000000000
--- a/x11-misc/albert/albert-0.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Desktop agnostic launcher"
-HOMEPAGE="https://albertlauncher.github.io/"
-SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.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/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" \
-		-i src/plugins/*/CMakeLists.txt \
-		-i src/lib/*/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DEBUG_EXTENSIONS=$(usex debug)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/albert/albert-0.14.14.ebuild b/x11-misc/albert/albert-0.14.14.ebuild
deleted file mode 100644
index 82d62c488e84..000000000000
--- a/x11-misc/albert/albert-0.14.14.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLUGINS_HASH="a5ee438af138d6e069384edc749d097bb0038c56"
-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
-"
-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/albert/albert-0.14.15.ebuild b/x11-misc/albert/albert-0.14.15.ebuild
index f2b0faa7ea21..e8fba0658b62 100644
--- a/x11-misc/albert/albert-0.14.15.ebuild
+++ b/x11-misc/albert/albert-0.14.15.ebuild
@@ -14,7 +14,7 @@ https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/bbppp/Manifest b/x11-misc/bbppp/Manifest
index b7f69d55bae6..d596c03cb7c0 100644
--- a/x11-misc/bbppp/Manifest
+++ b/x11-misc/bbppp/Manifest
@@ -2,6 +2,6 @@ AUX bbppp-0.2.5-gcc3-multiline.patch 2749 BLAKE2B 78e2a36cd3fd05fcc4b1804037f73f
 AUX bbppp-0.2.5-overflows.patch 453 BLAKE2B 45dcee17e6d725b3ba2e2197a75139d5b8dd86ae7b706f88069eda2ef1cf29236fc878a8de363904e88d4269302f9f9c6c49bf0ac2de607df3feeb53656a5420 SHA512 044755d73415d171ec2e0c61fe0affea912ab40dedd567f3e4f29938ca97825c1ab36be9bea50dc7c40227a06e5e2ea2541d0cdf71e5dc8013fef38a6db920eb
 AUX bbppp-asneeded.patch 1054 BLAKE2B b12c871818b5a26cd8f710ee7ee682fb652d8e7c138f4c9e9574f3beff30c2627d573aff393e473057179f006570005cded6ed4ea6d51c7b1a8ce1c0fabb8845 SHA512 96d243ce1b372d718649a8c4d1e14b3210f8e679aa1c6a5dfeb373aced866676bfb0622e639d65c8cfedf8e2ae072e01253a1013c9dbfb682957936b97547347
 DIST bbppp-0.2.5.tar.gz 83421 BLAKE2B 3fe18ce71617b792f9430b2bbe123af78b498be9a663fc782246550ed936b81278d27f06b9b454bc47ff6db193fa2a949e97f0fd970532399c3f0b0f335beda1 SHA512 55d1e4d1a2c97ac5a5d34a48cd877891d8d6acf32083d7bfa90e4941cfbc18a91d056a0ec6b7a96182f72be440f6609caf3bc82c9071c6d0bcfbe95577f04930
-EBUILD bbppp-0.2.5-r1.ebuild 1025 BLAKE2B 945754287d890748d39dbeb52b10c4b45d6ddd15577bd03cac16cb80171242451a77e642626327fb307694d0c4e4ababa487c7abd9144d66511978ebb00ac270 SHA512 9f20397d5504678004fc5bfefdfe5cc7169486b8a8032bf122572a2fbdd6646c0d1ee9202080a1ce68b6723fbb017cc3febe8ce7a60c60e1a7be2cb1d1aa5e82
+EBUILD bbppp-0.2.5-r1.ebuild 1024 BLAKE2B cdefc0d168d99b3be34656c4c1ae5d752690e93c5c4ad98773a09a8669c0a130fee874609659a1d340a27cee61a197137015be1accb193b4b1ce5ceba2017817 SHA512 bbb1775be520c7593a67077a918ce702a772a367853005b83c852a43a466284e7f432674742eed1ae34f009404c1c079c6edc52924b6aad462c9fa59fda7f856
 EBUILD bbppp-0.2.5.ebuild 966 BLAKE2B 14c98a9ba67367870a486ff21b6d0d708207f06731b6861fe384ebb5ddb8df7473b5f641a4ad823bba456b1a8d587ba661ed3e62759eafa386316b4db9cb8725 SHA512 d9a9d54a88cdd6d89d8f12cb7a1ea0a39dde0c263423705831066e5e219855c645cea05002f32d4dc205f9cda73074fb35706ec5dc65095032c8facbae8d5fb4
 MISC metadata.xml 329 BLAKE2B 314294a4fe076008891426b44fdcd92a5fd0b8f04aeb0240fda6f52f7e4a09300b2d46efa23f7f910559089611139d2262c60e588354081b2af97a7aceae2b32 SHA512 1b2b0c0055b4f8f44734697036fe3b470d8a60bba3de1972e7a8e6e21083a9a36356d9afa1e661ccbbbb686b5db6d3c8a57dd4dbba11217eee28010af18b82cc
diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
index 2664e9b7ae80..e522afd7b760 100644
--- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11"
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
new file mode 100644
index 000000000000..f9fa55e0ea20
--- /dev/null
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -0,0 +1,4 @@
+AUX j4-dmenu-desktop-2.16_system_catch.patch 5533 BLAKE2B 69745ebc955550ab3c02d31b455e8d36210aa845c09e3c1a5f61a829c0dfc779e093d818c977f98b1c5089f0a43662bd0b75d99bebeb83f9ada85175987134ad SHA512 dedb23a4b946a31778fdc1451ad2841d78bb6bfa00661e6e496fbd329f1c7fa6a3a3fcf52b35e1c02b049c1b2e614c9eeae6717851f56b6e89719cf017807c83
+DIST j4-dmenu-desktop-r2.16.tar.gz 32553 BLAKE2B c1c7f0f2a59421b2e244a8f65251b296ad44ae37c10cbffb62bdefb168b6104e3d89c0a43b74feaf0afcc52ac78c8d46204ed397f131e526c447379b066b9b88 SHA512 d5bb0902d4bdc474fa20bc9d8f79de90a92bb4941f0d325dfcfaa1347ea3ad355b87da8194bc3f654970e9ab8848e6ecb5093f3c75fbaa8dbc40199fe6ea2837
+EBUILD j4-dmenu-desktop-2.16.ebuild 908 BLAKE2B 0e1a90e0a0649040c3955c2a9359e24755b44c2f4bd4040c880732ab5dce79e866653ab4ac55680e5aad930d5c9a139162e3c8d54331bc35ebf499272729293a SHA512 ed85e3170a25159fd046723e77a1901b1ecfaa543c145e5b615c64b0c27f38fb178a3e0ab76c489f23367e4fba80c6a0d5917b3151007e52e56db16edeaa7d87
+MISC metadata.xml 777 BLAKE2B 180659005f20d3b3d011d5459cf3e34bb11f4942167b5219d570254255173f79a7ab90e9446a4b6ec8108e2bc3fc48373a8b10fa7dfb8f4aaad898e995d97acb SHA512 0b3f5d514237b845e609f5b99384fb27aa111f0e04b44fde1e2601d2a7089dac1401918afd3e8c1cc670d96273cb8797a2450ee2df9b6489e01b6426da0af617
diff --git a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.16_system_catch.patch b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.16_system_catch.patch
new file mode 100644
index 000000000000..7becf7d3f75a
--- /dev/null
+++ b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.16_system_catch.patch
@@ -0,0 +1,183 @@
+From 210926d23d0f40277b549ca490f876f93c3ffb6d Mon Sep 17 00:00:00 2001
+From: Diogo Pereira <sir.suriv@gmail.com>
+Date: Wed, 24 Jan 2018 16:44:03 +0000
+Subject: [PATCH 1/3] CMake: simplify GCC version check
+
+---
+ CMakeLists.txt | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 392db54..78a71c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,21 +2,9 @@ cmake_minimum_required(VERSION 2.8)
+ 
+ project(j4-dmenu)
+ 
+-exec_program(
+-  ${CMAKE_CXX_COMPILER}
+-  ARGS --version
+-  OUTPUT_VARIABLE _compiler_output
+-  )
+-string(REGEX REPLACE "(\n.*$)" "" cxx_compiler_version "${_compiler_output}")
+-string(REGEX REPLACE "([^0-9.])|([0-9.][^0-9.])" "" cxx_compiler_version "${cxx_compiler_version}")
+-
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-  if(${cxx_compiler_version} VERSION_LESS "4.7.0")
+-    set(CXX_OPT "-std=c++0x")
+-  else()
+-    set(CXX_OPT "-std=c++11")
+-  endif()
+-elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
++if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
++  set(CXX_OPT "-std=c++0x")
++else()
+   set(CXX_OPT "-std=c++11")
+ endif()
+ 
+
+From e6e05d0170554246118c2dffe5395a982e1af250 Mon Sep 17 00:00:00 2001
+From: Diogo Pereira <sir.suriv@gmail.com>
+Date: Wed, 24 Jan 2018 16:53:39 +0000
+Subject: [PATCH 2/3] CMake: clean up and reorder CMAKE_CXX_FLAGS
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 78a71c0..1b3f2b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@ else()
+   set(CXX_OPT "-std=c++11")
+ endif()
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} ${CXX_OPT} -Wall -pedantic -Wextra -O2")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} -Wall -Wextra -pedantic -O2")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ 
+ if(NOT DEFINED NO_TESTS)
+
+From 7be5116d0d6d80522517a58bb6e45ca1cdcd9612 Mon Sep 17 00:00:00 2001
+From: Diogo Pereira <sir.suriv@gmail.com>
+Date: Wed, 24 Jan 2018 17:51:28 +0000
+Subject: [PATCH 3/3] CMake: add option to disable downloading Catch
+
+---
+ CMakeLists.txt | 90 ++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 47 insertions(+), 43 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b3f2b0..17605e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8)
+ 
+ project(j4-dmenu)
+ 
++option(WITH_TESTS "Build and run tests" ON)
++option(WITH_GIT_CATCH "Use a Git checkout of Catch to build the tests" ON)
++
+ if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
+   set(CXX_OPT "-std=c++0x")
+ else()
+@@ -11,53 +14,54 @@ endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} -Wall -Wextra -pedantic -O2")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ 
+-if(NOT DEFINED NO_TESTS)
+-  include(ExternalProject)
+-
+-  ExternalProject_Add(
+-    catch
+-    PREFIX ${CMAKE_BINARY_DIR}/catch
+-    GIT_TAG Catch1.x
+-    GIT_REPOSITORY https://github.com/catchorg/Catch2
+-    TIMEOUT 10
+-    UPDATE_COMMAND git pull
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND ""
+-    LOG_DOWNLOAD ON
+-    )
+-
+-  # Expose required variable (CATCH_INCLUDE_DIR) to parent scope
+-  ExternalProject_Get_Property(catch source_dir)
+-  set(CATCH_INCLUDE_DIR ${source_dir}/include CACHE INTERNAL "Path to include folder for Catch")
+-
+-  # Includes Catch in the project:
+-  #add_subdirectory(${EXT_PROJECTS_DIR}/catch)
+-  include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
+-
+-  add_definitions(-DTEST_FILES="${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
+-
++if(WITH_TESTS)
+   enable_testing(true)
+-
+   add_test(
+-    NAME j4-dmenu-tests
+-    COMMAND j4-dmenu-tests
+-    )
+-
++          NAME j4-dmenu-tests
++          COMMAND j4-dmenu-tests
++  )
+   add_executable(
+-    j4-dmenu-tests
+-    src/Test.cc
+-    src/TestApplication.cc
+-    src/TestApplicationRunner.cc
+-    src/TestSearchPath.cc
+-    src/TestLocaleSuffixes.cc
+-    src/TestFileFinder.cc
+-    src/TestFormatters.cc
+-    )
+-
+-  add_dependencies(j4-dmenu-tests catch)
+-endif(NOT DEFINED NO_TESTS)
++          j4-dmenu-tests
++          src/Test.cc
++          src/TestApplication.cc
++          src/TestApplicationRunner.cc
++          src/TestSearchPath.cc
++          src/TestLocaleSuffixes.cc
++          src/TestFileFinder.cc
++          src/TestFormatters.cc
++  )
++  add_definitions(-DTEST_FILES="${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
+ 
++  if(WITH_GIT_CATCH)
++    include(ExternalProject)
++    ExternalProject_Add(
++      catch
++      PREFIX ${CMAKE_BINARY_DIR}/catch
++      GIT_TAG Catch1.x
++      GIT_REPOSITORY https://github.com/catchorg/Catch2
++      TIMEOUT 10
++      UPDATE_COMMAND git pull
++      CONFIGURE_COMMAND ""
++      BUILD_COMMAND ""
++      INSTALL_COMMAND ""
++      LOG_DOWNLOAD ON
++    )
++    add_dependencies(j4-dmenu-tests catch)
++
++    # Expose required variable (CATCH_INCLUDE_DIR) to parent scope
++    ExternalProject_Get_Property(catch source_dir)
++    set(CATCH_INCLUDE_DIR ${source_dir}/include CACHE INTERNAL "Path to include folder for Catch")
++  else()
++    # Use system-installed version of Catch
++    find_path(CATCH_INCLUDE_DIR catch.hpp PATH_SUFFIXES catch)
++    if(NOT CATCH_INCLUDE_DIR)
++      message(FATAL_ERROR "Catch include directory not found")
++    endif()
++  endif(WITH_GIT_CATCH)
++
++  # Include Catch in the project
++  include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
++endif(WITH_TESTS)
+ 
+ add_executable(
+     j4-dmenu-desktop
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild
new file mode 100644
index 000000000000..e758d1c57c4a
--- /dev/null
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PV="r${PV}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A fast desktop menu"
+HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop"
+SRC_URI="https://github.com/enkore/j4-dmenu-desktop/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( <dev-cpp/catch-2 )"
+RDEPEND="x11-misc/dmenu"
+
+S="${WORKDIR}/${MY_P}"
+
+# Merged upstream; remove in next version bump
+PATCHES=( "${FILESDIR}/${P}_system_catch.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_TESTS=$(usex test)
+		-DWITH_GIT_CATCH=no
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doman "j4-dmenu-desktop.1"
+}
diff --git a/x11-misc/j4-dmenu-desktop/metadata.xml b/x11-misc/j4-dmenu-desktop/metadata.xml
new file mode 100644
index 000000000000..581cc21d7364
--- /dev/null
+++ b/x11-misc/j4-dmenu-desktop/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sir.suriv@gmail.com</email>
+		<name>Diogo Pereira</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		j4-dmenu-desktop is a replacement for i3-dmenu-desktop. Its purpose is
+		to find .desktop files and offer you a menu to start an application
+		using dmenu. You can also execute shell commands using it.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">enkore/j4-dmenu-desktop</remote-id>
+		<bugs-to>https://github.com/enkore/j4-dmenu-desktop/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index de6803b4a2c0..de49daa35553 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -6,6 +6,8 @@ AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.18.3.tar.xz 503968 BLAKE2B ec1fa0a62880708d223da972b3d9c2f2961e3e8f8baf6da9012de98818b27e0bc0e37cb6f460a25821779d83e9da1cd632484ad75ba95cb26cb9d23254600024 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234
 DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5041dbb81ceaa59c4296b2e4b069f90d9f09a4289376cb34e11331c39740f4e5370273d1315c75a9a35bd01cbb0 SHA512 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8
+DIST lightdm-1.25.2.tar.xz 515976 BLAKE2B e60d254518294a494270809be08f15613340c723f0546623710c6c0272f4122f14fd751138f2dc270df47b1cd8e3c7b35da2fe6df005600fd740f0d576a9fff6 SHA512 a0125d88ece2fd6dd70f7b8f0b5a995ec7378f625bb569c514d17903a6c691fbc1dbc7adc9b811ceea61dcd1d5ba7629d0189bc20d8cbeee1e89e527226eecf9
 EBUILD lightdm-1.18.3-r1.ebuild 3897 BLAKE2B 05e97d3e9c2c8513d43e7f06c30737d066d9360f3177144bff79eee134d7b8a4b77af929c087c027cbd38b5cf68d34d8a149b6bbfe1c8804472730e4738ce812 SHA512 531f3724cb706a17b7dfc309f7413e1df5ed0e7e9f7da37d3427a5c189a8007cfd598eb370b1a57673033077b1a060cbd083f5088160eb78f788cfb9aebe2897
 EBUILD lightdm-1.24.0-r1.ebuild 3862 BLAKE2B ce4df61efd5edfd3f55507993d5d8d5330ec68466478e7603f881a7ac92168a7cdca1ac4c355000f093adac96baa14167f79da6cb4c1cfd951aaa4c25bb3ef4d SHA512 bb54b9ef6f2405c7fd5fe450ef9f0fde38f1fb0b5183cf37fddb8013019b0c5d30d2f13be64b41cd3a652a4a7c65ef100b327c2abc8ff5fc8884a72bd77ec946
+EBUILD lightdm-1.25.2.ebuild 3849 BLAKE2B 883cefc8f097c294bcc33f695de248e1549a1a2d4383f48878ae30a33eb6d8fed88d7b60cf0a1c85695f2f223f30ae54d66d5d20d92616875ed277750c0fcdf8 SHA512 a624e845c4e9080658c3e4911158f75b4dbf8fd2f87a5f5d6246352e438c880a9923b35c3521705e93046f7b5812c2c435c5a4c9a37b4c6b1e9af031b5e1090b
 MISC metadata.xml 391 BLAKE2B c6a14fded4791158cfe9c26a70c9c4de8638ab6e9ad1f683cbf94a522f456f36f0aaf2db26d88ac9dab5bf7818d18d4dbf793ef7a6970e91f16e9642d8cbc91b SHA512 c3856bf443309731ef7ea0d849f76219f69552475a88e5c5fb54ca73f30f223da44d2f4eb6d37cfc5f305757c6654573f3d639fa87818318f7afa4dc57dce466
diff --git a/x11-misc/lightdm/lightdm-1.25.2.ebuild b/x11-misc/lightdm/lightdm-1.25.2.ebuild
new file mode 100644
index 000000000000..efef3f3494bc
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.25.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audit +gtk +introspection qt5 +gnome"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	dev-libs/libxml2
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	audit? ( sys-process/audit )
+	gnome? ( sys-apps/accountsservice )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+	)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	gnome? ( gnome-base/gnome-common )"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	xdg_environment_reset
+
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	# use correct version of qmake. bug #566950
+	sed \
+		-e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" \
+		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
+		-i configure.ac || die
+
+	default
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	use qt5 && append-cxxflags -std=c++11
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	local myeconfargs=(
+		--localstatedir=/var
+		--disable-static
+		--disable-tests
+		$(use_enable audit libaudit)
+		$(use_enable introspection)
+		--disable-liblightdm-qt
+		$(use_enable qt5 liblightdm-qt5)
+		--with-user-session=${_session}
+		--with-greeter-session=${_greeter}
+		--with-greeter-user=${_user}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${ED%/}/etc/apparmor.d ]]; then
+		rm -r "${ED%/}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die
+	rm -rf "${ED%/}"/etc/init
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED%/}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	systemd_reenable "${PN}.service"
+}
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index b11f514b3c73..a4e58d4e899e 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -2,6 +2,6 @@ AUX qtfm-5.5-gcc6.patch 346 BLAKE2B 9b4757b2a6564c8842653c991b5c35e711a7291e0e74
 DIST qtfm-5.5.tar.gz 149667 BLAKE2B f369495fd5fba183e7bb5b38db61a8a667d5835b42cf78f424d0db4bb4f0c7fcb0856578df30cb50547c7799fa16147d17951b72d99398937774bd097487ccbf SHA512 0d592b482f35c76b424cc581394d34299bb93367f287f57718d640df256f352fef7e389a8370889d0d78ca8afb9868cdfb56ae15671614e279365b72f9e629e0
 DIST qtfm-5.9.zip 172616 BLAKE2B 50219cb9afbca78b4fe7767631e91008254f6a4e745c3f1b87b821dc49655117d6d61a0aeb37cb1771641aac6b5ccfa8eefaa6e2f6d453c68061594e47bf5c5e SHA512 7686a84f1678e1f04f439d65290f5c93da25fbe80487a37f4ce32eae0d29d7a03a169d3dd9cbc81c2b678f54d9fdc01967b6c1b1cb8a19cf37a910a19918a2ba
 EBUILD qtfm-5.5-r1.ebuild 957 BLAKE2B 992031bcf7ea55aef82b409361bf36e2cf5af5bf596daebfee82c657ec05e89d0b263d11170ba6a208c8bc3c2eb5e8c4101bbdd5690dece9aca67789f57b4c48 SHA512 d658f4f3aabd6f92786672b9985f89e061f2508d8d46ca81180578ba088c498a649335e8c6f28ac1f1ab80f198cc99542951911f1d05d54a1d9c4c60ff298f10
-EBUILD qtfm-5.9-r1.ebuild 1064 BLAKE2B 50d1652d7531c45b58c4e23e2e781176b0daa306bf4b2bd53a97956da275650786bef407e5bf476c71d3afeda08c8f4c2fb4156dee15c4ee6d28c4595ffdcb3b SHA512 c0094347b229b0da31aa0187f2432b5014422899cb7fd6f2bf18b8462340ba6e3a17f951e6e277f2e5fb31c70c91952f62b942a8e868367a7770654ef22e8c61
+EBUILD qtfm-5.9-r1.ebuild 1063 BLAKE2B 0f91c5ddfaf61e2593f47b979f72e0e1c861f4ffdbc5f78400b6f34b631e5994e6faab72289dd8ae576515d1761bb89777361bcfce54d392ee7fbe8e4844152d SHA512 7acff3a6560503cfcc0080af9930321762957d789460ffadb070c15b246c389f779884fd2d87853c5b986ecfbcb0af47043f5376f65e95377deba68ad35ee41b
 EBUILD qtfm-5.9.ebuild 1403 BLAKE2B 147e4c89fb3a5726be72d9e0c86f8e6e655a9a299c2bd87ef98758f4d27f89a47c63c581841a427b6e94c2c7e08356336a6c409e07b33dd93b13b065df80ebe2 SHA512 011f881aeaad7a13eb85e1bef8eb6b5679d14dc5132097065623bea54aed93e77fc382360ac5114871fcb3d8e4892ab3e995e3024942c4a0a7c56f3a58ee9efa
 MISC metadata.xml 376 BLAKE2B 5ece57e5fdfd4b9837bd82904a447698fdca5d0f3a2b905a272c2364034984e7b207c58e5e2205d1602911b7e1e719698bef8aa9ee11448c8c6de14a0625155e SHA512 dcf748d475de6eadfc319fdef1bcbcdf9e597f4f14dffe6df90ecc68f7825973ea84a56b1569950bf0d3793b5960c479b616c398b7b763dc73f06cd6b9dd435d
diff --git a/x11-misc/qtfm/qtfm-5.9-r1.ebuild b/x11-misc/qtfm/qtfm-5.9-r1.ebuild
index 4a2ca8ca87bc..67b00a405fd3 100644
--- a/x11-misc/qtfm/qtfm-5.9-r1.ebuild
+++ b/x11-misc/qtfm/qtfm-5.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/x11-misc/screen-message/Manifest b/x11-misc/screen-message/Manifest
index 35e9b2095c5b..8a00dca1ef1b 100644
--- a/x11-misc/screen-message/Manifest
+++ b/x11-misc/screen-message/Manifest
@@ -1,5 +1,5 @@
 DIST screen-message_0.24.orig.tar.gz 348147 BLAKE2B f8973c1af5165fa21061c8202788061a78100c94325f9e3dcc9628ef0e02cef43017a58439cf1ebb49378b84182ca5a3b6650306e38f691c87e0ced3992f1173 SHA512 0553c43fc4357c756d2a6ce6dab7e8d3fa880faf90a4bee68b706a0cd8b2a0b92a2e77bd3930e473deaeca75afadcadd946cd3d5c9d116786a4bd0f5cee80506
 DIST screen-message_0.25.orig.tar.gz 348684 BLAKE2B 04d067b71b5d23862a8750a3f403938e2ec243bd25c79f601770b89f86ddcf066e05a3550c26be8479707d5571e67f187d5d556af6662682099f35e45704f1ba SHA512 30fb47fa0d0707c7219517df5384f559c4a56b5b259d2d1940b50e05834052142d97c8c776d9b22d52f2fe502b7bfe15ee5667f7d2aaa8dc3a29f5677560be41
-EBUILD screen-message-0.24.ebuild 671 BLAKE2B 0405984f6015c0ee19b3a45de1a2365c90ce0166b3d6e1f5a4af42465272a96adc5040371c22e06a4a1c598d4b823b33ac6145ed4f07614532132d75537ca6b3 SHA512 3edd9eb3be200f373e2c6e8ff3e3c6ec405e95e10bd709d1294457fbd95600218e63bdac84471a15415fd647d4665d6c605d57512d07c55d22cb1673fc1dac1e
-EBUILD screen-message-0.25.ebuild 671 BLAKE2B 213c1035adecd57ef51101b56fa388cfd659c4327a88c9d986f7e8424301806f31c0ca1ef1e196bff132f8a25ae77db89205e34d739948fbebc9bc529656de19 SHA512 2ae71fa779273791ce566bc6e28428425b7ad3b23972f4675706370c4150993c6c49b8cc23af337287a6130973733a2bdd4f70a799c6e39bd15b6af398fc8dbe
+EBUILD screen-message-0.24.ebuild 642 BLAKE2B 4f3eaa9fcdd2032dc54285c2ff3bbc22ab45616df546d9bf07ce2563566a096c92b17712aa5348fe63624901e5958dba9cba34313148b817bb490bcb6f05482f SHA512 5d0dcb76d0446a80d19432031a11499d41da9e3f48db4a7488e51af86672e12629902e55f8aba55c06e8e235facda7afa3abd90fe71e80294535c21b3a3af9d6
+EBUILD screen-message-0.25.ebuild 642 BLAKE2B 9279b7d1dd034f646d6634cea9c5b03e0a16abcb7a337b0a9429d897d16c0233496cd199d2a4a36cd74f272d86eb958d4bc31809cce51cdec0f10f7094cbdc4c SHA512 bf45174b3989a225cdc84bd07a4069458a77b8a9094184498ed1331d2011d24e2e2083e8155b691b1abc747cace41c5e87c163c26d639ec2090dcd9d9349c8d2
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/screen-message/screen-message-0.24.ebuild b/x11-misc/screen-message/screen-message-0.24.ebuild
index bd4cac875867..660c376e0ee0 100644
--- a/x11-misc/screen-message/screen-message-0.24.ebuild
+++ b/x11-misc/screen-message/screen-message-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,8 +15,7 @@ IUSE=""
 DEPEND="x11-libs/gtk+:3
 	x11-libs/cairo
 	>=x11-libs/pango-1.16"
-RDEPEND="${DEPEND}
-	!<net-im/jabberd2-2.2.17-r1"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	default
diff --git a/x11-misc/screen-message/screen-message-0.25.ebuild b/x11-misc/screen-message/screen-message-0.25.ebuild
index a98b675cc3a1..f3df7c0075dd 100644
--- a/x11-misc/screen-message/screen-message-0.25.ebuild
+++ b/x11-misc/screen-message/screen-message-0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,8 +15,7 @@ IUSE=""
 DEPEND="x11-libs/gtk+:3
 	x11-libs/cairo
 	>=x11-libs/pango-1.16"
-RDEPEND="${DEPEND}
-	!<net-im/jabberd2-2.2.17-r1"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	default
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 20380745d8ed..0ad2f2a179ba 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1,5 @@
 DIST util-macros-1.19.1.tar.bz2 83274 BLAKE2B 014cf10cb1389809c4de793d28aa7941403734bc0abb28d920b22be3f05b7597a7106d716b0f3b5de5dc945fa23095dfd032e103711dbcd0711b8634a5153b7e SHA512 d69a415d5922f072bab1ddf8984c98bc349a24ffc7a60184320a12992a76b04d7cb773b426b1a7000e6dc7983d59df51bbc8f2ff25273d63e4e238b4cd91eb38
+DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
 EBUILD util-macros-1.19.1.ebuild 483 BLAKE2B cf7ad79fa74ce7a9f3d50a4f4981970d85e11029bc2d05a1f2d1ae3964088255bbbb14aa99339e6055d093a698191c73876d2c2379064df2936b7e2e1b6689a3 SHA512 6107a49a06da5d5f508528eb4d0cb92559e33f0944f690bbf412b0858f3e2d6629c2a2286ae521b55f769ab69d0338873be05182a55d7a44fcf9d357ead14c64
+EBUILD util-macros-1.19.2.ebuild 483 BLAKE2B f34920bd902ab608681c8510efd5dfc20c37270654d4a4417fa1cb728ee21793098526b2ba55f99d4a5fb67bb9ea4cdaf6620587eae05333086b2971a2ebbda3 SHA512 72147a6fd78028456455adbf8ffbc135d70b87e3608859024244970809ddbaa8c66bcf046b560dfd760af027d8fc0fabb7d816bc1bd548b4c533130c87f4c3ed
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.2.ebuild b/x11-misc/util-macros/util-macros-1.19.2.ebuild
new file mode 100644
index 000000000000..65cada7e3812
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.19.2.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/macros.git"
+DESCRIPTION="X.Org autotools utility macros"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index dae3052599f7..47e6e42a6b53 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -4,5 +4,5 @@ AUX xbattbar-1.4.8-const.patch 303 BLAKE2B d33ff7f8bc273e1ef3e493e2411b4aff025a3
 DIST xbattbar_1.4.3.orig.tar.gz 15722 BLAKE2B 85a6dbce98ec0109360881763fdf57501e0db21ab2d614b583996d2164c0d8aed94f3e20968cb6c91cf34a7181c66efe94a6e6f32007f6dc26dd94c163bb9d46 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32
 DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191
 EBUILD xbattbar-1.4.3.ebuild 902 BLAKE2B 7c00dd2d955179f5d6c64eb973e839edffb9d85e0b15f3b142aa6857fa2b733115d7f123a9db1d859270daa5ba0e20ae65f49020d3031e19e76ee179b8023efb SHA512 34696dc48ee16955280f979adf447e1622c2436d230852a6bf9021e1e4d98ec978025d273d482079a11de2f996e3690f03af68777ff54113345957ac88c866f2
-EBUILD xbattbar-1.4.8.ebuild 1088 BLAKE2B 721388d5cfce2ca7dc8f3ec0b5ed3baafc16b695ac5f5cdd8790ae1ae6b3ca52e9f85b28ca413286f680090a8abf773ac965a2340d0ebe149e62aec965b4c31f SHA512 2dee2fa91f616b9fbdc43f43a4b8b2f1aa8e2f2c3f6c9cb4dc02535a9d5541f262faa5d56fcc352383ae7f5454371ee5b6b45c9daaa4af900a3f9d9e6fc8dd09
+EBUILD xbattbar-1.4.8.ebuild 1087 BLAKE2B 2e4956ad79f0be411121f2614f476ab159395bbc60657d1365cdf929fa5718547743d18e7febed10e06e92e416576964bda25c9edc17923bd516b20fe6a804b6 SHA512 b091c9aabba2b5f40630bf4acab80b3bef9fdb5535e9ff2b7175d52ef76d0324213a059ee6f3dcfdf6982dff30959f26ef7221ace0c75a4361f0f16c604c0239
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
index 1d3780e53a04..eedb31688fa1 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index c7a898fec4f1..fe4a5f98523c 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -11,5 +11,5 @@ DIST xscreensaver-5.37.tar.gz 10598833 BLAKE2B 44462bdf735c0eeb460e400b260340a61
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 EBUILD xscreensaver-5.36.ebuild 3521 BLAKE2B 6dcb3156b850b3f9ab210ab0d5c030c355c6ef6f90639c23316f71d20602cda04176bdb598af4b90f41edb3e5e51ce8195803974752ad128b85b395fb9d88d12 SHA512 085ce103e700f04014a8b769ab9e625763b62fda74d38f474c576eda8dce3b1143769a0662252997c9d4f652d2c0bda483af327b15f9798674eb62812dd2c438
 EBUILD xscreensaver-5.37.ebuild 3530 BLAKE2B 08cf24c2252e4965a07ab3f8bc5728a40a82f287bb1343db2bede836de1d77c6b138478dace70bf54d703ce3d4b209d0bd6b018cf62532890ed6d05cf3b10a63 SHA512 fe2fc361b059b944e94f06013a3c99854f9f4b33fd25f7f75e07e249a88f13899f3c74982e7e0dfde43523474b7b48c610ff63dfcdb08f28f6b9164eee3af68e
-EBUILD xscreensaver-5.38.ebuild 3527 BLAKE2B 628c395a1813187dd11b90ff9bce39373bad14896166845eac95b4a60225895b8b754f6ed36497a0a105d50255f330e0065734c6dc936a8277688e7e85111578 SHA512 e38ae5c2500f42162d758c4e40f63776f4201e6e0ac9596a973c781878d76e2a432cc126ee804c22838770704b3e90f37000f0657530b5a5b501216edd86bb87
+EBUILD xscreensaver-5.38.ebuild 3541 BLAKE2B a296a3ad784c6dc1bf64f396e599f6a7a56f9b0a157ee3a91ee81b33894a14aeb6ad1b4c76ad1064803f0eac38165f3e0a3f8d00faef9faaa8ba7e892ca7b0b8 SHA512 953f43c0f463976254dd5b4232a17837013a6ea91d4879ec9d4611acf4c7a7a39dec1fc59979de3e5942f0528a2cef7ad8a4a51242d9fcfe322d5521fd74ebc0
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index baf1fe48e230..b94ece9c83ed 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
@@ -25,6 +25,7 @@ COMMON_DEPEND="
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXft
 	x11-libs/libXi
 	x11-libs/libXmu
 	x11-libs/libXrandr