summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/agg/metadata.xml2
-rw-r--r--x11-libs/c++-gtk-utils/metadata.xml2
-rw-r--r--x11-libs/cairo/metadata.xml2
-rw-r--r--x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild2
-rw-r--r--x11-libs/colord-gtk/metadata.xml2
-rw-r--r--x11-libs/dnd/metadata.xml2
-rw-r--r--x11-libs/fltk/metadata.xml2
-rw-r--r--x11-libs/fox-wrapper/metadata.xml2
-rw-r--r--x11-libs/fox/metadata.xml2
-rw-r--r--x11-libs/gdk-pixbuf-xlib/metadata.xml2
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild2
-rw-r--r--x11-libs/gdk-pixbuf/metadata.xml2
-rw-r--r--x11-libs/gl2ps/gl2ps-1.4.2.ebuild2
-rw-r--r--x11-libs/gl2ps/metadata.xml2
-rw-r--r--x11-libs/gnome-pty-helper/metadata.xml2
-rw-r--r--x11-libs/goffice/goffice-0.10.50.ebuild2
-rw-r--r--x11-libs/goffice/metadata.xml2
-rw-r--r--x11-libs/goocanvas/Manifest1
-rw-r--r--x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch26
-rw-r--r--x11-libs/goocanvas/goocanvas-1.0.0.ebuild58
-rw-r--r--x11-libs/goocanvas/metadata.xml2
-rw-r--r--x11-libs/gtk+/metadata.xml2
-rw-r--r--x11-libs/gtk+extra/metadata.xml2
-rw-r--r--x11-libs/gtk-mac-integration/metadata.xml2
-rw-r--r--x11-libs/gtkdatabox/metadata.xml2
-rw-r--r--x11-libs/gtkglext/metadata.xml2
-rw-r--r--x11-libs/gtkmathview/metadata.xml2
-rw-r--r--x11-libs/gtksourceview/Manifest1
-rw-r--r--x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild2
-rw-r--r--x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild70
-rw-r--r--x11-libs/gtksourceview/metadata.xml2
-rw-r--r--x11-libs/libFS/metadata.xml2
-rw-r--r--x11-libs/libGLw/metadata.xml2
-rw-r--r--x11-libs/libICE/libICE-1.0.10.ebuild2
-rw-r--r--x11-libs/libICE/metadata.xml2
-rw-r--r--x11-libs/libQGLViewer/metadata.xml2
-rw-r--r--x11-libs/libSM/libSM-1.2.3-r1.ebuild2
-rw-r--r--x11-libs/libSM/metadata.xml2
-rw-r--r--x11-libs/libX11/libX11-1.7.2.ebuild2
-rw-r--r--x11-libs/libX11/metadata.xml2
-rw-r--r--x11-libs/libXScrnSaver/metadata.xml2
-rw-r--r--x11-libs/libXau/libXau-1.0.9-r1.ebuild2
-rw-r--r--x11-libs/libXau/metadata.xml2
-rw-r--r--x11-libs/libXaw/metadata.xml2
-rw-r--r--x11-libs/libXaw3d/metadata.xml2
-rw-r--r--x11-libs/libXaw3dXft/metadata.xml2
-rw-r--r--x11-libs/libXcomposite/metadata.xml2
-rw-r--r--x11-libs/libXcursor/metadata.xml2
-rw-r--r--x11-libs/libXdamage/metadata.xml2
-rw-r--r--x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild2
-rw-r--r--x11-libs/libXdmcp/metadata.xml2
-rw-r--r--x11-libs/libXext/libXext-1.3.4.ebuild2
-rw-r--r--x11-libs/libXext/metadata.xml2
-rw-r--r--x11-libs/libXfixes/metadata.xml2
-rw-r--r--x11-libs/libXfont2/Manifest1
-rw-r--r--x11-libs/libXfont2/libXfont2-2.0.4.ebuild2
-rw-r--r--x11-libs/libXfont2/libXfont2-2.0.5.ebuild34
-rw-r--r--x11-libs/libXfont2/libXfont2-9999.ebuild2
-rw-r--r--x11-libs/libXfont2/metadata.xml2
-rw-r--r--x11-libs/libXft/Manifest1
-rw-r--r--x11-libs/libXft/libXft-2.3.4.ebuild21
-rw-r--r--x11-libs/libXft/metadata.xml2
-rw-r--r--x11-libs/libXi/Manifest2
-rw-r--r--x11-libs/libXi/libXi-1.7.99.2.ebuild28
-rw-r--r--x11-libs/libXi/libXi-1.8.ebuild28
-rw-r--r--x11-libs/libXi/metadata.xml2
-rw-r--r--x11-libs/libXinerama/metadata.xml2
-rw-r--r--x11-libs/libXmu/libXmu-1.1.3.ebuild2
-rw-r--r--x11-libs/libXmu/metadata.xml2
-rw-r--r--x11-libs/libXpm/metadata.xml2
-rw-r--r--x11-libs/libXpresent/metadata.xml2
-rw-r--r--x11-libs/libXrandr/metadata.xml2
-rw-r--r--x11-libs/libXrender/metadata.xml2
-rw-r--r--x11-libs/libXres/metadata.xml2
-rw-r--r--x11-libs/libXt/libXt-1.2.1.ebuild2
-rw-r--r--x11-libs/libXt/metadata.xml2
-rw-r--r--x11-libs/libXtst/metadata.xml2
-rw-r--r--x11-libs/libXv/metadata.xml2
-rw-r--r--x11-libs/libXvMC/metadata.xml2
-rw-r--r--x11-libs/libXxf86dga/metadata.xml2
-rw-r--r--x11-libs/libXxf86vm/metadata.xml2
-rw-r--r--x11-libs/libast/metadata.xml2
-rw-r--r--x11-libs/libclxclient/metadata.xml2
-rw-r--r--x11-libs/libcryptui/metadata.xml2
-rw-r--r--x11-libs/libdlo/metadata.xml2
-rw-r--r--x11-libs/libdmx/metadata.xml2
-rw-r--r--x11-libs/libdockapp/metadata.xml2
-rw-r--r--x11-libs/libdrm/libdrm-2.4.107.ebuild11
-rw-r--r--x11-libs/libdrm/libdrm-9999.ebuild9
-rw-r--r--x11-libs/libdrm/metadata.xml2
-rw-r--r--x11-libs/libfakeXinerama/Manifest1
-rw-r--r--x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild30
-rw-r--r--x11-libs/libfakeXinerama/metadata.xml11
-rw-r--r--x11-libs/libfakekey/metadata.xml2
-rw-r--r--x11-libs/libfm-extra/metadata.xml2
-rw-r--r--x11-libs/libfm-qt/Manifest1
-rw-r--r--x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild47
-rw-r--r--x11-libs/libfm-qt/metadata.xml2
-rw-r--r--x11-libs/libfm/metadata.xml2
-rw-r--r--x11-libs/libfontenc/metadata.xml2
-rw-r--r--x11-libs/libgxim/metadata.xml2
-rw-r--r--x11-libs/libnotify/libnotify-0.7.9-r1.ebuild2
-rw-r--r--x11-libs/libnotify/metadata.xml2
-rw-r--r--x11-libs/liboglappth/metadata.xml2
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.16.ebuild2
-rw-r--r--x11-libs/libpciaccess/metadata.xml2
-rw-r--r--x11-libs/librfm/metadata.xml2
-rw-r--r--x11-libs/libtinynotify-cli/metadata.xml2
-rw-r--r--x11-libs/libtinynotify-systemwide/metadata.xml2
-rw-r--r--x11-libs/libtinynotify/metadata.xml2
-rw-r--r--x11-libs/libva-compat/metadata.xml2
-rw-r--r--x11-libs/libva-intel-driver/metadata.xml2
-rw-r--r--x11-libs/libva-intel-media-driver/Manifest3
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild62
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild62
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild64
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild8
-rw-r--r--x11-libs/libva-intel-media-driver/metadata.xml2
-rw-r--r--x11-libs/libva-vdpau-driver/metadata.xml2
-rw-r--r--x11-libs/libva/Manifest1
-rw-r--r--x11-libs/libva/libva-2.12.0.ebuild2
-rw-r--r--x11-libs/libva/libva-2.13.0.ebuild91
-rw-r--r--x11-libs/libva/metadata.xml2
-rw-r--r--x11-libs/libvdpau/metadata.xml2
-rw-r--r--x11-libs/libwnck/metadata.xml2
-rw-r--r--x11-libs/libxcb/libxcb-1.14.ebuild2
-rw-r--r--x11-libs/libxcb/metadata.xml2
-rw-r--r--x11-libs/libxcvt/libxcvt-0.1.0.ebuild2
-rw-r--r--x11-libs/libxcvt/metadata.xml2
-rw-r--r--x11-libs/libxkbcommon/Manifest1
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild61
-rw-r--r--x11-libs/libxkbcommon/metadata.xml2
-rw-r--r--x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild2
-rw-r--r--x11-libs/libxkbfile/metadata.xml2
-rw-r--r--x11-libs/libxklavier/metadata.xml2
-rw-r--r--x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild2
-rw-r--r--x11-libs/libxshmfence/metadata.xml2
-rw-r--r--x11-libs/libyui-gtk/metadata.xml2
-rw-r--r--x11-libs/libyui-ncurses/metadata.xml2
-rw-r--r--x11-libs/libyui-qt/metadata.xml2
-rw-r--r--x11-libs/libyui/metadata.xml2
-rw-r--r--x11-libs/metadata.xml2
-rw-r--r--x11-libs/motif/metadata.xml2
-rw-r--r--x11-libs/motif/motif-2.3.8-r2.ebuild2
-rw-r--r--x11-libs/mx/Manifest1
-rw-r--r--x11-libs/mx/files/mx-1.4.7-gl-types.patch53
-rw-r--r--x11-libs/mx/metadata.xml11
-rw-r--r--x11-libs/mx/mx-1.4.7-r2.ebuild57
-rw-r--r--x11-libs/neXtaw/metadata.xml2
-rw-r--r--x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild4
-rw-r--r--x11-libs/pango/Manifest2
-rw-r--r--x11-libs/pango/metadata.xml2
-rw-r--r--x11-libs/pango/pango-1.48.10.ebuild (renamed from x11-libs/pango/pango-1.48.7.ebuild)54
-rw-r--r--x11-libs/pango/pango-1.48.7-r1.ebuild4
-rw-r--r--x11-libs/pango/pango-1.48.9.ebuild75
-rw-r--r--x11-libs/pixman/metadata.xml2
-rw-r--r--x11-libs/pixman/pixman-0.40.0.ebuild2
-rw-r--r--x11-libs/qscintilla/Manifest3
-rw-r--r--x11-libs/qscintilla/metadata.xml2
-rw-r--r--x11-libs/qscintilla/qscintilla-2.11.5.ebuild82
-rw-r--r--x11-libs/qscintilla/qscintilla-2.11.6.ebuild4
-rw-r--r--x11-libs/qscintilla/qscintilla-2.13.1.ebuild (renamed from x11-libs/qscintilla/qscintilla-2.13.0.ebuild)2
-rw-r--r--x11-libs/qtermwidget/Manifest1
-rw-r--r--x11-libs/qtermwidget/metadata.xml2
-rw-r--r--x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild31
-rw-r--r--x11-libs/qwt/metadata.xml2
-rw-r--r--x11-libs/qwt/qwt-5.2.3_p20210211.ebuild2
-rw-r--r--x11-libs/qwtplot3d/metadata.xml2
-rw-r--r--x11-libs/qwtpolar/metadata.xml2
-rw-r--r--x11-libs/rep-gtk/metadata.xml2
-rw-r--r--x11-libs/scw/metadata.xml2
-rw-r--r--x11-libs/snorenotify/metadata.xml5
-rw-r--r--x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild4
-rw-r--r--x11-libs/spread-sheet-widget/metadata.xml2
-rw-r--r--x11-libs/startup-notification/metadata.xml2
-rw-r--r--x11-libs/tslib/metadata.xml2
-rw-r--r--x11-libs/vte/metadata.xml2
-rw-r--r--x11-libs/vte/vte-0.64.2.ebuild3
-rw-r--r--x11-libs/wxGTK/metadata.xml2
-rw-r--r--x11-libs/xapps/Manifest2
-rw-r--r--x11-libs/xapps/metadata.xml2
-rw-r--r--x11-libs/xapps/xapps-2.2.4.ebuild (renamed from x11-libs/xapps/xapps-2.2.2.ebuild)0
-rw-r--r--x11-libs/xbae/metadata.xml2
-rw-r--r--x11-libs/xcb-util-cursor/metadata.xml2
-rw-r--r--x11-libs/xcb-util-image/metadata.xml2
-rw-r--r--x11-libs/xcb-util-keysyms/metadata.xml2
-rw-r--r--x11-libs/xcb-util-renderutil/metadata.xml2
-rw-r--r--x11-libs/xcb-util-wm/metadata.xml2
-rw-r--r--x11-libs/xcb-util-xrm/metadata.xml2
-rw-r--r--x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild4
-rw-r--r--x11-libs/xcb-util/metadata.xml2
-rw-r--r--x11-libs/xforms/metadata.xml2
-rw-r--r--x11-libs/xosd/metadata.xml2
-rw-r--r--x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild2
-rw-r--r--x11-libs/xpa/metadata.xml2
-rw-r--r--x11-libs/xtrans/metadata.xml2
-rw-r--r--x11-libs/xtrans/xtrans-1.4.0.ebuild2
197 files changed, 862 insertions, 570 deletions
diff --git a/x11-libs/agg/metadata.xml b/x11-libs/agg/metadata.xml
index 7c6740158c4..bdd8fee53d1 100644
--- a/x11-libs/agg/metadata.xml
+++ b/x11-libs/agg/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chithanh@gentoo.org</email>
diff --git a/x11-libs/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml
index 8d8ad9973ab..aedd3f9bc9a 100644
--- a/x11-libs/c++-gtk-utils/metadata.xml
+++ b/x11-libs/c++-gtk-utils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 4d03eec8d35..367ff5bc5df 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
index 76e8886fef6..4f7cfc86fec 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.2.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="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="doc +introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml
index 39980802b1d..7b343b06be8 100644
--- a/x11-libs/colord-gtk/metadata.xml
+++ b/x11-libs/colord-gtk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/dnd/metadata.xml b/x11-libs/dnd/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/x11-libs/dnd/metadata.xml
+++ b/x11-libs/dnd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
index 4fef3c8a856..c232dc3b2e1 100644
--- a/x11-libs/fltk/metadata.xml
+++ b/x11-libs/fltk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
diff --git a/x11-libs/fox-wrapper/metadata.xml b/x11-libs/fox-wrapper/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/x11-libs/fox-wrapper/metadata.xml
+++ b/x11-libs/fox-wrapper/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/x11-libs/fox/metadata.xml b/x11-libs/fox/metadata.xml
index a0084d6b4b7..19fdb2a74ce 100644
--- a/x11-libs/fox/metadata.xml
+++ b/x11-libs/fox/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zx2c4@gentoo.org</email>
diff --git a/x11-libs/gdk-pixbuf-xlib/metadata.xml b/x11-libs/gdk-pixbuf-xlib/metadata.xml
index b92ed12f95c..96616ae2f18 100644
--- a/x11-libs/gdk-pixbuf-xlib/metadata.xml
+++ b/x11-libs/gdk-pixbuf-xlib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
index 146867dc375..a0f63462d96 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.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 ~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 ~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/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 21782abf0b6..5fa25eb4c90 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
index a8f74181e30..e248470f2bd 100644
--- a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc png zlib"
RDEPEND="
diff --git a/x11-libs/gl2ps/metadata.xml b/x11-libs/gl2ps/metadata.xml
index 6577818b430..8d83fa3496a 100644
--- a/x11-libs/gl2ps/metadata.xml
+++ b/x11-libs/gl2ps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/x11-libs/gnome-pty-helper/metadata.xml b/x11-libs/gnome-pty-helper/metadata.xml
index 39980802b1d..7b343b06be8 100644
--- a/x11-libs/gnome-pty-helper/metadata.xml
+++ b/x11-libs/gnome-pty-helper/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/goffice/goffice-0.10.50.ebuild b/x11-libs/goffice/goffice-0.10.50.ebuild
index 33a766b3e01..36fdcb61d85 100644
--- a/x11-libs/goffice/goffice-0.10.50.ebuild
+++ b/x11-libs/goffice/goffice-0.10.50.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
LICENSE="GPL-2"
SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="+introspection"
# FIXME: add lasem to tree
diff --git a/x11-libs/goffice/metadata.xml b/x11-libs/goffice/metadata.xml
index 2bc9db5d368..34085eb7da1 100644
--- a/x11-libs/goffice/metadata.xml
+++ b/x11-libs/goffice/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index 2fdbd0d2d50..0ecdfc19ff9 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -1,2 +1 @@
-DIST goocanvas-1.0.0.tar.bz2 570552 BLAKE2B 00b1a3d59448cc2f40dd20b0c97977cfc477a6656f32e2106b3f3bd5c42b8b625e270d9f96de44f30caf83b744b331699e7c6385b5269bf7b22e3bb25a879948 SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644
DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
diff --git a/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch b/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch
deleted file mode 100644
index c395c6ffd79..00000000000
--- a/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b49c009..9c3316b 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES = \
-
- lib_LTLIBRARIES = libgoocanvas.la
-
--libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
-+libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
-
- if PLATFORM_WIN32
- no_undefined = -no-undefined
-diff --git a/src/Makefile.in b/src/Makefile.in
-index c4d43b2..8d555fe 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -254,7 +254,7 @@ INCLUDES = \
- # -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- # -DGTK_DISABLE_DEPRECATED
- lib_LTLIBRARIES = libgoocanvas.la
--libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
-+libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
- libtool_opts = \
- -version-info $(LT_VERSION_INFO) \
diff --git a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
deleted file mode 100644
index f59677deb0f..00000000000
--- a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-GNOME_TARBALL_SUFFIX="bz2"
-inherit epatch gnome2
-
-DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
-HOMEPAGE="https://wiki.gnome.org/Projects/GooCanvas"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
- >=x11-libs/gtk+-2.12:2
- >=dev-libs/glib-2.10:2
- >=x11-libs/cairo-1.4
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- dev-util/gtk-doc-am
- virtual/pkgconfig
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=671766
- epatch "${FILESDIR}"/${P}-gold.patch
-
- # Fails to build with recent GTK+
- sed -e "s/-D.*_DISABLE_DEPRECATED//g" \
- -i src/Makefile.am src/Makefile.in demo/Makefile.am demo/Makefile.in \
- || die "sed 1 failed"
-
- sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die "sed 2 failed"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-rebuilds \
- --disable-static
-}
-
-src_install() {
- gnome2_src_install
-
- if use examples; then
- insinto /usr/share/doc/${P}/examples/
- doins demo/*.c demo/flower.png demo/toroid.png
- fi
-}
diff --git a/x11-libs/goocanvas/metadata.xml b/x11-libs/goocanvas/metadata.xml
index 39980802b1d..7b343b06be8 100644
--- a/x11-libs/goocanvas/metadata.xml
+++ b/x11-libs/goocanvas/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index ec37e738f2c..0656b9b2d42 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/gtk+extra/metadata.xml b/x11-libs/gtk+extra/metadata.xml
index cbb03314ae2..396c6e30401 100644
--- a/x11-libs/gtk+extra/metadata.xml
+++ b/x11-libs/gtk+extra/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/gtk-mac-integration/metadata.xml b/x11-libs/gtk-mac-integration/metadata.xml
index 0c982d88130..232d18dd1fa 100644
--- a/x11-libs/gtk-mac-integration/metadata.xml
+++ b/x11-libs/gtk-mac-integration/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>prefix@gentoo.org</email>
diff --git a/x11-libs/gtkdatabox/metadata.xml b/x11-libs/gtkdatabox/metadata.xml
index 41f07ed1b66..7f6df4e26ea 100644
--- a/x11-libs/gtkdatabox/metadata.xml
+++ b/x11-libs/gtkdatabox/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-electronics@gentoo.org</email>
diff --git a/x11-libs/gtkglext/metadata.xml b/x11-libs/gtkglext/metadata.xml
index aa10f62c61d..d6d3335b6c6 100644
--- a/x11-libs/gtkglext/metadata.xml
+++ b/x11-libs/gtkglext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/gtkmathview/metadata.xml b/x11-libs/gtkmathview/metadata.xml
index ff2703fcd58..c465741566a 100644
--- a/x11-libs/gtkmathview/metadata.xml
+++ b/x11-libs/gtkmathview/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index d21ca1b3c8c..e0c490536db 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,3 +1,4 @@
DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
DIST gtksourceview-4.8.1.tar.xz 1160032 BLAKE2B 3ed93f056ca8c6ae1982e28a675ccec448c301999f058abc5b9ec46f609c2649ac807fc20379480a8eb00408496912e1554e08d55ce5da70a97cee34be10fc20 SHA512 fe3bc05e81f881b97a53e6dfb807ded314f1953ebe74424b515d6c1333e72011e3b756b958cca40becad0f66434cf16c56d42fff950b8d643e65c9a03e9cb88b
+DIST gtksourceview-4.8.2.tar.xz 1164876 BLAKE2B 3e6269b4e6a7147d5f4e0ed2096514a0e0bc29a928b73c0cd12eb207f2627c9eadde55ee81183b2a67fe5380fcd96c2335283a1f3da3f06303b7d2b65b49a09a SHA512 6951b9477b1e47b1b25756aef246630c948e8dd212b1b0e13f87ef4f56f39b59b02db3fd18315869e98acfc6454de13cfffa6eeb8fe1cd030dfd537b5f710a04
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
index 93b8d8ad8d1..1693f4853c9 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
@@ -14,7 +14,7 @@ SLOT="4"
IUSE="glade gtk-doc +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+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
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild
new file mode 100644
index 00000000000..17432083d65
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+
+IUSE="glade gtk-doc +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
+ >=x11-libs/gtk+-3.24:3[introspection?]
+ >=dev-libs/libxml2-2.6:2
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+ >=dev-libs/fribidi-0.19.7
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.25
+ app-text/docbook-xml-dtd:4.3
+ )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use glade glade_catalog)
+ -Dinstall_tests=false
+ $(meson_use introspection gir)
+ $(meson_use vala vapi)
+ $(meson_use gtk-doc gtk_doc)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ insinto /usr/share/${PN}-4/language-specs
+ newins "${FILESDIR}"/4.6-gentoo.lang gentoo.lang
+
+ # Avoid conflict with gtksourceview:3.0 glade-catalog
+ # TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
+ if use glade; then
+ mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
+ fi
+}
diff --git a/x11-libs/gtksourceview/metadata.xml b/x11-libs/gtksourceview/metadata.xml
index 7bcd75b4aa2..4bbc4d876e0 100644
--- a/x11-libs/gtksourceview/metadata.xml
+++ b/x11-libs/gtksourceview/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/libFS/metadata.xml b/x11-libs/libFS/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libFS/metadata.xml
+++ b/x11-libs/libFS/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libGLw/metadata.xml b/x11-libs/libGLw/metadata.xml
index 0b5ff5f5177..0ca5c0a34ca 100644
--- a/x11-libs/libGLw/metadata.xml
+++ b/x11-libs/libGLw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
index 562ebccf2e7..57851fba296 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Inter-Client Exchange 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"
+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="ipv6"
DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libICE/metadata.xml b/x11-libs/libICE/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libICE/metadata.xml
+++ b/x11-libs/libICE/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libQGLViewer/metadata.xml b/x11-libs/libQGLViewer/metadata.xml
index 9bc94015e4e..6810e9ef38d 100644
--- a/x11-libs/libQGLViewer/metadata.xml
+++ b/x11-libs/libQGLViewer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/x11-libs/libSM/libSM-1.2.3-r1.ebuild b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
index f53cb5e85b6..7feb0c6c5e4 100644
--- a/x11-libs/libSM/libSM-1.2.3-r1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Session Management 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"
+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="ipv6 +uuid"
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
index 73384252f25..eda7589872e 100644
--- a/x11-libs/libSM/metadata.xml
+++ b/x11-libs/libSM/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
index 1a618ccdebc..c50508e8170 100644
--- a/x11-libs/libX11/libX11-1.7.2.ebuild
+++ b/x11-libs/libX11/libX11-1.7.2.ebuild
@@ -10,7 +10,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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="ipv6 test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
index e1e8e6f760c..63a0c8ad1f1 100644
--- a/x11-libs/libX11/metadata.xml
+++ b/x11-libs/libX11/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXScrnSaver/metadata.xml b/x11-libs/libXScrnSaver/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXScrnSaver/metadata.xml
+++ b/x11-libs/libXScrnSaver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
index b5e09145422..fb485435a64 100644
--- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -9,6 +9,6 @@ inherit xorg-3
DESCRIPTION="X.Org X authorization 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"
+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"
DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXau/metadata.xml b/x11-libs/libXau/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXau/metadata.xml
+++ b/x11-libs/libXau/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXaw/metadata.xml b/x11-libs/libXaw/metadata.xml
index 570177e533d..2aba58ad3ed 100644
--- a/x11-libs/libXaw/metadata.xml
+++ b/x11-libs/libXaw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXaw3d/metadata.xml b/x11-libs/libXaw3d/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXaw3d/metadata.xml
+++ b/x11-libs/libXaw3d/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXaw3dXft/metadata.xml b/x11-libs/libXaw3dXft/metadata.xml
index 9ed9d563686..3a232be3e15 100644
--- a/x11-libs/libXaw3dXft/metadata.xml
+++ b/x11-libs/libXaw3dXft/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>ceamac.paragon@gmail.com</email>
diff --git a/x11-libs/libXcomposite/metadata.xml b/x11-libs/libXcomposite/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXcomposite/metadata.xml
+++ b/x11-libs/libXcomposite/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXcursor/metadata.xml
+++ b/x11-libs/libXcursor/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXdamage/metadata.xml b/x11-libs/libXdamage/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXdamage/metadata.xml
+++ b/x11-libs/libXdamage/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index 5ce4c7ca078..61a5ecc3008 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org X Display Manager Control Protocol 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"
+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"
RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
DEPEND="${RDEPEND}
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
index 8b173f9d4e9..16fbeb63887 100644
--- a/x11-libs/libXdmcp/metadata.xml
+++ b/x11-libs/libXdmcp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index d05404352ed..4ef042cb11c 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xext 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"
+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"
RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/x11-libs/libXext/metadata.xml b/x11-libs/libXext/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXext/metadata.xml
+++ b/x11-libs/libXext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXfixes/metadata.xml b/x11-libs/libXfixes/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXfixes/metadata.xml
+++ b/x11-libs/libXfixes/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index ea362bd0ceb..06e37d3b3a8 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1 +1,2 @@
DIST libXfont2-2.0.4.tar.bz2 513167 BLAKE2B 924cf8462a8fc593755080866b63d6cca6e58b5d875f1d25b95271a56d883e983445f72f8950adf1964e0bf10ca5b8bb2ddfe0c56d4395086e460952a5933bd7 SHA512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106
+DIST libXfont2-2.0.5.tar.bz2 524868 BLAKE2B 0b26d4c93452bcb3f5c740ac8984b9873a8241405d270e2d3fa5f440be820db417c9eff59c7a1a8c175513e40df70ada9c037d45c3a9ae2ccf62eb12f81c1d8f SHA512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa
diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index 7a77ae02471..3cb06826f4d 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xfont library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 ipv6 truetype"
RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXfont2/libXfont2-2.0.5.ebuild b/x11-libs/libXfont2/libXfont2-2.0.5.ebuild
new file mode 100644
index 00000000000..a07d98ab583
--- /dev/null
+++ b/x11-libs/libXfont2/libXfont2-2.0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_PACKAGE_NAME=libxfont
+XORG_DOC=doc
+inherit xorg-3
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 ipv6 truetype"
+
+RDEPEND="sys-libs/zlib
+ dev-libs/libbsd
+ x11-libs/libfontenc
+ bzip2? ( app-arch/bzip2 )
+ truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/xtrans"
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable doc devel-docs)
+ $(use_with doc xmlto)
+ $(use_with bzip2)
+ $(use_enable truetype freetype)
+ --without-fop
+ )
+ xorg-3_src_configure
+}
diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild
index cc2376f181c..1b342b77774 100644
--- a/x11-libs/libXfont2/libXfont2-9999.ebuild
+++ b/x11-libs/libXfont2/libXfont2-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
IUSE="bzip2 ipv6 truetype"
RDEPEND="sys-libs/zlib
- x11-base/xorg-proto
+ dev-libs/libbsd
x11-libs/libfontenc
bzip2? ( app-arch/bzip2 )
truetype? ( >=media-libs/freetype-2 )"
diff --git a/x11-libs/libXfont2/metadata.xml b/x11-libs/libXfont2/metadata.xml
index cb2e6a7213c..6d675fe66e1 100644
--- a/x11-libs/libXfont2/metadata.xml
+++ b/x11-libs/libXfont2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 1f2f4e37e90..5e0f42c6ed0 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1 +1,2 @@
DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
+DIST libXft-2.3.4.tar.bz2 359088 BLAKE2B 37f8522ad744e99ae8372f4292017eed1f2c2a84169497441c3c12696cbb7b3cf33e04864b50433e46f8723cc6c6006226c743a0d491a3784baf3f21ea062399 SHA512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51
diff --git a/x11-libs/libXft/libXft-2.3.4.ebuild b/x11-libs/libXft/libXft-2.3.4.ebuild
new file mode 100644
index 00000000000..19c704e2da0
--- /dev/null
+++ b/x11-libs/libXft/libXft-2.3.4.ebuild
@@ -0,0 +1,21 @@
+# 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 Xft library"
+
+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 ~x86-winnt"
+IUSE="doc"
+
+RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+ virtual/ttf-fonts
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
diff --git a/x11-libs/libXft/metadata.xml b/x11-libs/libXft/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXft/metadata.xml
+++ b/x11-libs/libXft/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 0d5a09adaaf..af452b5991a 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1 +1,3 @@
DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
+DIST libXi-1.7.99.2.tar.bz2 494804 BLAKE2B 103fe7d559f6e60417795d6f7278dc90375fa6889f8532a398986d163fd3f478396f8c71f81cba5bc2c37304d2dc5a229e1361a7e5237a04728f8c39466df0b6 SHA512 9e66315528152baabcf6333f5d0c9b829ca4f2055a90523de45f3022b726fdfbcb99e6459f8b18147b8305144cd7f7e0d4b2e9ebdd81f65efa29da08ffac1b39
+DIST libXi-1.8.tar.bz2 494579 BLAKE2B 6804aa5c666ff489180c7d468e666fd3c986c7e24396f80f69164cc351c4aff5ab3c8e22ded61f03b96e37bceb5fd86d707220479100c5ec44a2a05fe5345d60 SHA512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba
diff --git a/x11-libs/libXi/libXi-1.7.99.2.ebuild b/x11-libs/libXi/libXi-1.7.99.2.ebuild
new file mode 100644
index 00000000000..b3f6f57be0a
--- /dev/null
+++ b/x11-libs/libXi/libXi-1.7.99.2.ebuild
@@ -0,0 +1,28 @@
+# 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 Xi library"
+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 ~x86-winnt"
+
+RDEPEND="
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=x11-base/xorg-proto-2021.4.99.2"
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ $(use_with doc asciidoc)
+ --without-fop
+ )
+ xorg-3_src_configure
+}
diff --git a/x11-libs/libXi/libXi-1.8.ebuild b/x11-libs/libXi/libXi-1.8.ebuild
new file mode 100644
index 00000000000..b3f6f57be0a
--- /dev/null
+++ b/x11-libs/libXi/libXi-1.8.ebuild
@@ -0,0 +1,28 @@
+# 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 Xi library"
+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 ~x86-winnt"
+
+RDEPEND="
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=x11-base/xorg-proto-2021.4.99.2"
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ $(use_with doc asciidoc)
+ --without-fop
+ )
+ xorg-3_src_configure
+}
diff --git a/x11-libs/libXi/metadata.xml b/x11-libs/libXi/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXi/metadata.xml
+++ b/x11-libs/libXi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXinerama/metadata.xml b/x11-libs/libXinerama/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXinerama/metadata.xml
+++ b/x11-libs/libXinerama/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index a6421846f98..99fd2100223 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xmu 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"
+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"
IUSE="ipv6"
RDEPEND="
diff --git a/x11-libs/libXmu/metadata.xml b/x11-libs/libXmu/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXmu/metadata.xml
+++ b/x11-libs/libXmu/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXpm/metadata.xml b/x11-libs/libXpm/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXpm/metadata.xml
+++ b/x11-libs/libXpm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXpresent/metadata.xml b/x11-libs/libXpresent/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXpresent/metadata.xml
+++ b/x11-libs/libXpresent/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXrandr/metadata.xml b/x11-libs/libXrandr/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXrandr/metadata.xml
+++ b/x11-libs/libXrandr/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXrender/metadata.xml b/x11-libs/libXrender/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXrender/metadata.xml
+++ b/x11-libs/libXrender/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXres/metadata.xml b/x11-libs/libXres/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXres/metadata.xml
+++ b/x11-libs/libXres/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXt/libXt-1.2.1.ebuild b/x11-libs/libXt/libXt-1.2.1.ebuild
index b0e36cae59e..1fbf8a0dd20 100644
--- a/x11-libs/libXt/libXt-1.2.1.ebuild
+++ b/x11-libs/libXt/libXt-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org X Toolkit Intrinsics library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 )"
diff --git a/x11-libs/libXt/metadata.xml b/x11-libs/libXt/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXt/metadata.xml
+++ b/x11-libs/libXt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXtst/metadata.xml b/x11-libs/libXtst/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXtst/metadata.xml
+++ b/x11-libs/libXtst/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXv/metadata.xml b/x11-libs/libXv/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXv/metadata.xml
+++ b/x11-libs/libXv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXvMC/metadata.xml b/x11-libs/libXvMC/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXvMC/metadata.xml
+++ b/x11-libs/libXvMC/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXxf86dga/metadata.xml b/x11-libs/libXxf86dga/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXxf86dga/metadata.xml
+++ b/x11-libs/libXxf86dga/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXxf86vm/metadata.xml b/x11-libs/libXxf86vm/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libXxf86vm/metadata.xml
+++ b/x11-libs/libXxf86vm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libast/metadata.xml b/x11-libs/libast/metadata.xml
index dd5dfdb8045..5b5095039f3 100644
--- a/x11-libs/libast/metadata.xml
+++ b/x11-libs/libast/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
diff --git a/x11-libs/libclxclient/metadata.xml b/x11-libs/libclxclient/metadata.xml
index c870d0eef0a..b69a849fd57 100644
--- a/x11-libs/libclxclient/metadata.xml
+++ b/x11-libs/libclxclient/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sound@gentoo.org</email>
diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
index 39980802b1d..7b343b06be8 100644
--- a/x11-libs/libcryptui/metadata.xml
+++ b/x11-libs/libcryptui/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/libdlo/metadata.xml b/x11-libs/libdlo/metadata.xml
index aa25988e5b0..862238e9e7d 100644
--- a/x11-libs/libdlo/metadata.xml
+++ b/x11-libs/libdlo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
diff --git a/x11-libs/libdmx/metadata.xml b/x11-libs/libdmx/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libdmx/metadata.xml
+++ b/x11-libs/libdmx/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libdockapp/metadata.xml b/x11-libs/libdockapp/metadata.xml
index 1d5e6504004..0cd5b9db476 100644
--- a/x11-libs/libdockapp/metadata.xml
+++ b/x11-libs/libdockapp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
diff --git a/x11-libs/libdrm/libdrm-2.4.107.ebuild b/x11-libs/libdrm/libdrm-2.4.107.ebuild
index f603cf78370..a4ec5f0969d 100644
--- a/x11-libs/libdrm/libdrm-2.4.107.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.107.ebuild
@@ -4,12 +4,13 @@
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} meson-multilib
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
@@ -17,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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
@@ -34,6 +35,12 @@ 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=(
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index f603cf78370..c34f20fb240 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -4,12 +4,13 @@
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} meson-multilib
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
@@ -34,6 +35,12 @@ 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=(
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index 25fe9f86f2e..cfcecf022b0 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libfakeXinerama/Manifest b/x11-libs/libfakeXinerama/Manifest
new file mode 100644
index 00000000000..99c08a1f128
--- /dev/null
+++ b/x11-libs/libfakeXinerama/Manifest
@@ -0,0 +1 @@
+DIST libfakeXinerama-0.1.0.tar.bz2 3191 BLAKE2B 3f3572a64c6aafc71df9db7dc0c88125f4eb53dc7ae5dd22a704964664f3e21423241892b92be3591dffeca264660b1dd0880989e8088091d0731105ffec224b SHA512 6b2cd7a3ebd751d869b8afd1c129412f7bc8e8098d7f27a1781078c33f5fa644374524d3e7f5a7b9cf0297edb848d6ff7ec8f29d312e2af0c88d248c751ef907
diff --git a/x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild b/x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild
new file mode 100644
index 00000000000..d1a8f77f32e
--- /dev/null
+++ b/x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Fake library to override default libXinerama and expose custom screen dimensions"
+HOMEPAGE="https://github.com/Xpra-org/libfakeXinerama"
+SRC_URI="https://xpra.org/src/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ x11-libs/libX11
+ x11-libs/libXinerama
+"
+
+src_compile() {
+ libtool --tag=CC --mode=compile $(tc-getCC) -shared ${CFLAGS} -c ${PN#lib}.c || die
+ libtool --tag=CC --mode=link $(tc-getCC) -shared ${LDFLAGS} -Wl,-z,defs ${PN#lib}.lo \
+ -o ${PN}.la -rpath "${EPREFIX}/usr/$(get_libdir)" -version-number 1:0:0 || die
+}
+
+src_install() {
+ dolib.so .libs/${PN}$(get_libname)*
+ dodoc README.TXT
+}
diff --git a/x11-libs/libfakeXinerama/metadata.xml b/x11-libs/libfakeXinerama/metadata.xml
new file mode 100644
index 00000000000..ecd8e3de07d
--- /dev/null
+++ b/x11-libs/libfakeXinerama/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chewi@gentoo.org</email>
+ <name>James Le Cuirot</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Xpra-org/libfakeXinerama</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libfakekey/metadata.xml b/x11-libs/libfakekey/metadata.xml
index 2fdbf33d963..8641e5bdd39 100644
--- a/x11-libs/libfakekey/metadata.xml
+++ b/x11-libs/libfakekey/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml
index 4281b89a088..d53514de106 100644
--- a/x11-libs/libfm-extra/metadata.xml
+++ b/x11-libs/libfm-extra/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>lxqt@gentoo.org</email>
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 0b38a25215e..7e332010540 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,2 +1 @@
-DIST libfm-qt-0.16.0.tar.xz 348548 BLAKE2B 41c52efc5b71d924c06d55a5b94e7f9a1c4feda0a664d83b0de906479bdb644260a68136720baeb1958a48b08019b72de34b6066f51c19e5c5fb65afcd9e903c SHA512 5de63408a641b0e77cb319952e428aee9cd35db9ec3e6726a8327ebc53f5641cf66b28dbabd96797c64a253b1e41421dbe05dcb9f4bc7941bd92676bbfa9cc84
DIST libfm-qt-0.17.1.tar.xz 363052 BLAKE2B 5931a5f06f0d085aedf0b178efe4f47ccc90d6e99dfa88955d692736d0dbc4fb8ebc9c5b834547b473b84ce815bb7e1e2e991fee38f390e7ff85c8a3effe8f26 SHA512 1e1781a01446f381625361a50f77422827e7ac5ab6039b4246369e2281edf78d3ccba866fa472667bcbb6737c44ebc350cb30a0055fc84d1f5d7e1c83e1241c1
diff --git a/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild b/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild
deleted file mode 100644
index 7b04c4a72eb..00000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Library for Building File Managers"
-HOMEPAGE="https://lxqt.github.io/"
-
-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 x86"
-fi
-
-LICENSE="BSD GPL-2+ LGPL-2.1+"
-SLOT="0/7"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.8.0
- virtual/pkgconfig
-"
-DEPEND="
- dev-libs/glib:2
- dev-qt/qtcore:5
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- >=lxde-base/menu-cache-1.1.0:=
- media-libs/libexif
- x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
- !lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-qt/metadata.xml b/x11-libs/libfm-qt/metadata.xml
index da013df6513..cb633cd2f5f 100644
--- a/x11-libs/libfm-qt/metadata.xml
+++ b/x11-libs/libfm-qt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>lxqt@gentoo.org</email>
diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
index c6faec3664b..95a0bf5b2f2 100644
--- a/x11-libs/libfm/metadata.xml
+++ b/x11-libs/libfm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/x11-libs/libfontenc/metadata.xml b/x11-libs/libfontenc/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libfontenc/metadata.xml
+++ b/x11-libs/libfontenc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml
index f6aaeea5bff..3e7fdc1647e 100644
--- a/x11-libs/libgxim/metadata.xml
+++ b/x11-libs/libgxim/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/x11-libs/libnotify/libnotify-0.7.9-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.9-r1.ebuild
index 5661bbbbf60..34fa5a648bb 100644
--- a/x11-libs/libnotify/libnotify-0.7.9-r1.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.9-r1.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 ~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/metadata.xml b/x11-libs/libnotify/metadata.xml
index 0f6db5621bc..76d4eb294b3 100644
--- a/x11-libs/libnotify/metadata.xml
+++ b/x11-libs/libnotify/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
diff --git a/x11-libs/liboglappth/metadata.xml b/x11-libs/liboglappth/metadata.xml
index 75150c96669..5ea6254eaf5 100644
--- a/x11-libs/liboglappth/metadata.xml
+++ b/x11-libs/liboglappth/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-chemistry@gentoo.org</email>
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index 784b93f6147..7355b217f89 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -8,7 +8,7 @@ XORG_EAUTORECONF=yes
inherit xorg-3
DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="zlib"
DEPEND="
diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libpciaccess/metadata.xml
+++ b/x11-libs/libpciaccess/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/librfm/metadata.xml b/x11-libs/librfm/metadata.xml
index c6e70021a64..99052ec6f8d 100644
--- a/x11-libs/librfm/metadata.xml
+++ b/x11-libs/librfm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<upstream>
diff --git a/x11-libs/libtinynotify-cli/metadata.xml b/x11-libs/libtinynotify-cli/metadata.xml
index 59cabc032eb..d17b2795134 100644
--- a/x11-libs/libtinynotify-cli/metadata.xml
+++ b/x11-libs/libtinynotify-cli/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/x11-libs/libtinynotify-systemwide/metadata.xml b/x11-libs/libtinynotify-systemwide/metadata.xml
index b393cf15509..de90f98171a 100644
--- a/x11-libs/libtinynotify-systemwide/metadata.xml
+++ b/x11-libs/libtinynotify-systemwide/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/x11-libs/libtinynotify/metadata.xml b/x11-libs/libtinynotify/metadata.xml
index 099105f604d..65f92d78d22 100644
--- a/x11-libs/libtinynotify/metadata.xml
+++ b/x11-libs/libtinynotify/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/x11-libs/libva-compat/metadata.xml b/x11-libs/libva-compat/metadata.xml
index 99ca258afef..e454a283191 100644
--- a/x11-libs/libva-compat/metadata.xml
+++ b/x11-libs/libva-compat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chewi@gentoo.org</email>
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index 66f13678f5f..da593f3141e 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 58c9e525ce4..0aa8033099d 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -5,3 +5,6 @@ DIST intel-media-21.1.2.tar.gz 22487027 BLAKE2B 819b7c4a4fc9295034af77f1e95d4b23
DIST intel-media-21.1.3.tar.gz 22507169 BLAKE2B 68962db57d6f4c11e50b5d44584adf0458d08a118234a091aa55734885ee9fab6449658a8736c4a23233be38b58311953492482c3d9b258dd2cf8008cf363f20 SHA512 a5a4c26d86191138245e0cc62304aeeccfb6627b04310e4b1d35cc2050b909d9b856b6176d868562336dd6342f93b1909b46fb481eb353ef02cc188eea5da121
DIST intel-media-21.2.2.tar.gz 23021952 BLAKE2B 0173eb8fb81c3012af30bb755b87e5f4ad8e0ea1d7fd4c844dda8d08d72968e3080f320384dcc50caf0ad4f013eec69fe4e8d1444fac665623e6f72521fc3a95 SHA512 f88fd02af55538045e01982e7bda8a7e781ad7fa57a8e60e61681a705a87a402ceab433a5362fe0f6269366ea54b60f91ffd2689641370f20c66dc10d26d1c4a
DIST intel-media-21.2.3.tar.gz 23025524 BLAKE2B 0652563f8e8494c9fa181822a7af348cc5ce1e2446063c743fa89072ae46c6a4af0c71001fb8249b0306d67a220312f883a8f54dde1981078e6ee8fad71eaaa1 SHA512 b12ff5b3afbc4d4f34353c7a4ea50b1c66746b33920e450d7d17cffdc234921e82fc4c1afb025274caf2a5efbe87e577b6790d0648a52de08ea19b11a103ac81
+DIST intel-media-21.3.2.tar.gz 23069924 BLAKE2B cb7035698bc19eb65f0cf338e7fb0e11a379a27c243566b6f884d63897da10e2ded39523fcc81131f41885508d1413e7960e38cf9cf2d129d7a6a3994fa9b384 SHA512 27a1849ed2f2367e5de63189faa6e14a1a23f6708c45392f661fab819f856bb4a3d0d31754213b084c4f05be3b155b0a80c2f4e330c79879597910f77e3f1597
+DIST intel-media-21.3.3.tar.gz 23092541 BLAKE2B 083cc368095bbc9cf333953855ad94d7a8d633337b967f4f93d94e3c8e23bbcdadad19c1b1032cafc671ae9a9df9be547498ebe84426ad9d91a9e82557095eb8 SHA512 a9da8a627420c5ea0de9413ce0aeb471f40a0886abd67380ead7ffba32de4abbc1741c47cfcfc73d42b14456090266f4dad8d363c8ad590cef521ef48e42f692
+DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild
new file mode 100644
index 00000000000..6eec248e7f0
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"
+ KEYWORDS="" # no keywords for '_pre' releases
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD"
+SLOT="0"
+IUSE="+custom-cflags set-as-default test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-21.1.3
+ >=x11-libs/libva-2.11.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+ "${FILESDIR}"/${PN}-21.2.2_custom_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)
+ -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+ -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use set-as-default ; then
+ echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
+ doenvd "${T}/55libva-intel-media-driver"
+ fi
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild
new file mode 100644
index 00000000000..6eec248e7f0
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.3_pre.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"
+ KEYWORDS="" # no keywords for '_pre' releases
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD"
+SLOT="0"
+IUSE="+custom-cflags set-as-default test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-21.1.3
+ >=x11-libs/libva-2.11.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+ "${FILESDIR}"/${PN}-21.2.2_custom_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)
+ -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+ -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use set-as-default ; then
+ echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
+ doenvd "${T}/55libva-intel-media-driver"
+ fi
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild
new file mode 100644
index 00000000000..15ca5a26b62
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+SLOT="0"
+IUSE="+custom-cflags set-as-default test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-21.3.1
+ >=x11-libs/libva-2.13.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+ "${FILESDIR}"/${PN}-21.2.2_custom_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)
+ -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+ -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use set-as-default ; then
+ echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
+ doenvd "${T}/55libva-intel-media-driver"
+ fi
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 7e53505dd38..15ca5a26b62 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -15,7 +15,9 @@ 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}"
- KEYWORDS="~amd64"
+ if [[ ${PV} != *_pre* ]] ; then
+ KEYWORDS="~amd64"
+ fi
fi
DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
@@ -27,8 +29,8 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.1.3
- >=x11-libs/libva-2.11.0[X?]
+DEPEND=">=media-libs/gmmlib-21.3.1
+ >=x11-libs/libva-2.13.0[X?]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/libva-intel-media-driver/metadata.xml b/x11-libs/libva-intel-media-driver/metadata.xml
index 7c456c68af9..6afcc149822 100644
--- a/x11-libs/libva-intel-media-driver/metadata.xml
+++ b/x11-libs/libva-intel-media-driver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>media-video@gentoo.org</email>
diff --git a/x11-libs/libva-vdpau-driver/metadata.xml b/x11-libs/libva-vdpau-driver/metadata.xml
index e0c65e53b38..970c74a76a4 100644
--- a/x11-libs/libva-vdpau-driver/metadata.xml
+++ b/x11-libs/libva-vdpau-driver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 85d761252f4..49c22e06c7d 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,6 +1,7 @@
DIST libva-2.10.0.tar.bz2 484741 BLAKE2B 9c3912d5337d3624af9ffc537a972479385285413712948159641d10b60a39b60754b3bc6467a0508a878df29be23c0e2bace488bdf9047f3e162ca0b573fa5f SHA512 9225120f17e0d935927cb0046c3a6086c776beac71a8ef7fd800d2c6a721d0e28a13be89221c5ef3cca1634317aaa2a513554ccf25a54f25b2a339603c4a11a1
DIST libva-2.11.0.tar.gz 252204 BLAKE2B b56c47296493a9ecce7758661386d98d9a47082d8f16ab3b352f84591291e85aefc336a209433a901f7c4be1f54570221e9955666b22125740cc060542099394 SHA512 592df16bca06c93d252d27b2105032f020b0ca30f7937533918a497f385ec59b8a1e19c5d89047c197ddc1aab056128ab114b9ec29de3e968cb96bfa8d85f02a
DIST libva-2.12.0.tar.gz 257645 BLAKE2B 8436f654e3fec57dd490aad6ff19d7fd9aa33a90f32535c0bd57ad47ab6c5728b7a67b277c46f854b781747fd641a76d068f052d95104d515eb9a9b206041edc SHA512 53b22dd5166b92bceb508e7ecd73ae023d95928a76db0e61f4326652f23f6603c507b2ee604779293c7d7a02ef0f7b082e3b181bbb55f0a63416196088af1b51
+DIST libva-2.13.0.tar.gz 256724 BLAKE2B 97dd51bf488dc88027125973399e17dedcce03b7bf5104fd9bf17156c5013e1e9d46f2bf78c16431141294f75549a00fed3542b4f79dd31b032f4505c11d07d7 SHA512 226d09956754c9942348ed289f210268bad64dbba95d948b33ae063f7ecb276af9da083a48c03c3c79ad4305716d203898bc75a109945d064a5fe6fb43398dea
DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106
DIST libva-2.6.1.tar.bz2 466497 BLAKE2B d4ea6e6d0102722206d94725932f0b3cf650bab3f02235f4c627dc83e5417b786f9524430d793f1067d002a0c9d7cbc92a7c740383c698d225a14946e1bb90ba SHA512 b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d
DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe5681669ecb3583a8910568bc96817b8da079ffe80915ecf1002f9ac247eea5e44f8f7ce305313719fc1a4f1c5892b3 SHA512 f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126
diff --git a/x11-libs/libva/libva-2.12.0.ebuild b/x11-libs/libva/libva-2.12.0.ebuild
index 953e353bda4..6dbcb7faaaa 100644
--- a/x11-libs/libva/libva-2.12.0.ebuild
+++ b/x11-libs/libva/libva-2.12.0.ebuild
@@ -18,7 +18,7 @@ else
# To simplify updates, portage use tarballs without pre-build 'configure'
# which are always available.
SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"
diff --git a/x11-libs/libva/libva-2.13.0.ebuild b/x11-libs/libva/libva-2.13.0.ebuild
new file mode 100644
index 00000000000..953e353bda4
--- /dev/null
+++ b/x11-libs/libva/libva-2.13.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} = *9999 ]] ; then
+ inherit git-r3
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="https://github.com/intel/libva"
+else
+ # SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
+ # The upstream provides periodically tarball with pre-built 'configure'.
+ # To simplify updates, portage use tarballs without pre-build 'configure'
+ # which are always available.
+ SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl utils vdpau wayland X"
+
+VIDEO_CARDS="nvidia intel i965 nouveau"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+RDEPEND="
+ >=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+ dev-util/wayland-scanner[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+ video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+ utils? ( media-video/libva-utils )
+"
+
+REQUIRED_USE="|| ( drm wayland X )
+ opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/va/va_backend_glx.h
+ /usr/include/va/va_x11.h
+ /usr/include/va/va_dri2.h
+ /usr/include/va/va_dricommon.h
+ /usr/include/va/va_glx.h
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable drm)
+ --enable-va-messaging
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ default
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
index 7c9953aceea..52ff7214021 100644
--- a/x11-libs/libva/metadata.xml
+++ b/x11-libs/libva/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/x11-libs/libvdpau/metadata.xml
+++ b/x11-libs/libvdpau/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/x11-libs/libwnck/metadata.xml b/x11-libs/libwnck/metadata.xml
index edf87c6f6e8..35f3d9b84ef 100644
--- a/x11-libs/libwnck/metadata.xml
+++ b/x11-libs/libwnck/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index b20b8c3487c..8502d3c33d7 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.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 ~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 ~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/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
index 396f8bde1da..3fae52d3979 100644
--- a/x11-libs/libxcb/metadata.xml
+++ b/x11-libs/libxcb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libxcvt/libxcvt-0.1.0.ebuild b/x11-libs/libxcvt/libxcvt-0.1.0.ebuild
index 0ad3f5af940..27041453c6a 100644
--- a/x11-libs/libxcvt/libxcvt-0.1.0.ebuild
+++ b/x11-libs/libxcvt/libxcvt-0.1.0.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
inherit xorg-3 meson
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
fi
DESCRIPTION="X.Org xcvt library and cvt program"
diff --git a/x11-libs/libxcvt/metadata.xml b/x11-libs/libxcvt/metadata.xml
index 7a7bbf81054..6bbd73893d3 100644
--- a/x11-libs/libxcvt/metadata.xml
+++ b/x11-libs/libxcvt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 4d717f518ba..c60f8ee9f9c 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1 +1,2 @@
DIST libxkbcommon-1.3.0.tar.xz 455256 BLAKE2B f53a47005dd411855d1d5c39a33ef58d22982b2d4c2014320722f7fe9a9b468366c6090fadd067e50a846f22de7b80164b684615a8bcb1b14a478609cc4deb74 SHA512 9585ab1df7f2d95b991a786ee1f1de0a645aa315edb93cb093f3409fc76ef7b8f8189a6a7bfd179dc01c5d105d9c9eea40a395762eeffe0618b0c3ee116c0d18
+DIST libxkbcommon-1.3.1.tar.xz 471036 BLAKE2B c46d39876bd4477fe838e17e744ed04388417cfae8bb77c7de48237d31f51fe230d2705733dc0873253b48c61530fbe932e4da7317217c31a7897702fa1d03b4 SHA512 3b2cf6ae9ba4dc8b6fe702ac1fa700034fbc9bd147c73bd2cd93546bcfb71865734b3e46bad35a8fd618ed97266a02dad1dc966c63e6b10404a64919459d933e
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
new file mode 100644
index 00000000000..afdec5dec58
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
@@ -0,0 +1,61 @@
+# 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/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
index 720e8a2f5f0..9527efe6ae5 100644
--- a/x11-libs/libxkbcommon/metadata.xml
+++ b/x11-libs/libxkbcommon/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index 15403f69d2f..3c81299b992 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org xkbfile library"
-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 ~x86-winnt"
+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 ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libxkbfile/metadata.xml b/x11-libs/libxkbfile/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libxkbfile/metadata.xml
+++ b/x11-libs/libxkbfile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libxklavier/metadata.xml b/x11-libs/libxklavier/metadata.xml
index f3cab85cf60..d0b58801b31 100644
--- a/x11-libs/libxklavier/metadata.xml
+++ b/x11-libs/libxklavier/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
index 0ee4dd83fe9..08253db81cb 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
@@ -8,6 +8,6 @@ inherit xorg-3
DESCRIPTION="Shared memory fences using futexes"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libxshmfence/metadata.xml b/x11-libs/libxshmfence/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/libxshmfence/metadata.xml
+++ b/x11-libs/libxshmfence/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/libyui-gtk/metadata.xml b/x11-libs/libyui-gtk/metadata.xml
index c6c4bd48f46..86db53b6001 100644
--- a/x11-libs/libyui-gtk/metadata.xml
+++ b/x11-libs/libyui-gtk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<longdescription lang="en">
diff --git a/x11-libs/libyui-ncurses/metadata.xml b/x11-libs/libyui-ncurses/metadata.xml
index bc627c3f876..906cb3b7b0b 100644
--- a/x11-libs/libyui-ncurses/metadata.xml
+++ b/x11-libs/libyui-ncurses/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<longdescription lang="en">
diff --git a/x11-libs/libyui-qt/metadata.xml b/x11-libs/libyui-qt/metadata.xml
index f6b1437056e..f3ffe9b8c46 100644
--- a/x11-libs/libyui-qt/metadata.xml
+++ b/x11-libs/libyui-qt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<longdescription lang="en">
diff --git a/x11-libs/libyui/metadata.xml b/x11-libs/libyui/metadata.xml
index 03d507f538b..d5d0469a37e 100644
--- a/x11-libs/libyui/metadata.xml
+++ b/x11-libs/libyui/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<longdescription lang="en">
diff --git a/x11-libs/metadata.xml b/x11-libs/metadata.xml
index 33f939ef926..cfb5fab5007 100644
--- a/x11-libs/metadata.xml
+++ b/x11-libs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The x11-libs category contains various X11-related libraries.
diff --git a/x11-libs/motif/metadata.xml b/x11-libs/motif/metadata.xml
index 40ef2c33fec..31cb60593ca 100644
--- a/x11-libs/motif/metadata.xml
+++ b/x11-libs/motif/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ulm@gentoo.org</email>
diff --git a/x11-libs/motif/motif-2.3.8-r2.ebuild b/x11-libs/motif/motif-2.3.8-r2.ebuild
index 6e1c4083565..92ab7b3e60f 100644
--- a/x11-libs/motif/motif-2.3.8-r2.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r2.ebuild
@@ -13,7 +13,7 @@ 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 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}]
diff --git a/x11-libs/mx/Manifest b/x11-libs/mx/Manifest
deleted file mode 100644
index 64d8ec2d3af..00000000000
--- a/x11-libs/mx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mx-1.4.7.tar.xz 939672 BLAKE2B 3f55018c6d282af95b80852748a6baa7a56ea1ea69e1b3740b6d936633818f3b18124f1bec2d5bc51596df75a5633d355362d1d22549c5a7e490e053fcca2bae SHA512 6870898548c947d43947ea6ded7c06d01d18aa721c81927fabf3ee0cfe20f65739e927d32277acce5c2e13968502828e29e043f9a8cf31af8f2bc20ec1ad0349
diff --git a/x11-libs/mx/files/mx-1.4.7-gl-types.patch b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
deleted file mode 100644
index 85c691378d8..00000000000
--- a/x11-libs/mx/files/mx-1.4.7-gl-types.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 297b654133436c6ee5146fce31529da4e52dfe74 Mon Sep 17 00:00:00 2001
-From: Brian Pepple <bpepple@fedoraproject.org>
-Date: Sat, 25 Aug 2012 17:41:59 -0400
-Subject: [PATCH] Replace GL data types with equivalent glib types.
-
----
- mx/mx-deform-texture.c | 8 ++++----
- mx/mx-texture-frame.c | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/mx/mx-deform-texture.c b/mx/mx-deform-texture.c
-index 93c54d7..466cc9f 100644
---- a/mx/mx-deform-texture.c
-+++ b/mx/mx-deform-texture.c
-@@ -493,9 +493,9 @@ mx_deform_texture_class_init (MxDeformTextureClass *klass)
- static void
- mx_deform_texture_init_arrays (MxDeformTexture *self)
- {
-- GLushort *idx, *bf_idx;
-+ gushort *idx, *bf_idx;
- gint x, y, direction;
-- GLushort *static_indices, *static_bf_indices;
-+ gushort *static_indices, *static_bf_indices;
- MxDeformTexturePrivate *priv = self->priv;
-
- mx_deform_texture_free_arrays (self);
-@@ -503,8 +503,8 @@ mx_deform_texture_init_arrays (MxDeformTexture *self)
- priv->n_indices = (2 + 2 * priv->tiles_x) *
- priv->tiles_y +
- (priv->tiles_y - 1);
-- static_indices = g_new (GLushort, priv->n_indices);
-- static_bf_indices = g_new (GLushort, priv->n_indices);
-+ static_indices = g_new (gushort, priv->n_indices);
-+ static_bf_indices = g_new (gushort, priv->n_indices);
-
- #define MESH_INDEX(X, Y) (Y) * (priv->tiles_x + 1) + (X)
-
-diff --git a/mx/mx-texture-frame.c b/mx/mx-texture-frame.c
-index bde57ff..a88985f 100644
---- a/mx/mx-texture-frame.c
-+++ b/mx/mx-texture-frame.c
-@@ -200,7 +200,7 @@ mx_texture_frame_paint (ClutterActor *self)
-
-
- {
-- GLfloat rectangles[] =
-+ gfloat rectangles[] =
- {
- /* top left corner */
- 0, 0,
---
-1.7.12
-
diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml
deleted file mode 100644
index 6838de46e0f..00000000000
--- a/x11-libs/mx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <upstream>
- <remote-id type="github">clutter-project/mx</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/x11-libs/mx/mx-1.4.7-r2.ebuild b/x11-libs/mx/mx-1.4.7-r2.ebuild
deleted file mode 100644
index 5a85ae7c71a..00000000000
--- a/x11-libs/mx/mx-1.4.7-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit gnome2 epatch
-
-DESCRIPTION="A widget toolkit using Clutter"
-HOMEPAGE="http://clutter-project.org/"
-SRC_URI="https://github.com/downloads/clutter-project/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus +gtk +introspection startup-notification"
-
-RDEPEND="
- >=dev-libs/glib-2.28.0:2
- >=media-libs/clutter-1.7.91:1.0
- media-libs/cogl:=
- >=x11-apps/xrandr-1.2.0
-
- x11-libs/gdk-pixbuf:2[introspection?]
-
- dbus? ( >=dev-libs/dbus-glib-0.82 )
- gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
- startup-notification? ( >=x11-libs/startup-notification-0.9 )
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.35.0
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Tests are interactive, no use for us
- sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
- -i Makefile.am -i Makefile.in || die
- # In 1.4.8
- epatch "${FILESDIR}/${P}-gl-types.patch"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --with-winsys=x11 \
- --without-glade \
- $(use_enable gtk gtk-widgets) \
- $(use_enable introspection) \
- $(use_with dbus) \
- $(use_with startup-notification)
-}
diff --git a/x11-libs/neXtaw/metadata.xml b/x11-libs/neXtaw/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/x11-libs/neXtaw/metadata.xml
+++ b/x11-libs/neXtaw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index 9669ec61017..f89f6117831 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
RDEPEND="
x11-base/xorg-proto
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 0bf4efd638d..9e8a7cd33f8 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,4 +1,6 @@
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.48.10.tar.xz 2071736 BLAKE2B 68bca7e8307fc7ddb49830c84b17e95fbb1f2e1afbe04d26d04d9bd9f48f0767b80cb7446a22150a7f3d5650614d6652d7b20be102d533b4c78adf58574c57d1 SHA512 f9acdfb3fde50e8fb4b3dfad329624754ef7cb1c6ff6d80485c1fc7a24d92095b7e9053cd8713a291fbee68cd1cd699dcdb8110265b44e97a34c5b4ef0c06390
DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 8529e8cbcf0f33be56cf09229abe45fb3525e12a9c2a6ad7cca416ff67a92eb010abc2ce814fa4d19a924186369eede4a576efdd2f4c64b39e31c9821c5e414a SHA512 2c758e649af5b9f9fa960c26a6f4dcf5abd8035101fdfe4a02fe02cb892250b615584b02d63aaa06f3da5cbe7bb848459ac969f43437c34cec084b51bcf48cab
DIST pango-1.48.7.tar.xz 2050880 BLAKE2B 2ee048d9713aed0972ffdf3feb96c7c0683ffa1494ac2b798a4f6b1f5797d689b0e0c06bcc3f4a10130d23279ed295a3a59141c75bd3a0f2da7facf62d6c3baa SHA512 e5680d628f531bea7633945bd74dc51a93c4c881dec58fcf9f6271043e77b82a4805e311355cb4d9f8cdfcdf52785a5a6391517a264b62416c26e82dff4aca39
+DIST pango-1.48.9.tar.xz 2063756 BLAKE2B d1610aaac783b95a35ad3e083b4bab33f3d4beff533386817addcb5eb9022de242087ffe4e62c043870b4aac1fbc0fe3e1c5d18744909a5a05015a702dfea2e3 SHA512 e3bba743bb596b0a34cedc893f9af0216bcc9fec521c2da09cfdeec9ad80a05b5c53c3fce1a225ab27536e9335725cffb87c66867d0522fd4632df00b1d4c056
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index f669897c8f8..eac868b6c1c 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/pango/pango-1.48.7.ebuild b/x11-libs/pango/pango-1.48.10.ebuild
index b225dec3489..0c88d226201 100644
--- a/x11-libs/pango/pango-1.48.7.ebuild
+++ b/x11-libs/pango/pango-1.48.10.ebuild
@@ -3,33 +3,30 @@
EAPI=7
-inherit gnome2-utils meson-multilib toolchain-funcs xdg
+inherit flag-o-matic gnome2-utils meson-multilib toolchain-funcs 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+ FTL"
+LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv sparc ~x86"
-IUSE="gtk-doc +introspection sysprof test X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk-doc? ( introspection )"
+IUSE="debug +introspection sysprof X"
RDEPEND="
- >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
+ >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
+ >=media-libs/harfbuzz-2.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}]
- >=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
)
"
DEPEND="${RDEPEND}
@@ -40,11 +37,6 @@ BDEPEND="
dev-util/glib-utils
sys-apps/help2man
virtual/pkgconfig
- gtk-doc? (
- dev-util/gi-docgen
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- )
"
src_prepare() {
@@ -53,31 +45,31 @@ src_prepare() {
}
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
- $(meson_feature sysprof)
- $(meson_feature X xft)
- -Dcairo=enabled
- -Dfontconfig=enabled
- -Dfreetype=enabled
- $(meson_native_use_bool gtk-doc gtk_doc)
+ -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() {
- if use gtk-doc; then
- mv "${ED}"/usr/share/doc/{${PN}/reference/,${PF}/html/} || die
- rmdir "${ED}"/usr/share/doc/${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
+ 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*
}
diff --git a/x11-libs/pango/pango-1.48.7-r1.ebuild b/x11-libs/pango/pango-1.48.7-r1.ebuild
index 306afbbf4a5..aef9e1d9db1 100644
--- a/x11-libs/pango/pango-1.48.7-r1.ebuild
+++ b/x11-libs/pango/pango-1.48.7-r1.ebuild
@@ -11,13 +11,13 @@ 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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="debug +introspection sysprof X"
RDEPEND="
>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
- >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+ >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
diff --git a/x11-libs/pango/pango-1.48.9.ebuild b/x11-libs/pango/pango-1.48.9.ebuild
new file mode 100644
index 00000000000..31ec4a4021c
--- /dev/null
+++ b/x11-libs/pango/pango-1.48.9.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic gnome2-utils meson-multilib toolchain-funcs 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 ~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.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${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*
+}
diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
index 46b4979bd90..b6b501a3b83 100644
--- a/x11-libs/pixman/metadata.xml
+++ b/x11-libs/pixman/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index 65d7123b398..90fff3bb904 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
- 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 ~x86-winnt"
+ 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 ~x86-winnt"
SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
fi
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 05ed79dc77b..8247ffec01a 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
-DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
-DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
+DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index c0732c358c3..4844fb1b339 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
deleted file mode 100644
index 301812495e5..00000000000
--- a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-
-MY_PN=QScintilla
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
- SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
-IUSE="designer doc"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- designer? ( dev-qt/designer:5 )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- default
-
- # Sub-slot sanity check
- local subslot=${SLOT#*/}
- local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
- local major=${version%%.*}
- if [[ ${subslot} != ${major} ]]; then
- eerror
- eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
- eerror "Please update SLOT variable as follows:"
- eerror " SLOT=\"${SLOT%%/*}/${major}\""
- eerror
- die "sub-slot sanity check failed"
- fi
-}
-
-qsci_run_in() {
- pushd "$1" >/dev/null || die
- shift || die
- "$@" || die
- popd >/dev/null || die
-}
-
-src_configure() {
- if use designer; then
- # prevent building against system version (bug 466120)
- append-cxxflags -I../Qt4Qt5
- append-ldflags -L../Qt4Qt5
- fi
-
- qsci_run_in Qt4Qt5 eqmake5
- use designer && qsci_run_in designer-Qt4Qt5 eqmake5
-}
-
-src_compile() {
- qsci_run_in Qt4Qt5 emake
- use designer && qsci_run_in designer-Qt4Qt5 emake
-}
-
-src_install() {
- qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
- use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
- DOCS=( ChangeLog NEWS )
- use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
- einstalldocs
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
index 82d8a6e8e81..dbdee402333 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ fi
LICENSE="GPL-3"
SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
IUSE="designer doc"
RDEPEND="
diff --git a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
index b724431bd16..28e0c4e73dc 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-3"
SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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 b672a6ac59d..d68053121b7 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,2 +1 @@
-DIST qtermwidget-0.16.1.tar.xz 182764 BLAKE2B ba041130d8d67c08db07b91a5eb513c6fee548df3abef3ac7d7ccc5114771f2a14fff3c3f01a762670d8e3d9887fd7f62e1c018ea98ee7cc8e68b77317871966 SHA512 689d067e259aa07b22e1d3344467180109e871a8d45551085625c04670f1422b821bbbf52caf2b67e10ce8e78214c8e65811e6eb4fc61dd246fc25598ed095c5
DIST qtermwidget-0.17.0.tar.xz 187424 BLAKE2B 8053eae3674f12839a205b0686bdb42d83662604da1f43ee6c4feb60c35af6a2f7b65a095a89b64ffd9d2c3ac10e7c78df721862f15f401126fcab3d321fb92e SHA512 c8f75dcd5182a6eea933452c89126fbe64035b278e8e9817d6966693f741691244e5766c49046e83add8f38cb00ff08e2640d2fa149c5aa46b20d8a06a22e78f
diff --git a/x11-libs/qtermwidget/metadata.xml b/x11-libs/qtermwidget/metadata.xml
index 779c6c6b024..df1993476de 100644
--- a/x11-libs/qtermwidget/metadata.xml
+++ b/x11-libs/qtermwidget/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
diff --git a/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
deleted file mode 100644
index f739ad66dc1..00000000000
--- a/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://lxqt.github.io/"
-
-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 x86"
-fi
-
-LICENSE="BSD GPL-2 LGPL-2+"
-SLOT="0/${PV}"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 5acd8316bb0..6e86914f12c 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
index 5762259d2e3..aa64d85aa9c 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
SLOT="5"
IUSE="designer examples"
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
index 03ad3bea5fc..704d6f46f16 100644
--- a/x11-libs/qwtplot3d/metadata.xml
+++ b/x11-libs/qwtplot3d/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/x11-libs/qwtpolar/metadata.xml b/x11-libs/qwtpolar/metadata.xml
index 5b5806a77b8..388d8d5fbf9 100644
--- a/x11-libs/qwtpolar/metadata.xml
+++ b/x11-libs/qwtpolar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/x11-libs/rep-gtk/metadata.xml b/x11-libs/rep-gtk/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/x11-libs/rep-gtk/metadata.xml
+++ b/x11-libs/rep-gtk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/x11-libs/scw/metadata.xml b/x11-libs/scw/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/x11-libs/scw/metadata.xml
+++ b/x11-libs/scw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/x11-libs/snorenotify/metadata.xml b/x11-libs/snorenotify/metadata.xml
index 2fdbf33d963..d925f243975 100644
--- a/x11-libs/snorenotify/metadata.xml
+++ b/x11-libs/snorenotify/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
index c165073fda3..4d88523fddf 100644
--- a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
+++ b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="sound test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/spread-sheet-widget/metadata.xml b/x11-libs/spread-sheet-widget/metadata.xml
index 7bd5a01cbd2..29e46088b23 100644
--- a/x11-libs/spread-sheet-widget/metadata.xml
+++ b/x11-libs/spread-sheet-widget/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>alexxy@gentoo.org</email>
diff --git a/x11-libs/startup-notification/metadata.xml b/x11-libs/startup-notification/metadata.xml
index fb76b944f2d..d43581a9ab0 100644
--- a/x11-libs/startup-notification/metadata.xml
+++ b/x11-libs/startup-notification/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
diff --git a/x11-libs/tslib/metadata.xml b/x11-libs/tslib/metadata.xml
index 640fc4e4a42..23ae18f0236 100644
--- a/x11-libs/tslib/metadata.xml
+++ b/x11-libs/tslib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>embedded@gentoo.org</email>
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index 4a1550c34ad..da14147f6e1 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/x11-libs/vte/vte-0.64.2.ebuild b/x11-libs/vte/vte-0.64.2.ebuild
index f41c77ca513..21873ac96c9 100644
--- a/x11-libs/vte/vte-0.64.2.ebuild
+++ b/x11-libs/vte/vte-0.64.2.ebuild
@@ -11,6 +11,7 @@ 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"
+# 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"
@@ -22,7 +23,7 @@ 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.64.1-command-notify.patch.xz )"
RDEPEND="
- >=x11-libs/gtk+-3.24.14:3[introspection?]
+ >=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= )
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
index aa10f7e1f6d..45dc9be8c61 100644
--- a/x11-libs/wxGTK/metadata.xml
+++ b/x11-libs/wxGTK/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>wxwidgets@gentoo.org</email>
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 87cf97e69f0..a24c4be3427 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,2 +1,2 @@
DIST xapps-2.2.1.tar.gz 239789 BLAKE2B ee7f3f2b3c54b0b40158dff6abbe2233c0d1a1fa4e134ce4bd6ee48842335b16e0d94ad430cb59301529dd85e2705cbb1c1f5ba10844b6fb85f598ca0c42d1db SHA512 412f5c207d81d2507f2aa5cc69beed2036db07058f08613793aa7c277bac30191a02d9aff4eca0aeb8829e3e39d5f3a87e34232bf51220c4d4bc7c8ee37b9e65
-DIST xapps-2.2.2.tar.gz 239823 BLAKE2B a45b2707c505c9ed69b9748c846f69ef7668600619bc3d0f86c693c99e536afb9994ff4ed10cbf0efc194a1e861cf0911af50170e97a7b858b1363c370551799 SHA512 ab37714849365a81b2a500ed38ada9bf6b52edc17d3b3bfa6d41551a18af1b983f8fe084dee94939e81647814a77d2c219b87694349ac5d0d0ac59ba5ad79aa7
+DIST xapps-2.2.4.tar.gz 242171 BLAKE2B a2e53123776f3f0739778673d08f165d268f5d632ce57d722ac443a7201c22c14c1c88e08247f6c16dd708a01b2dd566d4bd9d55289d70eb50ba29b8f2a0987d SHA512 428fd4dc1911905d6f940c6e38fc8b572d55bcb2691d45ac807276ef554b781c9f6c57bbd6d0a95bf52ca1703a38d260f36a61b88a94bc2dc0812b575839a983
diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapps/metadata.xml
index a87c17eb9a8..9ffd2e01326 100644
--- a/x11-libs/xapps/metadata.xml
+++ b/x11-libs/xapps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>sparky@bluefang-logic.com</email>
diff --git a/x11-libs/xapps/xapps-2.2.2.ebuild b/x11-libs/xapps/xapps-2.2.4.ebuild
index a7434062a55..a7434062a55 100644
--- a/x11-libs/xapps/xapps-2.2.2.ebuild
+++ b/x11-libs/xapps/xapps-2.2.4.ebuild
diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml
index ff903b86644..de21169f5dd 100644
--- a/x11-libs/xbae/metadata.xml
+++ b/x11-libs/xbae/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/x11-libs/xcb-util-cursor/metadata.xml b/x11-libs/xcb-util-cursor/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/xcb-util-cursor/metadata.xml
+++ b/x11-libs/xcb-util-cursor/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/xcb-util-image/metadata.xml b/x11-libs/xcb-util-image/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/xcb-util-image/metadata.xml
+++ b/x11-libs/xcb-util-image/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/xcb-util-keysyms/metadata.xml b/x11-libs/xcb-util-keysyms/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/xcb-util-keysyms/metadata.xml
+++ b/x11-libs/xcb-util-keysyms/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/xcb-util-renderutil/metadata.xml b/x11-libs/xcb-util-renderutil/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/xcb-util-renderutil/metadata.xml
+++ b/x11-libs/xcb-util-renderutil/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/xcb-util-wm/metadata.xml b/x11-libs/xcb-util-wm/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/xcb-util-wm/metadata.xml
+++ b/x11-libs/xcb-util-wm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/xcb-util-xrm/metadata.xml b/x11-libs/xcb-util-xrm/metadata.xml
index 2b0c7132c37..c87b1348b28 100644
--- a/x11-libs/xcb-util-xrm/metadata.xml
+++ b/x11-libs/xcb-util-xrm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription>
The XCB util modules provides a number of libraries which sit on top
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
index 792ab1a6117..fb12007f954 100644
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="https://xcb.freedesktop.org/"
SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86"
RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
x11-libs/xcb-util[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util/metadata.xml b/x11-libs/xcb-util/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/xcb-util/metadata.xml
+++ b/x11-libs/xcb-util/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/xforms/metadata.xml b/x11-libs/xforms/metadata.xml
index 58c1077b82e..4c0d3032d69 100644
--- a/x11-libs/xforms/metadata.xml
+++ b/x11-libs/xforms/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>monsieurp@gentoo.org</email>
diff --git a/x11-libs/xosd/metadata.xml b/x11-libs/xosd/metadata.xml
index 191f4f0bda1..e68094ce064 100644
--- a/x11-libs/xosd/metadata.xml
+++ b/x11-libs/xosd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<upstream>
diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
index ff2f52b48e3..6daf5fe549e 100644
--- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="static-libs xinerama"
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/xpa/metadata.xml b/x11-libs/xpa/metadata.xml
index bb77c4ecb72..23941e94768 100644
--- a/x11-libs/xpa/metadata.xml
+++ b/x11-libs/xpa/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-astronomy@gentoo.org</email>
diff --git a/x11-libs/xtrans/metadata.xml b/x11-libs/xtrans/metadata.xml
index e943b72b8a4..e17a5bccb78 100644
--- a/x11-libs/xtrans/metadata.xml
+++ b/x11-libs/xtrans/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>x11@gentoo.org</email>
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index d2a46b26aee..5bc8a31b5f2 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -9,7 +9,7 @@ XORG_DOC=doc
inherit xorg-3
DESCRIPTION="X.Org xtrans 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
src_configure() {
local XORG_CONFIGURE_OPTIONS=(