gentoo auto-resync : 22:12:2022 - 01:55:45

12 files changed, 10 insertions, 487 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 99a5c0c58eaa..01dac1629227 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ccextractor/Manifest b/media-video/ccextractor/Manifest
index 80a670d32e1f..1431a56fed4f 100644
--- a/media-video/ccextractor/Manifest
+++ b/media-video/ccextractor/Manifest
@@ -1,10 +1,6 @@
-AUX ccextractor-0.85-cmake.patch 3008 BLAKE2B a6ce3f6004dbaaa2cb2b5d87798d8125779f380923f930210440165c09ddedc4027f71e338acf560f25ebbb235064e35c4afec7cec588e058367a2cbb4069cf7 SHA512 d2fee97a35c3b104d311d9424cdd199655b12a114172c3b152cca8503b06900897a5334709770af3b1b1294893376d9d4f5f3fc0486250dd90899df0bc7af3d0
-AUX ccextractor-0.85-fno-common.patch 412 BLAKE2B d3f72608417e2b8083eb2215baff4914f1a9ab562445792fd492af8ecd618724750e64a45962e9a086a6043a9ca2ac77173c373048c3bd2325325f00b1e6d8d5 SHA512 1738eab83961296f65eae6ade44ad6c8823542cb06809340cd0ff155d17405cb7f1a6dae2a5b5059194cb6fc205f1820a048b67b1ed41b6f6c2315dc8804808c
 AUX ccextractor-0.88-cflags.patch 394 BLAKE2B f400c071f762b1e300d883eb184ab79c4a413a22ea8ed27afba751d9ba6c830935ed67fbdb9b170af8e41d832e458e1d9cbc999f38ebee440cc87d1230e9b52b SHA512 8d572687bb1059485e106c76162f58304de8a97411e357fbd3719dfef7ccd2aea033e437361072db550e64cd3d440e8dda59af0dff5103ff6cdc42b4e67f3cb5
 AUX ccextractor-0.88-fno-common.patch 1724 BLAKE2B b74a0e411f4d7012feae108aae5e914b596bfaf1446e4c4f1fbcddae59aa6d8a42d8be88d9c78dddf180e411f4b94f57418f0290a9c9c6236d3820d878d32cb1 SHA512 7df3a9c4008ca77e430828769cc963eb599f0e132c098c375361f73a9b9636f98fa4a2919ccf7be495a22db76bcd4767806cfb73e248f3a506bb33563116e132
 AUX ccextractor-0.88-libdir.patch 489 BLAKE2B 92e2176680bb8273fc59430307c103b78da4b13e0b758b7b8b7e951401ed5a34e0a5e2dfe144e78d7a7871eb55767121489e25655df4def9c97c29a7ea5bd12d SHA512 98883556e1be13b4a1c1ee09dc964e97584a59b076e63506ddc3ca63d120d958a166e93374610203ae8fbdfbcd57b10db60a5af0925029c10fd5a96e1ea28f0d
 DIST ccextractor-0.88.tar.gz 41110344 BLAKE2B c0223f482eba2b1c0b80f24fcfbf0654fe6899d6123d4278b21df2558ba77da4e2212c5a0e67d27c670f466767022f1b3e5f557e156564f61269bc48c8ebfd31 SHA512 bb9442905f3c5d095b9b34eb318dc445a0ba484c22c4f061071cc2a1159ec9304b8aab5ea9e95348679e8c5ed378d4b2e471d6f7f933b7fa968f3443f1d5380f
-DIST ccextractor-src-nowin.0.85.zip 1843154 BLAKE2B 507018e76ed075de033df10c8af235ab7095b3dcf85c10398d9a7c8dbec338c6fe43f98b4f337419945b5deb9290d8652caa54c70de5fdfb0364b9dc48468379 SHA512 53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec
-EBUILD ccextractor-0.85-r2.ebuild 639 BLAKE2B 69437f1b71ac9772e74a3a3842181aa9ec60eb5ec2958af87734e37dc30472a97acbe63a5d157863880415b196abfcfc673639514377ff7447a3e0a8c5c50ae0 SHA512 323330b95c9a6efc295e18e6e61738b33a67984382a70e4bd63ab2e81ef70392c984de528b6a826b9936f2fe06ac453a2d6b168934aff4a5930885fe37e4d6c6
 EBUILD ccextractor-0.88.ebuild 723 BLAKE2B a404759914f8f4eedd4f413844581ac28e41d43f5cbb7a5aa3f9623b2bb08822126c84b73b0d11982a3dc5c4d60c144084747c3e9ade6fb47bc614cd3da6befc SHA512 8368124b9a140ca3342ae40b3307aeb38cdd10f120cba233a4988359eca1d333a99d31f3c054f0d80de1407150183ca7b74f7ea5d0ab40d6c3697fd9e347ccd8
-MISC metadata.xml 528 BLAKE2B 22f7e19938a50e6823df58e663c50590feafd46417f1b1e76d32b3a09ccf2da9a139e810bef378c81e641e1c83cf4c3fa447012979cfadead80661246f1d08de SHA512 27fe967fa29628076fd6c0df97aa651a948e2f41e569c62d34d4b40ff9150a6fdb6f75a92ff48956bbf2bb97d714e8e250605c5934a018eba1f0a65dd22bb014
+MISC metadata.xml 591 BLAKE2B c9f9c6e0cb909d5b9f5a5733db50f99f3c9b275e206a030dedc08b8a579c787f3f4a5d1b1ade42334f1ecba370d7a38311ac85959be886aed1c74f6bcb13c1aa SHA512 09c04a99f44ab3ebb594c0bbf10b915ff1a9f18f2b244c3ab46524f1ad988751a72aaa1943feccdb9735abd92a56b0797d24a533321960c7c0a638c6636bbd88
diff --git a/media-video/ccextractor/ccextractor-0.85-r2.ebuild b/media-video/ccextractor/ccextractor-0.85-r2.ebuild
deleted file mode 100644
index 982bba8df303..000000000000
--- a/media-video/ccextractor/ccextractor-0.85-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Extract closed captioning subtitles from video to SRT"
-HOMEPAGE="https://www.ccextractor.org/"
-SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip"
-S="${WORKDIR}/${PN}/src"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="app-arch/unzip
-	virtual/pkgconfig"
-RDEPEND="
-	media-libs/libpng:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${PN}-0.85-fno-common.patch"
-)
-
-src_install() {
-	cmake_src_install
-	dodoc ../docs/*.TXT
-}
diff --git a/media-video/ccextractor/files/ccextractor-0.85-cmake.patch b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
deleted file mode 100644
index 2fcf6cfee4b0..000000000000
--- a/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/CMakeLists.txt	2017-07-25 12:22:29.294144514 -0600
-+++ b/CMakeLists.txt	2017-07-25 12:23:33.979149436 -0600
-@@ -25,14 +25,13 @@
- include_directories ("${PROJECT_SOURCE_DIR}/protobuf-c/")
- include_directories ("${PROJECT_SOURCE_DIR}/zvbi")
- aux_source_directory ("${PROJECT_SOURCE_DIR}/zvbi" SOURCEFILE)
--aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib" SOURCEFILE)
- aux_source_directory ("${PROJECT_SOURCE_DIR}/lib_hash" SOURCEFILE)
- 
- # Adding some platform specific library path
- link_directories (/opt/local/lib)
- link_directories (/usr/local/lib)
- 
--set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -Wall -g -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64")
-+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_FILE_OFFSET_BITS=64")
- add_subdirectory (lib_ccx)
- 
- aux_source_directory (${PROJECT_SOURCE_DIR} SOURCEFILE)
-@@ -43,24 +42,8 @@
- set (EXTRA_LIBS ${EXTRA_LIBS} iconv)
- endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- 
--
--find_package (PkgConfig)
--if(PKG_CONFIG_FOUND)
--  pkg_check_modules(PNG libpng )
--  if(PNG_FOUND)
--    set (EXTRA_LIBS ${EXTRA_LIBS} png)
--  else (PNG_FOUND)
--    include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
--    include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
--    aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
--    aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
--  endif(PNG_FOUND)
--else(PKG_CONFIG_FOUND)
--    include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
--    include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
--    aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
--    aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
--endif (PKG_CONFIG_FOUND)
-+set (EXTRA_LIBS ${EXTRA_LIBS} png)
-+set (EXTRA_LIBS ${EXTRA_LIBS} z)
- 
- ########################################################
- # Build using FFmpeg libraries
---- a/lib_ccx/CMakeLists.txt	2017-07-25 12:32:32.803190443 -0600
-+++ b/lib_ccx/CMakeLists.txt	2017-07-25 12:25:40.819159089 -0600
-@@ -1,6 +1,6 @@
- cmake_policy (SET CMP0037 NEW)
- 
--set (CMAKE_C_FLAGS "-O0 -Wall -g -std=gnu99")
-+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
- 
- if (WITH_FFMPEG)
-   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_FFMPEG")
-@@ -37,20 +37,3 @@
- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DGPAC_CONFIG_DARWIN")
- endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--
--
--file (GLOB HeaderFiles *.h)
--file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n"
--                  "includedir=\${prefix}/include\n"
--                  "libdir=\${prefix}/lib\n\n"
--                  "Name: ccx\n"
--                  "Description: Closed Caption Extraction library\n"
--                  "Version: 0.75\n"
--                  "Cflags: -I\${includedir}/\n"
--                  "Libs: -L\${libdir} -lccx -lpng\n"
--                  "Libs.private: -lpng\n"
--                  )
--
--install (TARGETS ccx DESTINATION lib)
--install (FILES ${HeaderFiles} DESTINATION include)
--install (FILES ccx.pc DESTINATION lib/pkgconfig)
diff --git a/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch b/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch
deleted file mode 100644
index 6e543f74910a..000000000000
--- a/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/706934
---- a/lib_ccx/ccx_decoders_708.h
-+++ b/lib_ccx/ccx_decoders_708.h
-@@ -368,7 +368,7 @@
- 									 unsigned char *data,
- 									 int data_length);
- 
--ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color;
--ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs;
-+extern ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color;
-+extern ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs;
- 
- #endif
diff --git a/media-video/ccextractor/metadata.xml b/media-video/ccextractor/metadata.xml
index 5c31a9e31586..2bc9619e4c0e 100644
--- a/media-video/ccextractor/metadata.xml
+++ b/media-video/ccextractor/metadata.xml
@@ -10,5 +10,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ccextractor</remote-id>
+		<remote-id type="github">CCExtractor/ccextractor</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 9b622cb504e4..daef1f19690a 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST mediainfo_22.03.tar.xz 2005340 BLAKE2B 232f077a1e202271de8c0d07f1f2a27efac38c998cb5b7f465bf5e8e44c24d6dad9fcafc1a6d981863c13822bd8cbe921b4a06adf3b1f3ac7c8690de4026b597 SHA512 981c9fe410cf6fff1a87ecfe250216977e036e8606034621c18bbf66cc75261c2e0f411bbbf298a409b5b306f7f7ee993a1e24e70040cf48a7728550ef7d830b
 DIST mediainfo_22.09.tar.xz 2016868 BLAKE2B c4b1766c4d49be6e90d11c736e4572e24299ae96efdfbf92ef9d32a418d7777cad2ae60ac7e6234cfa7c3a11996e46fb178996c536b9ce13dd19a0449ae8bf86 SHA512 acdeef13153fd74c29d54b9bdf4e983dd81525ace47550977d99cb5950ab72579cbbfc1ae39d81d89e03c491ea559177a16853d9db20d83a995eff300b864d4d
-EBUILD mediainfo-22.03.ebuild 1687 BLAKE2B 2442b50e18b0d7b05eea921d88a84a8e1e81708f4a2935ff9ff6c1a499e2239bb2090a3ae4c72da213e448db38233aade0ee0930c478523099458e4f86fe28a4 SHA512 d2d320dfd4bbdc4dbdeb6bb838d7b742cbfd8076d8274ca39881620a102b2d63ade3d7ce402c2af1bf9e6910c8890dfd0398a0657b4e9da14447d2241076145f
 EBUILD mediainfo-22.09.ebuild 1687 BLAKE2B 2442b50e18b0d7b05eea921d88a84a8e1e81708f4a2935ff9ff6c1a499e2239bb2090a3ae4c72da213e448db38233aade0ee0930c478523099458e4f86fe28a4 SHA512 d2d320dfd4bbdc4dbdeb6bb838d7b742cbfd8076d8274ca39881620a102b2d63ade3d7ce402c2af1bf9e6910c8890dfd0398a0657b4e9da14447d2241076145f
 MISC metadata.xml 344 BLAKE2B c70240ab3644a4c1d2367d1eb094a01b60198549456dfae21604c03bb30298f0abde2afda7dfdcf16425ca90856e98f57869481b85358e1724595454c8fdb308 SHA512 cdf31d4cd6185e0fdf604b611ee54b0bb90ffd369119cfd0bcc759e1e3d63a0d5ce673f508d3963b06c0c6152cdc1ef7d369ad2e84327ebd91c1e4a196e75d2e
diff --git a/media-video/mediainfo/mediainfo-22.03.ebuild b/media-video/mediainfo/mediainfo-22.03.ebuild
deleted file mode 100644
index 76baf622975b..000000000000
--- a/media-video/mediainfo/mediainfo-22.03.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with media-libs/libmediainfo!
-
-WX_GTK_VER="3.0-gtk3"
-inherit xdg-utils autotools wxwidgets
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-S="${WORKDIR}/MediaInfo"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="~media-libs/libmediainfo-${PV}[curl=,mms=]
-	>=media-libs/libzen-0.4.37
-	sys-libs/zlib
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	TARGETS="CLI"
-
-	if use wxwidgets; then
-		TARGETS+=" GUI"
-		setup-wxwidgets
-	fi
-}
-
-src_prepare() {
-	default
-
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		sed -i -e "s:-O2::" configure.ac || die
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-	done
-}
-
-src_install() {
-	local target
-
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-		dodoc "${S}"/History_${target}.txt
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ae39bb2d0726..d26702c4bc1b 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,10 +1,6 @@
 AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e
 AUX mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 2494 BLAKE2B 1d23ca6e908947d80e3ea7567508714cd73461a7571dda88a227bf9d4ca3ec86113ad596ff64dc6bfea641c8b097fffa1b4b359a17f5b24c0305c7e6628103b7 SHA512 982953a7f992def139140298a5a6b2ceeae6afaf5123b8e12c46523ab1f799994aa2f5d435bebb8091ca63e56bb44310a39a6382c313f8e4083cfea67daff41d
-DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1 SHA512 c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c
-DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41 SHA512 f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b
 DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97 SHA512 dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c
-EBUILD mkvtoolnix-69.0.0.ebuild 2937 BLAKE2B 95d226e0dcd023451851428204cc72184a81adfd6926c889c608b0d12ff3d4c69fc681e92da910578addcc1a5257a236d46f5081c7a16e5b85c0768f7ea647ed SHA512 90d336e014affd6c9c0c7178522a4dcb6b7bbd3891ebd760dd8ef9cdf07b4d40a2b143f132d007cc6e805d508dd43cded8aab0001adc0c580c8c4d86d51e9429
-EBUILD mkvtoolnix-71.1.0.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a
 EBUILD mkvtoolnix-72.0.0.ebuild 2937 BLAKE2B ad306e107e1065ecbf0df631cb0eebb0d6f981da9f479b0a17604b016b21a6e0e544ee2f2eea50bb62cc3fcec7b8a59cfd717eee706d137f62e0717a5794584a SHA512 52e2adf07dce52e3bbf035bc11a9cfb27bc53e33109d3d781f845b1f0805b7999b4923ce9e89eb54f1b8b472819411019cd7bbb5776cdc36ccba123fc7ebfaf2
 EBUILD mkvtoolnix-9999.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a
-MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567
+MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0
diff --git a/media-video/mkvtoolnix/metadata.xml b/media-video/mkvtoolnix/metadata.xml
index 047ba8b96207..f305037837b0 100644
--- a/media-video/mkvtoolnix/metadata.xml
+++ b/media-video/mkvtoolnix/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>media-video@gentoo.org</email>
-	<name>Gentoo Video project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">mbunkus/mkvtoolnix</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
deleted file mode 100644
index e5b9d5f42fc2..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd gui nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/gmp:=
-	>=dev-libs/libebml-1.4.2:=
-	>=dev-libs/libfmt-8.0.1:=
-	>=dev-libs/pugixml-1.11:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.3:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	dev-qt/qtcore:5
-	gui? (
-		dev-qt/qtsvg:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-	)
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/nlohmann_json-3.9.1
-	>=dev-libs/utfcpp-3.1.2
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
-	"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# bug #692018
-	sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug #692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-
-		# Qt (of some version) is always needed, even for non-GUI builds,
-		# to do e.g. MIME detection. See e.g. bug #844097.
-		# But most of the Qt deps are conditional on a GUI build.
-		--disable-qt6
-		--enable-qt5
-		$(use_enable gui)
-		--with-qmake="$(qt5_get_bindir)"/qmake
-
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild
deleted file mode 100644
index 23a2e80da85d..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd gui nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/gmp:=
-	>=dev-libs/libebml-1.4.4:=
-	>=dev-libs/libfmt-8.0.1:=
-	>=dev-libs/pugixml-1.11:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.7.1:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	dev-qt/qtcore:5
-	gui? (
-		dev-qt/qtsvg:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-	)
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/nlohmann_json-3.9.1
-	>=dev-libs/utfcpp-3.1.2
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
-	"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# bug #692018
-	sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug #692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-
-		# Qt (of some version) is always needed, even for non-GUI builds,
-		# to do e.g. MIME detection. See e.g. bug #844097.
-		# But most of the Qt deps are conditional on a GUI build.
-		--disable-qt6
-		--enable-qt5
-		$(use_enable gui)
-		--with-qmake="$(qt5_get_bindir)"/qmake
-
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}