gentoo resync 04.02.2018

4 files changed, 2 insertions, 148 deletions

diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 94917c1d1786..4694ccc73515 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,7 +1,3 @@
-DIST mediainfo_0.7.99.tar.xz 1327592 BLAKE2B 42b377ad263fa1a73e9158740be014f0c5ce4f7a00b023b8d6950c3fc0545f7f68c68fc546b4aaeff819152ab9d72d1232dd87d75089557a617dbb24b0acd269 SHA512 7e50d0757c18e0eb07955a440250ca40fb5ee28dd4565528f8797f842611955942a4a6ff5b3c8736d4e24fe503272b2cd93de55187b2c3bca2c99021fe0330fa
-DIST mediainfo_17.10.tar.xz 1319988 BLAKE2B fb1f8199849dd6bc5834a1d975936504c3c08d34c247e059b2b1e0c8db9bbf642b77be9606dd8eb8f481b25cb82b44eddd6ec30ed9afbbd58e8570a734e9023b SHA512 8e24aa71054c8887dc9fc6f9ddb188dfcf61afa37549aed77f77cd13f31cf1ac2e56c2f4e5901cc4ab9d52403740d82b8081898515b4f81944566941906b63f2
 DIST mediainfo_17.12.tar.xz 1335676 BLAKE2B 66bf02f74a63b40446cb061fe6422c84d61cb10db53394a7b356e0c0b76a7c934548bf75a8e8e5556a3fab2bd2f65c2a8c3d57040bd404e5258f0cfa4f87bbd9 SHA512 3fd6c8538c7703e657c6c20fec3ba071e5575f6010f41188bdd46749ecad9bddfa2362a5f0df6c23aa98375bb9078f14704b0729d1c54174449871992b968ff9
-EBUILD mediainfo-0.7.99.ebuild 1548 BLAKE2B a07b5d07fc129aa58dcd70c682f8fbeb6d220304c527589adc544e97af335bea6a40518b6795ba3b5774e547c9b660bf2d22967bf01e9a3b6f99a9683c930ac3 SHA512 7b881f5f0199a8fb044fc5fdbe0856f769bb4e94a3a684e49cd69d089de4cb0921c1a4c47a971ddb3a99bc98e289806054e2581cf9c053b215b8867a85d511d6
-EBUILD mediainfo-17.10.ebuild 1550 BLAKE2B db359bd00c5932afee7ae290bf02588b270442a1eb054d023d6a9a9efc26d24aa59144bef9554d8c16196aea35dca10f8afade0b79691e81f3cfefff7616f47a SHA512 5eca56eedaecb066a123cb042b9ee4c53cc3ba629bc498e9bfb8dcfd519672b680766fc82af8d2fced59deed4a6fb7002322cfd565d790ba620a2782cc3af162
-EBUILD mediainfo-17.12.ebuild 1550 BLAKE2B db359bd00c5932afee7ae290bf02588b270442a1eb054d023d6a9a9efc26d24aa59144bef9554d8c16196aea35dca10f8afade0b79691e81f3cfefff7616f47a SHA512 5eca56eedaecb066a123cb042b9ee4c53cc3ba629bc498e9bfb8dcfd519672b680766fc82af8d2fced59deed4a6fb7002322cfd565d790ba620a2782cc3af162
+EBUILD mediainfo-17.12.ebuild 1548 BLAKE2B a07b5d07fc129aa58dcd70c682f8fbeb6d220304c527589adc544e97af335bea6a40518b6795ba3b5774e547c9b660bf2d22967bf01e9a3b6f99a9683c930ac3 SHA512 7b881f5f0199a8fb044fc5fdbe0856f769bb4e94a3a684e49cd69d089de4cb0921c1a4c47a971ddb3a99bc98e289806054e2581cf9c053b215b8867a85d511d6
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-0.7.99.ebuild b/media-video/mediainfo/mediainfo-0.7.99.ebuild
deleted file mode 100644
index a6625f97df57..000000000000
--- a/media-video/mediainfo/mediainfo-0.7.99.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.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"
-	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-17.10.ebuild b/media-video/mediainfo/mediainfo-17.10.ebuild
deleted file mode 100644
index f3350adbb933..000000000000
--- a/media-video/mediainfo/mediainfo-17.10.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.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"
-	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-17.12.ebuild b/media-video/mediainfo/mediainfo-17.12.ebuild
index f3350adbb933..a6625f97df57 100644
--- a/media-video/mediainfo/mediainfo-17.12.ebuild
+++ b/media-video/mediainfo/mediainfo-17.12.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