Merge updates from master

8 files changed, 273 insertions, 0 deletions

diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 7aede7d3ad42..95c134f3cd9b 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -2,3 +2,4 @@ DIST libmediainfo_0.7.73.tar.bz2 1648742 SHA256 d350dbbdc25a52f79bcb3d5e91d0a61c
 DIST libmediainfo_0.7.85.tar.xz 1537360 SHA256 b6202d5a9b1725b0976b051085625ae595f3eb8e2e02c4e34eb1cfff6c6d689f SHA512 ad7e99773257719c26a9fa4fe1ae3f87ee76e0e5c0d479778479d235abd67af9ef92c5b60c2b0f1262ed7da4878f54c8a57def89387973a3573f6b59459bfb65 WHIRLPOOL 77aded044df8aa2179f89c69b1d611dba1e430507a70790256fe6742ac9ab321f6121f8ef50b5e45a9c1d7306b37835e0ebf8559fdf2593a9ebb6bd1f31e8329
 DIST libmediainfo_0.7.86.tar.xz 1545368 SHA256 c0771a1405c8de3d90623ebb7d2686dd59c33c5917894e5462f4d591da63a792 SHA512 14ebffac03bf9b61d50ad6a3faeae649d4b24661152103eaf329e5e1ddb2230cd96001166a1217d796c463d5ec74fb103f07f45f3bdd6d048791d25923bf18bf WHIRLPOOL 2601f1f4e9268b71d8215ee96ba4a8b4d7a2d0f7ae3da319058b01e0eafed351a97f0b5ff71b964eb7129464fb960380deca21ef1e871dd9354ada1d6e70a3dd
 DIST libmediainfo_0.7.87.tar.xz 1544212 SHA256 4923dc108cf0e9fd6df36fc97e52a0955b69188491099331bb30d70410db72bf SHA512 595c3f6e6322dff7490e481e6705f0a8884c94150bf1c3679356b4ca0b37fd4e18a8d8e4d872c0398189b4d3328afa721586f7915293f6ebc9371ac4c6ccf93a WHIRLPOOL fcfdc6fec025c2c11d9420e019ef7afe5406658b9d18894532648689e11a1a45c74ec1ab831429fe44218ea988c75992f84497f87d1352b98756c98e77778b07
+DIST libmediainfo_0.7.88.tar.xz 1560488 SHA256 01de70bc67f2da4b6d2cde5aac0bf38b2e9ab834279b90c89cc3a3d1d47b14ec SHA512 9ddec4102bc4b28f5ff92fe13301c2cd1aad409680705d571a7b5a809aa831bfcec5f9cad28f49c78dd093c441b652140b1691762d81d3c69fbb3ea1b1922165 WHIRLPOOL 0dec5ff1bcc039ce66f67db586f68b6bb09b8c78787e96cc004dc3309ad4fbebc1daf197fa3b6ae5b5a754847b58b0a8769159222e2fe1acb2c36db2b3cef18c
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.88.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.88.ebuild
new file mode 100644
index 000000000000..59334c4304f6
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-0.7.88.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="http://mediaarea.net/mediainfo/"
+SRC_URI="http://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.28[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() {
+	sed -i 's:-O2::' configure.ac || die
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	epatch "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
+
+	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() {
+	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
+	if use doc; then
+		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
+	fi
+
+	prune_libtool_files
+}
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 85580de3ed30..f5aad48efd27 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,3 +1,4 @@
+DIST libmikmod-3.3.10.tar.gz 1237413 SHA256 00b3f5298431864ebd069de793ec969cfea3ae6f340f6dfae1ff7da1ae24ef48 SHA512 89a71f859bb2dbd20db2b8e1c381df61639302b5e10b85d64fa329fcad5aec603992f11d24c4498c442090f1dded7c8f14271cbaf1acc1b7e719be9cff60b3fe WHIRLPOOL 3c67c4fc73f62b9d2a60d1025f3962cc8429c71831186f4aed0e28111de3b683fb5453d0bb71c092242e59dcb408f815d09d4b70c704b52d53de81857fcb84cc
 DIST libmikmod-3.3.7.tar.gz 1226732 SHA256 4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 SHA512 3d2db6d0838a957f073f43f81e8ee20d803e5103e71bcbf7bb08f8a7776a77be50958522fc48e3ea9c20ee20a5a60eda8a66cd403f382ebd6c7910c6325dd4e9 WHIRLPOOL 708032fddc2260e52baee07dc00c45ac3dd0936d1c0f3f3b131dd3627fa7e1f0c699ab8184863f6435286ea4e1f83599cac76ce985ebd92a2d15ab7844d83fdf
 DIST libmikmod-3.3.8.tar.gz 1254702 SHA256 4acf6634a477d8b95f18b55a3e2e76052c149e690d202484e8b0ac7589cf37a2 SHA512 033e3977d5723c42af697bf1b9ba6b1912fff1bfbef1894e2b1919d55415efa8024046579ff6a1e9ec752a3c793acc60b616c223b3cb5d79a814746c0cf55e15 WHIRLPOOL 569dda4099e7b7b0c8f198425c9ae68f0fd6a1468e301e133482e24aef04ff85385aafe0ead3b847fb138d3c3fca06a9b588f3a896cf789143a2622d826f4cb1
 DIST libmikmod-3.3.9.tar.gz 1262237 SHA256 3b65c1a5cae07a2771cbb82fc70ac75d99f4b3e35ac1d4cd2177865093df2893 SHA512 260a3b46575bbfa5d7117d048293ea4271f1675d00e7cdb82f068493a3bfc69af3a10a35bd6a8a647bbe6808796a795a801c5c040d5d1eedffad455f0cbc2736 WHIRLPOOL 6d68a427b389b763b5e3656bdbc178de69cf5cdc208a2845a3957194fdf2612aea9dbe2ed4653d61872eebbe5efb0eb973088b30a6f34e6ea9248d7dedb65126
diff --git a/media-libs/libmikmod/libmikmod-3.3.10.ebuild b/media-libs/libmikmod/libmikmod-3.3.10.ebuild
new file mode 100644
index 000000000000..20241b276c46
--- /dev/null
+++ b/media-libs/libmikmod/libmikmod-3.3.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils multilib-minimal
+
+DESCRIPTION="A library to play a wide range of module formats"
+HOMEPAGE="http://mikmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
+
+LICENSE="LGPL-2+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
+
+REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
+	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
+	!${CATEGORY}/${PN}:2
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo
+	oss? ( virtual/os-headers )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libmikmod-config
+)
+
+multilib_src_configure() {
+	local mysimd="--disable-simd"
+	if use ppc || use ppc64 || use ppc-macos; then
+		mysimd="$(use_enable altivec simd)"
+	fi
+	if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
+		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
+	fi
+
+	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable alsa) \
+		$(use_enable nas) \
+		$(use_enable pulseaudio) \
+		--disable-sdl \
+		--disable-sdl2 \
+		$(use_enable openal) \
+		$(use_enable oss) \
+		$(use_enable coreaudio osx) \
+		$(use_enable debug) \
+		$(use_enable threads) \
+		$(use_enable static-libs static) \
+		--disable-dl \
+		${mysimd}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README TODO
+	docinto html
+	dodoc docs/*.html
+	prune_libtool_files
+}
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 0483027cccab..54dd20a55d23 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -11,3 +11,5 @@ DIST libpng-1.6.23-apng.patch.gz 10331 SHA256 58018fc71c0e584a482fdcec4f3347859d
 DIST libpng-1.6.23.tar.xz 961520 SHA256 6d921e7bdaec56e9f6594463ec1fe1981c3cd2d5fc925d3781e219b5349262f1 SHA512 950e2fae24db1e53e80257b34a78d3708844551c460d84902becea2bb246cddb1bb581c1e1faadbe2cac45c4182051558554748c78964ab74d27a65998a31c18 WHIRLPOOL 4660a394f6ed27fe239f3b8fec1c5dc0b3e697aed27f501e8f90a3440f2b7e0e4cccd7005821af335f77f7703f575d3cd64ab7582c3824bbfb25cc06d564f315
 DIST libpng-1.6.24-apng.patch.gz 10342 SHA256 d8c9335be7429e942252f39689087e4c70624fac68e361b297937afff702d52a SHA512 7f068ae37f824bba352cf4f1a3251c2ecc392add5fd9800fce529fe3a5ab6f6b7e2c2cce221ec233fc0e7bac8b4a366af15b2504b1c90cf5990747a8d16f3083 WHIRLPOOL 853ec68a89f338c0fc25f2572a781e4ef95a1f2af25e58ad9ac3841dc4e5fd1518a623bd7b6bcc9ce6d76634f62d37c1117730e94d6683e2d34fb90684cf3923
 DIST libpng-1.6.24.tar.xz 977532 SHA256 7932dc9e5e45d55ece9d204e90196bbb5f2c82741ccb0f7e10d07d364a6fd6dd SHA512 7eccb90f530a9c728e280b2b1776304a808b5deea559632e7bcf4ea219c7cb5e453aa810215465304501127595000717d4b7c5b26a9f8e22e236ec04af53a90f WHIRLPOOL 7cc2d0107a72c5aa5e342d9c85c29f98bde2c061d9d344a5c0ae3851ba0ad801a9db3c20cc08af25bdcfde6318d4b31d4e5da72d0dc814cd6b2a7ca3ad647d71
+DIST libpng-1.6.25-apng.patch.gz 10342 SHA256 e264d917d84872f01af3acf9666471a9bf64b75558b4b35236fef1e23c2a094f SHA512 3ecc7d49a001de7c47f7ca1169b8eb6bdf4221bf0de4f896afb52c526ea45027246c947a62a02adb2172d98085f6f07814de9c2ce222a5570c3eb67828733374 WHIRLPOOL a8021b1321a83023ffdb0c082d8fd3bb9a1ded2935da3f71098bac2bc070293212e4c2702855334e3db68ca66ddcb1891a4b82220b94dc2e0391585b9075c0cb
+DIST libpng-1.6.25.tar.xz 982204 SHA256 09fe8d8341e8bfcfb3263100d9ac7ea2155b28dd8535f179111c1672ac8d8811 SHA512 74de15b1146d479660e2b1fd6b192388857955f502b249f00b69e37b594af4d53117704cb77b5ae07ffd84510cc801695be2121adbedfaf65dc4e3b521259f5d WHIRLPOOL 31234463c2cd07b0dd8e98449ec20c902562b3d4c958811180d09cde0fda6643da14928d7fb852afe3d553e873982aa0423adf14811985dc55fca56aefb1e26b
diff --git a/media-libs/libpng/libpng-1.6.25.ebuild b/media-libs/libpng/libpng-1.6.25.ebuild
new file mode 100644
index 000000000000..b83049ccfb91
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.25.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng neon static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	if use apng; then
+		epatch "${WORKDIR}"/${PN}-*-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		--enable-arm-neon=$(usex neon)
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
+	prune_libtool_files --all
+}
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index fae9652c9363..ecc1db07357a 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -2,3 +2,4 @@ DIST mediainfo_0.7.73.tar.bz2 1467006 SHA256 a7cae29ac45a642c6747746db150382ed88
 DIST mediainfo_0.7.85.tar.xz 1299044 SHA256 ba441b9c94d56e6fd0867c7d6504963ef34b3d5e3c9edc719b67abdca5cdc1fb SHA512 bf3b75d1f11ab1c202f207abc2db28b699398bd4140e64a661e4b31f59ba97711aaa1ef7b0bb0ef014c69273d66101e0b476945eb1d473457114319b1cc756cf WHIRLPOOL 3d39935610d23fc1249a31873444517d07a369ea93e84a45ef9ec5940f4872dcbaccf4e43cf2585ea4fb4fa0b3eb17405d52ae87ace4d45bb4c2ff6173f6a5c0
 DIST mediainfo_0.7.86.tar.xz 1296520 SHA256 65edb2c1d3f7ea052b5cd6bf300267a007c8c01871c5965bef3a9bb9caa98697 SHA512 ea7a2dc0132b6910f361cc6f822ed5b3b5fbf76f9a0415aef3ce1298de8831175045800e8adcfecc9cc865874c6e97e271ec5796fa5937e2105bfb2cc884eb4b WHIRLPOOL ef99cde1e12afeb8c684a6767eb42a1cb7b3402df7c427559363a807e809b3c6c03e54f3160d7661593de818dc61a7a2806bf81d8283bed3cf2b7636bbd970b8
 DIST mediainfo_0.7.87.tar.xz 1304456 SHA256 fb86d2d8775ce6b23fe9416d006b0f62f8c2d71a1ee105ba820909ce9c8744f3 SHA512 2261d97aa0a62dadc1db3fe4985c3a105c4ce9d35c05fd0c222ef7f3055aa35d0faada717944bb264438ead5abaf427e1da41192b58f1768e3868098a017694f WHIRLPOOL d7c008182136b03c426e7b6fe2a7e12270f9b2b4cac1b6d3518cfeb1a96cb6e65d83a9f9f18236aaccd954fe892bdb3dae73741511d55117e5ede04202ac2d7b
+DIST mediainfo_0.7.88.tar.xz 1316320 SHA256 853839f0dce758f97ab950069c73a2ea7b601f6712bbcee36d0bc2ee9f58f373 SHA512 4467ffb8c9534ca4d53df12d6e0c6550d72446464b2e1e78c6768a1f5ce49cda5d501359d0d72b29c75ee00220998e9f5623a0b9afb506960a2ec95e1e423f72 WHIRLPOOL a3126841b89a05374fa0bc58881f119b8a0dd2a39d4f7f7cdf18c93f476e02d7caadadf1efb11eb0cd16db7a594617634a8a98915613f30b70740fd491f05d1b
diff --git a/media-video/mediainfo/mediainfo-0.7.88.ebuild b/media-video/mediainfo/mediainfo-0.7.88.ebuild
new file mode 100644
index 000000000000..912125691e30
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-0.7.88.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit eutils autotools wxwidgets multilib
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="http://mediaarea.net/mediainfo/"
+SRC_URI="http://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
+	~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() {
+	epatch_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
+}