gentoo resync : 19.10.2017

3 files changed, 2 insertions, 75 deletions

diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 28d5a9e17c74..dfb441cde269 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,7 +1,5 @@
-DIST mediainfo_0.7.98.tar.xz 1317952 SHA256 f1e32acc44063549b67e0584115a785e48b2a318a9011634affdd9c2cf04d9f6 SHA512 455ea7c51bf572c6ea389f2b8d82f5f5f6afcbf649bef6433293b970318e4ab58447e47c33c234cc0f8051efb7501c36637940c2df92c010a0a74c5f28fc3133 WHIRLPOOL 6c35c4e58124fb38003901c6f9c3ad1b0c524f9050284f232cde308fc16be45f59a28f3ae5add05348eca7db1ce60c2eea86c456d36227976556dcb5b4eb4fe0
 DIST mediainfo_0.7.99.tar.xz 1327592 SHA256 ca308d3fd1ded0baad62be2388f65c98949ab9111589b5561c8f0f9c3537ed88 SHA512 7e50d0757c18e0eb07955a440250ca40fb5ee28dd4565528f8797f842611955942a4a6ff5b3c8736d4e24fe503272b2cd93de55187b2c3bca2c99021fe0330fa WHIRLPOOL 0ac9d9042a5382ae9b3a98879e407013fa593bfc01559834ace61f5b1b9aabde54b31f62a407c01956541cc71e46d879b0fcf57fedd2f5cb46fb7812b0cb5a9f
-EBUILD mediainfo-0.7.98.ebuild 1548 SHA256 af3c49e2bd17a41a7bd3cf846108743f22089b26fd23ecdabbb60ca59c2725d4 SHA512 15448d71392248d998cc6253f3bc0af8e704a990acdbc719846f6178546ae438eefaac66cf92b28cbf592020321bd86b99e95fbe4fb38fdc9c69ce695d319f21 WHIRLPOOL f1dcb041dca43531a2a6df80d1aa689a2f49100cb512cca69d92b15b38e5e727f8a4e4a0e3e6ae960d17d2ca9b60b775559ec433fa97ff95358d6af9d38da471
-EBUILD mediainfo-0.7.99.ebuild 1550 SHA256 9808db6e406855992cbe89c876adbbf2266b86473a3e05ba185af55b42a886ef SHA512 5eca56eedaecb066a123cb042b9ee4c53cc3ba629bc498e9bfb8dcfd519672b680766fc82af8d2fced59deed4a6fb7002322cfd565d790ba620a2782cc3af162 WHIRLPOOL 569aa28882246d4541275cb3272ccc937c893a84b10492234e35011124a453c2bd80612404b7ea902c818492303abc11d7e61d0d2f453b6cb67f7e014176f898
+EBUILD mediainfo-0.7.99.ebuild 1548 SHA256 1f55bf684e4d4535d5211240c26d567d2db0511d9c19eba9a143e2abee6c1296 SHA512 7b881f5f0199a8fb044fc5fdbe0856f769bb4e94a3a684e49cd69d089de4cb0921c1a4c47a971ddb3a99bc98e289806054e2581cf9c053b215b8867a85d511d6 WHIRLPOOL 82f9a283230e530a180fd956961fb3a14563e6c60590aa852d97e7640da6f6d8c8ade138ef57282605e8f11f199bd369d76a65a97e5465179fe9685408585018
 MISC ChangeLog 5320 SHA256 84bea5b5194a485f443149dea94bb59fccabb1112cc2d829090421a2294d1084 SHA512 58db1a1c6949b86ebb7a226adf66fa853ae90f752bdcf41f5cf184e3e18e9e378fd8c67736cb78c7306add760f0c12e0cf27d02e5ce98e8d6e531e0486bf5c25 WHIRLPOOL d26a51fb5f7f31a227796808bc4a6e31a1f98bde0780d2b83caaad2236cb6fbcb033c95dbd6aca642018850f688e6ea78a28c0654eb7cdb174b2feff320eecce
 MISC ChangeLog-2015 11146 SHA256 6c2b5ed60b828ed8cf45d91cc15fbec9b2509684cc429232444b3121351a2f6f SHA512 8d714aee56ec7c89c4d1ae2c357d2bf9268c22adb63f36b35ee6f7e78bb945d6831532710662e29e15b7e9aea062860f3ea616be7c18746ab4e8d5d4ca804f54 WHIRLPOOL 1377b0762947b48217bd0461e2bb5816f4db81769a02cad4f6c1616b6dd4aa11f81a89c02687b3fff6838d4154676c52839a9701a408c662252a4528ab8a759a
 MISC metadata.xml 343 SHA256 b8b4a87c95842408a4d73eaf5b592d569a99ea6ba3cee8999072cc66cc17e017 SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3 WHIRLPOOL 5c9ecc6ea491b57153de00a64d3238be4e2b82fb020b883d4529ee04d1807bc37be2572d306716e933f433f504a5dd9d773586993cebc1234a67a3f7e31067b2
diff --git a/media-video/mediainfo/mediainfo-0.7.98.ebuild b/media-video/mediainfo/mediainfo-0.7.98.ebuild
deleted file mode 100644
index 962164535c14..000000000000
--- a/media-video/mediainfo/mediainfo-0.7.98.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit eutils 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.34
-	~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"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	eapply_user
-
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		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}
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-		dodoc "${S}"/History_${target}.txt
-		if [[ ${target} == "GUI" ]]; then
-			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
-			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
-		fi
-	done
-}
diff --git a/media-video/mediainfo/mediainfo-0.7.99.ebuild b/media-video/mediainfo/mediainfo-0.7.99.ebuild
index f3350adbb933..a6625f97df57 100644
--- a/media-video/mediainfo/mediainfo-0.7.99.ebuild
+++ b/media-video/mediainfo/mediainfo-0.7.99.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