gentoo resync : 29.01.2021

4 files changed, 8 insertions, 171 deletions

diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index d920de70cd0c..e913c245b4b8 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,7 +1,3 @@
-DIST mediainfo_20.03.tar.xz 1983420 BLAKE2B d0f7557c231bc1cca261e8f002d060b0df4c2063cc32185c315ccc08a94e00fe9f5c0116f8ea65ce1a9df9f159d119264046a9bb607bd25a3b6231092c541799 SHA512 608b86f50139b0cbb21331922447b85dc2012b133915696ca9fceb7f524895f779c8cbfaccfa351c5b79c330587bc48d0f419f4908977fdc3eb4cd0490580399
-DIST mediainfo_20.08.tar.xz 1994480 BLAKE2B bab189f1cd667977c744744bb272f8010c4aec98df62d6517750f8168389fcd20cc237eee2488e27d20e434f8d139b4674f252ca791741053a32ba27893bdf18 SHA512 0d2c2a9987cf5b64093f9492f3c83f5aee0f372375f86511d46d30adcecddbc2e15f8d6c8888abde63a621f05e2fc1d358480bd3eba786d332fbacc868832895
 DIST mediainfo_20.09.tar.xz 1984148 BLAKE2B 6926d9ce787b9f9e5c07fe0ddf98e186139ea25c7ab6b3573dc1732850a7f98aeefdeca2157fdcad83d652332705028df12a1cf1e6377f9c1e23b7865578cfd8 SHA512 b6c8bf661585fa6b8e82c7f4bafacae8505078c5c57bc1c703ed16ac237dad0829569dd33fdaaadccd394bdd93088d9b71e5ad2c2294f75aa641004ec91feca9
-EBUILD mediainfo-20.03.ebuild 1581 BLAKE2B 627f4f7c702c4c64c66004fc47b010ea331029ac28183d389b81d8d6682f4dd6b915f135f3d0f9cfaa3eff3066013e83cef477103ba5a784867e63fdcd98368b SHA512 1bad9e19544f7bf7a290f9927c83d4fe56189e8265afbfea1644eb39634b03c97488283d1250bdbcaee4c3696aeb62e59529cf02276b85b76170263f71e5a289
-EBUILD mediainfo-20.08.ebuild 1581 BLAKE2B 627f4f7c702c4c64c66004fc47b010ea331029ac28183d389b81d8d6682f4dd6b915f135f3d0f9cfaa3eff3066013e83cef477103ba5a784867e63fdcd98368b SHA512 1bad9e19544f7bf7a290f9927c83d4fe56189e8265afbfea1644eb39634b03c97488283d1250bdbcaee4c3696aeb62e59529cf02276b85b76170263f71e5a289
-EBUILD mediainfo-20.09.ebuild 1581 BLAKE2B 627f4f7c702c4c64c66004fc47b010ea331029ac28183d389b81d8d6682f4dd6b915f135f3d0f9cfaa3eff3066013e83cef477103ba5a784867e63fdcd98368b SHA512 1bad9e19544f7bf7a290f9927c83d4fe56189e8265afbfea1644eb39634b03c97488283d1250bdbcaee4c3696aeb62e59529cf02276b85b76170263f71e5a289
+EBUILD mediainfo-20.09.ebuild 1603 BLAKE2B 5c0dc5cd5992ce35df04b60e0f870a1203cd60bc67e923f20b7575827695d01f092785149fab5e2aad3297215d1128599b9177590bad13ad28226a1b05b4dd7f SHA512 d0779a099600b1478d234fa61f2696961266d2137c904e648ca77d52433588fe7015e929f2ced4eb5444fa4ee63fb05461f5f26a7cd86c7b7da6203a58ff2804
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-20.03.ebuild b/media-video/mediainfo/mediainfo-20.03.ebuild
deleted file mode 100644
index a79f1f182702..000000000000
--- a/media-video/mediainfo/mediainfo-20.03.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-
-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"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-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/mediainfo/mediainfo-20.08.ebuild b/media-video/mediainfo/mediainfo-20.08.ebuild
deleted file mode 100644
index a79f1f182702..000000000000
--- a/media-video/mediainfo/mediainfo-20.08.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-
-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"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-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/mediainfo/mediainfo-20.09.ebuild b/media-video/mediainfo/mediainfo-20.09.ebuild
index a79f1f182702..be6db587456b 100644
--- a/media-video/mediainfo/mediainfo-20.09.ebuild
+++ b/media-video/mediainfo/mediainfo-20.09.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-WX_GTK_VER="3.0"
 
+WX_GTK_VER="3.0"
 inherit xdg-utils autotools wxwidgets
 
 DESCRIPTION="MediaInfo supplies technical and tag information about media files"
@@ -15,12 +15,13 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="
+	~media-libs/libmediainfo-${PV}[curl=,mms=]
 	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
+	sys-libs/zlib
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/MediaInfo