diff --git a/Manifest.files.gz b/Manifest.files.gz
index e707e625caac..8f93f9863441 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1051369a35a6..551f009fbe63 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index d6046052c242..189cdd49ff3e 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1 +1,3 @@
 DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
+DIST rocm-tracer-4.2.0.tar.gz 476974 BLAKE2B 3a7be9c269fec5dcca98d7de514d97a2e1de7bbfaa54a1aca2df70453d05326564c8ee7bf793c7d176069ecd3f7f91409c6a20dd0773aa157f7abc1dac41448e SHA512 002d9fccee4761af4853e589b116bc5844b98abb84517c260aedcb5f31f5c92b862a233062ec280a6f878343c4f751d55f47fd38483e1882feb8c970f9836120
+DIST rocprofiler-4.2.0.tar.gz 1408433 BLAKE2B b35a7710d680167bad78ff74be153ea994ea919d572c5091ecec73d614bebb7ec14a14d81a0cabbe514b8439ddd7225f1a3a3fa7a0b653c33f938568bbe0c593 SHA512 35d3e9648bc5ee60bbddc15c9675efba7de3b4b3b725b9623e71a83007b8f23a323cc1da82e67f0ff425e5f827d6c632435bf465be8cba8c775405ead3f0f3be
diff --git a/dev-util/roctracer/roctracer-4.2.0.ebuild b/dev-util/roctracer/roctracer-4.2.0.ebuild
new file mode 100644
index 000000000000..2a61dee24cb5
--- /dev/null
+++ b/dev-util/roctracer/roctracer-4.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cmake prefix python-any-r1
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
+SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz
+		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocr-runtime:${SLOT}
+	dev-util/hip:${SLOT}"
+DEPEND="dev-python/CppHeaderParser
+	dev-python/ply
+	${RDEPEND}"
+
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+src_prepare() {
+	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
+
+	# do not build the tool and it´s library;
+	# change destination for headers to include/roctracer;
+	# do not install a second set of header files;
+
+	sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
+		-e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
+		-e "/install ( FILES \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir)/roctracer,g" \
+		-i CMakeLists.txt || die
+
+	# do not download additional sources via git
+	sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
+		-e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-i test/CMakeLists.txt || die
+
+	hprefixify script/*.py
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	export HIP_PATH="${EPREFIX}/usr/lib/hip"
+
+	local mycmakeargs=(
+		-DHIP_VDI=1
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa:${EPREFIX}/usr/lib"
+	)
+
+	cmake_src_configure
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 536485684efb..04fa15be304a 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f2c7fdde3779..e0039071ba92 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Aug 2021 08:08:54 +0000
+Fri, 13 Aug 2021 09:08:57 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f2c7fdde3779..27105e5714b0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Aug 2021 08:08:54 +0000
+Fri, 13 Aug 2021 09:08:58 +0000
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 290a71646fdc..a39bbb8329c6 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -29,6 +29,11 @@ manifest-required-hashes = BLAKE2B
 eapis-banned = 0 1 2 3 4
 eapis-deprecated = 5 6
 
+# EAPIs 0 to 4 are banned for profiles
+# EAPIs 6 and 7 do not include any profile related changes
+profile-eapis-banned = 0 1 2 3 4 6 7
+profile-eapis-deprecated =
+
 # Bug #337853 - gentoo's council says to enable
 # --echangelog by default for the "gentoo" repo
 # INFRA NOTE 2015/08/08: No more old ChangeLogs in Git
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index dacd3d59ef74..85f6b8b40c3e 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 02f96816d458..6de648778e56 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/roctracer-4.2.0 b/metadata/md5-cache/dev-util/roctracer-4.2.0
new file mode 100644
index 000000000000..c0338f52a9e2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/roctracer-4.2.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/CppHeaderParser dev-python/ply dev-libs/rocr-runtime:0/4.2 dev-util/hip:0/4.2
+DESCRIPTION=Callback/Activity Library for Performance tracing AMD GPU's
+EAPI=7
+HOMEPAGE=https://github.com/ROCm-Developer-Tools/roctracer.git
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocr-runtime:0/4.2 dev-util/hip:0/4.2
+SLOT=0/4.2
+SRC_URI=https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-4.2.0.tar.gz -> rocm-tracer-4.2.0.tar.gz https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-4.2.0.tar.gz -> rocprofiler-4.2.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	6551f7b3f1289e7f2956f3a1632e9d26	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2a5c40fa6890ac1ef6bf3eaf191fce32
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3f993094df74..e5ae8e72aa77 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.20.6 b/metadata/md5-cache/net-misc/teamviewer-15.20.6
new file mode 100644
index 000000000000..7c3830569dd3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/teamviewer-15.20.6
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils[extra-filters] virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
+EAPI=7
+HOMEPAGE=https://www.teamviewer.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=TeamViewer MIT
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/fontconfig media-libs/freetype media-libs/libglvnd[X] sys-apps/dbus sys-apps/util-linux sys-libs/zlib:0/1[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.20.6_amd64.tar.xz ) arm? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.20.6_armhf.tar.xz ) arm64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.20.6_arm64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.20.6_i386.tar.xz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=51b0f60d0137d9b7557924abfb575189
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7e5ed6b307b9..4ed61bc76864 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/bmake-20210803 b/metadata/md5-cache/sys-devel/bmake-20210808
similarity index 81%
rename from metadata/md5-cache/sys-devel/bmake-20210803
rename to metadata/md5-cache/sys-devel/bmake-20210808
index a4e01c59b54d..7b1665722e4b 100644
--- a/metadata/md5-cache/sys-devel/bmake-20210803
+++ b/metadata/md5-cache/sys-devel/bmake-20210808
@@ -5,5 +5,5 @@ HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20210803.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
+SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20210808.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
 _md5_=0df4be9d4232c44b8d91e6e38dbba3d2
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f2c7fdde3779..27105e5714b0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Aug 2021 08:08:54 +0000
+Fri, 13 Aug 2021 09:08:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 74469cb98f30..883aa309c045 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Aug 13 08:08:54 AM UTC 2021
+Fri Aug 13 09:08:57 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 19ab31b48693..27ad912e4525 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Aug 2021 08:30:01 +0000
+Fri, 13 Aug 2021 09:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 612a4bfd7bd6..74d8665cf117 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8e92e65d78e2dd7811f9f096c4a3ca1f4b861528 1628841211 2021-08-13T07:53:31+00:00
+6f3cadf8ff023df747c4ac4de3795e9ff54792f0 1628845356 2021-08-13T09:02:36+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 328eb05cb3fa..a506200e6c09 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1628841901 Fri 13 Aug 2021 08:05:01 AM UTC
+1628845501 Fri 13 Aug 2021 09:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f2c7fdde3779..e0039071ba92 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Aug 2021 08:08:54 +0000
+Fri, 13 Aug 2021 09:08:57 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 265c1ed157d6..89f5b4d79aef 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 7384153aa52b..66024168f0c6 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,2 +1,6 @@
 DIST teamviewer_15.19.3_amd64.tar.xz 59343000 BLAKE2B 8f5e39d87d8badfda16f6fbb0cdc9b5c6e4a26e38a62612dd2bb12ba1c997f4210308dc6746795f771b486be6467ab0044d6c0a6e3d301bf3ce1f1dd8025c01e SHA512 88cbc0c7c5bef0813b4d8cd99e12e5fc6bcfc44ca43302439182d3eb4e01e85b03a2edc1135613b9b878ad61a0dff5df8efcd8b276b6f2b7ab255d72d754e396
 DIST teamviewer_15.19.3_i386.tar.xz 62513708 BLAKE2B 959286f2e265204f703c9e6efcb8ca0fecc039763da22506330fabe3e449e076d21922d443670f02429cf07d74869431f2fe521e88822b266ce4ef78800114fe SHA512 9bdad9c2c2aba500ad29a6eb84ad104cd4d621f63be47e6a7755c3907e25c0c19404afa2489c83779977d54ff93568433affa4267d715ae142ba946efe7ae5dd
+DIST teamviewer_15.20.6_amd64.tar.xz 59943100 BLAKE2B 8d7c92056b72df1eb027c3ecbb136f6f6eeb7202a03eabfa98f31984bb40d9781352c2e3d89f3d6c67caeb6d256bd6fe526b56cabff6b5b83a22fae1e972eef3 SHA512 53cd255f6ffc88c6e4fb4a3e540971df2e9c3314638cd18b9823dd58841b2e0a4fb4774030871cc8362d9669dc5f6bec6a0936ddfa6f6aa4f6802ca5a37170a2
+DIST teamviewer_15.20.6_arm64.tar.xz 60154904 BLAKE2B 4b5079c90b7fb1d4468de0e726382b9faf1b7fdfd873b4000f6a43ec81eaea2f1ed40c642e736d2539318e4d4a67b9bc876868da7ca5c6f6ba9246b100a32b9a SHA512 b021b144b68a5cdb7f5186a6cff1d9bc41909272c9f9cb0d2fea81b820a1a0b669e5cf2a5576923575493dcde0b3b87917637dae5633c83754fc45651afc60fd
+DIST teamviewer_15.20.6_armhf.tar.xz 54563324 BLAKE2B b47fae120033f28472d1b3b1f69ed45a60e9c03c2032a263c274851e067809fd9527c02ab5f505fc417358c75fd93bdbfa94db1f9285d9b62678a1c265fa65a8 SHA512 a971ff53bdcaa045d8e69fd80e9e217f478e5d3488f6a41fe9c108bc7eb15f046c51510b482ea00515317181bc501ad22a8ca18507441040f0cde27f86936faa
+DIST teamviewer_15.20.6_i386.tar.xz 63206124 BLAKE2B f25fe894873d932786caf09a8ac64cb7d80ff850bb4290159868f3ef75b4bf8026fca4baf0cf9951c0ff69e05613a45c6c8b5ab33c8d3b05bd6a14d297fe9f8a SHA512 c41b0e9a5e1dec10ffcf493e135d6bc52dec501520e5cd35654538dd754f5eb409bd934375925da7b0b8f05004c6f38beefa8e44c95e776c5f99880fb430f648
diff --git a/net-misc/teamviewer/teamviewer-15.20.6.ebuild b/net-misc/teamviewer/teamviewer-15.20.6.ebuild
new file mode 100644
index 000000000000..156bef4ed7c7
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.20.6.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature systemd xdg
+
+MY_MAJOR="$(ver_cut 1)"
+MY_P="${PN}${MY_MAJOR}"
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+MY_URI="https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}"
+SRC_URI="amd64? ( ${MY_URI}_amd64.tar.xz )
+		arm? ( ${MY_URI}_armhf.tar.xz )
+		arm64? ( ${MY_URI}_arm64.tar.xz )
+		x86? ( ${MY_URI}_i386.tar.xz )"
+S="${WORKDIR}"/teamviewer
+
+LICENSE="TeamViewer MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+# Unpack will fail without app-arch/xz-utils[extra-filters], bug #798027
+BDEPEND="app-arch/xz-utils[extra-filters]"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libglvnd[X]
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib:0/1[minizip]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+"
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
+
+QA_PREBUILT="opt/${MY_P}/*"
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -i \
+		-e "/^ExecStart/s|${PN}|${MY_P}|" \
+		-e "/^PIDFile/s|/var/run/|/run/|" \
+		tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_P}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend || die
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	local exe
+	for exe in $(find tv_bin -type f -executable -or -name '*.so' || die); do
+		fperms +x ${dst}/${exe}
+	done
+
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	local size
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png teamviewer.png
+	done
+
+	dodoc -r doc
+
+	# Make docs available in expected location
+	dosym ../../usr/share/doc/${PF}/doc ${dst}/doc
+
+	# We need to keep docs uncompressed, bug #778617
+	docompress -x /usr/share/doc/${PF}/.
+
+	keepdir /etc/${MY_P}
+	dosym ../../etc/${MY_P} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_P}
+	dosym ../../var/log/${MY_P} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${MY_MAJOR}"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn
+	ewarn "Please note that the teamviewer gui works only when started from"
+	ewarn "a session initiated by a display manager." #799137
+	optfeature_header "Install one of the following display managers:"
+	optfeature "an example display manager" x11-misc/cdm gnome-base/gdm gui-apps/gtkgreet x11-misc/lightdm lxde-base/lxdm sys-apps/qingy x11-misc/sddm x11-misc/slim x11-misc/wdm x11-apps/xdm
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please note that parallel installation of multiple versions of"
+		elog "TeamViewer is currently not supported at runtime. Bug #621818"
+		elog
+		elog "Before using TeamViewer, you need to start its daemon:"
+		elog "OpenRC:"
+		elog "# /etc/init.d/teamviewerd start"
+		elog "# rc-update add teamviewerd default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start teamviewerd.service"
+		elog "# systemctl enable teamviewerd.service"
+		elog
+		elog "To display additional command line options simply run:"
+		elog "$ teamviewer help"
+		elog
+		elog "Most likely TeamViewer will work normally only on systems with systemd"
+		elog "or elogind. See this thread for additional info:"
+		elog "https://forums.gentoo.org/viewtopic-p-8332956.html#8332956"
+	fi
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 3f451844c357..424d7e094376 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 9c1bfa45011e..a8574e78376f 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,4 +1,4 @@
 DIST bmake-20210420.tar.gz 755281 BLAKE2B fe98dc5d0c5a11aecf45b160cfe5b69ef49e56a973823e84ec1f607023aa94d66cd87bc3f31fc340dc86eae0a6e87ca2a71b8367f3e9bb1a9eae8626d13a80ea SHA512 3bb603965c149e4f6bee4afff9710921e943bd1faaf5d142418a5f7a0752416e094b6a0f0dfc998bf6bedc391f668162856a51167e34b6f2ad2a0a498c96ed35
 DIST bmake-20210704.tar.gz 759047 BLAKE2B 4c21941c45c826e1758c64bc60532cff3b9a727cc18658b019ce55382aad8c668a5ef9039df695629f81a334969f1a5aaf08d5924aa20576474a528fe8dbcb15 SHA512 b21d89753b659a70d6f5d70aa41cc2b5f5ded5a5a4a227064c938db42282d7684df9389fa1db532c2e0de11d5be1e66698388f1e1e6966153ec56330af688674
-DIST bmake-20210803.tar.gz 764905 BLAKE2B 2a3d8378342c14ecd08e52f7ffea962641ed501b4a3157878ba57d12d38b2d14b303980db7c484d1ce7e882a2cc697338acf9ba16370cfbca176621af3348875 SHA512 3b93413fca2038f5a9dda5456b1b33aa8c9d21c98236628c9084f540b8caca5b57f47ffeb22c2768a8a928cfa1c0141853634c55219d33d282b8e24ca406b413
+DIST bmake-20210808.tar.gz 765029 BLAKE2B 27ff99395e7cdc00a118ebfb5b043180ffbd9d5385b008c49baae8bf953e45e277aeb133d736bd282c1ffc08bd7c3b87b4dc23d0b188a86469116e1d94ed2409 SHA512 d0afb9b6a50858c330cccf57a8f8b35ddf1ea1faefc2110237e30262b35eb69c1a4918e48acc2ed3deed8b11bf87b80429d71c46366c81ceb7427a79a3e58089
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
diff --git a/sys-devel/bmake/bmake-20210803.ebuild b/sys-devel/bmake/bmake-20210808.ebuild
similarity index 100%
rename from sys-devel/bmake/bmake-20210803.ebuild
rename to sys-devel/bmake/bmake-20210808.ebuild