gentoo resync : 03.07.2021

11 files changed, 253 insertions, 7 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7e1ff1d90442..42643697b64c 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest
index 9108a74b4a78..a386196d484d 100644
--- a/x11-libs/gdk-pixbuf-xlib/Manifest
+++ b/x11-libs/gdk-pixbuf-xlib/Manifest
@@ -1,3 +1,3 @@
 DIST gdk-pixbuf-xlib-2.40.2.tar.xz 53588 BLAKE2B a515e86bc69f59910f61fe9c275ab89c0732f0aa2cfb614ac94e597de420d25708a11b9b21313c7cfe3763434f45a8318412ae5889c24c8ed57dac68e09c0227 SHA512 246bcace03f4d7d694c4d08f28c7ad044cab63b5cf264b478ee1fe161499e7607c7ffeff93908f1f3b308e5108d78c4b51a3f90b79189d42a1a653c8edc53e37
-EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 846 BLAKE2B f2666e904b8d6f4c88346389cc3892ec2b41a4bc93c954057dae57924d4929e227de2d983107c26299b67c33e852759bd7eb2f16a455a0662057da68dc4be399 SHA512 85cd7e25d1fa3b8cd2c9f7ac8698bfa9e414c70ed7b883580779731b8471ab1276012b0a84096d3c60d7726e5440213bf16c469897e19b1cc9fa0435295099d5
+EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 853 BLAKE2B a8a6a820ad2891c9633f1d7cf89d6022770f54418f1110b194d8fa940527b4d187872fe30d4e521433a5f347e8bcf752d04cc88281865918d30a4d946ff4026d SHA512 75eda0ae452386d9798592b4cc6b3d4ef8857f72c141e050648bc9265dbcd4c3b2a72e6034365a1cf1ab45dd6ae58d1f1d5eb0f16ec077d59da2bc3f878d6409
 MISC metadata.xml 336 BLAKE2B b741dfbd8af9655d14c9d5794d0a421a0309b66a13c2d8e5800749b1acb3b68bc8084599fdb76a652e5cb2892d2206eb92a4d2915281089ad0e46022b59d3b1b SHA512 1af76541baa1ab105fa434b4caef8a0ca5e5caaad5be33823a7885f850836a195666f98e453e1c90e06aa3d869feba1383e49b3629a3672c4e5f4e8cdc344962
diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
index bb9698575a4c..cbb0d925ec2e 100644
--- a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
+++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"
 LICENSE="LGPL-2+ MPL-1.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 1c8e73dec7c3..a6566af31586 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,5 +1,6 @@
 DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94
 DIST libnotify-0.7.9.tar.xz 98148 BLAKE2B 4728d00a204cd1003e8171a54c23bb975c0477c245c1175558f27555763113ec8bd7abd7ef81f6bad2b98604efe436d843958e77473436e68560775804473383 SHA512 8a842b50777279efdb7d96a836a546c47decad158a4f03f7ffc818860d1f6276a657619e4f4a19a4e2f5ad55e0371c793420d50d802983700e8c342273b73874
 EBUILD libnotify-0.7.8.ebuild 1415 BLAKE2B 58e0de2826dd0c2e43cb47061464f308cf9539bc5d8f7a09cd96dc5d3be00d2685fca27c62a135e8e68e1fcfd7b35822582844528f29d83dd186ed7620b42f41 SHA512 fe35b1f045ddad13aaaafb067feeaa261d275369ad97fd871cd640b0a5d250db337e19e555ce2b043bf0431c350707315e4e88b6853fd044831a6524f55b582a
+EBUILD libnotify-0.7.9-r1.ebuild 1493 BLAKE2B dfc18dded46162784b8445109ee28a1993200040ee9e58034f6b3333df8584045591f6ecd01dfac4d8bb5fa87f2ced8ffa1f4ee7b6426f30bfedfea605742d6b SHA512 e81be2db50e148c8a3a549d36e24471ad44b1a001fc9c6cb8dbd706fb294be0c15831f3d214523b62d21e4ba600bf625123e4795a35fc29ee19d205f961c47dc
 EBUILD libnotify-0.7.9.ebuild 1477 BLAKE2B 41954abaf887c51ecfc56e85b7095a6c26e86a5ea17561bd27bf2ea268b91dfa2f26cafe2deb96b6230218de8e9c87897cb780d4e42164718d1d4fcbd9bef891 SHA512 9776171a40786986c2c6bff4176669aab30d6cf3fd8ab44129cade811ea3f20e3cb433ceae3eaead55af1a64ba9057464a5099b5d8fecf611de821a009202c30
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.9-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.9-r1.ebuild
new file mode 100644
index 000000000000..5661bbbbf604
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.7.9-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson-multilib xdg-utils
+
+DESCRIPTION="A library for sending desktop notifications"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-libs/gobject-introspection-common-1.32
+	dev-util/glib-utils
+	virtual/pkgconfig
+	app-text/docbook-xsl-ns-stylesheets
+	dev-libs/libxslt
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+"
+IDEPEND="app-eselect/eselect-notify-send"
+PDEPEND="virtual/notification-daemon"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		$(meson_native_use_feature introspection)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		-Ddocbook_docs=disabled
+	)
+	meson_src_configure
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
+}
+
+pkg_postinst() {
+	eselect notify-send update ifunset
+}
+
+pkg_postrm() {
+	eselect notify-send update ifunset
+}
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 018dbdfc9b6b..e1983cb989fe 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -2,15 +2,20 @@ AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729a
 AUX libva-intel-media-driver-20.4.5_custom_cflags.patch 4078 BLAKE2B 59c525f39ce9ab5546c384641fe8aba017a5cdfe0a4f48dd5acd5d48dc7c6469731c81bb8781ae3be77baaf673e3bee1787fa6623e1ded8b2c3578ff41ba1292 SHA512 0b53bc5a809b305eae939b4ee3a173d59eb433ecb66f67f8c168f4c098689f972fab807e9ee227ca9eac2f80855ad048d45ed262063f031d85ff79813500c643
 AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319
 AUX libva-intel-media-driver-21.1.2_custom_cflags.patch 2973 BLAKE2B 2fd93de09bcb113169f2b7ddd353a65cd209c786efb0368131f9c65ac18575092e0e16172f58fa817a7433ff96bec3ee1ff7a50438d67fa2fe5e938b0f4732a6 SHA512 830743d06118f20c83b5f3ba4cfcdb9f8cbe9b83c0294353eaa656db022145ac833401d8f662115187fbb912e2dd1bc081cd87209c9cda1c16e17b5762ad567a
+AUX libva-intel-media-driver-21.2.2_custom_cflags.patch 1557 BLAKE2B 81286ec21894db132ae406b67f11678540d663cc74163b6dbbba3e888b54fbc4678041322d34bab61ce418f6050718a209c78c7121aa2f9d430dca27699becb9 SHA512 d790162f5a327b237e472a404ba761f24db62d08f23b669839a5793bc19e96868522484bc30460a8c0d7d575983d9c488855766834c828775b59273ad24da8bb
 DIST intel-media-20.1.1.tar.gz 21788401 BLAKE2B 53f2ebf5941c487253d02d0e23229cd408eb3b53ef37cfdefb1a874e5a6c9b051b69ccda513c2d1d9bb9cc03814bc3db40a40241eb3c7a0a78edba3ba7e9bf01 SHA512 696f3b82d155e472285150b476daf9195ec6cbad0526f017fd0c57c1fb02618210b3e96eb13351ee286f3502df4970a22a940c3476877fa1f5c23dc85a646c25
 DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5bec4ad6237e5810d0e04349f7269adf62505afaed8456d1ad6a3544525bdb2012294e6b92e68dc3f0338f6fab54aa934bd SHA512 0f4817b66f4e2d752d5a34cc1c8974dd09b4fe4f6d8bf3df896887542c229088edc406a9b2a68a9b353214aa7ffa4cd8917cdb6695dbe2e316af6c444822b15b
 DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
 DIST intel-media-21.1.2.tar.gz 22487027 BLAKE2B 819b7c4a4fc9295034af77f1e95d4b23ca974629f0ff70f14d84c881fa8ae2558708878e045b700fef30bb28a1af9ec61306854e91d0df4881e7d9dc229715b2 SHA512 046942ebedad2e40de3c592ed92bd7d266402f1f94d30ee7674adcb147774f6d90af18c56a19a8d16465144a7bded9cc7b6eeefdeb50f349c7d3ef6840c30ea4
 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
 EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e0da45768caf70d8cdace4b4683f94f8133904513212652e5fa7effa8392be7e495e00f8d6227163c465d4404f8628f804eebd9c0c3e3b4 SHA512 52b2221c79305305deda5a952314f8de487399f99f5840e0ec9a2d67ebce819cba2d8e31ee9de4e17300e758925d68ab5f3205ecec62631d19b0a1c7f213203c
 EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
 EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B 44ab893c79c0eace0f0e237c89a81636123733a51da2b71b4314f5707e98855a59696896cac73a783cfc0b646f9dd1b2e99bc555888d6b53ddd6a54d2e13dca7 SHA512 95749d2504f57449baddfe40b9f1595f45d5058e9afb3656b9ead1163a5dc8a899aef6e71c9bea3ffd5f452b181ca3eebbeae7943e563292be51be7bc24037e2
-EBUILD libva-intel-media-driver-21.1.2_pre.ebuild 1456 BLAKE2B f79a367b3f6329e5027ef47f1710526ed9fc4423aa053877b87819ba7b8b6e53777ed9a99c00e44d424be0eb47c6dc0e089bb2f30fba65bb4f14615e451af4b6 SHA512 84923929d65363bad83046606529c615c6e8eb2dd69872809ebb0724d86867247aba62b23d887e7ff6fbef2d66e1b70e1fda1d251679becb160ee09db5470dc6
+EBUILD libva-intel-media-driver-21.1.2_pre.ebuild 1490 BLAKE2B 897cfecf58e7c0a952f24060688bb2ff546b76019ee423231a3e72240ef7847af2c07df8c051bc7fdbccd0a1da4c7ab30ecd5691ed5503e0ae11a2b3a6bbf793 SHA512 0504e593880e99a569a9357f8947d3e635ea229570224cf85155ce44c3f32afa291d3fb44530976764019de7a7143824596ed1660c7e1ffc7a65ce68c8a6ef47
 EBUILD libva-intel-media-driver-21.1.3.ebuild 1456 BLAKE2B f8ff1a9fe54793928efce9c38edb8fdd4c84404f0ed65b4183f6b895ac5f81cf74a562e9dcf3d7b5aba643f8d2f7ece8b8029a834ec0898a40300786d44d602b SHA512 989275860dcc628b9568b956b95b81e8b5eeeafe0bd09ac46acb96dc0af61d421265c374fec3aa1fe33f66fe4da10abf1cd2fb6bfd1831dab547112a45b0129d
-EBUILD libva-intel-media-driver-9999.ebuild 1456 BLAKE2B f8ff1a9fe54793928efce9c38edb8fdd4c84404f0ed65b4183f6b895ac5f81cf74a562e9dcf3d7b5aba643f8d2f7ece8b8029a834ec0898a40300786d44d602b SHA512 989275860dcc628b9568b956b95b81e8b5eeeafe0bd09ac46acb96dc0af61d421265c374fec3aa1fe33f66fe4da10abf1cd2fb6bfd1831dab547112a45b0129d
+EBUILD libva-intel-media-driver-21.2.2_pre.ebuild 1484 BLAKE2B 30827123d8241e2cb52bd92d1455ab40accbe60ca374206e38919f4f0add83c4b297b0a7fe86a4f38f1b8d9f1c8775d0e7d6181f0e9604afabcd406cc5a71519 SHA512 ded439fb9d7b41cd8ab6905dcfec3bcb4eb6f0527509a8ac62be6ce5873dc93dd9045be5e6222feca005385bcb16ad08f6e79769caa894ce4f5037fee4ae0392
+EBUILD libva-intel-media-driver-21.2.3.ebuild 1456 BLAKE2B 3ef7e7a112b602fcc8bab298099e8cc139bfa7e2d2a3ab2eb5d515ac6bacd2b02d49fd5c0ef62951153e7bd19a8eafab68b51d0ab7ea7bb142f56cae827be1ae SHA512 5fffda372db6de84b266a9cd2d04f8f419a4a76d8576ea4fd04dd75798763899414cdf0e3db72469b43fb344741eaa8f158c0176e0b2d72977601bc293b27c8b
+EBUILD libva-intel-media-driver-9999.ebuild 1456 BLAKE2B 9ebc73549d3ad9d9d0cbbccce0ca012599e952d324731841d5546a9aeb90768ffb1a780e9be0f89a66cc4b6cc38f76f03527cf8bf1bee31a9dd260b717fb548c SHA512 c6264b876982e35ae775c0863b6d1add2707451c6d13dce567220192d5e0efb8015eea834f5a036f4088a97a2a87c0694f660cd2640fdc814167bd0252ec8d23
 MISC metadata.xml 616 BLAKE2B e47d0c35b3aca0abfb57bbdc677e7e7f3bb45d92fa6af6d894291b370032e5d15d324aed4fc2752eb810b0f3603410eee91b20f368d64304e35cc5cbd827088f SHA512 3a546df85f009136e8e36c20c38ed61be10fb198cb1b443ef7b1ce3c43957aff2490e82fab0052f24067ff642ea8dc847770b08914721724b36db639ab24e53c
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
new file mode 100644
index 000000000000..c0f598ce6cd0
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
@@ -0,0 +1,52 @@
+    Prevent overriding of user-defined CFLAGS.
+
+
+--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+@@ -51,16 +51,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+     -fdata-sections
+     -ffunction-sections
+     -Wl,--gc-sections
++)
+ 
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+     # -m32 or -m64
+     -m${ARCH}
++)
++endif(OVERRIDE_COMPILER_FLAGS)
+ 
++list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+     # Global defines
+     -DLINUX=1
+     -DLINUX
+     -DNO_RTTI
+     -DNO_EXCEPTION_HANDLING
+     -DINTEL_NOT_PUBLIC
++)
++
++if (OVERRIDE_COMPILER_FLAGS)
++    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
+     -g
+ )
+ 
+@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm")
+         -mtune=atom
+     )
+ endif()
++endif(OVERRIDE_COMPILER_FLAGS)
+ 
+ if(${ARCH} STREQUAL "64")
+     set(MEDIA_COMPILER_FLAGS_COMMON
+@@ -189,9 +200,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
+ if(${PLATFORM} STREQUAL "linux")
+     #set predefined compiler flags set
+     add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
++if (OVERRIDE_COMPILER_FLAGS)
+     add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
+     add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
+     add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
++endif(OVERRIDE_COMPILER_FLAGS)
+ 
+     foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
+         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild
index d8a7364723b3..885636cf2e39 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild
@@ -15,7 +15,8 @@ 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"
+	# No keywords for _pre releases
+	#KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
new file mode 100644
index 000000000000..6eec248e7f0f
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.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.2.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild
new file mode 100644
index 000000000000..fc67874d04cd
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.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="~amd64"
+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.2.1
+	>=x11-libs/libva-2.12.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 072d1d906b99..7e53505dd384 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
@@ -27,14 +27,14 @@ IUSE="+custom-cflags set-as-default test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-21.1.1
+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.1.2_custom_cflags.patch
+	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
 	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
 )