gentoo resync : 30.06.2019

3 files changed, 2 insertions, 87 deletions

diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 1b67ad673ec0..5c321ec70b91 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,6 +1,4 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_18.12.tar.xz 1667104 BLAKE2B 977f2728edb592a0d05720ed7e4f3f75a5ba951c8a494ed1c7e92439c3e812c1c68a65d6e7a492a9851449e26c56397d3c19bd070cf572676f5a0ac6f7ec5973 SHA512 88a5617404afbea99dfe5f96371711c8066f3a78353937e95fdfe72d3ab29943e68f0ecc21b5771f5f1cde2717af9002c61c388c3fd0e2ddcdc4ef77320348eb
 DIST libmediainfo_19.04.tar.xz 1684320 BLAKE2B 04c468b74fe0f886ed0a1bd5d0d1ff4b430d5a2fbb8e17ff23bd6bf53143e99cb811220a76c6741b17dbab8917219211c87bff6b20285c5375a6f67cc3dc5bc0 SHA512 7fdacc206f1db57605fc41b717740e6c6ce245d432faef15abb48e646bc05743ce72ee117519464d0341d83e0b306ddab79c9d34fd348897d4b0d15cb2f7db04
-EBUILD libmediainfo-18.12.ebuild 1844 BLAKE2B f4f26df651c1e4b446f344d3eced6b695fcdb607191f0182cb0b0cee95b375b31dd51a42184665866f5e4af95e9dd17feb5189c913bd580453bb0ca01884bd88 SHA512 e34251fc3af7af2fca29164235497be9f7294b380b922aa4d1e0a5f014faccb82ec77b5ba9f430cfbc62e66d020c164a8f06e842a36541fa7b66a9ebf96a44fa
-EBUILD libmediainfo-19.04.ebuild 1846 BLAKE2B 6fc56ff465cc0fdedba9114959d9b5facabfd4b70bc1c8098724419e04758cd30a3783658a9fd4b843d6038537a5c5363173db1364a4d74c4e4ff8acb96f5cb5 SHA512 6fb8aff87af0f0df3c546feca2cb72840483661cf5b81055837860dc923987a0c3da70f870cfcd4b7d936b7037d3bda4dde5f05d30e8a400910b91d095ceea57
+EBUILD libmediainfo-19.04.ebuild 1844 BLAKE2B 4e560ddc0e84ed20bccbae4471f713533839e810e66d1ff1f320cd9a2c5694121c2b261ee58d144f47899354b69f89f3306d6c3d5f3817592040c10b86603911 SHA512 47771d8b21dad97f726e4de800d0608d6e55d06958c5255e36e6fb0bbf02d9d71a5a7851996aeaa21bee999dae9007b4347413e697273605a1275389a0c430ae
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-18.12.ebuild b/media-libs/libmediainfo/libmediainfo-18.12.ebuild
deleted file mode 100644
index 8caee179e0b3..000000000000
--- a/media-libs/libmediainfo/libmediainfo-18.12.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libmediainfo/libmediainfo-19.04.ebuild b/media-libs/libmediainfo/libmediainfo-19.04.ebuild
index 66497326e1f1..8272ecf1c95a 100644
--- a/media-libs/libmediainfo/libmediainfo-19.04.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-19.04.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