Merge branch 'edge' into next

29 files changed, 493 insertions, 310 deletions

diff --git a/app-admin/calamares/calamares-3.1.12-r3.ebuild b/app-admin/calamares/calamares-3.1.12-r4.ebuild
index 025076b6..32b3f6ff 100644
--- a/app-admin/calamares/calamares-3.1.12-r3.ebuild
+++ b/app-admin/calamares/calamares-3.1.12-r4.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7,8} )
 
 inherit eutils cmake-utils python-r1
 
diff --git a/app-misc/calamares-runtime/calamares-runtime-314.ebuild b/app-misc/calamares-runtime/calamares-runtime-314-r1.ebuild
index 4b08344f..e6fb6420 100644
--- a/app-misc/calamares-runtime/calamares-runtime-314.ebuild
+++ b/app-misc/calamares-runtime/calamares-runtime-314-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7,8} )
 
 inherit eutils python-r1
 
diff --git a/app-portage/sisyphus/sisyphus-3.1910.1-r2.ebuild b/app-portage/sisyphus/sisyphus-3.1910.1-r3.ebuild
index e8c9bcbc..31ba3828 100644
--- a/app-portage/sisyphus/sisyphus-3.1910.1-r2.ebuild
+++ b/app-portage/sisyphus/sisyphus-3.1910.1-r3.ebuild
@@ -59,4 +59,9 @@ src_install() {
 		rm -rf ${ED}usr/share/pixmaps
 		rm -rf ${ED}usr/share/polkit-1
 	fi
+
+	# enforce best available python implementation
+	python_setup
+	python_fix_shebang "${ED}usr/share/${PN}/${PN}-cli.py"
+	python_fix_shebang "${ED}usr/share/${PN}/${PN}-gui.py"
 }
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild
index 451b66f7..2f086a09 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r10.ebuild
@@ -12,11 +12,16 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# Does nothing now but by keeping it here we avoid having to have virtual/opencl
+# handle ebuilds both with and without this flag.
 IUSE="+khronos-headers"
 
 BDEPEND="dev-lang/ruby:2.5
 	virtual/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
+DEPEND="dev-util/opencl-headers"
+RDEPEND="${DEPEND}
+	!app-eselect/eselect-opencl
+	!dev-libs/opencl-icd-loader"
 
 PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
 
@@ -28,7 +33,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --enable-pthread-once
+	# dev-util/opencl-headers ARE official Khronos Group headers, what this option
+	# does is disable the use of the bundled ones
+	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
 }
 
 multilib_src_install() {
@@ -36,19 +43,4 @@ multilib_src_install() {
 
 	# Drop .la files
 	find "${ED}" -name '*.la' -delete || die
-
-	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
-	dodir ${OCL_DIR}/{,include}
-
-	# Install vendor library
-	mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
-
-	# Install vendor headers
-	if use khronos-headers; then
-		cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers"
-	fi
-}
-
-pkg_postinst() {
-	eselect opencl set --use-old ${PN}
 }
diff --git a/dev-python/animation/animation-0.0.5.ebuild b/dev-python/animation/animation-0.0.5-r1.ebuild
index a640a257..fff2882e 100644
--- a/dev-python/animation/animation-0.0.5.ebuild
+++ b/dev-python/animation/animation-0.0.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/meteo-qt/meteo-qt-0.9.9.ebuild b/dev-python/meteo-qt/meteo-qt-0.9.9-r1.ebuild
index 0123b6d0..096f6b44 100644
--- a/dev-python/meteo-qt/meteo-qt-0.9.9.ebuild
+++ b/dev-python/meteo-qt/meteo-qt-0.9.9-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sh/sh-1.12.14-r2.ebuild b/dev-python/sh/sh-1.12.14-r3.ebuild
index 88f0ef95..3ccb613c 100644
--- a/dev-python/sh/sh-1.12.14-r2.ebuild
+++ b/dev-python/sh/sh-1.12.14-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wget/wget-2.2.ebuild b/dev-python/wget/wget-2.2-r1.ebuild
index 71c994f3..7590d4fd 100644
--- a/dev-python/wget/wget-2.2.ebuild
+++ b/dev-python/wget/wget-2.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1 git-r3
 
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
deleted file mode 100644
index fe1e837c..00000000
--- a/games-util/lutris/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lutris_0.5.4.tar.xz 1843880 BLAKE2B f286d62df3bf5a5eadd634d2d177a5b69b5fa5d897e70f58a19be4148609e56ba33c29ce4218ae833dbdf9dded1e9be869f9ed4d84ba2b435a09981219d74438 SHA512 81669f2021063229bad78ebc49b54075058266716279695c53c43a5a06a8c1d4e5a9dcbcb20a1becfe0d243aa6e812f5a30b4d90f418d4cffcff18daefb09c50
diff --git a/games-util/lutris/files/df3a041458d3f128f2b23837b52edbbafeec0bd2.diff b/games-util/lutris/files/df3a041458d3f128f2b23837b52edbbafeec0bd2.diff
deleted file mode 100644
index 019010fe..00000000
--- a/games-util/lutris/files/df3a041458d3f128f2b23837b52edbbafeec0bd2.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/lutris/runners/wine.py b/lutris/runners/wine.py
-index 97126726a..f792451f2 100644
---- a/lutris/runners/wine.py
-+++ b/lutris/runners/wine.py
-@@ -743,6 +743,7 @@ def toggle_dxvk(self, enable, version=None, dxvk_manager: dxvk.DXVKManager = Non
-         if version.lower() != "manual":
-             if enable:
-                 if not dxvk_manager.is_available():
-+                    logger.info("DXVK %s is not available yet, downloading...")
-                     dxvk_manager.download()
-                 dxvk_manager.enable()
-             else:
-diff --git a/lutris/util/downloader.py b/lutris/util/downloader.py
-index da8038cfd..8b96af80f 100644
---- a/lutris/util/downloader.py
-+++ b/lutris/util/downloader.py
-@@ -113,6 +113,9 @@ def async_download(self, stop_request=None):
-         if self.referer:
-             headers["Referer"] = self.referer
-         response = requests.get(self.url, headers=headers, stream=True)
-+        if response.status_code != 200:
-+            logger.info("%s returned a %s error" % (self.url, response.status_code))
-+        response.raise_for_status()
-         self.full_size = int(response.headers.get("Content-Length", "").strip() or 0)
-         for chunk in response.iter_content(chunk_size=1024 * 1024):
-             if not self.file_pointer:
-diff --git a/lutris/util/extract.py b/lutris/util/extract.py
-index 4e05d9bdf..3bd78e5f3 100644
---- a/lutris/util/extract.py
-+++ b/lutris/util/extract.py
-@@ -113,7 +113,7 @@ def extract_archive(path, to_directory=".", merge_single=True, extractor=None):
-     try:
-         _do_extract(path, temp_path, opener, mode, extractor)
-     except (OSError, zlib.error, tarfile.ReadError, EOFError) as ex:
--        logger.exception("Extraction failed: %s", ex)
-+        logger.error("Extraction failed: %s", ex)
-         raise ExtractFailure(str(ex))
-     if merge_single:
-         extracted = os.listdir(temp_path)
diff --git a/games-util/lutris/lutris-0.5.4-r10.ebuild b/games-util/lutris/lutris-0.5.4-r10.ebuild
deleted file mode 100644
index 9bae46bd..00000000
--- a/games-util/lutris/lutris-0.5.4-r10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,threads(+)"
-
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="An open source gaming platform for GNU/Linux"
-HOMEPAGE="https://lutris.net/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/lutris/lutris.git"
-	inherit git-r3
-else
-	SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unrar
-	app-arch/unzip
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-evdev[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	gnome-base/gnome-desktop:3[introspection]
-	media-sound/fluid-soundfont
-	net-libs/libsoup
-	net-libs/webkit-gtk:4[introspection]
-	x11-apps/mesa-progs
-	x11-apps/xgamma
-	x11-apps/xrandr
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify
-"
-
-PATCHES=( "${FILESDIR}/df3a041458d3f128f2b23837b52edbbafeec0bd2.diff" )
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst docs/installers.rst )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	virtx nosetests -v
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Quote README.rst
-	elog "Lutris installations are fully automated through scripts, which can"
-	elog "be written in either JSON or YAML. The scripting syntax is described"
-	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
-	elog "available online at lutris.net."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
new file mode 100644
index 00000000..2a585f30
--- /dev/null
+++ b/media-gfx/blender/Manifest
@@ -0,0 +1 @@
+DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
diff --git a/media-gfx/blender/blender-2.79b-r3.ebuild b/media-gfx/blender/blender-2.79b-r3.ebuild
new file mode 100644
index 00000000..e1c36a3b
--- /dev/null
+++ b/media-gfx/blender/blender-2.79b-r3.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit check-reqs cmake-utils xdg-utils flag-o-matic xdg-utils \
+	pax-utils python-single-r1 toolchain-funcs eapi7-ver
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+SRC_URI="https://download.blender.org/source/${P}.tar.gz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="amd64 ~x86"
+IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \
+	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
+	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
+	osl player sdl sndfile test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	opencl? ( cycles )
+	osl? ( cycles llvm )
+	player? ( game-engine !headless )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/boost-1.62:=[nls?,threads(+)]
+	dev-libs/lzo:2
+	$(python_gen_cond_dep '
+		>=dev-python/numpy-1.10.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/freetype
+	media-libs/glew:*
+	media-libs/libpng:0=
+	media-libs/libsamplerate
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0=
+	virtual/libintl
+	virtual/opengl
+	collada? ( >=media-libs/opencollada-1.6.18:= )
+	color-management? ( media-libs/opencolorio )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( >=media-libs/openimageio-1.7.0 )
+	openexr? (
+		>=media-libs/ilmbase-2.2.0:=
+		>=media-libs/openexr-2.2.0:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
+	openvdb? (
+		media-gfx/openvdb[${PYTHON_SINGLE_USEDEP},-abi3-compat(-),abi4-compat(+)]
+		dev-cpp/tbb
+		>=dev-libs/c-blosc-1.5.2
+	)
+	osl? ( media-libs/osl:= )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0 )
+	valgrind? ( dev-util/valgrind )"
+
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-3.2.8:3
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-install-rules.patch"
+	"${FILESDIR}/${P}-gcc-8.patch"
+	"${FILESDIR}/${P}-ffmpeg-4-compat.patch"
+	"${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch"
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+	    -i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+	# Blender is compatible ABI 4 or less, so use ABI 4.
+	append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=4
+
+	local mycmakeargs=(
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_PYTHON_INSTALL_NUMPY=OFF
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_OPENJPEG=ON
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_C11=ON
+		-DWITH_CXX11=ON
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CUDA=$(usex cuda)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GAMEENGINE=$(usex game-engine)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_X11=$(usex !headless)
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PLAYER=$(usex player)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake-utils_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED%/}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherit risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch b/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch
new file mode 100644
index 00000000..4ad05aaf
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch
@@ -0,0 +1,62 @@
+diff -urN a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
+--- a/intern/ffmpeg/ffmpeg_compat.h	2018-03-23 15:22:25.000000000 +0000
++++ b/intern/ffmpeg/ffmpeg_compat.h	2018-08-16 14:39:23.484489828 +0100
+@@ -109,6 +109,45 @@
+ 
+ #endif
+ 
++/* XXX TODO Probably fix to correct modern flags in code? Not sure how old FFMPEG we want to support though,
++ * so for now this will do. */
++
++#ifndef FF_MIN_BUFFER_SIZE
++#  ifdef AV_INPUT_BUFFER_MIN_SIZE
++#    define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
++#  endif
++#endif
++
++#ifndef FF_INPUT_BUFFER_PADDING_SIZE
++#  ifdef AV_INPUT_BUFFER_PADDING_SIZE
++#    define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
++#  endif
++#endif
++
++#ifndef CODEC_FLAG_GLOBAL_HEADER
++#  ifdef AV_CODEC_FLAG_GLOBAL_HEADER
++#    define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
++#  endif
++#endif
++
++#ifndef CODEC_FLAG_GLOBAL_HEADER
++#  ifdef AV_CODEC_FLAG_GLOBAL_HEADER
++#    define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
++#  endif
++#endif
++
++#ifndef CODEC_FLAG_INTERLACED_DCT
++#  ifdef AV_CODEC_FLAG_INTERLACED_DCT
++#    define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT
++#  endif
++#endif
++
++#ifndef CODEC_FLAG_INTERLACED_ME
++#  ifdef AV_CODEC_FLAG_INTERLACED_ME
++#    define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME
++#  endif
++#endif
++
+ /* FFmpeg upstream 1.0 is the first who added AV_ prefix. */
+ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100)
+ #  define AV_CODEC_ID_NONE CODEC_ID_NONE
+diff -urN a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
+--- a/source/blender/blenkernel/intern/writeffmpeg.c	2018-03-23 15:22:25.000000000 +0000
++++ b/source/blender/blenkernel/intern/writeffmpeg.c	2018-08-16 14:39:21.702484751 +0100
+@@ -605,7 +605,8 @@
+ 	c->rc_buffer_aggressivity = 1.0;
+ #endif
+ 
+-	c->me_method = ME_EPZS;
++	/* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */
++	//c->me_method = ME_EPZS;
+ 	
+ 	codec = avcodec_find_encoder(c->codec_id);
+ 	if (!codec)
diff --git a/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch
new file mode 100644
index 00000000..0ecc960d
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch
@@ -0,0 +1,31 @@
+diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp
+index 68f7c04..514087b 100644
+--- a/intern/elbeem/intern/solver_main.cpp
++++ b/intern/elbeem/intern/solver_main.cpp
+@@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev)
+ 	GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
+@@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids()
+ 		GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
+@@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit()
+ 	GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
diff --git a/media-gfx/blender/files/blender-2.79b-gcc-8.patch b/media-gfx/blender/files/blender-2.79b-gcc-8.patch
new file mode 100644
index 00000000..3a64ad2f
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.79b-gcc-8.patch
@@ -0,0 +1,22 @@
+--- blender-2.79b-orig/intern/cycles/util/util_sseb.h	2018-03-24 02:22:25.000000000 +1100
++++ blender-2.79b/intern/cycles/util/util_sseb.h	2018-05-30 20:43:33.888717930 +1000
+@@ -116,7 +116,7 @@
+ __forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
+ 
+ template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
+-	return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0));
++	return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)));
+ }
+ 
+ template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {
+--- blender-2.79b-orig/intern/itasc/kdl/tree.hpp	2018-03-24 02:22:25.000000000 +1100
++++ blender-2.79b/intern/itasc/kdl/tree.hpp	2018-05-30 20:33:52.045179988 +1000
+@@ -34,7 +34,7 @@
+     //Forward declaration
+     class TreeElement;
+     // Eigen allocator is needed for alignment of Eigen data types
+-    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
++    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
+ 
+     class TreeElement
+     {
diff --git a/media-gfx/blender/files/blender-fix-install-rules.patch b/media-gfx/blender/files/blender-fix-install-rules.patch
new file mode 100644
index 00000000..e62aba81
--- /dev/null
+++ b/media-gfx/blender/files/blender-fix-install-rules.patch
@@ -0,0 +1,16 @@
+diff -purN a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+--- a/source/creator/CMakeLists.txt	2016-09-28 10:26:55.000000000 +0100
++++ b/source/creator/CMakeLists.txt	2016-10-03 12:17:08.938928486 +0100
+@@ -328,12 +328,6 @@ endif()
+ # Install Targets (Generic, All Platforms)
+ 
+ 
+-# important to make a clean  install each time, else old scripts get loaded.
+-install(
+-	CODE
+-	"file(REMOVE_RECURSE ${TARGETDIR_VER})"
+-)
+-
+ if(WITH_PYTHON)
+ 	# install(CODE "message(\"copying blender scripts...\")")
+ 	
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
deleted file mode 100644
index 9a3f1c2f..00000000
--- a/media-video/simplescreenrecorder/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
deleted file mode 100644
index bfbb3e23..00000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic xdg-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-	S="${WORKDIR}/${PKGNAME}-${PV}"
-fi
-
-SLOT="0"
-IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP}]
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-
-	# QT requires -fPIC. Compile fails otherwise.
-	# Recently removed from the default compile options upstream
-	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
-	append-flags -fPIC
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
-		-DENABLE_X86_ASM="$(usex asm)"
-		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
-		-DWITH_JACK="$(multilib_native_usex jack)"
-		-DWITH_GLINJECT="true"
-	)
-
-	# libav doesn't have AVFrame::channels
-	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
-	if has_version media-video/libav ; then
-		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
-	fi
-
-	if multilib_is_native_abi ; then
-		mycmakeargs+=( -DWITH_QT5="true" )
-	else
-		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest
index 60205c50..c00289ae 100644
--- a/media-video/vidcutter/Manifest
+++ b/media-video/vidcutter/Manifest
@@ -1 +1 @@
-DIST vidcutter-3.0.1.tar.gz 1299320 BLAKE2B 19ca27dc7cf78a1b7f866c6d5f9e7bec009b2def34a7698e39baf2920622dc62dae6a24e80545a3c3f791149ec347ae1a9217b2f20468513eadd36536178746d SHA512 6e202287186c4c5d2245f23a18caa3e4e2db2e13d3b327c3eee309eabdd1a2ba0b02ad7227764f8d3b1818ea989790e0ae05308224fcd9c14bc75f369684d1a3
+DIST vidcutter-6.0.0.tar.gz 9877867 BLAKE2B 91f153222f37d452ed8af5c4f24e32790189f058b5cbb3c80f7805ed48b5e953bfeeb8be92f04e049384dc30f416d0ee603237b8a59a329b0bc0cd61bf0fdbe2 SHA512 9970d9918cca9a7681bc5ca8d8b5d16212cf3dad0f2bc3e9c6727340c340801696dcb7ff4e901c2c0a25b86e9cb165bb3f783c18b4a8fd5f4ddba8490a7fd7a0
diff --git a/media-video/vidcutter/vidcutter-3.0.1.ebuild b/media-video/vidcutter/vidcutter-6.0.0.ebuild
index 10664545..f2e2fbfa 100644
--- a/media-video/vidcutter/vidcutter-3.0.1.ebuild
+++ b/media-video/vidcutter/vidcutter-6.0.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1169d39e..e3407253 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1 @@
-DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
+DIST webkitgtk-2.28.1.tar.xz 21427628 BLAKE2B 58f19d68598ed1aee58f9f700c84e76c9c58980e39d7fe1883c3be991f575074db3156b9a7a041bb3d59130d87d37b1bdee9cf6c122c4f0b0ba6637d66534c32 SHA512 30cfe63d202673d1f0b0ab32e062eab225e51b993d9bb0f51c02d0497423e1591b5a2e943c30d1c9ee6d9073dfbd13b8ec24bca94f380fe8886019e8185628b8
diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
deleted file mode 100644
index 0f095990..00000000
--- a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Add missing headers required during non-unified build.
-
-Unified build happens to get them included by the other sources unified
-into same source file, thus didn't fail.
-
-diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
---- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-@@ -30,6 +30,7 @@
- 
- #include "BuiltinNames.h"
- #include "BytecodeGenerator.h"
-+#include "BytecodeStructs.h"
- #include "CallFrame.h"
- #include "JIT.h"
- #include "JSCInlines.h"
-diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
---- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -23,6 +23,7 @@
- #include "MachineStackMarker.h"
- 
- #include "ConservativeRoots.h"
-+#include "CPU.h"
- #include "MachineContext.h"
- #include <setjmp.h>
- #include <stdlib.h>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.1-r10.ebuild
index 8dfc04f6..7830a6a5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r10.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.1-r10.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
 PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 CMAKE_MIN_VERSION=3.10
 
 inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs virtualx
@@ -15,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
@@ -86,6 +87,8 @@ RDEPEND="
 	gles2-only? ( media-libs/mesa[gles2] )
 	opengl? ( virtual/opengl )
 	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
 		opengl? ( ${wpe_depend} )
 		gles2-only? ( ${wpe_depend} )
 	)
@@ -144,7 +147,7 @@ pkg_pretend() {
 
 	if ! use opengl && ! use gles2-only; then
 		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
 		ewarn "This is an unsupported configuration meant for very specific embedded"
 		ewarn "use cases, where there truly is no GL possible (and even that use case"
 		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
@@ -163,7 +166,6 @@ pkg_setup() {
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
 	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
 	cmake-utils_src_prepare
 	gnome2_src_prepare
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r10.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r10.ebuild
index 47a94917..f753e04d 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r10.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit eapi7-ver perl-module python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
@@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python]
+	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
 	~sys-apps/apparmor-${PV}
 	dev-perl/Locale-gettext
 	dev-perl/RPC-XML
@@ -70,8 +70,9 @@ src_install() {
 		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
 
 	install_python() {
+		local -x PYTHONDONTWRITEBYTECODE=
 		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --version="${PV}"
+			--root="${D}" --optimize 2
 	}
 
 	python_foreach_impl install_python
diff --git a/sys-block/partitionmanager/partitionmanager-3.2.1-r1.ebuild b/sys-block/partitionmanager/partitionmanager-3.2.1-r10.ebuild
index b97057e8..2cf61470 100644
--- a/sys-block/partitionmanager/partitionmanager-3.2.1-r1.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-3.2.1-r10.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+inherit ecm kde.org
 
 DESCRIPTION="KDE utility for management of partitions and file systems"
 HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
@@ -12,25 +12,26 @@ HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
 
 LICENSE="GPL-3"
 KEYWORDS="amd64 ~arm x86"
+SLOT="5"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	kde-frameworks/kconfig
+	kde-frameworks/kconfigwidgets
+	kde-frameworks/kcoreaddons
+	kde-frameworks/kcrash
+	kde-frameworks/ki18n
+	kde-frameworks/kiconthemes
+	kde-frameworks/kio
+	kde-frameworks/kjobwidgets
+	kde-frameworks/kservice
+	kde-frameworks/kwidgetsaddons
+	kde-frameworks/kxmlgui
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	sys-apps/util-linux
 	>=sys-libs/kpmcore-3.2.0:5=
 "
 RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools kdesu)
+	kde-plasma/kde-cli-tools[kdesu]
 "
diff --git a/sys-libs/kpmcore/kpmcore-3.2.1-r1.ebuild b/sys-libs/kpmcore/kpmcore-3.2.1-r10.ebuild
index b6200e7b..a4fb03c9 100644
--- a/sys-libs/kpmcore/kpmcore-3.2.1-r1.ebuild
+++ b/sys-libs/kpmcore/kpmcore-3.2.1-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit kde5
+inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
@@ -17,13 +17,13 @@ SLOT="5/6"
 IUSE=""
 
 RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	kde-frameworks/kcoreaddons
+	kde-frameworks/ki18n
+	kde-frameworks/kservice
+	kde-frameworks/kwidgetsaddons
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	dev-libs/libatasmart
 	>=sys-apps/util-linux-2.30
 	>=sys-block/parted-3
diff --git a/x11-misc/compton-conf/compton-conf-0.14.1-r1.ebuild b/x11-misc/compton-conf/compton-conf-0.14.1-r2.ebuild
index 9d18e143..77fcbc8b 100644
--- a/x11-misc/compton-conf/compton-conf-0.14.1-r1.ebuild
+++ b/x11-misc/compton-conf/compton-conf-0.14.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit kde5
+inherit cmake-utils
 
 DESCRIPTION="GUI configuration tool for compton X composite manager"
 HOMEPAGE="https://github.com/lxde/compton-conf"
@@ -15,10 +15,10 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep linguist-tools)
-	$(add_qt_dep qtwidgets)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/linguist-tools:5
+	dev-qt/qtwidgets:5
 	>=lxqt-base/lxqt-build-tools-0.6.0"
 RDEPEND="${DEPEND}"
 
diff --git a/x11-misc/compton/compton-0.1_beta2-r2.ebuild b/x11-misc/compton/compton-0.1_beta2-r10.ebuild
index e0a9d4f9..3d14a03d 100644
--- a/x11-misc/compton/compton-0.1_beta2-r2.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 inherit toolchain-funcs python-r1
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"