19 files changed, 161 insertions, 241 deletions
diff --git a/app-text/ispell/Manifest b/app-text/ispell/Manifest
index d4f2733e..46b01419 100644
--- a/app-text/ispell/Manifest
+++ b/app-text/ispell/Manifest
@@ -1,3 +1 @@
-DIST ispell-3.3.02-gentoo-0.3.diff.bz2 5912 SHA512 839285c4b24788761d41712a15eb5a78fe3b590ff4462bf7ca64b785a4de59887ee4264c2b909ec3047a446ea04b3aaeb2cb8d141811f7f02354ac9fbc577ab2
-DIST ispell-3.3.02.tar.gz 619813 SHA512 d1614cf21bc09becb729bc476ea839877cce7f7a9cb36f2ae862acf2e15dd758f1477615878539ff3685e125583e431f647fca0ec3466e81efc21651eecad940
 DIST ispell-3.4.00.tar.gz 638770 SHA512 790475e7e296554221679b59856f256889a7193ab39e7314174f92364eaf4b658cc7e6b4f4b7892fa8f3cf0c022d933fc0c995c5e414987cbdcde27723e3da31
diff --git a/app-text/ispell/files/ispell-3.3.02-glibc-2.10.patch b/app-text/ispell/files/ispell-3.3.02-glibc-2.10.patch
deleted file mode 100644
index 8ccd5cc7..00000000
--- a/app-text/ispell/files/ispell-3.3.02-glibc-2.10.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur ispell-3.3.02.orig/correct.c ispell-3.3.02/correct.c
---- ispell-3.3.02.orig/correct.c	2009-08-06 18:28:32.000000000 +0300
-+++ ispell-3.3.02/correct.c	2009-08-06 18:28:57.000000000 +0300
-@@ -247,7 +247,7 @@
- 		  struct flagent * sufent,
- 		  ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
- 		  int * nsaved));
--static char *	getline P ((char * buf, int bufsize));
-+static char *	get_line P ((char * buf, int bufsize));
- void		askmode P ((void));
- void		copyout P ((unsigned char ** cc, int cnt));
- static void	lookharder P ((unsigned char * string));
-@@ -573,7 +573,7 @@
- 
- 		imove (li - 1, 0);
- 		(void) putchar ('!');
--		if (getline ((char *) buf, sizeof buf) == NULL)
-+		if (get_line ((char *) buf, sizeof buf) == NULL)
- 		    {
- 		    (void) putchar (7);
- 		    ierase ();
-@@ -598,7 +598,7 @@
- 		    (void) printf ("%s ", CORR_C_READONLY);
- 		    }
- 		(void) printf (CORR_C_REPLACE_WITH);
--		if (getline ((char *) ctok, ctokl) == NULL)
-+		if (get_line ((char *) ctok, ctokl) == NULL)
- 		    {
- 		    (void) putchar (7);
- 		    /* Put it back */
-@@ -666,7 +666,7 @@
- 		unsigned char	buf[100];
- 		imove (li - 1, 0);
- 		(void) printf (CORR_C_LOOKUP_PROMPT);
--		if (getline ((char *) buf, sizeof buf) == NULL)
-+		if (get_line ((char *) buf, sizeof buf) == NULL)
- 		    {
- 		    (void) putchar (7);
- 		    ierase ();
-@@ -1585,7 +1585,7 @@
-     return;
-     }
- 
--static char * getline (s, len)
-+static char * get_line (s, len)
-     register char *	s;
-     register int	len;
-     {
diff --git a/app-text/ispell/ispell-3.3.02-r1.ebuild b/app-text/ispell/ispell-3.3.02-r1.ebuild
deleted file mode 100644
index 8f4b40ed..00000000
--- a/app-text/ispell/ispell-3.3.02-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit toolchain-funcs
-
-PATCH_VER="0.3"
-
-DESCRIPTION="fast screen-oriented spelling checker"
-HOMEPAGE="https://fmg-www.cs.ucla.edu/geoff/ispell.html"
-SRC_URI="https://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz
-		mirror://gentoo/${P}-gentoo-${PATCH_VER}.diff.bz2"
-
-LICENSE="HPND"
-SLOT="0/3.3.02"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	sys-apps/miscfiles
-	sys-libs/ncurses:0=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-glibc-2.10.patch
-	eapply -p0 "${WORKDIR}"/${P}-gentoo-${PATCH_VER}.diff
-	sed -e "s:GENTOO_LIBDIR:$(get_libdir):" -i local.h || die
-	sed -e "s:\(^#define CC\).*:\1 \"$(tc-getCC)\":" -i local.h || die
-	sed -e "s:\(^#define CFLAGS\).*:\1 \"${CFLAGS}\":" -i config.X || die
-	default
-}
-
-src_configure() {
-	# Prepare config.sh for installation phase to avoid twice rebuild
-	emake -j1 config.sh
-	sed \
-		-e "s:^\(BINDIR='\)\(.*\):\1${ED}\2:" \
-		-e "s:^\(LIBDIR='\)\(.*\):\1${ED}\2:" \
-		-e "s:^\(MAN1DIR='\)\(.*\):\1${ED}\2:" \
-		-e "s:^\(MAN45DIR='\)\(.*\):\1${ED}\2:" \
-			< config.sh > config.sh.install
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	mv config.sh.install config.sh
-	emake -j1 install
-	dodoc CHANGES Contributors README WISHES
-}
diff --git a/app-text/ispell/ispell-3.4.00.ebuild b/app-text/ispell/ispell-3.4.00-r1.ebuild
index 2e7bcf01..4e9bcae0 100644
--- a/app-text/ispell/ispell-3.4.00.ebuild
+++ b/app-text/ispell/ispell-3.4.00-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,24 +12,31 @@ SRC_URI="http://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz"
 LICENSE="HPND"
 SLOT="0/3.4.00"
 KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+IUSE="+tinfo"
 
 RDEPEND="
 	sys-apps/miscfiles
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:0=[tinfo=]
 "
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	local tinfo
+	if use tinfo ; then
+		tinfo='s:\(^#define TERMLIB\).*:\1 "-ltinfo":'
+	else
+		tinfo=
+	fi
+	sed -i \
+		-e 's:\(^#define CC\).*:\1 "'"$(tc-getCC)"'":' \
+		-e 's:\(^#define CFLAGS\).*:\1 "'"${CFLAGS}"'":' \
+		${tinfo:+-e "${tinfo}"} \
+		-- "${S}"/config.X || die
 	sed -i \
 		-e 's:/usr/local/man:'"${EPREFIX}"'/usr/share/man:' \
 		-e 's:/usr/local/lib:'"${EPREFIX}"'/usr/'"$(get_libdir)/${PN}:" \
 		-e 's:/usr/local:'"${EPREFIX}"'/usr:' \
 		-- "${S}"/local.h.* || die
-	sed -i \
-		-e 's:\(^#define CC\).*:\1 "'"$(tc-getCC)"'":' \
-		-e 's:\(^#define CFLAGS\).*:\1 "'"${CFLAGS}"'":' \
-		-- "${S}"/config.X || die
 	default
 }
 
diff --git a/app-text/ispell/metadata.xml b/app-text/ispell/metadata.xml
index 097975e3..c389fb06 100644
--- a/app-text/ispell/metadata.xml
+++ b/app-text/ispell/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <use>
+    <flag name="tinfo">Whether to support (and require) sys-libs/ncurses[tinfo].</flag>
+  </use>
 </pkgmetadata>
diff --git a/games-engines/freesci/files/inline.patch b/games-engines/freesci/files/inline.patch
new file mode 100644
index 00000000..a7950c8c
--- /dev/null
+++ b/games-engines/freesci/files/inline.patch
@@ -0,0 +1,40 @@
+Martin Väth <martin@mvath.de>:
+Wrong inlines cause symbols/functions not to be found with current gcc-11
+--- 1/src/engine/klists.c
++++ 1/src/engine/klists.c
+@@ -301,7 +301,7 @@
+ 	return make_reg(0, ((l)? IS_NULL_REG(l->first) : 0));
+ }
+ 
+-inline void
++void
+ _k_add_to_front(state_t *s, reg_t listbase, reg_t nodebase)
+ {
+ 	list_t *l = LOOKUP_LIST(listbase);
+@@ -328,7 +328,7 @@
+ 	l->first = nodebase;
+ }
+ 
+-inline void
++void
+ _k_add_to_end(state_t *s, reg_t listbase, reg_t nodebase)
+ {
+ 	list_t *l = LOOKUP_LIST(listbase);
+--- ori/src/sfx/softseq/fmopl.c
++++ ori/src/sfx/softseq/fmopl.c
+@@ -443,6 +443,7 @@
+ /* operator output calcrator */
+ #define OP_OUT(slot,env,con)   slot->wavetable[((slot->Cnt + con) / (0x1000000 / SIN_ENT)) & (SIN_ENT-1)][env]
+ /* ---------- calcrate one of channel ---------- */
++void OPL_CALC_CH(OPL_CH *CH);
+ INLINE void OPL_CALC_CH(OPL_CH *CH) {
+ 	guint32 env_out;
+ 	OPL_SLOT *SLOT;
+@@ -486,6 +487,7 @@
+ 
+ /* ---------- calcrate rythm block ---------- */
+ #define WHITE_NOISE_db 6.0
++void OPL_CALC_RH(OPL_CH *CH);
+ INLINE void OPL_CALC_RH(OPL_CH *CH) {
+ 	guint32 env_tam, env_sd, env_top, env_hh;
+ 	int whitenoise = (int)((rand()&1) * (WHITE_NOISE_db / EG_STEP));
diff --git a/games-engines/freesci/freesci-0.6.4-r1.ebuild b/games-engines/freesci/freesci-0.6.4-r2.ebuild
index d5e21890..fe1f18c4 100644
--- a/games-engines/freesci/freesci-0.6.4-r1.ebuild
+++ b/games-engines/freesci/freesci-0.6.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,7 @@ src_prepare() {
 		Makefile.in \
 		|| die "sed failed"
 	eapply -p0 "${FILESDIR}"/${P}-glibc2.10.patch
+	eapply "${FILESDIR}"/inline.patch
 	default
 }
 
diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest
index e16656a8..d549f583 100644
--- a/media-gfx/ipe/Manifest
+++ b/media-gfx/ipe/Manifest
@@ -1 +1 @@
-DIST ipe-7.2.23-src.tar.gz 1030938 SHA512 31bc8841a038960c57ca5e46d85431697afc7a9b1e099bec623f26118aa8ef722d7c552a45a5a7c6a96a6651f3d9aa895a3059a357077e1ca7786bd1af7d45fb
+DIST ipe-7.2.24-src.tar.gz 1031794 SHA512 4387f5d770e356f7103787c667a5ee9a588f5fa656b96e1cf33051efe62dfdd5fd3bb49f0fcbad5fd1f342e79e3dc110910e6f4a929ed57a6831b867bd84f56d
diff --git a/media-gfx/ipe/ipe-7.2.23.ebuild b/media-gfx/ipe/ipe-7.2.24.ebuild
index 4aab2ded..d1d9c5ee 100644
--- a/media-gfx/ipe/ipe-7.2.23.ebuild
+++ b/media-gfx/ipe/ipe-7.2.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit desktop flag-o-matic lua-single toolchain-funcs
 
 DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
 HOMEPAGE="http://ipe.otfried.org/"
-SRC_URI="https://dl.bintray.com/otfried/generic/ipe/7.2/${P}-src.tar.gz"
+SRC_URI="https://github.com/otfried/ipe/releases/download/v${PV}/${PN}-${PV}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -36,14 +36,19 @@ BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${P}/src"
 
 src_prepare() {
-	filter-flags -fPIE -pie '-flto*' -fwhole-program +D_GLIBCXX_ASSERTIONS
+	filter-flags -fPIE -pie '-flto*' -fwhole-program -Wl,--no-undefined \
+		-DNDEBUG -D_GLIBCXX_ASSERTIONS
 	sed -i \
 		-e 's/fpic/fPIC/' \
 		-e "s'\$(IPEPREFIX)/lib'\$(IPEPREFIX)/$(get_libdir)'g" \
 		-e "s'\(LUA_CFLAGS.*=\).*'\1 $(lua_get_CFLAGS)'" \
 		-e "s'\(LUA_LIBS.*=\).*'\1 $(lua_get_LIBS)'" \
 		config.mak || die
-	sed -i -e 's/install -s/install/' common.mak || die
+	sed -i \
+		-e 's!-std=c++1.!!' \
+		-e 's/install -s/install/' \
+		-e "s'\$(CXX)'\$(CXX) -I${S}/ipecanvas -I${S}/ipecairo -I${S}/include'" \
+		common.mak || die
 	default
 }
 
diff --git a/media-gfx/libspiro/libspiro-20200505.ebuild b/media-gfx/libspiro/libspiro-20200505-r1.ebuild
index cc0aa9f3..b7c15118 100644
--- a/media-gfx/libspiro/libspiro-20200505.ebuild
+++ b/media-gfx/libspiro/libspiro-20200505-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Martin V\"ath
+# Copyright 1999-2021 Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,5 +18,5 @@ RESTRICT=""
 
 src_install() {
 	default
-	find "${ED}" -type f -name "*.la" -delete || die
+	find "${ED}" -type f '(' -name "*.la" -o -name "*.a" ')' -delete || die
 }
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 85d78e50..09706f52 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1 +1 @@
-DIST avidemux_2.7.4.tar.gz 23946276 SHA512 e6d0a9eb525d82d0bdecb41b50eaa5894134064148a1889e4bba704d512bb53f871f797444668a0601fecf4e0e61a1f1727b1c59d543860bb64c1a294eb9bf42
+DIST avidemux-2.7.8.tar.gz 22080267 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
index de8c9611..f31cff1e 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
@@ -1,35 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}
-	inherit git-r3
-else
-	MY_PN="${PN/-core/}"
-	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils
+inherit cmake flag-o-matic toolchain-funcs
 
 DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
 
 # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
 DEPEND="dev-db/sqlite:3
 	nvenc? ( media-video/nvidia_video_sdk )
 	sdl? ( media-libs/libsdl:0 )
-	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+	system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
 	vaapi? ( x11-libs/libva:0= )
 	vdpau? ( x11-libs/libvdpau:0 )
 	xv? ( x11-libs/libXv:0 )
@@ -44,11 +36,11 @@ BDEPEND="virtual/pkgconfig
 	!system-ffmpeg? ( dev-lang/yasm[nls=] )
 "
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/avidemux2-${PV}"
 CMAKE_USE_DIR="${S}/${PN/-/_}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use system-ffmpeg ; then
 		# Preparations to support the system ffmpeg. Currently fails because
@@ -61,15 +53,24 @@ src_prepare() {
 			-i avidemux/commonCmakeApplication.cmake || die "${error}"
 		sed -e 's/include(admFFmpegBuild)//g' \
 			-i avidemux_core/CMakeLists.txt || die "${error}"
+	else
+		local ffmpeg_args=(
+			--cc=$(tc-getCC)
+			--cxx=$(tc-getCXX)
+			--ar=$(tc-getAR)
+			--nm=$(tc-getNM)
+			--ranlib=$(tc-getRANLIB)
+			"--optflags='${CFLAGS}'"
+		)
+
+		sed -i \
+			-e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" \
+			cmake/ffmpeg_configure.sh.cmake \
+			|| die
 	fi
 }
 
 src_configure() {
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
@@ -83,17 +84,15 @@ src_configure() {
 		-DXVIDEO="$(usex xv)"
 	)
 
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-	fi
+	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 85d78e50..09706f52 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1 +1 @@
-DIST avidemux_2.7.4.tar.gz 23946276 SHA512 e6d0a9eb525d82d0bdecb41b50eaa5894134064148a1889e4bba704d512bb53f871f797444668a0601fecf4e0e61a1f1727b1c59d543860bb64c1a294eb9bf42
+DIST avidemux-2.7.8.tar.gz 22080267 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
index 717cff78..e8abc5a3 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
@@ -1,32 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_MAKEFILE_GENERATOR="emake"
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}
-	inherit git-r3
-else
-	MY_PN="${PN/-plugins/}"
-	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils python-single-r1
+inherit cmake flag-o-matic python-single-r1
 
 DESCRIPTION="Plugins for the video editor media-video/avidemux"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 SLOT="2.7"
 IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
+KEYWORDS="~amd64 ~x86"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="
+COMMON_DEPEND="${PYTHON_DEPS}
 	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
 	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
 	dev-lang/spidermonkey:0=
@@ -50,7 +44,7 @@ DEPEND="
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	fribidi? ( dev-libs/fribidi )
 	jack? (
-		media-sound/jack-audio-connection-kit
+		virtual/jack
 		libsamplerate? ( media-libs/libsamplerate )
 	)
 	lame? ( media-sound/lame )
@@ -75,22 +69,21 @@ DEPEND="
 	)
 	xvid? ( media-libs/xvid )
 "
-BDEPEND="${PYTHON_DEPS}
-	oss? ( virtual/os-headers:0 )
+DEPEND="${COMMON_DEPEND}
+	oss? ( virtual/os-headers )
 "
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
+RDEPEND="${COMMON_DEPEND}
 	!<media-libs/avidemux-plugins-${PV}
 "
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/avidemux2-${PV}"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
 
 src_prepare() {
 	default
 
-	# Don't reapply PATCHES during cmake-utils_src_prepare
+	# Don't reapply PATCHES during cmake_src_prepare
 	unset PATCHES
 
 	processes="buildPluginsCommon:avidemux_plugins
@@ -98,16 +91,11 @@ src_prepare() {
 	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
 
 	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
 	done
 }
 
 src_configure() {
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
@@ -151,28 +139,23 @@ src_configure() {
 			-DUSE_EXTERNAL_LIBMP4V2=yes
 		)
 
-		if use qt5 ; then
-			mycmakeargs+=( -DENABLE_QT5=True )
-		fi
-
-		if use debug ; then
-			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-		fi
+		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
+		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
+		BUILD_DIR="${build}" cmake_src_compile
 	done
 }
 
 src_install() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_install
+		BUILD_DIR="${build}" cmake_src_install
 	done
 }
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 85d78e50..8effcd52 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1 +1,2 @@
-DIST avidemux_2.7.4.tar.gz 23946276 SHA512 e6d0a9eb525d82d0bdecb41b50eaa5894134064148a1889e4bba704d512bb53f871f797444668a0601fecf4e0e61a1f1727b1c59d543860bb64c1a294eb9bf42
+DIST avidemux-2.7.8.tar.gz 22080267 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
+DIST avidemux-i18n-2.7.8.tar.gz 2488165 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
diff --git a/media-video/avidemux/avidemux-2.7.4-r1.ebuild b/media-video/avidemux/avidemux-2.7.8.ebuild
index 05cd184c..69ed6f3a 100644
--- a/media-video/avidemux/avidemux-2.7.4-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.7.8.ebuild
@@ -1,27 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} == *9999* ]] ; then
-	MY_P="${P}"
-	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-	inherit git-r3
-else
-	MY_P="${PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils qmake-utils xdg-utils
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake desktop flag-o-matic qmake-utils xdg
 
 DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.tar.gz"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
 
+BDEPEND="dev-lang/yasm
+	qt5? ( dev-qt/linguist-tools:5 )"
 DEPEND="
 	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
 	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
@@ -35,23 +32,28 @@ DEPEND="
 	)
 	vaapi? ( x11-libs/libva:0= )
 "
-BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-"
 RDEPEND="${DEPEND}
 	nls? ( virtual/libintl:0 )
 	!<media-video/avidemux-${PV}
 "
 PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/avidemux2-${PV}"
 
-src_prepare() {
+src_unpack() {
 	default
+	mv -f -T avidemux2_i18n-${PV} "${S}"/avidemux/qt4/i18n >/dev/null || die
+}
 
+src_prepare() {
 	processes="buildCli:avidemux/cli"
-	if use qt5 ; then
-		processes+=" buildQt4:avidemux/qt4"
+	use qt5 && processes+=" buildQt4:avidemux/qt4"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
+	done
+
+	if use qt5; then
 		# Fix icon name -> avidemux-2.7
 		sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \
 			die "Icon name fix failed."
@@ -68,10 +70,6 @@ src_prepare() {
 		mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
 	fi
 
-	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
-	done
-
 	# Remove "Build Option" dialog because it doesn't reflect
 	# what the GUI can or has been built with. (Bug #463628)
 	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
@@ -83,14 +81,13 @@ src_prepare() {
 }
 
 src_configure() {
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
+	# The build relies on an avidemux-core header that uses 'nullptr'
+	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
+	append-cxxflags -std=c++14
+
 	local mycmakeargs=(
 		-DGETTEXT="$(usex nls)"
 		-DSDL="$(usex sdl)"
@@ -100,41 +97,37 @@ src_configure() {
 		-DXVIDEO="$(usex xv)"
 	)
 
-	if use qt5 ; then
-		mycmakeargs+=(
+	use qt5 && mycmakeargs+=(
 			-DENABLE_QT5="$(usex qt5)"
 			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-		)
-	fi
+	)
 
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-	fi
+	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
+		BUILD_DIR="${build}" cmake_src_compile
 	done
 }
 
 src_test() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_test
+		BUILD_DIR="${build}" cmake_src_test
 	done
 }
 
 src_install() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_install
+		BUILD_DIR="${build}" cmake_src_install
 	done
 
 	if use qt5; then
@@ -143,11 +136,3 @@ src_install() {
 		domenu ${PN}-${SLOT}.desktop
 	fi
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index fb3af36e..a16db25e 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -44,7 +44,7 @@ app-shells/termcolors-mv 4.8: 256colors sample script and dircolors configuratio
 app-shells/zsh-autosuggestions 0.6.4 99999999: Fish-like autosuggestions for zsh
 app-shells/zsh-syntax-highlighting 0.8.0_alpha1 99999999: Fish shell like syntax highlighting for zsh
 app-shells/zshrc-mv 6.6: A zshrc file initializing zsh specific interactive features
-app-text/ispell 3.3.02-r1 3.4.00: fast screen-oriented spelling checker
+app-text/ispell 3.4.00-r1: fast screen-oriented spelling checker
 app-text/lesspipe 1.85 99999999: Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon
 app-text/mbtpdfasm 1.0.28-r1: Tool to assemble/merge, extract information from, and update the metadata in PDF
 app-text/psjoin 0.3: concatenate postscript files. From new PostScript Utilities
@@ -66,20 +66,20 @@ games-board/chessproblem 1.10 2.13: Find solutions of chess problems (mate, self
 games-emulation/sdlmame 0.174-r2: Multiple Arcade Machine Emulator + Multi Emulator Super System (MESS)
 games-emulation/xmame 0.106-r4: Multiple Arcade Machine Emulator for X11
 games-emulation/xmess 0.106-r3: Multiple Arcade Machine Emulator for X11
-games-engines/freesci 0.6.4-r1: Sierra script interpreter for your old Sierra adventures
+games-engines/freesci 0.6.4-r2: Sierra script interpreter for your old Sierra adventures
 games-rpg/aklabeth 1.0-r1: A remake of Richard C. Garriott's Ultima prequel
 games-rpg/dsa-stats 1.1: calculate stat probabalities for the role playing game DSA - Das schwarze Auge
 games-rpg/freedroidrpg 1.0_rc2: A modification of the classical Freedroid engine into an RPG
 games-rpg/m5figur-mv 4.2.2: LaTeX2e character sheet layout for the Midgard Role Playing Game (Edition M5)
-media-gfx/ipe 7.2.23: Drawing editor for creating figures in PDF or PS formats
-media-gfx/libspiro 20200505: A spline computation library
+media-gfx/ipe 7.2.24: Drawing editor for creating figures in PDF or PS formats
+media-gfx/libspiro 20200505-r1: A spline computation library
 media-gfx/pqiv 2.11: powerful GTK based command-line image viewer with a minimal UI
-media-libs/avidemux-core 2.7.4-r1: Core libraries for simple video cutting, filtering and encoding tasks
-media-libs/avidemux-plugins 2.7.4-r1: Plugins for the video editor media-video/avidemux
+media-libs/avidemux-core 2.7.8: Core libraries for simple video cutting, filtering and encoding tasks
+media-libs/avidemux-plugins 2.7.8: Plugins for the video editor media-video/avidemux
 media-tv/nvtv 0.4.7-r3: TV-Out for NVidia cards
 media-tv/sundtek-tv 210407.172308: Sundtek MediaTV Pro III Drivers
 media-tv/w_scan 20170107-r1: Scan for DVB-C/DVB-T/DVB-S channels without prior knowledge of frequencies
-media-video/avidemux 2.7.4-r1: Video editor designed for simple cutting, filtering and encoding tasks
+media-video/avidemux 2.7.8: Video editor designed for simple cutting, filtering and encoding tasks
 media-video/avinfo 1.0_alpha15_p1-r1: Utility for displaying AVI information
 media-video/video-mv 17.1: Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder
 net-dialup/accounting 1.60.45.3.1-r1: Give statistics about dialup connections. Originally part of SuSE's smpppd
@@ -109,7 +109,7 @@ sys-fs/squash_dir 13.14-r1: Keep directories compressed with squashfs. Useful fo
 sys-fs/squashfs-tools 4.5_alpha20210318 99999999: Tool for creating compressed filesystem type squashfs
 sys-fs/squashfuse 0.1.104_alpha20180721 0.1.104: FUSE filesystem to mount squashfs archives
 sys-fs/squashmount 22.0.1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
-sys-kernel/kccmp 0.3-r1: A simple tool for comparing two linux kernel .config files
+sys-kernel/kccmp 0.3-r2: A simple tool for comparing two linux kernel .config files
 sys-kernel/kconfig-hardened-check 0.5.9 99999999: A script for checking the hardening options in the Linux kernel config
 sys-kernel/kernel 6.2: A POSIX shell script to compile the kernel with user permissions
 sys-power/cpupower 99999999: Shows and sets processor power related values
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index fc00f24f..ab241b56 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -71,6 +71,7 @@ app-shells/schily-tools:suid - Install rscsi as SUID root
 app-shells/termcolors-mv:create - Install DIR_COLORS-create perl script
 app-shells/termcolors-mv:perl - Install 256colors perl script
 app-shells/termcolors-mv:poor - Install poor man's variant which does not require coreutils-8.25 or newer
+app-text/ispell:tinfo - Whether to support (and require) sys-libs/ncurses[tinfo].
 app-text/lesspipe:antiword - Support doc files with app-text/antiword; this overrides catdoc
 app-text/lesspipe:brotli - Support brotli files; requires app-arch/brotli
 app-text/lesspipe:cabextract - Support cabextract files
diff --git a/sys-kernel/kccmp/kccmp-0.3-r1.ebuild b/sys-kernel/kccmp/kccmp-0.3-r2.ebuild
index e9cedfa7..9876c40b 100644
--- a/sys-kernel/kccmp/kccmp-0.3-r1.ebuild
+++ b/sys-kernel/kccmp/kccmp-0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,8 +24,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local project_file=$(qmake-utils_find_pro_file)
-	eqmake5 "${project_file}"
+	eqmake5 "${S}"/kccmp.pro
 }
 
 src_install() {