gentoo resync 04.02.2018

4 files changed, 2 insertions, 172 deletions

diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 9eac84105665..bacd7ee2cedd 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,8 +1,4 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_0.7.99.tar.xz 1603656 BLAKE2B cd1cf1860e0910da6e818846a8ab8c71682a7fd0bfc3edf2d60e220cdedcefb9940ca2e6d3db2a18722cca0a0bebd2b70ba0ca2cfcb8908f0c5fd31fe41775fd SHA512 a0ceaf142604a98e9415ecfeda29d7c3d57ac755903630c2a5b2782d3bb24a101c46c93c68858dce99299da6375e03b846b5973274168ca8c42315b82a0cfdc0
-DIST libmediainfo_17.10.tar.xz 1606920 BLAKE2B a0419644e65fee120d6f5e828a0ee66b04e026c6bd91ace603d0b5e7a14aff9f9db4a84cfb252ee97a241a38f31cec91138176e91e5783f1d450b5484bce49f4 SHA512 3fe8b7c97c9b916376c090c89f7b5afb732d002d5d112370b977c83d9bea2911ec7cc249fa7df6f4b100600cc2354d6a8832339cf0d3b45262730a477c07fd4d
 DIST libmediainfo_17.12.tar.xz 1612420 BLAKE2B 1e1bd62efe45783d4973bbe0ff264db1ed20b064dc18fe3ab4fa3614c1b41663fe6727e469ef1769b4736827f89940edd959b270ec1c673a190c9078a81f3955 SHA512 c425612ca84f4655c851332a4c13bdd75df094fa5468b2d61db512ff8431b41e94068d2f645b669dbee286ccae3979a38a5f4ebbb5cda8abdbadf0313df5680d
-EBUILD libmediainfo-0.7.99.ebuild 1834 BLAKE2B a54b2a81cef3bb3309c7d5ca6671ca85f0726a9ea28c224b3b3eecb3e45739c7b8bf5653cd69e3cc5f65f795d396dc813412e8c86125d23480893c09708974ba SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e
-EBUILD libmediainfo-17.10.ebuild 1836 BLAKE2B 1847028ad80e0c65c8b046c5c048547c209eb7e3e61e44d6c87298a61b2cc425bcb2bf9a97dce6081c9bc7dea6fb035c46b8e78f50f3f9c4a0d0ea2484148180 SHA512 10cf52d6df0e23d28be0ee4c6d3eff0a3ba8f0ee7f6e5ba7d92ddab90deca01c3bc72081ff9c7d5f9799601d5d213a591dc95a4671fd472104f58c6d915edd97
-EBUILD libmediainfo-17.12.ebuild 1836 BLAKE2B 1847028ad80e0c65c8b046c5c048547c209eb7e3e61e44d6c87298a61b2cc425bcb2bf9a97dce6081c9bc7dea6fb035c46b8e78f50f3f9c4a0d0ea2484148180 SHA512 10cf52d6df0e23d28be0ee4c6d3eff0a3ba8f0ee7f6e5ba7d92ddab90deca01c3bc72081ff9c7d5f9799601d5d213a591dc95a4671fd472104f58c6d915edd97
+EBUILD libmediainfo-17.12.ebuild 1834 BLAKE2B a54b2a81cef3bb3309c7d5ca6671ca85f0726a9ea28c224b3b3eecb3e45739c7b8bf5653cd69e3cc5f65f795d396dc813412e8c86125d23480893c09708974ba SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.99.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.99.ebuild
deleted file mode 100644
index c5d85f15c216..000000000000
--- a/media-libs/libmediainfo/libmediainfo-0.7.99.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 ltprune 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.37[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-17.10.ebuild b/media-libs/libmediainfo/libmediainfo-17.10.ebuild
deleted file mode 100644
index 7be3ed1e7919..000000000000
--- a/media-libs/libmediainfo/libmediainfo-17.10.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 ltprune 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.37[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-17.12.ebuild b/media-libs/libmediainfo/libmediainfo-17.12.ebuild
index 7be3ed1e7919..c5d85f15c216 100644
--- a/media-libs/libmediainfo/libmediainfo-17.12.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-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 doc mms static-libs"
 
 RDEPEND="sys-libs/zlib