gentoo resync : 19.10.2017

3 files changed, 2 insertions, 87 deletions

diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 279a6b4c5c19..b358d98ecfab 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,8 +1,6 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 SHA256 c2ed16098bf4c8c22fbb3a8294ff1934568916623738c62be6fdb44a1bbf6fa1 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb WHIRLPOOL 3857055a02659881072d40eeddaaf2db554d41768d3f4ef82566d03f1ff3dada65910b9622eb812dbd020b79176fa8abfd1b2b9276b51c3c1ecd9a16f36f6ef3
-DIST libmediainfo_0.7.98.tar.xz 1602452 SHA256 c442ff8e179ef0611f9af38cff550255f3307f787a03d065d14d7d6300bc05dc SHA512 d4f9021968a6bbec253ff8a178b41443df69bea07a3277f840a3a3ed1bbbfb4fc5719797692450f1cd2f70c65886f257cef4402d8a6c4a247b0f6943c49e86ea WHIRLPOOL 456916e93c0395560cf3c1a13761816c8f79151a261f8c4e9506b7c6d37e3b1c2c8fd9f69d895eac1a5b3429caab91bd2817d6f0f9ed54897f6f4bffd286e8ac
 DIST libmediainfo_0.7.99.tar.xz 1603656 SHA256 ec9a8f2e081eefda05ddb841a3ffc838bf6ef8aedaf40f47fdbd19fd739fd688 SHA512 a0ceaf142604a98e9415ecfeda29d7c3d57ac755903630c2a5b2782d3bb24a101c46c93c68858dce99299da6375e03b846b5973274168ca8c42315b82a0cfdc0 WHIRLPOOL 06f197dc2292a90b92c5862f48d02df74d770d7e218f9e978e0d6ff081ce8a7970bab9c00ed6d01fdae0dc0868b031c20447abd6046efb6b6f1c6a60f81a9ac1
-EBUILD libmediainfo-0.7.98.ebuild 1833 SHA256 544a42c7b0ba580c9afaff436014b8484232c3e67dc3b6b0f191059bc5fa9112 SHA512 7f115a80936d1e3dc566c5377c627253eb1a0c395eb63994ac7e17f9d7d83a8d76744bdc243752a8900e4c70d86c81f828dd29f8e4642f49200e92b4fcbceede WHIRLPOOL f147ae3f338b03f047e7d25f742d87727081a8f794299298ba561f55a4eb1f61e1215faafc39298cef4db0f744a85cab84414b4a01bc7fc3420dbe1714204a9c
-EBUILD libmediainfo-0.7.99.ebuild 1836 SHA256 eef15fdac52979ec457bfb1e05ef37461c874c754a3c3c1551f79cdc97410fba SHA512 10cf52d6df0e23d28be0ee4c6d3eff0a3ba8f0ee7f6e5ba7d92ddab90deca01c3bc72081ff9c7d5f9799601d5d213a591dc95a4671fd472104f58c6d915edd97 WHIRLPOOL f52938226b97eb233ea464506d998472b93976a3da3f1086add21ffe08aaf1d93d2b23961748df122cfc7f8e472d67e0b7fa550575f896a18b94cacb8cc8a687
+EBUILD libmediainfo-0.7.99.ebuild 1834 SHA256 d6e7a9b7ff5bae36f20fe76abe808b171cc894c05c3932153338c2a2b91a7579 SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e WHIRLPOOL 166c94d28a7947aceebb2dd43e15fb1d3a2638a357ccc723530490babf625c59e6e80acf20c3459c19e7850017ed6ce09e3aa6788d5ac700797459014d3569ac
 MISC ChangeLog 5635 SHA256 e4c3ce2951e67209ddbd1161939a87c2190bcaef9bf5965474051dbf5ab596f9 SHA512 8738a07741f540cd3c000050fc7934bdacb687c7ff00c5c942aa185c98220cea8b06bf13df8620719f17def78abb0585eed149a82fbe1471ceb136fcf4c55f5b WHIRLPOOL 80d4087bc2db5737388683e8d959e08f5f94c6aa80feb06408275f455ca2d1ed70d2add7d6c9add2f0e1c3ce53682f2661adf566a29a6c2b642ecff702b75ce7
 MISC ChangeLog-2015 12605 SHA256 14d85167b54b78d328bdc4fbe3d74216eeb88f2ec5b0e00a3578083e0e7ddc48 SHA512 b52ea003f493cbe732a542c95f78a09256a6f7419e4559254dba117ccd962c02bbfb1d8efc33b4706d56628311bd50fcd8ac68b01fc73e6f5c2b0e1e864e1edb WHIRLPOOL 4b04336e66d5a490d5a4e9f8d91ab2e0231a346e0b3a07061e6f601efd0664877b1b61fd50d07649f8fe58395415259b984c9b1d045c551c8d7a623fcfd74edb
 MISC metadata.xml 346 SHA256 f5fd43de9a1f007dff370433644ed72c60ac399b4904fcd8a2c276faa2c88c2f SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93 WHIRLPOOL e7f61f85b0413503848e76912f404d4e82f42b79b8d77d81511da78608bfe021f8f942d97cdf9138684d4b2cd841a4b92c80c6939cb65a7cc3816eac33bddb4c
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.98.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.98.ebuild
deleted file mode 100644
index 96da0192279c..000000000000
--- a/media-libs/libmediainfo/libmediainfo-0.7.98.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.34[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
-
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
-	fi
-
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
-	prune_libtool_files
-}
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.99.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.99.ebuild
index 7be3ed1e7919..c5d85f15c216 100644
--- a/media-libs/libmediainfo/libmediainfo-0.7.99.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-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 doc mms static-libs"
 
 RDEPEND="sys-libs/zlib