gentoo auto-resync : 15:12:2022 - 21:34:37

13 files changed, 6 insertions, 795 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ea6697123206..78b8db5f16f8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index a3e01412fc8c..1eafc4571360 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,5 +1,5 @@
 DIST faad2-2.10.0.tar.gz 803225 BLAKE2B 73ecbcbb3fce93e8ceb88f6f7669bb681d2329935018cc2a23929cf6672959a0678b47c830cfdcf8e716709ce5252a02178737a7af09de373f7c8b54f38f3d9d SHA512 92c8b5e79f85b7a7caac9e7954959c26d74ef148a658dcb37e2c1b303fc2fcc5a0d12f21e7bd476870498109bdd03916a56c13f578186a69d6eceb103222e771
 DIST faad2-2.10.1.tar.gz 803488 BLAKE2B f25bf9242675250b910bd5540487cf708d6e195e1ddca0b27588678e5fbf2bedf9d41e6bc607aa34bb2dbff95a8a4071e74e2f9bd9493ccb7ef040ce9bf81b4c SHA512 8df69278350c68dd770c4bc482e42bc95eb04cd784eeea3f3fc58d615833c8b07dc3c72029bb7e5bfed612b7c1b8daefc9cb57be9789befb587120ef115e55b3
 EBUILD faad2-2.10.0.ebuild 1170 BLAKE2B c497817236897f43bb9f568e55cdfe3307cce1e3846082019178c57b9338d92d0d487a24175f7ffc5140abc85d17e3a5fe06851d4da1349f054e899fc46bb12d SHA512 4a5f17f0b6668ce6842706508b43d7fbe2e5566719dc09dd8d48dcc300596c8a75b8af005a17a9eadc1ece7ea9c1a329c516b9ecaa103b20260a319c8c04c62a
-EBUILD faad2-2.10.1.ebuild 1155 BLAKE2B 417900fa8f9879927ad3f979d1afc3c5d0ae133d2e80449f400c51e92b122786fe266909b1c9913f6ea4f05b3e78bb090d115ba013f87149d6fc93b2cd8a5b46 SHA512 59df2bd25230f1e9733386ee1f6ef0177919737bca4c6f61d7051bc46f711b3fdd8207f513365d471f398bf58cf6cfa0aa63a770a5785f8796f1fafb2a809979
+EBUILD faad2-2.10.1.ebuild 1148 BLAKE2B 753d5e5ad344a01caba2edc427ca77a4b31d429f2454a2167d4f9bbdd2961b6e04718de8ecc2891fdf42240724209ac012079111e80b02bd24cdec2cbec1bcef SHA512 a64c04dd50d4ea47e541a33528e7c884d6f13824634a02619b4a2e5090c9f86fee8fe84d057c4ceff7e7e5dbcc6ff9c12e86aac71b7258cab9645894a7bbfa3b
 MISC metadata.xml 673 BLAKE2B 28208bc0cbb71f989bfb9fb82f90115cdb1446ab0414f1ac4a642a83bdf39e6cf7ade76e4d82e583ffb2a9e47e86a2fe8b1416d218a95eacd8886124bb6f3f96 SHA512 294c2ea06d75d6d8f0a803b0c8e28b2b70e1fe05ed7ef1d1ddd515b8e7f829b7a99cb5195a5f4076bf5a4887dce87c424e46517a69efe5e17734594884d7be3c
diff --git a/media-libs/faad2/faad2-2.10.1.ebuild b/media-libs/faad2/faad2-2.10.1.ebuild
index 68078ac34d42..0c69da8f9880 100644
--- a/media-libs/faad2/faad2-2.10.1.ebuild
+++ b/media-libs/faad2/faad2-2.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/knik0/faad2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index a58ac2d8cf77..b4d15b37ae7d 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -2,6 +2,6 @@ DIST libsidplayfp-2.3.1.tar.gz 797779 BLAKE2B 45bf858fc984b10538e322c3d1473c490f
 DIST libsidplayfp-2.4.0.tar.gz 794252 BLAKE2B 5074e5f286b15dd419aceb3eb5b35903de45b75c0e6ec98b5419a285d28547e46d0f635f8c9882dc0630d3f91741573829c87bb786a79f0b779244d37c4e6e9d SHA512 bbe06069d578227e04c4c950dc66c6b35f856f0df4511b4d9669bbf92892327b6c488786678570357a7622150fc0984bfab0570f581a5a9caa2e04a4dcc8368e
 DIST libsidplayfp-2.4.1.tar.gz 794289 BLAKE2B 828e2d807e40509eaa4f9d2df5c5a2e43ee15176b035f77e9a0bd311468b16460e89ff8fd460ec409d8c84b18d6f711f4a98a0ad7b949c02489ab53c88a4f300 SHA512 8be44c62bb14831c04fbd0a0efe690e8fa80f1ee7150d046055580728793659914b2466b2bf7d8757ddb4c1025ae6cafa2c95830007160fc87dd87dc899bb609
 EBUILD libsidplayfp-2.3.1.ebuild 672 BLAKE2B 2ea17f4a44c75233f5bd8ba7cd273a9c7881385643623c49e5c4513aed5bad0022680ba2f13ad557c5c4c2dbd0529d8ee5d7ba920bfcf411a5ab4e5c6b299117 SHA512 b6555f22398a1c7a1663928a8e579c0380eaf955fae30cc6960b624a3c53354bfaeca39e753cec5331fb0ede00459c45537dea30f154d6e7fd00ec3b9cafc80d
-EBUILD libsidplayfp-2.4.0.ebuild 674 BLAKE2B 162f397cd303034d5563f4adf503b94490e6f40c9853e62a1a6f67212645f689d5c7c83a6a86921f2122df6fbbf0966abaa880270ffdee40920b6fa25d34f7a6 SHA512 aa1cf65023f53c62597f09c90c9c057e41c688b45aca4e4f35b0132e50ab1a08ed54e02ab3b1ba7fd4c48da48f13f2ae0d29b36c339dba39a00b2b4b43c34a00
+EBUILD libsidplayfp-2.4.0.ebuild 672 BLAKE2B 2ea17f4a44c75233f5bd8ba7cd273a9c7881385643623c49e5c4513aed5bad0022680ba2f13ad557c5c4c2dbd0529d8ee5d7ba920bfcf411a5ab4e5c6b299117 SHA512 b6555f22398a1c7a1663928a8e579c0380eaf955fae30cc6960b624a3c53354bfaeca39e753cec5331fb0ede00459c45537dea30f154d6e7fd00ec3b9cafc80d
 EBUILD libsidplayfp-2.4.1.ebuild 674 BLAKE2B 162f397cd303034d5563f4adf503b94490e6f40c9853e62a1a6f67212645f689d5c7c83a6a86921f2122df6fbbf0966abaa880270ffdee40920b6fa25d34f7a6 SHA512 aa1cf65023f53c62597f09c90c9c057e41c688b45aca4e4f35b0132e50ab1a08ed54e02ab3b1ba7fd4c48da48f13f2ae0d29b36c339dba39a00b2b4b43c34a00
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.4.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.4.0.ebuild
index cc286dae945a..174917107585 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.4.0.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~riscv x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 75558cba6e41..c8e7415b32e5 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,5 +1,5 @@
 DIST soundtouch-2.3.1.tar.bz2 529126 BLAKE2B f8ba587ac199cd1e91f3d3487b81457b7c7bb2b4dca8867376ae47f92bf4d5e60aef3d310eab56510995d5ce72e94ce55ecc4e601bfb3b4eba52c40982032d6b SHA512 9fac7484aead1a20aae019b29847ea13ad6d8cb72272313fcffd859b31479d2ab2fe2f69cfef2b3fd35e9b03923d095bf44a67b46f2b313ac711aa31df0fdd59
 DIST soundtouch-2.3.2.tar.gz 583373 BLAKE2B cd3c8fffaa81a2ed867f5a564dd7ff3047b4de576536c3c116162981261bf3789d16def1c94e5be2450373be3f61fd67fa44e3552e19cad7b7d5d56500b98255 SHA512 72cd38f3e11f3c55ff7ed3691fd9a749a5f8d072e08ed03f2fd43a8664962138afaf3e4647116940e86f6ae374a1ba3bcd4b108280da29f3ffa6091cf383ea35
 EBUILD libsoundtouch-2.3.1.ebuild 1580 BLAKE2B 96f5f32e57f59fab94d6f23183c6349c47c2153dc8cdff58e52170422227b60057e1537240daff4820bf55da3e11a89078a9f870ebfa42e76d3f247e18d3ee63 SHA512 f89fdadddf1a75cc14d5cd3faf0a5ca0b94f62756cf825b24e82eaa9f897913e6ee5f4cb4fdb54e51a120082914154044a86a7dda6c86439d6ac80a0c34b9f68
-EBUILD libsoundtouch-2.3.2.ebuild 1563 BLAKE2B 56c9b033767c7464b1a3cfa00615ec34ed42c0301a509ad98836b82d7eefe4e98936c11df870fb04382b5670d41faf5220cf6f044cf3934566c4b123965d6d1f SHA512 5753ad168d9cd49674e9a45eb144eb89a4c2e68688afe80968cd65354bd4f0ca13c64a63d8b549d7edb5be472f65c1bfb69962870eb085eb45305ddbc9d50c1b
+EBUILD libsoundtouch-2.3.2.ebuild 1560 BLAKE2B d7f51e8f53cd0112f84d5ce5bf04be098fb7983992605f90253d55300725e849c2dee7ad92d77e08a3f27df32b796f8b949ec15744e2e0f46c3b890521216043 SHA512 2170c0e21dabface37ebaa6c7ff5e0381ab29a0fdd8a9c4210209f2e61e2d1caf028b9e5110bea9b1ead97ce2524ba9f30436257dfe1d915b1fa3a88bcbe62e7
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.2.ebuild
index 0b26840141e7..2b9899eb9a4d 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.3.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.surina.net/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 9fc915f576db..244e577db9fc 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,9 +1,6 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
 AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f
-AUX mlt-7.8.0-linux_locale_h.patch 1508 BLAKE2B 412f066a5032e0f2408642256d182f0fdb22e58df3013cb08769e36a9189010b5a8d46b4def16ba0c59325f4db06c84eb664bff5aa7954ac8c8a8ba13ff20785 SHA512 5fddb589cbe2557a02be4a8a721b4e2acb03ab771444e603d8bd9878264c19803888ef7af383f102dd217a4784dec36376eb0bf2b84c1d907e6dfd0b22533f4a
 DIST mlt-7.12.0.tar.gz 1481720 BLAKE2B c0df14cfdbba1eec412e71a1184dfd0e595c89a24b956bc90390679307fec1c8a5f2264e9769123fa2f7d95a67ba35cf9316b32173f7248239431ae47743f6cc SHA512 7111ca31f5ed8479dc899596bec4b9dd9440ab8563844abd9d789f7ce342b61c54d1a5058d6f5288fdd510db7e05db12f7e807bf0cd33dbee11a72185fb0b746
-DIST mlt-7.8.0a.tar.gz 1458730 BLAKE2B 0f544923c7f1667d2a2379bcb84a68dca2c701ce7b9cebe4e9b5f81efcb494674111fea09e9025108b8714e792a0179d465d226bb0a0231a197a67c99d82f976 SHA512 aa44d604f2246db11e5c572e2c3f9121ef0ace1fdead95a6a4a20f7555a3139b067fd2d464f27d23cc90cfcf8907ae9cf8f33b26f76c110a6ba2329867f88bd1
 EBUILD mlt-7.12.0.ebuild 3618 BLAKE2B e53a9196c4901e0aa1cc0a62acfe954dfa74b0acdef9ee9f07d32af7f45c15f79a4077e2601aeb1997e0dba99ae968ca423aa6763ea5899b3c4d658dc387052a SHA512 d558b6fcdec3a6003f3509c5f076bc314a000912c634d8335683f4c33884bf49abc40e52189ae985353d3ba7174b13e66f1ba7b0a33b43f61b362834cfc74b97
-EBUILD mlt-7.8.0.ebuild 3705 BLAKE2B 1a713c4dbfb65e06907fcd29e67481d2ac5a83f43902a4d495984a3ab2e2f296a7c201762136bb02541df0b049f0f133d10ab761002e92468beec4deac78c181 SHA512 e3425148b727dacc140b1c363d20f2a9cd7fa3841e61559fbef60b86e86e0415c8a8987af8ddee1f872d33d589b678371fe52db38324f4153deefb3934ade64a
 MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd
diff --git a/media-libs/mlt/files/mlt-7.8.0-linux_locale_h.patch b/media-libs/mlt/files/mlt-7.8.0-linux_locale_h.patch
deleted file mode 100644
index 43822c446654..000000000000
--- a/media-libs/mlt/files/mlt-7.8.0-linux_locale_h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7d82553a00e74af77e69cc74645e0a3ec6bb3aa1 Mon Sep 17 00:00:00 2001
-From: alfredfo <98554039+alfredfo@users.noreply.github.com>
-Date: Sat, 25 Jun 2022 01:00:11 +0000
-Subject: [PATCH] Fix building for musl (#803)
-
-reverts: https://github.com/mltframework/mlt/pull/298.
-There is no gurantee that either HAVE_STRTOD_L or HAVE_LOCALE_H will be
-defined at compile-time. Try for example building this project :)
-
-The locale usage is now defined in POSIX and therefore we can now
-assume it will be available on Linux, except for ancient systems.
-https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/locale.h.html
-
-Another way of dealing with this would be to have a global mlt_config.h
-where HAVE_LOCALE_H and HAVE_STRTOD_L are defined to values determined
-when mlt is installed.
-
-https://git.alpinelinux.org/aports/tree/community/mlt/musl-locale.patch
-https://bugs.gentoo.org/829608
-https://github.com/mltframework/mlt/pull/803
----
- src/framework/mlt_property.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
-index 85d550ac0..be61c23c2 100644
---- a/src/framework/mlt_property.h
-+++ b/src/framework/mlt_property.h
-@@ -30,7 +30,7 @@
- #include <sys/param.h>
- #endif
- 
--#if (defined(__GLIBC__) && !defined(__APPLE__)) || defined(HAVE_LOCALE_H)
-+#if (defined(__linux__) && !defined(__APPLE__))
- #  include <locale.h>
- #elif defined(__APPLE__) || (defined(__FreeBSD_version) && __FreeBSD_version >= 900506)
- #  include <xlocale.h>
diff --git a/media-libs/mlt/mlt-7.8.0.ebuild b/media-libs/mlt/mlt-7.8.0.ebuild
deleted file mode 100644
index 53b16ea2df51..000000000000
--- a/media-libs/mlt/mlt-7.8.0.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit python-single-r1 cmake
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz -> ${P}a.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/7"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Needs unpackaged 'kwalify'
-RESTRICT="test"
-
-# rtaudio will use OSS on non linux OSes
-# Qt already needs FFTW/PLUS so let's just always have it on to ensure
-# MLT is useful: bug #603168.
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	sci-libs/fftw:3.0=
-	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? (
-		media-libs/libexif
-		x11-libs/pango
-	)
-	jack? (
-		>=dev-libs/libxml2-2.5
-		media-libs/ladspa-sdk
-		virtual/jack
-	)
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	opencv? ( >=media-libs/opencv-4.5.1:=[contrib] )
-	opengl? (
-		media-libs/libglvnd
-		media-video/movit
-	)
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		media-libs/libexif
-		x11-libs/libX11
-	)
-	rtaudio? (
-		>=media-libs/rtaudio-4.1.2
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	rubberband? ( media-libs/rubberband )
-	sdl? (
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image
-	)
-	vidstab? ( media-libs/vidstab )
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )
-"
-#	java? ( >=virtual/jre-1.8:* )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	ruby? ( ${RUBY_DEPS} )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0 )
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
-	"${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
-	"${FILESDIR}"/${PN}-7.8.0-linux_locale_h.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	if use python; then
-		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/python/build || die
-		python_fix_shebang src/swig/python
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_WITH_QT6=OFF
-		-DGPL=ON
-		-DGPL3=ON
-		-DBUILD_TESTING=$(usex test)
-		-DMOD_KDENLIVE=ON
-		-DMOD_SDL1=OFF
-		-DMOD_SDL2=$(usex sdl)
-		-DMOD_AVFORMAT=$(usex ffmpeg)
-		-DMOD_PLUS=ON
-		-DMOD_FREI0R=$(usex frei0r)
-		-DMOD_GDK=$(usex gtk)
-		-DMOD_JACKRACK=$(usex jack)
-		-DMOD_GLAXNIMATE=OFF
-		-DMOD_RESAMPLE=$(usex libsamplerate)
-		-DMOD_OPENCV=$(usex opencv)
-		-DMOD_MOVIT=$(usex opengl)
-		-DMOD_QT=$(usex qt5)
-		-DMOD_RTAUDIO=$(usex rtaudio)
-		-DMOD_RUBBERBAND=$(usex rubberband)
-		-DMOD_VIDSTAB=$(usex vidstab)
-		-DMOD_XINE=$(usex xine)
-		-DMOD_XML=$(usex xml)
-		-DMOD_SOX=OFF
-	)
-
-	# TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2
-	# TODO: add swig language bindings?
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	if use python; then
-		mycmakeargs+=( -DSWIG_PYTHON=ON )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	#
-	# Install SWIG bindings
-	#
-
-	docinto swig
-
-	if use python; then
-		dodoc "${S}"/src/swig/python/play.py
-		python_optimize
-	fi
-}
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 52c6a6ec43c6..700fafc5a79b 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,7 +1,4 @@
-AUX taglib-1.12-cmake.patch 18074 BLAKE2B f4f9dedd614d7bb2f981f7e4e8dc0b257847e9627e1fdc24d85a615cac7d894402b6901e39297a5a9473d9b1eecb6bc0be6183950abc3196245c1c8921f930aa SHA512 2003f02a843c3982c7c50db77bbda9ca75c36f25a371df03cca5139bd78e2efd7b083672bb06c5f9b0d114253fdaf6adeb995304877ff84085d8d1b07ef2c779
 AUX taglib-1.13-cmake.patch 1340 BLAKE2B 8255f3658c0a8adc386fb7f7aaba6c709b6a09a28219ef62484c9c73b198b6c45f03b7418bcacc6b0037ff8054497eb7aa7d2b18399e1321b40b58f66f49fd07 SHA512 46ff14f714954bcba48cdb9e0a1af3387fea6595cbdf2d6ad5331573d38d67fd0c22c412b67d3be757bd4bd1ef05aa485ae9e270643055cbbb4ccb4f9a009252
-DIST taglib-1.12.tar.gz 1364231 BLAKE2B 414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41 SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6
 DIST taglib-1.13.tar.gz 1371504 BLAKE2B 844aacec1a5a6baf69cc849cd09c53778b618acffc4bffb0b80835e0a0b6481c0492a5b66b51ef6fd15350b3a392f4a473410696534a7c2129cf045de6108156 SHA512 b6e3253d158b41173073c0da1915f5e4a3de947db918660817cb1c755fba7e3723ea1a335fbbc30b0dcf942348a471b493fe2ce1d52d1a808578edee14e1bfc7
-EBUILD taglib-1.12.ebuild 1296 BLAKE2B 1857d3925ded4150600158a518fd38b740dd839b0ec130a1f10d78c18245a3d978feee8acea27aca043a32f7febe213dec4d466e5eb0e27f12f1050759cf788b SHA512 8fbc3be5098ddee48c3cff5e0d00fa311d4a6232f5e1389e439ae7a7c1c903c8326472eb9baff530b86f90eed7d4071b356ff5dc1132bb07b2886a603abf1757
 EBUILD taglib-1.13.ebuild 1278 BLAKE2B 9d5d846b592b143c9f8bbb644d5866521d3d18d4142b96f6c90d8c3cb32f787b680cd26c4f706ddd4e0a708de722b85c16ed75a8cc634d85832ad40f276a8663 SHA512 e0ece4ddebb3e593eae1e47ec8ded8d9e5889b510e3486e87661cd99813d466594398a3d8dfbbf3f212a61a31e94e1b403a4026bcca1a18190e8ba330493f832
 MISC metadata.xml 385 BLAKE2B ca751efe47d501350e6b6f9b6d9925ed18e4a6f5dd2cacf18e5808b176c287f794251fb1606f86d2777051777b37d84c3c7a3d4a7dc2380f46f0c116500f81da SHA512 755de0d1495371605e6b80012ec736e5a9c9f50dfd7946e0443918f3fe193b5e3127325a5dc5b5e4e3c0db9be287d9db3e2e9d992b539629f2e291dc551963f3
diff --git a/media-libs/taglib/files/taglib-1.12-cmake.patch b/media-libs/taglib/files/taglib-1.12-cmake.patch
deleted file mode 100644
index 185a1e23ed20..000000000000
--- a/media-libs/taglib/files/taglib-1.12-cmake.patch
+++ /dev/null
@@ -1,525 +0,0 @@
-From 5d5315c5ddf2e3a6d92d6b5dba8a120b7c04f46a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 15 Feb 2021 22:50:56 +0100
-Subject: [PATCH 1/7] Use CMake's CTest which includes BUILD_TESTING option
-
-BUILD_TESTING is default enabled, which is a good default anyway.
-Move the CppUnit check to the root CMakeLists.txt, simpler and clearer.
-BUILD_TESTS is obsolete.
-
-The need for BUILD_SHARED_LIBS=OFF for testing is not clear, it works on Linux.
-But I kept it in the instructions for now.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt        | 13 +++++++++----
- ConfigureChecks.cmake | 10 ----------
- INSTALL.md            |  6 +++---
- 3 files changed, 12 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5fc91cc6..770fa046 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,6 +4,8 @@ project(taglib)
- 
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
- 
-+include(CTest)
-+
- if(DEFINED ENABLE_STATIC)
-   message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
- endif()
-@@ -32,7 +34,6 @@ if(ENABLE_CCACHE)
- endif()
- 
- option(VISIBILITY_HIDDEN "Build with -fvisibility=hidden" OFF)
--option(BUILD_TESTS "Build the test suite" OFF)
- option(BUILD_EXAMPLES "Build the examples" OFF)
- option(BUILD_BINDINGS "Build the bindings" ON)
- 
-@@ -147,9 +148,13 @@ if(BUILD_BINDINGS)
-   add_subdirectory(bindings)
- endif()
- 
--if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
--  enable_testing()
--  add_subdirectory(tests)
-+if(BUILD_TESTING)
-+  find_package(CppUnit)
-+  if(CppUnit_FOUND)
-+    add_subdirectory(tests)
-+  else()
-+    message(WARNING "BUILD_TESTING requested, but CppUnit not found, skipping tests.")
-+  endif()
- endif()
- 
- if(BUILD_EXAMPLES)
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index bcdbfe20..2fe2f129 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -187,16 +187,6 @@ if(NOT ZLIB_SOURCE)
-   endif()
- endif()
- 
--# Determine whether CppUnit is installed.
--
--if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
--  find_package(CppUnit)
--  if(NOT CppUnit_FOUND)
--    message(STATUS "CppUnit not found, disabling tests.")
--    set(BUILD_TESTS OFF)
--  endif()
--endif()
--
- # Detect WinRT mode
- if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- 	set(PLATFORM WINRT 1)
-diff --git a/INSTALL.md b/INSTALL.md
-index a398654e..19771aca 100644
---- a/INSTALL.md
-+++ b/INSTALL.md
-@@ -167,7 +167,7 @@ Unit Tests
- 
- If you want to run the test suite to make sure TagLib works properly on your
- system, you need to have cppunit installed. To build the tests, include
--the option `-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=OFF` when running cmake.
-+the option `-DBUILD_TESTING=ON` when running cmake.
- 
- The test suite has a custom target in the build system, so you can run
- the tests using make:
-@@ -183,7 +183,7 @@ Windows MinGW:
-   - `mingw32-make; mingw32-make install DESTDIR=/path/to/install/dir`
- * Build TagLib with testing enabled:
-   - ```
--    cmake -G "MinGW Makefiles" -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_SHARED_LIBS=OFF \
-+    cmake -G "MinGW Makefiles" -DBUILD_TESTING=ON -DBUILD_EXAMPLES=ON -DBUILD_SHARED_LIBS=OFF \
-     -DCPPUNIT_INCLUDE_DIR=/path/to/cppunit/include \
-     -DCPPUNIT_LIBRARIES=/path/to/cppunit/lib/libcppunit.a \
-     -DCPPUNIT_INSTALLED_VERSION=1.15.1
-@@ -200,7 +200,7 @@ Windows MSVS:
-   - It may fail, but the needed libraries should be available in src\cppunit\DebugDll.
- * Build TagLib with testing enabled:
-   - ```
--    cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON
-+    cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DBUILD_EXAMPLES=ON
-     -DBUILD_SHARED_LIBS=OFF -DENABLE_STATIC_RUNTIME=ON
-     -DCPPUNIT_INCLUDE_DIR=\path\to\cppunit\include
-     -DCPPUNIT_LIBRARIES=\path\to\cppunit\DebugDll\cppunitd_dll.lib
--- 
-2.30.1
-
-
-From 2cb339f46cc5b544ad1c2bb5528fe39c07d9f56b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 15 Feb 2021 23:11:38 +0100
-Subject: [PATCH 2/7] Move finding ZLIB to root CMakeLists.txt
-
-Small line decrease, but also easier to read what is happening.
-Now all dependencies can be read from the root CMakeLists.txt file.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt        | 22 +++++++++++++++-------
- ConfigureChecks.cmake | 11 -----------
- 2 files changed, 15 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 770fa046..e537aeb3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -101,8 +101,21 @@ math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}")
- 
- include(ConfigureChecks.cmake)
- 
--if(${ZLIB_FOUND})
--  set(ZLIB_LIBRARIES_FLAGS -lz)
-+# Determine whether zlib is installed.
-+
-+if(NOT ZLIB_SOURCE)
-+  find_package(ZLIB)
-+  if(ZLIB_FOUND)
-+    set(HAVE_ZLIB 1)
-+    set(ZLIB_LIBRARIES_FLAGS -lz)
-+  else()
-+    set(HAVE_ZLIB 0)
-+  endif()
-+endif()
-+
-+if(NOT HAVE_ZLIB AND ZLIB_SOURCE)
-+  set(HAVE_ZLIB 1)
-+  set(HAVE_ZLIB_SOURCE 1)
- endif()
- 
- if(NOT WIN32)
-@@ -120,11 +133,6 @@ if(NOT BUILD_FRAMEWORK)
-   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
- endif()
- 
--if(NOT HAVE_ZLIB AND ZLIB_SOURCE)
--  set(HAVE_ZLIB 1)
--  set(HAVE_ZLIB_SOURCE 1)
--endif()
--
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
- 
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 2fe2f129..7d2ff953 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -176,17 +176,6 @@ check_cxx_source_compiles("
-   }
- " HAVE_ISO_STRDUP)
- 
--# Determine whether zlib is installed.
--
--if(NOT ZLIB_SOURCE)
--  find_package(ZLIB)
--  if(ZLIB_FOUND)
--    set(HAVE_ZLIB 1)
--  else()
--    set(HAVE_ZLIB 0)
--  endif()
--endif()
--
- # Detect WinRT mode
- if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- 	set(PLATFORM WINRT 1)
--- 
-2.30.1
-
-
-From 6d94166dc6d2f12d9b913d8b672af32cec211440 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 15 Feb 2021 23:28:45 +0100
-Subject: [PATCH 3/7] Use GNUInstallDirs
-
-Well-established CMake standard for installation directories.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt               | 14 ++++----------
- bindings/c/CMakeLists.txt    | 12 ++++++------
- bindings/c/taglib_c.pc.cmake |  8 ++++----
- taglib-config.cmake          |  4 ++--
- taglib-config.cmd.cmake      |  4 ++--
- taglib.pc.cmake              |  6 +++---
- taglib/CMakeLists.txt        | 10 +++++-----
- 7 files changed, 26 insertions(+), 32 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e537aeb3..fb047350 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,7 @@ project(taglib)
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
- 
- include(CTest)
-+include(GNUInstallDirs)
- 
- if(DEFINED ENABLE_STATIC)
-   message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
-@@ -47,13 +48,6 @@ endif()
- add_definitions(-DHAVE_CONFIG_H)
- set(TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/")
- 
--## the following are directories where stuff will be installed to
--set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
--set(EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Base directory for executables and libraries")
--set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" CACHE PATH "The subdirectory to the binaries prefix (default prefix/bin)")
--set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})")
--set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix")
--
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-@@ -120,17 +114,17 @@ endif()
- 
- if(NOT WIN32)
-   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" @ONLY)
--  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" DESTINATION "${BIN_INSTALL_DIR}")
-+  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" DESTINATION "${CMAKE_INSTALL_BINDIR}")
- endif()
- 
- if(WIN32)
-   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmd.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd")
--  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd" DESTINATION "${BIN_INSTALL_DIR}")
-+  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd" DESTINATION "${CMAKE_INSTALL_BINDIR}")
- endif()
- 
- if(NOT BUILD_FRAMEWORK)
-   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" @ONLY)
--  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
-+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- endif()
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
-index ebb1267f..15f4e440 100644
---- a/bindings/c/CMakeLists.txt
-+++ b/bindings/c/CMakeLists.txt
-@@ -58,18 +58,18 @@ set_target_properties(tag_c PROPERTIES
-   VERSION 0.0.0
-   SOVERSION 0
-   DEFINE_SYMBOL MAKE_TAGLIB_C_LIB
--  INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
-+  INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
- )
- install(TARGETS tag_c
- 	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
--	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
--	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
--	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
--	PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
-+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/taglib
- )
- 
- if(NOT BUILD_FRAMEWORK)
- 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc)
--	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- endif()
- 
-diff --git a/bindings/c/taglib_c.pc.cmake b/bindings/c/taglib_c.pc.cmake
-index 232f4f78..97f0b5a1 100644
---- a/bindings/c/taglib_c.pc.cmake
-+++ b/bindings/c/taglib_c.pc.cmake
-@@ -1,12 +1,12 @@
- prefix=${CMAKE_INSTALL_PREFIX}
- exec_prefix=${CMAKE_INSTALL_PREFIX}
--libdir=${LIB_INSTALL_DIR}
--includedir=${INCLUDE_INSTALL_DIR}
-+libdir=${CMAKE_INSTALL_FULL_LIBDIR}
-+includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}
- 
- 
- Name: TagLib C Bindings
- Description: Audio meta-data library (C bindings)
- Requires: taglib
- Version: ${TAGLIB_LIB_VERSION_STRING}
--Libs: -L${LIB_INSTALL_DIR} -ltag_c
--Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 
-+Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -ltag_c
-+Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}/taglib
-diff --git a/taglib-config.cmake b/taglib-config.cmake
-index d500fe60..9f251178 100644
---- a/taglib-config.cmake
-+++ b/taglib-config.cmake
-@@ -16,8 +16,8 @@ EOH
- 
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_INSTALL_DIR@
--includedir=@INCLUDE_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- flags=""
- 
-diff --git a/taglib-config.cmd.cmake b/taglib-config.cmd.cmake
-index 1b807ec8..4e615c5e 100644
---- a/taglib-config.cmd.cmake
-+++ b/taglib-config.cmd.cmake
-@@ -27,8 +27,8 @@ goto theend
-   *       to allow for static, shared or debug builds.

-   * It would be preferable if the top level CMakeLists.txt provided the library name during config. ??

- :doit

--if /i "%1#" == "--libs#"    echo -L${LIB_INSTALL_DIR} -llibtag

--if /i "%1#" == "--cflags#"  echo -I${INCLUDE_INSTALL_DIR} -I${INCLUDE_INSTALL_DIR}/taglib

-+if /i "%1#" == "--libs#"    echo -L${CMAKE_INSTALL_FULL_LIBDIR} -llibtag

-+if /i "%1#" == "--cflags#"  echo -I${CMAKE_INSTALL_FULL_INCLUDEDIR} -I${CMAKE_INSTALL_FULL_INCLUDEDIR}/taglib

- if /i "%1#" == "--version#" echo ${TAGLIB_LIB_VERSION_STRING}

- if /i "%1#" == "--prefix#"  echo ${CMAKE_INSTALL_PREFIX}

- 

-diff --git a/taglib.pc.cmake b/taglib.pc.cmake
-index 71ee09af..4ddabe12 100644
---- a/taglib.pc.cmake
-+++ b/taglib.pc.cmake
-@@ -1,11 +1,11 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_INSTALL_DIR@
--includedir=@INCLUDE_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: TagLib
- Description: Audio meta-data library
--Requires: 
-+Requires:
- Version: @TAGLIB_LIB_VERSION_STRING@
- Libs: -L${libdir} -ltag @ZLIB_LIBRARIES_FLAGS@
- Cflags: -I${includedir} -I${includedir}/taglib
-diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
-index 563583ef..527c0073 100644
---- a/taglib/CMakeLists.txt
-+++ b/taglib/CMakeLists.txt
-@@ -344,7 +344,7 @@ endif()
- set_target_properties(tag PROPERTIES
-   VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
-   SOVERSION ${TAGLIB_SOVERSION_MAJOR}
--  INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
-+  INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
-   DEFINE_SYMBOL MAKE_TAGLIB_LIB
-   LINK_INTERFACE_LIBRARIES ""
-   PUBLIC_HEADER "${tag_HDRS}"
-@@ -365,8 +365,8 @@ endif()
- 
- install(TARGETS tag
-   FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
--  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
--  RUNTIME DESTINATION ${BIN_INSTALL_DIR}
--  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
--  PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/taglib
- )
--- 
-2.30.1
-
-
-From b23eb1f4208ca8a5806648bf1a442c55a06aeeae Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 15 Feb 2021 23:31:00 +0100
-Subject: [PATCH 4/7] Use FeatureSummary for a nice CMake summary output
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb047350..0370bd05 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,7 @@ project(taglib)
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
- 
- include(CTest)
-+include(FeatureSummary)
- include(GNUInstallDirs)
- 
- if(DEFINED ENABLE_STATIC)
-@@ -173,3 +174,5 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_C
- if(NOT TARGET uninstall)
-   add_custom_target(uninstall COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
- endif()
-+
-+feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.30.1
-
-
-From bcdae81dee3ff7e044e862b31f92b4a281fa19d1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 15 Feb 2021 23:44:11 +0100
-Subject: [PATCH 5/7] Just set CMAKE_MODULE_PATH instead of list(APPEND), drop
- ENABLE_STATIC err
-
-ENABLE_STATIC error has been there since 2014, that is long enough.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0370bd05..f5b1c479 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,16 +2,12 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
- 
- project(taglib)
- 
--list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
-+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
- 
- include(CTest)
- include(FeatureSummary)
- include(GNUInstallDirs)
- 
--if(DEFINED ENABLE_STATIC)
--  message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
--endif()
--
- option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
- if(APPLE)
-   option(BUILD_FRAMEWORK "Build an OS X framework" OFF)
--- 
-2.30.1
-
-
-From 5b94ac436b02ee9280de7fd705e7d02d77bd1a43 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 15 Feb 2021 23:47:26 +0100
-Subject: [PATCH 6/7] Install examples after we selected to build them
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- examples/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index f991739d..2360ada0 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -38,3 +38,8 @@ target_link_libraries(framelist tag)
- add_executable(strip-id3v1 strip-id3v1.cpp)
- target_link_libraries(strip-id3v1 tag)
- 
-+install(TARGETS tagreader tagreader_c tagwriter framelist strip-id3v1
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+)
--- 
-2.30.1
-
-
-From b8ee92c5b53df4259fae6499a7e1f9d1cb275a85 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Feb 2021 00:19:05 +0100
-Subject: [PATCH 7/7] Install taglib.png icon into html folder structure
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt      | 2 +-
- doc/api-header.html | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f5b1c479..759b23c9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -161,7 +161,7 @@ if(BUILD_EXAMPLES)
- endif()
- 
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
--file(COPY doc/taglib.png DESTINATION doc)
-+file(COPY doc/taglib.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/doc/html)
- add_custom_target(docs doxygen)
- 
- # uninstall target
-diff --git a/doc/api-header.html b/doc/api-header.html
-index ab133c25..52617513 100644
---- a/doc/api-header.html
-+++ b/doc/api-header.html
-@@ -12,7 +12,7 @@
-       <table border="0" width="100%">
-           <tr>
-             <td width="1">
--              <img src="../taglib.png">
-+              <img src="taglib.png">
-             </td>
-             <td>
-               <div id="intro">
--- 
-2.30.1
-
diff --git a/media-libs/taglib/taglib-1.12.ebuild b/media-libs/taglib/taglib-1.12.ebuild
deleted file mode 100644
index e78923f7eb7a..000000000000
--- a/media-libs/taglib/taglib-1.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Library for reading and editing audio meta data"
-HOMEPAGE="https://taglib.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="debug doc examples test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) # PR#996
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && cmake_build docs
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	if multilib_is_native_abi && use doc; then
-		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	fi
-}