gentoo resync : 13.09.2019

18 files changed, 166 insertions, 102 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e38e34d6cefc..c9ab90555dc4 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index f445486d9561..0137b97321f9 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -2,6 +2,8 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
+DIST gdk-pixbuf-2.38.2.tar.xz 5509752 BLAKE2B f78ba049edc7b1a6c909746ec68948764b3602988e110ee2ad752d26d8b3a37c3f2957a91d3c8a5fe3455cf11b477eaa43d097554048e8988c563b4074bfd751 SHA512 b0f83cca9bfbe45dab200b19a5ec6231b628c09633fd41348f433c226d523c2f9b805d41e4d955e9fd65c5b6d24df59c7c94193032379d6f09b0472ae988a0c1
 EBUILD gdk-pixbuf-2.36.12.ebuild 4007 BLAKE2B de6f3819c976e33c87a1f9f84fc8d85ce16ca793b147282545a796493cd43b827e034c7a0f5f529f160165781c02465f71859a863c6af8fa9882aa1a8235aa72 SHA512 98f39a76ebec24dc4f22559b487fff324f2b714d3203a5e98d6d4a18e85b4b8ab7f9c584e0f9c57dbb5d3f727e66b932458901408bc20a3c84eac7aafaa6be03
 EBUILD gdk-pixbuf-2.38.1.ebuild 4014 BLAKE2B b9d4e2cee94e4ee563804f6e98ac687063b2604c4a37b9ec64a981e3632beb516d11a9588cab341d9e0dba4fa1ff176fc9d99152fb760191c01b301e160f5ae4 SHA512 b1f1061e9d833667d4ebf4c7107b7446b21d66a6d955f79fdf64043c1fc7ce13b329f11b0a738f4aab3bd2c2104f8733f7f1ff6da4586491fdcb014a259734ec
-MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
+EBUILD gdk-pixbuf-2.38.2.ebuild 4028 BLAKE2B 42e4a44d8b20ff9a173671f125570f33a7386dad045b4165042730da44780e6f6ba47aae6cb90d1aba26d10d51bd450085163c70ee3d3a588848db781c5cbdae SHA512 63959485fb45cbab1bff37e9ec17e88c649bde28296ad1f875439fecf2b8e03f9a51eb04d5da60c0a5a11540d2a70722cc227bac3f4c3819a458756d5ed2e4e8
+MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild
new file mode 100644
index 000000000000..35bdc66994e6
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+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 gtk-doc +introspection jpeg tiff"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+DEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# Do not run lowmem test on uclibc
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
+	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=true
+		$(meson_use tiff)
+		$(meson_use jpeg)
+		-Djasper=false
+		$(meson_use X x11)
+		-Dbuiltin_loaders=png
+		-Drelocatable=false
+		#native_windows_loaders
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+	)
+	if multilib_is_native_abi; then
+		emesonargs+=(
+			$(meson_use gtk-doc docs)
+			$(meson_use introspection gir)
+			-Dman=true
+		)
+	else
+		emesonargs+=(
+			-Ddocs=false
+			-Dgir=false
+			-Dman=false
+		)
+	fi
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}/${cache} ]]; then
+			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 6c6d2ea40eb5..8901219e2688 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="X">Build and install the legacy gdk_pixbuf_xlib-2.0 library</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 45b42d99f70f..222decbea3f7 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -16,7 +16,7 @@ DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b
 DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa166286f071b8b98803d452df3f4f8934f2b1830427d0c0cd956b67170e576f8c3f733e9b6323b8f89f6d0ddea71 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5
 EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
 EBUILD gtk+-3.24.1.ebuild 6911 BLAKE2B 2320cdd69304ba179e9d3a679f4fcbbbef233f454b4661fa1268e7f209401fac175d1a50f57c931ec669ff64168891d66abea8f057b84837cf3801404f6cc6e8 SHA512 0df091ae2f0ad31ef4a77c77ea62e1e6075af62234483bc841b9c027aff45e0c7632354895d3066f9d480177f90eaa25069b6082b21da48640e7525b96000194
-EBUILD gtk+-3.24.10.ebuild 7319 BLAKE2B c95b010239374cb401c75b885e149519b75dbeb880be1e77d86fb829142ce86c19638376eee58dd6829852aeaddc3d13b2d63394eafc50010f46f59332eb666c SHA512 8303ad265908b470a9268266600035a5657acaecf77221f46fdbb6765152a2b458d0e8d197fb3b63ca6c95316b10e50e585b9ecdb36cfc8b729e316a2b3c3ed2
+EBUILD gtk+-3.24.10.ebuild 7318 BLAKE2B bf9be6e82fe39f53c254a4e93ae8c040654efef0a8438e361084c5d1c260d183c70385095b01ed36b048b148dc9485071df0b056e4d5df179141af5d2205c482 SHA512 ead2f168392bf78234f15d84926f69a2009730724675900dd6225a36f02334165803865f4085a3521cd3f0924a7af1364b58d7ab34ce5be22c3ee6a999f38877
 EBUILD gtk+-3.24.11.ebuild 7356 BLAKE2B 932d654e21ebe74724571f013ec35d69722547071e106442180e0b5a79f234b3d2c84fff1d222e32e337f2ac9866cd1cc86a3745be0be503b4606f0af920cd9d SHA512 07e90ebf374fa35372121eeb46db27fefb5b349e98327b130fe1472beeeaba83c44153b6ad5e51123b6665bb00d04c9c35fc6bd8f041b382f5050c626adaeaa0
 EBUILD gtk+-3.24.4-r1.ebuild 7277 BLAKE2B 833c8d22a401ba319fce77e3dc17223213d96e3d170b382377af5aa95fcee179c357e69d7dabc02e653a21877e199c5871e9843f800887dfe87985e3a068e231 SHA512 a26d38f97f1186452abb836ae7508f1d70d8913f466915afc7f6970af52a389bfb1b16914ee933be4ef0e2cd9eed99684f7b3aa2c41cbd793a3d55bbb0b4e0fa
 EBUILD gtk+-3.24.8.ebuild 7107 BLAKE2B d7f5db20d8f6821c5c50568493ffa0a01fe0b50c935055cd6d4cc0ea0ee34ea8fb3cbb8737f15868267017430466c0404c2c8084f759001d4642af4970c25b99 SHA512 051a2cbad61cff75b30fc8c889f7a1884bb8ee483cf304f92cd5b04a81dadae664aee1994d71111b2b3ff8389f794b0d02dbf998826367ffab70a7441f5ce4b9
diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index efd5436f0669..ecf03668282b 100644
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~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=768662#c1
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 6389db739e43..935094cc3a0e 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,3 @@
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
 EBUILD libXdmcp-1.1.3.ebuild 675 BLAKE2B 64beb2c9eac2c56d2c65ff231605535778313158bb2f4426957abf8dfb500894217e243bae1f80c4ef1b6b981c7647e8a20aad603c77ebddb680bb8bd4e8bb7c SHA512 524693085023b54c098eb4cdd0757d8f7a49ccc42f208c08b32bbfab4684e4835d7b9a5bd835e6f29b61495dd2e5d4c28dfc840567eaf6c6df8459ad606130e2
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
+MISC metadata.xml 310 BLAKE2B d30b368c138282f71b307e21c101bceac3df72c78519e9a20b124602e84d46d19f18c781e29ed797329122c63459602d56c2be4c5ad62e255e3586865a9a0c99 SHA512 fcfd052b3bd6c53658fea8bf241ca82753c12be1d0850536b02f700d9f9d830304296fee70a3b551ffd0c5d9378e13119c3bb12fd986764c940a644f3ac96656
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
index e943b72b8a48..8b173f9d4e9b 100644
--- a/x11-libs/libXdmcp/metadata.xml
+++ b/x11-libs/libXdmcp/metadata.xml
@@ -5,4 +5,7 @@
 	<email>x11@gentoo.org</email>
 	<name>X11</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:x.org:libxdmcp</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 03066224ae99..d8c13fe8f24b 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,3 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
 EBUILD libxcb-1.13.1.ebuild 1457 BLAKE2B e073eaa4ae6167b5de1ff2296f4c47085dca5d9699cc3e2b73686b7bc8b8f8f46833aa5a0bbf2d7de27b9fceb6dfceb3effb7c1b37df0ab3ca1381dd527bb33c SHA512 68a0345e90049f6dfb6e62b70f91486f2b281944b7791d3eafd67518e75f319c786d9fee9a7a628c4ab5743f724f1ae72bcc3ac7110bb17a0ebfb7a01cb756cc
-MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
+MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
index c68f9e8922a7..396f8bde1dad 100644
--- a/x11-libs/libxcb/metadata.xml
+++ b/x11-libs/libxcb/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="xkb">Enable the XCB keyboard extension</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x:libxcb</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index f0dbfe3f8c63..e16c17647da1 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbcommon-0.8.4.tar.xz 648592 BLAKE2B 6205ca08f1ccb6d85320428317e9d023e2f2a56dcaa77e34a9f9ea42bbf67c9ee27a3123dd8e880ead3fa92c4cd7718bde55a255c52f16fef8d33c395c2511a9 SHA512 dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3
 EBUILD libxkbcommon-0.8.4.ebuild 883 BLAKE2B a15d0aa82065f12f9259df5d3e578525b10e5f1448764d9286da355fbddb756448c974628edfe1cfb30cd51db79036836a680ff8eef8ece73f185f03ec1f0d75 SHA512 e8df23bcc8d74d04264c2fcfbecf563d7b01960b929bde15d1d139de915a74098c8c17c5a87b0c9fe0bbcfe3f8324eb072c4cd9a78f134ec8ecf703dd99e1141
-MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
+MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
index 7a7bbf810544..720e8a2f5f07 100644
--- a/x11-libs/libxkbcommon/metadata.xml
+++ b/x11-libs/libxkbcommon/metadata.xml
@@ -5,4 +5,7 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:xkbcommon:libxkbcommon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 7a79592a356a..c260d5edaea0 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
 EBUILD pixman-0.38.4.ebuild 1753 BLAKE2B e86ec9678222c2c6db62519aa6fc2838a88ce2e6ec9ea700a8fc8748b59a18cd4fd6c489cf866d43394352ddc470df0098e49d56e918abd9938e5b420dbcfe13 SHA512 e842f8d972f82f218d5426a819b00b3c44690ec2437fd5612a06d349b32cb3c87bbc7701cc36f697cedf808f44f18b9f8c26c2170cc8d90652dea98b6b3f1fee
-EBUILD pixman-9999.ebuild 1725 BLAKE2B ba5cc714e618976708ce2edcfae88c380a984455a06bff9a1d8b278bc06ebdc7f30ed5b8a0a3435eb822db18c63795f7ce97f2447d54ee9b5b1010f9491295ab SHA512 7e2408dd9f703a7f042067d64bf76eb35f65ce3959b4190c8cbda34161fda53cddeed7df3fee96dc4c6cbd673cc88dc9a668b6482999b1ff582b22ef648d940d
+EBUILD pixman-9999.ebuild 1753 BLAKE2B f6388f72690d3675f71bc30cd0788e534cc7f41c0c631bef3dd92dc92313bd85241aa4c737ab95381c51baccec31d14ea8973a4406a75322333981ccc043871d SHA512 cf3e78e6ce72008a489368627811e079ecaaa9e7a7566d2846d834df97be6d4b39104298398415b737618c49b04bbd04bae6fbead44004241c74cc439d20cfef
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 97ba3b6a51a8..95726ead8e99 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 multilib_src_configure() {
 	local openmp=disabled
@@ -34,7 +34,7 @@ multilib_src_configure() {
 		$(meson_feature cpu_flags_x86_mmxext mmx)
 		$(meson_feature cpu_flags_x86_sse2 sse2)
 		$(meson_feature cpu_flags_x86_ssse3 ssse3)
-		$(meson_feature altivec vmx)
+		$(meson_feature cpu_flags_ppc_altivec vmx)
 		$(meson_feature cpu_flags_arm_neon neon)
 		$(meson_feature loongson2f loongson-mmi)
 		-Dgtk=disabled
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index a6ced3a0b19b..6f5e8761d969 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST rep-gtk-0.90.8.1.tar.xz 251652 BLAKE2B b10a2a88b1950da4cb0f85d7dea53167184fcbf28a515b68de70f9ffc6e6cb9a2e2208020f8d6a9a52235cf4b1454901a0edeae990a2bb7227ba7eaa5da6db45 SHA512 033c148b34591672f29b0a1636b4c962ff82423f627243db07746899bfbf0ccd479322743d0822903bf954cdb3bae662ef7b2f8064cbe2741c5e8cf886e56d1b
 DIST rep-gtk_0.90.8.3.tar.xz 120616 BLAKE2B a0ada2bb13a8104d0dd532f35b64e6b049711284b60b4c4960b730909061ecce058a0ee79517cc508db95647d93f9af95c5ca73cf76e26b59467c8441064ac07 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac
-EBUILD rep-gtk-0.90.8.1.ebuild 1163 BLAKE2B 29f07de2e6265aa82b35d8d9398714edb2edb62c0f201632404428e5a12debbddc8bfc7dada51b30c8ec1475738b28a2e6e23a4cf41fb9e3681cd2c7631e658f SHA512 f66f4e7bad2ef1611fe5aa64379706011d91f3962a078cb9c3448e152e2796bdff99c4e05352df61c5dc243c1ec4c3031fa99e4610560f5d64ee6b82e55dd0c4
 EBUILD rep-gtk-0.90.8.3.ebuild 992 BLAKE2B 07fdc83b91f99f1a69af90774e296876f558fa70edc3ef4e1b61bd8a9f59bdfb08384f39d448b6f883068562d9722eb4f00e5b86a8ef5d361b3b79e90311a160 SHA512 c2128a9ddf5704242b74633bc0a0ea601a9bf640361efeb0e34ccb627fa89bbff9f4a5431cb612e63b258779316af85df998ad8c3da17668c6de7a6587ae3ae8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild
deleted file mode 100644
index 03812c54a2cd..000000000000
--- a/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="A GTK+/libglade/GNOME language binding for the librep Lisp environment"
-HOMEPAGE="http://sawfish.wikia.com/wiki/Main_Page"
-SRC_URI="http://download.tuxfamily.org/librep/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="gtk-2.0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/librep-0.90.5
-	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.24.0:2
-	>=x11-libs/gdk-pixbuf-2.23:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/xz-utils"
-
-#src_prepare() {
-	# Fix undefined symbol problems like bug #367623
-	# http://listengine.tuxfamily.org/lists.tuxfamily.org/sawfish/2011/09/msg00026.html
-	# TODO: Doesn't apply, if some people still get the failure, try to push a bit upstream
-	#epatch "${FILESDIR}/${PN}-0.90.7-implicit-def-new.patch"
-#}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-	dodoc AUTHORS ChangeLog README* TODO
-}
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index fa57b7e76f22..47c06b2eafc6 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -6,6 +6,5 @@ DIST xosd_2.2.14-1.diff.gz 8616 BLAKE2B b9eb96eee0bd561923507fb2bddf87e8f9ad986a
 DIST xosd_2.2.14-2.1.debian.tar.xz 17276 BLAKE2B 77caf1f33ba66698ab7f1894da3da27e754fe5989814427de804b9797f71930e2d52ced403f72cdbac9522337876bec2c93fc83b0d97f7e0d05f8b78337d0b34 SHA512 ba5d86d2391e6dfdc6a2994e486f9c5ecd1934438815f4dc01c0633192d74a2fa2cabe647574052c4a87203e0c12b9bb8c38851975c36f19d113787dae3681ee
 DIST xosd_2.2.14.orig.tar.gz 418331 BLAKE2B 2f7b8fbc31a2341ede7bc85c35ede4209c1d3a74ce07dbc62f302aa6d81a00e5e0dd4880d8ac290c0ff0f3babfcdb8b5975f7375cdafdc87fa0747c8ed8295ad SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473
 EBUILD xosd-2.2.14-r1.ebuild 1099 BLAKE2B a9efbbb9e7b743c9d04f1ebc6c803c427a312ea3e792c1fa5903136a3cf32fee16c1e53358dbd6e9d890c59d7b8665557c247ab8014a30b6bd6b18a372e512ae SHA512 b0b66039f6275381f403a9be4f5354cd4bfbee8b8ac006aff95fe20b0876dbdb866ea01be8ea3b5eceb374cdb21f5ed988edd8d021a44988b0679ee060ba954a
-EBUILD xosd-2.2.14-r2.ebuild 1190 BLAKE2B 054a0dae420343fd1cd566e99a27303db6c2864ce7b3f9f80b951a0cc2d378d1b60991b45a037b0d14c376c35c6408ce9ea82abded92dd082166e401062db3c6 SHA512 07682fb573d500f91c8ec140edd30b7caa438a38f07e05f6fde9b040d4ce26d58023c3f3e3783364faf1bd52ed73cd0ab3ff9b07ead6ccbc62e4d340de1a0f89
 EBUILD xosd-2.2.14_p2_p1.ebuild 1299 BLAKE2B 17b626b5b5fe3a3575c1c5e920a3540ee3dad816090f4144fb2d020734043d19b1756af3b13aad2be880de7ce06eb672bbad6f2133dd862b4df818fb0b3be995 SHA512 b4c294dec4978c8bb2ba6b16d1505f678877b814c1fc0d9231cd085f829177017441b0a0e5fe80215729d069e4702a5d4931b4df97fb26bdb8f110bff15f5b55
 MISC metadata.xml 242 BLAKE2B 7363ed5aa4ab2d52ba96610654eeb5e2f2f8f0c2e5ca4f695f6ffa88af926130fcc9ea41257f281b542a45703848ecdf78ff99c89f1fbe51116d8e6234095782 SHA512 cf2d021687f90caa78f0f9738a07a81fb632ff35dd323dbe63b080f3985d9bcc665e5cf8549840e2369d1c4427f9831a0d61d20c4b65bab93794464a98f82519
diff --git a/x11-libs/xosd/xosd-2.2.14-r2.ebuild b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
deleted file mode 100644
index f5629247357b..000000000000
--- a/x11-libs/xosd/xosd-2.2.14-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display"
-HOMEPAGE="https://sourceforge.net/projects/libxosd/"
-SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~jer/${PN}_${PV}-1.diff.gz
-	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="xinerama"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	media-fonts/font-misc-misc"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
-	# bug #286632
-	epatch "${FILESDIR}"/"${PN}"-config-incorrect-dup-filter-fix.patch
-
-	AT_M4DIR="${WORKDIR}/m4" eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable xinerama)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}