gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /x11-libs
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
35 files changed, 57 insertions, 1397 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 1e2ccb991871..f9eb259757f6 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/flowcanvas/Manifest b/x11-libs/flowcanvas/Manifest
index 55d16ca76ba1..460a13535a45 100644
--- a/x11-libs/flowcanvas/Manifest
+++ b/x11-libs/flowcanvas/Manifest
@@ -2,5 +2,5 @@ AUX gv234.patch 1572 BLAKE2B b9f36694929b773596fe3316b1f3b4fe2a2bdf9a792303c9f64
 AUX ldconfig2.patch 329 BLAKE2B f4cb55c852b1fbaadde1612b18e54544e4c97b73cf5b736c7b1aaca898fbe5d54e7eda816c8ca09d52c1929ef945a9884e287b8597a112a98bcb95832c5f528d SHA512 156cf9bee8a6d736ce4f51d8fde79dec0f0eb8594ae2f5c7d1aee6d9d29d46200a5f8a228fba99c7066c26c784d391d0a3389d009e29fc1e1fe8a16fceec024c
 DIST flowcanvas-0.7.1.tar.bz2 139471 BLAKE2B e37f557fdd850c35dc70fc7efe71e7d9be5c60a7920fcfdb38fc4a9eb4d1a44639688b50feae4b0f529469cc68e906ea75e0b870a82379212d94e27e4be8abb1 SHA512 e9c7ee9693c6b78e44a0611a8d73c1b7ffa1ae0f3e36c9b0bbc88d5a293c3e5183c17e14b2079d611c988f30cb292caee52ab37f8a13da96b5c8c8261e408410
 EBUILD flowcanvas-0.7.1-r1.ebuild 959 BLAKE2B b8093eedf07b9ed170ab11e6a31f6f6452a1e076a0af3098dfd015a92f7a25e83e973503c4e37989a8c4648bb608b9a0ab77f5ceb35923e804820f747c670d99 SHA512 2bf702ead6ce595595066691af556aedc24d2def93fcf79ec3691afbeb7221859bea0e599e46aa1ee617283f36e2fd30a99a6a41001e1304bf729fe38fc502ee
-EBUILD flowcanvas-0.7.1-r2.ebuild 1000 BLAKE2B c901d755a6ba57e3ee1cda4fe4d3a332fb81fff9a590d68f28237594696168ff40ad729ace403b6037b7558e539b08f4b0511056d6bfe947a46f7c0495017ac0 SHA512 f9c8c3db640d745b5f55702ee4cb1d84f3d1f121934649ef70f2cd0819ba54d4926fb0af60a80f6ba27e2adc27f1967aa3b7a2a362f726c624cc0276ab736c49
+EBUILD flowcanvas-0.7.1-r2.ebuild 1002 BLAKE2B ea7d68e7c2ace500a6bfe89949319e9e13f2965f66773f6eb2302408119d63dd91fd628a4a8d537a8f931b66f5bce350976eb654609d8fd250069bb31fb81b00 SHA512 2f2f8a3c4cf8ba42c159fd7996713e88a7839e6ec53b9b7b859f4a1be1ad80b0953cbe581ad0603b3f3e8ae4ccc0e87115b6ae863212bd35e358a892ee430ae2
 MISC metadata.xml 463 BLAKE2B 0c1c83cb8de453fc351e658058e8e52be625440dda6dc2943c1e2198b203f510066a41992289253ae2b423a55f92d6daf6024253e47d7beb8c0274f63445dd69 SHA512 94b79488b0d2fff96a3a3207cc23c014dc6739e5f020c6459fe09e5c8b20563172fafbbbb8e5f1781f8bb0392bb25fe8c79eb30019ecbd0d5db15ba1485b8b32
diff --git a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
index 8f2514c32e14..452438c3dbc0 100644
--- a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
+++ b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc"
 
 RDEPEND="dev-libs/boost
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index 65d457729bab..b3112f0198cd 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcdca19304f352edb97e645815411a49ff1aeea1347b3ad024b40bacb761727d32c1d2692e2d5a040f893 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
-EBUILD fox-wrapper-2.ebuild 522 BLAKE2B ab3df1c77555741d66fcb0b60c2694adf7ca39f81a6e24b75ab9664ba22bde4afce1cb910b7f460c22b109fed73f917d9207fef9f8cfdbb44c33f5d5c2e25f4e SHA512 21614e34ceb81cb2997265f1dafc2ed4eda14b48ccee8eacaa222f09f811d5bacc67dd04f9f75f57597e3b2dca5aeb5585a5f25bbc78e8f1a5e4fbf3a0657a36
-EBUILD fox-wrapper-3.ebuild 536 BLAKE2B 8c62923bf0e9e50c5d00fe50a957f85d9fb754b559182f03dd36cb5b593e90d1f96f55dbc3d3dde4e3b7844c771ea292bb9a9a26f57796c0320ed499e2ba48d9 SHA512 1fde0c35aec32402e54ccc5fca5abf0f2901baa339ef4f3dbd51d1f4c50248b90650a1b4efe1f82e225140176d919c2dccc1830f174bc08284b956d5a885a564
+EBUILD fox-wrapper-2.ebuild 539 BLAKE2B e27b08259517eaa605471ac462b0a4b24c171d0de00ca0f99014a430c475a466e6c7b1e9b937e3ab65431942dd39b4d57f28ec6d245251aed0099ca8d5c65601 SHA512 45fe4172a02e5ea3b26ff3983ed3f0e711b1cfdb4dea8d1e6a0de5b44c7f70df06c1a44c68ff8b93e1f47b0fd5d2ab651b9a55e35b683aec8fea6ec16dee4158
+EBUILD fox-wrapper-3.ebuild 553 BLAKE2B d97b70af5455851faedc1cb23b139294c155f34d60278e3f4806419c687439642e355edde3c841f7e5ed89b9c8eb6d9ba50bf0cb9e64bd0bcaf5c42c55a3da26 SHA512 cba95fddda314074ae67577c1e0fca909df169c46c17fdb94a218c099cfe941ed4b0064c2f60608fd1c145fbd593a72254c91221287f4465758b1b8de4e1db1c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
index 56983ae52617..fc4249f7449e 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="wrapper for fox-config to manage multiple versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
index 9826efa31296..1a9cd3e0b756 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="wrapper for fox-config to manage multiple versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 13d805d2d271..b6cbd05a1623 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -6,12 +6,10 @@ AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-DIST gtk+-3.24.10.tar.xz 20958300 BLAKE2B 60a70341f15b59b95316cbce55cd18b54a6dff3735fb5f375c1bc21ca2591874b583d4879021d868d78fe1714bc037d80d44fb3384efd1167962b8c6e9588c5a SHA512 1f7980189f522fd3646fb480b965c21801cc30b3316eb8bad8ded1efd25d3054f62160ddbe9ea241628c11b24f746024fbc3d22b17b9bd61fa6c301ab91d6498
 DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008
 DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4d4be2a2c870bee06daf3d9f63918d47243b88c73c4441f9415c859116fd873f276496b7ea9c2243a9540351ca53c5897 SHA512 dc8abad0812c936f7316425ca456d5892f3438ca6f843ed49fd53258695958b2a52a1df878ff25547d176aa054ea48ae9fc1b971698afc4d4aedae9cb643feae
 DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406
-EBUILD gtk+-2.24.32-r1.ebuild 9986 BLAKE2B d669193ad3f4a93aa2fbd42ac53acccf65733e561848c39a98f2f4a6f9001b7ed339b72e5b6ac25bea2888218df1b21314fecaf80c4d6f227c8a705bc123ffcc SHA512 2e7ba97b79d16547462e4433b38a6e7668e34380e2f7d1012deeb42816f0f4e4c29134de8cfb0ae21728e899a21264be3593d24282f9f8cb2784cb5ddfa9ee05
-EBUILD gtk+-3.24.10.ebuild 7294 BLAKE2B b91fa9192749bd4d85a97ea47e4581c8401b2be82a7a620e0d0db456ce2797f9cf4b6e4efe6432f683e290df3661fb2fc73e3cae915fa29ed505ae081c682a77 SHA512 6b99400b400d156af7184ecd0ac2fae5a58468baa7b0bfc2e3aec38de4fbd308610df0ae9772fd8d779e382f1d0a1faeb16e59a5bbf92c5d90b690661a8d9fbd
+EBUILD gtk+-2.24.32-r1.ebuild 9987 BLAKE2B 484ff6b317c25d3a7edd13caf9754c8104822d0e3537037a9485e5c0b67e7d158316ee37f46af97e92c17e99f70802d307320945192300030e494680465b862f SHA512 27188961315d62e394da2e4922e18c2efa725c54d8acfa27c6bd702e23ed01903396c603fbf4b75fada477ae0d8415a5fa6ed2122e4fca24652ebe7d5c8766fe
 EBUILD gtk+-3.24.11.ebuild 7325 BLAKE2B 9c00c7990a575d14f7f4b0205acc384e4382628c41725f5469f0d525e2aa032721a53b4cb0dab81fb7ec1b5fe1d6ca2ab296190f9824986d06eb59a510e7d49a SHA512 9daeaf3bb855045589887e743d37be7f4e14ec16c555abc4d005207622a25396325d5d6967278c425fd9d617d9c1bced9196098b6f7db50a0ee93dfbc56eafb8
 EBUILD gtk+-3.24.13.ebuild 7447 BLAKE2B 31a619b26e2adea68955bd3cedfbe50d8523c21d4d8296363a7cdcec23973bd468b3ebeb87433afdc57c01e8338e95b1dd5364308fcb183d1fe8ad9e3d52bd19 SHA512 2c571c507fd3b37b2023c1f403d4680f20972a8d185c48b9b3c6584e36f43f53a09ab64c4fe28464510776ed761d2a89ec6ae01e7352460f51e1b4e499205f7c
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 67c8ddff4f4a..8b91e66833b1 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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-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/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
deleted file mode 100644
index e21e8dec69a4..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9:=
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.12
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable aqua quartz-backend)
-		$(use_enable broadway broadway-backend)
-		$(use_enable cloudprint)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		# cloudprovider is not packaged in Gentoo yet
-		--disable-cloudproviders
-		--disable-mir-backend
-		--disable-papi
-		# sysprof integration needs >=sysprof-3.33.2
-		--disable-profiler
-		--enable-man
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		# need libdir here to avoid a double slash in a path that libtool doesn't
-		# grok so well during install (// between $EPREFIX and usr ...)
-		# TODO: Is this still the case?
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-	)
-
-	if use wayland; then
-		myconf+=(
-			# Include wayland immodule into gtk itself, to avoid problems like
-			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-			# user overridden GTK_IM_MODULE envvar
-			--with-included-immodules=wayland
-		)
-	fi;
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest
index ebacfbb647f7..35eb23a522ed 100644
--- a/x11-libs/gtkdatabox/Manifest
+++ b/x11-libs/gtkdatabox/Manifest
@@ -1,5 +1,3 @@
-DIST gtkdatabox-0.9.2.0.tar.gz 2836730 BLAKE2B 8ac4c3a4335fd5850d21ad035ed68292da08f19ed83be4e50a30439782e6b3a0b3aea31d56a27e6cfd3af0a60ee71f8fd2b51f0dfe5307412ad6baa2159012b2 SHA512 cb36c4ec7b1b4db747520e00c80c037d02c26f60c04bd9d8e4eac06e4e0ec6a605d39e8f11d518751d3137a0ab38631916e98f15cb55cf024b3e5ed37a716f91
 DIST gtkdatabox-0.9.3.0.tar.gz 2883977 BLAKE2B d9d5de1c4d07bd01940ea6f75f2b2f455b46cf018dbae67bcb643f523353e675e1a97cfc10b696fe16aa0391cb006e5e866bef52cefcdd8ca4de057589164e6e SHA512 5c2464dafcf9cdd4ee11bec6f8e627533c0270fe28d736e1be45ad084c42d430a50c39cf08531138627cc59ab034a191ecd7b97ccfce633467ff99e6e9cd593a
-EBUILD gtkdatabox-0.9.2.0.ebuild 1385 BLAKE2B d3b683369f03e0876ae85c44a390c218bd07195396c73e9acbb4dfe111d87a146c20a62c099cd5950136020458149a3ebb6cfd28b07aebe8a9ea40acd4f5153d SHA512 3aab1a2fcfed72447f4a1c85613f4fc7cc148dce8ccdad57eb028b52c2f46a1bbb9f8e7ebdb2460f847d23b537727499c92ba51eb997467374dc094c1592000e
 EBUILD gtkdatabox-0.9.3.0.ebuild 1320 BLAKE2B 1511e776e669f072064d036449861db9b642b8a5b8487c9a9e242fe692febe7febf240687e15323d76da8665b3c9f1d5f38653bc80bf307cde19a976ea6bca6f SHA512 af327c426845abb8e64b1938a922a058e198c7aee4914f1bb7f1e2d41ec55af30ce4641d9899b4061efe76828ac9e33e6fbf26dfa27560c46916a83cb2de0290
 MISC metadata.xml 581 BLAKE2B ff0d8d541a11821321883ac414d4de93a7e2a8daeee8e2e4540c72018775a8b37b83e52d97df8e7fc279e0c629fc9d46f9514dfba55e30e64eadf00ab100f8af SHA512 34e6d588df560865aec420e4d400c13e931bf97d402fd8ee5e2ee1df8ebe6df8673bacb59c14f8ef258165d0802e160c8f105648fcf42eac15ed888f267b87fa
diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
deleted file mode 100644
index 1f83e52ef5b2..000000000000
--- a/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data"
-HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples +glade static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	glade? (
-		gnome-base/libglade
-	)
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-DEPEND=${RDEPEND}
-
-src_prepare() {
-	# Remove -D.*DISABLE_DEPRECATED cflags
-	find . -iname 'Makefile.am' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
-	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
-	find . -iname 'Makefile.in' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 2 failed"
-	sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am -i Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable glade libglade) \
-		$(use_enable glade) \
-		$(use_enable static-libs static) \
-		$(use_enable test gtktest) \
-		--disable-dependency-tracking \
-		--enable-libtool-lock
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	dodoc AUTHORS ChangeLog README TODO
-	if use examples; then
-		docinto examples
-		dodoc "${S}"/examples/*
-	fi
-}
diff --git a/x11-libs/gtkglarea/Manifest b/x11-libs/gtkglarea/Manifest
index 96beedfd39b9..3c85a6057b67 100644
--- a/x11-libs/gtkglarea/Manifest
+++ b/x11-libs/gtkglarea/Manifest
@@ -1,5 +1,5 @@
 DIST gtkglarea-2.0.1.tar.bz2 298744 BLAKE2B a60ee019af111b6f1da92a6c81cc0d5dac003fa79ae95aaf79f1f5bc38c558e1a084d69b556570d1710966d1d25590467a612d9e0f17a994084960537bd744f1 SHA512 54d3c23637e4347c9cdc25fa0159f720bc6bf76e167b025efd14361f1026af18f41686860444083100f939bec66309b1ffbb84c776c88e513d6ad4a06f66c79e
 DIST gtkglarea-2.1.0.tar.xz 264100 BLAKE2B 453a867581a09bab4ad2c71a5d66f567afe8fa8315467beb39d48e242fd46119c4b77b75a662eb1d4c88398811c0ccb4328b8695f584f692bfd53f43c8bcf4a9 SHA512 c790c1b542d85d86cd57f333c87ab2c930c8065d6f75320d588688b9a0adb8c4270522b6b88734720db1b71170f4f12c95e650e9a599a5d7e4b7baadf1f9f06b
-EBUILD gtkglarea-2.0.1-r1.ebuild 1108 BLAKE2B 5182fc07f3348acfc243f5b6ef51f6149a4a07df03371f8749fa54b132fc59b83cdd16919141664a51f8e7e4453e438139c31af1a18d6e4855273f08754d5cd9 SHA512 15c2a444fdfdc8d5b13136c22b06b21c52337d17cfaec1556a9f0e2535876a0d8ca2142332f64669be445fd722bbca1a554fa8b4e0f6720388d786cdb8d5749c
-EBUILD gtkglarea-2.1.0.ebuild 977 BLAKE2B ae7317b3aad31ed93582312c7065afa796ea6905de6ca318efd8ba1c0c6f28a1328e60c24d93af0fe93d01f1912a1dfdfd4b8e52221d23518b4f6684ed502ff4 SHA512 ba0290da9f469b73c6c771eb28cc89a6e0c706b41f93583334a249b85d037058a703733d7da9028178b9daa73afc1ebcbb7c648351325bb715e804cbbcbf9e24
+EBUILD gtkglarea-2.0.1-r1.ebuild 1106 BLAKE2B 54f88f2b645f78c02fbce3ef78c8e13aa5cf8d00d87e14be09fc94cf3508302d470eaccdc2e52c715c4756ffe732c25ba85f69685c1d7c671b52833ce8fa933c SHA512 f4f0ca4230712f2f645d5e2f18c2a2fecc3a929cbaa88cf29f0e16d0ab509e6a8ea72d8e0a7889963b899101bda519f308c37a3c26648a57ee33262f79cf11c5
+EBUILD gtkglarea-2.1.0.ebuild 975 BLAKE2B 2d9469350c76b26d5ac5f0bb81f97826226ad17a49f2f2e13dfdfa68392bc043d6e8330fa66a8e8c2e49f18a30236bd82ce49f69d0872c11b8550d6d5cc1a387 SHA512 0472605253acdf5e6100c3374b8622575daac29ba90c7d76681a27cc22537ebc79c7e827dbd02442cb7c214bd40a606c5c35f780fd74bf81c25eff5c3205eac9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
index 5766a907b263..c70462d862ea 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND=">=x11-libs/gtk+-2.0.3:2
diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
index f3788d891dac..a91c2801415b 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index effabfe8d6ff..b83d4b9f1065 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,5 +1,5 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1562 BLAKE2B d28572943bdd3942fb9dc8ae59eed5687a1faa9438c5d504f6e6fd47eb810d27d1c610ce5af5d99de10dd25b6627ed09dd638d72e4ce2059462ffdb88a709ce9 SHA512 79691e24e330cdc3c8d500953151f83531bb3976e5b10e642f91082fd1ee4130cf740c349ad97bf3254f4b523348a2e2d875c675098d903086d89e4742498dcf
+EBUILD gtkglext-1.2.0-r4.ebuild 1563 BLAKE2B c5f8f9d77851943027cef58fd83570ccc575adc582bc6d58f38cbe60c034f96b15a268abb39fbf28a1c862d8358ecd1c8ed6aa3a466fcc5e7a69a22ea0df8058 SHA512 0d3fc5ad7d86e39815144f3279fdee53e29238f6a5c311ee35f4082770bd89e36324a4992809fca7aa97c3c8c0da842c70df6a1d30fd6bf00b875195f8b23543
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 3721b28edf38..a61ba76bc495 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libGLw/Manifest b/x11-libs/libGLw/Manifest
index 5761ac4d7b7c..867222d6c083 100644
--- a/x11-libs/libGLw/Manifest
+++ b/x11-libs/libGLw/Manifest
@@ -1,3 +1,4 @@
+AUX libGLw-8.0.0-gcc10-fno-common.patch 558 BLAKE2B 901d7fc3b61eb6b50f09c2318d0dcefb3a3551d85f2c0d239f3d69c8e15a7360a4e1628370d13c0810ce380c1f8da9d5887917a131d0055956b0286018488e35 SHA512 d44de8dd3ed9648122fc5661137d6990772595213cdf5fccba6c191eeca20234fb05b97b86c8249208f3c5a978ab677c18d01b4d39da94333d8cd36ef21340da
 DIST glw-8.0.0.tar.bz2 221136 BLAKE2B fcbd1fa99da4fa5d45b0ec14af1a9798c53ad13adfa6e2fb46b45a214397b7a7d11186f2efa2f64cddd589fba9c24280825bca11163eba8fd4149fbfefd822e9 SHA512 09e1352edb16a9a34b9031996c2a1545d69dc690d7eda10a1aad6a7ad9ef0576d0af8a1b7740dba47f9647b7c957c1d7a078b38747d2d2c28ea39314a0e53587
-EBUILD libGLw-8.0.0.ebuild 699 BLAKE2B f11b2beba45aae0307eaae5a47f14b5ecfff72e24845f247fc3d1f50a1abbc7397bddf53a33cde57b0938966341f49e029444eb85081389700d655c7ee4cc72b SHA512 6c9dcbf09f1845f5693fa762ed23e05ed4fd35b8b504e8ee482c11e150b797b30665b6c73b146536d5fc297883ea8822baedb4c0a85c31d1b3ba48a66bf1226b
+EBUILD libGLw-8.0.0-r1.ebuild 729 BLAKE2B a5fd5b4b47816d1b51de4c4ad390d47fd142c8ccdb0760946ac863c3134322421fdc3ac19516b3fbca3236cc5c8dd79ad39fadacaab9e9aaaa60ed2fdd0d49c1 SHA512 018636a3b405792ea4e3c8a19d2e860a44f40c7e1ee4fd1d4d4907cc7ce6714e96530c26c99a89b37656ab9bb08dfe7b6ad8a973e6d79e8a4dde2d2c1f3b6e87
 MISC metadata.xml 310 BLAKE2B 6cd072bd58e5525e3e31fecd7d823e85498858e9109ff94707a21aa801697d59f21cc1ba8d477511a14bdc1d10238bdb34da1402c1b431ad25b52b2adcdd96f6 SHA512 797bbd05193951c317b30062db58f04f950889b9c5b31d1e3338142c9ea826d10e2f4c6d55fd076bb9c409239667bf3bf9f7ccec3c7c5d4aedf9187619ee1196
diff --git a/x11-libs/libGLw/files/libGLw-8.0.0-gcc10-fno-common.patch b/x11-libs/libGLw/files/libGLw-8.0.0-gcc10-fno-common.patch
new file mode 100644
index 000000000000..ad0253270937
--- /dev/null
+++ b/x11-libs/libGLw/files/libGLw-8.0.0-gcc10-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/GLwDrawA.h
++++ b/GLwDrawA.h
+@@ -136,7 +136,7 @@
+ typedef struct _GLwMDrawingAreaClassRec	*GLwMDrawingAreaWidgetClass;
+ typedef struct _GLwMDrawingAreaRec	*GLwMDrawingAreaWidget;
+ 
+-GLAPI WidgetClass glwMDrawingAreaWidgetClass;
++extern GLAPI WidgetClass glwMDrawingAreaWidgetClass;
+ 
+ 
+ #else 
+@@ -144,7 +144,7 @@
+ typedef struct _GLwDrawingAreaClassRec	*GLwDrawingAreaWidgetClass;
+ typedef struct _GLwDrawingAreaRec	*GLwDrawingAreaWidget;
+ 
+-GLAPI WidgetClass glwDrawingAreaWidgetClass;
++extern GLAPI WidgetClass glwDrawingAreaWidgetClass;
+ 
+ 
+ #endif
diff --git a/x11-libs/libGLw/libGLw-8.0.0.ebuild b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
index 94fc2c6d16f3..6be3bab29d6b 100644
--- a/x11-libs/libGLw/libGLw-8.0.0.ebuild
+++ b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,6 @@ KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+motif"
 
 RDEPEND="
-	!media-libs/mesa[motif]
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/motif:0
@@ -25,6 +24,8 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc10-fno-common.patch )
+
 src_configure() {
 	econf \
 		--disable-static \
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 7453ab42fc30..7f7248f99c33 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,5 +1,5 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
 DIST libwnck-3.30.0.tar.xz 800296 BLAKE2B 5917ac8a69f6f1e0d639f301a77349015226ca6d0fc12e8b23c00a81e18f6e9dbb7716b01e50aceb15bdbd64b5b1a8295be5b931d513e120508cdf14d2d15a23 SHA512 79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128
-EBUILD libwnck-2.31.0.ebuild 1256 BLAKE2B e8b38702ad4ed813d84286b5a898aa129d9c408d70b42bfc0fe0de2c0de59ca69fe781aac1494f04ee1a91bcdb78c91dcbb3603a54701d28ba9d4b717b84b5c2 SHA512 8d45ad927c02761e1267c2a4e657bf427f3f8a7e2883c863c12a05d342c405aeec703015b46a686bbc8bff671df39d714532c1398ed09543b5c709f111a281d6
+EBUILD libwnck-2.31.0.ebuild 1257 BLAKE2B 151f9c6691680a644fffeba9e54dbecb097e98517e043e706d07d0f0d4746b6b7e70f4822c9a6bf444bcfb0242d38b35a37650eff529801d79fd9c4be6a82974 SHA512 832dd84bdee9be173c67aff5859647af069722002205388aed0ced59db509d24c2f13b0b6a5e96dbfcaf2d2bde187014831566aa2e213aaef9e323f319581331
 EBUILD libwnck-3.30.0.ebuild 1131 BLAKE2B f7e70b65940fabbc2c154e598efb9f63da6253de3d5d0f6fc5fc0382fba3eed952c3bc967655b64fa430a30d8f9c898a3f75c6d8d2da8c943f8bd0aada2290c7 SHA512 895bce136f3c2d2410a7fc3d203f56e8c3841f21a1c57cc021115b6dd30b0b0fc37f049a57a89559b5419197a8d7580076824ccb80d6c2b077e529615aaaae87
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index 422baec70749..1310e2df134c 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2+"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification"
 
diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
index 21a77c2a30f6..891691528263 100644
--- a/x11-libs/libyui/Manifest
+++ b/x11-libs/libyui/Manifest
@@ -1,3 +1,3 @@
 DIST libyui-3.3.3.tar.gz 230452 BLAKE2B 4be43bb4959eac5cd7c5974774130cb948367cae55dc83ad67b26d0c57f79cd1b8a7328b695478c450c3373167d0d74e2455e7804b4f25fd51b8386ceb113df1 SHA512 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f
-EBUILD libyui-3.3.3.ebuild 1148 BLAKE2B dc00809cc001e612561cdc62dbfd7e56592f4601efb0cae01162c448aeeb44ca6ebaf8a745202a471c2e9c2b79d8e55219080bc03f132029d37ba553e475be11 SHA512 0e64747ebd1d178c75044d7ba0d7029384aab450e2e748c04547d4aa681e93737fb03607a08666edd7c6f460563b830cf30ca420c4d29ebb55991e629eaaaf02
+EBUILD libyui-3.3.3.ebuild 1146 BLAKE2B 70c7017e2d5c774d1894d510e83a26abf9d5be4ed651a2f5cf1e913ef3326148c1b175aa4baa2e4f41858f69d60f49a95d44e2d0303c86033e1bfcadec9521a1 SHA512 65f3b05baeec154cefbac28098d458562ace709baf321f802e4493ebc5f6d25c7e2d5718b5858ca08b02a048e6bb93e35e1c030a20472f1c71afb792732e2224
 MISC metadata.xml 504 BLAKE2B 2b75281f47b4da4fb853907f1149bd594ba38fefd345614e1d58e9aadbfda5cf5ea0d2d8e0176dd6e898d0f48461ca27b899a9f50c1533f3c52014ca55e6c62d SHA512 a162b0e478e92561015939017156b3d7694613305c954eeca0b16a6d9c74590ed2bef4cd19062a4c0dc2df98d5cd41d2f884aa223af63f7f2dfa3309a26dbed0
diff --git a/x11-libs/libyui/libyui-3.3.3.ebuild b/x11-libs/libyui/libyui-3.3.3.ebuild
index 66ac31371916..b3e24c56ad7e 100644
--- a/x11-libs/libyui/libyui-3.3.3.ebuild
+++ b/x11-libs/libyui/libyui-3.3.3.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DDOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}"
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DENABLE_STATIC=$(usex static-libs)
 		-DENABLE_WERROR=OFF
 		-DRESPECT_FLAGS=ON
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 69b2f76de82d..eb766a64165d 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -5,6 +5,6 @@ AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
 DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb
-EBUILD vte-0.28.2-r208.ebuild 2953 BLAKE2B 2c03f83d8daa49eaf5c603d0c51c415e26636ca0f1087fe833ce577d5b9e333307c8c2b03b56547df401176b8a7dad22ca6d038d1800712f62feef7d0da7dd8f SHA512 f57bc271c20e7994675aeadba91d00e36efd73d55efb4b7c6c558955877385539a0db28614ad6e1fe19906c60e79b20ce885cb41218bb8c2c4600b2ebd510b0e
-EBUILD vte-0.56.4.ebuild 2279 BLAKE2B ffef98a5788101e4f6ca7ed8c9e29fe7cd4b1c45a4a6d21b846f992384383d84de3cab0b59cfbe471003e19c04ded933b1c6571aac23542dd213097bf1022c12 SHA512 63ca8a7b27932bed7474b75f26d2b229c22bb67bbdbc10963b52a5df18d40f0e0d1b57d889995941b8bb16b2fa12617c3fdb8b43a53b5d4e62961e46a136eb15
+EBUILD vte-0.28.2-r208.ebuild 2951 BLAKE2B e019bc44f99b4700922ebc95f47538d47119ab3a10d4615e42e34b75e9ab99a825777e2152b0434cedc796fd0a9e8079a7d07cb7208417bfd210228f6d52cc0a SHA512 5ec053f35a65755b4f4c20e3f336d6b55bac6148719ce6332d1db55c5e30ecdad185b64e3b5319c9042263e18a0ce89affabb9511702a2f7ff6b801469cd28a3
+EBUILD vte-0.56.4.ebuild 2280 BLAKE2B 0953cab05a36606382b98bd9c42c93a2e65208d975835b24897c51a5e563b9f099194b30ae99d3836fd247bf19f1c9a9149d49f56a1a7e07d4100e80369856ed SHA512 4565bd79500b9b1100f89e9950cb1390e24bd156223328e557b6669d88457dc0b5f8b6020f63d195061d4f5ff00938de7616e876b3a61aed91ba57c77e7b4d86
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
index 3c3c8d2a5661..d4ddb9c31aa5 100644
--- a/x11-libs/vte/vte-0.28.2-r208.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/x11-libs/vte/vte-0.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild
index afa7f7693a5a..bfb56231f4d2 100644
--- a/x11-libs/vte/vte-0.56.4.ebuild
+++ b/x11-libs/vte/vte-0.56.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 3b8f617bd578..b37075e09c90 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,21 +1,9 @@
 AUX wxGTK-3.0-gtk3-translation-domain.patch 454 BLAKE2B fd0b6d6a0c1fe7f1dfbd7692d549dfd6f78c85e25f06e2e44630ca9b3c9dda4c12af2df6e4fcc02de73e75524631b858cc21b9f63b8799b0d157a38bd5541fac SHA512 8cdf57558e8d09e3e0613c25ac7701cce0bf78da13060e2b36167b69b8ae4f265607cb5216a33054f6c0c2f21beba8cc7f8297f4de2b2db1ec9f3f5bb8177ff3
-AUX wxGTK-3.0.3-collision.patch 6299 BLAKE2B 1130b96f32e2abe7109ca84f1cd0cae0a6742f2f96ad905996157e227236deaff64813f892b649adb2b17beb8fa2b3e9b651f7c397960eb6346bb4bc1e50b417 SHA512 e38a7985c750a34f7ed0b3772677b6b6942340c48d3e70a7c1f1851d2933a4d7823c225203a79c8b713f3d6a1bb0c0d0690d5df027674cd826cea300f9b2ed0f
 AUX wxGTK-3.0.5-collision.patch 6298 BLAKE2B 711d7b94b6a0de4bdda21caa2bfcfd799c0d57a8d1d4a820e6da397768b075f415b8e438502167446b3be6b948420d1c1a31c401bd5e7bb2b549e3a95dcccad8 SHA512 62bbf952eac4a3485a2cfa3e6908b2272cb6f47632f17e60f413ad34b64e331423189a31c4259c8283120b4b1351f915e226f5c749787a5c69737779cc9edb59
 AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f031214691fe7d5cd8c283faf9511fff260735d9dcd293e6377be0e96a6521e84ceae4560f2fef8fc7e7ed5642cd6 SHA512 649551eeacc9915f249ece1c3ed79959f0f0129e54373bfbe84ea5fbf2b8e0ba7778d6a22ac6f165e5d4e85a3ea4320274296b1b2a8e623acb11300fe44478f8
-DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72
-DIST wxGTK-3.0.4_p20180507.tar.xz 2972 BLAKE2B 431855d43aefac6227925195c107b21f7539ca2709c98f6d6beb7d25dbdf8633c61bb160fb4e5c993e97dbddc37cdf90dc7b09753a312c25b16f79f0207cfe98 SHA512 9caa7ca3b6f15fd70014ccd4008c4fa76f12cb07d3fc58a8f0d2b9a591cf8be3f0eb40497dc757b9d0a04d26f54296aaa8fe693aa601bb1c058365529bb4bc8b
-DIST wxGTK-3.0.4_p20181106.tar.xz 28448 BLAKE2B dbbaaa49cbf03b42089c04d3c6045734f045e5bddc66b72f367f2ba1deed0531280c3bf3db873bf78dd33cee9873e20839ab38b94f90830b48bc1a8122164d02 SHA512 d1bde53b4eac1f8e6785379f99d585c926fd132c709ca134d7c8c3d62a2bcf77059b90f25333aa692932888318dadf464620b0a136341217cae7a2cd2c93ab50
 DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9
-DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb
-DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
-EBUILD wxGTK-3.0.3-r300.ebuild 5046 BLAKE2B 686dd2de3291981d965c9a30c2a3fd6d883217bd0a91729e6c751462e74022295326ef3d1d23dab5a0ee1b4bcccb627e49a2e6d6980ef62b7cbd26a0a3576c65 SHA512 a41f3ff4af20034a8b4fa6faa7fa8b0e81769d641f4cb6ea214d9f100c1ec6ca99cf30b9218d65118af7bca31a740e44445c28b6801c35044ac9495e25a1ca26
-EBUILD wxGTK-3.0.3.ebuild 3973 BLAKE2B 8b0568a51194423dde783f6767239469d78aab276f36f857979dbdd97c2ba3c0248754fb75fff8567431ab8138ff4bfdeeda8979c111ceaead5586ceef229e2d SHA512 2c486358754ce998fd3357235eb4c628cd36ec8c0129626c0c571f9848a36f1136f1f11a5a9acc4cf1429350f307cbaf6dc1635a248413fe7d7cfeab56acee31
-EBUILD wxGTK-3.0.4-r1.ebuild 3979 BLAKE2B 982ab0b79b36078acea50118a213c1953fb8290476a2a54faf32edd955954d6f9fd22fe0abccc0906121c930993103cffd17e11491908f3e7e079409cdc1a5e6 SHA512 0df4930e67b6c3dc3d20161ef8ff8bac0e046d4dfd65f83e5db0e787788b55b4f1e733dc288c1a4534fb93fed6a00b0ccc8b83fa732c245398129027257cc703
-EBUILD wxGTK-3.0.4-r2.ebuild 4020 BLAKE2B c01fb525d61ffb7de9318520b3902c102cbf1e5e69272773ae615ab6daef59907cbadb291880cd403a6204fd73997bc746897c1b9182713461c261a54aa99c2b SHA512 df124838818830fd94e59f762da4bd24c7bec2e1d558a5f0f26eef7be9f658516c544f4b7c1985e150cf452aa011b39fe0ff629494f033907d54dd67f2d145fe
-EBUILD wxGTK-3.0.4-r300.ebuild 5196 BLAKE2B eb76e91933d3e1c4d287c45e01057ec98ffa1b6319b932c4fa1da18f8a657a9e395135601e9b486434be55f7b26ba206e7f30d0947051016ce8051262cf52b6f SHA512 b37d2c799a516bfb4a31fce5c9471c025680795acad84f977935c6b85e216667af02076ca36490293867431e2227d633740d4579871288977d46e47230cf6007
-EBUILD wxGTK-3.0.4-r301.ebuild 5196 BLAKE2B 5acd5b07b33a893139dbe20d697bd0e4e155d5b936a527853ae35930fabe4581981d891a03814d821434dd20b61b25cf36d514bdd02d91e5f9dcae8b04c789f6 SHA512 e4b9e789f0a333d030e4bf4d7a2ad2142b8092b6790f7106e8b8a9898e694382eb120f432af8e5d09f25522fc9b227bed70b6018cbe55dcae00579dad904b49b
+EBUILD wxGTK-3.0.4-r2.ebuild 4021 BLAKE2B b7498e9c19ff1100ff4354defb166a6dae9fddffc375143a5dffbe2a9a4f089179b6ff9d0351e70b07bcbe18b8f137ce900d82a267df38a4c095d9f05ccb415c SHA512 bbe6309f3bd93713e2fa6cb1d2280a7b941330ad5941588406845cc4eb7dc0a29763eb47808943a690b3b99d3463f85fb28ef3363d83efc90fff6cb2b7da052b
 EBUILD wxGTK-3.0.4-r302.ebuild 5246 BLAKE2B 9b49c08d97448521c72631cb842f03d3fe959cedd0e06245cd325913b54b4242e5b791bd2dd9fc81995ed992d7e883b31c59c154f4de22d5bb1fa306f6a884c8 SHA512 4f6a4e59078a6d6a4bdd7f2841d88f1d1a4cb11995b039618cef0cf21f784e9c8be51770e536fcde9849555cb5345e33da7fd7d9824368bf46e6cfd5020711af
-EBUILD wxGTK-3.0.4.ebuild 3969 BLAKE2B 0a6e3dcdf929e1375cea84c2fe96d2dad9dd8aca5164ddef8398949d60bee8014fdf4864e22c6b68fa279d2a1621d16b07529c273a839b128bdd0757a4a09bb4 SHA512 1a972030ad233e1b8297d8d97e083d046de88db1e56bc161e2d6f8679ea3a58b5ffc1413997bc1c1e0a90e9396fd3cd970fbaa8517c79cf2f7c7e9e6736d6b7c
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch
deleted file mode 100644
index 3459e8dc75d8..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with app-eselect/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
-+	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
-+	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(DYLIB_RPATH_INSTALL)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
-@@ -16101,7 +16101,7 @@ install-wxconfig:
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- 
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -16109,7 +16109,7 @@ locale_install:
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -137,7 +137,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
- 
- bool wxTranslations::AddStdCatalog()
- {
--    if ( !AddCatalog(wxS("wxstd")) )
-+    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
-         return false;
- 
-     // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -125,7 +125,6 @@ distclean: clean
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
deleted file mode 100644
index 4fb40d29f627..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz
-	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~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
-WXVERSION=${WXSUBVERSION%.*}			# 3.0.3
-WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		webkit? ( net-libs/webkit-gtk:4 )
-		)
-	aqua? (
-		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.3_p20180104/
-	"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
-)
-
-src_prepare() {
-	default
-
-	# Versionating
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
-		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
-		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
-		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
-		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		utils/wxrc/Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
-		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
-		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
-		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
-		configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-gtk=3
-			--with-libpng=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(multilib_native_use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Unversioned links
-	rm "${D}"/usr/bin/wx{-config,rc}
-
-	# version bakefile presets
-	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
-	for f in wx*; do
-		mv "${f}" "${f/wx/wx30gtk3}"
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
deleted file mode 100644
index 12f859ec705b..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
-
-SLOT="3.0"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.3_p20180104/
-	"${FILESDIR}"/${PN}-3.0.3-collision.patch
-)
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			--disable-webview
-			$(use_enable gstreamer mediactrl)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
deleted file mode 100644
index cadb5dd21588..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20181106.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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
-
-SLOT="3.0"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.4_p20181106/
-	"${FILESDIR}"/${PN}-3.0.5-collision.patch
-)
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			--disable-webview
-			$(use_enable gstreamer mediactrl)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 610edd44935f..124c5e3d8806 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
deleted file mode 100644
index cb5280813658..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.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 ~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
-WXVERSION=${WXSUBVERSION%.*}			# 3.0.3
-WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		webkit? ( net-libs/webkit-gtk:4 )
-		)
-	aqua? (
-		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.4_p20180507/
-	"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
-)
-
-src_prepare() {
-	default
-
-	# Versionating
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
-		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
-		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
-		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
-		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		utils/wxrc/Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
-		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
-		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
-		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
-		configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-gtk=3
-			--with-libpng=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(multilib_native_use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, bug #650118
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-
-	# Unversioned links
-	rm "${D}"/usr/bin/wx{-config,rc}
-
-	# version bakefile presets
-	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
-	for f in wx*; do
-		mv "${f}" "${f/wx/wx30gtk3}"
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
deleted file mode 100644
index 66769f55bf3e..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20181106.tar.xz
-	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~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
-WXVERSION=${WXSUBVERSION%.*}			# 3.0.3
-WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		webkit? ( net-libs/webkit-gtk:4 )
-		)
-	aqua? (
-		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.4_p20181106/
-	"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
-)
-
-src_prepare() {
-	default
-
-	# Versionating
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
-		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
-		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
-		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
-		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		utils/wxrc/Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
-		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
-		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
-		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
-		configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-gtk=3
-			--with-libpng=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(multilib_native_use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, bug #650118
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-
-	# Unversioned links
-	rm "${D}"/usr/bin/wx{-config,rc}
-
-	# version bakefile presets
-	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
-	for f in wx*; do
-		mv "${f}" "${f/wx/wx30gtk3}"
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
deleted file mode 100644
index 2de5b927dc81..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
-
-SLOT="3.0"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.4_p20180507/
-	"${FILESDIR}"/${PN}-3.0.3-collision.patch
-)
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			--disable-webview
-			$(use_enable gstreamer mediactrl)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /x11-libs
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)