summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/Manifest.gzbin20475 -> 20500 bytes
-rw-r--r--x11-libs/dnd/Manifest2
-rw-r--r--x11-libs/dnd/dnd-1.1-r3.ebuild4
-rw-r--r--x11-libs/fox/Manifest4
-rw-r--r--x11-libs/fox/fox-1.6.57-r1.ebuild4
-rw-r--r--x11-libs/fox/fox-1.7.67.ebuild2
-rw-r--r--x11-libs/gdk-pixbuf/Manifest1
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild116
-rw-r--r--x11-libs/goffice/Manifest2
-rw-r--r--x11-libs/goffice/goffice-0.10.50.ebuild2
-rw-r--r--x11-libs/gtk+/Manifest2
-rw-r--r--x11-libs/gtk+/gtk+-3.24.30.ebuild249
-rw-r--r--x11-libs/gtk-mac-integration/Manifest2
-rw-r--r--x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild (renamed from x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild)12
-rw-r--r--x11-libs/gtkmathview/Manifest2
-rw-r--r--x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild4
-rw-r--r--x11-libs/libX11/Manifest2
-rw-r--r--x11-libs/libX11/libX11-1.7.3.ebuild40
-rw-r--r--x11-libs/libpciaccess/Manifest2
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild2
-rw-r--r--x11-libs/libva-intel-media-driver/Manifest10
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild (renamed from x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild)3
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild (renamed from x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild)3
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild (renamed from x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild)3
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild (renamed from x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2.ebuild)3
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild2
-rw-r--r--x11-libs/libva/Manifest3
-rw-r--r--x11-libs/libva/libva-2.13.0-r2.ebuild87
-rw-r--r--x11-libs/libva/libva-9999.ebuild2
-rw-r--r--x11-libs/pango/Manifest2
-rw-r--r--x11-libs/pango/pango-1.50.2.ebuild84
-rw-r--r--x11-libs/qwt/Manifest5
-rw-r--r--x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch28
-rw-r--r--x11-libs/qwt/qwt-5.2.3_p20210828.ebuild66
-rw-r--r--x11-libs/qwt/qwt-6.2.0-r1.ebuild127
-rw-r--r--x11-libs/qwtplot3d/Manifest3
-rw-r--r--x11-libs/qwtplot3d/files/qwtplot3d-0.2_p20210828-install-headers.patch23
-rw-r--r--x11-libs/qwtplot3d/qwtplot3d-0.2_p20210828.ebuild43
-rw-r--r--x11-libs/vte/Manifest3
-rw-r--r--x11-libs/vte/vte-0.66.2.ebuild90
40 files changed, 1010 insertions, 34 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7684c121b413..a677250c951c 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
Binary files differ
diff --git a/x11-libs/dnd/Manifest b/x11-libs/dnd/Manifest
index 23da92f2491d..18c0e5210f26 100644
--- a/x11-libs/dnd/Manifest
+++ b/x11-libs/dnd/Manifest
@@ -1,5 +1,5 @@
AUX Makefile-fix.patch 1139 BLAKE2B b8e6a2e3d7c91eaccde9cb47228a7a810d313e5f0e38fe999451a50078ef86ae66e22dc6df8a2430c1d1e6d4c6b84897f2894158bfddb53325c12ebaba6add50 SHA512 57785cec0adfef150f9560be79cad9f6170c0476060b7653705fc8a2e17e81c93996a4ca1cfa11cece609950e8d4afcae113f2169a6b5d622494c3ae36cd6c26
AUX dnd-1.1-gentoo.diff 1532 BLAKE2B 5bc035212d46f712b0f8ad016a0fc649f0b36f19674e8c90eec0b2a54a7a6a8e735bfdcf4d4afc0d5792236623a9c43b34775053704e8ad4916488fe55458edb SHA512 68e3fe2a8c36a1b9b8bfdf57ef4eef1e5abb11debd160633cc0d323cf90b1ba579ee87aad82fa8e29b086cbbcfe19326f2202f6191749059cfe638fa7940ec5f
DIST dnd.1.1.tgz 227598 BLAKE2B 3d6bc4644d492cdfcb9160b87b1c8d2a0f0fa3ae30bfbc948e4327b390f80247c4e4fac562c14972ede2f807e11503d78edc845bac53ad5c5a42ce0439e60c6b SHA512 8644d669ea6553b4e99469f30144286e262fd64379a00b8595d1574d0f4f0e504799ed18979a9036cfc89d74074d325ffca94b4147e350969f3a1c5ff9cf0ff8
-EBUILD dnd-1.1-r3.ebuild 724 BLAKE2B 8473c82952697d357e579b10c0ad4ec9983931fe6330c3c32aec0728b5247042a6dbd3743b2d975c691ac9c1dc8e9aac6ef73aaa66a6d6e66bdef7ee6780940a SHA512 72cc6024ffe826867ba629059825eaaa17c824f13277945afe0f3b405c674c7c08bf446b781d11f8dbe06158cc2b996547cdf0c8d78106acbe57d899be62589c
+EBUILD dnd-1.1-r3.ebuild 731 BLAKE2B df98219d0c177e3bd30c5cfe613867444ae665d77d39142024ca83a4c55d2c055f708d8f05432a936f7a51360fa48be67ef944eaa8f8a993dfd4b13222fdf54e SHA512 34d54077b673ad452cfcf25a0e3d74f1aaa7f7a7f15cea0769968e35dc54b911367e0338f338071224d99e82aa68b067a41b344a62f2507e83a3e97d411d192f
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-libs/dnd/dnd-1.1-r3.ebuild b/x11-libs/dnd/dnd-1.1-r3.ebuild
index cda4ff45d520..09bc04cde8f6 100644
--- a/x11-libs/dnd/dnd-1.1-r3.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
RDEPEND="x11-libs/libICE
x11-libs/libSM
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 36a9016209dd..618090a974b0 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,6 +1,6 @@
AUX fox-1.7.67-no-truetype.patch 1660 BLAKE2B 73e67b75b851ea5dd0fa5ccb0c2b79e1b6f829170ee9bd969612e356ad2ee78854a58e886f837edb004e840a9750a3d7c86bde53f7722cf4de117ebc375faec6 SHA512 1908bf7c1aec24e3086c431518e5c8392cb4467e953091226da088e0768993caf358180aa330a140de334cb9378fa2425732045ca64abccdea3c09f602c57760
DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
-EBUILD fox-1.6.57-r1.ebuild 2517 BLAKE2B 262d0c514bbd6620b3fff9b9895014016fe38ff19a693d544971ad12e0b36dc6c49b1a3956d4fedfb5c91b16fea3f4f30d096844abd15bee7c92037d9cc2b450 SHA512 af4d7cc85a107f6b9d1f657edb2066f6b834fcf61bbc17358174306b458b720360bf268c4fe33ecf925ae63928f25d87a1778e348d227a3c3a4b792f5f60860a
-EBUILD fox-1.7.67.ebuild 2734 BLAKE2B c2c4df40118d76ef25282b74bd4eb927bc0cb4463e320d759d027f424dc3a6f53d12a6400691dfe57f3cd19cd8edebf8e71a4eeafce7000e99fe66afdc374788 SHA512 6f2ec0f7065819ce214699bfc91c6a5e33550d3de82b5e10c6c0e1614c8701d33a24f700337591e07fe34cb0a3b464307fdc841a1551739634a7f3ffcb31b428
+EBUILD fox-1.6.57-r1.ebuild 2524 BLAKE2B 296cffa981ac9b6f9690a93d10067ad8aa67378e58b1d428231e764ffe8b1084d62e57e88a5d68c1b17c964419c2b62e2100b3b6652d2b8c8da6e358cbcd209a SHA512 11f2e59d4469066c5f77a3a4bcafdc2ae8532d5c655154e72f6e7f043440109146977ba852e1c7705f10db006d4666dafefda96727a3a9fa7564f8d84bba7935
+EBUILD fox-1.7.67.ebuild 2741 BLAKE2B a707c2f9d222fa494ffafff903311f9c51a737f8a1958622be83a9c9fcfe9960fc1970fe6f10fd20d1bbbc0d1c9b332a08ee5c5fbd55619f2713f5365646b1a8 SHA512 77eb8e6aea3142dba93f1811394e9dc6265bf09d044ed4257700a6450a8718a5dfd4447926bfacb9fad8923e79b2875acde00fec9ef123efd2987c7b09bacfcf
MISC metadata.xml 353 BLAKE2B e9db8b14c07f63f450153af626408d7007471113ba54acad5aa97aac5258d02fe6702db354cce45ceca20444756f5ceb0c46dbacb6fae28fb06320f24221cbbb SHA512 26adab0c5f6876716fa0c87398e9d4009d162d4d202d0455d987837617316aecf8096b10c2a99a5529f7b9d5a324f9aa386d11d0f22c574114acebd15e30fdaa
diff --git a/x11-libs/fox/fox-1.6.57-r1.ebuild b/x11-libs/fox/fox-1.6.57-r1.ebuild
index 3b8d8ad7645b..1503a338a205 100644
--- a/x11-libs/fox/fox-1.6.57-r1.ebuild
+++ b/x11-libs/fox/fox-1.6.57-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile"
RDEPEND="
diff --git a/x11-libs/fox/fox-1.7.67.ebuild b/x11-libs/fox/fox-1.7.67.ebuild
index 6b13f28ddb1e..b4d0d11538a1 100644
--- a/x11-libs/fox/fox-1.7.67.ebuild
+++ b/x11-libs/fox/fox-1.7.67.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1.7"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
RDEPEND="
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 683b4bb1068a..63cb85884607 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,4 +1,5 @@
AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
DIST gdk-pixbuf-2.42.6.tar.xz 7708484 BLAKE2B 003b1de915ce8f17a987059bd9b2679127a08032dc70567ea169aa0dcdcc194216f66d03f35f5580e70e1c05fa15f08b18c86a72e9bcefc2bd6ed59abdb24b82 SHA512 02e6d89de6cb6c9768d5173dada88c038e2454b4345ebc6f7b012d484303c08e53b58f085e872290555e1ccb74a478fa6cef4623a75f2e1f05c27bfc4e986f4d
+EBUILD gdk-pixbuf-2.42.6-r1.ebuild 3315 BLAKE2B 2c3d48b176d662b03533ebbfb2633c3421ecfb5cc608a538c01f459eef4374669e3d3232365502d0531ce8c28bc2b532a4affd4cd0be26de4a5a89816c71e4e0 SHA512 a5bd714d7e3cb245a39651ef55cd82eabd000d6c4025700ce72c9a998ca9bf729892f3fceb99315d56b6f4286df49fce25849365ec50f4ea0c8c29b4052ff1b1
EBUILD gdk-pixbuf-2.42.6.ebuild 3473 BLAKE2B 0ace13e34c43c00de8f9b6d9d35fc146c3e6805127e4efed6ed781bde1d2a0bb0c768836fbf8abd491eefa14acccd090073a263da6ea8f128ae2a154654d8c46 SHA512 86c6a789b8664faf6bb921cd8367d27b163280af47e77fc5e17befa6d7cb9a1be5c32434132c5039e9c57fe1f0f0ffe6fc30c2fe8692a759f66d7512e2df8e55
MISC metadata.xml 332 BLAKE2B d11021f9889f64b977816523c2ed8f4b122b3f510e9649ef1548584f99b97e28f782d6fa753e92042bfefc8da4d1c9694949559660d99bdcdaa648af0bb01c4d SHA512 9bfa76b3e49cc2038dfa8af478bd12ec1832c4cf073987a88d6c1b0da791496d45f20b7a411e08c89bcffa1ce207fa07c08da244f93a2534175e0b80079965af
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild
new file mode 100644
index 000000000000..d8033cb745e8
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson-multilib multilib xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+introspection jpeg tiff"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+ >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+ x11-misc/shared-mime-info
+ >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+ !<x11-libs/gtk+-2.90.4:3
+"
+BDEPEND="
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.3
+ dev-libs/glib:2
+ dev-libs/libxslt
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+ # Do not run lowmem test on uclibc
+ # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+ "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+ # This will avoid polluting the pkg-config file with versioned libpng,
+ # which is causing problems with libpng14 -> libpng15 upgrade
+ # See upstream bug #667068
+ # First check that the pattern is present, to catch upstream changes on bumps,
+ # because sed doesn't return failure code if it doesn't do any replacements
+ grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
+ sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dpng=true
+ $(meson_use tiff)
+ $(meson_use jpeg)
+ -Dbuiltin_loaders=png,jpeg
+ -Drelocatable=false
+ #native_windows_loaders
+ -Dinstalled_tests=false
+ -Dgio_sniffing=true
+ -Dgtk_doc=false
+ $(meson_native_use_feature introspection)
+ $(meson_native_true man)
+ )
+
+ meson_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ insinto /usr/share/gtk-doc/html
+ doins -r "${S}"/docs/gdk-pixbuf
+ doins -r "${S}"/docs/gdk-pixdata
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make sure loaders.cache belongs to gdk-pixbuf alone
+ local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+ if [[ -e ${EROOT}/${cache} ]]; then
+ cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+
+ multilib_foreach_abi multilib_pkg_preinst
+ gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+
+ xdg_pkg_postinst
+ multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
+ rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+ fi
+}
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 13188fb26674..bfe5824ee55b 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,5 @@
DIST goffice-0.10.49.tar.xz 2430256 BLAKE2B 64ef27ab729f02b42742b2ae8da43c59b560d016caa707c6dccb3dc6f23eaab13b40367f145b83b1c728c9884dff164118f4a4d6f9ac5accb07596173b127271 SHA512 a185f9fc814ecd2a6e69d026ac150c38e30e1a440f7640bcfc3bfd1939b924621eabf2faafa2837e2d1835418f5481a0d0d7980f4a669e7ca1b93907b17a303a
DIST goffice-0.10.50.tar.xz 2430608 BLAKE2B 0b06da8d58c4407465266f8c5421331d5d05731038bca191afdd1823950dde07439d458c0ddb93e0641ff81e727f055313be3c8af29bdf32214ed8b2c2cafc0b SHA512 1117540d9162d45059150281b03941ff9b6df1929dcbd7e5aa6e28010d3bb5a46902c30b6f1d35fd5b60f9afe73b58f132aa686aa1712332ea18635d5a79bd0c
EBUILD goffice-0.10.49.ebuild 1419 BLAKE2B b94d44596297b2ac24076e4021f0a557828fc0a185a9a933d774134ac99411189ccafbe3549b35503d240f82635d1eea9c7ce5b7a6623b5e33ac7895cd1be87b SHA512 ffd5cb7122e6a6b9997bbd3bb7d837061d2e87b0df26c9a823b34a50b35a5e0766302a0f2e56a319e53393f53eeeb57fabd00f3e0333de657afae77564b77c82
-EBUILD goffice-0.10.50.ebuild 1419 BLAKE2B b94d44596297b2ac24076e4021f0a557828fc0a185a9a933d774134ac99411189ccafbe3549b35503d240f82635d1eea9c7ce5b7a6623b5e33ac7895cd1be87b SHA512 ffd5cb7122e6a6b9997bbd3bb7d837061d2e87b0df26c9a823b34a50b35a5e0766302a0f2e56a319e53393f53eeeb57fabd00f3e0333de657afae77564b77c82
+EBUILD goffice-0.10.50.ebuild 1426 BLAKE2B 04420f6fe5beda22005e0abc5a773e2d2692b3df8d591c82d1c4d2a5ee0b66395ede2e6515bdd2cf2040354f6e631a90ee52aeec96aacdb4a33df3f7456f5088 SHA512 90f756fe773b544b1f360736fb3eaab06164c5cac40f9ad3129f8c1053fd3924cbf01fa64cb453805a09d9b663852aa7b4cabe5bf029e9be9e77581116aa1c1e
MISC metadata.xml 442 BLAKE2B 56957456fbf59b1d8d26adc3d78086614f4bb97627b9ef1ba981662423dd35578bdcdf123f5138441abfddaf13d0abb241af47d66deafe6baaff5892d6f85341 SHA512 fdbd05bd6a1fa802f008435d72dcd2b6a29cddb4356a956fb1e17d5590e6c31e26ebe08e8b51395fdaa9abd6571db4b5a4680432554d2aca31e5b4f9a8e82a08
diff --git a/x11-libs/goffice/goffice-0.10.50.ebuild b/x11-libs/goffice/goffice-0.10.50.ebuild
index 36fdcb61d852..f50270aea1db 100644
--- a/x11-libs/goffice/goffice-0.10.50.ebuild
+++ b/x11-libs/goffice/goffice-0.10.50.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
LICENSE="GPL-2"
SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="+introspection"
# FIXME: add lasem to tree
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4bc4ae58e205..086f5c4693fa 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -7,6 +7,8 @@ AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7
AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
DIST gtk+-3.24.29.tar.xz 21396876 BLAKE2B 1675e54b185d813965a6279fa80a62784fc6216408710fad0b07a3300eb08301c80779e6e3a6b1109ce29bacca4e7ff4710b670a68ec0c6ffa68e44cfb07ccc5 SHA512 00f71024686c2d11d5c0cdd683365c35fe4d28b5eaad4937e79690777500788818faa5bd0c483e54ba8ce734aa6411388a39e398dc638cfcf0ec0e542aae6c2b
+DIST gtk+-3.24.30.tar.xz 22407016 BLAKE2B 42e357b066ff40aae2827bc1f8fa821a8b8c8c4f4c09b0c0735e51ea358c1763eda7e8cc3bc70300d66e37af424087d50644cba1406530c15ee721e6b2fd1796 SHA512 4164559f3e14501b9f9330a76535ebf5e26961d436f65e65ea609998cb120fcbcc5d9591453a64e1d414248499857288e5758274d03a7f75e9ae76cbf8c68ff9
EBUILD gtk+-2.24.33.ebuild 9805 BLAKE2B e24f2718c012a86e34aec536e34afe919ad526721fc5cc2e9e5df3f92e3820c416a871110ea8f819838f44564d30dc4ff43cd0e4884ec9e8754a6e9ead006de5 SHA512 9cfbfdd0a24c78471d9917478685402706c9db097bf4c898db851afa61cc5335e6cf57c2c06e53a827d55ad5c1e1dbdf2d03b6003a517447dbf7e52249b49a8c
EBUILD gtk+-3.24.29.ebuild 7346 BLAKE2B 04082a1ce6d79a0ecea51a42a72dfd94d22234bf0e0a672bcf0a3bb3951e5d6dd1cdb30e91c912c7f14f804ed5f92fd60acb28cd80f0b011448d61b6dae2f2ea SHA512 c822b373d7e6d9a21d6deeded488cfd6a2a8ed816a6e6179c63285a666a4ceb006a2992192869facac993be1605ffd2564059b577d81554a49d24a403cee5b73
+EBUILD gtk+-3.24.30.ebuild 7209 BLAKE2B 76f3650b30317728d26e49ed72dd9387e711deb46de5c3911584905fdeda53d38a24dd27c6a78777aedbd0c5122ec955df7a98573dcb808935900fee6c4acffa SHA512 9b31f380d98c70a317dcb1aff2b975f4c276cf2a68013379b63f182ceaa68d28ec612a9bb6f8c0fb3e9405d57ccd0a63a55b978b55e37924bfd740949666e3d1
MISC metadata.xml 948 BLAKE2B 98bf6cecb24352555a5c8a4d689d2d3bb996a05d8c82a731370435f2633d6901222a021f056ca97fbe4313ecabbbba417c14b84c09cea1dbd7274038c0430630 SHA512 2ad2cf22965384fdbd8c9fc479c0d5e9c8c7bfe88d72d2680cf88d5f1df127304d0ab11f253c8e4a9f8f1123e987bb08226bb281f205858d1e743da4cb310568
diff --git a/x11-libs/gtk+/gtk+-3.24.30.ebuild b/x11-libs/gtk+/gtk+-3.24.30.ebuild
new file mode 100644
index 000000000000..19f67ea6223a
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.30.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 multilib multilib-minimal virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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.32.0[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ >=media-libs/harfbuzz-0.9:=
+ >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+ virtual/libintl[${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}]
+ x11-misc/shared-mime-info
+
+ 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:= )
+ sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.17
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}]
+ media-libs/mesa[X(+),${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ test? (
+ media-fonts/font-cursor-misc
+ media-fonts/font-misc-misc
+ )
+ X? ( x11-base/xorg-proto )
+"
+# 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
+ !<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 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xsl-stylesheets
+ dev-libs/gobject-introspection-common
+ dev-libs/libxslt
+ >=dev-util/gdbus-codegen-2.48
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.20
+ wayland? ( dev-util/wayland-scanner )
+ >=sys-devel/gettext-0.19.7
+ virtual/pkgconfig
+ x11-libs/gdk-pixbuf:2
+ gtk-doc? (
+ app-text/docbook-xml-dtd:4.3
+ >=dev-util/gtk-doc-1.20
+ )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+PATCHES=(
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+ "${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
+
+ # Fix broken autotools logic
+ "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+)
+
+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
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ $(use_enable aqua quartz-backend)
+ $(use_enable broadway broadway-backend)
+ $(use_enable colord)
+ $(use_enable cups cups auto)
+ $(multilib_native_use_enable gtk-doc)
+ $(multilib_native_use_enable introspection)
+ $(use_enable sysprof profiler)
+ $(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-papi
+ --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} that would get installed by default
+ DOCS=( AUTHORS ChangeLog 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/gtk-mac-integration/Manifest b/x11-libs/gtk-mac-integration/Manifest
index 826dafb44567..ce3739038644 100644
--- a/x11-libs/gtk-mac-integration/Manifest
+++ b/x11-libs/gtk-mac-integration/Manifest
@@ -1,3 +1,3 @@
DIST gtk-mac-integration-2.0.5.tar.xz 305656 BLAKE2B 10790251abc68498d486242fb168d673f2ecf01bc7a772f5634459bcd05c2029d91af81c02f006135f2c7548e7f94be0506d9271c76298786ade790607c431da SHA512 c26c9ceadb4b8c4410636e38fcd57f76a5b04b6dd14be44e62217973fe9ad1b1107a9771ddcc66e8e8fa078fa3b521df834b9928ba9371ef08cc5a55953426cd
-EBUILD gtk-mac-integration-2.0.5.ebuild 509 BLAKE2B f78d205014130c646dbd826b915f5081dca025f56ea2974d7fe85d51fb6ee41070c42890e9021a9867b1f5d0660226a7dd2c080209b9c5251ad33d4ef0c4105e SHA512 2e03fc94b032f472368f0c5645affad1c56155016d2bcade66ae37ff4739ecbed2caefa4d5147b7bfc5687e4b9576160738325fdc42055c56bf0f9acc19e3607
+EBUILD gtk-mac-integration-2.0.5-r1.ebuild 511 BLAKE2B e1c5ab48907f9d3a2c8fb871ffdb7e96e57e5ef38f0adc9635ca99fddddaeb43fc5708e85c73bb91a14844c42c2df118db083737a6d965815d9ddd0ece555756 SHA512 8caceb9757ebafbcb4a78c727c4d8adeb1d8de641128fecf313ae292bb222a51126cdf092139ce3f616ee9bbd5da728c9d4f0911b8572a7e8bc8aefb4967ef25
MISC metadata.xml 248 BLAKE2B 92ffbf5df7cedae395e3af770765075073d9dd2ddcc887b34b1eca1997d449a5dc827cb3513863a21f26efebf75700fc87e1228c8614a47e951da4b270f264d4 SHA512 5dca2496f2ab8cbdb810fd11c488d84ab9822448794d7e6e3edbb1f71a9f1865248685e25d3e54524b43d781b8e073082773606f8e91943a71fd2bafe63f7b73
diff --git a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild
index 2cf046c6889f..545945eeb9bd 100644
--- a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild
+++ b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
DESCRIPTION="Menubar, doc and app bundle integration for GTK+"
HOMEPAGE="https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration"
@@ -10,13 +10,13 @@ SRC_URI="https://download.gnome.org/sources/${PN}/2.0/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x64-macos"
-IUSE=""
-DEPEND="virtual/pkgconfig
+DEPEND="
>=dev-libs/glib-2.14.0
- x11-libs/gtk+[aqua]"
-
+ x11-libs/gtk+:3[aqua]
+"
RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
src_configure() {
econf --enable-python=no
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index 11ff477685d2..4eb9b2b2c033 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -8,5 +8,5 @@ AUX gtkmathview-0.8.0-gcc6.patch 2043 BLAKE2B 5534acd718f3b4423a1325c109483de311
AUX gtkmathview-0.8.0-gcc7.patch 1150 BLAKE2B 28c122d1ac04cdbe6b232325da3e5994e9680c670ad51387c0d0f7cd67618fca11d54163b563431c3ae3853ea05ada400627c6dc45b8e00f79f07c050d118073 SHA512 550646e134f43a47dd185b9ac2bb7c1713682685c78feca43fd6371d3e6455d06cb105fac9cc69f624cc8c3fef14d06aeabe91dae35ecdd096901cea9c802b17
AUX gtkmathview-0.8.0-underlinking.patch 1926 BLAKE2B 6f50638ebb9c2a6af55e3b0f13b438b97a2e606fc7639a2aa6d7e3467bfcdeb4661c6b18db200b727a3de87c457ea99013f32e49b76ebaaf0a5d9793828f280b SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d
DIST gtkmathview-0.8.0.tar.gz 987328 BLAKE2B 1c8403fcfab828153911a40850bdfcfdd15c8c19da5dc1d7c015a8718c647b4adde2f7201ee0abc72d6c2b5acc79b8c852d6aa4f09021bbeaa827291d963b646 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb
-EBUILD gtkmathview-0.8.0-r4.ebuild 1962 BLAKE2B 7b60f4e6e82060044dabb795c9ecd5e905d7e7cfecedc6cd1a0415a932ac9deedf37dd281d1436be5ecfb6b511a4bdb3c32841a8e537747aa2611133e7133df9 SHA512 8a24987f19df3ab4e604051f1a65ebfef9350847a4a9a24b22f3f4c2c34f377ed65ca14d60a75f68e05a3428298bf3ba58ecf128160bbff6d83e4246ae0498d1
+EBUILD gtkmathview-0.8.0-r4.ebuild 1969 BLAKE2B 1e97398bf9df5f6adca7725bda0d0599f3304d1364b72b2775a6fbe5eb7522b133531794aa3e37e32534035a23f47ad9514ebed7d68fc0b813f026811c8c8a0a SHA512 cecd8b7e03670bb58288fa910901d302e751b9204efb74b5003e377c91d4b7610c338d758cf4f73e6938a5d134562996f0a59aae0c75fd12e6ee1d7e00b98c8d
MISC metadata.xml 414 BLAKE2B d5951ee687da934c39c066c237c67ff1855fce4a6ad7bc16496fcbc7ffe4518fb0adca8597b57b25482e45fafa17b8798bb0a637df18f6deba319b442f02307d SHA512 58b806d5440e74e9f8e0cf6be8047b8f1542fb137e746a19a8991c68c35de1459e179088b3122588b59960be406d4e1238751a61f5be7c9963933bebbdfc0500
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
index d714662b28f5..b2a9406e64ee 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="mathml svg t1lib"
RDEPEND="
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index bf3f26dff638..d89d6c6273c6 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,5 @@
DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
+DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
EBUILD libX11-1.7.2.ebuild 932 BLAKE2B c33dfd62b0d452169d5e242c8f455586ece1155204b0c3d1d018625fcf7c272fd27b7de44e338d3a865db47152fb28480118bb327a97da9333fb6ce0029b0844 SHA512 3a6f0e3ef002cfc6514724f5b08c7527d25e8b3347703155392e63393f20b0e8bfbbb52cf124f2a83838f0ce1708f2151261e40da46c250e3e19a8e84e8111fe
+EBUILD libX11-1.7.3.ebuild 933 BLAKE2B 218663687b2aad7b2f2359adee771033090befcbbdcf060c4a5f7b9402ed8fc98c7519e722acfc6569a845eb147a3eeb3b37866d3187e28d1eb3f59b2dbf60b6 SHA512 004bea2ed8d4966872b27e49a071e4e7d8ab50ae9980df7ebabb19ddd20b694f74c979a579a304bcd436abb6bcd23ebc6a3e4988d29c0d05207c6b27d12d70af
MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-libs/libX11/libX11-1.7.3.ebuild b/x11-libs/libX11/libX11-1.7.3.ebuild
new file mode 100644
index 000000000000..bc2f07298e05
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.7.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX=xz
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+ x11-misc/compose-tables"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ $(use_enable doc specs)
+ $(use_enable ipv6)
+ --without-fop
+ CPP="$(tc-getPROG CPP cpp)"
+ )
+ xorg-3_src_configure
+}
+
+src_install() {
+ xorg-3_src_install
+ rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index de1bd14af9ba..c1cd051bcd18 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,4 +1,4 @@
DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
-EBUILD libpciaccess-0.16-r1.ebuild 801 BLAKE2B ab70c754348958fbd5771f602259e0118d58a8b9ffa048981df50ab3c72155e279a3713ba8ed3733354e7e970d43a702f4e853f456f8b79401159924b2518b44 SHA512 a8db5c4310da46872c960d878e2f72a5cfe944976700f6f652f5f561a87366d427e164bc6a04c98540b0ed50b2696008cbd7a3f1bb6a6c91fa7b92a1937beb5d
+EBUILD libpciaccess-0.16-r1.ebuild 799 BLAKE2B eb029646c1edb71c24d80c1824c42b33ce5187563681ba57ba61fb1a84621b9f8997ada084c1d59e89b4d6fc680030af5713979dfa960945956e1456816495f9 SHA512 94ee90ef628839936d6948c62537c43979f1e321a23a9d999cda8f4d48b086163cfeae11d7d7103e828047f89a228a7b494a050e66a9c8cdd7bbd6b167fc3b5e
EBUILD libpciaccess-0.16.ebuild 790 BLAKE2B 151db8f4ee572c663bf1d9b07e7822e915660812dd221ea00ec169325e3332acd1992815c72cf0a20f2de925634f40337a105efb4c474e058f3347b73acbed3b SHA512 1eeba1ecf3ecde428fb74c3a33e32d2397a9a093cf0994fb5ed3b61f2e68ddd8bda5cccbf26681cbb0b295234afe646ca9b81f4801a29dfe0d807867760a8c6a
MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild
index 1f46f6ac6927..3d1dc4ceac3e 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild
@@ -8,7 +8,7 @@ XORG_EAUTORECONF=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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="zlib"
DEPEND="
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 4daeebbb6232..eef628a29e85 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -7,9 +7,9 @@ DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befb
DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
DIST intel-media-21.4.0.tar.gz 23116624 BLAKE2B d913e379c4990bd0f5a5d07654baeb374d3b4f7adbe607338a96ac6555631560005d6124fb0124bafe5e94107b54acdfd0fbcfdabc820210b453ebb61c828c36 SHA512 e338e645677d90d4c2e91d5096a9002b87cec602ec354283b67e4ee31fcd6a2454918c4e179b86189126d30742ab2814bc8400072fb1d06638c3bc0bf66385e4
DIST intel-media-21.4.2.tar.gz 23185132 BLAKE2B 257f1a8a65928aee897d84ed8df69a129958bcf5fd6ea263283e1f2341a845651a86367cff7988c0d4b04accf48664dbd4d1e0bd106883e92feff095e5f88225 SHA512 1b906ce75ef70395e36296de1e1e4b39d4a82c8b8532497faf47bcb101cf2103bba67a125da7ea1be9f901699288520f704b43fef01339a1f1b7691040d7618e
-EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B 44ab893c79c0eace0f0e237c89a81636123733a51da2b71b4314f5707e98855a59696896cac73a783cfc0b646f9dd1b2e99bc555888d6b53ddd6a54d2e13dca7 SHA512 95749d2504f57449baddfe40b9f1595f45d5058e9afb3656b9ead1163a5dc8a899aef6e71c9bea3ffd5f452b181ca3eebbeae7943e563292be51be7bc24037e2
-EBUILD libva-intel-media-driver-21.3.5.ebuild 1493 BLAKE2B c41e1dd8d4156ad759e10799d5b01d6cf44507b013589a7e2a5e34ffe6d433ca1158af2974c47eed183be2b732e87dd78d5bd7c5ed4fdaf7a1d89410d6a73e3a SHA512 2176809fe16537d67f5538c102c5b56dc3263ed8512a154183d9c942960ea45c033e15e1f8193ee2f53d3e2ed8e97709d7f9dca55969136163105c8a84404177
-EBUILD libva-intel-media-driver-21.4.0.ebuild 1494 BLAKE2B 19e86871ffcfc7429630d27ddfea83c12aad6515fb835a164d3af932680b1cdc11a1afc2607e010a63cfc8318128535c103ec05a34525eb952251b0632b47402 SHA512 377bcfa3181f363ec2df809c237435531411d7aee6da415227e15df89fce118edc72fe56bc44606b4255b53c012a7246f654bd63cb479a164cdc91a3412b6097
-EBUILD libva-intel-media-driver-21.4.2.ebuild 1367 BLAKE2B 8260faea61fba013786a2eedc32775e2bd5df66151e4c10dd3193e843de93e38341ca23e43cbdabbe6405e809c6eed7e8010fa76b2f22a0de270d967aeb6e072 SHA512 913c2667e470e84244a7c1c018ec9816a4db917608c6c429be1b18c239a5fefafcbc79b4f1eca87ef0a5d04de00694260965e0b2392d17bb4f9116a132f728ef
-EBUILD libva-intel-media-driver-9999.ebuild 1367 BLAKE2B 8260faea61fba013786a2eedc32775e2bd5df66151e4c10dd3193e843de93e38341ca23e43cbdabbe6405e809c6eed7e8010fa76b2f22a0de270d967aeb6e072 SHA512 913c2667e470e84244a7c1c018ec9816a4db917608c6c429be1b18c239a5fefafcbc79b4f1eca87ef0a5d04de00694260965e0b2392d17bb4f9116a132f728ef
+EBUILD libva-intel-media-driver-20.4.5-r2.ebuild 1491 BLAKE2B 9c1c9e9d4c753fd6e840fe9aec5db9e994e427440c31335c2e3e579abb1e29b66261a03b1cb77cf2d863d99b2fadb24954450a9c8016ea7a18626a86f50155c5 SHA512 ed9b086e5dc379953a629f227aa9561accba7dfc3422242603df06872d00c571fd1a544d999595dc17b4ce6f80748e2c959c79199161278fdfab5cc9868ffa70
+EBUILD libva-intel-media-driver-21.3.5-r2.ebuild 1518 BLAKE2B 5c2a4591ce1a3b6af4827f0c2eec03767d80f825704abd2e6c589b97ec55d6e76d0e8516bb2993cbae492eceddd4071cb07b605b28fa17c8b5acdba4e3e5c115 SHA512 fe936016b71e4203bcea37a1deb8c5812469b9d6fb756b76aa844a959a0883710dec2775a43f2f07b80c02b9254d5fdc17f5424cd0cf3bb625fe42acf7258406
+EBUILD libva-intel-media-driver-21.4.0-r2.ebuild 1519 BLAKE2B b6fa5f05746270f6c458022c914d08edda6fcb5edb5e28612df4543561e3cf5df6ebd7a71a76b9504d1bd94f8b8cc1391e08481a69fff54b7a3129712b8cff28 SHA512 fd08f731552148367c900c030c8731388e8a273de8823f38c630b08731ce4e53f7d8826f83c2b9ea1bf574bd4d27d9b43eece32f24c0cb891b5f809b235a772e
+EBUILD libva-intel-media-driver-21.4.2-r2.ebuild 1392 BLAKE2B 7412f822b7459314494014cd5d2ad795ad4ce0564e19ff53bc2a2f00701b082ef20ef3ff6253192fca802e1b805fef2bac2554591e879125baa5b0a7f89bc484 SHA512 68e29ddab24decacf5e21377f11e1b404e449cdf76b78037f46c340654b22b35098253941957c75a13466856a3db6b851919b40847e89116df62bb85ec5a7bc3
+EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B b275e1452a39f0c11834e2a73b37ed5553a40f5b78271ad3e774ea565ddca1e41b2f260e685fb57b347ac3d0c16698e671c006fb1cddedf12739a629399da484 SHA512 10c0f9ade2b337df30a24828132d244743ef86a229cfbc30831a697f20e9ea8e6b2b03356f5d217824fa60af0c2ae22aa914436fba442c5323c76a1d48b20461
MISC metadata.xml 770 BLAKE2B 6ab4ad71025ad0e2130613c3c4a06c0d337be0388f994f9e02042214228e105dfde10943efe80aef0d3e0656038a35c9bab01ad907f05826059a809f76add8e3 SHA512 c4cfbacc4218176b4a18bb3afe428a46a09d2fc7f7b13e6a12fa5f028e8d9d498c29e0e654ee51591eb62eff2e4d4addaa2a3a63c45706dba46f447c3b013027
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild
index 7e51437dd247..00f2befa1f19 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild
@@ -26,7 +26,8 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-20.4.1
+DEPEND=">=media-libs/gmmlib-20.4.1:=
+ media-libs/gmmlib:0/0
>=x11-libs/libva-2.10.0[X?]
>=x11-libs/libpciaccess-0.13.1-r1:=
"
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild
index fb2d94e7416b..05829c3b4ed6 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild
@@ -29,7 +29,8 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.3.1
+DEPEND=">=media-libs/gmmlib-21.3.1:=
+ media-libs/gmmlib:0/0
>=x11-libs/libva-2.13.0[X?]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild
index 15ca5a26b62c..5573b2b96933 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild
@@ -29,7 +29,8 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.3.1
+DEPEND=">=media-libs/gmmlib-21.3.1:=
+ media-libs/gmmlib:0/0
>=x11-libs/libva-2.13.0[X?]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild
index 53f1093683e0..5ce014edf7eb 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild
@@ -29,7 +29,8 @@ IUSE="+redistributable test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.3.1
+DEPEND=">=media-libs/gmmlib-21.3.1:=
+ media-libs/gmmlib:0/0
>=x11-libs/libva-2.13.0[X?]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 53f1093683e0..7645bfd38f1d 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="+redistributable test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.3.1
+DEPEND=">=media-libs/gmmlib-21.3.1:=
>=x11-libs/libva-2.13.0[X?]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 5651e25f326c..7e4d8f257228 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,4 +1,5 @@
DIST libva-2.13.0.tar.gz 256724 BLAKE2B 97dd51bf488dc88027125973399e17dedcce03b7bf5104fd9bf17156c5013e1e9d46f2bf78c16431141294f75549a00fed3542b4f79dd31b032f4505c11d07d7 SHA512 226d09956754c9942348ed289f210268bad64dbba95d948b33ae063f7ecb276af9da083a48c03c3c79ad4305716d203898bc75a109945d064a5fe6fb43398dea
EBUILD libva-2.13.0-r1.ebuild 2219 BLAKE2B edefe41042978eb61e2d0f75c2c4befab859ddc267a3b9a5719eaaefb38a3c88f58b3bb09f1c69345acb6df72858add5ac443ca076d0f8262daa3ca17469aa39 SHA512 afb649de60b6760ab1a2ff67b2d88c5cf0b09bfa5405258268e91aa987324dbf005e36f76236cb2ae441c2d7b693f6e949585026a2296c67a809927285d80f24
-EBUILD libva-9999.ebuild 2223 BLAKE2B 2401aa2c500de6a88750f33a4e964c3113a4a782ff4a9e50e6f41b6434e6e397b9d86da12ed424c928535f9c9b75e2f4823413a6c70b28358d7ad538c9b529c7 SHA512 693a23ecfbbb04769e8ae58ac62b1c5e95fc415b478889c63cdacf10c5c0591c6c691feddef517396ef67f4b033a363406067f19803630e517d87a60bf541a01
+EBUILD libva-2.13.0-r2.ebuild 2202 BLAKE2B d192b08049c769382525fe7c6cd2679dcffdcbbec3db697fbf1d42fab21cfe63c81864edbaec1a0ee58004bcdb84f78fbfd9d3870db441359abe9dbcd4450ae2 SHA512 be154ae3722c3c53fe559a5975c99be093d483a8c14bd7473217e0dbe502078516024b5e04bc211b4d824680f1318143295a4d0b1c0d9ae0c8653110d2032f24
+EBUILD libva-9999.ebuild 2202 BLAKE2B 58fe8af2b0316bcd8000357b3c83b7d3175e266df6fd960e1c1ed4b708be6842d4c9d1deb0bf7b111c4c3e81655bbc0cc40cdaf6e62a1738a7fc0363d11280ee SHA512 469ea6356ede6915b61cfb82b26841904d702be7eabfae86f0ed2c7fe63fd9b626b89ffb6d273605a2ba3956ff91922d82660d1fa43c8464c5ab73ca2d9154ad
MISC metadata.xml 470 BLAKE2B d9df0ced571b8afa6cecda8dafb7165d142c3fd1c0fff21526d5624edb530e0ac705a36a7fa1a17d18583805a267652dfb77850a70aa47dcceb4794636821e9e SHA512 66f62980ed7d876f681bc77cb47cf43940fe056db6577557cf518604885c54ad94a17680c6749eb81937b44e21d7df9cad3ede05fdf74be88dcb6d21e271491e
diff --git a/x11-libs/libva/libva-2.13.0-r2.ebuild b/x11-libs/libva/libva-2.13.0-r2.ebuild
new file mode 100644
index 000000000000..fb840c456a59
--- /dev/null
+++ b/x11-libs/libva/libva-2.13.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal optfeature
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} = *9999 ]] ; then
+ inherit git-r3
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="https://github.com/intel/libva"
+else
+ # SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
+ # The upstream provides periodically tarball with pre-built 'configure'.
+ # To simplify updates, portage use tarballs without pre-build 'configure'
+ # which are always available.
+ SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl utils wayland X"
+
+RDEPEND="
+ >=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/wayland-scanner
+ virtual/pkgconfig
+"
+PDEPEND="utils? ( media-video/libva-utils )"
+
+REQUIRED_USE="|| ( drm wayland X )
+ opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/va/va_backend_glx.h
+ /usr/include/va/va_x11.h
+ /usr/include/va/va_dri2.h
+ /usr/include/va/va_dricommon.h
+ /usr/include/va/va_glx.h
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable drm)
+ --enable-va-messaging
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ default
+ find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+ optfeature_header
+ optfeature "NVIDIA GPU support" x11-libs/libva-vdpau-driver
+ optfeature "Older Intel GPU support" x11-libs/libva-intel-driver
+ optfeature "Newer Intel GPU support" x11-libs/libva-intel-media-driver
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index a5e8ebf286e2..8e84bcf7bb12 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
wayland? (
>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
- dev-util/wayland-scanner[${MULTILIB_USEDEP}]
)
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -40,6 +39,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
+ dev-util/wayland-scanner
virtual/pkgconfig
"
PDEPEND="utils? ( media-video/libva-utils )"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 9b342e8c56f6..77ff6c9df17f 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -6,9 +6,11 @@ DIST pango-1.48.10.tar.xz 2071736 BLAKE2B 68bca7e8307fc7ddb49830c84b17e95fbb1f2e
DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 8529e8cbcf0f33be56cf09229abe45fb3525e12a9c2a6ad7cca416ff67a92eb010abc2ce814fa4d19a924186369eede4a576efdd2f4c64b39e31c9821c5e414a SHA512 2c758e649af5b9f9fa960c26a6f4dcf5abd8035101fdfe4a02fe02cb892250b615584b02d63aaa06f3da5cbe7bb848459ac969f43437c34cec084b51bcf48cab
DIST pango-1.48.7.tar.xz 2050880 BLAKE2B 2ee048d9713aed0972ffdf3feb96c7c0683ffa1494ac2b798a4f6b1f5797d689b0e0c06bcc3f4a10130d23279ed295a3a59141c75bd3a0f2da7facf62d6c3baa SHA512 e5680d628f531bea7633945bd74dc51a93c4c881dec58fcf9f6271043e77b82a4805e311355cb4d9f8cdfcdf52785a5a6391517a264b62416c26e82dff4aca39
DIST pango-1.48.9.tar.xz 2063756 BLAKE2B d1610aaac783b95a35ad3e083b4bab33f3d4beff533386817addcb5eb9022de242087ffe4e62c043870b4aac1fbc0fe3e1c5d18744909a5a05015a702dfea2e3 SHA512 e3bba743bb596b0a34cedc893f9af0216bcc9fec521c2da09cfdeec9ad80a05b5c53c3fce1a225ab27536e9335725cffb87c66867d0522fd4632df00b1d4c056
+DIST pango-1.50.2.tar.xz 4089160 BLAKE2B 3b752d72ab3c656c23efa591a8508ed52475e73ea329984c11aacaca4a1f4ebee68bdc4000104d2150b01a452215d6b3fc9ac5c50a71b4b2ddca78d1aed231e9 SHA512 e85898370c68ee91391f926aaab046763b6b6086fd892e1a7d98bf83787bcca9c463f3ccb4a2fc4b8f248722a8a229bb52363f799c8bc4040eeb94028c6361b6
EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
EBUILD pango-1.48.10-r1.ebuild 2281 BLAKE2B 47ab13c343ad4f2d09a7c258164eeb9b06eb7566e44a18c6bbbbf73e838e90a601ca8c609bf47dab83cd2b9e3e2a2c86d492cc9b902056cc5d35f2c6dc8bb667 SHA512 994205edb3352d026a51f64f1d16db4a8e2a9b903be551be501fbbc529111c488a50c14fba6bfaf518496b624708541e623622f388723eb59e589d52cf0d6050
EBUILD pango-1.48.5-r1.ebuild 2140 BLAKE2B e53a8cab9f9de8c8e5828fbfe3784877ef4c416ee39a1780a49b0978c5f4a85ff21e2a53a3204c65a51458d25b143ce8361dc8323fa34167981066040cb982ab SHA512 ebadd72e5bfb7ed5fccc1da685d6b973c7931fcc076c6a466e49e8c41980e0a781f3ff42272b83b0b9db02224b9a30881fd2f0c484c9f0f163101f17e1b5b3c9
EBUILD pango-1.48.7-r2.ebuild 2273 BLAKE2B 01b85b64743d399ec1372c34f8fe356cf08132a94b42ad3a6675088d90533d326cdb804bfca96cf52c197fef228574ef77b4d428a4102ed9dd0346a29ca995aa SHA512 25316916803bcfbb1f90fb6921d8d0596e70d1ea4f9eac9d35f612d55f3c53131d2f11d80469ff8b0244ad8758b54d937baba46f49fa38a29013430e48935d26
EBUILD pango-1.48.9.ebuild 2054 BLAKE2B 487470875c5a78508292841229e1600208c73dcf4bf10accbffeff3f7ff04e85c2cf3623d085af116e753efc172951b3b9c168996859c6253430a9ca1ab4c369 SHA512 1c87f5774542d295a7f5ef2d8fe3445654493ce426af739d0f823c03732021df5667195462f498daf670f908e23558f43cb7e81802fbaa7faf98a44dcdc290c9
+EBUILD pango-1.50.2.ebuild 2272 BLAKE2B b41b796171eae910753492ddf0e91ad7ebbb3cffa544fa676b69bb0972bf332c532ff3ce8264b85f44df2da46132123afd5e9cccfa4c937390437c2f7db815f7 SHA512 ca9d78e71fd8434e654a930cb5373a326592d3ad5f4fc562c46b0134754be18e637134d99e271214207bf89e37aa09efe86ad002b8263dbcc530b8f4b33fa39d
MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb
diff --git a/x11-libs/pango/pango-1.50.2.ebuild b/x11-libs/pango/pango-1.50.2.ebuild
new file mode 100644
index 000000000000..b756a9e7e501
--- /dev/null
+++ b/x11-libs/pango/pango-1.50.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic gnome2-utils meson-multilib xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="debug +introspection sysprof X"
+
+RDEPEND="
+ >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
+ >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
+ >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+ dev-util/glib-utils
+ sys-apps/help2man
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ xdg_src_prepare
+ gnome2_environment_reset
+}
+
+multilib_src_configure() {
+ if use debug; then
+ append-cflags -DPANGO_ENABLE_DEBUG
+ else
+ append-cflags -DG_DISABLE_CAST_CHECKS
+ fi
+
+ local emesonargs=(
+ # Never use gi-docgen subproject
+ --wrap-mode nofallback
+
+ -Dgtk_doc=false # we ship pregenerated docs
+ $(meson_native_use_feature introspection)
+ -Dinstall-tests=false
+ -Dfontconfig=enabled
+ $(meson_feature sysprof)
+ -Dlibthai=disabled
+ -Dcairo=enabled
+ $(meson_feature X xft)
+ -Dfreetype=enabled
+ )
+ meson_src_configure
+}
+
+multilib_src_install_all() {
+ insinto /usr/share/gtk-doc/html
+ # This will install PangoXft API docs regardless of USE=-X, but this is intentional
+ doins -r "${S}"/docs/Pango*
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if has_version 'media-libs/freetype[-harfbuzz]' ; then
+ ewarn "media-libs/freetype is installed without harfbuzz support. This may"
+ ewarn "lead to minor font rendering problems, see bug 712374."
+ fi
+}
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 0ffb892c86a6..41f55a808444 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,7 +1,12 @@
+AUX qwt-5.2.3_p20210828-install-headers.patch 777 BLAKE2B e57833f3b77afcb0afa4b66d545e420b56f99d5f9a328eea7e029da0af7d445fee560c481c35fca00e8ee1c44b38485d5fe957a6013b88ee2ff8edd46335327a SHA512 999a2ef2059e2d78e0b37447e356ebd62a4b89bf59979ef526c7ef853cd6d75a639b6d4a1eb238de8f745e0295568be417f443d65ad983e880144875fb5b8c66
AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb2800c88ad06aa989d3293c42be8945db11982c915b775dac43d773f557dbfa57f5f3abf40a0f57c4d414f4003d09f581b SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201
AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769
DIST qwt-5.2.3_p20210211.tar.gz 2324714 BLAKE2B 86556c9cf65af80500b3cba7ef78be8aec0f2413a1d485641f8870b447a1b1370b9821ad6b4a58c74f87a73172e4b2fa3eb2f02bb525c0ab3982aec550914666 SHA512 8268213c9e809015d83f3f7d42e66c85b6c9cb16efb9586ad4e5da2fa60fdcc5bdf52e0a422adcdfe928e36df0f63d8bbed1fabded91ef36d226e6cc7fa372bb
+DIST qwt-5.2.3_p20210828.tar.gz 2324516 BLAKE2B f86ee55dab0e70bb255f90384ee920985d71ff998aa74bb087c2bd7bf3cdc23034786bce0d4e652dd4a7b1551719e4723de6689c76500e5f618838f40f7ca838 SHA512 c5eb64593a476d9ff1ec6c16593896bf3b90738a17775bd8186ffc7f86911ae0b91ceb8e7c1736329e9871fd9e1e5653a85df0a4cdb780a1f2f993f33ee07f62
DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
+DIST qwt-6.2.0.tar.bz2 4815773 BLAKE2B 30011de7ef9b555584644ccb0994bfe56af2d7efe16690b236aa1aa0860a4408800fbd31003fd7a7a0ddf8572f573b4d0ff77069f291cd2858b31a2840952b3b SHA512 d992f9dddb09ad0e1d09e23a24a9331c950ca19a413d2627cf423e1ddc2a4ad4eb951646f789e8c7a9ab42668c30d7108071f3f8bbd8e1f4118cadb67c34939d
EBUILD qwt-5.2.3_p20210211.ebuild 2319 BLAKE2B b6062a5d1d7e0c4a42e6cac9ee80a0610a4e3ad4b0868f9806138f8d408c513abf5ae7ef5ecbfbde38b1e9398519ffc8bed798e6db7dfb2374e33c257fb337cc SHA512 2882706eb496ca52501c23d7da465122c4338648e6ef1b72ec202430b7437497568b1ba3e44b812a6ecc2048e00cc060640eaf88d7e8e4c138cfe48e0c0d7916
+EBUILD qwt-5.2.3_p20210828.ebuild 1295 BLAKE2B 2a8af082fbb910433d75c8ba9c368af885f34c2b9670dadbd8ed6024cc86ab943f58d6d211746b41a119899a4a4d6b54f9571065c4841baf783a1f9fec93099b SHA512 789329283a008e17fa89b75c529ab9aa94e97c53bc970b3bf88bc66fd9999f3d6a995373701c142f32f590dbdc513352f01627c0d3c48192f8968123a258f21e
EBUILD qwt-6.1.5.ebuild 3194 BLAKE2B 7a5d212d05ddfc7ae91c83fb5a8e4af7c3eb6a0b89a9da886a8bdbcaacf2583d8bfaddf0225ea7ed78a70b0fba53d9d75e5f4902ae2fd53b375475a2026d889e SHA512 a3906bee40011fdf0bc6594b230c0b29f3bea7d87d48127a36ab57edc61656043f46a2aae886fc22ec708dc34a10bf1c66082735cc1032862bf447592e2cf661
+EBUILD qwt-6.2.0-r1.ebuild 3141 BLAKE2B 382d602da54a281e5e91f1d50175577383e29ee35b21028c511f059c830752c67a2eac163c74b461f67f2c3699fd7ba8c3faceca0d3ce9e32bc41a3c11892c78 SHA512 04e39d1043f65ce8eb0badb376f16ede28f60bf91308d0a14ad8251f5ebbb0e0d231425ae084fa29f9b63d2cdb1a89e6b04372701c33ae637a7f4c18ddf86c37
MISC metadata.xml 930 BLAKE2B 7e69f5762e0abf8399921153b73c31e927803de990cb3902be1fcfeaba75d18c36300b374a84a57630fd3eb08f4c99194e8dd3f86059cf9fa05ec049649c3cf7 SHA512 f90beae03d5e96508f139da0206f4aea119fb323aaafaa92931e35c8b6e1fc56c0e4deaedd77c57c5c8173c36c34227b504b9444c7200427ef7daeae3204f14a
diff --git a/x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch b/x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch
new file mode 100644
index 000000000000..9ceff1035e69
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch
@@ -0,0 +1,28 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 502f097..35b8660 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -6,6 +6,7 @@ set( HEADERS
+ "qwt_color_map.h"
+ "qwt_clipper.h"
+ "qwt_double_interval.h"
++ "qwt_double_rect.h"
+ "qwt_dyngrid_layout.h"
+ "qwt_global.h"
+ "qwt_layout_metrics.h"
+@@ -34,6 +35,7 @@ set( SRCS
+ "qwt_color_map.cpp"
+ "qwt_clipper.cpp"
+ "qwt_double_interval.cpp"
++ "qwt_double_rect.cpp"
+ "qwt_dyngrid_layout.cpp"
+ "qwt_layout_metrics.cpp"
+ "qwt_math.cpp"
+@@ -156,6 +158,7 @@ if( QWT_WIDGETS )
+ endif()
+
+ add_library( qwt5-qt5 ${SRCS} ${HEADERS} )
++set_target_properties( qwt5-qt5 PROPERTIES PUBLIC_HEADER "${HEADERS}" )
+
+ target_link_libraries( qwt5-qt5 Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport )
+
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
new file mode 100644
index 000000000000..4321491653bf
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="doc"
+DOCS_CONFIG_NAME="Doxyfile"
+DOCS_DEPEND="
+ media-gfx/graphviz
+ virtual/latex-base
+"
+
+inherit docs cmake
+
+COMMIT="f7519200f102676fb04fb7bd0be555e0a419d378"
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
+SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="5"
+IUSE="designer examples"
+
+DEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtsvg:5
+ designer? ( dev-qt/designer:5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-install-headers.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ -DQWT_DESIGNER=$(usex designer)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ docs_compile
+}
+
+src_install() {
+ cmake_src_install
+
+ # avoid file conflict with qwt:6
+ # https://github.com/gbm19/qwt5-qt5/issues/2
+ pushd "${ED}/usr/share/man/man3/" || die
+ for f in *; do
+ mv ${f} ${f//.3/.5qt5.3} || die
+ done
+ popd || die
+}
diff --git a/x11-libs/qwt/qwt-6.2.0-r1.ebuild b/x11-libs/qwt/qwt-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..c2bc73d2417c
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.2.0-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="doc"
+DOCS_CONFIG_NAME="Doxyfile"
+DOCS_DEPEND="media-gfx/graphviz"
+
+inherit qmake-utils docs
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="6/2.0"
+IUSE="designer doc examples opengl svg"
+
+DEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ designer? ( dev-qt/designer:5 )
+ opengl? (
+ dev-qt/qtopengl:5
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:5 )
+"
+RDEPEND="${DEPEND}"
+
+# tests require package to be already installed
+RESTRICT="test"
+
+DOCS=( CHANGES-6.2 README )
+
+src_prepare() {
+ default
+
+ cat > qwtconfig.pri <<-EOF || die
+ QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+ QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+ QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+ QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
+ VER_MAJ = $(ver_cut 1)
+ VER_MIN = $(ver_cut 2)
+ VER_PAT = $(ver_cut 3)
+ VERSION = ${PV/_*}
+ QWT_VER_MAJ = $(ver_cut 1)
+ QWT_VER_MIN = $(ver_cut 2)
+ QWT_VER_PAT = $(ver_cut 3)
+ QWT_VERSION = ${PV/_*}
+ EOF
+
+ use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+ use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF || die
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ DEFINES += QWT_MOC_INCLUDE=1
+ EOF
+
+ echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+ cat >> qwtconfig.pri <<-EOF || die
+ QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
+ EOF
+ sed \
+ -e 's/target doc/target/' \
+ -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
+ -e "/^TARGET/s:qwt):qwt6-qt5):g" \
+ -e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-qt5.so:g" \
+ -i src/src.pro || die
+
+ sed \
+ -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
+ -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
+ -i qwt.prf designer/designer.pro examples/examples.pri || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_compile() {
+ default
+ # need doxyfilter.sh in PATH
+ PATH="${PATH}:${S}/doc/" docs_compile
+}
+
+src_test() {
+ cd tests || die
+ eqmake5 tests.pro
+ emake
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+
+ mkdir -p "${ED}"/usr/share/man/ || die
+ mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
+ rmdir "${ED}"/usr/share/doc/${PF}/man || die
+
+ if use examples; then
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF || die
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
+ LIBS += -lqwt6
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ cp *.pri examples/ || die
+ insinto /usr/share/${PN}6
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest
index 436eafe8f270..7c61b50b2ffc 100644
--- a/x11-libs/qwtplot3d/Manifest
+++ b/x11-libs/qwtplot3d/Manifest
@@ -1,8 +1,11 @@
+AUX qwtplot3d-0.2_p20210828-install-headers.patch 636 BLAKE2B 53d635042cfb6a9ca954dc5be460ed887f16678565e5fe1a00da6e7fff93a51fd67c2fba79c51ebbdbe83266d77113006c5c3b00ce5cc6f34feba4fff07ad258 SHA512 fd1edddf8d852d643bc8603c09972e2c923f62321b5aecfbb5c2f000ac62a49ad760606940c90753313d4d190563d5123c8d572a623eeb2e311a698b24455fd7
AUX qwtplot3d-doxygen.patch 1089 BLAKE2B 87af8ef42050cac3e953800122e5713f4a9ba3c3da9397f43ce6dd1e54106ecfd245920e793033c6decf0202f589a53380a3dff688d5ee0c9236f598a7dced7f SHA512 d424ede7e78ddbeeb8bcd2270a83956164d5cf8f574b9a478a9b527c28ed6488edc2324b72dbf3e3c1973e7aae16c1baeb63d0dc3e3e97ecc9d3679fd06db7d7
AUX qwtplot3d-examples.patch 4764 BLAKE2B 68cdda8bbec7744f4ee8ad811c8d2b934c58cd2ba5320271fc70edbded9ada1a92aee2b387c6238ec16f8de83fb552b7dd78c3851bb76f32ca7693fc0e2ce055 SHA512 b1100942e85df8347a439083a7c2ed1fc86edde2115fba9ec6657f2a8a10ffea937e28d2cb4bfcd377f3f75cb098cac923cb4a254116a56e3d914daa05cc504f
AUX qwtplot3d-gcc44.patch 440 BLAKE2B feaab80b003dedbe95a4e4ce5d70dff8e29efb498857274a68e078127947822eada637c66c452fbcdc51ccdc98a3dc85993a9a4266b9b7ae39700653a2bddc8b SHA512 4f10bfabc68ec313aa8f3f624632c59bfad18f701bc802cd222607ac551b2ad6736dca14e3b63bd238c9c2b68128cb0b66eb1801dc6efebc800e71b0d03cbd31
AUX qwtplot3d-qt-4.8.0.patch 1033 BLAKE2B f3039ed5892c68a364be3a93f89cd1c2d23b6899f50a42af7c2490331c7ea84a4bb0c23c67787d8b1d5a449767d8011d72bc9da2988913ce1a848a13e7b981db SHA512 7cb30ea968e491b0bdfd6a27ce6a47dfbf9888048a4368b14947988e29f4041814d9f452960851d959177a5ced58fda74f4cfdac1f178bb6b44fb9ccc98d53c7
AUX qwtplot3d-sys-gl2ps.patch 913 BLAKE2B 4605902c4297e9f6a0152e869d50d425edb771647dd230c3e9e3bc12365675b5524279dfacb64b40996416009e57eaf82a18fc8d8f98320a2fcc138f5f13e113 SHA512 4e1e7df4b7e31ed5b51fff730aa72e6834627d98f27605b43a8f63feb333f6d7f6858a71be4cf19abc83b20e483eebae2e2730ec00336225e45ea693f096b2eb
DIST qwtplot3d-0.2.tar.gz 322366 BLAKE2B 7c589efe13409089dd6e1b579f19891fb0b75e44a4add87128822b3184c4d22ec0e7b04ce4c7c52dfaf8644a17a8506419726ae1ab50ab7cd7bc9ea9f84f9268 SHA512 92addf10865d090216a92d5ced5b0793b50657c6c5e5faf5c8f78120cc9c94a0b6f8e351d2e053b73951411b8f81a4179c0f17aea27d78cd748df8f81b31bcf9
+DIST qwtplot3d-0.2_p20210828.tar.gz 162362 BLAKE2B e2382f8b1b6f9f3ac5526a6ae3269f649badf11240e65283c62a88ae620ca81d6f1bad51f39651c1ca1fa8bf63f47978a41386cdec64a374a16eb7bf579d0875 SHA512 92ecfd6e91a31921993171f41f4606abbbd675fb869c32c3f1e0665cb13e1d88718bba39493edbc350c8e0a7b66cdfb14fd998d46b3f67b7223a41260347061a
EBUILD qwtplot3d-0.2.ebuild 1248 BLAKE2B d712fb3ba9c906c0fb63b31209e8e739e8b25e30f6d01886a767d5f0e5ecca8bbe82343a0b3adee9c15f817295cdea08536e66a57f19915873d802d91fed3436 SHA512 c45675398d54de2d4a6f34f0628b964887c97268b3013f7af91ebe0f60cf3cfac14d163b1956fe8ea101faf6b894c702ab39c70fe40924010a7372756dbdb6ac
+EBUILD qwtplot3d-0.2_p20210828.ebuild 860 BLAKE2B 519b99afc06507c97e27fc45f46cdcd7feed80c27884f0feea4a62110877ea88cb9d302414ad032966f5400c88a72bf83049d31aa724cbed8e3506d32dc01867 SHA512 6014dea32b975f25208855cdcd380b7d15f7ec14ade08cf8db525a11c8aa30777193905604ecfcffbb95092702686f449eb9fbf9a3eb33898bb66ee943d48586
MISC metadata.xml 641 BLAKE2B afa1d739bf16b3aded67a077b948efc327d15a22fd630ad5044d85eb1bc75b6c7617d01ec2e0b46a43e6def7998c3d78328af61bf85bd8dc4bd76090e752e670 SHA512 5e9791b1fca3d5d5899c64cecc781b5891ed519a12b713acb2c928436d78afdfd4121add2a8b593811b389890003a41f77fa9af03f7325fe8d97ff1aefbd9811
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-0.2_p20210828-install-headers.patch b/x11-libs/qwtplot3d/files/qwtplot3d-0.2_p20210828-install-headers.patch
new file mode 100644
index 000000000000..c32dccaa09d7
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-0.2_p20210828-install-headers.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 12657be..c14ca89 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ cmake_minimum_required(VERSION 3.16)
++include(GNUInstallDirs)
+
+ project( QwtPlot3D
+ VERSION 0.3.0
+@@ -104,8 +105,12 @@ set( HEADERS
+ "include/qwt3d_io_gl2ps.h"
+ )
+ configure_file( "include/qwt3d_version.h.in" "qwt3d_version.h" @ONLY )
++list( APPEND HEADERS
++ "${CMAKE_BINARY_DIR}/qwt3d_version.h"
++ )
+
+ add_library( qwtplot3d ${SRCS} ${HEADERS} )
++set_target_properties( qwtplot3d PROPERTIES PUBLIC_HEADER "${HEADERS}" )
+
+ target_link_libraries( qwtplot3d
+ Qt${QT_VERSION_MAJOR}::Core
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2_p20210828.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2_p20210828.ebuild
new file mode 100644
index 000000000000..09a4bfa5cc32
--- /dev/null
+++ b/x11-libs/qwtplot3d/qwtplot3d-0.2_p20210828.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="doc"
+DOCS_CONFIG_NAME="Doxyfile.doxygen"
+
+inherit docs cmake
+
+COMMIT="b2655743d30ed3185f3c0e2626b33a1d29655216"
+
+DESCRIPTION="3D plotting library for Qt5"
+HOMEPAGE="http://qwtplot3d.sourceforge.net/ https://github.com/SciDAVis/qwtplot3d/"
+SRC_URI="https://github.com/SciDAVis/qwtplot3d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="ZLIB"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE="doc"
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ x11-libs/gl2ps
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-doxygen.patch"
+ "${FILESDIR}/${PN}-gcc44.patch"
+ "${FILESDIR}/${P}-install-headers.patch"
+)
+
+src_compile() {
+ cmake_src_compile
+ docs_compile
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 1b8712a95c55..91795ba62406 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -6,6 +6,9 @@ AUX vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 1375 B
DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
DIST vte-0.64.1-command-notify.patch.xz 4880 BLAKE2B d6ff5f4acac161980c8c18245e65795c7f0ea3d0819748894b055306ecd731d698cac578eff2750795a9180a9b17d79f220e814083012d5a04f4f351ff2a0e36 SHA512 174397aeca00399b138286fd4cc88941add041a1f2596fd42222d44c886c2e35b2a33041b58a102ee3acbcddc0cc40fcfde39d72ec46b640ee1db22d8ae684c4
DIST vte-0.64.2.tar.bz2 486837 BLAKE2B 3e127d61e4018607ca2df170108aef65b224a48df4d57545c98cbdb9753cbe7b9821e91a5bccd09d8c39af95d747a2ff01c69320e9245f5a82e7887b62c32c97 SHA512 6cbc1ee25a0ef2b00bcf26c07042eccc14fdea323e4445123db9fad05bf2e799579d723f6147c08712aec9b94e17003ce8f9e6ebe65278fdb3832cf77cba5be5
+DIST vte-0.66.2-command-notify.patch.xz 9672 BLAKE2B 8153a250f571f491845041627029065029bd32ab63c127aacc0852f42abee0834c716d63248120a49011857901d775b75fc0c31a513cfb113563e8ffb599e478 SHA512 d491f8332fbd21e8dfe225636ca035339ab1da3bd7dc74436cdd2f3de3c5f24f609f9825c4eb0b816c9f60862da62b97f36381c5cc5af0203b3698d56fc77d3e
+DIST vte-0.66.2.tar.bz2 503503 BLAKE2B 174a0d9bfdaf2318255e62041ed94aa53f8fc110ed55f3e7b24baa70dd01a4851306ac47cc3f1d6699341c9ab41f85aee57c460b9f96bfd14618f0f40e4bd657 SHA512 6e9e2cc03b72c2d04aa3d7633dcf86649dcef39fdfecbe7a0c4b063eaccdb2ea83207f592edf348fad5a36f091d9261cc46fd0a4e9e5db6006fcecb0d01a6ccc
EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
EBUILD vte-0.64.2.ebuild 2639 BLAKE2B 322c4e933b99409d8b09e59d89cb21933ce60c0bdf510691aaf241940cf964697376668374eec45222fa24a37f374ef54bceec96adb0867afbd13c380b321359 SHA512 94cc0c4a20feae35be06efd81eddb148b8c739c0ddfa5046331e20224d7bad6f88e3f92af968dba347fdccda094833560dff085d5bbde8668a419d189278a3af
+EBUILD vte-0.66.2.ebuild 2682 BLAKE2B 052274b5a7efe08a5d8ebe0aa762cad2febae31d6fdf73bc68303199ed2b46a99be392b0980bf0bb6fb31565e052d26451dd4621c2e0c4b0a383378a07a43714 SHA512 5eb18244cf9668b2dde732d2697f7bb8b40b42ae6b7ed409034ad96259803bfb4786e7f39400cceaa921a8e8c74bde30b6e32cf353d9f1268e2b312f03b090ca
MISC metadata.xml 519 BLAKE2B e34530c7e9882f9d61b6c1fe9cc1d523037bcc05034e3f98351ff33bb543a0a25d96c0debdd1572cfeb0d2166b41a324c7fdfed38482c11cbe053db96b312ef8 SHA512 313a0af6b28d47bf385594a9306f38476bbfcc44517d7219ba1d0a8ddee224a37cd4ee8f7c4f8aed8bd7eae0ad2b3461bc4ae49c5eb8b08bc61459c76bf7a5ef
diff --git a/x11-libs/vte/vte-0.66.2.ebuild b/x11-libs/vte/vte-0.66.2.ebuild
new file mode 100644
index 000000000000..5d00801b3f56
--- /dev/null
+++ b/x11-libs/vte/vte-0.66.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91"
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.66.2-command-notify.patch.xz )"
+
+RDEPEND="
+ >=x11-libs/gtk+-3.24.22:3[introspection?]
+ >=dev-libs/fribidi-1.0.0
+ >=dev-libs/glib-2.52:2
+ crypt? ( >=net-libs/gnutls-3.2.7:0= )
+ icu? ( dev-libs/icu:= )
+ >=x11-libs/pango-1.22.0
+ >=dev-libs/libpcre2-10.21
+ systemd? ( >=sys-apps/systemd-220:= )
+ sys-libs/zlib
+ introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+ x11-libs/pango[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.13
+ app-text/docbook-xml-dtd:4.1.2 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+)
+
+src_prepare() {
+ if ! use vanilla; then
+ # Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
+ # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+ eapply "${WORKDIR}"/${PN}-0.66.2-command-notify.patch
+ fi
+
+ # -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+ sed -e '/ggdb3/d' -i meson.build || die
+
+ use vala && vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ -Da11y=true
+ $(meson_use debug debugg)
+ $(meson_use gtk-doc docs)
+ $(meson_use introspection gir)
+ -Dfribidi=true # pulled in by pango anyhow
+ -Dglade=true
+ $(meson_use crypt gnutls)
+ -Dgtk3=true
+ -Dgtk4=false
+ $(meson_use icu)
+ $(meson_use systemd _systemd)
+ $(meson_use vala vapi)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}