gentoo resync : 16.02.1018

18 files changed, 139 insertions, 61 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 9bc7f6a3db74..42580eac1765 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a2faf5befd33..59b9a74a8eaf 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,6 @@
 AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r2.ebuild 3633 BLAKE2B 8dd21187c7958ac7c0592352efabc156ec9b9f34275fd87cdfe81b4470ee25948b9c196f7767a1d28f81591ce97ff18e335c963b3bea443abb78f3ed1955be06 SHA512 44e5995559cd76295d65529074d5e6ba9ba1392dfd14e60e8ca1c9ff4e8805ab365159c7211c277484c08b18f79de99ec000dd15979c0747a2f014c45ac16585
+EBUILD cairo-1.16.0-r2.ebuild 3632 BLAKE2B 9d12a4c2c07e203df7574aa36f5b16d436e0bf0d0bbdfdf0a98ad54abc55a2542ea40108c6d34ff176be91f472566b50c3f8b82e40cd22932dbc2094cef06ead SHA512 e166e6931907c4ef8736d037d9f4b745114df4e75fc799dcd215764a573a9a04cb5e3a98dd73d3d615e9a807e9f5abf74b52e77da9b48c7db319204f19d7d698
 EBUILD cairo-9999.ebuild 3643 BLAKE2B ea2f2d7ff707c26ec1ed270013402aaf5812f858d7d88fa7ca1388920951f33b4c84f5b331c83535e92d981b2af92c69c341845559d35757b4828dd701ff8046 SHA512 085453031a155971d810e1e9b96abf50d52a16a1525c25116bdeffc46c22fa948d2323c1bbaa081f2bb95b77cbdd0f003df7e13eda79a0651ab74a52db58ad9e
 MISC metadata.xml 704 BLAKE2B 25cce9fa8743e9f12ee5f41d189dfdb8850673c129f0ee1089922aead08d50a0eca451f926a9f58fcfe7fee256764db2102364968971d7f971a026f8f29fcfd1 SHA512 4c2c54b38569197ebbcb8145017b77c4f77fed2f6b6b6c4198386ee1e3f067b3ca4539cbf239bd7f3ead1e3d428992bae67b3e80edfbf8bcf48fad43d14256b1
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 009282297c65..f49627585235 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 61acfb244080..2b188e2de25b 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -11,7 +11,7 @@ DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ec
 DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
 DIST gtk+-3.24.5-patchset-20190206.tar.xz 4208 BLAKE2B 09d1dcd0a6312f042739c633ef5c3a3b26c81f586c4c1396bc9ed4cd5e8a891507d6a6857e91b481794c8c6ea1e9511b756e7307775acb4ec53f561283c2139c SHA512 e3748ab10032d1c388b50ac35e295d08f7373c70186d35ee52f8a31ea53cddbac61eb25e5c6aac9855a4cb02c25ed0d2361241fe2530b6ce6738fb5e4840817e
 DIST gtk+-3.24.5.tar.xz 21012108 BLAKE2B 25b8fc92655be190a0dc082ee303614026054d9bf17f93e8df11129f77fe1e6dc9cc97d5ceeab139eb905e3d61ea918b01d39f342e11d06fb3245c590567d24a SHA512 344988c9e2a2d7fd2fd1e367a113be7c4a32c28c9cf395aeab923e25256b99856091d1583d3f8557aac6919a930a4d0af69b966486caab559c7d9d22585cc1a1
-EBUILD gtk+-2.24.32-r1.ebuild 10009 BLAKE2B 2a190d7fce5efa98ad28a1e94ee83eed1acd1399e04b4d4ac76c31349d2d40668b78d06096b9a6352f64e5b61e1a31675b61e8a0c90e252035782d51ea8f36e0 SHA512 9d794353dd8bdf5fdb68298ba454781f7f11cc287737b58003ed18a03c6824fbed536633af4c435a6243fee1289d42fa467bee00b8c0ca9d36f7999908fdff61
+EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
 EBUILD gtk+-3.24.1.ebuild 6868 BLAKE2B e602a63f626d30650b4ffdec0b7e5f21447646bd5cfc3c179aabbbe7c0447fa4714774e929becd35986dd39c4f800858721212945cc609f769aa451c39efa9c2 SHA512 779d1a44e18d00cb6051df289fc413bb9766ea4be932fd6207f83ac0d71c9a15883d585f778c1752460e5957a326f9d2b16550c1009230623c8561381bd51b6d
 EBUILD gtk+-3.24.4-r1.ebuild 7243 BLAKE2B 7aa81f0092387dce46b8fd55aa24f14c6e50bb7efbf903be4d64f9b703d2ebfea80c561fd426848aef69d445597283186a372f27c9c77ce1d7db3ffe2afcc6d9 SHA512 30b537ae298815f42c8faafc492b222849209903039ffa24bf004821411c7853d95d3de279535b4e1ec9e053a3b83a8df34121e8910af447090313af336a8583
 EBUILD gtk+-3.24.5.ebuild 7148 BLAKE2B 55eef75fa3935cde6c1830c0eab3689ea02ae51d7271df0f0e215cbdded7f4af903c2c22aeb871336039cb0bc7f5f04871b5b7201aacbdaa178089e228517577 SHA512 804468b38c444e63da54b17ddaa36180be7c8359b1c6e2e66d39a0af95dae17dbceec64182bb28d3ed6f8ce941a00fdcad916f34943c402029d48841f8478621
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 37e26a0b2b0c..59b152960347 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 65f1b5b48498..a5a3b05c3585 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,3 +1,5 @@
 DIST libXau-1.0.8.tar.bz2 295297 BLAKE2B 46c0cdf3382a75e197e48d556d44494dc8a91483fa27c86ae1b4264deb63320637232fe94d1286b38ba8f4efa5405f4b5c476266963ee3ee43b934af2e0a0e53 SHA512 9f933d22f8f2411ae770094589cbe170c631a1437d572664e0fa6b9608e6ec39deef752f2dd6408ab45acdf01bf1827ef3ced640a33da787d9cfb546f12397b5
+DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
 EBUILD libXau-1.0.8-r1.ebuild 489 BLAKE2B e6e62286ebd46e04c217f933d6ff1b45f7e506f2738ce353bcf53583467317e480562519dbafe1b37a231050d4d1e663e3900c96d99e22619c13339dea81b91c SHA512 b9ca291f2c834fe4890b3f99f840be609615a1a41c555ad54f24d7c8c157b00c827c5f77bad0442970e36295dbed27fde328764e19b4a107aa6190285d519e34
+EBUILD libXau-1.0.9.ebuild 497 BLAKE2B dddfec346ec91530b0f9527bdae45f773d9363e436130847d91599d9b5eab2b7a1c9949e1cb927e540b134db6cedf67148a7cb3e1d9538f9f9de78da6735857d SHA512 3b09560b408539afd32ef876645490f95efe4d34206bf2807187af166153553ed6a445512193b61ed0eb124c01a6240ffa53d9964a0f5523ca3a310f7f668781
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.9.ebuild b/x11-libs/libXau/libXau-1.0.9.ebuild
new file mode 100644
index 000000000000..a75660eb26fd
--- /dev/null
+++ b/x11-libs/libXau/libXau-1.0.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org X authorization library"
+
+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 ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-base/xorg-proto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index ca03501c72c5..2122a3a0ff4d 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1,5 +1,5 @@
 DIST libXaw3dXft-1.6.2c.tar.bz2 574326 BLAKE2B 05a869567972c8b0aee270281c38dcc75ca849ffa1b5510557ddbf95974f93db5b2255cc2a99969b2da40ca125df95d7b0c7d905dec10ce373baab404ee5b9ba SHA512 4bc2b8257cc44cbdf1640c9946acd5958694beef4af9f5910cf07b1d32133708561e59532a3ae8f1540b930f97649978910b2eed349e81486ab86f340363faad
 DIST libXaw3dXft-1.6.2d.tar.bz2 584670 BLAKE2B cde040659a90edb50ac5aa374e8ec04442479ae1c06fe3d5b1387bd3e02c1a0b40ff286ad40f0ae7841544d1244648e34905570e5827dc0efe60a62da3261c9a SHA512 ac434b7f055d20ceb0bd17851d8ba69976ec562a60cb8012a259045e52c038278f0a8b25b52a61befab3aa169b74fd919278c671f1b6e282efb404e089772740
 EBUILD libXaw3dXft-1.6.2c.ebuild 714 BLAKE2B 74570912dfb9fb5dade34aeab9c974182aa707cbe6715723c3e29830b26ab5510f4cf896dd5945fa10c09f37cf0dab0706f7ffb0eee6c85fbb8da6dea6d59bc8 SHA512 6b0266b786fecfe01ebc79d3f679204234adf9d4be147fdc21de68a91d94d4800080d6e991cd4995f0a9e2db58271f654d5181b0d3278eb542952ac4db5e9177
-EBUILD libXaw3dXft-1.6.2d.ebuild 716 BLAKE2B ef0ce254bfe37a97285320d5e6c164be38092a19320f501d93c1eb8fa815f155528a9b6ad2059935f3c66da00023be85d963ba18ad991b10258711953d6f8b5d SHA512 3a5a1149a4e2ad9e7680357850d363c9a7523f10dad1291a95cba03c5b34fe38c754b789eba889832ff480a48bd402fc526e69d74c066cc1eeccde6414677a87
+EBUILD libXaw3dXft-1.6.2d.ebuild 712 BLAKE2B 39517f4108e6703d8224be915fdc95c7bef2ce4433e122e15ce1749167b0dbc330bceadec9c146a19131b5128854cbc698c71a406da3442b90154d829e686b83 SHA512 2a1f4f93a318cfbddb2d1bf26f6efdf61d662b55fd772441dc1762f29d51b813ef191c151968253134f26f0824207f8d158ef98ef06985d578af8854352eea9b
 MISC metadata.xml 246 BLAKE2B fdb264ea0fcdffe3b15f288ef6958a743a7c88bc85f82e13d20af443e93182007ffcf8ccfd62071b57660a668f9c25753c12baa7a409c9d42a408293c21f482c SHA512 be42da502b805b08126629fdde43bd1473535fc5588faf7c65c05e923736fb18f0249fe61ac5c18c4de1619bd52e4865449d1f02ec19f2c2581f6c2e23a5ed4c
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
index 706b92aa6dc6..be5b81c48aba 100644
--- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.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=5
@@ -9,7 +9,7 @@ DESCRIPTION="Xaw3dXft library"
 HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
 SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="unicode xpm"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index f6e957c3a8bb..e652d4657d97 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,5 @@
 DIST libxkbcommon-0.8.2.tar.xz 644040 BLAKE2B c323384308d9730924d6f1cb7ad55fdb3d1a37289f648b981c54dc5997c67c857d33f8ad872fc7646b462ebc97252dca30efe2a2e12d1f1f08a8a1604a5de23f SHA512 b714240ec6120bbe44b5da7a4f89b1c2f24cfd6e5ebbe81e5290d135c8f2e5a68f89ac256b73430a446167345f8db309b35dcf74f3d3840e20897cd91eccc172
+DIST libxkbcommon-0.8.3.tar.xz 646124 BLAKE2B c80d5065395ee8adec436243cf42fa82a05a5797be711b4e10d70d92ef742c707f034adf870480e1797e1b05135b5ce644e6ebefd036aaac7d3fb7435b5bd543 SHA512 0a3dfacc17eddfc10fe3edb946bede5070f2744effe642bd96076996f262a41addb691d62c0d738457da522d1fea02c297c9a2a8b1f56521adbf50ca917577c2
 EBUILD libxkbcommon-0.8.2.ebuild 928 BLAKE2B 08e1d3188c38bc14a9ba866d530e1768a2b8f4b13d1ad7eed9e342d54049e7e4f2c3e39d666b9ecc95e4f325720cb66ada4ce7d485a46dddb5e8c6937d4e75de SHA512 6717271f5b12543c3a47bc53c2d181bef7e2552c5234de51c693dadfda3f6287e41755674720e9fb31df3002fa8357f74e711c4637be195b8626b62ff3121f71
+EBUILD libxkbcommon-0.8.3.ebuild 939 BLAKE2B a9d45b076253fa3757162f9652ef043404b08c94177326e77bc0a6d36da69e07916be6b04ee9f81a8025358f4760bfdc90abdfa92650273f3f4c2a3d074ef670 SHA512 d380a6b36bedca1f265b75ca9a51ae665daff47d6e8b2555b80d74bea490e040eb947e0f9c25b030631cc849306684c4112c9dca95a9dcea51200e70e36f23d9
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.3.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.3.ebuild
new file mode 100644
index 000000000000..20521c37215d
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_MULTILIB="yes"
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	XORG_BASE_INDIVIDUAL_URI=""
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+fi
+
+inherit xorg-2 ${GIT_ECLASS}
+
+DESCRIPTION="X.Org xkbcommon library"
+HOMEPAGE="https://xkbcommon.org/"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+IUSE="X doc test"
+
+DEPEND="sys-devel/bison
+	X? (
+		x11-base/xorg-proto
+		>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
+	)
+	doc? ( app-doc/doxygen )"
+RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		$(use X || use_enable X x11)
+		$(use_with doc doxygen)
+	)
+	xorg-2_pkg_setup
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 520b1bd12654..a95d9c66a76b 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,8 @@
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
+DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 EBUILD pango-1.40.14-r1.ebuild 1680 BLAKE2B 3232426804fbbff57e8b7071cea928e241873cb25fa444b8aa412e5ee6b11141d46f68d843f3e764b85ac5b93b0f4d72983e18660590dafd4fac962093d52e52 SHA512 e4c34fd5ce181a3fa04021736763c11c152e31dda71cca14d176cba2b9816d64f3adce6ac3583e957e987fa1849eca4166ad8abbbd35d03529a33073f18828b8
+EBUILD pango-1.42.4-r1.ebuild 2296 BLAKE2B c7854de793ba07eb255d48722a02bbd8a75499f96b1db15bd46dee2bec06452b7e4427b0433569602aaa026509e314200750c0bde22b0a27366c6da878b466b0 SHA512 499a9e0d82d931b12b817a61e3a59df6a150e78281e2f834176edf85320ccf57124a9d232b8dcc7fb084afd87e6019c67b270a2d29801ef42b1d86889ec9fc54
 EBUILD pango-1.42.4.ebuild 2046 BLAKE2B 23b124957c056dcefef238d6066ee8c2ef36a5ed5f2a7aa5f30530aac482af61f220261f8eb7bdc1d9e2e073bfcc154e40d659902a408bc87cb6d3fad96aefa9 SHA512 e23638c8c3cd188ca413178999d407c1a967b3ee97834a5b190ddf6b2f14164727bc9b7559954dc031e4f94ef5b04eed509f3f1d9180221ce718f58aeee617d6
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4-r1.ebuild b/x11-libs/pango/pango-1.42.4-r1.ebuild
new file mode 100644
index 000000000000..676a13a07419
--- /dev/null
+++ b/x11-libs/pango/pango-1.42.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.50.2:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( x11-base/xorg-proto )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+PATCHES=(
+	"${WORKDIR}"/patches/ # bug fix cherry-picks from master by 20190216; each patch has commit id of origin/master included and will be part of 1.43.1/1.44
+)
+
+src_prepare() {
+	gnome2_src_prepare
+	# This should be updated if next release fails to pre-generate the manpage as well, or src_prepare removed if is properly generated
+	# https://gitlab.gnome.org/GNOME/pango/issues/270
+	cp -v "${FILESDIR}"/${PV}-pango-view.1.in "${S}/utils/pango-view.1.in" || die
+}
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 70ad21678364..39b1274c596f 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.36.0.tar.bz2 739957 BLAKE2B 05834dbed8a5bfed607a20f78523e7441f5b78a7a01c7d302c48b8f15dcda37111a8a99e7119b84a0a8a26b55fa93db1c2af316359095cb7db0d8a9e263a1eb7 SHA512 ed99c85a8ce11f52659da61bff599c0405ae0069c30434bdef7238bc9f18e83e6d534cddf38c14d753943edbaeba580c5005ad7575f27e469ca7be7878678d21
-EBUILD pixman-0.36.0.ebuild 1012 BLAKE2B 8656a3c7fc52199b5eb3925bf8263376d287fd6fd9effde00a9b3f4f5fd1339eb4cb3422d0a870485de6d6b0f0f5fa264fb7a96074182bb3f3e29d493d93e8e5 SHA512 2d01a109cdb0c9e7d23df8cc93d858d3c8fd6780165674207a509e2ab153591e0b390667cf6c1f3d2e7bdd3ff7af9829d3a42b8b31eb66ebb4904ec229fd6ed7
+EBUILD pixman-0.36.0.ebuild 1011 BLAKE2B 39bdaceeb38639ce856d207792a88ee7f1237cb2b0ac8ca34d93503f3ce3b69146ea015657e7a9b55481f59a438d29ba491711716d7820ede4620d9dc56e7118 SHA512 034b0716e27095c89beeaa0bfcc12032a1d629800d91b308fea8de21e5c1f369fdf62d1ab14188126c8eaf7b3f802d5e007cf1fd7e0b0f1e5cf9f7673c5e8978
 EBUILD pixman-9999.ebuild 1022 BLAKE2B 1876024bdba963fdc1f8fd2226099d75b8a4ef5c7918ef4967bc7ea24aa4dc59a08fc6d81acde1778308043a9f9fddb6b494607f265fad6b75ae2889142eb85c SHA512 ec76a5f65932b57d0d76f841a152646edeea44a3f2d3e8bdd4d078ba7de36b7ed264b0ee7221eb64c27206409e8ce66d7dc01c56d50e5214f55da267d1b7b08c
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.36.0.ebuild b/x11-libs/pixman/pixman-0.36.0.ebuild
index 736ca932d6af..118922ce9112 100644
--- a/x11-libs/pixman/pixman-0.36.0.ebuild
+++ b/x11-libs/pixman/pixman-0.36.0.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
 DESCRIPTION="Low-level pixel manipulation routines"
 
 if [[ $PV != 9999* ]]; then
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 IUSE="altivec loongson2f cpu_flags_arm_iwmmxt cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index df789bfcd803..120311a370ee 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,8 +1,5 @@
-AUX qtermwidget-0.9.0-nofetch.patch 817 BLAKE2B f75c6162fde982065fa6c48bda461ebd73f288a2f395167729ec2ea577226c0ac7943b5954b4e2914a57aeaf6f0cddee02bb8f042cde75aab12140f19191ceb1 SHA512 1fbebfc9b3d6fae447f2399659528af2b1b461e262e74456aca48683db7bf4f161a0c5022f24cd7c63913021c6d35a78986477154432275f80a1ed6d9edbe957
 AUX qtermwidget-9999-nofetch.patch 1236 BLAKE2B 2c797ea767681357a587c6e86796c9869f9a1e5d455b7c0bd76a14eb04c56b74aba637df337aa29af5fc5f0f4b40c4ea2ca9637eab6e7cf9b4808609afdaea6f SHA512 b7fe3cc1effb00fc8f6a62cc6284de756e6a6b671ae8c803dfdb89f7af74055570711b7d8d8985695c7ca40fb419768721ec8a748f7658590304c90a07053c84
-DIST qtermwidget-0.7.1.tar.xz 158172 BLAKE2B 7fc013a4bdd589ea8d08f440d48fcc924c71635292ceb0ec7b38142733f14f280eeda599fa35b6fc4f9bfbcaaec565e35163274709c43c7ec9e56e51cc2ab2dc SHA512 a8660ca5355103cf9d9f72ec5213f3c04d02dff44ceaa26297960def07335596eba6b125a7b3ca1a02f8c19a99edffdee68c57ff0c3f357cc3df149d3e9c5c99
 DIST qtermwidget-0.9.0.tar.xz 166976 BLAKE2B 5f3f56168e21dbf9a5039784fbb42682b5422fc919c3f30c4240acdff23b57dd7f850eb37bba96a50ae18f9b2594dd3ccdde173d3cf002e39611f67085cc9e0c SHA512 fc7286dc3494bd1ccdd95fae3cee7cc8dd39b51eab58e697d939d5fb85c930545d79b984769815708852335e460ad063b684291b200e1e7f90c13195ea5e66dc
-EBUILD qtermwidget-0.7.1.ebuild 447 BLAKE2B 31ac658f1358e826ae406e14c64e5913cf60e8f28dcb158b69faa90ba18aca70342fa77e65bfe62653d28075883db8183f6778925e0e07aace8ae73c00987236 SHA512 bdc88cd3b2b0921e91cd0fca026bdecb3a4a1b6f2afac9152d4f132ff1807fc65466f50ff3c91f04f09f363d3772dc9ce0fb03ad201757874338a9797180e7c2
 EBUILD qtermwidget-0.9.0.ebuild 726 BLAKE2B 96165db397eba5e17a6533539c4aa869a8d633cc77ce3d0c3e726c4372b3f4cd065316a8e3d39fdcca121c4d505f2aca92baf3c1e0c82012d467bf8d42e35f8b SHA512 b4e10cfb5c5fce50c63256cddc22f6b33de0227884c01d8af21a47053d3ebd434fbf57f5f10bd40af60f2aa1eca7ddb01257adf09c3162280dd77342c416c097
 EBUILD qtermwidget-9999.ebuild 516 BLAKE2B fcfcd0622a1718d9b60f0f26c72cb353066955dd83bba528398258ffe706984f066b01709784436da9cc26594b32d4d10aa2892de762727c05b6f8a9d18ac09a SHA512 6cec4d241eee31c9106bc7e8cd94d22bef7e7cc5b47fab30904f7ed480aa69c434320731f9be9bddeb2099a6db29838cf1f3fa866193f81c2c9c236267d94470
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/files/qtermwidget-0.9.0-nofetch.patch b/x11-libs/qtermwidget/files/qtermwidget-0.9.0-nofetch.patch
deleted file mode 100644
index b0b84e174a28..000000000000
--- a/x11-libs/qtermwidget/files/qtermwidget-0.9.0-nofetch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8d29395d189a99d05792c34de3edc5a2fdd267de Mon Sep 17 00:00:00 2001
-From: Alf Gaida <agaida@siduction.org>
-Date: Tue, 5 Jun 2018 21:53:17 +0200
-Subject: [PATCH] Removed translation related git stuff from CMakeLists.txt
-
----
- CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 462e841..9abe385 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,14 +129,6 @@ lxqt_translate_ts(QTERMWIDGET_QM
-         ${UPDATE_TRANSLATIONS}
-     SOURCES
-         ${SRCS} ${HDRS} ${UI}
--    PULL_TRANSLATIONS
--        ${PULL_TRANSLATIONS}
--    CLEAN_TRANSLATIONS
--        ${CLEAN_TRANSLATIONS}
--    TRANSLATIONS_REPO
--        ${TRANSLATIONS_REPO}
--    TRANSLATIONS_REFSPEC
--        ${TRANSLATIONS_REFSPEC}
-     INSTALL_DIR
-         ${TRANSLATIONS_DIR}
-     COMPONENT
diff --git a/x11-libs/qtermwidget/qtermwidget-0.7.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.7.1.ebuild
deleted file mode 100644
index 5d568599545c..000000000000
--- a/x11-libs/qtermwidget/qtermwidget-0.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://github.com/lxde/qtermwidget"
-SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"