gentoo resync : 06.08.2019

26 files changed, 75 insertions, 444 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 399acdff4ce6..a3acc68ce234 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 67985c9c0336..f445486d9561 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -2,6 +2,6 @@ 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
-EBUILD gdk-pixbuf-2.36.12.ebuild 4076 BLAKE2B bc49bef8fc97cb3adcbfa5262713d700089f06cc7392bb85faf080ae02804520a6c89e36c024757cfa7f0e865e70a84639d4094d6a45de6968e3fc1953cf08f5 SHA512 516b6f8b9643e86bd19e10172ccc430e38a289f319a521b45ba336a6f87e163b26c51077a9e4a855502c240b7bedd63021a82b878ce1c779581b82e78a82a0de
-EBUILD gdk-pixbuf-2.38.1.ebuild 4086 BLAKE2B 5befd1e92bbae70ff6294fcac99f24d3f23d327295fbd2751c5da9ff8936d495371acbbcedf0eb8853223639e8089325247a18792f8cf82325d2fe3f8a75f8b7 SHA512 b9072ab977f05347445ee0c696113be679b887c4be0c4b5d42f23ca71e2a21fc4d2dd117e57cb28e9fed38143be11cf9ee453e099c0c4dd98589cbaa4b213e2b
+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
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index fba332527c16..abf08b26b453 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -12,7 +12,7 @@ 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 debug +introspection jpeg jpeg2k tiff test"
+IUSE="X debug +introspection jpeg tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed
 SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )"
@@ -22,7 +22,6 @@ COMMON_DEPEND="
 	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
@@ -74,7 +73,7 @@ multilib_src_configure() {
 	gnome2_src_configure \
 		$(usex debug --enable-debug=yes "") \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
+		--without-libjasper \
 		$(use_with tiff libtiff) \
 		$(multilib_native_use_enable introspection) \
 		$(use_with X x11) \
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
index feca458cf8df..d6594527cccb 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
@@ -11,7 +11,7 @@ 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 jpeg2k tiff"
+IUSE="X gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
 COMMON_DEPEND="
@@ -20,7 +20,6 @@ COMMON_DEPEND="
 	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
 	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
@@ -66,7 +65,7 @@ multilib_src_configure() {
 		-Dpng=true
 		$(meson_use tiff)
 		$(meson_use jpeg)
-		$(meson_use jpeg2k jasper)
+		-Djasper=false
 		$(meson_use X x11)
 		-Dbuiltin_loaders=png
 		-Drelocatable=false
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 9c38dd549bbb..a8e7c470f437 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -15,7 +15,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 7325 BLAKE2B 5462361af2e23d93b6fb6f55666a2c15552edefa201bc22443688e628a13bfab77714e3b55e0be2c57d92b18e01d4681d2730967e55a393eb1f3009b1880a29e SHA512 dfe6cffe3836606a87ce162b7c5668c284c0da4dfb0848941ed2a41b95efcda2d098997ce20921f7e149c89ed4c3978f484d3640f674f4bf1b000f5889a85adb
+EBUILD gtk+-3.24.10.ebuild 7319 BLAKE2B c95b010239374cb401c75b885e149519b75dbeb880be1e77d86fb829142ce86c19638376eee58dd6829852aeaddc3d13b2d63394eafc50010f46f59332eb666c SHA512 8303ad265908b470a9268266600035a5657acaecf77221f46fdbb6765152a2b458d0e8d197fb3b63ca6c95316b10e50e585b9ecdb36cfc8b729e316a2b3c3ed2
 EBUILD gtk+-3.24.4-r1.ebuild 7277 BLAKE2B 833c8d22a401ba319fce77e3dc17223213d96e3d170b382377af5aa95fcee179c357e69d7dabc02e653a21877e199c5871e9843f800887dfe87985e3a068e231 SHA512 a26d38f97f1186452abb836ae7508f1d70d8913f466915afc7f6970af52a389bfb1b16914ee933be4ef0e2cd9eed99684f7b3aa2c41cbd793a3d55bbb0b4e0fa
 EBUILD gtk+-3.24.8.ebuild 7107 BLAKE2B d7f5db20d8f6821c5c50568493ffa0a01fe0b50c935055cd6d4cc0ea0ee34ea8fb3cbb8737f15868267017430466c0404c2c8084f759001d4642af4970c25b99 SHA512 051a2cbad61cff75b30fc8c889f7a1884bb8ee483cf304f92cd5b04a81dadae664aee1994d71111b2b3ff8389f794b0d02dbf998826367ffab70a7441f5ce4b9
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index 5f80a015c446..efd5436f0669 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/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest
deleted file mode 100644
index a89de6defcd4..000000000000
--- a/x11-libs/guile-gtk/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 2.1-brokentest.patch 1029 BLAKE2B 96336de7d1efcfcff9ba7ac04c00e2972b5aac0051e586c381a24ef45efe62814cf75a34b4634f7812a96342781d6bbc088b889874757977586fc4cf806729a4 SHA512 e398ba38b19a2076a0974da3b8c2a038fe7b49e59cf187e20eb33df1bc74f6d34afcec5ffac5b288ed59b0f131a2a30254e248b6c63ff10cbf9107005ca56625
-AUX 2.1-prll-install.patch 421 BLAKE2B 137bb381668c7540d56f15c8246d79a08c4931b2eaed7828f4b1e0bbecc0e88ad752e639331784cc2b24fcfabea050d374e92d13887587865aeb5029debbd02a SHA512 ff30ed5edb3a9a2bfde6b480b2bbf2d8487cfe6583f73bbefb35e434b37e727037005e6e11e91aa115fcc75ed558883e36aa64d46f34d9ab40a94792eb201e10
-AUX 2.1_migrate_gh_functions.patch 1872 BLAKE2B a82d98508469b3233215f672f15018a32752ca2505bbf414a01382553ea45fcb8b075cec0647198021d165bdc01e4364f7f8f919049a94a15b2861216d2a78e3 SHA512 7b749c4a438da1a98d266ca7e1e7923400121af47c52b3f8715a1cebc1c60c7c6e2fda9992891b49c866d9121f64182c629615900d285209fe3aee22e9976ba8
-AUX guile-gtk-2.0-g-object-ref.diff 1239 BLAKE2B 8ee7fc847befc089e7e9171c17b5a950b5e930241dccff2bd497909206c54c31f1384b204ed7c3ad4fbda8c0961dba494945609ed1ad7c0f78ee2bb9bee46b29 SHA512 ad72eff398d573450127dab756207974b56b48161d79a13b907ed58dc17ba63b1256478ab8d2d6c22ec03fd106d9814e6a4d9ca030ee203c1af474a28faea513
-DIST guile-gtk-2.1.tar.gz 781985 BLAKE2B b3387ef9ac79935fa9cf2b7d35f4012dc0748ecbade131b2c73d8d4513d90f84164ec3f196fafda8ba77abfd2a0b8dadf9dbc0118281fc06db0a36d2f533592a SHA512 ab9bc66c97099d6958c401e16db57ceedaf23f1944cb7cf1e6899547c77cafff67455f228edd156a5a7ee0b62264e6af0ff82fa3ec31bcb499710bc5cb2070a7
-EBUILD guile-gtk-2.1-r2.ebuild 936 BLAKE2B bf3f7b37cdfac6b5430157311049f38dae49bf290b6401352be2a429437151f9dd1cc12c4b6d0a5c142e29abbbc9c0db16d254966b5bbb78eb851cb528ea47b2 SHA512 b570fe2dc0060f3a03d5c710ad3fc742636f598f9332f711f94291268dc02dbcad090e91b4e3207487a9dd4ddabbce3bd8b1cfeea6729100db4b757f7f119280
-EBUILD guile-gtk-2.1-r3.ebuild 1003 BLAKE2B d0e02f0f57cf6af74526c993c600819398aa2c9738ffcfbed4e43bedd1f36b8051037ad00ad7a89c9dd444c1752f4a4f20bb022d33925d0ee8dff72ded9f4211 SHA512 63203feb3293e955d417cdc6f33e6ff577cfe21ae09cec11cbecd6c5149613de2b451e96ab63d21954ae00f65e0a77776dfe8af4bd77c7ecf571a76dffcfbf8a
-MISC metadata.xml 384 BLAKE2B 0825ebf9da828bd733111afeafa845331623c6f61a7a8c396ea594d0cfef2a0fa5a3786e4e4de3709df5e493aae56263548206ebd82296e15fb807e403595022 SHA512 d249b966de131fb538bccbdf9ff10501b54058de809a9c8e4405e79aacaa3c232c429183a57b955bd044207ff84a8056883eec3dad1583c6fd58c06ee912bd77
diff --git a/x11-libs/guile-gtk/files/2.1-brokentest.patch b/x11-libs/guile-gtk/files/2.1-brokentest.patch
deleted file mode 100644
index ecba95174e0c..000000000000
--- a/x11-libs/guile-gtk/files/2.1-brokentest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/tests/gdk.scm b/tests/gdk.scm
-index 6e08f9f..6b01e83 100644
---- a/tests/gdk.scm
-+++ b/tests/gdk.scm
-@@ -1102,28 +1102,6 @@
- 	  (got  (exact-positive-integer? (gdk-screen-height-mm))))
-      (test "gdk-screen-height-mm" #f want got))))
- 
--;;
--;; gdk-selection-property-get
--;;
--
--(malloced-steady  ;; with nothing ever requested
-- (lambda ()
--   (let* ((win    sample-win)
--	  (want   '(#f NONE 0))
--	  (got    (gdk-selection-property-get win)))
--     (test "gdk-selection-property-get" sample-win want got))))
--
--(malloced-steady  ;; on a destroyed window
-- (lambda ()
--   (let* ((win    (gdk-window-new #f 100 100 '() 'input-output 'toplevel))
--	  (want   '(#f NONE 0))
--	  (got    (begin
--		    (gdk-window-destroy win)
--		    (gdk-selection-property-get win))))
--     ;; final free()s only take place under the main loop, so need this to
--     ;; satisfy `malloced-steady
--     (gtk-main-iteration-do #f)
--     (test "gdk-selection-property-get" (list "destroyed win" win) want got))))
- 
- ;;
- ;; gdk-text-extents
diff --git a/x11-libs/guile-gtk/files/2.1-prll-install.patch b/x11-libs/guile-gtk/files/2.1-prll-install.patch
deleted file mode 100644
index b00fc29ca34a..000000000000
--- a/x11-libs/guile-gtk/files/2.1-prll-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 822a170..37f43b5 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -72,7 +72,7 @@ gdkdefs = gdk-2.0.defs
- defsdir = $(datadir)/guile-gtk/
- defs_DATA = $(gtkdefs) $(gdkdefs) 
- 
--install-exec-local:
-+install-exec-hook:
- 	rm -f $(DESTDIR)$(bindir)/build-guile-gtk
- 	rm -f $(DESTDIR)$(bindir)/guile-gtk
- 	ln $(DESTDIR)$(bindir)/build-guile-gtk-2.0 $(DESTDIR)$(bindir)/build-guile-gtk
diff --git a/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch b/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch
deleted file mode 100644
index 5a194874f155..000000000000
--- a/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur guile-gtk-2.1.orig/glade/glade-support.c guile-gtk-2.1/glade/glade-support.c
---- guile-gtk-2.1.orig/glade/glade-support.c	2016-08-12 12:00:45.894290499 -0600
-+++ guile-gtk-2.1/glade/glade-support.c	2016-08-12 12:02:33.186666585 -0600
-@@ -17,7 +17,6 @@
- 
- #include <glade/glade-xml.h>
- #include <libguile.h>
--#include <guile/gh.h>
- 
- #include "config.h"
- #include "guile-gtk.h"
-@@ -83,7 +82,7 @@
-       sgtk_protshell *protshell;
-       GClosure *closure;
- 
--      cb = scm_internal_cwdr ((scm_t_catch_body) gh_eval_str, (char*) handler_name,
-+      cb = scm_internal_cwdr ((scm_t_catch_body) scm_c_eval_string, (char*) handler_name,
- 			      scm_handle_by_message_noexit, "glade",
- 			      &stack_item);
- 
-diff -ur guile-gtk-2.1.orig/gtk-gl/gdk-gl-support.c guile-gtk-2.1/gtk-gl/gdk-gl-support.c
---- guile-gtk-2.1.orig/gtk-gl/gdk-gl-support.c	2016-08-12 12:00:45.894290499 -0600
-+++ guile-gtk-2.1/gtk-gl/gdk-gl-support.c	2016-08-12 12:02:19.530121760 -0600
-@@ -19,7 +19,6 @@
- #include <gtkgl/gdkgl.h>
- 
- #include <libguile.h>
--#include <guile/gh.h>
- 
- typedef struct {
-   char*		name;
-@@ -100,7 +99,7 @@
- 	    if (! SCM_INUMP (s_value))
- 	      goto error;
- 	    
--	    *aptr++ = gh_scm2int (s_value);
-+	    *aptr++ = scm_to_int (s_value);
- 	  }
-       }
-     }
-diff -ur guile-gtk-2.1.orig/guile-gtk.c guile-gtk-2.1/guile-gtk.c
---- guile-gtk-2.1.orig/guile-gtk.c	2016-08-12 12:00:45.890957197 -0600
-+++ guile-gtk-2.1/guile-gtk.c	2016-08-12 12:01:59.346968496 -0600
-@@ -28,7 +28,6 @@
- #include <gdk/gdkx.h>
- 
- #include <libguile.h>
--#include <guile/gh.h>
- #include <libguile/dynl.h>
- #include <libguile/tags.h>
- 
-@@ -2196,7 +2195,7 @@
- #if 0
-       /* Gone in Gtk 2 */
-     case GTK_TYPE_CALLBACK:
--      return gh_procedure_p (obj);
-+      return scm_is_true (scm_procedure_p (obj));
- #endif
-     case G_TYPE_OBJECT:
-       return sgtk_is_a_gtkobj (type, obj);
diff --git a/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
deleted file mode 100644
index bd582117f621..000000000000
--- a/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- guile-gtk-2.0.orig/gtk-gl/gdk-gl.defs
-+++ guile-gtk-2.0/gtk-gl/gdk-gl.defs
-@@ -22,14 +22,14 @@
- ;--- Types ... --------------------------------------------------------
- 
- (define-struct GdkGLContext
--  (copy gdk_gl_context_ref)
--  (free gdk_gl_context_unref)
-+  (copy g_object_ref)
-+  (free g_object_unref)
-   (size "0")
-   (canonical-name "Gdk" "GL" "Context"))
- 
- (define-struct GdkGLPixmap
--  (copy gdk_gl_pixmap_ref)
--  (free gdk_gl_pixmap_unref)
-+  (copy g_object_ref)
-+  (free g_object_unref)
-   (size "0")
-   (canonical-name "Gdk" "GL" "Pixmap"))
- 
---- guile-gtk-2.0.orig/gtk-gl/gdk-gl-glue.c
-+++ guile-gtk-2.0/gtk-gl/gdk-gl-glue.c
-@@ -83,8 +83,8 @@
- 
- sgtk_boxed_info sgtk_gdk_gl_context_info = {
-   { "GdkGLContext", GTK_TYPE_BOXED, NULL },
--  (void *(*)(void*))gdk_gl_context_ref,
--  (void (*)(void*))gdk_gl_context_unref,
-+  (void *(*)(void*))g_object_ref,
-+  (void (*)(void*))g_object_unref,
-   (void (*)(SCM)) NULL,
-   0
- };
-@@ -100,8 +100,8 @@
- 
- sgtk_boxed_info sgtk_gdk_gl_pixmap_info = {
-   { "GdkGLPixmap", GTK_TYPE_BOXED, NULL },
--  (void *(*)(void*))gdk_gl_pixmap_ref,
--  (void (*)(void*))gdk_gl_pixmap_unref,
-+  (void *(*)(void*))g_object_ref,
-+  (void (*)(void*))g_object_unref,
-   (void (*)(SCM)) NULL,
-   0
- };
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
deleted file mode 100644
index 0b766606e53e..000000000000
--- a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils virtualx
-
-DESCRIPTION="GTK+ bindings for guile"
-HOMEPAGE="https://www.gnu.org/software/guile-gtk/"
-SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-scheme/guile:12[deprecated(+)]
-	x11-libs/gtk+:2
-	gnome-base/libglade:2.0
-	>=x11-libs/gtkglarea-1.90:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-g-object-ref.diff
-	"${FILESDIR}"/${PV}-prll-install.patch
-	"${FILESDIR}"/${PV}-brokentest.patch
-)
-
-src_prepare() {
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	autotools-utils_src_install
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
deleted file mode 100644
index 66fb90b3a5a2..000000000000
--- a/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-WANT_AUTOMAKE=1.9
-
-inherit autotools-utils virtualx
-
-DESCRIPTION="GTK+ bindings for guile"
-HOMEPAGE="https://www.gnu.org/software/guile-gtk/"
-SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-scheme/guile-2[deprecated(+)]
-	x11-libs/gtk+:2
-	gnome-base/libglade:2.0
-	>=x11-libs/gtkglarea-1.90:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-g-object-ref.diff
-	"${FILESDIR}"/${PV}-prll-install.patch
-	"${FILESDIR}"/${PV}-brokentest.patch
-	"${FILESDIR}"/${PV}_migrate_gh_functions.patch
-)
-
-src_prepare() {
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	autotools-utils_src_install
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/x11-libs/guile-gtk/metadata.xml b/x11-libs/guile-gtk/metadata.xml
deleted file mode 100644
index fe1bacfb1309..000000000000
--- a/x11-libs/guile-gtk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-	<longdescription lang="en">
-The guile-gtk project brings the power of Scheme to your graphical application.
-	</longdescription>
-</pkgmetadata>
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index a735b35089eb..c31a9755a0f6 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,10 +1,6 @@
-DIST libdrm-2.4.96.tar.bz2 829518 BLAKE2B d9a21ce31af65812c1b23968ef6c1901aea106b4cc68d76d3641a17b98423024b804bfda509862174eba98271bd7156c7f08d81bc0a520ea4a25c8e2e0bfd598 SHA512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b
 DIST libdrm-2.4.97.tar.bz2 837329 BLAKE2B b47393d81917a0b43c22f7798ff2e1c21a05fc716a63092dbe0e49cda0fe3bd899d5cc4d703ae49f781e283f5067c62cd37a4931362427e21c3356584cb5e810 SHA512 3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed
-DIST libdrm-2.4.98.tar.bz2 833295 BLAKE2B abcb51046d95dd0620d8ae705a731c4a0b9db817cc897c6bf2063c3c25c13f45019b5c016248fe93269b77252de96724c3215eaf5be990b925a38034bfe4a4e4 SHA512 3d333d060ceb14fa8e204ef468ca2c95d6f07205185ca90a044b685832b9b2d7256faa5e81d5871ce8b70aa1fdf9fb1ade18b4e582ff0c7ef5551da8506eb27b
 DIST libdrm-2.4.99.tar.bz2 853659 BLAKE2B 66fb3f757ab468b6f6285ae740f67d6c38473f3866b57c6a1e24b322bdd46f2d21132b5ea7a737f1d3fa8dcf55162d4c904f181f17227c239b3322c0af50181c SHA512 04702eebe8dca97fac61653623804fdcb0b8b3714bdc6f5e72f0dfdce9c9524cf16f69d37aa9feac79ddc1c11939be44a216484563a612414668ea5eaeadf191
-EBUILD libdrm-2.4.96.ebuild 2143 BLAKE2B 3e2c8d221b892ec17c3f36036be0398061ac3aa50b05259ef89acc2b86309953a5c87382cdda95df152a603ff624216b3108c9754a6bfe88b6c6053ccd24a06f SHA512 30cfc0c66b0a8b6b303e68c891ed02239a9a9767289523d7cbb74b37ed7b592975450d0f130ed47ed67ff82e0ea32250a7d4e3d07706ae1030e32096e8e0a108
 EBUILD libdrm-2.4.97.ebuild 2143 BLAKE2B 3e2c8d221b892ec17c3f36036be0398061ac3aa50b05259ef89acc2b86309953a5c87382cdda95df152a603ff624216b3108c9754a6bfe88b6c6053ccd24a06f SHA512 30cfc0c66b0a8b6b303e68c891ed02239a9a9767289523d7cbb74b37ed7b592975450d0f130ed47ed67ff82e0ea32250a7d4e3d07706ae1030e32096e8e0a108
-EBUILD libdrm-2.4.98.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 EBUILD libdrm-2.4.99.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 EBUILD libdrm-9999.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.96.ebuild b/x11-libs/libdrm/libdrm-2.4.96.ebuild
deleted file mode 100644
index 76499a8ff61b..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.96.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.98.ebuild b/x11-libs/libdrm/libdrm-2.4.98.ebuild
deleted file mode 100644
index 29daf988738c..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.98.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 6aab121f7224..ff4e677bd327 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,4 +1,6 @@
+DIST libvdpau-1.3.tar.bz2 139009 BLAKE2B d535c7723638339d4e67002721e9d0d8aae89a6001fccc41d9c3b21d52f0fae9237705bca448fbf1c244dd7eeb71f5fc74ed81f05c975bed798fce503a571c90 SHA512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330
 DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e
 EBUILD libvdpau-1.2.ebuild 1141 BLAKE2B 58d92ed94816b94efc377b9e8788853b6e0e3c6474998727e03ea5287814007f960f921f0b38b978ea7caae78cc915bb85fb42c07cfecd36cc43df01688f6b62 SHA512 ca5e09592d0de74fe1b430b562e486d0bdee721eb42e0fcf41cbe54b4fcb46f168a36f882097f0903e276257b6bbacecd98194322949910099536f70a5b472a6
+EBUILD libvdpau-1.3.ebuild 1184 BLAKE2B 9f423e68f5c409a5444a659d70bbaa8410770ac5908c2c906cfd79b8c6a913e609c4610b2bbee874691c067e349c96977793797b65d20b4830f320bc3db5fc9b SHA512 1d8c4175393e0b88bbc40965f8f7c456fc7b0d2876c022a192a17630b2704f4a7d8a2ef45ef5ef61f230bdf4088bfc3f97f5e66913a00ecf8adfe585b6eba9ab
 EBUILD libvdpau-99999.ebuild 1122 BLAKE2B b2e74c53c093e22e58257b67b91b59f51e98cc3715f68c67958a57e366df36bb660436e3bb7abdcb0fe11490f60d6a0c5bc8b2658c58d3979125385f6d7f7276 SHA512 8da6e8637191f4b8c198498e4f81fb4e7a0f5fa8108c16edf3ae89d52ee7ab360a2c2e505b3b5341076e7cfe18f1ad1093c251cad96f456ad81f134fdd940851
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/x11-libs/libvdpau/libvdpau-1.3.ebuild b/x11-libs/libvdpau/libvdpau-1.3.ebuild
new file mode 100644
index 000000000000..2dc4d12a5faa
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-1.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic meson virtualx multilib-minimal
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc dri"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+		)
+	dri? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die
+	default
+}
+
+multilib_src_configure() {
+	append-cppflags -D_GNU_SOURCE
+	local emesonargs=(
+		-Ddri2=$(usex dri true false)
+		-Ddocumentation=$(usex doc true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+multilib_src_test() {
+	virtx meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 85dc6d2bb1d7..599ee434f913 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -3,6 +3,6 @@ AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbe
 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.42.4-r1.ebuild 2287 BLAKE2B ca72e458f6d20aa04760e5e683ec5bc4c92a5966ee87b6cea8661f46c35f4d463f1c390dfaad9836bbe6859bf91d49eabfd4fe8220c30647103f5bdf468090e4 SHA512 8497a2a3a992eb6405161691e985c561fac5b387a43ba7567ca2ba4227358f6a18ccc174e36557b5b296197f7138fd3f7bd5a231ee529f493918ef3b66294d88
-EBUILD pango-1.42.4-r2.ebuild 2335 BLAKE2B 91b269ef582a419a2f9b51430392af9176f026aa33a73be70518becd961e2061deb07d5ba06457ab0fd485a04db85ad827ddc12deb06a9e044848d8bd84c8eed SHA512 10a82a2386317fb19b2669114857d61d896acf6a18c04bd1534bd4a10958c068afa8832ec649716f515dfd1a241f8a9ac755ac6b373755bca59dd2ef734f4d44
+EBUILD pango-1.42.4-r2.ebuild 2330 BLAKE2B a8a28d031cccd35f3a8b7accb93351c1627740608df580d099a9df1f743100b9ffa887803392f055062eeace16fbd55b7c3573ccaf630aef8fd788a9e9b5dc17 SHA512 ea5892786884915465815b497928f144239212c172f7b38e12201bab3ca38072bb23e7a0c83c0caf8b65d584d3b5c0f30c637a3e98548f903edd3aff7eff2947
 EBUILD pango-1.42.4.ebuild 2047 BLAKE2B 1248ddc636fd6345ddf29062120a48e81e6047f609e0ee2f18d62ebb543163b7b0c37ad7457882b50c07af0a781c95e5e93a31bd033755f50ccab3c9e337a79f SHA512 4da1edd151fc0bc03c8712520ea21145b9bc84209372ca9d81023d0f59e66a0883820c0a5f188f575d709ffefb91b81c8eef04b0b4a5f13b3392d49a9da624c5
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index f740511e7bca..f9f788295a87 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -12,7 +12,7 @@ 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"
+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"
 
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index ad380047d6f0..7a79592a356a 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 1764 BLAKE2B fb330736a030bcba2c1f852e8fcf87832e4d3a0a43916d6dff1c662ba11c54e8c8c6894d29f28fd2ab73f06bc441b77ff4fe8214f290262e864fd683f4ac8374 SHA512 4980ac5eda703bc87585a31e5902f6c450e921c2bc3dd74d158472b6eb1b4a7852551ce82df90c0e3a3218da9134bd212dc85ca49b6ababa2d8a78f995e765cf
+EBUILD pixman-9999.ebuild 1725 BLAKE2B ba5cc714e618976708ce2edcfae88c380a984455a06bff9a1d8b278bc06ebdc7f30ed5b8a0a3435eb822db18c63795f7ce97f2447d54ee9b5b1010f9491295ab SHA512 7e2408dd9f703a7f042067d64bf76eb35f65ce3959b4190c8cbda34161fda53cddeed7df3fee96dc4c6cbd673cc88dc9a668b6482999b1ff582b22ef648d940d
 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 17ea41af3389..97ba3b6a51a8 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -22,12 +22,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
+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"
 
 multilib_src_configure() {
 	local openmp=disabled
@@ -40,7 +35,7 @@ multilib_src_configure() {
 		$(meson_feature cpu_flags_x86_sse2 sse2)
 		$(meson_feature cpu_flags_x86_ssse3 ssse3)
 		$(meson_feature altivec vmx)
-		$(meson_feature neon neon)
+		$(meson_feature cpu_flags_arm_neon neon)
 		$(meson_feature loongson2f loongson-mmi)
 		-Dgtk=disabled
 		-Dlibpng=disabled
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 8f76c23b0cc7..3408d2c4cbb9 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -13,9 +13,9 @@ DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce
 EBUILD wxGTK-3.0.3-r300.ebuild 5056 BLAKE2B 187c4e043e912beee9a58c9796866493fe83b85e5c814b30029bf5e4d92a3c561d814cd41e635028d97b9e9d8b7dbdb9b19694023caed063976b9ec1b919d5fe SHA512 aa1ba5f27f7593e0a3f57010509169173ab6521f66890400d2f654f636cbc154723cc2fea403c02bdfca516ef7ec5cf83e71be74ef5cdc543b2676d01ec3d65e
 EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc61c2e957368f1d2bb06f910d20b533ab1cf80dcf9fdf124b9c37b56b9233b775e3fc07803173d440e3a28e29 SHA512 4c63f058ba1c7eded7978a9adac5637d3d4b40de6cdb92eb079eb697a3792581a32641f4d8e6062181d1c2e763e2528416691f5b4fe8d88d7bd41092eeda0509
 EBUILD wxGTK-3.0.4-r1.ebuild 3989 BLAKE2B 114505f94787230c4dd9cdf61211178fa0cf738ffccee3d73bda054d6611286084a7025fc1317508d93d263547cd90414a78ca619f328407fd30f1bc49c2826d SHA512 481a9bad6508a6bddae036838394560a82aea6be5591ec6b53e56e97aaba615b70486362bf142497e0980c8a25105a6730bae6dff6cd6175cfac0f636ed72581
-EBUILD wxGTK-3.0.4-r2.ebuild 4030 BLAKE2B ce44d342436d6c558e1b0b0b284a43d987277487d9a8845940a57731113fd93324b56e0e913f8eed148e07843c74fdbbf2881104724d129a53231ebcc71de7f0 SHA512 1b86f7c4d4a6600aded907efc346ebe59e56d73549f97baeeb515a2ef97bfc1f26fdea8932859e93a06f048e6d830e724a9cd73aa48f4e1267e2dd2fb46b7867
+EBUILD wxGTK-3.0.4-r2.ebuild 4029 BLAKE2B 1a694bfe23eff849225ba8609da19af4df65f106ab10a42ad2636d953e11d72e1e9d96b4997180ae413a85e3c994b517df51f8ef78741cb8607bfb503320507a SHA512 40c7efb74afc2f9427c60870f1dcf8d14874fb730856eca9e2af75b69fa872235053c9df85ebee21b64f4fcdcbaa7dac118d2ce54969f4df228054ea25012a88
 EBUILD wxGTK-3.0.4-r300.ebuild 5206 BLAKE2B 2dd0c671bc03e6a1d5e1725c04abfe182ddf9e580a20fc5c191d6ae108cada7df303514022feff00e40c76a051d34348c1f1d8ddcf7a7c1f69d1d8ae924a142d SHA512 a529c3de9c9bcd54770661ae1861a1331402153018969eb592b1e04e743a8faf0ad8c8157151da29cc84f55fb8854bcf12d3205c25953d7ac0950b0d0f6886ff
 EBUILD wxGTK-3.0.4-r301.ebuild 5206 BLAKE2B 3f3b13b90dfc95527d7c2a0aaa31728f5a299143cb43b7faa5077167e9191273e9f150ac1f2e5b8be90b9d11d2d9c5fb8603254c6a22794037e85fb8d0d58a9e SHA512 4283fc65d9284b98ccbffc689164bbdbe70d1b9160003b9c722a855ec58b73ea80f57efba8320b66ea6124a9197e8fa76c5aaf49bc294491c4abb1867507e34e
-EBUILD wxGTK-3.0.4-r302.ebuild 5257 BLAKE2B 45d6bde1955533aa8298bf8ce9690a5458a5860522c9e62ad3683ce1c616cbcf4a572afd6e84e64d106ae58a759365e1d788680df7fbe666894289eb3b2ae048 SHA512 84a4f811e2288e09fd09e466746c54ca654a6b5d428ca4ae24be3d19c6f87c6c1abcea4b2bcc1bcbbe9241caf3f0dd18d1f92ce17a2fce66df8581978f2c3309
+EBUILD wxGTK-3.0.4-r302.ebuild 5256 BLAKE2B bec5507d4187e8747cd09a4355114e85c2d7ed3cef57b7f6c68cba094449b331f82d87ae2d9eb1d8a2e5f8ded854d676bd10f33395ed6393b8ac7a1a3f39b0d1 SHA512 8f82e33fc023ca59eaad59687a1c5cfd08392a1d122709a78e27dd9d4d66d91b69e95218c7c79a416589bade18dbb090abb3d85829921a01f3480168416a2be9
 EBUILD wxGTK-3.0.4.ebuild 3978 BLAKE2B b11f966c518da65ab09703128eec655f13fb5713b2736c934dd82e941ec5031cd8ca1448f2895df5210a91f2a91dd40ca55129cd3016bb2bf4a83a3feb78f902 SHA512 39ad229bab491bec77d88336b7ff036aff0f5628e8648ed933d0573a9dae8ef1107ee2a0d06d73efb54012094834b22cfc7e1121f6d9866d80e7d3460e893aa5
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 5821004698f5..13c4e43a5f02 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
index b4479fe7201d..84bc2610f00c 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3			# 3.0.3.0-gtk3