gentoo resync : 10.11.2019

3 files changed, 2 insertions, 84 deletions

diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index cdfcbbf2fd8b..22beabadce9e 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST mediainfo_19.07.tar.xz 1903620 BLAKE2B 68487713e0c540022d2a5ee8416cb8e1c87ed2a4479f8d7c247d75137a62d3ae2994d02cd8853080837a23d582ce4acab497646bf2307a0b2b4d398635738baa SHA512 ef543b2b3fa61347adaa510fc3b051ff148e24ef6461e25b9f1d158f3c4b57ce96826d0c0e8ae46996092e0eb84e99308ba87d95dd0392b99f05b704438c5983
 DIST mediainfo_19.09.tar.xz 1906920 BLAKE2B 926a13dd4b059eb613acf89b3b3e12918a86ad45c8551948be2d55478bbe94a93a3fdf7a49fbc087e44fd81232a9fa85cb6dfbd25efb11b9997b1f90b49090e4 SHA512 ddcfa92d822a28fa804d5bddc0d29bdb8cff3779b924c2caef0e59b0f79f857a4140dc94bd2ed9158954f6400778572975ac63f45ee2b87664e3e3b5ed9327a0
-EBUILD mediainfo-19.07.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
-EBUILD mediainfo-19.09.ebuild 1602 BLAKE2B ba4076c82d812b436c9c707c36043e1f2a5c493fa23c78ab2b545dc1e207f1d42e49cc3795fd5675820ef4e614f37c94128e9e4c5e3a82ccb79e416338950ae7 SHA512 30306ad04a63f72802532bcc3bfbf9bac6cba5306af8d6f693052a17b24f033ab089a7dc1f928cb6fe5c569c5f73d71206fb8d6d0d1f9b4d135cabf8bc109637
+EBUILD mediainfo-19.09.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-19.07.ebuild b/media-video/mediainfo/mediainfo-19.07.ebuild
deleted file mode 100644
index 37cd73d53baf..000000000000
--- a/media-video/mediainfo/mediainfo-19.07.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit gnome2-utils 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() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/mediainfo/mediainfo-19.09.ebuild b/media-video/mediainfo/mediainfo-19.09.ebuild
index 255a3010c595..37cd73d53baf 100644
--- a/media-video/mediainfo/mediainfo-19.09.ebuild
+++ b/media-video/mediainfo/mediainfo-19.09.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib