summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/Manifest.gzbin19853 -> 20182 bytes
-rw-r--r--x11-libs/cmrt/Manifest3
-rw-r--r--x11-libs/cmrt/cmrt-1.0.6-r2.ebuild31
-rw-r--r--x11-libs/cmrt/metadata.xml18
-rw-r--r--x11-libs/colord-gtk/Manifest2
-rw-r--r--x11-libs/colord-gtk/colord-gtk-0.3.0.ebuild2
-rw-r--r--x11-libs/gdk-pixbuf-xlib/Manifest2
-rw-r--r--x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild4
-rw-r--r--x11-libs/gdk-pixbuf/Manifest4
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild116
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild2
-rw-r--r--x11-libs/goffice/Manifest4
-rw-r--r--x11-libs/goffice/goffice-0.10.51.ebuild64
-rw-r--r--x11-libs/goffice/goffice-0.10.52.ebuild2
-rw-r--r--x11-libs/gtk+/Manifest12
-rw-r--r--x11-libs/gtk+/gtk+-2.24.33.ebuild4
-rw-r--r--x11-libs/gtk+/gtk+-3.24.32.ebuild249
-rw-r--r--x11-libs/gtk+/gtk+-3.24.33-r1.ebuild257
-rw-r--r--x11-libs/gtk+/gtk+-3.24.33.ebuild249
-rw-r--r--x11-libs/gtk+/gtk+-3.24.34.ebuild (renamed from x11-libs/gtk+/gtk+-3.24.31.ebuild)2
-rw-r--r--x11-libs/gtksourceview/Manifest2
-rw-r--r--x11-libs/gtksourceview/gtksourceview-3.24.11-r1.ebuild (renamed from x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild)21
-rw-r--r--x11-libs/intel-hybrid-codec-driver/Manifest8
-rw-r--r--x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch11
-rw-r--r--x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch39
-rw-r--r--x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch21
-rw-r--r--x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch13
-rw-r--r--x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch54
-rw-r--r--x11-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild53
-rw-r--r--x11-libs/intel-hybrid-codec-driver/metadata.xml18
-rw-r--r--x11-libs/libX11/Manifest10
-rw-r--r--x11-libs/libX11/libX11-1.7.3.ebuild40
-rw-r--r--x11-libs/libX11/libX11-1.7.5.ebuild2
-rw-r--r--x11-libs/libX11/libX11-1.8.1.ebuild (renamed from x11-libs/libX11/libX11-1.7.4.ebuild)0
-rw-r--r--x11-libs/libX11/libX11-1.8.ebuild40
-rw-r--r--x11-libs/libXScrnSaver/Manifest2
-rw-r--r--x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild2
-rw-r--r--x11-libs/libXcursor/Manifest4
-rw-r--r--x11-libs/libXcursor/libXcursor-1.2.0.ebuild22
-rw-r--r--x11-libs/libXcursor/libXcursor-1.2.1.ebuild2
-rw-r--r--x11-libs/libXdamage/Manifest2
-rw-r--r--x11-libs/libXdamage/libXdamage-1.1.5.ebuild4
-rw-r--r--x11-libs/libXpresent/Manifest2
-rw-r--r--x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild4
-rw-r--r--x11-libs/libXres/Manifest2
-rw-r--r--x11-libs/libXres/libXres-1.2.1.ebuild4
-rw-r--r--x11-libs/libXt/Manifest2
-rw-r--r--x11-libs/libXt/libXt-1.2.0.ebuild32
-rw-r--r--x11-libs/libXvMC/Manifest4
-rw-r--r--x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild19
-rw-r--r--x11-libs/libXvMC/libXvMC-1.0.13.ebuild2
-rw-r--r--x11-libs/libcryptui/Manifest3
-rw-r--r--x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch20
-rw-r--r--x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild7
-rw-r--r--x11-libs/libdrm/Manifest10
-rw-r--r--x11-libs/libdrm/libdrm-2.4.110.ebuild66
-rw-r--r--x11-libs/libdrm/libdrm-2.4.111.ebuild (renamed from x11-libs/libdrm/libdrm-2.4.109.ebuild)7
-rw-r--r--x11-libs/libdrm/libdrm-9999.ebuild4
-rw-r--r--x11-libs/libdrm/metadata.xml1
-rw-r--r--x11-libs/libfakekey/Manifest2
-rw-r--r--x11-libs/libfakekey/libfakekey-0.3-r1.ebuild4
-rw-r--r--x11-libs/libfm-extra/Manifest2
-rw-r--r--x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild4
-rw-r--r--x11-libs/libfm-qt/Manifest2
-rw-r--r--x11-libs/libfm-qt/libfm-qt-1.1.0.ebuild45
-rw-r--r--x11-libs/libfm/Manifest2
-rw-r--r--x11-libs/libfm/libfm-1.3.2.ebuild4
-rw-r--r--x11-libs/libnotify/Manifest7
-rw-r--r--x11-libs/libnotify/libnotify-0.7.11.ebuild63
-rw-r--r--x11-libs/libnotify/libnotify-0.7.12.ebuild2
-rw-r--r--x11-libs/libnotify/libnotify-0.7.8.ebuild61
-rw-r--r--x11-libs/libnotify/libnotify-0.7.9.ebuild63
-rw-r--r--x11-libs/libva-intel-driver/Manifest3
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r2.ebuild60
-rw-r--r--x11-libs/libva-intel-driver/metadata.xml3
-rw-r--r--x11-libs/libva-intel-media-driver/Manifest6
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.1.ebuild55
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.2.ebuild55
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.3.ebuild55
-rw-r--r--x11-libs/libva/Manifest4
-rw-r--r--x11-libs/libva/libva-2.14.0.ebuild2
-rw-r--r--x11-libs/libva/libva-9999.ebuild2
-rw-r--r--x11-libs/libwnck/Manifest2
-rw-r--r--x11-libs/libwnck/libwnck-40.1.ebuild2
-rw-r--r--x11-libs/libxcb/Manifest6
-rw-r--r--x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch86
-rw-r--r--x11-libs/libxcb/libxcb-1.15-r1.ebuild (renamed from x11-libs/libxcb/libxcb-1.14.ebuild)16
-rw-r--r--x11-libs/libxcb/libxcb-1.15.ebuild2
-rw-r--r--x11-libs/libxkbcommon/Manifest6
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild61
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild (renamed from x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild)4
-rw-r--r--x11-libs/libxklavier/Manifest2
-rw-r--r--x11-libs/libxklavier/libxklavier-5.4.ebuild4
-rw-r--r--x11-libs/motif/Manifest4
-rw-r--r--x11-libs/motif/motif-2.3.8-r2.ebuild109
-rw-r--r--x11-libs/motif/motif-2.3.8-r3.ebuild4
-rw-r--r--x11-libs/pango/Manifest9
-rw-r--r--x11-libs/pango/files/1.50.7-harfbuzz-4.patch78
-rw-r--r--x11-libs/pango/pango-1.50.4.ebuild84
-rw-r--r--x11-libs/pango/pango-1.50.5.ebuild84
-rw-r--r--x11-libs/pango/pango-1.50.6.ebuild84
-rw-r--r--x11-libs/pango/pango-1.50.7.ebuild10
-rw-r--r--x11-libs/pixman/Manifest4
-rw-r--r--x11-libs/pixman/pixman-0.40.0.ebuild16
-rw-r--r--x11-libs/pixman/pixman-9999.ebuild16
-rw-r--r--x11-libs/qscintilla/Manifest2
-rw-r--r--x11-libs/qscintilla/qscintilla-2.13.1.ebuild4
-rw-r--r--x11-libs/qtermwidget/Manifest4
-rw-r--r--x11-libs/qtermwidget/qtermwidget-1.1.0.ebuild31
-rw-r--r--x11-libs/qtermwidget/qtermwidget-9999.ebuild4
-rw-r--r--x11-libs/spread-sheet-widget/Manifest2
-rw-r--r--x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild23
-rw-r--r--x11-libs/startup-notification/Manifest2
-rw-r--r--x11-libs/startup-notification/startup-notification-0.12-r1.ebuild4
-rw-r--r--x11-libs/vte/Manifest5
-rw-r--r--x11-libs/vte/vte-0.66.2.ebuild92
-rw-r--r--x11-libs/vte/vte-0.68.0.ebuild2
-rw-r--r--x11-libs/xcb-util-cursor/Manifest1
-rw-r--r--x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild24
119 files changed, 873 insertions, 2112 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 53afdf28c448..e8cffe460813 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
Binary files differ
diff --git a/x11-libs/cmrt/Manifest b/x11-libs/cmrt/Manifest
new file mode 100644
index 000000000000..33c490b88dad
--- /dev/null
+++ b/x11-libs/cmrt/Manifest
@@ -0,0 +1,3 @@
+DIST cmrt-1.0.6.tar.gz 3717552 BLAKE2B 0bfb121f37b9b2e9e672d6129a6b7207ccfc3455ea613c8ae000965ee49260e56a154fba8595d8f3b022d153c9d84c7ded7b9f0914f7387eeca826acca9acfa0 SHA512 de115e86e4dc65e617e5e39dd1a14a4baa301480915d1ef31245b759acebbd2c85647e3affb9ccda3b55f7f9008b03d561689d2b63a61a70feba72c9a62b6505
+EBUILD cmrt-1.0.6-r2.ebuild 632 BLAKE2B 840c5711c6beefe93a8f67041b20cd2216a97dabc159ce0e0f49154932a7cc982156d20885356c46a0b66b34ff58b1c6ec6fe933060004da597bd529586690d4 SHA512 f5585b201895a7d77ccdfcf1462d2d6aa723e4d356a3e0e70f40fc2d033d592c36eb9ef536c47fc037d2ac37117ce1b99e5b3a2d866860ac6461f573fd925738
+MISC metadata.xml 578 BLAKE2B e5bd4b4ba88fb40cf5a699e9af6cc53e0daa380e690eaf33bc54840bf4dc53176f8c8f4c13320759409c0bff287eeb93704bddfb66d2243381ba8dea8846b76a SHA512 b7747429dfca4a8f3e7d1899e7846fe06235d97cf3a7e79385d1701e21538186b31819c777bc30954417338867de3057f37e3543c51744da49ad965fd5e6688b
diff --git a/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild b/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild
new file mode 100644
index 000000000000..055afcf4d2e6
--- /dev/null
+++ b/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Intel C for Media RunTime GPU kernel manager"
+HOMEPAGE="https://github.com/intel/cmrt"
+SRC_URI="https://github.com/intel/cmrt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ >=x11-libs/libdrm-2.4.23[video_cards_intel]
+ >=x11-libs/libva-2.0.0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/x11-libs/cmrt/metadata.xml b/x11-libs/cmrt/metadata.xml
new file mode 100644
index 000000000000..debd0b7111b7
--- /dev/null
+++ b/x11-libs/cmrt/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>media-video@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>kaichun.ning@gmail.com</email>
+ <name>Kai-Chun Ning</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">intel/cmrt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index c76f10d71e73..724ac3bd7977 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -2,5 +2,5 @@ AUX colord-gtk-0.2.0-optional-introspection.patch 1471 BLAKE2B 3d4ce65f6241538fc
DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f90eb96a3fedc6e30a1764d9c667cd82408116cdf65591496ab4e2f59f2b415cd1aa8f995fe2162ee4d649c5d496 SHA512 797eebfd4451fcae4cf70835f5de3d9bdc9e8401ddb82a2fef2310002f28bf523b599c587ff35eb89ceff38a245a6311129ad90b107f837ac4f42f268c9aad97
DIST colord-gtk-0.3.0.tar.xz 21768 BLAKE2B e6fe56dfa969f18bd406d481dd13e83b689a820aeddaf1482ec97e89a3f78d4228544c79849d330962f3d45e3506f1c0b2540ed7bfab36ede04008877d503b94 SHA512 95ea9e8925d56462b8e5230a6737ca8e75d2273b2803e00f7aa2f933d22f88373194dccc00117fce85579274cc0daf88876fa265510580b1610734bb45220896
EBUILD colord-gtk-0.2.0.ebuild 1349 BLAKE2B dcffb41a0c1a73a35a1c507a5003006e2a229eb2172226e8f7b0ecd3aca7d47b4d871ca7a607ba3149af15dcf60a9dd3bc3bff5a20fafb6636c65a50ced0b030 SHA512 367aa2ec128152ec52e99724945dc1edef7c327b048fb7bc2dc976439456b9a144b84ff59d8c7d360a23106027f1d3d345f9b0022fe0a3e0a5896c2b7d0442a7
-EBUILD colord-gtk-0.3.0.ebuild 1339 BLAKE2B 01b4736d28a271675f8bde597255b8310618fc3c498a5dbd05d832ad0530292f2a185a23c125f28c5b96adfedc4e2b8592128a613e74ed59b36bf4f96be1ce1c SHA512 c328717825ea64e9b58f08d0f63bdf8e9cb1ad3c7a8439b3a92832ea1393fb07fd13b9b1b502ccaabea612f93eb843954f680ac8ece93b83a2dfeafe9d454fa6
+EBUILD colord-gtk-0.3.0.ebuild 1346 BLAKE2B 24dccdf7a9a38ca99fa6c2563bca8f0808f284448247db5eb07a3fa2a0726dc4f656babd021be69a64b10fe0070f341d52e713ba031a5417375dd51d7bc7725d SHA512 a0d72df94656ca381d18a7641ff00636dbfe398dfeb66a2d022c32b708d4d96e75fe184e3db74ba0ab9ec2dbc8ee5599878c6781ae72ea89c531b74c4fa0c054
MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-libs/colord-gtk/colord-gtk-0.3.0.ebuild b/x11-libs/colord-gtk/colord-gtk-0.3.0.ebuild
index aa820d37ce64..f137d8e9244f 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.3.0.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
LICENSE="LGPL-3+"
SLOT="0/1" # subslot = libcolord-gtk soname version
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="doc +introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest
index 999f1bffa13d..f7c5eb38f26f 100644
--- a/x11-libs/gdk-pixbuf-xlib/Manifest
+++ b/x11-libs/gdk-pixbuf-xlib/Manifest
@@ -1,3 +1,3 @@
DIST gdk-pixbuf-xlib-2.40.2.tar.xz 53588 BLAKE2B a515e86bc69f59910f61fe9c275ab89c0732f0aa2cfb614ac94e597de420d25708a11b9b21313c7cfe3763434f45a8318412ae5889c24c8ed57dac68e09c0227 SHA512 246bcace03f4d7d694c4d08f28c7ad044cab63b5cf264b478ee1fe161499e7607c7ffeff93908f1f3b308e5108d78c4b51a3f90b79189d42a1a653c8edc53e37
-EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 861 BLAKE2B 2582da3fc4f5e959a328ce147636dcc33b827d3f3ee3fcceeb355bc01863c8e3fa48b80ae51cf43ee637a1decfa20c455627aaef6e732cf44a66957a9cce62bb SHA512 ea72a528bf800095f7643572f7b8a2355495162d856373cc47daa05125bd634f227eb3c3343414b577595b1af461a1d314b257920d429b0d7ce070248f23470b
+EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 868 BLAKE2B 5c3d436cbb1e33c1ab3405483f0185a15cfe2c579427589d5d12b984bf2762c2f014f75bfd40f14583e7a1f916c210b34b456578c99bb5ba6a7193f937ba9f8d SHA512 8d5a4f0eb16f0e6bea4ac2cd34f7f57f7a92710628a522ea96458f53260253f125852ebb732908e66b7b97d06e9936460ee8c9208a12e385a2d231f9f9beb7cd
MISC metadata.xml 337 BLAKE2B d3fca36ccca5e3d9ba2cef44bb628f26159eeb7c8ff6eb929e393f25b5873d5d315519b74d39731b4e5a5324bae20d1e2e134ef685e91c0ef5d91ad36630e533 SHA512 efcd88a724c035894d4dfed62d12ff4184929b240939dd9882a432d917d6ac5f8e1da324b19efa834b42bc27ae86cc3ecd6c80f140e9a51267e8662a9c5ef29b
diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
index 06630bfcffbb..cd08615fdce0 100644
--- a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
+++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"
LICENSE="LGPL-2+ MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="gtk-doc"
RDEPEND="
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index c3d86ffdc8fb..63fd365ea275 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,6 +1,4 @@
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
DIST gdk-pixbuf-2.42.8.tar.xz 8503020 BLAKE2B 39960043c5aa980f311d2705c868c170c90c7b580ac9ae849a3fdfc6a5faffcc24be23b82ca8fefb1cd5c28d2a02bfb87b1c5c5d1eab7b897f5e551a57577f7c SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387
-EBUILD gdk-pixbuf-2.42.6-r1.ebuild 3307 BLAKE2B 1fba64eace5724ce75edc53a499372559ed6602dbbe32871de052187e28c540393d6e403226dce86695807f7bf6d7376f1ff492ddce8b2f48a4fb8c4fc0f5215 SHA512 09f1bf11be4a9be92688a8747bea2891e2c49d50ebc8469576af3f95a9a07571e80d4fed35a83ecd3ab0e8c17169a92838d6f227a8a36d5488b10a18160b7d0f
-EBUILD gdk-pixbuf-2.42.8.ebuild 3467 BLAKE2B 871c6da3bb686d019add7a186a86fe9bae99a73cd30d9d4e0cf8d896fba0109ff0d0fb70b6c8d5e10feea9f68001bd1463eefb2b67ad8c18566dfe37258f3feb SHA512 dadd3c63c80817e4a79640a0891b5747cfc04c9c3b5be6b45279472adf5a86c978daf5ae11bb8963b0c8550fcf21ae7e467fdf86dcc410d163af410f5569e904
+EBUILD gdk-pixbuf-2.42.8.ebuild 3459 BLAKE2B 76c75c89dbaf850cb2943962ccf72eaab6c2ebb5bd78f4f3f214f64be80adf41f3204167aa2e6ce2be2cfb46d5917d50676f0a3ee54320956b914786cfc8e5dd SHA512 293bf38a0ca34fd3c9669e56631e0823aca22fd48308f94961c7acb32de7d7670d7302b43f486d3f93c49a86190a3fcc2df942342dc2d27d108103bbd732cf6b
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
deleted file mode 100644
index 08fd518be554..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 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/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
index 197b9021df0a..b4f614c7b16c 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="gtk-doc +introspection jpeg tiff"
# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 52cb88b951e6..64b259fc0b9a 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,3 @@
-DIST goffice-0.10.51.tar.xz 2432992 BLAKE2B 89da3c4707516884c13fed15f3ea04a60f871888469c7a119d42654f1470001bbcbc5a67bd46fcdb6af458ded0cb951a132cc60cd7861d6ebb762bdab1cf4311 SHA512 4d0e6c4c4c6c2f18b1e22c2b24d4034a693c1f6698e58589b83a956b9ff52d1ce05f1e7fdaab5c22c8c6f1d93b53c202f2505bdf9fddba646ef34c75fdb2f520
DIST goffice-0.10.52.tar.xz 2436944 BLAKE2B 13c2d28cd9bd081d4636325e3df14193d5ffad913f4f9fa78251d848f293eeca5ee265058b2c9662b5bd48957b39f31714eb41469f3228359dba1923f918bea5 SHA512 8636bdfd436a0b5853aead6ecf09ae39c5059b2d9044cf04c9f2e0f4d2572aaa07e51cfd123b0dd153877d1c0d5f4af78a031d63b03c724bf1e8282d2e1cc841
-EBUILD goffice-0.10.51.ebuild 1426 BLAKE2B c26a2b63209d72e576da5e60899e2e30351530a819e060d6adb5451660a1d5557b5a511030d7bffabf106d7dfe843b391b71b361c4691a00b515e58533daedca SHA512 97e0490875f3698a4405cc203fa87a7eaa3c7e336f6d71bb7de0cf411e24afc59a304fab9d45f9c16952af6f77269c3296fb6525cc97002a99e7432806d8a1dd
-EBUILD goffice-0.10.52.ebuild 1427 BLAKE2B 3524f72f80da0d858b23d8598d34d4b987b49d73bc33990489634696266471eb8332d9fceaf0af0ba477efe05b0271efddb8d7115e621be2e9fb4eb410888809 SHA512 7d3d4b895e36936e05c126861993f529fe84236deb6ede9426f80ee4b1439d0f672dbead9b619c550b0efb7a11120b9dbb7556efa0fb03fee6607b04c311df49
+EBUILD goffice-0.10.52.ebuild 1426 BLAKE2B c26a2b63209d72e576da5e60899e2e30351530a819e060d6adb5451660a1d5557b5a511030d7bffabf106d7dfe843b391b71b361c4691a00b515e58533daedca SHA512 97e0490875f3698a4405cc203fa87a7eaa3c7e336f6d71bb7de0cf411e24afc59a304fab9d45f9c16952af6f77269c3296fb6525cc97002a99e7432806d8a1dd
MISC metadata.xml 547 BLAKE2B d4d95fec4ee5b452af722544aeab368219ecd832def2458af565639cbed6e37807a8fd54dc388070bef89f6f277ac323f27cc397f9b469f60e02e001e12a91fb SHA512 b5b72cea3a76b2ce768510f32e7e4ac77a4af086671304a52f19897c54a3e8af1f36b625e590498bbb51da5c267af66ed979c8a27d9e0d6c4f4bfc7f78390326
diff --git a/x11-libs/goffice/goffice-0.10.51.ebuild b/x11-libs/goffice/goffice-0.10.51.ebuild
deleted file mode 100644
index d5051f0e3b5c..000000000000
--- a/x11-libs/goffice/goffice-0.10.51.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org libtool
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-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
-RDEPEND="
- >=app-text/libspectre-0.2.6:=
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/libxml2-2.4.12:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.22:2
- >=gnome-extra/libgsf-1.14.24:=[introspection?]
- >=x11-libs/cairo-1.10:=[svg]
- >=x11-libs/gdk-pixbuf-2.22:2
- >=x11-libs/gtk+-3.20:3
- >=x11-libs/pango-1.24:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- introspection? (
- >=dev-libs/gobject-introspection-1:=
- >=gnome-extra/libgsf-1.14.23:=
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-lang/perl
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.12
- >=dev-util/intltool-0.35
- virtual/perl-Compress-Raw-Zlib
- virtual/perl-Getopt-Long
- virtual/perl-IO-Compress
- virtual/pkgconfig"
-
-src_prepare() {
- default
- elibtoolize
-}
-
-src_configure() {
- econf \
- --disable-gtk-doc \
- --disable-maintainer-mode \
- --without-lasem \
- --with-gtk \
- --with-config-backend=gsettings \
- $(use_enable introspection)
-}
-
-src_install() {
- default
- dodoc MAINTAINERS
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/goffice/goffice-0.10.52.ebuild b/x11-libs/goffice/goffice-0.10.52.ebuild
index 2bcc131cd893..d5051f0e3b5c 100644
--- a/x11-libs/goffice/goffice-0.10.52.ebuild
+++ b/x11-libs/goffice/goffice-0.10.52.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
LICENSE="GPL-2"
SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 09c7be06c98f..1e0df9f3e83e 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -6,13 +6,7 @@ AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2
AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
-DIST gtk+-3.24.31.tar.xz 22449112 BLAKE2B 2a09b199ad88ab8006e8d768ff6d2c5ddbdd22f84aa7d661e8e25f87a7436135edf0116202574a092536d3293800d83d9dcf1affff27e9baedeb27d31291e6a5 SHA512 e7f8e5003a919e297bd3e616acccbc5cc9bf9c9d41377c108c24db51817fcccec919abc12d05c0ed585d49526d52f0395a1c0f3ed9d9ef816bb0c4b2aa615f9b
-DIST gtk+-3.24.32.tar.xz 22443900 BLAKE2B 0a07f4159d8c09dc46b22a98398020bf164a0a29ff4bc41aea158d697d95362b74558c9605eaafab366500cfeade9b8794baa980dd3023f71336ae8c49e1e4d7 SHA512 326640621b8aca59e9e46282c19b7a88f15469436e39bde7b845028014f245f23fef482db3589a7dbded20fcc82ec3adac66b837472f2b8c3016d285d38582c4
-DIST gtk+-3.24.33-add-legacy-icons.patch 157847 BLAKE2B 298a872d876421bb0d34f897b5d65984be768f623f294f0dd98e722df16ca2177c417e9508aa14fb81c75e3ff24981e018739d398748b62ae5450804f3286cee SHA512 a11b1e30a67214fbd65182efa0a7c1315a6fe75426d211a48678e5b4c13799b389b487e07b07b7a7044b7d3e277f7342a9842819e53176674ec71668481b9976
-DIST gtk+-3.24.33.tar.xz 22449472 BLAKE2B 7fb75393ecd0a932ed5ef6ea3c694e61dec237403e87addca3bbfdcc1dd8dcd4646d11fab3f0a8b7717bfb8c0c64926132a5aa8b1009e8c20f656c6eaa593c1b SHA512 35c844af67d442a9d55197028c6b660668c701ad8f83a64791669fca2930ada15194452b59b2ee11f8068098986218744fe9fc4742897af5a6b3eba23c98395e
-EBUILD gtk+-2.24.33.ebuild 9805 BLAKE2B e24f2718c012a86e34aec536e34afe919ad526721fc5cc2e9e5df3f92e3820c416a871110ea8f819838f44564d30dc4ff43cd0e4884ec9e8754a6e9ead006de5 SHA512 9cfbfdd0a24c78471d9917478685402706c9db097bf4c898db851afa61cc5335e6cf57c2c06e53a827d55ad5c1e1dbdf2d03b6003a517447dbf7e52249b49a8c
-EBUILD gtk+-3.24.31.ebuild 7203 BLAKE2B 7ad891b9fa23e198e2f76273cb60bcfd5a8d9acb24fcfe9b1d28ac7d87cf2e4f608d64c73b1efbea57cd7d99d094990f8b112e17a4202a4123df6438c85efd4c SHA512 54c803ca8a4fae72e45726dbaa570bbc050ec4d081f424953a883fc6e4a8414139851c05c86cb21f0035c979f440e8106997569104a98c1c9139b96c4f56ff8e
-EBUILD gtk+-3.24.32.ebuild 7211 BLAKE2B 79d8cf2baeaa79731fb74c2de6d17662cf952ddd0975b4e64ea45e28dd789a29c47cd3bf713228600ccce03a46a392ef3ef73bda600213a30a59cc94f0468f21 SHA512 d0cc7ebd356d006a41f085e98cfad987f9e95dba5983d575fa82914a1e3c8c2225f67258296b2c9b805f9fb4232882c9c002d4047c5d5d6eda9e8cb0d52600da
-EBUILD gtk+-3.24.33-r1.ebuild 7531 BLAKE2B 927539cc0a26b238c22008ffa14da8fb38303fc651139e7d4a436bbcf4926c34aec7ca45459cd2dd41a63299365d4882efa67b0203811c5b442b3526a0e894a6 SHA512 8cd880c427299e02bce720d210743aaf06de1683a3eddf85d3e9375be882ce4d99fd6f937868b4acdc36cca35ecbdf34ebe9f41ed7b508e6fadf3a9d648894dc
-EBUILD gtk+-3.24.33.ebuild 7211 BLAKE2B 79d8cf2baeaa79731fb74c2de6d17662cf952ddd0975b4e64ea45e28dd789a29c47cd3bf713228600ccce03a46a392ef3ef73bda600213a30a59cc94f0468f21 SHA512 d0cc7ebd356d006a41f085e98cfad987f9e95dba5983d575fa82914a1e3c8c2225f67258296b2c9b805f9fb4232882c9c002d4047c5d5d6eda9e8cb0d52600da
+DIST gtk+-3.24.34.tar.xz 21587592 BLAKE2B 708e03ee9e62f1a1742faffb63a352ec2d90a1dc46a4e0162e343bf68355ab80fbd30c1f2261b5e5339cbb66a02cfb48addbc5ecbc2b8a37f97aae86c5af1405 SHA512 95af4441b53be175acf16121a90b1db7a152cbfb3e5ed2dffc59f622b2eb5a4d74720ae8e05dc1421b6b23588f28e09e0f153f0b92777c836f522881720fb0a2
+EBUILD gtk+-2.24.33.ebuild 9812 BLAKE2B 1bd8eceeb91f7e4a0e309c9581ddf7b156101fab889fa7c1004025c5d00223f3940054a733071a2cad587df202063625b543093fac99c62410fcb62079a26ecb SHA512 678eb1fba4c42c0f85429a406a31162d04946c8c600bfc72fb6d2f64077e2531fc9f86bb998d0a1291495c784cf162a5ca9cc8765837ac4910762c2805dfef2f
+EBUILD gtk+-3.24.34.ebuild 7210 BLAKE2B 3799ca10c40eb663a702d67a1122632f299fe63de84db2fa5020eb2dd7ff6c90064b2a9c193cbcd6fa1626dfd13f13383d946ea2af4ee78bc3e6426eb35a122d SHA512 781af7ed4c236845b2f49f7416d4152227abee4784078f883fc73e9d5540c54b78f8291899beeb4a1b09718d5a7e6173dbdef27cd2b7eb69625c943103c5da24
MISC metadata.xml 875 BLAKE2B 40b9f97f4db18f276bb80587843146c5227b5b803306da704ad99f8c7c34fb22cddbfb9f1df3395e2288ed258970851cb9d100f40b846f95d414e2b47ab78f99 SHA512 02b9c2674783308f54bde4d983185d36b372f64f1ee5d9d2cd797fe1158e3653a1edb8ece51a0be143775e9b85d71d4375769e2682778a9286fff42cbf18836b
diff --git a/x11-libs/gtk+/gtk+-2.24.33.ebuild b/x11-libs/gtk+/gtk+-2.24.33.ebuild
index fbb6af20074a..bce6a0119550 100644
--- a/x11-libs/gtk+/gtk+-2.24.33.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ REQUIRED_USE="
xinerama? ( !aqua )
"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.32.ebuild b/x11-libs/gtk+/gtk+-3.24.32.ebuild
deleted file mode 100644
index 52be7e73169b..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.32.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 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-2.2.0:=
- >=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.44.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.8[${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+/gtk+-3.24.33-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.33-r1.ebuild
deleted file mode 100644
index 87d3ef82b019..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.33-r1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2022 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/"
-
-SRC_URI+=" https://gitlab.gnome.org/GNOME/gtk/-/commit/5a0ffbbb4568e39bdf26006e1bf18c1c1d0d597a.patch -> ${P}-add-legacy-icons.patch"
-
-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-2.2.0:=
- >=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.44.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.8[${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 )
-"
-
-# dev-vcs/git to apply the binary patch in SRC_URI, should be dropped on next release (3.24.34)
-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
- )
- dev-vcs/git
-"
-
-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
-
- # bug #835966
- git apply "${DISTDIR}/${P}-add-legacy-icons.patch" || die
-
- 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+/gtk+-3.24.33.ebuild b/x11-libs/gtk+/gtk+-3.24.33.ebuild
deleted file mode 100644
index 52be7e73169b..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.33.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 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-2.2.0:=
- >=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.44.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.8[${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+/gtk+-3.24.31.ebuild b/x11-libs/gtk+/gtk+-3.24.34.ebuild
index 4a67c000408c..f56fa35464c7 100644
--- a/x11-libs/gtk+/gtk+-3.24.31.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.34.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index d36a937bbf56..964b4897ac4a 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -5,6 +5,6 @@ DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb8
DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
DIST gtksourceview-4.8.2.tar.xz 1164876 BLAKE2B 3e6269b4e6a7147d5f4e0ed2096514a0e0bc29a928b73c0cd12eb207f2627c9eadde55ee81183b2a67fe5380fcd96c2335283a1f3da3f06303b7d2b65b49a09a SHA512 6951b9477b1e47b1b25756aef246630c948e8dd212b1b0e13f87ef4f56f39b59b02db3fd18315869e98acfc6454de13cfffa6eeb8fe1cd030dfd537b5f710a04
EBUILD gtksourceview-2.10.5-r3.ebuild 1317 BLAKE2B 80f626e2a5ded1e372760139354bc61a36c64620a2476c385f24e44d8711536ab162ed299b016fa1e4734afea2a48aa1346507b0c265440857bba8b0740bf406 SHA512 796445765875a51c6467d3a80a20007d892f40c0d71a5c8b768dcc2738f091b46f24e37d9fb45715152a72bfb709b6fa272c9f973ce22eafecbf5fa01a20e15e
-EBUILD gtksourceview-3.24.11.ebuild 1279 BLAKE2B d4e7fb2cccc4d617b9c6a3fe8cc11ecbaf6c3907df32b1251bdc56819b4e85cb945dc224e9c468f69d7077f8645e135b0aa98815bda7339ad553f9f85dfd0dd2 SHA512 2ab149f2e157beada8d782292d96e6aa117364c7815cf83b7f847c46c652442baa0409e12531786b0dcbbf176bdfd634a13f513f28390a9d90b9458e993de145
+EBUILD gtksourceview-3.24.11-r1.ebuild 1221 BLAKE2B 8f07e18a7443d3e7802d4da2f7c3faa7791eb55d2440a9be3a7d60edf7de3edf03274ce01e2391d812cf773fd9469a31e2588ecd069696076da35307fe2ad3d0 SHA512 f764ec43144157e7354f996a78d09c22c3de1933b3ecc1b529123d0369a8948d8a9e798b048588351ddcbe3bf9a315ef72a41a1ba809698861aafca8dbc723a1
EBUILD gtksourceview-4.8.2.ebuild 1751 BLAKE2B d20f94cd5f313cf4fed081b8ac6a39894ef809e14e9f3eeeb7822a27ac42833aa1af048ce57e1fc5d5ef93103d93a363ae7349bd380222303295945ac94e09b1 SHA512 738aec48327b3c17fafdf334b5b031fed2e962b518864dfd354074fbf29efad73a8438c51475f102661ac4a1ade9b872fb33ffb73e124613234968da8b4d9cba
MISC metadata.xml 319 BLAKE2B 383670a9fec1362b5c4cc12cc93d8f94140d3ba3c09ac64f125de13ea990d4fbaad7eae555c864dc18b1c5f1ddcf631e1125d161cffdea9fa97d76f775f42d7b SHA512 dabf9cb57c228ea197a473292336bad77024b7ea122c121a385755096201097215925bb8281359d3cfcdf7879d80c93d522b6f9dd08b5a33df826b8c310ce074
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11-r1.ebuild
index 7db2b001cb01..2d10514bfb83 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-VALA_MIN_API_VERSION="0.24"
-VALA_USE_DEPEND="vapigen"
+EAPI=8
+VALA_USE_DEPEND="vapigen"
inherit gnome2 vala virtualx
DESCRIPTION="A text widget implementing syntax highlighting and other features"
@@ -12,12 +11,10 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="3.0/3"
-
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="glade +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
RDEPEND="
>=dev-libs/glib-2.48:2
>=dev-libs/libxml2-2.6:2
@@ -25,7 +22,8 @@ RDEPEND="
glade? ( >=dev-util/glade-3.9:3.10 )
introspection? ( >=dev-libs/gobject-introspection-1.42:= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.25
>=sys-devel/gettext-0.19.4
@@ -33,12 +31,9 @@ DEPEND="${RDEPEND}
vala? ( $(vala_depend) )
"
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
src_configure() {
+ use vala && vala_setup
+
gnome2_src_configure \
$(use_enable glade glade-catalog) \
$(use_enable introspection) \
diff --git a/x11-libs/intel-hybrid-codec-driver/Manifest b/x11-libs/intel-hybrid-codec-driver/Manifest
new file mode 100644
index 000000000000..d2ef44d28918
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/Manifest
@@ -0,0 +1,8 @@
+AUX intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch 460 BLAKE2B 94a225338835403788383b845ec4048608966170671944f73975dbee3e95ae49c943a32fbec0d59008f230186342fafb27af1f214664cd6f239f3d4eebb45a1c SHA512 bebaa765d3d97c5568fccfaa465fb13b717681b1846acce94dc7b45ba9ea48f017fce125f937b433e2eeec63985e3a555748277fedf8777ca0693acee78a4fed
+AUX intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch 1672 BLAKE2B 94e08496fd654fcb57d083ab72311ac29791ad488f2d55d92aba63b872a526563e015a3dfa48ebef957fed18372bf6e3be068e42bfa571c585d76bc1a42bfb01 SHA512 7efb4c30078b2c03f5ff15c48983d68971e95f0ae9eb637953b7ce972c21fb66ec04cbf30862ec2bc3200703d4d8994678022497c7a85a644404bf2f71095291
+AUX intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch 907 BLAKE2B a894473043bf929d21bac2cfaacab5c3404dc82f1019c96909ab328be946c31034ba6cb5cd9ea60a234f3f0b44c6b48c49c49499f2c7cb7a34885237540dcbea SHA512 b450126fd487cee7b157ff08f01e83dbf8ed571f6938ff84e5c71fff174ff6b0826e7ce02b2604a58ce38baf7a6e0eb93cc430f719b02de1630bda499f4a8930
+AUX intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch 447 BLAKE2B bcb9c088436c468732eb33991e2db50efe5bc51ab3ecbd1da814c71379ecf13980f53b327ed93022e0a83967fd1864ca08e707d0b22c0c1a41e4b63e9840c894 SHA512 440e909ad090d7fd5d07fcccbd288c9422c32df38704ec24f8ce513341229023a288638828b63f2174afd6460be79abc158b528a10f33fcb81f9f9cfcab4dbd8
+AUX intel-hybrid-codec-driver-2.0.0-x11-fix.patch 1915 BLAKE2B e203b5573494d7da4d1f17841a41c396012638f3bdea01796b821ea63f4fc4dadf9aebdd9c78cd2c613773528f8dcb719ff2f9c61dee2eca7e48896339579106 SHA512 bc9f985370a94e9dd1e41d9c091a5ed0a59c225094b8e16a4d669086aaef59b50e597ad4584d6a04f00a5095439896023fa5a2b901441d778cf2468f358a2b0a
+DIST intel-hybrid-codec-driver-2.0.0.tar.gz 1332637 BLAKE2B c02a54a12ad3b9d35bd4e15f9ffaecc8cd33750ab2eea73c8e4140ada1c666cd9a2b43725b44a22050f8140ffe2810ca87802854afb4c251cb879f219da8db6b SHA512 1d4e2c41d30892e07a3d2c83977725fca6fc20d887bead41109a0936fa9b4848131e4460cca8efe792f2815fcc9622d38d0a5e117a54403708e1132f1112d37a
+EBUILD intel-hybrid-codec-driver-2.0.0.ebuild 1229 BLAKE2B eb6d0f94a3797d239d9254b3cd6f48cfc8a4b3541232c390994c5533cc4d3dafa02f1d9a443709238f8b2b96a31e0a7b44a5b3708a9d2245177c4b77e147641e SHA512 d329b01f8d154a38bb8e9be381232e0f22a74c93a106bbef50463d2f28ba6018b1be1e7d1ff8b83086b70fcc3e8b6499549a42e018f2f49f4e697afca365d147
+MISC metadata.xml 593 BLAKE2B e6fcb9ac5b9b51f1c2b03f03a221b8333a190c7ba1b7ea36de4a1e4d61ef1e9593784ed6d500de87f618d286d3a921fa59f1a0482185677ce2bb961b3abdeac0 SHA512 ebe0afe41278366116f6e7a12039de8f09961fee1807370a63e0e459fceefbe6fca67a5fdfcb3f3892e457b8d211a6b48b48d6f335e197b61a86d2f33ac03779
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch
new file mode 100644
index 000000000000..0c170579857f
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch
@@ -0,0 +1,11 @@
+--- intel-hybrid-driver/src/media_drv_common.h 2020-05-26 23:18:02.279795861 +0100
++++ intel-hybrid-driver-new/src/media_drv_common.h 2020-05-26 23:19:11.316101524 +0100
+@@ -39,6 +39,6 @@
+ #define BRC_INIT_IGNORE_PICTURE_HEADER_SIZE 0x2000
+ #define BRC_INIT_DISABLE_MBBRC 0x8000
+
+-UINT SEARCH_PATH_TABLE[2][8][16];
+-UINT ME_CURBE_INIT_DATA[30];
++extern UINT SEARCH_PATH_TABLE[2][8][16];
++extern UINT ME_CURBE_INIT_DATA[30];
+ #endif
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch
new file mode 100644
index 000000000000..e410a8cc89c5
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch
@@ -0,0 +1,39 @@
+diff --git a/src/media_drv_gen75_render.c b/src/media_drv_gen75_render.c
+index a3d60ff..51b1442 100644
+--- a/src/media_drv_gen75_render.c
++++ b/src/media_drv_gen75_render.c
+@@ -1453,7 +1453,7 @@ media_drv_gen75_render_init(VADriverContextP ctx)
+
+ if (IS_HASWELL (drv_ctx->drv_data.device_id)) {
+ memcpy(render_state->render_kernels, render_kernels_gen7_haswell,
+- sizeof(render_state->render_kernels));
++ sizeof(render_kernels_gen7_haswell));
+ render_state->render_put_surface = gen7_render_put_surface;
+ render_state->render_put_subpicture = gen7_render_put_subpicture;
+ } else {
+diff --git a/src/media_drv_gen8_render.c b/src/media_drv_gen8_render.c
+index 42005ea..da349cc 100644
+--- a/src/media_drv_gen8_render.c
++++ b/src/media_drv_gen8_render.c
+@@ -1741,7 +1741,7 @@ media_drv_gen8_render_init(VADriverContextP ctx)
+ render_state->max_wm_threads = 64;
+
+ memcpy(render_state->render_kernels, render_kernels_gen8,
+- sizeof(render_state->render_kernels));
++ sizeof(render_kernels_gen8));
+
+ kernel_size = 4096;
+
+diff --git a/src/media_drv_hw_g75.c b/src/media_drv_hw_g75.c
+index 57eddbd..080cd86 100644
+--- a/src/media_drv_hw_g75.c
++++ b/src/media_drv_hw_g75.c
+@@ -3325,7 +3325,7 @@ media_set_curbe_vp8_me (VP8_ME_CURBE_PARAMS * params)
+ MEDIA_CURBE_DATA_ME *cmd = (MEDIA_CURBE_DATA_ME *) params->curbe_cmd_buff;
+
+ media_drv_memcpy (cmd, sizeof (MEDIA_CURBE_DATA_ME), ME_CURBE_INIT_DATA,
+- sizeof (MEDIA_CURBE_DATA_ME));
++ sizeof (ME_CURBE_INIT_DATA));
+ me_mode =
+ params->
+ me_16x_enabled ? (params->me_16x ? ME16x_BEFORE_ME4x : ME4x_AFTER_ME16x) :
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch
new file mode 100644
index 000000000000..84562584b6a2
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch
@@ -0,0 +1,21 @@
+diff --git a/src/vp9hdec/decode_hybrid_vp9.cpp b/src/vp9hdec/decode_hybrid_vp9.cpp
+index 1baf339..7a086e2 100644
+--- a/src/vp9hdec/decode_hybrid_vp9.cpp
++++ b/src/vp9hdec/decode_hybrid_vp9.cpp
+@@ -3289,9 +3289,16 @@ VAStatus Intel_HybridVp9Decode_HostVldRenderCb (
+
+ // Reset padding flag of current frame and update surface dimension
+ surface = SURFACE(pMdfDecodeFrame->ucCurrIndex);
++ if ((surface == NULL) || (surface->private_data == NULL))
++ return VA_STATUS_ERROR_INVALID_PARAMETER;
++
+ pFrameSource = (INTEL_DECODE_HYBRID_VP9_MDF_FRAME_SOURCE *)(surface->private_data);
+ pCurrFrame = &(pFrameSource->Frame);
+ pFrameSource->bHasPadding = false;
++
++ if (pCurrFrame->pMdfSurface == NULL)
++ return VA_STATUS_ERROR_INVALID_PARAMETER;
++
+ pCurrFrame->pMdfSurface->SetSurfaceStateDimensions(
+ pMdfDecodeFrame->dwWidth,
+ pMdfDecodeFrame->dwHeight);
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch
new file mode 100644
index 000000000000..5177e1448539
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch
@@ -0,0 +1,13 @@
+--- intel-hybrid-driver/src/media_drv_init.c
++++ intel-hybrid-driver-new/src/media_drv_init.c
+@@ -2764,9 +2764,9 @@ va_driver_init (VADriverContextP ctx)
+ return ret;
+ }
+
+-VAStatus DLL_EXPORT __vaDriverInit_0_34 (VADriverContextP ctx);
++VAStatus DLL_EXPORT VA_DRIVER_INIT_FUNC (VADriverContextP ctx);
+ VAStatus
+-__vaDriverInit_0_34 (VADriverContextP ctx)
++VA_DRIVER_INIT_FUNC (VADriverContextP ctx)
+ {
+ VAStatus ret = VA_STATUS_ERROR_UNKNOWN;
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch
new file mode 100644
index 000000000000..2422e4d1721b
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch
@@ -0,0 +1,54 @@
+From b3b4d9a3a08d48bf6022723908a22255cc271ab7 Mon Sep 17 00:00:00 2001
+From: Daniel Charles <daniel.charles@intel.com>
+Date: Fri, 4 May 2018 09:56:10 -0700
+Subject: [PATCH] driver_init: load libva-x11.so for any ABI version
+
+with libva > 2.0.0 hybrid driver can operate with it as well
+so make this load generic to libva installed version
+
+Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+---
+ src/media_drv_output_dri.c | 10 ++++++++++
+ src/media_drv_output_dri.h | 2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/media_drv_output_dri.c b/src/media_drv_output_dri.c
+index 42299b8..bbd9713 100644
+--- a/src/media_drv_output_dri.c
++++ b/src/media_drv_output_dri.c
+@@ -105,6 +105,15 @@ media_output_dri_init (VADriverContextP ctx)
+ struct dri_vtable *dri_vtable;
+
+ static const struct dso_symbol symbols[] = {
++#if VA_CHECK_VERSION(1,0,0)
++ {"va_dri_get_drawable",
++ offsetof (struct dri_vtable, get_drawable)},
++ {"va_dri_get_rendering_buffer",
++ offsetof (struct dri_vtable, get_rendering_buffer)},
++ {"va_dri_swap_buffer",
++ offsetof (struct dri_vtable, swap_buffer)},
++ {NULL,}
++#else
+ {"dri_get_drawable",
+ offsetof (struct dri_vtable, get_drawable)},
+ {"dri_get_rendering_buffer",
+@@ -112,6 +121,7 @@ media_output_dri_init (VADriverContextP ctx)
+ {"dri_swap_buffer",
+ offsetof (struct dri_vtable, swap_buffer)},
+ {NULL,}
++#endif
+ };
+
+ drv_ctx->dri_output =
+diff --git a/src/media_drv_output_dri.h b/src/media_drv_output_dri.h
+index 0d6ccf0..889861c 100644
+--- a/src/media_drv_output_dri.h
++++ b/src/media_drv_output_dri.h
+@@ -30,7 +30,7 @@
+ #define _MEDIA__DRIVER_OUT_DRI_H
+ #include <stdbool.h>
+ #include "media_drv_defines.h"
+-#define LIBVA_X11_NAME "libva-x11.so.1"
++#define LIBVA_X11_NAME "libva-x11.so.2"
+ VOID media_output_dri_terminate (VADriverContextP ctx);
+ BOOL media_output_dri_init (VADriverContextP ctx);
diff --git a/x11-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild b/x11-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
new file mode 100644
index 000000000000..860feeb69f61
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_64 )
+EGIT_COMMIT="edead0c17e2818bc0fee0ea644f85ab81bbe6f7a"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Libva support for partially hardware accelerated encode and decode on Haswell and newer"
+HOMEPAGE="https://github.com/intel/intel-hybrid-driver"
+SRC_URI="https://github.com/intel/intel-hybrid-driver/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/intel-hybrid-driver-${EGIT_COMMIT}"
+
+KEYWORDS="~amd64 ~amd64-linux"
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ >=x11-libs/cmrt-1.0.6
+ >=x11-libs/libdrm-2.4.45
+ >=x11-libs/libva-1.0.16[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gcc10-fix.patch"
+ "${FILESDIR}/${P}-vadriverinit-fix.patch"
+ "${FILESDIR}/${P}-x11-fix.patch"
+ "${FILESDIR}/${P}-nullptr-fix.patch"
+ "${FILESDIR}/${P}-invalid-read-fix.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=(
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ default
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/x11-libs/intel-hybrid-codec-driver/metadata.xml b/x11-libs/intel-hybrid-codec-driver/metadata.xml
new file mode 100644
index 000000000000..b93334ee2543
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>media-video@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>kaichun.ning@gmail.com</email>
+ <name>Kai-Chun Ning</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">intel/intel-hybrid-driver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index e56206974a53..b0ccffa63c34 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,9 +1,5 @@
-DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
-DIST libX11-1.7.4.tar.xz 1872992 BLAKE2B 6a25e5008ead53be5af7411f51711789eb410473f9aefc49fb4d0bf7227b89c5fd71f0f61fef9bc3f83e585e4815644f42884d5e5cf0bdcdd120abe6fe8a741b SHA512 8bfaaf9fc3081c47152d533d30cdc0b2521bfeb088ff813b041c08ffd518c80ba3725bb68cac7c21b521a4bace546f99424700fe21955b498015d14c2f7f9a57
DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
-DIST libX11-1.8.tar.xz 1782508 BLAKE2B 15a41cbcdb54d68cd54b6fa4147d55d277a6c091af7d38341ec261b42c547acf981270ceebec5abb3fcc15da5c1e05b7908114e157555f8184234922e3c05fde SHA512 64899ba9efbda00211daf08534a2a98eba86bb377980d21ce319106075cd36b511b17245d02e8ebd1045e7c2147f2c005004bcf579121138be7a7b879eeca83b
-EBUILD libX11-1.7.3.ebuild 931 BLAKE2B d27af79560a6b919d117482959f3b33602025477821be40a1f1a63a53114608d726cdc561ca1c774341c9100949bd534a044dc3366d2a1fb422f15fd817b5c85 SHA512 d37cfe03fc06a48e09812118671f3fb9070ab388ba95025fdfd8bb35c68e0bcd775285aa22b5d07e62454639abe7c3ee773ea087b31a27313adcbbd005f6a5cd
-EBUILD libX11-1.7.4.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
-EBUILD libX11-1.7.5.ebuild 942 BLAKE2B a019b96ff82d02d804c782e7e5e541e27eb0fa7455164b176d3e421ae26545404cf48fc0ef161f6fdd9b00904c2a14d9cc3532a8192a99106e61d1c69d30ad55 SHA512 3b36ea0ae17ea8b9f176c127425c8a306eda1ce06528536f218de28dc653b070101a4125bd611454387a0dcc48b9312a1b3f6eb447ec0130c092494a4e990c66
-EBUILD libX11-1.8.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
+DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
+EBUILD libX11-1.7.5.ebuild 938 BLAKE2B 6559a7c7633d55efa6774d3b0d100a289e060a32c53cff2fb1c7dcaeffa2119058eeb8aeb1b0ff1d13dfca02fe07086c9d42071233388ede0a5b5f9a74b5bff9 SHA512 340786682d8218feb524815a1813af189f21d5a4b100e3fb61c399afff7897298a34aff2bbe8f6efe96ca9899b89f1e5acc2515f21e9277aad7c423b319f2d32
+EBUILD libX11-1.8.1.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
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
deleted file mode 100644
index 348c3207fb78..000000000000
--- a/x11-libs/libX11/libX11-1.7.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 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 ~m68k ~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/libX11/libX11-1.7.5.ebuild b/x11-libs/libX11/libX11-1.7.5.ebuild
index 61df0cf6e2d9..30015bc8dc2d 100644
--- a/x11-libs/libX11/libX11-1.7.5.ebuild
+++ b/x11-libs/libX11/libX11-1.7.5.ebuild
@@ -11,7 +11,7 @@ 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="ipv6 test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libX11/libX11-1.7.4.ebuild b/x11-libs/libX11/libX11-1.8.1.ebuild
index 34171b8bc0c2..34171b8bc0c2 100644
--- a/x11-libs/libX11/libX11-1.7.4.ebuild
+++ b/x11-libs/libX11/libX11-1.8.1.ebuild
diff --git a/x11-libs/libX11/libX11-1.8.ebuild b/x11-libs/libX11/libX11-1.8.ebuild
deleted file mode 100644
index 34171b8bc0c2..000000000000
--- a/x11-libs/libX11/libX11-1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 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 ~m68k ~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/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 26aa8c0dd9c2..aaa9fbf87433 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.3.ebuild 498 BLAKE2B 5b5981706bc90f52576ec96fc7fc4dda1f7e70bad2f1d85db94912fcd92f5277e1dda03f66f299a3d31d57319bbc5b90e142d1112719fe6b513069c6fadb02a8 SHA512 857ad5e0a332e84b445966ca7762b9abd9c7a5eacb006a632a9b3b668d21e939dd3ad3ec0e30cc85480bbbffbd0a76f3137f20e9dc7d23e6fcccffcd9a9abd83
+EBUILD libXScrnSaver-1.2.3.ebuild 505 BLAKE2B 1cf5c8e85118fff5b523b2ededaf33c90b54d2570bf47734d7b65cb8eae0b23570714f6d731cd997cbfde6850fb984db536abeee9daf4da11440756a3cb52d8c SHA512 2f72ec0d033e2ac812fada24512eea8aa40646a22d03438684666545b8d0d607359c7d899da87497f151fbd24dd8209ac4c279bfe7a8e367c2f17dd3b3eb7617
MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index 183ea173d5cb..90def7debeee 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 01d2541ad531..699f40797fa0 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,5 +1,3 @@
-DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
DIST libXcursor-1.2.1.tar.xz 280352 BLAKE2B 5c59a43d9cdaaab887ef7ffbe836534508e3542959dd5011c08e46db1d5e4de6e7ee47b1574eb1bd2aebc8baa8fe401e5195fa73bb2ab47b779dbd03af4bbf4a SHA512 ebb42a39855aab86d0c11fe6ad33d011cf56a6dc5c309bef643460319c03df239b7e09fe88777bb25c0e9ff8aceac6bf66e51cc04a2d5ee463b3bc3bbf1674e3
-EBUILD libXcursor-1.2.0.ebuild 887 BLAKE2B 3556729903c8d63bfba3d1e40ae86ba71812a740467bc0485847c2fd4611d00624ba2a138bb07bae79facb1d16ccbafe2f0ccaa5f6b099a0262aa30f7608f898 SHA512 8141cc2c6c1a704b1ca7b33828ceae7dc0e0e0c5b5663076c5b489acf6dcfcf0e52e409277ebffe01583a603b1e07bb2c348c3cffc3c2ae0daa49d9aedbc3656
-EBUILD libXcursor-1.2.1.ebuild 935 BLAKE2B 0ab8bcb99f49775f3bbacfda1c12eeb82349598e99bea2793cd7b2130d176e7ed36a0b7b1a3c2554f515ec872813c0c57be7ead52fe92c85b4b289f834be79a3 SHA512 28882165f1e65375eb0e9800272d458fbd121c2ff7e580ab209e8ea264aad583d643d5eac195888b0943077b4479e74dd0c7092b8440846c35178e1a6609c8ac
+EBUILD libXcursor-1.2.1.ebuild 938 BLAKE2B f1c19a8c8b0dbf8e9e84e0c81a8494398cfaa3877eb81cad39c5b63dd0f00765ebe720f67b80c1f83cb79aff318c9f60956e56cfb330ba2ad5e5dc79b4370a9b SHA512 a6eca0db489a7913b7380d5b902c09d7c299fca00084bd2af504db5c1b0e9319083956f2d2e57569bacafc2ed01c7a2b6bc8bbd12757b8d117b879082b9130e2
MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
deleted file mode 100644
index 6a7647d50d38..000000000000
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xcursor library"
-
-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 ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
- --with-icondir="${EPREFIX}"/usr/share/cursors/xorg-x11
- --with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-)
diff --git a/x11-libs/libXcursor/libXcursor-1.2.1.ebuild b/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
index e063eeea3029..9a3ebe6dd3d0 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xcursor library"
-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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index 68e47e98ce1d..816eb0a5b1b0 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,3 +1,3 @@
DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
-EBUILD libXdamage-1.1.5.ebuild 509 BLAKE2B 0bccfbcd440dfde94533275b984ba0f7700fcbb8e66e681f17456e7afe0daee55484e88cea83f0ce1e663fff20d9a6276b4bccfe83a5ae3359d58e7f2743a080 SHA512 ffa45c410527d967ce702cd90f334977ce45bb993126422ac1063601f32135376f91c725c6c7e548161fc014c798968e9542ecec08276d36ebd506accc81868f
+EBUILD libXdamage-1.1.5.ebuild 516 BLAKE2B 52bd82b984cb5786c2632e8331d597a98e9b7195d2a2090775af7ca2a8ebaf01ab7bb378fb26aaa9f6b6862eed48fad700d4e08a8bf5fa8da1d9cc550d2a2245 SHA512 3163f4ddf0a08a53fd8a8d7fbe959c109f5f465ae5e1c319f44287737a082f6837be78e864cad43d25c4b223b5c4fa99c689cba46fcb65a4318f73e8a414d073
MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
index bdaef2c048cd..2253d995178a 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xdamage library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index fc4762f5c69b..7931931163d2 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,4 @@
AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
-EBUILD libXpresent-1.0.0-r1.ebuild 606 BLAKE2B b3baab1f9ab41fb623808c8717764a6faf673bc211bcc75f1a5609246a2c942afac773006eaa770d2015ab1465b16c773d384041670ca2d6ed73e18e0cd66c1c SHA512 0cc8e9a6f020d90d766798c3173ab1c0fd27dba542c937812f350a601c8300642c325f9939de01e0862e521346a2e1a846786b579ba903420484be41aaf98553
+EBUILD libXpresent-1.0.0-r1.ebuild 613 BLAKE2B b5bd0e821c72f5ef6a08e4e20f623dbe3e3e6f15a6f5cc388fe198c1baef04a83c7360c62c46b3d5175521989f127de0a3bbde4662d080f579a175d6bfd92ece SHA512 2c83556a69460223df78b019a9002e60edf3050b023c2e90fb16708e392db9efb81459e9f3d08e83884a873024d435ee3e63e643d12af85186ac258797f4581e
MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
index 390ffda951fe..25304ed45ad4 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X Present Extension C Library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
RDEPEND="
x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index 42e1ae38a843..9ee09df811d0 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,3 +1,3 @@
DIST libXres-1.2.1.tar.bz2 311025 BLAKE2B f1ecc2397547cd6bcd37dc94968bacc378ab67d004fc31f02890b26bf169057bda61f6a08559ec23eb70bee5910f200e9d1016add3ca816fc4dd49115e718256 SHA512 c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1
-EBUILD libXres-1.2.1.ebuild 423 BLAKE2B 3cb1acbf1cedd871c0f14d8e8fd6e198c24d0b66c981dc0a53d3cea0b6e724958ece633b2bbe90738fb9978179b996d198cf23528e9b74196adba679c1b3c214 SHA512 d2e7871be20ffafd4a564ed2b5771de6926c2fa7e7d0e04a1de4faa73dfe91a5ef8e53c1233143199ce41ce37b1a1d189e5634c6b26e4c280446fdf66415d70a
+EBUILD libXres-1.2.1.ebuild 430 BLAKE2B 3e80451b5d0eb47d0c4b4432169c96063dd7e8a4d61169c1e6afea701220367f38d744fd9e1af2fb0902f8de597673d94403d4ab82fbd7e45c1895820df0c6ff SHA512 f320c5cf0b7bf3dd13a69b4d246ee176b3c9393a430f29969d0a3487edc63ad79f0f1857273582d2e6c4b1dc632f9bcd1b76f15ffafa28fd81a4b6b9f565fef1
MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXres/libXres-1.2.1.ebuild b/x11-libs/libXres/libXres-1.2.1.ebuild
index be385fa681a8..eaf0a5457ba6 100644
--- a/x11-libs/libXres/libXres-1.2.1.ebuild
+++ b/x11-libs/libXres/libXres-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org XRes library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="x11-libs/libX11
x11-libs/libXext"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index cdaea95b7ac2..eefaf2cf6771 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,3 @@
-DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
DIST libXt-1.2.1.tar.bz2 784610 BLAKE2B 69a1446a22acb50e625ab4a7b24b5db634d47a540d4543a3f58459dbb380d61aa4bbbde50328c76b2c31eaae3662a1c71cdbcf9bd3a0c915ae4e587f63fbee7a SHA512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c
-EBUILD libXt-1.2.0.ebuild 875 BLAKE2B d7139b22e4a29967a99a807004a4a56b210f44bfe7f5975077dcd17a60fa8f51bc64d5c7b49e8cc6661883b5c1cad091eaaef6ae9a94a300668b8c571dab5624 SHA512 5dbad6e7ace4f45106551511e21262b4b31c398712ffae506284dc54c01db353a8619685f20017dfbfb1d8d32aa923c8d8078b8ccea63e64b2bb4974c2c5c115
EBUILD libXt-1.2.1.ebuild 887 BLAKE2B e02f6eb93eb829133807f01734cf666f62e0ae59bd5ff48857454c4e5ba7a7b1ce9eed3a9156e7b78b2b38e75038b96e74c0cbc3a405785a7643ae04ba46bb41 SHA512 4cd64255595ecf5db9659f696c1a8609fae80c7d98d5eb86019df48c40dc9c29f4cd57c558a7016e1035b6d214daac01d74fb619302d243c466df42c2627426a
MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
deleted file mode 100644
index b0e36cae59e9..000000000000
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org X Toolkit Intrinsics 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- test? ( dev-libs/glib[${MULTILIB_USEDEP}] )"
-
-src_configure() {
- local XORG_CONFIGURE_OPTIONS=(
- $(use_with doc xmlto)
- $(use_enable doc specs)
- $(use_enable test unit-tests)
- --without-fop
- )
- xorg-3_src_configure
-}
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index e5888431d814..9fcaf43ec0c8 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,5 +1,3 @@
-DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955
DIST libXvMC-1.0.13.tar.xz 274180 BLAKE2B 51e7a08b0a1c76c9ed3bf53dc9656d7cea836ce7f5c17175b0700f73f2a8c4c0a9a91a6c3bc3b3919c4fbfaecc8e305d344ebf4654662d297735bf53d9a55579 SHA512 c9d0f73884a586efb9ea4f77fc8555f60d940077d7dff8eaa765b86345c8b4e3d80b860f68191d2830c272b9e464c08450fbb51bb64819753a6f4228c71861ac
-EBUILD libXvMC-1.0.12-r1.ebuild 533 BLAKE2B 9046b13633b260e85afd2cb81745cbc5c2ecf437e4a914ff5e3e17ca8a523bedc9206dcb466d00fe370aa35f83165d7c5d4efedc0e5c73b4dc1e97fa558cdac0 SHA512 fb00943b7cb92d3b751750ed709d4f79fb1d31ca8996d8027405f769be49977f8d4d505da72966c93af17783c50623c36daea045e7c935b9488737dc15f730ee
-EBUILD libXvMC-1.0.13.ebuild 709 BLAKE2B 8892520e1516ff9b2b55649d52456ab5994cfc8cf19b2065650f5e7cabfadc07cc504aafb8904153f38e44fc012338efc5095c1e3849de422c198d79ee6b176d SHA512 9629f879e5704be627937467689ba7cb3f58fe254465f33e6f67b77177b54a874831e552d94ccadfb355985bed4ba47325998e4bc84fdae8aadc7869a0cb1ce3
+EBUILD libXvMC-1.0.13.ebuild 712 BLAKE2B 31436bd0b4a60b2ea420fb41488b43863be6578525564e5b4f42c7a985b97d7e1b02c9e95994380dad6e35614233d19ee71c6b2d0d588f7fa417b937432966f7 SHA512 03a81ca400ef552469191fa733692ec2342ea7345cbd82b55f0493e02b6fee7c4f3be3d23cb833cf35cfdc9b9555012b8d9e811cb5ec2f70ab21331335aa0047
MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild
deleted file mode 100644
index 33757667d0b2..000000000000
--- a/x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org XvMC library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- !<x11-base/xorg-proto-2019.2"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
diff --git a/x11-libs/libXvMC/libXvMC-1.0.13.ebuild b/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
index 9758c3782471..d0d92c186cfc 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3 meson-multilib
DESCRIPTION="X.Org XvMC library"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
index e241e214b3c4..01893ac60a05 100644
--- a/x11-libs/libcryptui/Manifest
+++ b/x11-libs/libcryptui/Manifest
@@ -1,8 +1,9 @@
AUX libcryptui-3.12.2-fix-return-types.patch 1049 BLAKE2B 6bba9b2e80acac3226b78d52dda0223bf2067a7541519dcc789a35c5d45d787cbdb989b925441ce741d681427e68a88b968e045529a6444a82c23ad59e693b7c SHA512 2c29a7213d620be54f00f8b753b429c3f87f3986f8b024274b0c8758b7207e05591820abb7f896f441b3097d3cb24baabadc7542c536a6db2d1d1c71df28de5d
AUX libcryptui-3.12.2-gnupg-2.1.patch 702 BLAKE2B 99b0b054ab4c0901deaca2f59ae622679cdcedd4d6171b9f3b3bf167669ff6db2dbde61d7e984023cf0995778285d0d3d97eab5f753b08cc39dac1eb332e615f SHA512 9207081483604b115ec6ca5dd920b6396e2ad3c00ad41e1f354f10e43d144ce110431b34a895baa9ea22702aa22210eee3ba83e78083216d720d43ec0e4cdc7e
AUX libcryptui-3.12.2-gnupg-2.2.patch 708 BLAKE2B 29f7a7b19f9267c1aa43835b5992543558a3ae0be251a48212cc07a7daca6d4e3d0b37bbc73c93b09d653e9be99c33e6d36f5641351c23da5385b83b94485864 SHA512 7acf4770f9382e574822bf54defa48e817f40459a50fd5fd2b6794d61ef82329bbe1bfe013fb3ce0880bfc3f97d556c103e3685ead86772fd04e0119f70bc103
+AUX libcryptui-3.12.2-gnupg-2.3.patch 676 BLAKE2B fa00d44c06c063f81cbc4136247e85862306efc5b8225cd65f4cc7c8a3461e878f033efcc6a9e3c7a63fe73d385c738f6f660d0775e449ba8d17c94450439e5e SHA512 f87c45d7ecd9a35d440f8e840542bb60d56b8848a2a4a1e5bf97425a6b7d46c77b0c971273ef2310b3dfea877026ee147fa915d390bb1b62b65fc571f2d1b704
AUX libcryptui-3.12.2-port-gcr-3.patch 4932 BLAKE2B f711e6f0c6c8dec3c84d47e2ecc931dfaff197529028ffdca1ff8bec3d4e3ac75b2feda56de3ed9f0a78fe17ee2918e2d888ac863cd40f746b185f4b1ee7590b SHA512 3ffa45e6a2636bb4e6933082c92b83a2eedee927ad6a7d214df1bdb1b4c5ca41ca22c0c06469f3a6fe1c81e94888a3a5adca56e6354a00bebdc68faaa009e4c6
AUX libcryptui-3.12.2-prompt-recipient.patch 1447 BLAKE2B b36b71220a48540ff2a4dc2ac2de2368ab9a4ea2f12721ec84d3f4459e3e8cf348fb1d51318064e40137aab2f424c881bd3f17d25ae988c0e95826cd87c52393 SHA512 4e38c0f2e813bf0ab76f2205045a3b5240d0ccb9701de8c7a73adc4edc3540ff49eff6fcd5bb011c9e91984c9b82eab8a6bef32d099501895eaf9d6187874c43
DIST libcryptui-3.12.2.tar.xz 1163784 BLAKE2B 4a13f5dbe4229673da293115dd0d57added87f0522d6ed41d3072780e738b64bfee7c1b9af5872e9877ae22117492a5e3e1b119d4842536c2e762870fe8de85e SHA512 50ef407f0a9fe2ac8f4ab075e125fe8eabc55160b9b96a852d34e52c46be04e04b2a7c8288d2669e24865a89dc179af6bb0da8f6799e8b07fff7bc667c8eb1f0
-EBUILD libcryptui-3.12.2-r1.ebuild 1834 BLAKE2B a890ef3f18696d464be65c3e70ce1136defbe663d4d2cf70323fd08c856faf95a8c7b2cac5e85e047998ff8b92aa13622ac31fce59ae25019494eb24b9abd488 SHA512 5fb0bcdbd477a8532d049c74f48c19a26a2c320618908bc000863a969dd186644a6ef2319544158fb97158f4289fa44396ee75e3e2b29eee6071efef5a93aba4
+EBUILD libcryptui-3.12.2-r1.ebuild 1917 BLAKE2B 7158d31c0979b864b442de3605889b5152a666853903e30ffbb440ed5ca195ece5fa066e9c87b59b3eecac7f57527ead8321b24c2d24d7472686c17c302958a4 SHA512 44fb69969f0625263d3605d5d917f76ce34b73c47cf56ad74919ceee2f48f5254b83f24443390c32e25cc564caa727656c4522fa62992ef59e1d25dd18e3759b
MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch
new file mode 100644
index 000000000000..5582b02fb552
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch
@@ -0,0 +1,20 @@
+https://gitlab.gnome.org/GNOME/libcryptui/-/merge_requests/1
+https://bugs.gentoo.org/820143
+
+From fa3b8fd3b55768e0e02b30948c29a9504d02522e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Tue, 31 Aug 2021 13:46:10 +0000
+Subject: [PATCH] Accept GnuPG 2.3.x as supported version
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
+ DO_CHECK=$enableval, DO_CHECK=yes)
+
+ if test "$DO_CHECK" = "yes"; then
+- accepted_versions="1.2 1.4 2.0 2.1 2.2"
++ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
+ AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ ok="no"
+GitLab
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
index f54b39147899..565dc4f52015 100644
--- a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -50,8 +50,11 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.12.2-fix-return-types.patch
"${FILESDIR}"/${PN}-3.12.2-port-gcr-3.patch
# Support GnuPG 2.2
- # https://bugs.gentoo.org/show_bug.cgi?id=629572
+ # https://bugs.gentoo.org/629572
"${FILESDIR}"/${PN}-3.12.2-gnupg-2.2.patch
+ # Support GnuPG 2.3
+ # https://bugs.gentoo.org/820143
+ "${FILESDIR}"/${PN}-3.12.2-gnupg-2.3.patch
)
src_prepare() {
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 1675d65ef011..64f8531defe3 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
-DIST libdrm-2.4.109.tar.xz 433708 BLAKE2B 99c612a4f9a8e9068debbecfc428f4af530705fca47df9c8e6f0fe6ed740610ded1db0d0e37a063ae893e1697c2f8c4dcc8e15b8909d8ba7c66cd941d7400d24 SHA512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8
-DIST libdrm-2.4.110.tar.xz 436372 BLAKE2B 0d5f8bfe47bdcc96ef7dbe3ecf2da0b21262bae4396fa1e73c0f728d970d041a9925082c4526bc71e00f110c2eb0ba94313d9a7c27a2d4676073fdbc3708c628 SHA512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3
-EBUILD libdrm-2.4.109.ebuild 1964 BLAKE2B 773409a81dd537f1fdb79422c25639f1a9e3ac222a413099a6de3cadd0b3cbe44141b3563d9dfbfc37e5fe034bc71b4aabcb4f4d990bac7d86e11cdaeb9d93f8 SHA512 be75aab37f19d08cb71cc8efacb0def1a086db3b88a4b53e6658da064c4c1d879b5eda0ba1fbdf7f74a1718b65206b17e00aaeb9906b9662c3f8317bdaa48317
-EBUILD libdrm-2.4.110.ebuild 1975 BLAKE2B 5fd777fbb8f020ba563810ebde19d07d298bb0e5ae0d603dc2388cce9347b28439022277b07c953e15451cbcaa3b2cc2f3ee133344a069f51e68b3fe5ce7b0bd SHA512 ff2285fcc2b4c1d993828b104ef3b131574e04742eb48c08e77520e169d491c23c25d4b1c662ead78d9e3d81e2c3a8c85da4ce8395a32ebd311b796393730214
-EBUILD libdrm-9999.ebuild 1944 BLAKE2B 76ef85b65180a0f3f799a91a54d6ee1484bf71c3df87d14f10b8a45402b58d5e76f0b676905843a90e7e965ac81c3ab8dd35845aa960427492527a1b5038d8b7 SHA512 810efaf6477edacf82e1ca195db85908f17ab71807dbe43b7da84d9b15aca6e0740572b3702c2eadff7ced2c90009964c9290c68a21b6d0c2a9805337764594e
-MISC metadata.xml 407 BLAKE2B 1ec724640ea057ea29a6c84f3dcd34cb6a3f4bd7731c00d486688c9ec1dce393133e58b86ade00e51f91c80fe521e8829cfb796bd7cdc2e3d8c7be450d4c4188 SHA512 b54da0a8739fda9bb388e9893d992323247df89d9e97d20f29c62e64b189bf38092615cf113ae5048ce223270ebfaa128bb6b5fa119e5e8c8cdf2bda76a64769
+DIST libdrm-2.4.111.tar.xz 447388 BLAKE2B bd1fe6a1af3dbdd542ea9d3b887121d917c11ef9c3c0074bbe5d18ffd15050e2df63c744aa5e559e7f8a1f1e9561d3b2ba8b9a45ad72d7c1e6393b7eae99cf54 SHA512 17e92e9e4ded8031ac222764bed7e9ff430a1a377f5e435f6b62b4a7f45cb4c4b769b3b79fbcba11512c1ac973abf8cdcca8e0b9659ae095e915d3d5efcf5516
+EBUILD libdrm-2.4.111.ebuild 1942 BLAKE2B ce7a3fcd053b207c2c78f20667bf9264d7b5c0f75039fcc49f2b771660eb913307462c35b094ff2b309eaf4e0a658ce68fadce94cb091bb8e07ada1342c769bb SHA512 5f7a642ce1571333d431558af4824ce604463e41f5e031e54c24063f8dc0ed8083875bbdab6fd429e32cf3864726c89505b587546c64d3589c4d0de89456f486
+EBUILD libdrm-9999.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
+MISC metadata.xml 304 BLAKE2B e47f11b45b5c90804d5dfd27dbe2f2156099661ac7546152fb4e62046fd030838a0944d7dea35efd2f7b527eb88992c5049a40282dea58097b991c6bcd843693 SHA512 b798cffebaf330272494b6ef84c9c587a920e27ac0ae26336ff256de21768274cfcbe8feb61b7f63bff52294e460f945ada9ab9ddaeaea91d17bc1d6d41360da
diff --git a/x11-libs/libdrm/libdrm-2.4.110.ebuild b/x11-libs/libdrm/libdrm-2.4.110.ebuild
deleted file mode 100644
index 8f412ec60d52..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.110.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..10} )
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
- SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
- video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- valgrind? ( dev-util/valgrind )"
-BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-python_check_deps() {
- has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
- local emesonargs=(
- # Udev is only used by tests now.
- -Dudev=false
- -Dcairo-tests=false
- $(meson_use video_cards_amdgpu amdgpu)
- $(meson_use video_cards_exynos exynos)
- $(meson_use video_cards_freedreno freedreno)
- $(meson_use video_cards_intel intel)
- $(meson_use video_cards_nouveau nouveau)
- $(meson_use video_cards_omap omap)
- $(meson_use video_cards_radeon radeon)
- $(meson_use video_cards_tegra tegra)
- $(meson_use video_cards_vc4 vc4)
- $(meson_use video_cards_vivante etnaviv)
- $(meson_use video_cards_vmware vmwgfx)
- $(meson_use libkms)
- # valgrind installs its .pc file to the pkgconfig for the primary arch
- -Dvalgrind=$(usex valgrind auto false)
- )
- meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.109.ebuild b/x11-libs/libdrm/libdrm-2.4.111.ebuild
index d8d497e8f3f8..25b15697e55f 100644
--- a/x11-libs/libdrm/libdrm-2.4.109.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.111.ebuild
@@ -4,7 +4,7 @@
EAPI=7
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
@@ -26,7 +26,7 @@ for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+IUSE="${IUSE_VIDEO_CARDS} valgrind"
RESTRICT="test" # see bug #236845
LICENSE="MIT"
SLOT="0"
@@ -58,7 +58,6 @@ multilib_src_configure() {
$(meson_use video_cards_vc4 vc4)
$(meson_use video_cards_vivante etnaviv)
$(meson_use video_cards_vmware vmwgfx)
- $(meson_use libkms)
# valgrind installs its .pc file to the pkgconfig for the primary arch
-Dvalgrind=$(usex valgrind auto false)
)
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 2c0a31f176d6..a8ccddd22d1b 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index cfcecf022b00..73e3db5cabfe 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -6,7 +6,6 @@
<name>X11</name>
</maintainer>
<use>
-<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
<flag name="valgrind">Compile in valgrind memory hints</flag>
</use>
</pkgmetadata>
diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
index 2a6d1b7300b8..fcaf5b968c85 100644
--- a/x11-libs/libfakekey/Manifest
+++ b/x11-libs/libfakekey/Manifest
@@ -1,4 +1,4 @@
AUX libfakekey-0.3-ac.patch 764 BLAKE2B 733cdb11da016a2d3b9e196943d6c0a948404ed15de0684d8bf7bba28d700a5cc83a3cb0ed5b82ca95ed2d7c531136362f0373c87bab3c979a33ce8c2f613e64 SHA512 8cfe2a3185580e26c5d76d6b392003b96b73a1aabb15255b1aab54a777b3759e496d4c0323b18ee2a67a5537e68388b9c67f6d885bd791f62b42b39e37fb635c
DIST libfakekey-0.3.tar.bz2 9672 BLAKE2B 1cd86581148e218879b14ff52fb085fd20248a475ccf00a08918d64db811b21bbba3632e799d798077a197298da4d976be3180c060a6016c396428519d1aaef2 SHA512 b0502dbb01839009de7120f8ca939c839850e7c3c88678b52d6df9f4205cbec20769cedd61c9307e8307f6bf789eee25b20d4fe20c25e7285318f5ea1334555a
-EBUILD libfakekey-0.3-r1.ebuild 1221 BLAKE2B 3c73dba753d232495f393bc1b1e1a00dd73158a378a255a468706aa802349716646be2f44f7ae3b8b9ed72737594bbadbf5470c9eab976f938f89c6aade06f4f SHA512 d5dd2550680411f5fe043775b2657ac438cad621d93a63787a9c7d2ee557951e6fdee76de812d9db1fe6388719b5e63c11ceed51687cae796ccea68ea5e2a0e9
+EBUILD libfakekey-0.3-r1.ebuild 1228 BLAKE2B a8c5726f6d933dd7df81b997ab924ff5da3b9c9aa618d19c2e90b3aee804232fa2d2954078a6491b30a0aa296f4aa9e88d8196596e2ac96e28469f43f1e6484f SHA512 b843e8827ffad3e748630aace2b9f8bd01ae67d5fab0e73833561edd190c066c98d81da821ee8750c44e55938b999a9aa9007460533ae9eb15173f57672a8daf
MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild b/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
index 4957afca44d2..206cbcfecee4 100644
--- a/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://git.yoctoproject.org/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
IUSE="debug doc"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 13c5e5da56a7..43713d27898f 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,4 +1,4 @@
AUX libfm-extra-1.3.2-buildsystem.patch 1691 BLAKE2B 25ac36d6e12b1d4cd0675730654aa19167928c450abb58a9ec58bf7364821377e11b3a76093a125b61096770e1e486987e473f7081fddf2a106ae6205989edb4 SHA512 20c435dc45fb51f269323b45a549a59ef4721864bb13c2e384eb1b60fc8cb4cd8045f8e6e94d32f29b92640d02d72e903cc119f6783099c1843fd1c4dec07491
DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
-EBUILD libfm-extra-1.3.2.ebuild 2243 BLAKE2B 55bc9d1a148934fc2872f6623d712b2f44e58db9bd9e61426ac313da1b91dda1316f0f08d9f1e872c37c0fa0cd9a2bc9a126201eb3b048b46ecb8216bba740f1 SHA512 8d84897b84a5faafb8dc8c4a05e233462b6adb17b5169f622f64fd3d72568e638fee2747a9ef9a2727d99723b3bca9e13dcd11f6aeaf0645ad64d6846b72947d
+EBUILD libfm-extra-1.3.2.ebuild 2250 BLAKE2B 15759013014f39d187b35d38b4bf7b564f69807ffd18143c483f1a93f1329829a972e16fc054d948e888ce09200aebd6a8cf9c374cf9af33fc5fdba604e621ab SHA512 24f4b84d3a06b626fde703d9a6941e7b97bb6e812436dab02d88ab34475ec9509fa708a543efc75157ff7694c87bc85acb9102a992de9087de8fe79e16b7ac1a
MISC metadata.xml 376 BLAKE2B 84b01bbb584825333136f2bc316e5ef259adbb67b3f97d6d8cce8bf3c29a4406fefb8151b3aacad08db288ab5299697be0955bb274f904868d909b527d61101d SHA512 06e1eaee5a6df486bdaa5f9fcd396f925aa04773744d17ff07d869553c90ffeb823e4ee0ecd1a53af4c718a6fb8154a6cdab293a13f6a417d9fa080501242fef
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
index 667df1b32186..ee721e91c833 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-libs/glib-2.18:2"
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 8f8c3d98cfa9..7e82064af3ae 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,5 +1,7 @@
DIST libfm-qt-0.17.1.tar.xz 363052 BLAKE2B 5931a5f06f0d085aedf0b178efe4f47ccc90d6e99dfa88955d692736d0dbc4fb8ebc9c5b834547b473b84ce815bb7e1e2e991fee38f390e7ff85c8a3effe8f26 SHA512 1e1781a01446f381625361a50f77422827e7ac5ab6039b4246369e2281edf78d3ccba866fa472667bcbb6737c44ebc350cb30a0055fc84d1f5d7e1c83e1241c1
DIST libfm-qt-1.0.0.tar.xz 379492 BLAKE2B 28a111434deb0ece8ab54d7d558c13e3f5d66b8e2b18bfb5d84601c10b6cd822c0bea794b1e959d95ca2427272d8aa008ef7fe49056228288472397c72241e6d SHA512 8609709b00a67273e4cb3ca18ad695df172ff3cac2ed70d48e5f607c20a4d4507598b500957bf197bffa65db4ad5843f3fd477a56868c95507a594542f24b5b4
+DIST libfm-qt-1.1.0.tar.xz 383280 BLAKE2B f01b8d2b21bee05c265f55d6b1c71644001bd668a03d8c4994a4e0fde2f07e53014d3b079d818b7a66cd25f8c9141fa980d0cdb9d3b8e4a66eb3b1521c46690b SHA512 6717bc3fd3a2795389071e4dbfba2e73f3abfeafce8a583f99b3281e60347430db48246eb29796c5b7647b35b064824e90fc3a286547288798a1c6da3a3f5137
EBUILD libfm-qt-0.17.1.ebuild 885 BLAKE2B 321c46149eb3867c1130b4d626f6b1e517859223a45c45c5355f999d6919add7d34c93444ebfdc346db20f2723afeb5dcec580555f649cf7bb10ce4727e60f26 SHA512 a252a63e2f66b77bac030dd93fd54f33249ecae1e9ed5d180763d8a683f9c15152838f3d99ac6d22f619f8a50a93ab4a4ae2a14f48257a5ec2c8388bd3bce8a2
EBUILD libfm-qt-1.0.0.ebuild 924 BLAKE2B 10d04b42bc19a58201f2a4b734235deb721ed3d4c67146eac3e2af3d9509f6b45de5f4276691a29b98c137d4885bbb54794962085446861f260d2c2747d3d1e2 SHA512 9ea497d484f327c7bae160ee93d977df2b87d2702be1e3dbc32044b430aaf72713c5c30b555a2f7d21b17a6d66077e7e190ab3162db8ef00f7314c8bd00cf920
+EBUILD libfm-qt-1.1.0.ebuild 934 BLAKE2B c671069c5c7c7a10a15a609b75f3c22d93f9c225ac9ce1ec41c02547808ea078e9eec92cfad97677b6212e6576711fb383d851d6aa03128b9c7a52c259710ef5 SHA512 9fe03dd17913f39a7aecdf7f9a83cd6445171aba7550682b141b67a617e034ce913a0ad0cfe9787e0e1f05ba11bd466fb00451ca6ef139bf9e92c36f0ca33e6c
MISC metadata.xml 315 BLAKE2B 1ca0894e1b787a755d024f95c4b09659b300f957f5cf69958bb3801e464eb84385303bbde99be3b491fc85e4202656dfefd40e5aa97ba47533307bfe07d40a0a SHA512 f9df6f22d74db03f845ad296b50e6d53e204867b2f00cbb04448c33f5ed3d22af6de3f9c58238f0e657aa4b963e467db74864d94266e5fa6923f2cb9c330e56c
diff --git a/x11-libs/libfm-qt/libfm-qt-1.1.0.ebuild b/x11-libs/libfm-qt/libfm-qt-1.1.0.ebuild
new file mode 100644
index 000000000000..038f3f6b57c4
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-1.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt Library for Building File Managers"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="BSD GPL-2+ LGPL-2.1+"
+SLOT="0/7"
+
+BDEPEND="
+ >=dev-qt/linguist-tools-5.15:5
+ >=dev-util/lxqt-build-tools-0.11.0
+ virtual/pkgconfig
+"
+DEPEND="
+ dev-libs/glib:2
+ >=dev-qt/qtcore-5.15:5
+ >=dev-qt/qtgui-5.15:5=
+ >=dev-qt/qtwidgets-5.15:5
+ >=dev-qt/qtx11extras-5.15:5
+ >=lxde-base/menu-cache-1.1.0:=
+ media-libs/libexif
+ x11-libs/libxcb:=
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 597e3269b515..7e888cb87692 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,4 +1,4 @@
AUX libfm-1.3.2-buildsystem.patch 1098 BLAKE2B 63cde148b2ada201d290550769ae7714324f72617629d801ce362dbc3f33b1de7e6a712959a6e4e8629e880244ad361c054ebc898f2b089d4e19f348120e9635 SHA512 d2dc9c220e2ce70c33809ecb9ce4e85529990946537970a63d60fad33577f1ec444b066abcbbf346611035e9dac5d2750ddce84105a391040c1dc8b179ec0901
DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6
-EBUILD libfm-1.3.2.ebuild 3352 BLAKE2B a2474914c53b8189c55fd9faa5421b390bdf92cdc60b04078805107c89c03ac0208cad25f62d2e671cb92a1acc8af0ad29968d4a6cdeda9c3a01174445069b01 SHA512 d7ead11dd70c68e57df516a6794d9481cb6ba7db5cb1715c69f6f10ed2c91dcd2ac417c887bd3f5185a2666ae8050127e5c71965691cb1cae50c61ab4a47982d
+EBUILD libfm-1.3.2.ebuild 3359 BLAKE2B ec0a9aafb09a8ae911985c919931e925f218fb4e8329b11b157aa0aa909f680e42be524888bd0d9357be0579710e9a88021d33e033c60a57dd8810bd91d6a058 SHA512 f53a15a3e014bb2475659852ae81c91bf0cbae354a8f31648353d5ac54d0ef60590202be95be304c418e4a539d4e6271b5e122d12fdbf48ca0c66490681adc37
MISC metadata.xml 583 BLAKE2B 1c41015600c3e8298cb648d7a4429737cd8c5f1f9b856920dad397040e682892917c1895c391cfd1671fea59b28ada8e94972ec29d3787a06a8f7686e6934a45 SHA512 718448ed01fb88480c9a4f500308b9bb9c16f913a31b37e53b2c1b9670e698f8d6c0c5b78cd64b5c32f61e46da0b17d2e3f6c0417d5ddc247ce20ab99db57150
diff --git a/x11-libs/libfm/libfm-1.3.2.ebuild b/x11-libs/libfm/libfm-1.3.2.ebuild
index e4daf617f735..881c58f06135 100644
--- a/x11-libs/libfm/libfm-1.3.2.ebuild
+++ b/x11-libs/libfm/libfm-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="+automount debug doc examples exif gtk udisks vala"
REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index d58ef39c9848..845bed2d0182 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,10 +1,5 @@
-DIST libnotify-0.7.11.tar.xz 101616 BLAKE2B 202456000bc092707e171dfd3ba06b46ac2bd7b222e2dd70540c17eda32639369cf9af2e275a49ea3a0859598d271cdd733b68ff66ed2c30d3c0987fa6de6a97 SHA512 1e96b88278fb5e941dc691a7bbb83ea7fbc46d7873e7e10d988cd44dd83fcd678956bf9e5cd2f5533cf316b2a23354161c80a5b12299eb119a3f5697e4935ed7
DIST libnotify-0.7.12.tar.xz 102032 BLAKE2B fc0c0f377bf86cb9a7d3e080cf0aa23fa287a9199656d403624925208d86390e96f62d4c41f4b457efd403139f1bad52ff5fdd2c0cb3270c0abc82957b2634cf SHA512 1ddbdc2ea7ba653ea54169db9ed3d471f6e3421ef29e486c9b8d36837a655bcd613d0f07a8cf1253b87c42a2651e2f1634145622d8624d91e4223452deb99f1b
-DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94
DIST libnotify-0.7.9.tar.xz 98148 BLAKE2B 4728d00a204cd1003e8171a54c23bb975c0477c245c1175558f27555763113ec8bd7abd7ef81f6bad2b98604efe436d843958e77473436e68560775804473383 SHA512 8a842b50777279efdb7d96a836a546c47decad158a4f03f7ffc818860d1f6276a657619e4f4a19a4e2f5ad55e0371c793420d50d802983700e8c342273b73874
-EBUILD libnotify-0.7.11.ebuild 1493 BLAKE2B 8e808d50dae668260862717cf43c3fc9ea6fc31deb213d8f56f9b19ddeebffb82a5dbf9a538929fe84a8a58d78528d1ac617849754116902d660d633189043be SHA512 682849633281248cd897a74d52026ea17b632c99710d130081d31295cb8743bf1b8977050240e4a19acc493d8a9b04eadcafc90e2b65934d4c443e01efc2199f
-EBUILD libnotify-0.7.12.ebuild 1493 BLAKE2B 8e808d50dae668260862717cf43c3fc9ea6fc31deb213d8f56f9b19ddeebffb82a5dbf9a538929fe84a8a58d78528d1ac617849754116902d660d633189043be SHA512 682849633281248cd897a74d52026ea17b632c99710d130081d31295cb8743bf1b8977050240e4a19acc493d8a9b04eadcafc90e2b65934d4c443e01efc2199f
-EBUILD libnotify-0.7.8.ebuild 1415 BLAKE2B 58e0de2826dd0c2e43cb47061464f308cf9539bc5d8f7a09cd96dc5d3be00d2685fca27c62a135e8e68e1fcfd7b35822582844528f29d83dd186ed7620b42f41 SHA512 fe35b1f045ddad13aaaafb067feeaa261d275369ad97fd871cd640b0a5d250db337e19e555ce2b043bf0431c350707315e4e88b6853fd044831a6524f55b582a
+EBUILD libnotify-0.7.12.ebuild 1500 BLAKE2B d518c57d06f668b915911a6adf224ed8f9c5c6193e96d3391c4ba5dec9c96cb0cf2cad7a885872b8dc718709fcc9ddca5d583e5c4968ee3e5defd4de1ae9b33c SHA512 4536d49495c84f5517965ed7f3ff7b9da665d3412501c27c962053e386ddc264f3ee266628d43ba583fe8a798beb59ba351973db80f9d328ecbe20d31af144ef
EBUILD libnotify-0.7.9-r1.ebuild 1486 BLAKE2B eb83500e64f278f7a471afd536cb873c23110a6f1f8c8e1d8d59acbea6c36a8b8494327e9582658dee57055f18c60a898388cad29573fb82e1a28f6e7d0e18f7 SHA512 dc4fbdea0c1cd7ca153638b3a643e23c66bb32ad504c7cb3a74c49f1af48ddc6536c14d9a52c440399a9ec6bee3703a156cbb12bda91dc8aa53dd46c57ef4752
-EBUILD libnotify-0.7.9.ebuild 1477 BLAKE2B 41954abaf887c51ecfc56e85b7095a6c26e86a5ea17561bd27bf2ea268b91dfa2f26cafe2deb96b6230218de8e9c87897cb780d4e42164718d1d4fcbd9bef891 SHA512 9776171a40786986c2c6bff4176669aab30d6cf3fd8ab44129cade811ea3f20e3cb433ceae3eaead55af1a64ba9057464a5099b5d8fecf611de821a009202c30
MISC metadata.xml 397 BLAKE2B ed17366f7a815c49a838fef999ccf115e109a3ed9eb88d527e464c49692abca943f8c8971f2a263012cb12c2c1426b3747b733cc8c20926ff0139446b1c6e685 SHA512 89e5213048893402d277dd137d4236164d0cd47cc6e5208bade85cc67303f0d754259a5ccee789e2b5e77aae2188baa09f631e5ed1a0e216215bd091539cc0be
diff --git a/x11-libs/libnotify/libnotify-0.7.11.ebuild b/x11-libs/libnotify/libnotify-0.7.11.ebuild
deleted file mode 100644
index b2f00994e9f7..000000000000
--- a/x11-libs/libnotify/libnotify-0.7.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson-multilib xdg-utils
-
-DESCRIPTION="A library for sending desktop notifications"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="gtk-doc +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-libs/gobject-introspection-common-1.32
- dev-util/glib-utils
- virtual/pkgconfig
- app-text/docbook-xsl-ns-stylesheets
- dev-libs/libxslt
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.1.2 )
- test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-"
-IDEPEND="app-eselect/eselect-notify-send"
-PDEPEND="virtual/notification-daemon"
-
-src_prepare() {
- default
- xdg_environment_reset
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use test tests)
- $(meson_native_use_feature introspection)
- $(meson_native_use_bool gtk-doc gtk_doc)
- -Ddocbook_docs=disabled
- )
- meson_src_configure
-}
-
-multilib_src_install() {
- meson_src_install
-
- mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
-}
-
-pkg_postinst() {
- eselect notify-send update ifunset
-}
-
-pkg_postrm() {
- eselect notify-send update ifunset
-}
diff --git a/x11-libs/libnotify/libnotify-0.7.12.ebuild b/x11-libs/libnotify/libnotify-0.7.12.ebuild
index b2f00994e9f7..47b686ac66a8 100644
--- a/x11-libs/libnotify/libnotify-0.7.12.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="gtk-doc +introspection test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild
deleted file mode 100644
index aac07f1f95dd..000000000000
--- a/x11-libs/libnotify/libnotify-0.7.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson-multilib xdg-utils
-
-DESCRIPTION="A library for sending desktop notifications"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="gtk-doc +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-eselect/eselect-notify-send
- >=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-libs/gobject-introspection-common-1.32
- dev-util/glib-utils
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.1.2 )
- test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-"
-PDEPEND="virtual/notification-daemon"
-
-src_prepare() {
- default
- xdg_environment_reset
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use test tests)
- $(meson_native_use_feature introspection)
- $(meson_native_use_bool gtk-doc gtk_doc)
- -Ddocbook_docs=disabled
- )
- meson_src_configure
-}
-
-multilib_src_install() {
- meson_src_install
-
- mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
-}
-
-pkg_postinst() {
- eselect notify-send update ifunset
-}
-
-pkg_postrm() {
- eselect notify-send update ifunset
-}
diff --git a/x11-libs/libnotify/libnotify-0.7.9.ebuild b/x11-libs/libnotify/libnotify-0.7.9.ebuild
deleted file mode 100644
index c06d463dd0d1..000000000000
--- a/x11-libs/libnotify/libnotify-0.7.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson-multilib xdg-utils
-
-DESCRIPTION="A library for sending desktop notifications"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="gtk-doc +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-eselect/eselect-notify-send
- >=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-libs/gobject-introspection-common-1.32
- dev-util/glib-utils
- virtual/pkgconfig
- app-text/docbook-xsl-ns-stylesheets
- dev-libs/libxslt
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.1.2 )
- test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-"
-PDEPEND="virtual/notification-daemon"
-
-src_prepare() {
- default
- xdg_environment_reset
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use test tests)
- $(meson_native_use_feature introspection)
- $(meson_native_use_bool gtk-doc gtk_doc)
- -Ddocbook_docs=disabled
- )
- meson_src_configure
-}
-
-multilib_src_install() {
- meson_src_install
-
- mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
-}
-
-pkg_postinst() {
- eselect notify-send update ifunset
-}
-
-pkg_postrm() {
- eselect notify-send update ifunset
-}
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index e1a6bcbcea42..58b7272e357c 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,4 +1,5 @@
DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
EBUILD libva-intel-driver-2.4.1-r1.ebuild 1315 BLAKE2B b3143086acc0278e1d84e0ca35a34325ba667395f547437205c70a8182d560cda32a704fb0016674f0691a661e19ad7321e88ad9fb09dedb4db2610f9d0a0a0a SHA512 4dd1702c81a808eaafe6b519eeef298bf1e6c6872c3b87011f928f90abd642decfd53f43b8663f9f646fe147d1e4e6e871ef8fa496b92e42cdd1c996fd18f530
+EBUILD libva-intel-driver-2.4.1-r2.ebuild 1434 BLAKE2B 07fdb241b574bcc1ef95e3186a41a364ae94862ee14630727eab0d69e7040bec562cfcb662af6f421e4f017db897e5e636876251b9136184035be6f7d56dfb25 SHA512 dd3f28e992940fe73f5f3838ae61ef4b38334eb33deab62debf4aa793f74895a682d5e77e6012bea24977298ba1e4a1379cda4f6dd4b23399f9221213cd244e2
EBUILD libva-intel-driver-9999.ebuild 1317 BLAKE2B 916b05fa1c1b8baf20fcbea3256f04771920362863af4fb13688b539a819125227e63ea574081089b8c42b09278a1815aeaf217ac914204e05930e19fde0e9b7 SHA512 9825c011b68f4610f6600bae36a4b6a099aa34cedd6de6a7be2345bd584e1e8c3f00adbcc670a1ac9ffd8731c25da151c7d842eff241fc2e2efa50a8654f7e35
-MISC metadata.xml 349 BLAKE2B ef740cfab9baa746a0bd75f99e4458e76899eadb7c65f546de16093b5fc7a6a16e84bfd289c5b5a3a82e96775904cdda76cb60ad5b9389672c63d1a8f9d97f03 SHA512 2d8f4932efe61409edd7b1cafc9a84e8a3620d87db60053a378cbe180f2c6206a51e0033943fa349de91954c1b76154651013dea99e51fdcaaff7e9f0e40616d
+MISC metadata.xml 492 BLAKE2B b9c22e0ff6c7a984e4ea52caa889c14d15a8a77bddac8a088bc872290c619c84a4814986d97a4c5712f3f57288b1d5257b86ef1d5446e4d4420c0e5cf018c36b SHA512 343f913540aecf5e9b8eaf08ee225f55b238695d894e681e8f643f04ffb2a695aae1773c9fbaafb76df6aa929acc3dc23d77054fff6857c09785c2165bfdd572
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r2.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..2adee1dcc69b
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
+fi
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
+if [[ ${PV} != *9999* ]] ; then
+ SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="hybrid wayland X"
+RESTRICT="test" # No tests
+
+RDEPEND="
+ >=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+ >=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+
+ hybrid? (
+ >=x11-libs/intel-hybrid-codec-driver-2.0.0[X?,wayland?]
+ )
+
+ wayland? (
+ >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ eapply_user
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=(
+ $(use_enable hybrid hybrid-codec)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index da593f3141e2..fed131d8322d 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -5,6 +5,9 @@
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+ <use>
+ <flag name="hybrid">Enable support for hybrid vaapi hardware acceleration on Intel Haswell and newer architectures</flag>
+ </use>
<upstream>
<remote-id type="github">intel/intel-vaapi-driver</remote-id>
</upstream>
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index e4273d6ff485..de58ad050140 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -3,7 +3,13 @@ AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820
AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3303d8cf11e99fc08b01cb4a12b1500afba27920e52a47cdf2d3cacc0b2cbea72e417ca4c118793c1149659cf1e51b619c0a81ca5103505a25994d9a0fee00a SHA512 41cd3cefd7a6aa6482c4d06b912cf441879e6fd14cee93380b081021e344d6555791e80d0925f66f59178d1b2d5ee15ff1f2deb4835d72f7fb74673912fc6b9e
DIST intel-media-22.1.0.tar.gz 26188730 BLAKE2B 7ade4b25d2fe50ed6c3498c37f0fb39ecf7241ba21485c423a4a8769628b78d8134471639aad12bcac79a7d107682e36cb5954227528601eb5253be5ce00acac SHA512 dd444608fd15fc7f05a0d2c9e6e2c8be3a588a1253ac014c045c207d5d59c9d172c89d248e94688078097a224f57025c11e86b9392271cd111bb9dce6d07617e
DIST intel-media-22.3.1.tar.gz 27302226 BLAKE2B 24ac80adcd9a72f9e9b7db4b878715233835f2b69a25d1029538fb87da1fa49ed3c0606478a8b24e198f0c366003ff315e31972c7576e9ff2ecd8419e12ab150 SHA512 286f974a11546f8541429230330c5bd514c5eb372d3278461a132fb236f19908aa544a44010e52981bb942573ab6c2047c8c03471517182e2daf2da87b0eb74f
+DIST intel-media-22.4.1.tar.gz 27407593 BLAKE2B eed738064b6febc17e93f195f81f71be55cb539f0bac1a90b0a60695b89ed2eb8deac5da3a646bd178396ace8e68c35a8e58fbebd74e6298aea6c1bd505fd482 SHA512 7615c76d501f9fa127da8465c4f5ecf8067b0374e14ee699b874ec7b4dfc131630901e2ec4d85e420b13c33bb1431938adefb60add7e1abe7e7351bec5e6322c
+DIST intel-media-22.4.2.tar.gz 27408373 BLAKE2B dfc72e1188eddc47207f7def060efb4852aaa57971d26690657117facfab8dbfc7f3a249bb1defbf52ed2e3db218f5f4eedcd397e25d8f790bf472c92d058bf5 SHA512 1f32709b80cd25006e2156e4487d75d07ff5eb337164c6aaacb92385dc31c1ce0c80a3c7062c830f89674d70bfedd7f81e4f34ea4d1dd8adb4da0d2212e744ea
+DIST intel-media-22.4.3.tar.gz 27415572 BLAKE2B d4298d6195cfd160c3bbc0789e2bbdbfe4ffac2fe592b697d52320e60c62a542902d8610c1a1a41ce7f79bf80bce7ee386cfe8b8e4b10509066dff8e6b52deee SHA512 9acf38fc0ffc65a7ef39570a31e9403600b1c6fe532a741ccdb26588e056a4bb0e5a53290942a026f4813b86db95d7d1eb3166682a889e482ac1645c6ce8aba4
EBUILD libva-intel-media-driver-22.1.0-r1.ebuild 1368 BLAKE2B 5f58f95f23416c6dfa77cd61e311c59448a5b1dadd3280115d17176bb392607320d3b4b00324cf80c7bfd953cf8365edeaed562edc7117ecf3a3f94c7577a00b SHA512 b24aa898bb3c48126c0e85f886cc564eee38f611d8ffb21ecc163b070814e526262892b7dc6d99fbec302345d2788b98c335734f82258d68a0357c0de9c8ca38
EBUILD libva-intel-media-driver-22.3.1.ebuild 1368 BLAKE2B 6867cae8428766be791e91ecfd074062ff94a26a36cbbfcbe1d18136edd32b9a2245a1abd3799f18985a3099165098812ae400e3ef36cd063de6343815fdbc16 SHA512 9546f6afff8f11566e0f4b2f6b1862d31b766b383f42ffc91edb4282711e72bb1260972d8a049f777526e6cfccc970780dad9b48a2372cb0cec1faea8c43999d
+EBUILD libva-intel-media-driver-22.4.1.ebuild 1369 BLAKE2B 93487cf7effcc1749b455c7459195f0e4ea9a802e3f12b22bef4d29d928227c293e0d18ce713f1f2abbe5784fde6171f33447c8eff9d176d62fb69a9133ab4c8 SHA512 7635e220c3ec9c69c6351fa87867570971a07a65054b911e982b05c191d45c53c10799d37932482f4500481baced5801d1859d805735b9f584b1a54f4cc32d32
+EBUILD libva-intel-media-driver-22.4.2.ebuild 1369 BLAKE2B 93487cf7effcc1749b455c7459195f0e4ea9a802e3f12b22bef4d29d928227c293e0d18ce713f1f2abbe5784fde6171f33447c8eff9d176d62fb69a9133ab4c8 SHA512 7635e220c3ec9c69c6351fa87867570971a07a65054b911e982b05c191d45c53c10799d37932482f4500481baced5801d1859d805735b9f584b1a54f4cc32d32
+EBUILD libva-intel-media-driver-22.4.3.ebuild 1368 BLAKE2B cd90db1451e5e4fd1090a089b06ecc9554e84dd6250821cd4595040d3b2749032345bf967de1a856becd9855bfa7b5312e68a6479fa691d9abd150338febc614 SHA512 4776e62b5e9f61324bcd7d70222298060f9fea6800eada752fb54e17b43a74593745a197572015850a4e1e7cfb1df7315fd312b77e64ff1d5709c292f8d1cbd3
EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B e7a9336e295f00875c9eaef26a47113e5e94fd804459b3c17ec7ada98ae2ab70760d13ed9eff17295465e79c54a26ace0f5ba5d2bb3fca7a431bef7aa7b503dc SHA512 171e12e7d4613336a534bfcbac98aa53e68ad64a00edd21840c10f4db848803ed3d254c82a32c54fe99a02b401b7afb0782c2e35b7a453068208cbfe91ffc717
MISC metadata.xml 506 BLAKE2B 22e3db4e87af8f032b2f02d18937c894524ede02e6a408cee8f8fddf492cfd2ebc8de6ebe8e2e1786ec81f119a09d3abb50dd2617c7651ff2082986d66421760 SHA512 5f7ebdec168766dc148294d92b1a6f6a355293a78ff8c879d1de94dca283ecfb9136bb0f124f41af15256f31832c2b034452a2b4d0ea0616a36b2576b7d8da58
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.1.ebuild
new file mode 100644
index 000000000000..9a49528f5647
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+ : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+ if [[ ${PV%9999} != "" ]] ; then
+ : ${EGIT_BRANCH:="release/${PV%.9999}"}
+ fi
+ inherit git-r3
+else
+ MY_PV="${PV%_pre}"
+ SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+ S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+ if [[ ${PV} != *_pre* ]] ; then
+ KEYWORDS="~amd64"
+ fi
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+ >=x11-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+ "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+ "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DMEDIA_BUILD_FATAL_WARNINGS=OFF
+ -DMEDIA_RUN_TEST_SUITE=$(usex test)
+ -DBUILD_TYPE=Release
+ -DPLATFORM=linux
+ -DUSE_X11=$(usex X)
+ -DENABLE_NONFREE_KERNELS=$(usex redistributable)
+ -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+ )
+ local CMAKE_BUILD_TYPE="Release"
+ cmake_src_configure
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.2.ebuild
new file mode 100644
index 000000000000..9a49528f5647
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+ : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+ if [[ ${PV%9999} != "" ]] ; then
+ : ${EGIT_BRANCH:="release/${PV%.9999}"}
+ fi
+ inherit git-r3
+else
+ MY_PV="${PV%_pre}"
+ SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+ S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+ if [[ ${PV} != *_pre* ]] ; then
+ KEYWORDS="~amd64"
+ fi
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+ >=x11-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+ "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+ "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DMEDIA_BUILD_FATAL_WARNINGS=OFF
+ -DMEDIA_RUN_TEST_SUITE=$(usex test)
+ -DBUILD_TYPE=Release
+ -DPLATFORM=linux
+ -DUSE_X11=$(usex X)
+ -DENABLE_NONFREE_KERNELS=$(usex redistributable)
+ -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+ )
+ local CMAKE_BUILD_TYPE="Release"
+ cmake_src_configure
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.3.ebuild
new file mode 100644
index 000000000000..05341f45c9db
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+ : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+ if [[ ${PV%9999} != "" ]] ; then
+ : ${EGIT_BRANCH:="release/${PV%.9999}"}
+ fi
+ inherit git-r3
+else
+ MY_PV="${PV%_pre}"
+ SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+ S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+ if [[ ${PV} != *_pre* ]] ; then
+ KEYWORDS="amd64"
+ fi
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+ >=x11-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+ "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+ "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DMEDIA_BUILD_FATAL_WARNINGS=OFF
+ -DMEDIA_RUN_TEST_SUITE=$(usex test)
+ -DBUILD_TYPE=Release
+ -DPLATFORM=linux
+ -DUSE_X11=$(usex X)
+ -DENABLE_NONFREE_KERNELS=$(usex redistributable)
+ -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+ )
+ local CMAKE_BUILD_TYPE="Release"
+ cmake_src_configure
+}
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index bdf446c72887..8e0a2a8119d6 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,6 +1,6 @@
DIST libva-2.13.0.tar.gz 256724 BLAKE2B 97dd51bf488dc88027125973399e17dedcce03b7bf5104fd9bf17156c5013e1e9d46f2bf78c16431141294f75549a00fed3542b4f79dd31b032f4505c11d07d7 SHA512 226d09956754c9942348ed289f210268bad64dbba95d948b33ae063f7ecb276af9da083a48c03c3c79ad4305716d203898bc75a109945d064a5fe6fb43398dea
DIST libva-2.14.0.tar.gz 266254 BLAKE2B 1ad504dc7f72b15bb35b486a5fcb327c14663b80068791aa983f2d46876b1504b8330888430b85d2fb309bd5aa2a11c4a34589b68fa140e10b27cb952e3eb5c7 SHA512 8d87b49c7242174d05dca709bd79e6e45cea6e6060d12f5cf7636433be587c2b3a6c3183f632fb0ff49b19f31f915a2a62818c26f57c3a8f40741aa1ab8270b4
EBUILD libva-2.13.0-r2.ebuild 2211 BLAKE2B d32d23548a690da4d07760074c77a981da21f139e39cf9b8f53a7b5317459c6f3c4a72328edfaaa9bdf5002fd17db4b66d6cff9ced7fd38527d2c67d6f34c561 SHA512 08396b6f8359cecb707ed63b25d0b1de37955cbddb82fe18cede7f2af7b582c947da3079079222fc7c614b4341aec29e849d63f4d1f56abe6504339323fc0c5a
-EBUILD libva-2.14.0.ebuild 1706 BLAKE2B f03009fb4a66d0f6e610764c3f004953d1346c63bbd6915557ecd0efe12f5bed86c7c662306e786ffd589a9bcebb5aabfb93e3b8182f8903438396ebec8a355e SHA512 cd10332082ee5c78e1fec28669d716eb6b8299f559f955c1a96e899c3f4df1214ac029087172c1d0d63d29cac2897e79a4d7d6dc3553d98fe850c9cdd1cf545b
-EBUILD libva-9999.ebuild 1710 BLAKE2B d181248d43c1258afeb9ca09948a3c4e0555430ceb29328a33e7e9117a4199076bdb235c120df2e70e5653e069e256accc593b100383710a7666dec93cf8f80a SHA512 962ae7b977868fe9bf93ea4bed2d26e3e19dfa84855b8e154e2dae4721c9c971856383d27922d662a19dcc67811c87722a2e9a8c5548e4ccec009e00a248f5ca
+EBUILD libva-2.14.0.ebuild 1713 BLAKE2B 145c4efbbce03720086f6e31799cf84958cba6e64d50c84309e5467c268fac75bba18ff044dbac81c53a21402599b2c116dafda8de536b1bc406ca6be463eea2 SHA512 1580c4269b93fb4ced2d0e88315c0efcd0e3cf4f6da39e2607e8edf66b7601b3a0a0ced8b38ea51c6309f336cc29df6ec808752235508559387c33e4e6ca9ba9
+EBUILD libva-9999.ebuild 1717 BLAKE2B 62666bd850edfda63ad64e0f771bd321c7dc374022a70f6e6b7733ca80dd82001bd33d1a21e533bb6223f029fcba4e4cafab4de5bd12274d6f829c247e5bfe08 SHA512 986122df4a2991f91f5e76dff1679c27839700bb961cca76a688a3edd1c2bda85fe431194fb526bb4d4dd8b52981140628b746cdc2735ae99bbe65fa76ce805f
MISC metadata.xml 470 BLAKE2B d9df0ced571b8afa6cecda8dafb7165d142c3fd1c0fff21526d5624edb530e0ac705a36a7fa1a17d18583805a267652dfb77850a70aa47dcceb4794636821e9e SHA512 66f62980ed7d876f681bc77cb47cf43940fe056db6577557cf518604885c54ad94a17680c6749eb81937b44e21d7df9cad3ede05fdf74be88dcb6d21e271491e
diff --git a/x11-libs/libva/libva-2.14.0.ebuild b/x11-libs/libva/libva-2.14.0.ebuild
index 1e77dc053d30..a4668da9b31c 100644
--- a/x11-libs/libva/libva-2.14.0.ebuild
+++ b/x11-libs/libva/libva-2.14.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
EGIT_REPO_URI="https://github.com/intel/libva"
else
SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 572eb16bd958..48d03afe7a28 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
EGIT_REPO_URI="https://github.com/intel/libva"
else
SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index f0498fef846c..ec3aabe3e0c2 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,5 +1,5 @@
DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
DIST libwnck-40.1.tar.xz 455624 BLAKE2B dd069cba299b9006a10de3311da87958f14a9defcc02a936cb0be38431eda9210aa8cff36ae63858235380a75c1d5266ce0612b5f93f47de21d48a5324af8a6d SHA512 50ba20547e95280d10f1f66f36eea6c649b59d385da7a9217c295150520099585a5ff43c08a552afb8b0db3ee7305bbb2c38d0baed84cc6dc0942f3ca1e43e29
EBUILD libwnck-2.31.0-r1.ebuild 1209 BLAKE2B 5bf316bc3ab03afbc54fbcf4095804721f86b24c81be44e416d5e1107d65954b9142a739e8d46ff07a27657b174b078a364e52640cec50a8676cdb7916f34888 SHA512 adcd8a2024f44730082de7a27bea6fdea598f3ba5495fe18f86df09e23d21218cf9fa4403a4ad665d0ca218e2aa5d1187643bb68cc57187e9825a9f558cd4eba
-EBUILD libwnck-40.1.ebuild 1410 BLAKE2B 41de94e5d9c92e57414d6af7496862b6db655d175778c599ed29e456077713ba0c51000b15b75f8d28a0641d10e0091279df653affdcd8b569ef9bdf19ca109c SHA512 153b9a15843562614b0b1732a94696eb917c71f20504e16b215ff37113de04a4e8879f95d9f631406d6c522379ad7cb1eda6a09d00f1b4b7db3e57b13a34d0d2
+EBUILD libwnck-40.1.ebuild 1417 BLAKE2B 03b3cd2b320b1699aad725de8dd7cd52782c3b876c699783685639a924093f8d64c2268d3b4501f60fab9748f173552326ca7b4b525e3c9a9fd1375a6742df89 SHA512 8549fddc4440b2e10479161d1531a42a90cf322c91658440f5fd9516355d41513f9e933808b14eecc8e962e254199b2961c37d9f527fd4e1cc05e83f3d0a24bf
MISC metadata.xml 365 BLAKE2B a7be92726d84fa9db42339b18e8ce7cafcf36a19c7573295c5b833c6ab1fcde222bcb43a645ae5c581d8fbe71e52073381f73203c89009dc9088aa4d11c9a1dd SHA512 d7fccc45d93efd6f83a0af12a1b8816a4a9d45c379f247f0728e7bcc7c4b6d8e193649ac83df6070fac2841b42708181829393cc424075067ef49496eb1f9f54
diff --git a/x11-libs/libwnck/libwnck-40.1.ebuild b/x11-libs/libwnck/libwnck-40.1.ebuild
index fc95a99f6e79..d1d0d39aaa99 100644
--- a/x11-libs/libwnck/libwnck-40.1.ebuild
+++ b/x11-libs/libwnck/libwnck-40.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
LICENSE="LGPL-2+"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE="gtk-doc +introspection startup-notification tools"
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index cbb428bd159c..d3aada6ce765 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,6 +1,4 @@
-AUX libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch 5795 BLAKE2B 0a864b0fbd998fdc6c151b9f9cdb2a31797ac693b4ffa164a6f9a3c0fc1c5430454ec97be4c52ed48489cb08e820a998086fc588cdd2348b16da122bd483b8bc SHA512 e5148c7c310ca395b7e0f3b76ef98d79e50d0ac58935ad6df3c71bfd426166ce736ccfff4970e9523a2418820cd7cb2cba6e8818f23dd5cc21dac69accc1c3f9
-DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
DIST libxcb-1.15.tar.xz 446492 BLAKE2B d50146ee9b822dfd0c24513110e1706cda05ce588f276005167a911d3097275f36be1ce755c42c2b2970e750f10b2b943f3e373b6e55865fba986e29811a3545 SHA512 f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9
-EBUILD libxcb-1.14.ebuild 1500 BLAKE2B 31d68d2b246e4da3906e3a1507fa83a151a9ee3b66427192dc1917d95fe3e48c43765b8284d8f074d2f8a19c82e2f1055f36aac4c515f0096339547ce753e57c SHA512 6e86fde7e6b6c011b81b946a6a1f22070285d75e8001dd9a31e059e9579287b2c863425c505dac0de14ccf613541b660d06e771313d4b639ba2d2db8b91e1ed1
-EBUILD libxcb-1.15.ebuild 1427 BLAKE2B 2f951f68b04f71599829c502b240cb6a028f9ee62d521b7254ffe203a91ab39918783f8b335b2a829813bb92e7ee009b414d0387d480c1d2fe312e7d328508ea SHA512 8723fe98d3a9ca995e587deeb1c49c44b78febfddb1ee81cd543ece1786dcd3e6f18f9a00118d5b6c38317d5ae95f69e460f1333da9f9121b71510b551b0aee1
+EBUILD libxcb-1.15-r1.ebuild 1418 BLAKE2B 71e16e36934cf585735e6981cc27b65d6736ea2dcfafbf7689d71ea974b9945d7723c24e436d307d9b144c06dfd3f39d375692c0f0b243bafa524c454d06dc33 SHA512 e78c446596a8555cc6833b7337d321b4642ff3ac2388d5e40ce7354cc95b9c71556c8a664f98ec75f15df04fad07c95639655e1850eb0c4bdb2ef480d3a2de57
+EBUILD libxcb-1.15.ebuild 1419 BLAKE2B f3cbdfdb4e2e6033dc98dbad1a4a99bca3ced8d444044023bf9f0205d1ab6270c2cb4738aeec1c6654aa96fe9929ab7defd5ad6553b5419bb34b8a1fbeaba1da SHA512 bdac2c0d046ec98dc990a6312f867a413dbff5bde21563e0845bb8d79de5446ebd0f9c9a69ebc2248114920703de5d2af79ce8c292b85e26c4ccda8cf31107ee
MISC metadata.xml 401 BLAKE2B 67d85ae2c4ac6eecb10245666173d96f896ec9eddc36c8d0890092cbd19c7dd685f327332235937afbb119fa6e69860920fc1e385fdc750d89c85b67a9fbaa20 SHA512 72981a4b87a9219573847178c3d50f9a182c0b0a82917d3d472be062a5bb5e21422bc1776a8988b0ff0a5248a6f5eabe3dee3aa51612b31a7da283fd870b58ab
diff --git a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
deleted file mode 100644
index cc7f22ba4e9d..000000000000
--- a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From f01f3c378eb0168fbb055c7be1c2d08a7acd3752 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran@unusedvar.com>
-Date: Tue, 17 Nov 2020 23:43:06 +0200
-Subject: [PATCH] tests: don't use deprecated fail_unless check API
-
-It causes errors like this when running make check:
-
-check_public.c:40:24: error: too many arguments for format [-Werror=format-extra-args]
- 40 | fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
-
-Closes: https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/49
-Tested-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Ran Benita <ran@unusedvar.com>
----
- configure.ac | 2 +-
- tests/check_public.c | 30 +++++++++++++++---------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/tests/check_public.c b/tests/check_public.c
-index 2094bfe..aed40c8 100644
---- a/tests/check_public.c
-+++ b/tests/check_public.c
-@@ -37,18 +37,18 @@ static void parse_display_pass(const char *name, const char *host, const int dis
- got_display = got_screen = -42;
- mark_point();
- success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
-- fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
-- fail_unless(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
-- fail_unless(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
-- fail_unless(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
-+ ck_assert_msg(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
-+ ck_assert_msg(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
-+ ck_assert_msg(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
-+ ck_assert_msg(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
-
- got_host = (char *) -1;
- got_display = got_screen = -42;
- mark_point();
- success = xcb_parse_display(argument, &got_host, &got_display, 0);
-- fail_unless(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
-- fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
-- fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
-+ ck_assert_msg(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
-+ ck_assert_msg(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
-+ ck_assert_msg(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
- }
- putenv("DISPLAY=");
- }
-@@ -79,18 +79,18 @@ static void parse_display_fail(const char *name)
- got_display = got_screen = -42;
- mark_point();
- success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
-- fail_unless(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
-- fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
-- fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
-- fail_unless(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
-+ ck_assert_msg(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
-+ ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
-+ ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
-+ ck_assert_msg(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
-
- got_host = (char *) -1;
- got_display = got_screen = -42;
- mark_point();
- success = xcb_parse_display(argument, &got_host, &got_display, 0);
-- fail_unless(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
-- fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
-- fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
-+ ck_assert_msg(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
-+ ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
-+ ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
- }
- putenv("DISPLAY=");
- }
-@@ -183,7 +183,7 @@ END_TEST
-
- static void popcount_eq(uint32_t bits, int count)
- {
-- fail_unless(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
-+ ck_assert_msg(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
- }
-
- START_TEST(popcount)
---
-2.26.2
-
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.15-r1.ebuild
index 8cd1a7ed1915..f53663413b6f 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.15-r1.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE=xml
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
XORG_TARBALL_SUFFIX="xz"
XORG_MULTILIB=yes
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
DESCRIPTION="X C-language Bindings library"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc selinux test +xkb"
RESTRICT="!test? ( test )"
SLOT="0/1.12"
@@ -25,23 +25,19 @@ RDEPEND="
>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}
- >=x11-base/xcb-proto-1.14[${MULTILIB_USEDEP}]
+ >=x11-base/xcb-proto-1.15.2
elibc_Darwin? ( dev-libs/libpthread-stubs )
test? ( dev-libs/check[${MULTILIB_USEDEP}] )
"
# Note: ${PYTHON_USEDEP} needs to go verbatim
BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep '>=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]')
+ $(python_gen_any_dep '>=x11-base/xcb-proto-1.15[${PYTHON_USEDEP}]')
doc? ( app-doc/doxygen[dot] )
test? ( dev-libs/libxslt )
"
-PATCHES=(
- "${FILESDIR}"/${P}-tests-don-t-use-deprecated-fail_unless-check-API.patch
-)
-
python_check_deps() {
- has_version -b ">=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]"
+ python_has_version ">=x11-base/xcb-proto-1.15[${PYTHON_USEDEP}]"
}
pkg_setup() {
diff --git a/x11-libs/libxcb/libxcb-1.15.ebuild b/x11-libs/libxcb/libxcb-1.15.ebuild
index 38cd08cb34f8..4a9b2b45b944 100644
--- a/x11-libs/libxcb/libxcb-1.15.ebuild
+++ b/x11-libs/libxcb/libxcb-1.15.ebuild
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
DESCRIPTION="X C-language Bindings library"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc selinux test +xkb"
RESTRICT="!test? ( test )"
SLOT="0/1.12"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index cc39230be1ae..540d975a7c04 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,3 @@
-DIST libxkbcommon-1.3.1.tar.xz 471036 BLAKE2B c46d39876bd4477fe838e17e744ed04388417cfae8bb77c7de48237d31f51fe230d2705733dc0873253b48c61530fbe932e4da7317217c31a7897702fa1d03b4 SHA512 3b2cf6ae9ba4dc8b6fe702ac1fa700034fbc9bd147c73bd2cd93546bcfb71865734b3e46bad35a8fd618ed97266a02dad1dc966c63e6b10404a64919459d933e
-DIST libxkbcommon-1.4.0.tar.xz 471948 BLAKE2B 5b0a155a3a47adb7302db01f3daa0ef81993a9754b032b01f1cdbd53af74d15df95dc6c9334860211a28272b246f66978ad6e409db74a242afb13c17dc25b76e SHA512 7dd86952c036a6a78455b1ba05b53fcff9d6f133bb01c83fa860b4eaec3fc26bb0b5535948bcc2dafbd27204c3c91d01404ca9fc52896cc36af509384797d4f1
-EBUILD libxkbcommon-1.3.1.ebuild 1474 BLAKE2B 6fad57ab223145b1f966714970d6e21bc16841405a569e68a505587c7ac2fedaab111be7b58d0d99bc700c4dc8c6e3723e49b1594e2d6033519a640530908515 SHA512 1e78ed395916ed6e9c2691ae7113ba90cdb0123e9ca2d675ff3ea6d22da9dfbe91771131a6ef8a7a1ac6fcbee6238ff88761180ee3ea7e60da066d549b9aab21
-EBUILD libxkbcommon-1.4.0.ebuild 1549 BLAKE2B 8e1f8c89bb116b7d571957128e7fd16affaa92714ce32f163255d07e23dceb083f4d13e881ac124f8b44da6c435fe1e4c6ad647ca5a7ee6fe8d0947c7052cadb SHA512 74bf0d2980af0dc1189ae051bd8d30b9146df6e375b6cd86ce92c760977b16767ed4d2f4fb84f9740c97eb54226d049a0a79c18f91fba37e2444b48d8d919062
+DIST libxkbcommon-1.4.1.tar.xz 471824 BLAKE2B a784f3612bb52abb79bf1a2ddd3e7709fa52eddce5cabcf8520ed7df8ec8ea557e51205e1e9d116a0b31eb27b1f3bca33144318c5f01be7312cbb3e48f687fbe SHA512 757b340aeab6d187917807a88015b5113475ab2172aaaa8e530b40ea60619b3fbdfa668fd62707d66ed8fb763e68fee19394fcbd519af7c01d8975c59fdf0d89
+EBUILD libxkbcommon-1.4.1.ebuild 1545 BLAKE2B 7b0af3e3b664290fc834f621ccc0c740bdfb31c4e342380fc9847857f8172c4d68b486822547fcee5bf37cc13d4faaf460a9a9930a546d33f4c54266bea5dcba SHA512 ffc63c15e96bcef0ba4c7a28b12ffff1e7a72888f467a9b6f3ee5466330dd7bc98473fedbf0e271b1dd0da48fe829177ec56a3a4b5314ed20bdb3fef5e3f3a4c
MISC metadata.xml 392 BLAKE2B 387cc216299e7c312552b0fa7abdd744203daff7bc5a51ef5b7d2bcfd39b83904308c8bb2b66f2459f77f593e18fc8ade017491fa45e698e8e6bfce03a819df8 SHA512 0ab9850b467605c1050d70ca526d2a4c2957e3ec9f56113fcabeb9d4a79cb8636ab077f66e17c7e05b79aad6948a7e89a83e5d8c48197ab016a7f5b2f2886f42
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
deleted file mode 100644
index 513cfd69b0c3..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
- SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="doc static-libs test wayland X"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-BDEPEND="
- sys-devel/bison
- doc? ( app-doc/doxygen )
- test? ( ${PYTHON_DEPS} )
- wayland? ( dev-util/wayland-scanner )
-"
-RDEPEND="
- X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
- wayland? ( >=dev-libs/wayland-1.2.0 )
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- x11-misc/compose-tables
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
- wayland? ( >=dev-libs/wayland-protocols-1.12 )
-"
-
-pkg_setup() {
- if use test; then
- python-any-r1_pkg_setup
- fi
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Ddefault_library="$(usex static-libs both shared)"
- -Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
- $(meson_use wayland enable-wayland)
- $(meson_use X enable-x11)
- $(meson_use doc enable-docs)
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- virtx meson_src_test
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
index 1928a5e2d281..f3622c3dac8a 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
@@ -8,10 +8,10 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
else
SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index dad770513fc4..03bd62605609 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,3 +1,3 @@
DIST libxklavier-5.4.tar.bz2 390428 BLAKE2B 3cd109c6200ef977533d39b1362c33f871c2cd0b011779b726546aa7dc95bf7dc89931dff7ca2e9a012a51aeec602a53df499591ab30e1dd813fcc823318a2e2 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
-EBUILD libxklavier-5.4.ebuild 1367 BLAKE2B 8c0719cc41b8ef141cfb02238ee594de9bf01a41aa08749a0e8596fd1f62dfcdbe8a161a0816a871af9d3876c40061a32e8bd97e91d9b51775facef7592b12d1 SHA512 75884ddb6594dab374214aa476ed199310730f4ec86173570a0a9c0c1945cebff4bfaad7d382a01d55110e110253b7d2aac430d7ca5257bbe84abd3f5b9b8d67
+EBUILD libxklavier-5.4.ebuild 1374 BLAKE2B 689bc7cb48e289ce12ba1aba9ce4b5fe7fb2b8bd0f5512ef356bc41374bd2ec58fce198ec84064dc8b9dc250d8671a866c216c3a23167cd674aa14486dff9297 SHA512 7cee61b1fd8b79c3c7803d73807b48aa52af427e53315b97c3a9cf7f113ac07454c98c7e6d786e0382ae9e6cf5d9eaa33e6c4432dc691a46feda35ee233bd909
MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index ccc718f7efa8..b8d6e7e7ab16 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index bcd46bdf884c..480db6cb315d 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,7 +1,5 @@
AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
-DIST motif-2.3.8-patches-1.tar.xz 1896 BLAKE2B 7234860dadac55362c7f1804133a660da1ab468fb6c0f0c71cad76b956a5f0b1e58874496a6721f49bd6413e916014807e946112b48b9a22272db5e4d97d43d9 SHA512 22e5d8c590d2c1c57fc639cb46d16984dc5fbafb3b68fd647d180d6299a06f884a8ed69e2180da8153bb0f68821eb0031f93e9b9a3128ba93535fd7fb92b402b
DIST motif-2.3.8-patches-2.tar.xz 4068 BLAKE2B 5466f824d71edd1d787eebe5b1fa09de5b52ffa20cdf733301722c4f1d7509af8084f226d68dcba14c2e8d15d5b1ea7d49e408eea8f710af3c0b27c86aba444c SHA512 27e10c2a5b3dec8597acb04940bb8e000fc43c325e5b6f578246ab4187ef34264940369bff1e9c999ba967e85e093434e16a447f1d4da805d0a5ab1576e5ef80
DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-EBUILD motif-2.3.8-r2.ebuild 3055 BLAKE2B 9e910be57aa656ff5234012c677c669814505537e78e6a56cecd0b97f14c94eb081332d8012972581d12fe8c4a0927276457f3a5e81d9429b2644973ea6df540 SHA512 465c166e1c5a6dd46faf07a915b6abb505ba04355e537cb43bca0447af5939c3a6ebf6a13d0f88adbb811c82a44febae2797e75cb8103c0464fd25caa4abe97c
-EBUILD motif-2.3.8-r3.ebuild 3053 BLAKE2B 5532b2a0fa173069c2198b7de210ed3ccec59b96b3e10f199cf464a6a093ede066929f8e43be773a4ad22a02b0fd09cf38846d87f22358728014e29f4583b2b4 SHA512 bc550f0d4d8204875a58b2921ba166ef018e4dd51fb005d532159bf37cb65b3e8b452e05f0ebb5efd133a5b39827f341f4ba0b641a6cdb0312e7b4a3666f11d7
+EBUILD motif-2.3.8-r3.ebuild 3062 BLAKE2B 1b8eaeb9130cabfb96050aa4742ece95b796340fb403e472f99187dd9fff654ebf68a526acf925075ad74bfcd1182f59f96155e83f0c58cb38ca167d5494f1fb SHA512 b5a5269812a1b7f8f650b5d5f3599eb68101d3bb500374c2d85dc76eedb604eddf3abe3840da6d952444693bf74161e934f4c3b57e69227bd944db91d4914ef4
MISC metadata.xml 445 BLAKE2B 4cfd68cffe9f6c0fdccff74526669d1585ce47949682b911becb4508f40a13493be2a55b5cff6a90c0c9556b330a96bb478dbef2e1b16e4f4baf7a323d88ada3 SHA512 d8ada4a3a14db837ab11752d55bfec960de6a631fd4bbfa569dc4a09d8b3ff3f6908339888e83ad56c716ae9d940111c36030db870f2765b86db2303ed2fbaba
diff --git a/x11-libs/motif/motif-2.3.8-r2.ebuild b/x11-libs/motif/motif-2.3.8-r2.ebuild
deleted file mode 100644
index 707f27f2cd29..000000000000
--- a/x11-libs/motif/motif-2.3.8-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="The Motif user interface component toolkit"
-HOMEPAGE="https://sourceforge.net/projects/motif/
- https://motif.ics.com/"
-SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
- https://dev.gentoo.org/~ulm/distfiles/${P}-patches-1.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
- xft? (
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
- )"
-
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-misc/xbitmaps"
-
-BDEPEND="sys-devel/flex
- dev-util/byacc"
-
-src_prepare() {
- eapply ../patch
- eapply_user
-
- AT_M4DIR=. eautoreconf
-
- # get around some LANG problems in make (#15119)
- LANG=C
-
- # bug #80421
- filter-flags -ftracer
-
- # feel free to fix properly if you care
- append-flags -fno-strict-aliasing
-
- # for Solaris Xos_r.h :(
- [[ ${CHOST} == *-solaris2.11 ]] \
- && append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
-
- if use !elibc_glibc && use !elibc_musl && use unicode; then
- # libiconv detection in configure script doesn't always work
- # http://bugs.motifzone.net/show_bug.cgi?id=1423
- export LIBS="${LIBS} -liconv"
- fi
-
- # "bison -y" causes runtime crashes #355795
- export YACC=byacc
-
- # remember the name of the C compiler for the native ABI
- MY_NATIVE_CC=$(tc-getCC)
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --with-x \
- --disable-printing \
- $(use_enable static-libs static) \
- $(use_enable motif22-compatibility) \
- $(use_enable unicode utf8) \
- $(use_enable xft) \
- $(use_enable jpeg) \
- $(use_enable png)
-}
-
-multilib_src_compile() {
- # The wmluiltok build tool is linked with libfl.a, so always
- # compile it for the native ABI
- emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
- emake
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use examples; then
- emake -C demos DESTDIR="${D}" install-data
- dodir /usr/share/doc/${PF}/demos
- mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
- fi
-}
-
-multilib_src_install_all() {
- # mwm default configs
- insinto /usr/share/X11/app-defaults
- newins "${FILESDIR}"/Mwm.defaults Mwm
-
- # cleanup
- rm -rf "${ED}"/usr/share/Xm || die
- find "${D}" -type f -name "*.la" -delete || die
-
- dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}
diff --git a/x11-libs/motif/motif-2.3.8-r3.ebuild b/x11-libs/motif/motif-2.3.8-r3.ebuild
index 59092ddaa9c3..6b4f686a43d4 100644
--- a/x11-libs/motif/motif-2.3.8-r3.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r3.ebuild
@@ -13,14 +13,14 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
LICENSE="LGPL-2.1+ MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
xft? (
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index c9e7545ab6c2..c1f3bea8d324 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,14 +1,9 @@
AUX 1.42.4-CVE-2019-1010238.patch 1088 BLAKE2B 7517b2b4c3502546a554d3b592c8c48af444bf2797fcffd18bd63fb97023f3fff666c70359d4935cf179d7e98be12b885e5a2937d882b27f213e17658002e0a9 SHA512 24f46b5d14dd589b0d5ca992169fb46a696d0251c63cf3c0210bfded534f4f35d20bcd158c4397d6ebe828ae995a5321daca4ecc634f0d5f38bc7f5ccf8f2fee
AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
+AUX 1.50.7-harfbuzz-4.patch 2168 BLAKE2B 3aab03d810e6cb6b540c9381b310ef76cde1b4d3053db40fbf28f3bcb1a5de979927ff12d19639ad95af84dcf2b45eae5f2e148c00fb3d4243148ba928285176 SHA512 cdd895141817d4e0e363a3e9f2ae0df03c0cf379b6868689fa39fbd63b090864d59f74c1c432e55479e45ca0e14d4254cd2f4758b80f9f7cdb383285e953866c
DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-DIST pango-1.50.4.tar.xz 4290504 BLAKE2B 310a7be79ebf693b3a7775fa86557539bf4ea682b0903266248ab2812504e805024b14a917531e71ad9b5637d4d3f3c1a06b84188eb01aeed37fdcc7d11679a9 SHA512 b44cf9bd7afd633fab326e70b69dcb9f00cc26dcc36361793d3654b5ae798a303d4e63e173370f396c4fa474a4118c53076927fe7cc944fc35a32adf3a656806
-DIST pango-1.50.5.tar.xz 4291708 BLAKE2B 90a1fc927ee1e06eb76ea6b82e9851e3381d5393a1992db0d3da4d3a934b5bf08f4485b40a9eef58aa906e3f0b74e71f491d947ae00310130ec5e23bde47d836 SHA512 6e898945ca9682ad113cea8a5702068d6141d39bc51a27093c6c1627c10825005155c73778cb5acab99551689dd1b47069f7d5ea102db11f00416ddcf747b8c6
-DIST pango-1.50.6.tar.xz 4293168 BLAKE2B 63cad33f5fe5361642edb0e26a11c45e28e23400f29c078079fa9ce4411eca90c67fdd789e8cf9caec0f1d4a6b5d619808d8dcf53447f961b66db17e1bbcdb97 SHA512 27fe5b2398995fc9103dbb957bb10e5f35284762260fe29366eafd2ba570d90bb0d2f865bd78ed6728417dfde54931f014aaa2155e3eae054e1a45a2a07bf90f
DIST pango-1.50.7.tar.xz 4294752 BLAKE2B 049b7c09f2ec35ca229eadcd146513d2b292fac8c2296a1635f32c1e21a2ff14979c4ce4a88f966d2d85dad55e356f089c09e00062d06373f7d0760871333046 SHA512 4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3
EBUILD pango-1.42.4-r2.ebuild 2317 BLAKE2B 7bbc0227f8b846c1e51cc142e7a3088ec88c2fdc35fff8970daf3699e94e369de66380fc140aca039accd546270be27c809e13c0a71d42ae8df19f64198d22c8 SHA512 8c1c0f11ad9ecbe7f464e7b839de614e4f266d2674b843d133489b882270f02754c61b05f2624a2b4c9d571b7824d2a142ccc2105e2c7e968fc26e97e2936c1d
-EBUILD pango-1.50.4.ebuild 2264 BLAKE2B d506d18f028db1a83bd38485a60706f7563f08f1b4bf5256a8e2d3a1be097030281d60a4946b8812b89c55d19c3d5a2dd4e3d11a7b24827a2fa0201c75c58d69 SHA512 769ba222582a9cd3c4b3bbacb2b27d5c5cc5cdb752a93ea8d94036ce35c9b31e0a1614c5b4384ca320edcfcc681204e2a4fff37b75adbdb56ed99ab2ab3073de
-EBUILD pango-1.50.5.ebuild 2272 BLAKE2B 5c1fa2368a5f1fe99f4e50cac03851c0cb28ec7fca9318d614257583df94182d07ef754990911466aafd75b0122c839106e51c90c5cc4a04bbdddf85bf8f9ce5 SHA512 f07c6b8ce20b9855790a3fcd075480294646be56ce1184b72125784f6c5717ac94f3fdd02f73e13137d6ad136c2780cd5d190ff9fffddbc426284bffc50031ea
-EBUILD pango-1.50.6.ebuild 2272 BLAKE2B 5c1fa2368a5f1fe99f4e50cac03851c0cb28ec7fca9318d614257583df94182d07ef754990911466aafd75b0122c839106e51c90c5cc4a04bbdddf85bf8f9ce5 SHA512 f07c6b8ce20b9855790a3fcd075480294646be56ce1184b72125784f6c5717ac94f3fdd02f73e13137d6ad136c2780cd5d190ff9fffddbc426284bffc50031ea
-EBUILD pango-1.50.7.ebuild 2278 BLAKE2B 813a7f842496d18f60c16cd00d25fd41a06a0d41ed9ba73034762338112ee7531a1efb2740758c91b5507e42261d6f528b59c1ce703957bf9c3bf3c80989ac3a SHA512 fda25bf8721f39e2d643bddda1f2977b935d649a5756bb9fdeee1969b35f65b17ccb8a368fdb450979e5690338cd7c99a89b8da9a5333d0b685882481aa11194
+EBUILD pango-1.50.7.ebuild 2393 BLAKE2B e71c83d31bb46754c830caf45f3c30ab369cb9225400b406fd0f75a4fe0cb854fdfe2338a9fc9431256415128846ddad0b81b9e4b0b6f87183752aaa1a3870c9 SHA512 d15bc369f30091885a59ec14c870210d0592eddb359ea1c00f2d03d3be793098bd6185475db358f48ebd8a770315b879b95ceaa7d6e60169f13037459344248d
MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb
diff --git a/x11-libs/pango/files/1.50.7-harfbuzz-4.patch b/x11-libs/pango/files/1.50.7-harfbuzz-4.patch
new file mode 100644
index 000000000000..91598f9969e5
--- /dev/null
+++ b/x11-libs/pango/files/1.50.7-harfbuzz-4.patch
@@ -0,0 +1,78 @@
+https://gitlab.gnome.org/GNOME/pango/-/commit/0226bdd9c223f5651b6657a14cebc900bbac4b19
+https://bugs.gentoo.org/836317
+
+Fixes tests with Harfbuzz 4.0.0 ish.
+
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 10 Jun 2022 08:00:22 -0400
+Subject: [PATCH] Update tests to pass on F36
+
+Rounding differences are our downfall :(
+--- a/tests/layouts/valid-14.layout
++++ b/tests/layouts/valid-14.layout
+@@ -25,7 +25,7 @@
+ "is-ellipsized" : true,
+ "unknown-glyphs" : 1,
+ "width" : 161792,
+- "height" : 20480,
++ "height" : 21047,
+ "log-attrs" : [
+ {
+ "char-break" : true,
+@@ -261,7 +261,7 @@
+ ]
+ },
+ "flags" : 0,
+- "y-offset" : 0,
++ "y-offset" : 567,
+ "start-x-offset" : 0,
+ "end-x-offset" : 0,
+ "glyphs" : [
+@@ -360,7 +360,7 @@
+ ]
+ },
+ "flags" : 0,
+- "y-offset" : 0,
++ "y-offset" : 337,
+ "start-x-offset" : 0,
+ "end-x-offset" : 0,
+ "glyphs" : [
+--- a/tests/layouts/valid-20.layout
++++ b/tests/layouts/valid-20.layout
+@@ -40,7 +40,7 @@
+ "is-wrapped" : false,
+ "is-ellipsized" : false,
+ "unknown-glyphs" : 0,
+- "width" : 67584,
++ "width" : 76800,
+ "height" : 25600,
+ "log-attrs" : [
+ {
+@@ -138,7 +138,7 @@
+ "glyphs" : [
+ {
+ "glyph" : 244,
+- "width" : 15360,
++ "width" : 18432,
+ "x-offset" : 14764,
+ "y-offset" : 3845,
+ "is-cluster-start" : true,
+@@ -146,7 +146,7 @@
+ },
+ {
+ "glyph" : 272,
+- "width" : 15360,
++ "width" : 18432,
+ "x-offset" : 14764,
+ "y-offset" : 4280,
+ "is-cluster-start" : true,
+@@ -154,7 +154,7 @@
+ },
+ {
+ "glyph" : 273,
+- "width" : 15360,
++ "width" : 18432,
+ "x-offset" : 14764,
+ "y-offset" : 3507,
+ "is-cluster-start" : true,
+GitLab
diff --git a/x11-libs/pango/pango-1.50.4.ebuild b/x11-libs/pango/pango-1.50.4.ebuild
deleted file mode 100644
index 92c1485a0b64..000000000000
--- a/x11-libs/pango/pango-1.50.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 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/pango/pango-1.50.5.ebuild b/x11-libs/pango/pango-1.50.5.ebuild
deleted file mode 100644
index 13c9fd367584..000000000000
--- a/x11-libs/pango/pango-1.50.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 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/pango/pango-1.50.6.ebuild b/x11-libs/pango/pango-1.50.6.ebuild
deleted file mode 100644
index 13c9fd367584..000000000000
--- a/x11-libs/pango/pango-1.50.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 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/pango/pango-1.50.7.ebuild b/x11-libs/pango/pango-1.50.7.ebuild
index f3c9e0dbfdde..366b60090874 100644
--- a/x11-libs/pango/pango-1.50.7.ebuild
+++ b/x11-libs/pango/pango-1.50.7.ebuild
@@ -11,9 +11,10 @@ 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 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="debug +introspection sysprof X"
+IUSE="debug +introspection sysprof test X"
+RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
@@ -37,8 +38,13 @@ BDEPEND="
dev-util/glib-utils
sys-apps/help2man
virtual/pkgconfig
+ test? ( media-fonts/cantarell )
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-harfbuzz-4.patch
+)
+
src_prepare() {
xdg_src_prepare
gnome2_environment_reset
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index c984edabf0c0..c89734926aaf 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
-EBUILD pixman-0.40.0.ebuild 1858 BLAKE2B 06deeef64acab12ae0d51852c79a530c5e156ea33c2705095d76ddb1912b4a9c1f4946d36e551ebf1e731b766a5c497b4ded567bdb2695bca1ac35baf535dcc0 SHA512 6efcfa79a27ceb5454f24629b1bc309a6fe1da1de282eeee9fdf6df8342202fdcb0d0c0d1715627a97b5971b3b9125a498ba9ab3200efde3565a72dd51b38e14
-EBUILD pixman-9999.ebuild 1866 BLAKE2B b1a8cb848989ef3e5b5d298a441d805a1e7c7f1e3762f777a2ea29c9f3a9b4d868a55b640583aa25b9d228621db45a26e7c213a2d4cc250b2d856ff599093766 SHA512 d9d094a709813add61b94eadda8a2cf64bf1fb7476ac85d5900c855c82f45e3afa1ab216b04e37fd14d44d80736e876226fcf6abd8e7d5eca5b41436baf0a2fe
+EBUILD pixman-0.40.0.ebuild 2005 BLAKE2B 443ba3024143ba6106054358c3ecd28e4e3951f378d15740fed4141fa65908fe99b3ba074914b6860f03b5c30c855bfd84bad78d2fcbe6a9241ca452d93491f4 SHA512 1bdf7a0d33ef2b3bf03fa5d2e91b6d71e58336ad9b602869a54a5cf27c2303c4303916223740d1f5d79dae5280c92a12d3717950c5f8071bb2f90d45c0c9cfa0
+EBUILD pixman-9999.ebuild 2013 BLAKE2B aecf684907839c8ae0fcbfab97d226ba9638b4b192c4fd9cc20ec8b96aa0b661a38aa9e7eee71e3d204f56b6618cfc4e1862f9a93016f6ccca13f2dd3976b76c SHA512 5938e49282080d1be36df40014b922a8ff5fe71bb435a8146a81e5dfb9ee89e0c8b05c07732b8f74a68369897c62d019a4912109b33695f520f2d7de293ec13d
MISC metadata.xml 392 BLAKE2B 5ad5ba991fefef08fe1fa364ce726a90a338c6840947cd6fb9ac57b7e4cdff0389d9a6fac955164529a51ee5ec92cd2e478e4d330484593fcfdfc8d5325ca21b SHA512 ae68e9a2a492e899bff3ea5c70c88f054fde927c18e9d4a3c08030c8b2f5b6f2977bf9590b4d4776bb1151a3cd9de72bc18460c0ebdc2f506c8ff51b99a5b3c5
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index d74622ede459..795b17992f52 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -22,12 +22,18 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs"
+IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test"
+RESTRICT="!test? ( test )"
-multilib_src_configure() {
- local openmp=disabled
- tc-has-openmp && openmp=enabled
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
+
+multilib_src_configure() {
if use arm && tc-is-clang ; then
# See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
append-cflags $(test-flags-CC -fno-integrated-as)
@@ -42,10 +48,10 @@ multilib_src_configure() {
$(meson_feature cpu_flags_ppc_altivec vmx)
$(meson_feature cpu_flags_arm_neon neon)
$(meson_feature loongson2f loongson-mmi)
+ $(meson_feature test openmp) # only used in unit tests
-Ddefault_library=$(usex static-libs both shared)
-Dgtk=disabled
-Dlibpng=disabled
- -Dopenmp=$openmp # only used in unit tests
)
meson_src_configure
}
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index b1bf1b2339dd..ee72ddca48c6 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -22,12 +22,18 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs"
+IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test"
+RESTRICT="!test? ( test )"
-multilib_src_configure() {
- local openmp=disabled
- tc-has-openmp && openmp=enabled
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
+
+multilib_src_configure() {
if use arm && tc-is-clang ; then
# See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
append-cflags $(test-flags-CC -fno-integrated-as)
@@ -42,10 +48,10 @@ multilib_src_configure() {
$(meson_feature cpu_flags_ppc_altivec vmx)
$(meson_feature cpu_flags_arm_neon neon)
$(meson_feature loongson2f loongson-mmi)
+ $(meson_feature test openmp) # only used in unit tests
-Ddefault_library=$(usex static-libs both shared)
-Dgtk=disabled
-Dlibpng=disabled
- -Dopenmp=$openmp # only used in unit tests
)
meson_src_configure
}
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 7a882fdb090c..d7ada6085db1 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,5 @@
DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
EBUILD qscintilla-2.11.6.ebuild 1959 BLAKE2B 5609b01ac7f134c828f00689ddfb3f63816b0098b028199edde287211a969cbdbfa4eeb1c3442fca58d8021d205bd9fb82cd736bb0c5e617cc85d362ea39cd3e SHA512 b8365aa48d71e5d2c6421dd45132601e58857f35569397f7d157b710af5c4210bffcf9c88ef6800fe1ce96c909e21cf6cf5cd71346ec5f35f5b38ebe1048290e
-EBUILD qscintilla-2.13.1.ebuild 1903 BLAKE2B 98ff80479a4440fa60b07b5d4aa92cda637b523ee62c728a985bf486dc81e5cedcf9f074156357325b8a96ecaa971d821d363b4d287648fbd3fd51c4c8fd7b51 SHA512 40d30762c011d7be0b63b2249860c4c1f643a39e36637393e7e27f65283885d377eee22b860667e4713c92132a5c73a3d9d2ab89d9d8cc2b1813df05bb78e2bc
+EBUILD qscintilla-2.13.1.ebuild 1898 BLAKE2B 3f12cbb046479c41e627790dcdd07725f9d6a70ed75edf123b844702ed6ed7603b83fb35d93e4a2d078d409fdb0be39b17d61a849460f4523e3be3610d6a855a SHA512 600176bf4a329e0b4e076fd752630ab4edfed325145ae2e488a0fdc2f194cce50a802a6923198363d30234a95f047a311bb1a2a3bbfa1404c4138fb25d539461
MISC metadata.xml 605 BLAKE2B 926d6dffbaf1d0243678e72a7e09d537d58571413142bef96b5963ea21cf1edadb6404992a6c57c1698cc58f9154ef9eb80926f1472b0570f6f3c299e856304c SHA512 99a337e3019d6ea8f8887bd92130d3fbc8d042eeb4d0c42afd6ea943751b901dbe0bc94f3244ae55371e2e2b9cfc0e2c4709f2bcbd07b70e42c16c454ae83007
diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
index 28e0c4e73dc6..8dba82f8be1c 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-3"
SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
IUSE="designer doc"
RDEPEND="
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index a769b32022c1..210285037412 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,6 +1,8 @@
DIST qtermwidget-0.17.0.tar.xz 187424 BLAKE2B 8053eae3674f12839a205b0686bdb42d83662604da1f43ee6c4feb60c35af6a2f7b65a095a89b64ffd9d2c3ac10e7c78df721862f15f401126fcab3d321fb92e SHA512 c8f75dcd5182a6eea933452c89126fbe64035b278e8e9817d6966693f741691244e5766c49046e83add8f38cb00ff08e2640d2fa149c5aa46b20d8a06a22e78f
DIST qtermwidget-1.0.0.tar.xz 189764 BLAKE2B 5fafbb9431cf28c908930e1f568959a66085a71062971480807520f3ff936cda93465e257d3d4c208287c14f9c2a8a9ac5c26f5da07d64731de2a98af4de19c9 SHA512 c4628e13b8aaba88c6992c982b91dbf13205aaa9ecdcc49906850d3c80f00ea43ddf5d0d1bd9962ef0213f056b13c76133cdb59eecce794f6b74553e5db696c5
+DIST qtermwidget-1.1.0.tar.xz 187592 BLAKE2B 7fe1c0b5f6b08b40896caf354c87e849337a8840e3c5f2e2a17b33a3a2dc780c29d01f4ddbf904c6b6a32a04af04a6a6cce3f5e2b056e8ee38008060a9e7f271 SHA512 808034e372c619357a931c2831233b6e3db01917ca7fc709ddb02af4d26520c247ba1da329445792efeddb0409f596df10e31c7cc78e0386ac1ec64b4d23dc5b
EBUILD qtermwidget-0.17.0.ebuild 640 BLAKE2B e20ebb05b376b29f29cf3ab3947e632cc3c3919d85a2b71d43319ca90067f576d533e14b475fb46959297f96e49f37cf64005b50cfec57ad5f55a7ef6a397f42 SHA512 54d12f19ba5ee6a4616896709026b1c9b880816e4733b8d9df90f60fe42504dbc95fd261d60481d960dfcc46897898f22fefca402e275d37f34baab17f0bd7d4
EBUILD qtermwidget-1.0.0.ebuild 670 BLAKE2B e75cb0051d894e545ee7fcf90dae2e6d4e326b1104bc1cfefdcddbf6907db18a48cdcb358edcbb0c2f5c5b7c0006a7643598c5d3c2a32f7f0f06cc9ad3bf7553 SHA512 1f1c205fc3605ddcbcc6e3ff04472c65464962380fd6f9f1af7ce43eb3442300026efcf775874ec3a62f1e3c6fbc6d42d8e73089a12f7127fd88578fafad52ba
-EBUILD qtermwidget-9999.ebuild 673 BLAKE2B b9b4b94b2830dec0fd8906c690522725de587c7c219eb5d7641cafcedccedfef64b55b474ae7179d8468a76e9d09c83578dc3f72c4645557e7afd86fc0fff4c0 SHA512 32e063fd49ed2e7a0e27446de5e27342c96883bfb644a81be7b0badc500b10a7947405adc254ebb5b22f3094ff35ca11251d4dd6f7a15808db40a419db42e75d
+EBUILD qtermwidget-1.1.0.ebuild 673 BLAKE2B 51b8144f6d89ba51cb7d9a5e8a576afa0a6a6f456fbeb88a607cab1503be716b7426bd347c14852d09d0f85f5001b500100e6e5ff4a90eecb72f60d615684ca3 SHA512 176212c4528ee5cac8c25964f3095e633d32cb269ba3bf7dec2889ce1ccdfe011048ca50ca6d4cc9c12b698a967d63770328b0ac56642b46363d53a670f78db7
+EBUILD qtermwidget-9999.ebuild 673 BLAKE2B 51b8144f6d89ba51cb7d9a5e8a576afa0a6a6f456fbeb88a607cab1503be716b7426bd347c14852d09d0f85f5001b500100e6e5ff4a90eecb72f60d615684ca3 SHA512 176212c4528ee5cac8c25964f3095e633d32cb269ba3bf7dec2889ce1ccdfe011048ca50ca6d4cc9c12b698a967d63770328b0ac56642b46363d53a670f78db7
MISC metadata.xml 603 BLAKE2B ea430f4683aba5813eb7299f56de863dbd4f8b31d23ace4a727fd09c638d038b7bfed6c01274e184b0db0131009eac282e9505a786e6e65b7071a8f14c2da269 SHA512 462305496afcdcdeef9677be6492f8739874892e80fcd789e83b8349e32bdcc822016d8b2efc58a47d32b2385a08538faa64179328ca9309eeabeabbec5cc21c
diff --git a/x11-libs/qtermwidget/qtermwidget-1.1.0.ebuild b/x11-libs/qtermwidget/qtermwidget-1.1.0.ebuild
new file mode 100644
index 000000000000..aaa3dffde923
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-1.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="BSD GPL-2 LGPL-2+"
+SLOT="0/${PV}"
+
+BDEPEND="
+ >=dev-qt/linguist-tools-5.15:5
+ >=dev-util/lxqt-build-tools-0.11.0
+"
+DEPEND="
+ >=dev-qt/qtcore-5.15:5
+ >=dev-qt/qtgui-5.15:5
+ >=dev-qt/qtwidgets-5.15:5
+"
+RDEPEND="${DEPEND}"
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index a55ee925c0fd..aaa3dffde923 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ SLOT="0/${PV}"
BDEPEND="
>=dev-qt/linguist-tools-5.15:5
- >=dev-util/lxqt-build-tools-0.10.0
+ >=dev-util/lxqt-build-tools-0.11.0
"
DEPEND="
>=dev-qt/qtcore-5.15:5
diff --git a/x11-libs/spread-sheet-widget/Manifest b/x11-libs/spread-sheet-widget/Manifest
index a7273418cca8..bd6c188b3357 100644
--- a/x11-libs/spread-sheet-widget/Manifest
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -1,5 +1,7 @@
DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeacccce169a6f53d9f7f418f5e8469744fb19b SHA512 1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc
DIST spread-sheet-widget-0.6.tar.gz 522827 BLAKE2B 0e68fff897915b9a74fb954d604efde4180c82550d5af7ec43cdb3bc843fefa5eaf33994e95dcd65cadf5f04c24e1d0a7f08f0c7465a35c62c434c42c48bd366 SHA512 7a5b436cb0411fa4759b467935b7e14a15ae83c971a449525ef19cb50584ef9293efb1f6160e3b373b5bf7b48c2688c36f8396b5942599ebcb8e2957e07179b9
+DIST spread-sheet-widget-0.7.tar.gz 517216 BLAKE2B 920fa2bc648d60f041e1b5d9d2faa7edb5b93310759de498e75bae42bcbba8493c7985e013a5099e405f2a748904e702ef8f431fa51a5d19c4e5a7a1efeceed0 SHA512 c27647a55e3ae878037a764e879244ac4396406f331ea6bd3795544165dc1a894c21be1bbd7314c45a4e1734f97c70d711520edb4f26438ade00b2ef39732c65
EBUILD spread-sheet-widget-0.3-r1.ebuild 479 BLAKE2B 0f39da86bd4a8edfd38e75bc2b448e9a7add3b33d433ab0e7887cd7047e4d255d3b63a040d59ab96eefa3f05b261b1782b70bc4e150e979dcd87f1ae90d213cd SHA512 9d3214012b40635fa03de29679898282f0f5919128e9cd77de5debdcec87b39f52ad9bfdf93911944f276184ff7ada6fae028a012cc89ab0283b75f748bc56f7
EBUILD spread-sheet-widget-0.6.ebuild 481 BLAKE2B 7720c8ec7517e859100b22149c404cc1d320cfe5099e19f1ebe9e5803db29913201750a384835fd83be005088e82c572a2b52aaa67e1e7a562d4f8f8cdeaf3c9 SHA512 9dfeee13140caf1ec0e493e07fe7dbb01439e5881d0b6492fd507b8f1f644d201662ac8a3b5427f12f01858d8392c3b12237888cec9616a1134eccd71d892944
+EBUILD spread-sheet-widget-0.7.ebuild 449 BLAKE2B d2d961b8f8246485a186e4a94487d436de05265dfb3dfbcb437ccaf8b606b336bb04e0efe9a10c5412b624c31f687d82d7866aa55b52b43aadd0eaaee2b69cbb SHA512 488e1f56fc1df59722357a6c07703efa1d437e2cd142168b8ab9cecdfb57a86de474ae9ceb94da6bd7ac2542498015370dacf97b6a192b35181b78838a42db6a
MISC metadata.xml 784 BLAKE2B 6469c4af18aecc8781c4c329db3d669189d073042b7b30adc828f44974c3243c16dc12a4b20f7cb8886ba176e82d18aa7211589e1bdbc603ff4f029c51605f74 SHA512 b150e53107eb9b8dc3f6bd31ff9409bdb09f038773baee3ff74d3cf0cf908741dd39b6fc6aa546d206b7017fd9b33a945896689fb4bba3a38f23d221049b2640
diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild
new file mode 100644
index 000000000000..1baf7cd07c93
--- /dev/null
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNU Spread Sheet Widget"
+HOMEPAGE="https://www.gnu.org/software/ssw/"
+SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-libs/glib
+ x11-libs/gtk+:3"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ default
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index f785cbffe79a..170b0ae9c0ab 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -1,5 +1,5 @@
AUX startup-notification-0.12-sys-select_h.patch 928 BLAKE2B 048e3a834d6ec993d629bd72d13fc3008b7c52885cd34f5b057c77c5be3b8601e05d5280443eb567696ff5e590f49f3b6f184971c92e8bffc8b94cd1103e9b81 SHA512 5f89b2747a2e5d633229b2e858380919121bdfd8f5788898824115fe5c4f60ffb51d0303830b7896657a96f4c2468de0ada0a72782a48cb990d614a1805e91cd
AUX startup-notification-0.12-time_t-crash-with-32bit.patch 3377 BLAKE2B 2ed2cd342d606e6d3a2065aa127b7c1e2f6352c9e8142795d2a3a654706d771ec5a8cd1c26d5f75538d8961d081577cc3738d1c169790ebe954d3ade07f1721d SHA512 b1bbef28012a08e265e19296f6f6b1adf4bf82efa2d585680f06a352258deee6f2d8b2f842a8f27febe78f23048afe5f39fe80bd555b826aec927d14a289928d
DIST startup-notification-0.12.tar.gz 355285 BLAKE2B 9822de9745fdeef28d7c6422d2a967394ffc329e7f37e1676c79e900f8e776578698ef47ff199fa05aa795540382f5eab5cb63f6cb20512328897236df1ab152 SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab
-EBUILD startup-notification-0.12-r1.ebuild 821 BLAKE2B 4bfafb660ea6fcdee17bf238a7eee1a18839bcba87f64f8b0e44c390cafea022ce97fbc0ef7e7afed3880ad767dc330ecd3ac5175518c988e22de5fea324d1f3 SHA512 3e883fc06d7284274cee99ffc7ed5cb511a239f98c35c3b2c6d0370ccadb43230438a2332ce0f5432a22473702a1e5f9a9749f65b46e94ce5ddfff5a9bb64e7f
+EBUILD startup-notification-0.12-r1.ebuild 828 BLAKE2B 6bc5e2a514879e4d3fa78b0c0472fd1276e7877096754ca44af6e224a1c9861e420526833dfe3302dff23e5f589a54feb0f2cce4b773b7be467a32e468fd5414 SHA512 0820821bb3a7ac9f37dd27194425749ead0e2c9c814019f9e34fdabe94fbe32a75fea2319da5bdd062f1b51fd67c0a665d62f06863db45c04afb89e08d4bda94
MISC metadata.xml 225 BLAKE2B 293ebc97ac40be7df2825c558f7def8026a2c8b49af06c8a5fc0dfb58657ee3093306f2a6b90bce5f7fc10f9c3165eee3cd77b58fcea8d293dacff5ba2f04657 SHA512 6f3645f7fe9f5362268973d150b122dcaef666c61e30ddc96917485c617568105aadf7b8d78bf06e402f8592c90369fdc7d949832b9fda13258b4693f1c4c6f3
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
index e0ea86087e05..be9170358c98 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
LICENSE="LGPL-2 MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=x11-libs/libX11-1.4.3
>x11-libs/libxcb-1.6
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index f1ee0afc5c4d..66c3dfe01782 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -5,11 +5,8 @@ AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c
AUX vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 1375 BLAKE2B 27ee298761155789aba19b77dcad97abbf2524a69de4540c38b814fa566e8f3e4003925570a12b75d85f56cb1b047c1895eb8c74df8c81f8334785dfc5055913 SHA512 983c7f4ab44417a5ca0e00f428882650b8a5c250aba328e8255bffb25cdff0505f0fa3a635d722a27467ac44e4e2880f8631b7ff3b20a35ea4e57db9537807ab
AUX vte-0.66.2-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b
DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
-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
DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7
DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1
EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
-EBUILD vte-0.66.2.ebuild 2753 BLAKE2B 4c5ad9e4b0e991d80320163c6d467c0e928439290b61a9a11df8a3937736aa63f4fed3c660ba4f20482b274dd1cb60db970945b4ff261d0a94808c508d8309fb SHA512 5a6c210080a552a3a6ba726f877423513347b78b886c2d42952eeb3ed611c6dd418d3ba99c6b5324e04448f77ef83499bd4f4a4683894cc5840dbba021f4d5a9
-EBUILD vte-0.68.0.ebuild 2741 BLAKE2B 819c99067dad7150378948320e374d9fb136aad214aaf0a7f78909fec2fd2884f49940a6fa7afc4324e1882afd4ba2afd6fb14c8fb3c023ddb5f48d9f598240e SHA512 e2f85f44d74e7604fb0594688c7646108a462a887eb3ef8397c4b037446f2ceef537b34a05b7fc4e5a501fea145c6195e2906133f6aa28838795e0396768a159
+EBUILD vte-0.68.0.ebuild 2741 BLAKE2B 66debeedcbd37b16ed63f2618bebc1c0b611855016a18dd51e54be535130843c58c1bd2a583f83563268fbb33cb40c4070352518be8aa0e1168f72c63b2b2d57 SHA512 93344cd296bc3ee4ff50df052c0118fa4529efd5f2b72c0904258f090d42ab640eb4ffd8616a085d90a13f9af04d7d9cad90acc8855573879318a4b45e348744
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
deleted file mode 100644
index 9de97c89a24b..000000000000
--- a/x11-libs/vte/vte-0.66.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.48"
-VALA_MAX_API_VERSION="0.54"
-
-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() {
- use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
- 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
-}
diff --git a/x11-libs/vte/vte-0.68.0.ebuild b/x11-libs/vte/vte-0.68.0.ebuild
index 36caed902924..a65d3b2ce26f 100644
--- a/x11-libs/vte/vte-0.68.0.ebuild
+++ b/x11-libs/vte/vte-0.68.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOM
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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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.
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index 6e2d65b5af05..e4baf0dbb9b2 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,3 +1,4 @@
DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1045 BLAKE2B 93f1f3b11db5d69d42445f160c0e41540101f5e3c98368a35dcce1d0a164d410b17f8ded853a07ccbf995ec8c96dec7a137061ea643b8450e19ecf533d902800 SHA512 833070ad90a01aae0ee93a970157a9746b9b85e936b3085cec744d6ec8edb48a766fa972a7c6ac37db49fafd8bb2f5944d98f922c9d99247c7e630b4358aedaa
+EBUILD xcb-util-cursor-0.1.3-r4.ebuild 1032 BLAKE2B 6a9d23746eaa8a8c4b309c3c094daeeec373ee6378429d31438ddcd709a9c1a3a3b67d2a1c030d246273e863c72b1e4fd8f85ed89676e819feb2a359f6fbe623 SHA512 a3dbde0b1f6c319a67d669943bd90384bc02b8102c08d9ddd320315b72cf565d6ad4f42b2f5c1a3670cb24ea539121c2f63a2f3c7923e6d5774798ca6fce7c91
MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
new file mode 100644
index 000000000000..60cd1a1dc7c5
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=x11-base/xcb-proto-1.8-r3:=
+ x11-base/xorg-proto"
+BDEPEND=">=dev-util/gperf-3.0.1"
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
+)