gentoo resync : 29.08.2018

15 files changed, 79 insertions, 46 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7c6a3832e69b..f907a68d3941 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index ed598eb8ea3d..d287a1edc6c6 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -21,6 +21,6 @@ AUX agg-2.5-pkgconfig.patch 387 BLAKE2B 7f0034bf791618bf3fdc59ec60210732f582b54d
 AUX agg-2.5-sdl-automagic.patch 811 BLAKE2B 9cb34b0efc6980b5269f6d82e524ddde3557b11e369bcb5e351b4b7d814d92a52bc13cd9a1b85487ce9d3d42b897712e93fdb17fa191e0f8850160402acaa415 SHA512 11166f6b8ca9cdaef2e510c7752c643ee6c7a56051c6214111e56dd0274f2e0023be073014a806ecf9ffc086b1436adefd04b563fc82cdd53f9910d281fe2b8e
 AUX agg-2.5-sdl-m4.patch 6797 BLAKE2B 1050aa706618ad34f03d437105449b071478b37655b6799be0258fb5afe27238dfbd029aae77e339847372a97ab99946078a677d691895e05a046389e618b3d7 SHA512 880594c3ea43846e79529444608301b323acbec4dc1bb883880ae4610f8041e95ac31743f0edd042be7d70d36928295b571265910e9342f2538ee68e557406bd
 DIST agg-2.5.tar.gz 564313 BLAKE2B 6451688dad51fe9d0433218109fd555fcaea3dd5933ebb13bc5c6d935640885f007b5dba8607cf45c94f58f0974391ca4fcd2ea9fda954334c8a4309b881d994 SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
-EBUILD agg-2.5-r2.ebuild 1454 BLAKE2B 1d95a5d65345a7067479902e3cdf28798f8b19b43844b56e551b6f207efb78fca89000dffaaac465b7bb2d73e0c131010b274398525f7766f95909b77af5109d SHA512 5d7061a7fd9bc19a37e6a249fb1019ed1801f2e18efe796188a83f868e79f8d29e052088d853485aba1f82db6113087ae257a67abf13d3774f21d681fd915743
+EBUILD agg-2.5-r2.ebuild 1414 BLAKE2B 34d9946175b2dcea675588fc74597f4e87c8e2b1f270657f49811afaac08ce9ccac721ab7f21a401c0b683209117436f9aa127fdd1b3bc7a9b5975ff9f71f482 SHA512 5d0f131ccb63c448e1a767b206f3bb98a86dfc1705962455b31a409d15edb151cec991d01b7395c7285642676f9e85eb91ed633166eb8076dded576c3708ff7d
 EBUILD agg-2.5-r3.ebuild 1310 BLAKE2B b38e25771857f92a380258ede6e816595f69944f332c3b08d347b45cd0dd2f4bf82062159a945497f2dfead1de0d545794612e0cc3ad4ecd6e5ab22489cc207a SHA512 65b75c8ada4e082900e91790e64534412d0f771be45f4ea18a5aafe022ca1fd751a1b9fb1f752f88b769bcb15ab55fc030c7c0908b75ec2002dee8d44caeec7c
 MISC metadata.xml 335 BLAKE2B 4f8f3f570b1640e3dd48210e17eba5e9e0749313f4ba21d1d2f2565d8dbb2a7ec16ad73852ddeb0dd11f25887319bbbc44b9bc1c7397e02e43c36123789d186a SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f
diff --git a/x11-libs/agg/agg-2.5-r2.ebuild b/x11-libs/agg/agg-2.5-r2.ebuild
index caba9c1a146d..8228f01acbce 100644
--- a/x11-libs/agg/agg-2.5-r2.ebuild
+++ b/x11-libs/agg/agg-2.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -17,7 +17,7 @@ IUSE="+gpc +truetype +X"
 # preffer X with enabled xcb, really
 RDEPEND="
 	media-libs/libsdl[X?]
-	X? ( || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
+	X? ( >=x11-libs/libX11-1.3.99.901 )
 	truetype? ( media-libs/freetype:2 )
 "
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index f48fe0d8cb38..35978a5f571b 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -4,5 +4,5 @@ AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf
 DIST libX11-1.6.5.tar.bz2 2361556 BLAKE2B 6001d745cd989dad2586690da69b8d67c68a4f148a4b3f595a7b58d5ed3a054928b302307b73d776a2a707f62c2d6d97453dd1484790ed8f4e9cf36ca4758148 SHA512 63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0
 DIST libX11-1.6.6.tar.bz2 2342730 BLAKE2B 7b3936606a6cf8981d691caa06b2ebbf2383259a4b74ebc6fa72277ce4870222d7e797037f21cd669dc1f1177f5a08f7fdd5d0158b6579c3ca3d0587a3e4e950 SHA512 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7
 EBUILD libX11-1.6.5-r1.ebuild 1289 BLAKE2B d168c2a47f8f24bbf0379d2c1e9456a654d0876197c2dd5982619c6630ebfe4c18dc693165836563147dbd2eff58722fdfc03134bb4a26eac64598b36a048014 SHA512 9828c6c67426674be851e0e06bcb331db26ae2bf47f376c874792a4cddc44338e71014065955348e49b68e1b1eaa92191c13626ecba13a25e88b5c52f29e7a77
-EBUILD libX11-1.6.6.ebuild 1295 BLAKE2B 2633f04a5bfa2bcbe3a6191edf391f9b1e2b79de08af7c831e65773082f471ae70699808d28d2471082d518912fcda4899ac03c806a34c32f1e4b687bc14fe9f SHA512 3a4cd9c7b7fd0568772ec8ef8972c52155daf8d958f3f5b58625a4de11f075cb85a95ec06ad19cdace778124bd56e2ec05838ffedd41d4c1f465b126eefe802a
+EBUILD libX11-1.6.6.ebuild 1292 BLAKE2B 9a30cb9b779815e6654d8ed2bce44705128d202bd7dcace6b12918f3a381003064bfe86e2c483167c9bab559b1b00002dc613d91feba16ba8144b105536521e8 SHA512 97be45bfa73a1209dec305fccd5232c9f213e9ff931034a20b279557e16d0d29d92a5e75cbf4268548cf4e46f3bc560749fe1542755383207f63c16f2d23e1a8
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.6.ebuild b/x11-libs/libX11/libX11-1.6.6.ebuild
index 199cf58762f7..5c90881f8160 100644
--- a/x11-libs/libX11/libX11-1.6.6.ebuild
+++ b/x11-libs/libX11/libX11-1.6.6.ebuild
@@ -10,7 +10,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libyui-gtk/Manifest b/x11-libs/libyui-gtk/Manifest
index d8d1505ce5b7..a839b56563e6 100644
--- a/x11-libs/libyui-gtk/Manifest
+++ b/x11-libs/libyui-gtk/Manifest
@@ -1,3 +1,3 @@
-DIST libyui-gtk-2.44.7.tar.gz 292368 BLAKE2B 12c06953d9b80018ff926354dc0911fd0fdd6e878830166a1baf6ec83a10c895ebf8d34dd40112fdc8a0b07eb944a332c81fb43c6ff20ce8c55c328b24581962 SHA512 d7031205f32bef3524b97c06d79d0dbebb6bfdd6071f03968b5862959f060f63d4241b56bca2f655a96281e32a9c160f7090ab96b7a32c7d00c31f93e9d26c4e
-EBUILD libyui-gtk-2.44.7.ebuild 1157 BLAKE2B 215925583a2ccd51097097c3df01a69aa9a72ae5fcda8516fb007cd993f2610fcfc5991d50ee62e15b06e76a550619c9790ffdf1808aa779e7719c51c40d1066 SHA512 0cfb3720dc12a8498573156c1bfbcf0732ec577c51f371c27f42cfe96bdf074549e91824720019b28946bde5b2f0b5de6ee7821deafc68f98101e89d8deb82c1
+DIST libyui-gtk-2.44.9.tar.gz 292864 BLAKE2B 74ff741a1fd2ee6c87acdc1b44d5c6f22ef32d9b148c4122ef75f40cbd2fc959c692b323aa31917371a5143bbf2f6f6f65bd89476d45e26c330f3ba27d97a8c8 SHA512 cb1641f79e189bbafa41dc07ad7ec0c09bb6ab7696b576fa8709d0112b6870b12c97b757cd3d6a0b42bb67d6a21655f7749bd72b714af0a3b77ab8a16169f51d
+EBUILD libyui-gtk-2.44.9.ebuild 1097 BLAKE2B ad4b2abd9d78f0244aeaa2b428dce355f6f8013f7661a9f9baf807f3bd6a92762dd2d0cfc2546b344c9c2d58711c264a882d6ae5d5a19ae969841fe8f91ac979 SHA512 dec08fdc2aac2795d51a426f768f6c3c0f128faabbb42624bb2722d8fa4cf22da2d89298de540e0ce300a67baa6e0151bd064925d3746cc8a8d2c6f32d669f12
 MISC metadata.xml 435 BLAKE2B b5335f300fee9d0eec6b444ca9b093c4d0a1ea59e83c81801c8d8d6891bf22643ae9e3007a122ae78fd46c5e1c45670eb1bc685f2032a765c68bff450c2baca2 SHA512 b78dc0b8f36fac9fdf7f2f0e6e50cf57ad42a47c024212818c7a7a1a6681eb78ebe9dadac031b2cdef30a6b319bed0c64d521774c643526c71e1328206eeafe8
diff --git a/x11-libs/libyui-gtk/libyui-gtk-2.44.7.ebuild b/x11-libs/libyui-gtk/libyui-gtk-2.44.9.ebuild
index 0f148ebcad94..5cfe8cedc876 100644
--- a/x11-libs/libyui-gtk/libyui-gtk-2.44.7.ebuild
+++ b/x11-libs/libyui-gtk/libyui-gtk-2.44.9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
 DESCRIPTION="UI abstraction library - GTK plugin"
 HOMEPAGE="https://github.com/libyui/libyui-gtk"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6"
@@ -21,9 +21,8 @@ RDEPEND="
 "
 # Only Boost headers are needed
 DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+	dev-libs/boost
+"
 
 src_prepare() {
 	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
@@ -39,9 +38,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_EXAMPLES=OFF
 		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
+		-DENABLE_STATIC=$(usex static-libs)
 	)
 	cmake-utils_src_configure
 }
diff --git a/x11-libs/libyui-ncurses/Manifest b/x11-libs/libyui-ncurses/Manifest
index 37f42a3d1be2..64ed8909b822 100644
--- a/x11-libs/libyui-ncurses/Manifest
+++ b/x11-libs/libyui-ncurses/Manifest
@@ -1,4 +1,5 @@
-AUX libyui-ncurses-2.46.4-tinfo.patch 934 BLAKE2B 346d2f87a532c7aa5f460743371d59e2f4d751cf27fa1e5d8f4c6fe4a177afa2c5c0b90ff5665eb59c90620039c3b673f8cde37c6e8ebc497282a7939c1017bc SHA512 cdfad23f199dc4c94c53718aa5f86a9caaaa0b93121ccdabcece10023af0a5a74ace836b9c6610aa5bded7cacf9ad529a9a048124c4e3e891ecd32c9cb305ce4
-DIST libyui-ncurses-2.47.6.tar.gz 188365 BLAKE2B 47d13ba5109bba0d58b0ac34a6d5032328c63f1aed1fa2ffb10b9bccd3d4ba5cc7ad215e75cc14fd4089a0b4e4d4702e1409f798aae85febaacc2567454ce17e SHA512 c11b4ac6e7d2e5fce52e39abbea5c9c280128071802ee925c00560642cb03e734393b348dc57d3aaff29993b36cdbc371f5766839640162a6e1310810c66e343
-EBUILD libyui-ncurses-2.47.6.ebuild 1218 BLAKE2B 310b1659a1e8f761c6671e842b1d75b420b1393ea2745b0c9e413a5b280b29a10b9d614de6ff3ef56dad3cc1db1ff56a04a5146a2bc4b5771f42a43489674a00 SHA512 358958c7686410fc0235041fb574bf28a03edf0d292d72bdb13e6d64211e61a01baaf434484c82042b0daeb756542d7f09e30c3c367e4bca5afcf8669ae681e0
+AUX libyui-ncurses-2.46.4-tinfo.patch 933 BLAKE2B a737be5956d99e025caac2ab1b8bf83fdf2e028b124a878dc1d5fdd926a48e80dd3bc77a11b321dc471c8414f765b6cd08e548160be0c8c9eafa6d6fba14d99d SHA512 f64eda593d6c8e6fdf3c2210c092ab68aea778ed0bf346d7cb42fa89dd1ee53170dfc6f2230476f79f3966d32fde20e9b42a6ab79d17fc255ed23d51176e3a23
+AUX libyui-ncurses-2.48.3-ncurses.patch 826 BLAKE2B 151d9033a179a761f87824c4c50eb441bd5eaecc5a2210407031e6377aec8a6da79cb6001f67d3255178198cb24f4cb237bb170eb1d1a023c74d17ee7d653c75 SHA512 44c47b12362ecddf1953d50f259b2ef2c63984a2de3036d76b6aa2389155b6c4ba9825db32f8872b368d16b67dd1aff0b9210404b5dfd8116feed25c01035e4c
+DIST libyui-ncurses-2.48.3.tar.gz 189621 BLAKE2B 360b12f40c6e7dace84e5e10edb32d9b75ec33cb0c796ce31697b90b17df3ac13096d7a3d715d4bf4963c487e705ab4031dbe682f99237331dad951d19c32979 SHA512 18f7cec47aba1fd33443d4154b358c7dd769ed79a5544b11d907f6de461c96fcf1f980ee602781bd3cf3242d692d02721fcf975728a0c00955b34844104419d0
+EBUILD libyui-ncurses-2.48.3.ebuild 1196 BLAKE2B 5476cde47baf2c548d03742567bfbcc3bbfb3d805cd23ae7b2facc10038c50ac728f846c77c19a59099cac089f7fc26d159e226e42154feee98d093766b6924d SHA512 598dd567a2363dd71b50566595712e83c30ce08f5283c6e6967bebf5caf5dfc88367590f910f6a1be3235a61377d32bda3575cd6221844c89a89faed69ef6340
 MISC metadata.xml 443 BLAKE2B c55b7afbd50426e6ae21ed6af37d99bab996fafa6dfe384ed2f74acac422e8becbffacf8656e0b16cd2c00f0c5882fcac67515153100d79e3290a254029300c6 SHA512 266ef9ea2d575aa247ac6f663ab2ecd0f7c9046677ea85423cfd48685f2a9e314f4ef7e9be5d12ad6080aec31b96c3422f65d64525c62d4c1d227810839963e3
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
index b69aafe797b1..9da76f194598 100644
--- a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
+++ b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
@@ -1,7 +1,7 @@
 Fixes building with sys-libs/ncurses[tinfo]
 
---- cmake/Modules/FindCurses6.cmake.orig	2014-09-25 16:32:20.000000000 +0400
-+++ cmake/Modules/FindCurses6.cmake	2014-09-25 16:33:16.000000000 +0400
+--- a/cmake/Modules/FindCurses6.cmake	2014-09-25 16:32:20.000000000 +0400
++++ b/cmake/Modules/FindCurses6.cmake	2014-09-25 16:33:16.000000000 +0400
 @@ -11,11 +11,12 @@
    FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH)
  ENDFOREACH()
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch
new file mode 100644
index 000000000000..7c58ce47ab69
--- /dev/null
+++ b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch
@@ -0,0 +1,29 @@
+From 6444e043b58bf7703e4fc9035f380f3817207525 Mon Sep 17 00:00:00 2001
+From: Stefan Hundhammer <shundhammer@suse.de>
+Date: Thu, 4 Jan 2018 17:21:56 +0100
+Subject: [PATCH] Removed function that conflicts with newer NCurses lib
+ (bsc#1074600)
+
+---
+ src/ncursesw.h | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/ncursesw.h b/src/ncursesw.h
+index d25923a..c8b95bb 100644
+--- a/src/ncursesw.h
++++ b/src/ncursesw.h
+@@ -1607,14 +1607,6 @@ class NCursesWindow
+ 	return ::wtouchln( w, s, cnt, ( int )( changed ? 1 : 0 ) );
+     }
+ 
+-    /**
+-     * Return TRUE if line is marked as changed, FALSE otherwise
+-    */
+-    bool	   is_linetouched( int line ) const
+-    {
+-	return ( ::is_linetouched( w, line ) ? TRUE : FALSE );
+-    }
+-
+     /**
+      * Return TRUE if window is marked as changed, FALSE otherwise
+     */
diff --git a/x11-libs/libyui-ncurses/libyui-ncurses-2.47.6.ebuild b/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild
index ea1993c22752..7567d80afdf0 100644
--- a/x11-libs/libyui-ncurses/libyui-ncurses-2.47.6.ebuild
+++ b/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
 DESCRIPTION="UI abstraction library - ncurses plugin"
 HOMEPAGE="https://github.com/libyui/libyui-ncurses"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6"
@@ -15,16 +15,19 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="static-libs"
 
-RDEPEND="sys-libs/ncurses:=
+RDEPEND="
+	sys-libs/ncurses:0=
 	x11-libs/libyui:${SLOT}
 "
 # Only Boost headers are needed
 DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-PATCHES=( "${FILESDIR}/${PN}-2.46.4-tinfo.patch" )
+	dev-libs/boost
+"
 
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.46.4-tinfo.patch"
+	"${FILESDIR}/${P}-ncurses.patch"
+)
 
 src_prepare() {
 	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
@@ -40,9 +43,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_EXAMPLES=OFF
 		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
+		-DENABLE_STATIC=$(usex static-libs)
 	)
 	cmake-utils_src_configure
 }
diff --git a/x11-libs/libyui-qt/Manifest b/x11-libs/libyui-qt/Manifest
index 9afe3bd1f3f5..dcf30a758895 100644
--- a/x11-libs/libyui-qt/Manifest
+++ b/x11-libs/libyui-qt/Manifest
@@ -1,4 +1,4 @@
 AUX libyui-qt-2.46.21-norpc.patch 653 BLAKE2B e93b1a1da1ef585d7f1caf34325eb8107dc952a84707565dce174a35ae37cb90ffb384c6a5852e490b15d002cf7083fcedc32882f4bea0b7f30e4fa30ca53515 SHA512 123b2b932318bbf71621bd37cea5be25a39ea796359cc0800bdbc2270b0240bca2a105562dfff79ea4b8d4d0af23c7933703d15740340119b31211d0ec42010c
-DIST libyui-qt-2.46.21.tar.gz 167324 BLAKE2B 175df2de97b013e81298dd8f2c66d099047d6d8ae2ca56f9c92d2b634a5acbdd92bcd3c4d0243a4e013267eeb563366229440b7cdf160ea888dc5b85e12984e0 SHA512 715154efd9fa2753f528e5a809fd2a3c635751b9bee3d511e396051b04a55086446510dbec5c70e753b1926c35faf84aaf05ea92a2a7f089f9b95dce9ee1a77f
-EBUILD libyui-qt-2.46.21.ebuild 1316 BLAKE2B 697ced0fa0e95173d7b44ce3e1ba9cc1db8daac57ec2a483462c77d43466a6c1aa9fb805f25bb33a2cc10f32c5ae7e487b1978938f2a3346a4fbf33d01d457a1 SHA512 d5ba89b1af7dfc6bd1a5eb42388bc25a2f9a5e6a349dd27817ff0cafb2c1edbd283600104abf04360715ed31f9b343069e89eff61c31b383a4fcf02971db6fd7
+DIST libyui-qt-2.47.1.tar.gz 171152 BLAKE2B 54a8d1609ed717e97c1ec9b3eb6e86eed85446689223753db4b2dcb4c35f361675c42287378636708813b724c4120b14b6bab19c4c8fa17f91bbb612569d1a00 SHA512 9c5e23ff7bb08dd363a490a43c0347e4dbe1af3546bec85a9169da3267f87cbbe15f17f882058b2f3a813fb54efeb1594ec343b2b8d12e371ee77a105a8f4f99
+EBUILD libyui-qt-2.47.1.ebuild 1302 BLAKE2B c85b5c56918a1b4d210e01ebe1988638062fa480bbe368f0be9c3b996151e7224b587ba739c66be232dd99f24a4aea5335e7856f21dab30f3061e7982b7f522d SHA512 08c24070d3db9172b15ef9a15a982ba01b64ca937efb605029105ae0b749e2ce61e008519e77f8865cf24e5a0426e1d627821b4a03bbc9fc353c5e086ffb3361
 MISC metadata.xml 433 BLAKE2B 540a2285cea17fd979ff0088a11f15fd32c7e9f5262ef05b32a3b858576479689f9ff2bc403c4b0ae83d86ff023a0ff1825ffdc70eaa55468cca6a0aa4aa1e90 SHA512 de632f622c93b7747dbdf22b38b69a1fbe37025fccf8be02ac9d79b512323425a2d322e8596d580e3761a758d03680b3a06c63872cb8889adb641ae5fa57a586
diff --git a/x11-libs/libyui-qt/libyui-qt-2.46.21.ebuild b/x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild
index dbd9945ad3a7..3672afb555d2 100644
--- a/x11-libs/libyui-qt/libyui-qt-2.46.21.ebuild
+++ b/x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
 DESCRIPTION="UI abstraction library - Qt plugin"
 HOMEPAGE="https://github.com/libyui/libyui-qt"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6"
@@ -16,7 +16,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	media-libs/freetype
 	x11-libs/libX11
 	x11-libs/libyui:${SLOT}
@@ -25,12 +28,10 @@ RDEPEND="
 # QtSvg headers only required, no linking
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	dev-qt/qtx11extras:5
-	dev-qt/qtsvg:5"
-
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+	dev-qt/qtsvg:5
+"
 
-PATCHES=( "${FILESDIR}/${P}-norpc.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.46.21-norpc.patch" )
 
 src_prepare() {
 	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
@@ -46,9 +47,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_EXAMPLES=OFF
 		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
+		-DENABLE_STATIC=$(usex static-libs)
 	)
 	cmake-utils_src_configure
 }
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index eb259a274b9b..fd7a915bafe6 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,5 @@
-DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
-EBUILD qscintilla-2.10.3.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
+DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
 EBUILD qscintilla-2.10.4.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
+EBUILD qscintilla-2.10.7.ebuild 1802 BLAKE2B 54a078d16a981c7f5ca4b332592e388376caa4201f02867464dda62e2fda08b0f9e3a5535558367198931a67c657161b20e93b3982c62f83c92fbc308950c32d SHA512 d304e9df12f1915e24890bfe02e8019d6a9cdc660deb65467aa17c36979ce2947a615d09cc82d532b75e1b42c54cf4f18b48791b10787e1bf834d2096a1cb6a8
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.7.ebuild
index 087f92e548df..aa76e891b48e 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic qmake-utils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
 DEPEND="
@@ -32,7 +32,7 @@ src_unpack() {
 
 	# Sub-slot sanity check
 	local subslot=${SLOT#*/}
-	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
 	local major=${version%%.*}
 	if [[ ${subslot} != ${major} ]]; then
 		eerror