10 files changed, 316 insertions, 2 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 40243bb5d07a..562aad4a428e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index e2ed308ff268..1f373fb1a906 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -5,6 +5,6 @@ DIST alsa-lib-1.2.7.2.tar.bz2 1085117 BLAKE2B 9ae3d4358d802970249e1b904faa7c4d64
 DIST alsa-lib-1.2.7.tar.bz2 1084924 BLAKE2B a3bfbbfcf31625be0749218b3c02b307da9077d4bd82e9f980b8e3d6f9275f3a3f3c8158bb28fb1c61724a35e794eb3f6cc8872202ff42fb847725058109087e SHA512 6bd48b07d659fddad792876326a93b2a549ce94bc191131670365599c31f81f737bfd8e94dec6fe296bc5d86df2e3e381bbb7a694d24fe7e8e501f1c994ed084
 EBUILD alsa-lib-1.2.6.1.ebuild 2313 BLAKE2B 02d78d02d665db5d31f937be8983f86ba45d28f1b8f9961edd7b97fc83c2186929836ca7c217b9989c651e9dee75e0e37d3daa462fe099ee9a8a6685bc1cc6a3 SHA512 af89550a294ef1932045604cf81c9f37a40f94acd731a55d654391d96eb5bd7c026716ba72303af64621cf0a98c2bdd92abd22881e4a776845e5e235778d4762
 EBUILD alsa-lib-1.2.7.1.ebuild 2574 BLAKE2B 8f30c5cac3083fb8afbf3b20052b9234c22572289b7283106bdc4917ea66ae3f0838b0fa588552d191195626fd83120328a7587b1ad328d61963a6bc62b07535 SHA512 6fec4746221fe2f71fdb5e05bf599aef8a6f7e560ec65ceeaff212a6b5bb9540632775c339e4aa97c8091f9dc452520cb3b88f400ae16b6cc89191e050e44520
-EBUILD alsa-lib-1.2.7.2.ebuild 2574 BLAKE2B 8f30c5cac3083fb8afbf3b20052b9234c22572289b7283106bdc4917ea66ae3f0838b0fa588552d191195626fd83120328a7587b1ad328d61963a6bc62b07535 SHA512 6fec4746221fe2f71fdb5e05bf599aef8a6f7e560ec65ceeaff212a6b5bb9540632775c339e4aa97c8091f9dc452520cb3b88f400ae16b6cc89191e050e44520
+EBUILD alsa-lib-1.2.7.2.ebuild 2558 BLAKE2B 514c0b7132000bc2ac75aeb6bbd95995a43e8e07cb901d1f337f7ff1edc45f23e8693bc5f3297c348cb3fd5239bc936320ca3ad2e9857d0bbcfe39d17c0ddf99 SHA512 f6f2ab7ba0228e74f6454be87e987c566405ddd18a2b4b3149a7756562aeb48eb8b106f45ffa30f78dc1738737b9989cb59db8cdf4e803e64e2a9535f4cea741
 EBUILD alsa-lib-1.2.7.ebuild 2307 BLAKE2B eb062334ed34d1d40a32fec1cbd63fde78c17b5e71752dd15f53a9e562457c685894f6676e60fa2c1f566bf6015dae9195f56d735b00d13015d8bdb6a16968de SHA512 e0adc0f5412c292871e46a216afcd28050f77aa32b13093709087d560b6ee80be3362775c4151ed06ce923ba39e0f4d21e017c8606cf6c408c3e3022cf455f05
 MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
index 2fb3f286446d..d9872d85161c 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
@@ -54,7 +54,7 @@ multilib_src_configure() {
 	# Broken upstream. Could in theory work with -flto-partitions=none
 	# but it's a hack to workaround the real problem and not strictly safe.
 	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
-	filter-flags -flto=* -flto
+	filter-lto
 
 	local myeconfargs=(
 		--disable-maintainer-mode
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index c8a641d60db8..20ac235e49c1 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -4,8 +4,10 @@ AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a
 DIST intel-gmmlib-22.1.3.tar.gz 813386 BLAKE2B 6946423e3a58bea36ac6ca7619f68a30997910e0041b60e3b6a34ad3d76308cf0af69c46abc4008d19a5cee88e8f423503560598d2006645771f2eb2b224201c SHA512 cbf0164e7604f6214f6e1d3d9a283d385fac0efbd83afad02a76e3090d680ec000b17a257d5e004c296764330888dbd0a3e5bd46a760ac5c5f3e67436a7c9437
 DIST intel-gmmlib-22.1.4.tar.gz 818133 BLAKE2B c1faae09ad38369b12c8dc9d9ac0d0d652f1eb0876e78cedceddaf94afe27114be905512fb3a71f7eb0ebb77544eb7601e96e19359500eb9149fd6e2e2295c1f SHA512 cd31611a53474c2d457f9ce1ce903a184b320d398dc2eba1600f5586108cfa156cde584501ce283d51a8cb13d1917789370d194b6ee3b6a2b5d823d1323b0ef2
 DIST intel-gmmlib-22.1.5.tar.gz 818259 BLAKE2B 54f8065784f9ee5ca79f4ad7c0a83a83a476a5d2db5b37194eee5234d7b30a0df4b42b2a3279e7ef4884f28d3ed8d27fe1133bc9ab8600050938c67808467432 SHA512 1786d397d3a3d5303faec68a6eecb3426391c906ec16b47bd16462732e911928b3a9e7df2a84b384cf4c1b9dcb293953dcd11ee32a2fb631570db260b15f9c3b
+DIST intel-gmmlib-22.1.6.tar.gz 818312 BLAKE2B acf5fd05e4220df6b828e08e6ee1a6ee9da3d5067c2b99d7a12d01441359761ed4bfa12e2b4bb417a91bfc2fdd0e7d4fd0abf2cafd92549d6ce9910fc37e5bf4 SHA512 4423d9eaf6449aa50e7ecb4e74dbf2510ba67c14aa33efa132d612a05faf5542cdda60c011af36f7875658876ababc3eeeb799637601430c16030d6fae6bc926
 EBUILD gmmlib-22.1.3.ebuild 767 BLAKE2B 76d22a835768e7f4296804a0f99e7939a273ac151b5e4e2fc6ddcc724f85fc8e74462b55a4bb1822095d118d376a0759a56d986e6defa629ea356783545e18b9 SHA512 bc04c984fe8c8823ce45bf50fc3b013932411e069726254d9623e1d509f08c98789415d8905c8d60e917c71920317ab83a551d3e501efcd5f14a06c4acd35902
 EBUILD gmmlib-22.1.4.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
 EBUILD gmmlib-22.1.5.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
+EBUILD gmmlib-22.1.6.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
 EBUILD gmmlib-9999.ebuild 875 BLAKE2B 18b5a947cb3620a85cd17bc24d01570888855aee49c8b2acabd88fe36cb363aeb80d15c8d127f1636c1738e2c8e0a4863c56fa9c81696171e3c2ba71f87c7bcf SHA512 7ebdfaaad8f6a1ebdc2c2042ae5f53ef7f12797fab0b2cc6a7d1075d837a8c1d42f01e2c13ba730bfb8a81f56977f827d0c00fa5fdab06f459edb663ca922a5c
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-22.1.6.ebuild b/media-libs/gmmlib/gmmlib-22.1.6.ebuild
new file mode 100644
index 000000000000..598b7721fb10
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.1.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/12.1"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_TYPE="Release"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index f149789bd6c4..37df376f6cc9 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,6 +1,10 @@
 AUX 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch 1197 BLAKE2B f570a9a479e9d73f506c16dc7c3a75badf5da2e2407173b1ddd6ed8374f269ca628ea1b84adf94ac3b055db9a1d74f812db9557b96c92300f53c60a5048728a6 SHA512 1d392b6fc41d59349b75e9ab5adcf95a545c02709ec2a71b1855f98a444c9e753ca44464264c624fcaf6e49404f8f92d7aa7b85dfacecb1c7c28f3960e9c4fb9
 AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
+AUX raptor-2.0.15-use-pkg-config-icu.patch 1575 BLAKE2B 7dfc19ecd246a049663c7e1ad6853fc9b8540a5a26ae24e3479c8fc7da4e519fd3ab4d5c8003962aed1b744701d8294cf0f08a298f854c0e58ecef6e1b42b7e9 SHA512 5848ca19d016aa46991c54de4f3d2f80cbc17c922f75fac49b5d7a9e33be07f6102f9c929107a2ed193d95a1333c64b436fa25639cf1803d0d60c40185d617f3
+AUX raptor-2.0.15-use-pkg-config-libxml2.patch 1479 BLAKE2B 8b2f1d1a10b04d6c67b807af14c2e78444234c0202414fa172a34436e3c39399a02a7ebd7439f985dfc564b5899d2ffbf2c9a55b399b2db6cdc5b76118276055 SHA512 6d146068f386346af6e745791fb6adedb98fa7f9fe54838578c0a2261f9efadfca72e36eb5a9fd2e24a36264c780a7869482c16667a7bd067604b5cb62959c05
+AUX raptor-2.0.15-use-pkg-config-libxslt.patch 3514 BLAKE2B 5bcdb3fecf1149ad60387bc4c485d42fd9f764556ebf383201baa3d18426a85ca76a3f29723a8f74be71a58fcfba9f5263a1b1681d012ea4cc0167260702d111 SHA512 0eef2e55e8f77ceb8ac1dc639eea7cb7ee53e53d0ad8058af8b52d44d9f5a5a4e027c7c90360b950469f0c632721c8be068fde7f7fdb8e93aab06b56d3845150
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 EBUILD raptor-2.0.15-r4.ebuild 1887 BLAKE2B a5e4ddbcae09d6f0905947a1130e5cbea034afd30e7e5fa0be6e81b687407405db476ae561c1ff4a6ccaf7c0eb146b7d15401c4481f3e0bebe44c7f3a53c7abb SHA512 5ac95f22cb51e930f601c277fca45df222fe50468ee19848e78764a429d7ce0d53c49917aa83fc814642ebf230b15b8ba60b5ba7e97540d4891c69c899a943a5
+EBUILD raptor-2.0.15-r5.ebuild 1945 BLAKE2B 2380153268435981d380a9e76709a038ad8ca4616f758331ee6bd6ea28c7b0c1e2ff7f83442bbeec5e2efb47242511f4d7732cddcce0c36dbfa88d99518cd294 SHA512 d1b8c6f976eee01a597fb1989683587d7a4a512094428f222c7e753de7218b8b917bf276c8e027d31fe61526b061c1dcd1b779a64e5ef5ee9987f83885ef94ec
 MISC metadata.xml 338 BLAKE2B 3dae058894d1b97d950b3be750e4e2bb48c839fc271d881895690c342ccde726a4e6a385816a00a0b49827559adf05443bb432212b5743c0598a1e48a199b257 SHA512 3fd8af45abe4a8970eca3ad5057f80f72afaef324018d7e2be674337653b6b2eb5fb8a5e8661aafd00b76f79b3d6f00893c2a425b4424b35b4a8e5db5c115d7e
diff --git a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch
new file mode 100644
index 000000000000..60fffcd804ee
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch
@@ -0,0 +1,48 @@
+https://github.com/dajobe/raptor/commit/3af116d61babd7042b42018c67a63baebf486df7
+
+Fixes build with e.g. lld.
+
+From 3af116d61babd7042b42018c67a63baebf486df7 Mon Sep 17 00:00:00 2001
+From: Hugh McMaster <hugh.mcmaster@outlook.com>
+Date: Fri, 21 Aug 2020 20:48:17 +1000
+Subject: [PATCH] configure.ac: Use PKG_CHECK_MODULES to detect the ICU library
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -621,21 +621,10 @@ else
+   AC_MSG_RESULT(yes - $LIBCURL_VERSION)
+ fi
+ 
+-
+-AC_ARG_WITH(icu-config, [  --with-icu-config=PATH   Location of ICU icu-config []], icu_config="$withval", icu_config="")
+-
+-have_icu=no
+-AC_MSG_CHECKING(for ICU)
+-if test "X$icu_config" != "Xno" -a "X$icu_config" != "X" ; then
+-  ICU_CONFIG=$icu_config
+-  ICU_VERSION=`$ICU_CONFIG --version`
++PKG_CHECK_MODULES([ICU], [icu-uc], [
+   have_icu=yes
+-  AC_MSG_RESULT(yes - version $ICU_VERSION)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-dnl Note there is NO automated searching for icu-config
+-
++  ICU_VERSION=`$PKG_CONFIG icu-uc --modversion`
++], [have_icu=no])
+ 
+ AC_ARG_WITH(www-config, [  --with-libwww-config=PATH Location of W3C libwww libwww-config []], libwww_config="$withval", libwww_config="")
+ 
+@@ -1183,8 +1172,8 @@ dnl ICU for NFC check
+ AC_MSG_CHECKING(NFC library to use)
+ nfc_library=none
+ if test $need_icu = yes; then
+-  CPPFLAGS="$CPPFLAGS `$ICU_CONFIG --cppflags-searchpath`"
+-  RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS `$ICU_CONFIG --ldflags-searchpath` -licuuc"
++  CPPFLAGS="$CPPFLAGS $ICU_CFLAGS"
++  RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS $ICU_LIBS"
+   AC_LIBOBJ(raptor_nfc_icu)
+   nfc_library="ICU $ICU_VERSION"
+ fi
+
diff --git a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch
new file mode 100644
index 000000000000..e53111b857fa
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch
@@ -0,0 +1,41 @@
+https://github.com/dajobe/raptor/commit/3f9335b3cfd945a8d5f6f75f87cab04c53cc2b6d
+
+From 3f9335b3cfd945a8d5f6f75f87cab04c53cc2b6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 27 Oct 2015 10:35:35 +0100
+Subject: [PATCH] configure.ac: do additional checks on libxml2 when library is
+ found
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In yocto cross environments we must use pkg-config. Configuring with
+
+  --without-xml2-config
+  --without-curl-config
+
+causes
+
+| checking for LIBXML... yes
+| checking for libxml via pkg-config... yes - 2.9.2
+| checking for LIBCURL... yes
+| checking for libcurl via pkg-config... yes - 7.44.0
+| checking for ICU... no
+| checking for yajl installation... not found. Get it from http://lloyd.github.com/yajl/ and use --with-yajl=DIR if necessary to configure the installation directory.
+| checking GRDDL parser requirements... no - libxml2 and libxslt are both not available
+
+Applying this patch fixes configuration.
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -599,7 +599,7 @@ have_libxml=0
+ need_libxml=0
+ 
+ oCPPFLAGS="$CPPFLAGS"
+-if test "X$XML_CONFIG" != X; then
++if test "X$libxml_source" != X; then
+   CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
+   LIBS="$LIBS $LIBXML_LIBS"
+   AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no)
+
diff --git a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch
new file mode 100644
index 000000000000..5ef9ac1b6ffa
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch
@@ -0,0 +1,102 @@
+Rebased version of https://github.com/dajobe/raptor/commit/abfdfb44cc00dfafbad4e594618621fce21590e1
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -524,6 +524,44 @@ if test "X$xslt_config" != "Xno" ; then
+   fi
+ fi
+ 
++if test "X$XSLT_CONFIG" != "X"; then
++  XSLT_CFLAGS=`$XSLT_CONFIG --cflags`
++  XSLT_LIBS=`$XSLT_CONFIG --libs`
++
++  CPPFLAGS="$XSLT_CFLAGS $CPPFLAGS"
++  LIBS="$LIBS $XSLT_LIBS"
++
++  AC_CHECK_FUNC(xsltSaveResultToString, have_xsltSaveResultToString=yes, have_xsltSaveResultToString=no)
++  AC_MSG_CHECKING(for libxslt via xslt-config)
++  if test $have_xsltSaveResultToString = yes; then
++    have_libxslt=1
++    LIBXSLT_VERSION=`$XSLT_CONFIG --version`
++    libxslt_version_dec=`echo $LIBXSLT_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
++    libxslt_min_version_dec=`echo $libxslt_min_version | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + 3)};'`
++    AC_MSG_RESULT(yes - version $LIBXSLT_VERSION)
++    if test $libxslt_version_dec -lt $libxslt_min_version_dec; then
++       AC_MSG_WARN(Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required.)
++       have_libxslt=0
++    fi
++  fi
++
++  AC_CHECK_FUNC(xsltInit)
++
++  AC_CHECK_HEADERS(libxslt/xslt.h)
++  if test "$ac_cv_header_libxslt_xslt_h" = no ; then
++    AC_MSG_WARN(libxslt library found but not headers - disabling)
++    have_libxslt_lib=0
++    have_libxslt=0
++  fi
++  CPPFLAGS="$oCPPFLAGS"
++  LIBS="$oLIBS"
++else
++  PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [
++    LIBXSLT_VERSION=`$PKG_CONFIG libxslt --modversion`
++    have_libxslt=1
++  ], [have_libxslt=0])
++fi
++
+ libcurl_source=no
+ PKG_CHECK_MODULES([LIBCURL],[libcurl],[
+   LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion`
+@@ -650,41 +688,6 @@ fi
+ CPPFLAGS="$oCPPFLAGS"
+ LIBS="$oLIBS"
+ 
+-
+-have_libxslt=0
+-
+-if test "X$XSLT_CONFIG" != X; then
+-  CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
+-  LIBS="$LIBS `$XSLT_CONFIG --libs`"
+-  AC_CHECK_FUNC(xsltSaveResultToString, have_xsltSaveResultToString=yes, have_xsltSaveResultToString=no)
+-  AC_MSG_CHECKING(for system libxslt library)
+-  if test $have_xsltSaveResultToString = yes; then
+-    have_libxslt=1
+-    LIBXSLT_VERSION=`$XSLT_CONFIG --version`
+-    libxslt_version_dec=`echo $LIBXSLT_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+-    libxslt_min_version_dec=`echo $libxslt_min_version | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+-    AC_MSG_RESULT(yes - version $LIBXSLT_VERSION)
+-    if test $libxslt_version_dec -lt $libxslt_min_version_dec; then
+-       AC_MSG_WARN(Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required.)
+-       have_libxslt=0
+-    fi
+-  else
+-    AC_MSG_RESULT(no)
+-  fi
+-
+-  AC_CHECK_FUNC(xsltInit)
+-
+-  AC_CHECK_HEADERS(libxslt/xslt.h)
+-  if test "$ac_cv_header_libxslt_xslt_h" = no ; then
+-    AC_MSG_WARN(libxslt library found but not headers - disabling)
+-    have_libxslt_lib=0
+-    have_libxslt=0
+-  fi
+-fi
+-CPPFLAGS="$oCPPFLAGS"
+-LIBS="$oLIBS"
+-
+-
+ dnl Check for JSON library
+ 
+ AC_ARG_WITH(yajl, [  --with-yajl=DIR  YAJL installation directory or 'no' to disable (default=auto)], yajl_prefix="$withval", yajl_prefix="none")
+@@ -1184,8 +1187,8 @@ AM_CONDITIONAL(RAPTOR_XML_LIBXML, test $need_libxml = 1)
+ 
+ 
+ if test $need_libxslt = 1; then
+-  RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS `$XSLT_CONFIG --libs`"
+-  CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
++  RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS $XSLT_LIBS"
++  CPPFLAGS="$CPPFLAGS $XSLT_CFLAGS"
+ fi
+ 
+ if test $need_libyajl = 1; then
diff --git a/media-libs/raptor/raptor-2.0.15-r5.ebuild b/media-libs/raptor/raptor-2.0.15-r5.ebuild
new file mode 100644
index 000000000000..bc6bb24ae8c0
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The RDF Parser Toolkit"
+HOMEPAGE="http://librdf.org/raptor/"
+SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+curl debug json static-libs"
+
+DEPEND="
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	dev-libs/libxslt[${MULTILIB_USEDEP}]
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	json? ( dev-libs/yajl[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+	!media-libs/raptor:0
+"
+BDEPEND="
+	>=sys-devel/bison-3
+	>=sys-devel/flex-2.5.36
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
+HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
+
+PATCHES=(
+	"${FILESDIR}/${P}-heap-overflow.patch"
+	"${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
+	"${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch"
+	"${FILESDIR}/${P}-use-pkg-config-libxml2.patch"
+	"${FILESDIR}/${P}-use-pkg-config-icu.patch"
+	"${FILESDIR}/${P}-use-pkg-config-libxslt.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #552474
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
+
+	local myeconfargs=(
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		$(usex curl --with-www=curl --with-www=xml)
+		$(use_enable debug)
+		$(use_with json yajl)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}