8 files changed, 58 insertions, 156 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1480cb5b31c9..4804e90351e6 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/binkplayer/Manifest b/media-video/binkplayer/Manifest
index 5c7e0cca63e6..0618d7d390a8 100644
--- a/media-video/binkplayer/Manifest
+++ b/media-video/binkplayer/Manifest
@@ -1,3 +1,3 @@
 DIST binkplayer-1.99w.zip 100620 BLAKE2B 98fd5756850e1c88083b1350c393fad4d43cb77a1015d972331ab52b117c65f794301a3a0514074c3ad7971846bb435b614b8e4cb8cd564961b82cda5f96f5bf SHA512 2f6e58780098e19cd446e7876de8187e585c1be13cf53f1311975e107644c08d25703b93ceacc596b787a351bc104bde5aaf9f2da8338fcdc7a2795bf49936ce
-EBUILD binkplayer-1.99w.ebuild 689 BLAKE2B f73e13d879bb1e5642882ce3948f5152a6c6d604647a883ff89c6abd8781b3c2d912cb89afff5b0180847cee82442570b9536780dde3ca19850863509e2ebf74 SHA512 f3da55df3d14cfd808f66bc97a5bd85fe7c5e9b1ad1a18b2aabfd892cbb7617c47aebc592d397c089f225975359a3471b7487f4f756a03b7df5bcca245581064
+EBUILD binkplayer-1.99w.ebuild 657 BLAKE2B 59478caf0dbc7c3f0e3a87e89c944dbc9320f00d0bbb8751bc446dfc6896afd57ab8b0731ffec3d2d9dd3faf4d61ed48f23eca93c67bb2b5d74fac6cbd52772e SHA512 4be1dd068e54e96e0baedeeb948393ccbe6f9db715c1772e96d4104d7be1983f6262ae029db60190e75210bd5e3306ad8e6f53f33f02a36884b4e0116190cc7f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-video/binkplayer/binkplayer-1.99w.ebuild b/media-video/binkplayer/binkplayer-1.99w.ebuild
index 01e6281cfd4b..da676885c940 100644
--- a/media-video/binkplayer/binkplayer-1.99w.ebuild
+++ b/media-video/binkplayer/binkplayer-1.99w.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
+
 DESCRIPTION="Bink Video! Player"
 HOMEPAGE="http://www.radgametools.com/default.htm"
 # No version on the archives and upstream has said they are not
 # interested in providing versioned archives.
 SRC_URI="mirror://gentoo/${P}.zip"
+S="${WORKDIR}"
 
 # distributable per http://www.radgametools.com/binkfaq.htm
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
 RDEPEND="
-	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1-r1[abi_x86_32(-)]"
-
-S=${WORKDIR}
+	media-libs/libsdl[abi_x86_32(-)]
+	media-libs/openal[abi_x86_32(-)]"
+BDEPEND="app-arch/unzip"
 
 QA_PREBUILT="opt/bin/BinkPlayer"
 
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 4c699049fd5f..d7504f08264b 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,3 +1,4 @@
+AUX bino-1.6.7-gcc11.patch 883 BLAKE2B 612ff39d9294567d65809f88c4dc9d77011f2dbf5aa318a827299a7323f6706bbc4d82f8834ad8dd180fdef47de8d7fa0b861e93b91f2e2b2016cc09a522ca53 SHA512 3cf037566f6cb1d3eb2eeaf332e657e9eb088627c70752da2c27e5e22956a803fde3bca9071e75ede097c348e0f0e013e9c6d2cd0c15ff80f8b2059cfcab4646
 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
-EBUILD bino-1.6.7.ebuild 1534 BLAKE2B 28f577b5b83855f516dc5624d910f97d5f27c50c1d9208a9cfbcdb4db658b0822102e2700c9949e72988da77636c5328f4b964627fcd814b7ce8ec453b6c0efc SHA512 c8d185ae01990a161576ebde09079afb23381cdd9847fa494791ceab8d56a8afe96e26783cf304bd6c2bdbb43a3ed92a23ae7c63747bd32802a223500e1f71f0
+EBUILD bino-1.6.7.ebuild 1480 BLAKE2B f7841fc972fa8ae1f69fd8cd5c6fe7deffa9deebc12de70df06a7468f90cfcccc50f505a0399d430e537a695dc4e38c9542a13c66b18aa41959fa8cdc0debb09 SHA512 1600712530afc3cdef216324decb214f2c1a907b8dbb195c41c7a83456d60cae130efd94b442b60d1bce6efa19423302368cfa2d76f3bbf9248af591df49ba59
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild
index 2969055aea7a..8c5b35e1714a 100644
--- a/media-video/bino/bino-1.6.7.ebuild
+++ b/media-video/bino/bino-1.6.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic xdg-utils
+inherit flag-o-matic xdg
 
 DESCRIPTION="Stereoscopic and multi-display media player"
 HOMEPAGE="https://bino3d.org/"
@@ -25,28 +25,28 @@ RDEPEND="
 	virtual/libintl
 	>=media-video/ffmpeg-0.7:0=
 	lirc? ( app-misc/lirc )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
 
-src_configure() {
-	# Qt5 now requires C++11, #649282
-	append-cxxflags -std=c++11
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.7-gcc11.patch
+)
 
+src_configure() {
 	if use video_cards_nvidia; then
-		append-cppflags "-I/usr/include/NVCtrl"
-		append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib -L/usr/$(get_libdir)"
+		append-cppflags "-I${ESYSROOT}/usr/include/NVCtrl"
+		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/opengl/nvidia/lib -L${ESYSROOT}/usr/$(get_libdir)"
 		append-libs "Xext"
 	fi
+
 	if use lirc; then
-		append-cppflags "-I/usr/include/lirc"
+		append-cppflags "-I${ESYSROOT}/usr/include/lirc"
 		append-libs "lirc_client"
 	fi
 
-	# Fix a compilation error because of a multiple definitions in glew
+	# Fix a compilation error because of a multiple definitions error in glew
 	append-ldflags "-zmuldefs"
 
 	econf \
@@ -59,15 +59,8 @@ src_configure() {
 
 src_install() {
 	default
+
 	if ! use doc; then
-		rm -rf "${D}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-video/bino/files/bino-1.6.7-gcc11.patch b/media-video/bino/files/bino-1.6.7-gcc11.patch
new file mode 100644
index 000000000000..8d4bf4070f36
--- /dev/null
+++ b/media-video/bino/files/bino-1.6.7-gcc11.patch
@@ -0,0 +1,30 @@
+https://git.marlam.de/gitweb/?p=bino.git;a=commitdiff;h=7997ad11eefe241bb85a27c50d009c99851d7b0b
+https://bugs.gentoo.org/790128
+
+From 7997ad11eefe241bb85a27c50d009c99851d7b0b Mon Sep 17 00:00:00 2001
+From: Martin Lambers <marlam@marlam.de>
+Date: Sat, 27 Feb 2021 21:28:50 +0100
+Subject: [PATCH] fix compilation with C++ 17 compilers such as gcc 11
+
+---
+ src/base/dbg.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/base/dbg.cpp b/src/base/dbg.cpp
+index 6c6234f..044be67 100644
+--- a/src/base/dbg.cpp
++++ b/src/base/dbg.cpp
+@@ -74,8 +74,10 @@ namespace dbg
+         (void)sigaction(SIGFPE, &signal_handler, NULL);
+         (void)sigaction(SIGSEGV, &signal_handler, NULL);
+ #endif
++#if __cplusplus < 201700
+         std::set_unexpected(exception_crash);
+         std::set_terminate(exception_crash);
++#endif
+         std::set_new_handler(oom_abort);
+     }
+ 
+-- 
+2.20.1
+
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index e35ad69b0618..d9cbd2c9abdc 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,6 +1,4 @@
 AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53
-DIST totem-3.38.0.tar.xz 2235672 BLAKE2B 31a69bce69316e06b6ba1b1c98bfc5b87cae0b30e682bb1b32bbac713fb2ff262084e76c19690eb78495969a67c2be484bc45adcd1b432a3de7a33c3dc04109c SHA512 231aca873bb53f23f81a7981177761d0bf7768baa845309b0dc0821db58377d692cf7e8a65135090dac14e856aa3e1dc0c1f11c55a7b25d694822019bfa9eecf
 DIST totem-3.38.1.tar.xz 2196156 BLAKE2B a9f5771d7406df9490b6eb0f9dc03ef449bee05d6ff038fce9adbac63692b5555de6ff36fe90b3b63cf4bc59739d91b23e57b3a03bf953594567e6a21060b509 SHA512 f33583b0890bfdd0dfff0722f73242b1d38605564a3055b587a30eae4c0ba51159c105ef577ab144792ca1994f385c2b8a9375a356b7cdf2b93bfeb6317f6040
-EBUILD totem-3.38.0.ebuild 2776 BLAKE2B c0fc60233bebdde5825fbb4be16138f5ffaee529f23b992fa44652d3d325c7fc7217137bf61b350982a0f8ec631b55de5e252095bc02e8db37dc0798cad29426 SHA512 f34e74f68fe799af78f19d4c9f66a5b6a0d7b354a8239f86230f0ccc5d4370dd866a251b236646824a214481419ab88022968afc95f2c62899121bd85819fc03
 EBUILD totem-3.38.1.ebuild 2777 BLAKE2B 682bad8bd9eac4408b33e285306d137be365625b7621bc60f13ac57d994293e79fb818dc47548046564f523b9998e33a5d414e6f94bbd9114670b9e74e0c8760 SHA512 31a9d00ea794d3dac208df22d0c5ae4a1fb92db79c063e122f4d84c474c141fd0adab40e5b7c43b8bf11fa37349edc0b6781a13c45401015f9c6f815ba86fe79
 MISC metadata.xml 1017 BLAKE2B de40f52bc4cc3c838b473d4c444e9c41673cd3c2925f17508d03f5130fe237784d4ee4d02581718c06ccd30fa204d27ba7691fb8046009a540c00f3535f6909d SHA512 9b89a8eaa90ad2f55abf7a53bfba7c065be999233a7bbfe243f4514ca1c3ec5a3934f23ea8ecd6b2674ac82d5e55e2f3e25e3869a0cec019485c9bb99549b625
diff --git a/media-video/totem/totem-3.38.0.ebuild b/media-video/totem/totem-3.38.0.ebuild
deleted file mode 100644
index bc6d6ecbc9ee..000000000000
--- a/media-video/totem/totem-3.38.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="gtk-doc +python test"
-# see bug #359379
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.19.4:3[introspection]
-	>=media-libs/gstreamer-1.6.0:1.0
-	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
-	>=media-libs/gst-plugins-good-1.6.0:1.0
-	>=media-libs/grilo-0.3.0:0.3[playlist]
-	>=dev-libs/libpeas-1.1.0[gtk]
-	>=dev-libs/totem-pl-parser-3.26.5:0=[introspection]
-	>=media-libs/clutter-1.17.3:1.0[gtk]
-	>=media-libs/clutter-gst-2.99.2:3.0
-	>=media-libs/clutter-gtk-1.8.1:1.0
-	gnome-base/gnome-desktop:3=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/gobject-introspection-1.54:=
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	media-plugins/grilo-plugins:0.3
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		x11-libs/pango[introspection]
-		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	dev-lang/perl
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.5 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-# perl for pod2man
-# Prevent dev-python/pylint dep, bug #482538
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Drop pointless samplepython plugin from build
-	sed -e '/samplepython/d' -i src/plugins/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable-easy-codec-installation=yes
-		-Denable-python=$(usex python yes no)
-		-Dwith-plugins=all # in 3.34.1 only builtin and python plugins are left, and python is extra controlled by enable-python
-		$(meson_use gtk-doc enable-gtk-doc)
-		-Dgst-inspect=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use python ; then
-		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx meson_src_test
-}