gentoo resync : 19.07.2019

34 files changed, 484 insertions, 18 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 44741c5bdb5b..be049f61722e 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index 00b9e1418879..1830f3a639bb 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -2,4 +2,4 @@ AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcd
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
 EBUILD fox-wrapper-2.ebuild 521 BLAKE2B 3180b08d0c55585f0cbaedc43fab068ed68d02a47d51631f2bcbac6b88ffa76924c41c610f113c4ff8e60f505c9059db21de99ad5336e1dd32039b6fb19526f6 SHA512 8cbb277dbd1f60a13e7319aa5f8e9788ef96ca8bb6aec46ff765d8cd3e186b7dbbf0bc55671dc7bb90e5a6bc7f44fbaf101544dd3fbf0255e2c9a79326823839
 EBUILD fox-wrapper-3.ebuild 546 BLAKE2B b9754081417a1ff8d3bf3bd68a5e7679fa9fa84ebb8a5c0fc8ba75adc3a22d78b6fccaf8a48d2e64f083531e36aaac9e51f543c04c013b6040f9b4c7c7693585 SHA512 fd9344cccb19c121e737e3002ed4301e6e77e744eb64b35974e0f36a75c1e83d3b0a3599ce6db51ac80b688eeea00396101ec2d408c8c1efdc795245d4b167a2
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/x11-libs/fox-wrapper/metadata.xml b/x11-libs/fox-wrapper/metadata.xml
index 097975e3adc2..58f638b2ac3e 100644
--- a/x11-libs/fox-wrapper/metadata.xml
+++ b/x11-libs/fox-wrapper/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 </pkgmetadata>
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 10705afb4126..e6aa00c94f46 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -4,4 +4,4 @@ DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c
 EBUILD fox-1.6.49.ebuild 998 BLAKE2B 3b0c9e16007f3445c61b5ded6b926cd3f852b2fb6edca03a16324a439ec0ec2f6b71f06b18e1c0169659d1449ee35c5178193bf30d8fdf8eb517d963264447e9 SHA512 e033bf329528cd8a569cef5c3760e5aa92258f62a34cb28ef3c086322c8315fb9c7b300183ddf265257d3d5054d6cd04e05eaf7802a2596ca72213dbc83d9195
 EBUILD fox-1.6.50.ebuild 1016 BLAKE2B 3aaf84aa03724d7a117db9a39fdd6564a18c73e9f9d2a4a4aeeafebca891af91aeb8b2657d6d2ed75826588fe1b05ec16f7832f79cec4546cd952ccbed761228 SHA512 651329a14b50595ea6787953962d1988c8e2a7bc2e55a13a2c3668a618649c0fea66c228a4a2c3ca47d443eb23f03d639da012cf7b6d75c868e67976771e0589
 EBUILD fox-1.7.54.ebuild 1296 BLAKE2B d5a19de333cfa6346b4e18532838c5c24295f443eddbb77810f8a7a7e55b1c59064913f828e61906e5215d5bc1d62e78b534aaca710977975e332cd6e461a3c1 SHA512 a9760a4ef8ff82d60b58592fc648ccb2de4d3c8e3ed3f1320f62eac8cae2a765a2ca7291486a32204ca6502c0345c25779c35e61c8c71afe46e62f68d4fb8785
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/x11-libs/fox/metadata.xml b/x11-libs/fox/metadata.xml
index 097975e3adc2..58f638b2ac3e 100644
--- a/x11-libs/fox/metadata.xml
+++ b/x11-libs/fox/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 </pkgmetadata>
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index f870c5c06c8a..0b4cb3381616 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,3 +1,5 @@
+DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
 DIST libICE-1.0.9.tar.bz2 384921 BLAKE2B 701122d9ef6bfa9077f63b35131dc4603964dbb0b7f58bd54ca49e25be24265142d39da4e1f7c72fdf4945dfb358f7b061acb848dfb0c1bcac5973c9fc728a26 SHA512 daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7
+EBUILD libICE-1.0.10.ebuild 687 BLAKE2B 4918627ae3f1d155a386be4a9f3997de07c0dabdebaa6a0ed21cdf6f35638c6d526aec89a4592946e94fa663b9ba4bec9b459cc0c902b118789239d9720d1124 SHA512 655ae8e0a943dda1bedf3ddba8d78d91de6b503470808002980d26c821e804cf14dc193dc38d2d3040064407397789f06c1e534eca7afac3a4b40c273af74b42
 EBUILD libICE-1.0.9-r2.ebuild 749 BLAKE2B 38eb1e857197de5a71012b4f683f70e5d65f6266f5043abb8f012314450a66bcddd99a67e8f3aeae4032d5d3536de29ad6c08f9c273313894420eafeba0972d7 SHA512 7d108ed97b6e210227ca741d517589a828ad52a6d46b09e955416ed07629918574885aa11c45db9017b1fcba420ab62e243cf23b9ba2fd547cf92c8a2bd949b1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
new file mode 100644
index 000000000000..fcf1112fea93
--- /dev/null
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Inter-Client Exchange library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="ipv6"
+
+DEPEND="x11-base/xorg-proto
+	x11-libs/xtrans"
+RDEPEND="${DEPEND}
+	elibc_glibc? ( dev-libs/libbsd )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		--disable-docs
+		--disable-specs
+		--without-fop
+	)
+}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 7534959a32b8..18bf36cb4146 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -4,5 +4,5 @@ AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf
 DIST libX11-1.6.7.tar.bz2 2290260 BLAKE2B d149d3eacdb1cd80de378076dd96bbaa2cf0cf24d4431ed1afbc00f6ff43cb5dbbea01345230e8b06cd05900d77d4771a72e3b8c5ddda69cb25c95f02a58d9ce SHA512 edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5
 DIST libX11-1.6.8.tar.bz2 2395911 BLAKE2B 50f8871d7ff2aee14767085a6cf78e9f6e2b01c5143227089590c86db8006836432cb051d6259893850d78d2daea3332a26885a34f07989b869c14b8ddeefa28 SHA512 1de8e0ec466308bc48946d1ce7a7dc6bd3120b1b365cd01afd1bd51dd7369e3d1870dd379b0b7c5b07699095d59761bd23e2e02ab60929de32c39b6885016e76
 EBUILD libX11-1.6.7.ebuild 1287 BLAKE2B 82da20e7f5c237b6b98dbac3075ed9aaa57ff094adfe0fc35ab6f8dafad0a97885869525c45884958d1cd0891b4afaad3aa3c921374533a1bca3319cf0caeac5 SHA512 6f8f758a1f1b01d7b1858a19c17647805f9c67c453def0c1e3d1a108a9b070c3397a442a9616447701a5933685d9efcbb4a04e4d78faa86708f30089c40c8396
-EBUILD libX11-1.6.8.ebuild 668 BLAKE2B 42a388881fa9da2e74188b830a815c3c5859fdb849495b178648d57c7272541a45f536aa333c552f823c189de485c59cb89f38ddfab4fc730b41fd0bc0cc9a72 SHA512 8080b2d3f02f2b9c032ff50d410dd489912c1254067e08b2453f7e55edfbd3fc0a11da065e795e7aa048dad867492830eef177f3ad7868958e16cbc9200d7afb
+EBUILD libX11-1.6.8.ebuild 662 BLAKE2B 77d6e70327ec63320be890670c68d3430c6054efa3d333822df82a5382ed79cbe6ac218c4124743263544e84dd6834b78980bddb145b24700d81fb392d36aa27 SHA512 b08048aa0b31e67127b83b84f4cf9ec4ded5a9f7d96ba93a64aa132fe080b1eb596ce73547024fa3511c4439c202fa35e015bbffb53b8d98bfc5b01b92684e78
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.8.ebuild b/x11-libs/libX11/libX11-1.6.8.ebuild
index f9e4a2ad339e..2826e685814a 100644
--- a/x11-libs/libX11/libX11-1.6.8.ebuild
+++ b/x11-libs/libX11/libX11-1.6.8.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 098f3a38edf2..009231bb9cd0 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,5 +1,5 @@
 DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
 DIST libXi-1.7.9.tar.bz2 486312 BLAKE2B 2dae307168431ed0a629ee1be1fa0f93732105452be822bc9cf54cc0863286306c2bdda67c16bb7ed92d63d669f884a4a67ae67ffcc7c170f91848039d470c0b SHA512 9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5
-EBUILD libXi-1.7.10.ebuild 764 BLAKE2B 5c801763a8262b63684cbe3f2d3a2d2f3d45a5f26e2521b2852b2dd8ba8a5113618b4359df30945a92bd412270fac92bb9791fa60a1490274d7647fe1b6832ac SHA512 fadeb279b6a5ae3538f060e688f79ce4842c72c2afe5fce7f17e43330fe7f398131e5050ff22e0abcf15128311f0e86a3468fe7d1f8e459cb17bb429ba02b31d
+EBUILD libXi-1.7.10.ebuild 758 BLAKE2B 487822f2f637a5a2681411365af3078b2ab7bfb6bdd374f44289923c1ae84411125a13877d2997bec5f8ae088491d94853d3ee3901a39ff5fe1af8a1b7fc162c SHA512 7a2365ff0e5169126cdcba0c9c4f73e9bee85e9e862138e6acea9b701ae68382f8dca3e536e2cddeba0d6338e18feedc0cc63c25656a5a5906d0c820ea55821c
 EBUILD libXi-1.7.9-r1.ebuild 783 BLAKE2B d94b72e1fcd97ecbe865e5e4afeb2d11ad66d84f29c35a3159c73a816b66855e1037947c985ac57fe01b7ac555720492c0012cf5599b904840149a9de699f356 SHA512 2ec5e1467eb55105c367f49a90a182c6ed3a08aa7d8d4375b7815a5cfab6f3d6da39ac05668dfca05ead845ab553589c42862fb0f5a5e5b90921992bbaeec403
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
index 67eed1fa00d0..50be0ca18cc4 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 0ba847e30bad..c4f7f8216d54 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,5 @@
 DIST libXt-1.1.5.tar.bz2 771567 BLAKE2B c3624f1ab81fdace1b2eef8749807e9a2157ec6f60e2f5f8b463aae088057d4eb82f9c6de547e286798b98f68be8f8097ff291b490baf49a4204e62566c1a9c4 SHA512 29828cfc021b60e0a0b5ff0321801db20f12bd635866cd000b35a23736b5477a3d1e5f936a1124ed3e3f4c0e7a27cb8744dbb5ab4fbcd45c817a13877081e05b
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
 EBUILD libXt-1.1.5-r1.ebuild 752 BLAKE2B 3a7dc7462b012c6f8a75d3fa7d23351da7291eaf8ab5613d9e72fbf8e150696f02b6717f891b471ceee17562e09c57545ba0e4d2614f824a3b4959c10d2b03e6 SHA512 1851a262d4f32042bcf76ac7d1994b8b4c78de8c966a408000fcebf068be0261821980338d04b180ad3c65965fb33c267f30d37eb9dde2e434e80b9be346936a
-EBUILD libXt-1.2.0.ebuild 859 BLAKE2B d80a6b347969830d0dd140156cf672a191ccafdc820b2ff1093380ce136b58628fc752cb05ea5b7e57c3819c323eca65f2e96597fcec26a08e2a27c9f2d9e336 SHA512 37ef667764f0c4badc3a72dbccd9b699c6bb03c0a0215cf734c2503a03a60c2311cba60cd0a80031c3295bf67ceef805de02034f8bf2fa25711bc7cad17bf81e
+EBUILD libXt-1.2.0.ebuild 853 BLAKE2B 9eb986f397ede6bb2424a13ed8e4807f06d3aea1fc25b25db1d9642e37645b0d8108056b228454d251b8da249f73c90d3c36c3ca5ed691be27f50d715d8acd83 SHA512 3354972e0fae459bc35341135fe0ca7e92813651f7117c03c3d7a8c105c99a4d1c7fcd6fa296eb91bdf4cd248a91be9129ef834b59ad7d293dc7403b4b5e2d6f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index 9814192c9c78..757133c25d11 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 
 RDEPEND="
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index b4a2ace71b1b..99f5205fee99 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,5 +1,7 @@
 DIST libpciaccess-0.14.tar.bz2 361375 BLAKE2B 05af836e52c7a8e19537a5c246f2dbbfee0a8c078ed0d6c45de6d1cc5f07b70d91b9409846b175da74f31b0e2536e38ffcb65983d79d40a54abc878b679d845d SHA512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b
 DIST libpciaccess-0.15.tar.bz2 366454 BLAKE2B 8a17a7178e735b17e726fd0fd02235e9059228fd369e2569071167ec54ae88f042032628660db6b7558845600cec67237598d648abe11ef99acedd1ad1c8bef5 SHA512 c34abc438c549db22d27d71d63e13f93cb547eaea238ff2d193627b83a5877e2b34f6fcf4cdaf9b4f0c6b78206447fd9a578454783cfb4e9010e8de20de1364e
+DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
 EBUILD libpciaccess-0.14.ebuild 855 BLAKE2B 6f82647d77e4b7c50c337f62fa9f86502874884f15876ddc96b285795ed47c10e61f4a89c3b4b5c96f650771a4a72c3a102b86e75a019339496ad45ff17368b7 SHA512 e70c8a94f594c533f5db7f6d5fcbac620be6d9207f8a6f3516b10e2184dce3aac6347416e02816c781bb4c44823b4c7cdd51d6a68eef31cdf641ae12f8ac0260
 EBUILD libpciaccess-0.15.ebuild 844 BLAKE2B 036d8d8b1cd979d49140f9a01261f62654f9a8d2386bc84ea756c76c5580f16a743e516b439d74030a639d6f370e2512f6eb7bb2c2d066522aa8be1066325aae SHA512 91b64a5598451871e3fecdb293b290d05f20453ff5c8156d0f219156c4847001f8976066fd2cceb5abda6ae3915ba7aff394e9822de46d2b2904706bca401a8e
+EBUILD libpciaccess-0.16.ebuild 844 BLAKE2B 036d8d8b1cd979d49140f9a01261f62654f9a8d2386bc84ea756c76c5580f16a743e516b439d74030a639d6f370e2512f6eb7bb2c2d066522aa8be1066325aae SHA512 91b64a5598451871e3fecdb293b290d05f20453ff5c8156d0f219156c4847001f8976066fd2cceb5abda6ae3915ba7aff394e9822de46d2b2904706bca401a8e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
new file mode 100644
index 000000000000..553bc41bb9ba
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+DEPEND="!<x11-base/xorg-server-1.5
+	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		"$(use_with zlib)"
+		"--with-pciids-path=${EPREFIX}/usr/share/misc"
+	)
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		dodir /usr/bin
+		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
+	fi
+}
diff --git a/x11-libs/librfm/Manifest b/x11-libs/librfm/Manifest
index 3a90b84aa4e2..f6d8cb3d65cb 100644
--- a/x11-libs/librfm/Manifest
+++ b/x11-libs/librfm/Manifest
@@ -1,3 +1,3 @@
 DIST librfm5-5.3.16.3.tar.bz2 3304424 BLAKE2B 6651ef8a3967956e1858d4c94af055bddee1b0f2278fe3c0323232e1824e77d8d5d56533d23af3770a9641a2c8ea64eea35157e2cd02cd73f6bcbddd99ea9da8 SHA512 e3d00b0337c9368bbe939bcb2d7f6b1c3f3b6b5a810074c5d6bc7afccd938c5284075231a0326b5be2b93436bee346871fb47ee30c130e6ce00756148d214000
 EBUILD librfm-5.3.16.3-r1.ebuild 898 BLAKE2B 35cb653d3fb920d7a3e212f52885511017757fe0d92d9504094a4727f6fffe412ff9e05508a0242a4dbb78e84d77a60fbb0c095436d7e74c8fb0e6e164b5d691 SHA512 356dcf6d5b042ac47a3b335c9da4626d807a1da5c9cb12321e5e35225a4976ecd270d87cd2e26366710dd8515c435cf9c26f949bd54c00f0b8326ab058a7ed21
-MISC metadata.xml 213 BLAKE2B e524267baea7a3f81ef48dcd9b5e571d8d5d34cb8e727135ac9012ffa1292aff46f9f29c8d88740a5761c50daffce42970d19045a730ff96e0f89fe83371380f SHA512 afc62e5345c59bfbb6b11d40c122edba3bef3faaa2667881d88f51ceb83115ad19e69f7d99dfd75ca2561d0c5d9c26c4a8807c1a2002bdf6d6ae3e4bc3cec5a2
+MISC metadata.xml 239 BLAKE2B 3db5d07e4322fa5b0559623be6edcd78840caf77d64fcbd2bf4eb74d5fc2850e9e6287afbd59cc7d1a01ce4307462e37cb3158690de39be8f0294fe6e11f7201 SHA512 b0230e897c2fa3dfef69e8aca50d4775aeaa9f3c41986585ddd2f2fc0f8913221b2d6b57508aae6322b7b2916d05d2423f45de9dda9b9ef94d0fd753490ca248
diff --git a/x11-libs/librfm/metadata.xml b/x11-libs/librfm/metadata.xml
index 4cf35b89a654..c6e70021a646 100644
--- a/x11-libs/librfm/metadata.xml
+++ b/x11-libs/librfm/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="sourceforge">xffm</remote-id>
 	</upstream>
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
index 4a462d1839a7..f6697e6570ed 100644
--- a/x11-libs/libva-vdpau-driver/Manifest
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -1,8 +1,9 @@
 AUX libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch 892 BLAKE2B 5a5a12aff1f93769d480525140e7a0d61f4db64e57f1f956d778d1ab8be881b209779030ce14b8fee53dd4cbb6a7c59a0c9297ad0c92548268c840ea0f5910b0 SHA512 f60e84f88eca17e762e3d5a53404d0215bca27051c02ff3e4441ad2c2897c0c04297b8e7b4693c37404bde95d7b5d7a6392b4c17ab1ece5f1bd78e6af376b301
 AUX libva-vdpau-driver-0.7.4-glext-missing-definition.patch 659 BLAKE2B 2729caf9edaaf2826d1f74de4594522323c5bf15ec0b40e7fbeef71d9b193d5cdfa5786bebc81bc6cda721717f9abf61a50c13003434f5838057cd923a8fc5b2 SHA512 bb86ef063eb695c77bbe0fd0c273f1c2a479d1803b8381ffaeac5917de8a7d6e11cef33569d75fbbc1d16e9b64913e8f4a60fbb1b80afc5e381033bf34a192de
+AUX libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch 772 BLAKE2B 69265c1132c246c2b9d3e284c86499afa962cbc9e2be0db36004b4b1f16230391aae03fb5c44a3238b6f389e3c820564601e6e88348024aaefb94ffef8b9227c SHA512 b36b1a7518d84073eca1a73d5d74624e42dfa5fa264ef1d685fb4e459a3fd221613822d571643198efca4ea8fe6a18bf2e9cb9b0ef042dfba028b752202428c2
 AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 446 BLAKE2B 3fd96d388be5d55541a3c15a7eac4248d4dd4601a0d116abc09dd1383b407f926a86e448e470617f65ba3f303a4f8421efee97fd6593419e60e3960a5bb6598a SHA512 49555a2efb0b8a49e2dcf942d97c4b862f67e22947adcad2694bc3ee7f94d2e784dddba474e097e0c2f6575afb7ecf5041d2c95ebc8573ca9e3f5bb641fb6cab
 AUX libva-vdpau-driver-0.7.4-sigfpe-crash.patch 742 BLAKE2B c1e3a3af09c0c121747b0da28cb256ab4f9783254349be6accad512b7c4872065909bb6701ff0bee07c04e8c7ed34b93a7f6e50b964a1207501209d75f70d26b SHA512 f56d7e64bfc36f0c54eb5bef8fec3ce0b3efcbcec3fbb4dcda599fb4d553f2ee494a87b8b8a7a1c642598dcca385872b68b612b31f965eb1c943123e75630ccc
 DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 BLAKE2B b9cd0bbbe1e638ad29363cd0d8c6452de222023017283ce81f138730c7ba3396f3ffca40478746cab4b93a8855e73de405aa783e44e6c1179c5e347bd7eff657 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094
 EBUILD libva-vdpau-driver-0.7.4-r4.ebuild 1131 BLAKE2B 4e07ca091e60a04ebf2d3dbfdf4adf572f37fd8c990814e939ed6ed62f986fada773947a0ed9fe8fa0e35034a2f08ef89965bf08208b3cdfae4496012cfd9b17 SHA512 869c76363f55138f35f01e9ce2c051d4f46d53263a759cac286dbd3a1028457793c5c234eefbb7909f7af9b4eb5e36ad2d6c6f4cb3fef32ba8bffd86dad881b3
-EBUILD libva-vdpau-driver-0.7.4-r5.ebuild 1152 BLAKE2B 383ec32f8ef056a067b749699940303eb1e09241a3bc58b0541386f8fbbdcb89ee50957377f9f7fa694b957587f4712ce1f16b6268c05cc5809528ada554755d SHA512 2a83f67a65ffba9f6a709e3ef54e069553636e18c0b723007c11aa9fc4fbd9a719d42c1b1c7b465745257dfa527458115ceea29fcd7a3e62e6c1585846b4aaf7
+EBUILD libva-vdpau-driver-0.7.4-r5.ebuild 1203 BLAKE2B beb2404fc3f104417100252c216f77921f92bd259b6e3c990b48507100818b407e4a2d8490345221b5cff9fa3cf97d523ec6d6c25e024db9327939a58b92778e SHA512 daaadf8d1073630cd86f26a25a347f7b898517f1c1b34188fc7a0248a33539e3622b6d8b58dc2377e68b5a48324fac886cf61097485a523a65b37fd3a1949b89
 MISC metadata.xml 354 BLAKE2B d83783f14cc4b4e0c43c6fc50fc3324a8b1fc19af5457bfdaa48ce3ade989764d06a4a12702aaaddbf292900903896813beb30fe4506e3e8029d966c446880fd SHA512 99a9dd9651a16776c22ce528709e588a956d4b20d305392054b3c65e59bbd1ef855c2e916f2458cfda9797efa2570ac0ed706ca20d1df2f878435c6f4f6ca2cd
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch
new file mode 100644
index 000000000000..0d92074ced93
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/689530
+
+libva commit 93c52a17b8d2 ("va_backend: remove unneeded
+linux/videodev2.h include") removed an include that provided the
+prototype of v4l2_format among other v4l2_* structs.
+
+Without this or a forward declaration of 'struct v4l2_format', the prototype
+and definition of vdpau_CreateSurfaceFromV4L2Buf() (which has a 'struct
+v4l2_format *' parameter) are seen as conflicting.
+
+Just include the removed header where we need it.
+
+diff --git a/src/vdpau_driver.h b/src/vdpau_driver.h
+index 6286d16..54d37fb 100644
+--- a/src/vdpau_driver.h
++++ b/src/vdpau_driver.h
+@@ -21,6 +21,8 @@
+ #ifndef VDPAU_DRIVER_H
+ #define VDPAU_DRIVER_H
+ 
++#include <linux/videodev2.h>
++
+ #include <va/va_backend.h>
+ #include "vaapi_compat.h"
+ #include "vdpau_gate.h"
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
index fb0c732ebe5e..04300f7f7b70 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug opengl"
 
 RDEPEND=">=x11-libs/libva-1.2.1-r1:=[X,opengl?,${MULTILIB_USEDEP}]
@@ -29,6 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch
 	"${FILESDIR}"/${P}-libvdpau-0.8.patch
 	"${FILESDIR}"/${P}-sigfpe-crash.patch
+	"${FILESDIR}"/${P}-include-linux-videodev2.h.patch
 )
 
 src_prepare() {
diff --git a/x11-libs/libyui-gtk/Manifest b/x11-libs/libyui-gtk/Manifest
index a839b56563e6..0fae3ca5f12a 100644
--- a/x11-libs/libyui-gtk/Manifest
+++ b/x11-libs/libyui-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST libyui-gtk-2.44.9.tar.gz 292864 BLAKE2B 74ff741a1fd2ee6c87acdc1b44d5c6f22ef32d9b148c4122ef75f40cbd2fc959c692b323aa31917371a5143bbf2f6f6f65bd89476d45e26c330f3ba27d97a8c8 SHA512 cb1641f79e189bbafa41dc07ad7ec0c09bb6ab7696b576fa8709d0112b6870b12c97b757cd3d6a0b42bb67d6a21655f7749bd72b714af0a3b77ab8a16169f51d
 EBUILD libyui-gtk-2.44.9.ebuild 1097 BLAKE2B ad4b2abd9d78f0244aeaa2b428dce355f6f8013f7661a9f9baf807f3bd6a92762dd2d0cfc2546b344c9c2d58711c264a882d6ae5d5a19ae969841fe8f91ac979 SHA512 dec08fdc2aac2795d51a426f768f6c3c0f128faabbb42624bb2722d8fa4cf22da2d89298de540e0ce300a67baa6e0151bd064925d3746cc8a8d2c6f32d669f12
-MISC metadata.xml 435 BLAKE2B b5335f300fee9d0eec6b444ca9b093c4d0a1ea59e83c81801c8d8d6891bf22643ae9e3007a122ae78fd46c5e1c45670eb1bc685f2032a765c68bff450c2baca2 SHA512 b78dc0b8f36fac9fdf7f2f0e6e50cf57ad42a47c024212818c7a7a1a6681eb78ebe9dadac031b2cdef30a6b319bed0c64d521774c643526c71e1328206eeafe8
+MISC metadata.xml 461 BLAKE2B 353e7c16ff7435a49bfa08c8d5b3e3d5a78391f1634c0d69b9f1a786a383bb0ce6df16e490beafd5c15b135ed28fd1b2fda35bde3acf85fc55f312f46df552cb SHA512 4f0d41ef41de777e2ea2dd80ddb5c3f5ed601b8e331bb6d18afccb5a0dd9b91dcbdea9d3574144fae06ca5b78113ea9bb1e81136ad1c59d4440c0103773f5438
diff --git a/x11-libs/libyui-gtk/metadata.xml b/x11-libs/libyui-gtk/metadata.xml
index 2290c3827fa3..c6c4bd48f469 100644
--- a/x11-libs/libyui-gtk/metadata.xml
+++ b/x11-libs/libyui-gtk/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 Gtk plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
 </longdescription>
diff --git a/x11-libs/libyui-ncurses/Manifest b/x11-libs/libyui-ncurses/Manifest
index 64ed8909b822..8894a9013e22 100644
--- a/x11-libs/libyui-ncurses/Manifest
+++ b/x11-libs/libyui-ncurses/Manifest
@@ -2,4 +2,4 @@ AUX libyui-ncurses-2.46.4-tinfo.patch 933 BLAKE2B a737be5956d99e025caac2ab1b8bf8
 AUX libyui-ncurses-2.48.3-ncurses.patch 826 BLAKE2B 151d9033a179a761f87824c4c50eb441bd5eaecc5a2210407031e6377aec8a6da79cb6001f67d3255178198cb24f4cb237bb170eb1d1a023c74d17ee7d653c75 SHA512 44c47b12362ecddf1953d50f259b2ef2c63984a2de3036d76b6aa2389155b6c4ba9825db32f8872b368d16b67dd1aff0b9210404b5dfd8116feed25c01035e4c
 DIST libyui-ncurses-2.48.3.tar.gz 189621 BLAKE2B 360b12f40c6e7dace84e5e10edb32d9b75ec33cb0c796ce31697b90b17df3ac13096d7a3d715d4bf4963c487e705ab4031dbe682f99237331dad951d19c32979 SHA512 18f7cec47aba1fd33443d4154b358c7dd769ed79a5544b11d907f6de461c96fcf1f980ee602781bd3cf3242d692d02721fcf975728a0c00955b34844104419d0
 EBUILD libyui-ncurses-2.48.3.ebuild 1196 BLAKE2B 5476cde47baf2c548d03742567bfbcc3bbfb3d805cd23ae7b2facc10038c50ac728f846c77c19a59099cac089f7fc26d159e226e42154feee98d093766b6924d SHA512 598dd567a2363dd71b50566595712e83c30ce08f5283c6e6967bebf5caf5dfc88367590f910f6a1be3235a61377d32bda3575cd6221844c89a89faed69ef6340
-MISC metadata.xml 443 BLAKE2B c55b7afbd50426e6ae21ed6af37d99bab996fafa6dfe384ed2f74acac422e8becbffacf8656e0b16cd2c00f0c5882fcac67515153100d79e3290a254029300c6 SHA512 266ef9ea2d575aa247ac6f663ab2ecd0f7c9046677ea85423cfd48685f2a9e314f4ef7e9be5d12ad6080aec31b96c3422f65d64525c62d4c1d227810839963e3
+MISC metadata.xml 470 BLAKE2B b49967c43cf16e1ac5d91ae3e43ecf7c437efa277efce748f71483347523d239da5a2a6ee975e3f00d9fd4077b02d66956c82201f88c843154f2e07d26a2e627 SHA512 947ca194d405f9aa617dadc8c9660f8221330b7c749e1a7c98db4aefe8bfa10fcafd05d787415f7bd6d8c0cc4b117f64760a07aa926553a6bf3a5187ff1756aa
diff --git a/x11-libs/libyui-ncurses/metadata.xml b/x11-libs/libyui-ncurses/metadata.xml
index d1dc4f808fde..bc627c3f876a 100644
--- a/x11-libs/libyui-ncurses/metadata.xml
+++ b/x11-libs/libyui-ncurses/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 ncurses plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
-</longdescription>
+	</longdescription>
 	<upstream>
 		<remote-id type="github">libyui/libyui-ncurses</remote-id>
 	</upstream>
diff --git a/x11-libs/libyui-qt/Manifest b/x11-libs/libyui-qt/Manifest
index dcf30a758895..cf0a9d6767c3 100644
--- a/x11-libs/libyui-qt/Manifest
+++ b/x11-libs/libyui-qt/Manifest
@@ -1,4 +1,4 @@
 AUX libyui-qt-2.46.21-norpc.patch 653 BLAKE2B e93b1a1da1ef585d7f1caf34325eb8107dc952a84707565dce174a35ae37cb90ffb384c6a5852e490b15d002cf7083fcedc32882f4bea0b7f30e4fa30ca53515 SHA512 123b2b932318bbf71621bd37cea5be25a39ea796359cc0800bdbc2270b0240bca2a105562dfff79ea4b8d4d0af23c7933703d15740340119b31211d0ec42010c
 DIST libyui-qt-2.47.1.tar.gz 171152 BLAKE2B 54a8d1609ed717e97c1ec9b3eb6e86eed85446689223753db4b2dcb4c35f361675c42287378636708813b724c4120b14b6bab19c4c8fa17f91bbb612569d1a00 SHA512 9c5e23ff7bb08dd363a490a43c0347e4dbe1af3546bec85a9169da3267f87cbbe15f17f882058b2f3a813fb54efeb1594ec343b2b8d12e371ee77a105a8f4f99
 EBUILD libyui-qt-2.47.1.ebuild 1302 BLAKE2B c85b5c56918a1b4d210e01ebe1988638062fa480bbe368f0be9c3b996151e7224b587ba739c66be232dd99f24a4aea5335e7856f21dab30f3061e7982b7f522d SHA512 08c24070d3db9172b15ef9a15a982ba01b64ca937efb605029105ae0b749e2ce61e008519e77f8865cf24e5a0426e1d627821b4a03bbc9fc353c5e086ffb3361
-MISC metadata.xml 433 BLAKE2B 540a2285cea17fd979ff0088a11f15fd32c7e9f5262ef05b32a3b858576479689f9ff2bc403c4b0ae83d86ff023a0ff1825ffdc70eaa55468cca6a0aa4aa1e90 SHA512 de632f622c93b7747dbdf22b38b69a1fbe37025fccf8be02ac9d79b512323425a2d322e8596d580e3761a758d03680b3a06c63872cb8889adb641ae5fa57a586
+MISC metadata.xml 460 BLAKE2B 18b0abf51297fea09712fae624a422e9e422fb174c16510c7a8ee2db25d019f472f912f41a6fcf5274d8b9ef4d18f6b8f4fb8231f5a2212d087e66c5b8c89236 SHA512 f7aa9563d9ab7f793ead712855052202c40dacd0814758feaca3297165755a599630e26128a6bb705aee2d6070d3c885111b2588ee024ff60f241c1364712cdf
diff --git a/x11-libs/libyui-qt/metadata.xml b/x11-libs/libyui-qt/metadata.xml
index 616b7c2ca44c..f6b1437056ef 100644
--- a/x11-libs/libyui-qt/metadata.xml
+++ b/x11-libs/libyui-qt/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 Qt plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
-</longdescription>
+	</longdescription>
 	<upstream>
 		<remote-id type="github">libyui/libyui-qt</remote-id>
 	</upstream>
diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
index 5a46f0b24013..21a77c2a30f6 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
-MISC metadata.xml 478 BLAKE2B 656ad2887a4ba18f967ef0d3a531ed5c9bb9375cb636e4444baafd7c32087a9fc698577335c4b18e9dc8bcc43e854e7cb2b9ff0cd2e86b43d4a0317ab2dfbbcf SHA512 51b79091d14a9a3cf37ac46abbb798ae6da059aa9726bb2cba7935523e0a7d06d95f725eff7ae6e6e270f062c5a1c127c50c54ad0fd19acf3f74991e66983c0c
+MISC metadata.xml 504 BLAKE2B 2b75281f47b4da4fb853907f1149bd594ba38fefd345614e1d58e9aadbfda5cf5ea0d2d8e0176dd6e898d0f48461ca27b899a9f50c1533f3c52014ca55e6c62d SHA512 a162b0e478e92561015939017156b3d7694613305c954eeca0b16a6d9c74590ed2bef4cd19062a4c0dc2df98d5cd41d2f884aa223af63f7f2dfa3309a26dbed0
diff --git a/x11-libs/libyui/metadata.xml b/x11-libs/libyui/metadata.xml
index ed5e7e2f3f0b..03d507f538b8 100644
--- a/x11-libs/libyui/metadata.xml
+++ b/x11-libs/libyui/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). This can be used independently of YaST2 for generic (C++) applications.
 </longdescription>
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 666eb2d52ed9..0240941bbc8b 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,9 +1,11 @@
 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
@@ -11,7 +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 4039 BLAKE2B 957732c12ffcc6ef2224917fb1caa77e537eefdad65f47ad3cb8fc7da97b679e30369d825fe95cb209cb9fa6967aecda7282ef58b1c0aa6a6ac52f315e5f460b SHA512 9a552056190cd4c6357dbdb10b4436cfd64e2c21519db55a3052e5c4b0889460659c08f7660cc1cf01c58bc0e43515085ba610c5b944a5c1310558e843297dd1
 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 5256 BLAKE2B 34b2cf853e403376d6227c2d15e6a3c24e3142718d04f8cab6c17595535f56720701c855d6d63348ae03ca6cec51a96d835ee9bc366508310edde43e63e26c3b SHA512 5c263b0f8582759b79d75373ca0a716ffa1dea09b5629f824f78c3602e4cbdee890c59c3604e79d9871d667aa1599373e8a8e78693a94e2d8c74f298f56759a9
 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/files/wxGTK-ignore-c++-abi.patch b/x11-libs/wxGTK/files/wxGTK-ignore-c++-abi.patch
new file mode 100644
index 000000000000..30026eb98cba
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-ignore-c++-abi.patch
@@ -0,0 +1,39 @@
+Description: Suppress error about mismatching C++ ABI version
+ In practice, the differences between recent ABI versions don't seem to be
+ incompatible since they apparently only affect obscure corner cases.  So
+ suppress this error so we don't have to rebuild the entire wx world in one
+ go.
+Author: Olly Betts <olly@survex.com>
+Forwarded: no
+Last-Update: 2017-07-26
+From: https://salsa.debian.org/freewx-team/wx/blob/wx3.0-debian/debian/patches/warn-for-compiler-abi-mismatch.patch
+
+--- a/src/common/appbase.cpp
++++ b/src/common/appbase.cpp
+@@ -762,6 +762,26 @@
+         msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                    lib.c_str(), progName.c_str(), prog.c_str());
+ 
++	int l_off = lib.Find("compiler with C++ ABI ");
++	int p_off = prog.Find("compiler with C++ ABI ");
++	if (l_off != wxNOT_FOUND && p_off != wxNOT_FOUND) {
++	    int space;
++	    space = lib.find(',', l_off + 22);
++	    lib.erase(l_off, space - l_off);
++	    space = prog.find(',', p_off + 22);
++	    prog.erase(p_off, space - p_off);
++	    if (lib == prog) {
++		// The only difference is the ABI version, which apparently only
++		// affect obscure cases.  We used to warn here, so at least
++		// there was an indication of what's up if there is a problem
++		// due to ABI incompatibilities, but wxLogWarning() can result
++		// in a pop up dialog with some applications, which is just too
++		// intrusive, so just quietly ignore instead.
++		//wxLogWarning(msg.c_str());
++		return false;
++	    }
++	}
++
+         wxLogFatalError(msg.c_str());
+ 
+         // normally wxLogFatalError doesn't return
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
new file mode 100644
index 000000000000..006d41c84fd8
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -0,0 +1,141 @@
+# 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_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"
+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_p20190713/
+	"${FILESDIR}"/${PN}-3.0.5-collision.patch
+	"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
+)
+
+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-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
new file mode 100644
index 000000000000..79ab9a6bf105
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
@@ -0,0 +1,185 @@
+# 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_p20190713.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 ~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
+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_p20190713/
+	"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
+	"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
+)
+
+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/xosd/Manifest b/x11-libs/xosd/Manifest
index c009b93c814e..fa57b7e76f22 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -8,4 +8,4 @@ DIST xosd_2.2.14.orig.tar.gz 418331 BLAKE2B 2f7b8fbc31a2341ede7bc85c35ede4209c1d
 EBUILD xosd-2.2.14-r1.ebuild 1099 BLAKE2B a9efbbb9e7b743c9d04f1ebc6c803c427a312ea3e792c1fa5903136a3cf32fee16c1e53358dbd6e9d890c59d7b8665557c247ab8014a30b6bd6b18a372e512ae SHA512 b0b66039f6275381f403a9be4f5354cd4bfbee8b8ac006aff95fe20b0876dbdb866ea01be8ea3b5eceb374cdb21f5ed988edd8d021a44988b0679ee060ba954a
 EBUILD xosd-2.2.14-r2.ebuild 1190 BLAKE2B 054a0dae420343fd1cd566e99a27303db6c2864ce7b3f9f80b951a0cc2d378d1b60991b45a037b0d14c376c35c6408ce9ea82abded92dd082166e401062db3c6 SHA512 07682fb573d500f91c8ec140edd30b7caa438a38f07e05f6fde9b040d4ce26d58023c3f3e3783364faf1bd52ed73cd0ab3ff9b07ead6ccbc62e4d340de1a0f89
 EBUILD xosd-2.2.14_p2_p1.ebuild 1299 BLAKE2B 17b626b5b5fe3a3575c1c5e920a3540ee3dad816090f4144fb2d020734043d19b1756af3b13aad2be880de7ce06eb672bbad6f2133dd862b4df818fb0b3be995 SHA512 b4c294dec4978c8bb2ba6b16d1505f678877b814c1fc0d9231cd085f829177017441b0a0e5fe80215729d069e4702a5d4931b4df97fb26bdb8f110bff15f5b55
-MISC metadata.xml 216 BLAKE2B 21fa7ec50873cc5605163ee8d7bd348d3626bcb0bf69e879aae3dc4f65dfd7fe3b81c862c9d17fb2d97284a119e4282d850879c54b03096059958a308146a4c0 SHA512 8b8a55269a3c1429d2f13a0056d9e500cf3b176584b9dc259eaccc2e68a3eb86234e522fdd960e9ee35d6039ce1e747c6bb986ef00af259279537a29a15adfc7
+MISC metadata.xml 242 BLAKE2B 7363ed5aa4ab2d52ba96610654eeb5e2f2f8f0c2e5ca4f695f6ffa88af926130fcc9ea41257f281b542a45703848ecdf78ff99c89f1fbe51116d8e6234095782 SHA512 cf2d021687f90caa78f0f9738a07a81fb632ff35dd323dbe63b080f3985d9bcc665e5cf8549840e2369d1c4427f9831a0d61d20c4b65bab93794464a98f82519
diff --git a/x11-libs/xosd/metadata.xml b/x11-libs/xosd/metadata.xml
index 4f449373c059..191f4f0bda1b 100644
--- a/x11-libs/xosd/metadata.xml
+++ b/x11-libs/xosd/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="sourceforge">libxosd</remote-id>
 	</upstream>