gentoo resync : 20.06.2021

24 files changed, 103 insertions, 55 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 860eca8692e1..b9694c1ae352 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/hexter/Manifest b/media-plugins/hexter/Manifest
index 14f0d4517095..4cfbdde6211d 100644
--- a/media-plugins/hexter/Manifest
+++ b/media-plugins/hexter/Manifest
@@ -1,3 +1,5 @@
 DIST hexter-1.1.0.tar.bz2 737430 BLAKE2B 9c79da379a69bc4ceceab11dc725d965bb923384e060e24eb7e7d1f65650d5c77206a79d02403e7a952c2eb3c46262b5905e5b07872fb5b060525ed0f275cbc4 SHA512 8d433fae44b0620c3866c9a3b2445271a039c8ac3ad12c71ca34d667a85b95b9bddd7e04c4eaa2c27299c66b9cce16d104b5fbb376dd3cdc85f7e4d6c9b28529
-EBUILD hexter-1.1.0.ebuild 706 BLAKE2B 61c7d926f002bebdfd7c9d16c4dd2a7a1210e8fe300cfb99fe9935d7f2fb48ec6a4fba27cbfc9ff761caac4d367267412edbcede517d3555ba483cf886f3dadb SHA512 cbae1847a66a6f19b1556f0aaebf96f067c501a59d6465b8dd52a94af030192cc264d8e692439f95e60a5443aadfa7377beaa0665c36062885262c83072e046c
+DIST hexter-1.1.1.tar.bz2 738789 BLAKE2B c3feb3cbed77ba7b6c7dec9158af60cca0c02c2f3f65eb6a80f0f57593998e3ecf28599736e94e56e5d1daa72b2868a2831b4491eb73bee6302ed78fbe1712fb SHA512 db744ba7c9066f6b47b8e6e31c830fdb1760ee5e8df5a8f287878bc62891d1d1b10a568bc58b00fc732933c9ff1f816e1d88c836741c302bbb4353c96ac291cc
+EBUILD hexter-1.1.0.ebuild 740 BLAKE2B d1458a9cadfdc8fa34e0d74a26bd3a3799065e9458436e59da37aa90fd05a9746ebb65c4e2f96d4301127af9f0c0c8a019df52a1fec471216262fd21313b65e5 SHA512 60a08c3b0a57877868254c7ec59905c8d53e83edccaa88fb59b057a3c1d894c5a99ebcbe4a139ac6f8b317496518ceff411dce933a0d4e19fc647026789cbabc
+EBUILD hexter-1.1.1.ebuild 730 BLAKE2B 279becc2d7717196889a52673dc8c833edb793ffb2e8c5e630b5545d6138110b1798aa15a658d955750827f1f9be3b77433268acd226e06fdc338221fe859c3d SHA512 68004481666eab2300421f4d2b7454f5965e2441172025526e752bc41356678bd6762f16884f3e2c475ea555549f45e7219dc9e96798c5ca08b06c4c222db43d
 MISC metadata.xml 433 BLAKE2B 7bff94c87e78273a579ae464d3cc071ba60b9a7963937e1ca9b4883a7abc17690edfc2b6d3cb41079fa555c6658e6f73facd5f8d301f0d3dbd3d5a3473d8004f SHA512 3f451cf291b522db82eac8537947668088eeb8c21c13a99a22b830f3a197027b1923b3c2ebf0db7dd6321f2218612b8b2c82626717c7fee42337629430da5e22
diff --git a/media-plugins/hexter/hexter-1.1.0.ebuild b/media-plugins/hexter/hexter-1.1.0.ebuild
index 7ed0c13559b1..c2ad330e29d9 100644
--- a/media-plugins/hexter/hexter-1.1.0.ebuild
+++ b/media-plugins/hexter/hexter-1.1.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="Yamaha DX7 modeling DSSI plugin"
 HOMEPAGE="http://smbolton.com/hexter.html"
 SRC_URI="https://github.com/smbolton/${PN}/releases/download/version_${PV}/${P}.tar.bz2"
@@ -30,7 +32,7 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
-	PKG_CONFIG=pkg-config \
+	PKG_CONFIG=$(tc-getPKG_CONFIG) \
 	econf $(use_with gtk2) \
 		$(use_with readline textui)
 }
diff --git a/media-plugins/hexter/hexter-1.1.1.ebuild b/media-plugins/hexter/hexter-1.1.1.ebuild
new file mode 100644
index 000000000000..d36ea4490cc3
--- /dev/null
+++ b/media-plugins/hexter/hexter-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Yamaha DX7 modeling DSSI plugin"
+HOMEPAGE="http://smbolton.com/hexter.html"
+SRC_URI="https://github.com/smbolton/${PN}/releases/download/version_${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="readline"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/dssi
+	media-libs/liblo
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/ladspa-sdk
+"
+
+src_configure() {
+	PKG_CONFIG=pkg-config \
+	econf --without-gtk2 \
+		$(use_with readline textui)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-plugins/vdr-duplicates/Manifest b/media-plugins/vdr-duplicates/Manifest
index 5874df947866..55b17759f7cc 100644
--- a/media-plugins/vdr-duplicates/Manifest
+++ b/media-plugins/vdr-duplicates/Manifest
@@ -1,4 +1,4 @@
-AUX duplicates-0.0.5_Makefile-new.diff 7408 BLAKE2B 3a995937b45e8363c31231e375888aa1fc2f8e12514a0d0ca154bd6e5ef06964cf31727d279856057b152ff2ed30f67d8c537f769e40e60cad707cd9e4996eff SHA512 114e25f66cd0eeaa7438ae5af0b7579324b001d9b2b1a25ba39a69454a233976be311f30e7d2a8b53362d324499ee69f174acce8bcf5ec96e8ed9d5e24ef0e88
+AUX duplicates-0.0.5_Makefile-new.diff 6610 BLAKE2B cde7d7bdb33b2c0c80d8ba0774d562ea540a0f8917b5303ff0f72156b4c675d1b216e992f3f7ebc8dc28fa07d466f9172575ba49479bfd0da5b473204db7f6e0 SHA512 8a76dc97e4c917f304df805ac01aebc730028c765544ed39aece023996a1aa95e9857b409cc211875e4f6937bdfb030468e3cf9ed17523048761d6f4b8799e74
 DIST vdr-duplicates-0.0.5.tgz 14745 BLAKE2B 61f153dcf01c91e0b3ef54367daa9d7108fef8b3acbfba4f5c91b7a1c2ee8681ca9d20ef3dd11c42db7b05d46d1c055ab3e02b2400c00f1fff6e2ecaa5f910a5 SHA512 9e8ec30cbf9b1447aa00152be48237a8688dcfd746b06774b3f5d87d7100037ee8f890507c06d203a81bc05b4b476e326a3c1f0fe84e222a876a7de534b2495d
 DIST vdr-duplicates-0.1.0.tgz 16696 BLAKE2B 47b0a9501d12578980d3665f0549ffddf655f645a65c01f8ece6fb0fe76d42ed9cfa11f433115df99cbe36320bbd5ab127a830a9ccba728c50830be9857047bd SHA512 1ada8262ed349af98ba3ea62bb732b69febff29d74a7dd225f3ee3216e3ea7d5a20fea71ad4f7dd2f87da5a27b7f6de0dcd56554e6f819f3a002e51633c50500
 DIST vdr-duplicates-1.0.1.tar.gz 17836 BLAKE2B e48b8fae13ef0ff8e310045dfd40eef2722dd3cc797e49c3601ab4df2d92ec7a8d490e135a57808806f42db86e295d602183b879ebc87922e6dc4218e7cea230 SHA512 ba1476c3705a4f9a982887833ecba7d22be84c391908f4d9e0d938337615d46b11b9c7cb97f6f80edc5348321afcd1a5535eebe0f71fb67615ae8d75ccf53507
diff --git a/media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff b/media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff
index 4a37b4d25ea1..a2e7bcb93bbf 100644
--- a/media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff
+++ b/media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff
@@ -1,10 +1,9 @@
 New Makefile handling up from vdr-1.7.34
 completed german translation
 minor fixes in .po files
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2015/Jan/03
-diff -Naur duplicates-0.0.5.orig/Makefile duplicates-0.0.5/Makefile
---- duplicates-0.0.5.orig/Makefile	2015-02-03 10:40:33.661259290 +0100
-+++ duplicates-0.0.5/Makefile	2015-02-03 10:53:20.542203193 +0100
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2015/Jan/03
+--- a/Makefile
++++ b/Makefile
 @@ -6,48 +6,50 @@
  # The official name of this plugin.
  # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -30,7 +29,7 @@ diff -Naur duplicates-0.0.5.orig/Makefile duplicates-0.0.5/Makefile
 -LIBDIR = ../../lib
 -TMPDIR = /tmp
 +# Use package data if installed...otherwise assume we're under the VDR source directory:
-+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
++PKGCFG = $(if $(VDRDIR),$(shell ${PKG_CONFIG} --variable=$(1) $(VDRDIR)/vdr.pc),$(shell ${PKG_CONFIG} --variable=$(1) vdr || ${PKG_CONFIG} --variable=$(1) ../../../vdr.pc))
 +LIBDIR = $(call PKGCFG,libdir)
 +LOCDIR = $(call PKGCFG,locdir)
 +PLGCFG = $(call PKGCFG,plgcfg)
@@ -153,10 +152,8 @@ diff -Naur duplicates-0.0.5.orig/Makefile duplicates-0.0.5/Makefile
 -	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
 +	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
 +	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
-diff -Naur duplicates-0.0.5.orig/Makefile-vdr-1.7.33 duplicates-0.0.5/Makefile-vdr-1.7.33
-diff -Naur duplicates-0.0.5.orig/po/de_DE.po duplicates-0.0.5/po/de_DE.po
---- duplicates-0.0.5.orig/po/de_DE.po	2012-12-13 09:32:52.000000000 +0100
-+++ duplicates-0.0.5/po/de_DE.po	2015-02-03 11:12:44.879118021 +0100
+--- a/po/de_DE.po
++++ b/po/de_DE.po
 @@ -5,20 +5,19 @@
  #
  msgid ""
@@ -191,9 +188,8 @@ diff -Naur duplicates-0.0.5.orig/po/de_DE.po duplicates-0.0.5/po/de_DE.po
  msgid "Compare title"
 -msgstr ""
 +msgstr "Vergleiche Titel"
-diff -Naur duplicates-0.0.5.orig/po/fi_FI.po duplicates-0.0.5/po/fi_FI.po
---- duplicates-0.0.5.orig/po/fi_FI.po	2015-02-03 10:40:33.661259290 +0100
-+++ duplicates-0.0.5/po/fi_FI.po	2015-02-03 11:13:00.607116870 +0100
+--- a/po/fi_FI.po
++++ b/po/fi_FI.po
 @@ -12,7 +12,7 @@
  "PO-Revision-Date: 2011-12-12 19:57+0300\n"
  "Last-Translator: Timo Eskola <timo@tolleri.net>\n"
@@ -203,9 +199,8 @@ diff -Naur duplicates-0.0.5.orig/po/fi_FI.po duplicates-0.0.5/po/fi_FI.po
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
-diff -Naur duplicates-0.0.5.orig/po/it_IT.po duplicates-0.0.5/po/it_IT.po
---- duplicates-0.0.5.orig/po/it_IT.po	2015-02-03 10:40:33.661259290 +0100
-+++ duplicates-0.0.5/po/it_IT.po	2015-02-03 11:13:17.167115659 +0100
+--- a/po/it_IT.po
++++ b/po/it_IT.po
 @@ -12,7 +12,7 @@
  "PO-Revision-Date: 2011-06-05 23:37+0100\n"
  "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
index bf4c4a97780b..61af237cc388 100644
--- a/media-plugins/vdr-extrecmenu/Manifest
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -1,7 +1,7 @@
-AUX dvdarchive-2.3-beta-configfile.patch 302 BLAKE2B c3466202e7199d7cc7c4e090efd8ec329e3871729a0f53ede82393e44b58bffff3c6857dd3f71a82f01ba2fbd31f2aa28ad9ba857229e8716049607d07712e44 SHA512 59c113d672580c34b08a1a314b4104bb6400e18fa2855f02a70583975c5fd675de672006d057e1f207919aab488cf42505072fa57a61f931a58d4c1f84756ea5
+AUX dvdarchive-2.3-beta-configfile.patch 234 BLAKE2B 278e6b84029308d99d16b5ed074a28328e95930fced0542dcb07355a214d8551edeb8cd0cce3f771e9be23d1c04936ed41bae92619dda4dabaf08b4f3850f5f1 SHA512 c81893115c3279fa2421dff6a0bed0e74263b1bb04c3745982b91ae431e14397982250cd68a281bf488fc493413c44d8e92e509c83d6ff6b0ff7a6a17eef1949
 AUX dvdarchive.conf 633 BLAKE2B 1b70f19dcc9f94d1d3124773d4338c799cfabad2c0cbb0665d1e7f9cb07c914eb7a87cee4a11d77fb49d3d05cff2f7f641d210c5120c27a57c63eababcc35989 SHA512 1b4f7c68f83617d861277a491dbddfdd76b92fbf342d1cfda7cbb958cc77ce19291b8223d65774aafcd22cfcb273913c1122821eb0be97e7423b4842e9237fd0
-AUX extrecmenu.mk 3323 BLAKE2B e9446a2dc3b29bf69e314455b1b033932c6f14bdee4b4e2ec07b2bb8ab98d5d4ee795a9acdcd6906653dc6319ceb4f2979204b89e537529d5189330b9b1c5b9f SHA512 b16dad6d7be92e9a5483fa7aad8ac2a25bd26bf2d14d50bb3e2fefdd4eef8c837277747030f1403e5248d1c6c0a18530bb55521976656e8a5c2ac26f2d1827d9
-AUX vdr-extrecmenu-1.2.4_c++11.patch 1424 BLAKE2B 00e015a7a5dc9bafc1dd2393c82bd7b229273bfbb6a7999e90c53d4cfb88b4b39b5d4df43b353384a3e496c951ce3e58a8e1545f627fc2dcd5c68d4e4152fa07 SHA512 632b4608275a55cf19ca8dd3debf9b5f5db9e13cd6d7ddbc831b3603be0fc3fe7d690121462715ca66005b8d14cb2d7f892f47ef5ddc3d2ab50a07a0266e067b
+AUX extrecmenu.mk 3332 BLAKE2B 068396bec5431b3487d0417b2c7808032027d70a0aea5aba042838f7b5b92fa450cc290535422d78753440688d76b5a4a0a74a4bb32a7517773a7f7a08f39218 SHA512 b8dce9b7a260c3af5537dc3183bc26174f756b0103f44d3981ef3c4bfbcea68f186df72edd625871884efe3716d23ee33db86805ef62ec6c37427cb6470636d4
+AUX vdr-extrecmenu-1.2.4_c++11.patch 1039 BLAKE2B a62bf2595d2eb5e6caf2a267f7234ba175e3022ccbcbb8e78f40c91157e58fc0e79310fd5d2a907531668dc2009a328ed7e1878535e3019e5b81003dd155858a SHA512 b19bdae621a0464620435412bb56ea6ca3ab2d319d09b74a45936ee2556e4204fba9660381ba6ec1c54af5a379c049e661a000d655705120bccf061c27dcd6a7
 DIST dvdarchive-2.3-beta.sh.gz 3412 BLAKE2B aca97b4c7abcc907f1242482f0f0550cb38fcd357acb9ec6ebc4c978a8f50e9c63fe6fcc2932e426c5d7301f0eaccc5e2f8726e72abafe504e5503528ce782e9 SHA512 18262b1e6749961bae37894649f518f88ad2ca100b83965eb48ce7344bbf4f7bfac9d36c9b9d91744281c00c4b89fa49209cc98ca5d848b46225facf4ef7a48f
 DIST vdr-extrecmenu-1.2.4-r2.tar.gz 729966 BLAKE2B 2ec2790cc57db3a9f1d12cdc43eea3e70076ef14d9f0392eb9ab4cda4bf30999a163526416276e661430bf9b684f7d313f5f7193997118e061bf5352c5bbe39a SHA512 d3103e5bc65f968bc4f512195eaa25b04fb5261281d79c7c486fe2532656b8ee7ddc00648d46e92c468b33f95e77c6ce3b2ca67a2debcc0c7021a4b525ac0aa4
 DIST vdr-extrecmenu-1.2.4.tgz 731823 BLAKE2B a226aadb843480b62798e2c4226af8bbb5bba41946f14222616ec43eec94a1b45150661ceb9ecb85e714673f408ab01849b6d55b6572da8028e6b47f9991916d SHA512 a750c6ad244e2afd3f04cafe634ec3c58baf4a38a809121a7c9045c327b4f10cb28b7aab4b7bd0e86d0b7febf85cc7fbc258bdd83386a60ddfe748347192f592
diff --git a/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch b/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch
index 723610e8c58e..77da7a5563c9 100644
--- a/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch
+++ b/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch
@@ -1,5 +1,5 @@
---- dvdarchive-2.3-beta.sh	2009-10-06 16:23:20.000000000 +0200
-+++ dvdarchive-2.3-beta.sh	2009-10-06 17:32:43.000000000 +0200
+--- a/dvdarchive-2.3-beta.sh
++++ b/dvdarchive-2.3-beta.sh
 @@ -118,6 +118,10 @@
  DEBUGLOG="/tmp/dvdarchive.sh-debug.log"
  
diff --git a/media-plugins/vdr-extrecmenu/files/extrecmenu.mk b/media-plugins/vdr-extrecmenu/files/extrecmenu.mk
index b08519610a69..ae68843778f9 100644
--- a/media-plugins/vdr-extrecmenu/files/extrecmenu.mk
+++ b/media-plugins/vdr-extrecmenu/files/extrecmenu.mk
@@ -15,7 +15,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell ${PKG_CONFIG} --variable=$(1) $(VDRDIR)/vdr.pc),$(shell ${PKG_CONFIG} --variable=$(1) vdr || ${PKG_CONFIG} --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch
index 91df23911a42..8427982eede8 100644
--- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch
+++ b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch
@@ -2,9 +2,8 @@ C++11 requires a space between literal and identifier
 https://bugs.gentoo.org/740282
 
 Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
-diff -Naur vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.orig/mymenueditrecording.c vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b/mymenueditrecording.c
---- vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.orig/mymenueditrecording.c	2021-03-21 17:25:40.260078140 +0100
-+++ vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b/mymenueditrecording.c	2021-03-21 17:26:15.560078140 +0100
+--- a/mymenueditrecording.c
++++ b/mymenueditrecording.c
 @@ -626,7 +626,7 @@
  { //This has been taken from remotetimers-0.1.5, written by Frank Schmirler <vdrdev@schmirler.de>
  
diff --git a/media-plugins/vdr-fritzbox/Manifest b/media-plugins/vdr-fritzbox/Manifest
index 75f418b873c4..861dd70834b0 100644
--- a/media-plugins/vdr-fritzbox/Manifest
+++ b/media-plugins/vdr-fritzbox/Manifest
@@ -1,6 +1,6 @@
 AUX vdr-fritzbox-1.5.3-boost-1.67.patch 597 BLAKE2B 8efc4aa1ff4418bf9d627032a89d3975d264446266f92a823ccf467dfa8a593ff3c99768e9ae3a8421fb9bfc72145ec5b114997c4f653f5fc786cff45375d13c SHA512 97ab8e2e572be18dea596a6b66eae5d1929c7178bc5027abd6035240fab0fa76afe26170007e7c84776f11d4c452fa39fc8140a21adcba5eb78912984809098a
 AUX vdr-fritzbox-1.5.3_clang.patch 780 BLAKE2B a28cae333c109bdaf9dec0800fb304d2bf6f3e12c8d73a68b509ca085800b91cfdcc353a4fafedee238a75d535502e1b5aa588ed496592daf7ae577a96f473e2 SHA512 d9dc4fc9efb3229f4a4c1386a96b42c8ada6e96dc17e33d8892c1d9c03e469c0f41cdc382915614587de4379d0453d3c85a47f984669bfdce1dfbfaf24ca6c98
 DIST vdr-fritzbox-1.5.3.tgz 132207 BLAKE2B c9a93e922eeb2126279409e3948c44cb1fc3348d44fbcc2c1116038d66fc77a707d3885a6d587c8996138fcaff134bb78db4dab2d122caf0293d2d8d8770e985 SHA512 d396bb1386ffc4b53867c735d4ffc710c4266067e011e17f2d4aa597ecceeb502d2c6e23a1df69f929503b2cd5d07f4d57869c890040b1ae9af1742c044541be
-EBUILD vdr-fritzbox-1.5.3-r1.ebuild 1003 BLAKE2B 9deec31f2456624d46756f804d2dcbeb2ea70393d91e0ca5bb1dfe5000cb349401702c8fc168d3cf9a5a1503c64f56b1c70d6b0f91a8ca5dfdba4da11bfabdd1 SHA512 4c92b5d74cbd5cb732bc5769d13adf5e22ae8e156c6e3e7912fea6175d793f5b773a7bb2a0efa6c4574cc03538a3092f5e107451c31aa08c51a34fe3f8b04266
-EBUILD vdr-fritzbox-1.5.3-r3.ebuild 1270 BLAKE2B b6f53563f70775f9f8694d10f5db894c752d71054ea1aca2e3d7dac1ede5cba9282715d68a2f236af9a5860fb178d3ca870e125367ed8e9f7aea564d2d7319d2 SHA512 99cbe2d61f9a70b22633f9bacab975de02ca17cf24ae019e89a0660a426337f3e399994e7fe7e5941336789f484288a4ba2153a7edf82051c7cf76706bc6ebff
+EBUILD vdr-fritzbox-1.5.3-r2.ebuild 1008 BLAKE2B 1b7836e2f0e674949e3bd7f1c0856baeb7081062f9970e93439ab792c2e2d237e4accfd327636708edbb64238cedb8b2f36b10c09209619fad4d311cc382ff18 SHA512 97f1d0d484779742408c40a6bae25608b32d8ae00250c41c04a00204dd2a68e3a1fa899365e9c6ab61cd2b42e68c691cdc2a39975e448461842094d3fd178ffd
+EBUILD vdr-fritzbox-1.5.3-r4.ebuild 1277 BLAKE2B b9715c198ae4172cec818bc74ce557e3b431a4f217380a053469b9649398aadd41bb6426a526c2d96d1d19c651d50154a0ea73b1a671f1ee5e44d12afdd5126c SHA512 ad7e9f837bee3e51ad35e2b77bf85592497cead0949ec7b180d78fdbb833cec5b4154477374694f8395535168015f05aafcd78fdb8899ec06a729795f14f6aa5
 MISC metadata.xml 330 BLAKE2B 5cd8d714a3b5682eb5488d30ee4e7ac0ffc32adf99df1b9e0779722fb4e85268e4a57d1cfac793117f93d76e42929ad9b22bfe352d55ed509946f51db9136148 SHA512 262ffcc4bc66991c986e3b89bdf7f5ce988e796248547fc8a6faa67b57c162bce8e3e7d59f548e953f65a3a889eacc4ab1a8e9fee74401604b7ddedb7416723b
diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r2.ebuild
index 792c195f12ff..566439ba3e3a 100644
--- a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild
+++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,8 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
-	dev-libs/libgcrypt:0
-	dev-libs/boost[threads]
+	dev-libs/libgcrypt:=
+	dev-libs/boost:=[threads(+)]
 	>=media-video/vdr-1.7.34
 "
 RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r3.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild
index 8ca019bad2a2..8d282d5f871b 100644
--- a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r3.ebuild
+++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild
@@ -14,8 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/boost[threads]
+DEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/boost:=[threads(+)]
 	media-video/vdr"
 RDEPEND="${DEPEND}"
 
diff --git a/media-plugins/vdr-imonlcd/Manifest b/media-plugins/vdr-imonlcd/Manifest
index e837870a2fe8..1b04030f47f4 100644
--- a/media-plugins/vdr-imonlcd/Manifest
+++ b/media-plugins/vdr-imonlcd/Manifest
@@ -1,7 +1,7 @@
 AUX 99-imonlcd.rules 125 BLAKE2B 70328389d6a2aaf93333eedf4db4c7ec798b058dd4fcc86d7f97e2460f106157248ca2d26f328ba1b611183519dc740dae0faae8d1e50a15acb61b67727a5141 SHA512 429c3c1cc6eb2ec59b293f51fadab25724756d22ddef4764684eff5cf239102904d45ccf07e05b7d5ae0ddea8b965800c0655290332e53b01bb82befa4d5c48c
 AUX confd 197 BLAKE2B 6ae3b143d152860d5343859feb4a054c0c733e6bf91767b3d9ecaf9fc7cbf3313a1776c38b7538265c585d5bed6bf7efe66e9ae50aa5296f3735aeaf175f610d SHA512 4a118a89160ad63208cdfb1fee80063bcc1487e8fd98205a442babc892411018293313fe8db9741180d483a6787cd8cc7a04cea644d3967c46a680e74afa94c1
 AUX rc-addon.sh 165 BLAKE2B 7d761ab823ae86d365047cfb01251077e2f3d880953888ef2fdcd943d30299fac8af23e24c668b0969ae22a04264ecb2f88e78a81d5d9b06870d292705b110e5 SHA512 6d805256adeed3719ff7d7edb7ed5b434654e23a0a709e1761be48877f7572f35a6c66ca732219de73c6be49338593aa5d98af507558a1ec76be6acb1ad95f16
-AUX vdr-imonlcd-1.0.2-freetype_pkgconfig.patch 816 BLAKE2B f0494f58adff0fbab89262ebc65a65c0610e3a6198014139c860f705a9e0011759b471d9c1f5c7f4472a08b98a533ee1d0cf34a0ec7a13773e97b5a027c9bc39 SHA512 9d008137b6b8bd42051f6019f7b3d35aebae510536124dfe3e59d9a677fc2223910af9f5012bc334f5c3c0f3fc5539ec2a381cffe5039338804e015fc02da572
+AUX vdr-imonlcd-1.0.2-freetype_pkgconfig.patch 822 BLAKE2B 224a9cbe6bf68ec3e598b10bd417a1f18b81708d574afd4e79268b98a747e4b304d4119c1290e3bd7f8f41ca282b1735b9d8885d957ba1523d9950d8f8939044 SHA512 c8a2e8eabec2b05066ed6f5cba2219a942fb644b805605b703fd71c19a72e23b6affd1e418a76da882fd480190b3920f6da4dfec20d5c995c79b6aa0fed54707
 DIST vdr-imonlcd-1.0.2.tgz 44517 BLAKE2B 1cc675978ca2c8270592c552ca383468628382c28aca08f74c55aa40dfc4154797f0e49e038cb2a8c07d66dbbf9d3fed190256809e08c4dea9b379a29cd96acf SHA512 ad1f70c3c3f4754251bd47d23ac2c56503860461edfb6e91d8dfa8e1d585da9fdd36ad300821eb29ef727e5a0875aa41d5def5f6f89f36f06efbd4a5da2b2fae
-EBUILD vdr-imonlcd-1.0.2.ebuild 970 BLAKE2B 6eee8b638b6c42963ed78c31a1fde4e95cbf2618266eb7065d48ee7604a6987febf4b0342a183a7ee78aca7a820b6f79b0aa3256241b86c6ec3f0ca787f07391 SHA512 a05b1fbe2b298e9db3d3208d209e9fa11fc49afaeb68a1447ec2149885ef82ab87676b9de9e9bdc58aee0147354f33fa4db8dd96993628c891b166fdaac79602
+EBUILD vdr-imonlcd-1.0.2.ebuild 1066 BLAKE2B b9027eeea449c5ea967bfde085a5a3d1fcedd80a4a75d3c9fa19089c185288e8c7954b29714cfc5389a3dbffd1ed556fda6c4ec79d005a5633c638ec66872a17 SHA512 be7cd6a5259303e7060955ee6d41a22d854c1f5b6733e53de594348bba736f000c2c8af1a5079ae39b1335665bef9aa26e46fc3c14f63c888a84b3f689ccba5f
 MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/media-plugins/vdr-imonlcd/files/vdr-imonlcd-1.0.2-freetype_pkgconfig.patch b/media-plugins/vdr-imonlcd/files/vdr-imonlcd-1.0.2-freetype_pkgconfig.patch
index 3c35846608f7..2e570b89f8ac 100644
--- a/media-plugins/vdr-imonlcd/files/vdr-imonlcd-1.0.2-freetype_pkgconfig.patch
+++ b/media-plugins/vdr-imonlcd/files/vdr-imonlcd-1.0.2-freetype_pkgconfig.patch
@@ -19,8 +19,8 @@ index fc165e9..36fc681 100644
  
 -INCLUDES += $(shell freetype-config --cflags)
 -LIBS += $(shell freetype-config --libs)
-+INCLUDES += $(shell pkg-config --cflags freetype2)
-+LIBS += $(shell pkg-config --libs freetype2)
++INCLUDES += $(shell ${PKG_CONFIG} --cflags freetype2)
++LIBS += $(shell ${PKG_CONFIG} --libs freetype2)
  
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  
diff --git a/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild b/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild
index 2a66910fab92..75f9c6b555b3 100644
--- a/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild
+++ b/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info udev vdr-plugin-2
+inherit linux-info toolchain-funcs udev vdr-plugin-2
 
 VERSION="2086" # every bump, new version
 
@@ -20,6 +20,7 @@ RDEPEND="
 	virtual/udev"
 DEPEND="${RDEPEND}
 	media-video/vdr"
+BDEPEND="virtual/pkgconfig"
 QA_FLAGS_IGNORED="
 	usr/lib/vdr/plugins/libvdr-.*
 	usr/lib64/vdr/plugins/libvdr-.*"
@@ -38,6 +39,11 @@ pkg_setup() {
 	vdr-plugin-2_pkg_setup
 }
 
+src_configure() {
+	tc-export PKG_CONFIG
+	default
+}
+
 src_install() {
 	rm -f README.git
 	vdr-plugin-2_src_install
diff --git a/media-plugins/vdr-wirbelscan/Manifest b/media-plugins/vdr-wirbelscan/Manifest
index 6374bbece480..41ccbf77bdb4 100644
--- a/media-plugins/vdr-wirbelscan/Manifest
+++ b/media-plugins/vdr-wirbelscan/Manifest
@@ -1,7 +1,7 @@
 AUX receiver-api-fixes.patch 2060 BLAKE2B 02ed94c3504b1989ebf061cef4904fae0e4dacc7fd4d6309c1893ef2d368516b3255fae5a78f54fcb687b0518d7c2acb308b404aa409f106f9c6ec0052d4899f SHA512 973afc96a1f0a162b90b91c8f2053dd538f0b5644c0295ade0398a1cfa0a03ccd938b2faca2a0bcfe75f9d8663b1f0e145afc28de14d0f3bf1626bb0132a30cc
-AUX wirbelscan.mk 3297 BLAKE2B 0b7d8676fc0791cbe877c3cec0d265afebe3be8daf52efb905f7c1ff3a2fd495cd57b4107afb33738e13f912e2e274a7a9516ff93a7bcc178bd9068c86aa15fc SHA512 a3a9e71d8e4da822cad2d9d747904f4fe505a500bc36a3b7312274bcde5dd66bab5dd346e8353de920eb9eec75c55d8e0ddc9ae9eaebca907cbfcd80d6e070cc
+AUX wirbelscan.mk 3300 BLAKE2B dd8b514e854763949c81cd14eebd186a682201127cc3532635d5ae6de67665b684d960efce3a1c1fb73937e89ae5dd4c2669ad567c2115fcfb81c2f6f997f771 SHA512 13ba2c6257fd6f9aef5abb0db86aea4ecab7fdca79f7ba00c60d450b065d1182266bc9e5aa6e1a680445978a3e4b8db24ac129d35e3d2675074d9a1297600193
 DIST vdr-wirbelscan-0.0.7.tgz 149949 BLAKE2B b0b258b91bef493c352b8a2e7edec821b4046a7a6c2751ffe0e1deacd1ddcf3a563cc4051eee6424526903444952a0d489b8bca00533ba89a8214943948c76d9 SHA512 754b3089b1a8536b501fd8b62ddafedaf8304518856152a49b97149113929b47d6c6299b8eb4b78b2d3dc5aba147a3e21c00554ad02d2dc5018c296f6c55d6a5
 DIST vdr-wirbelscan-2018.11.04.tar.gz 146140 BLAKE2B 067046dcd11837f2de5a44acce35cc1c58778b7cc110a69eb1f35e2c2e792a1dfac0f04dc50c230b0ee4940a3ed8bf8fe34484ba6cc988b7f7da59c361e2d1d8 SHA512 61d7109f47c3a1d87d520d3228b0737073762e877b9b08d2716337de071bdf7f8419ae5285a72c5e29e4c5081403edb2cb729adf6755a9e898a662af30a7b92c
-EBUILD vdr-wirbelscan-0.0.7-r1.ebuild 843 BLAKE2B b47b0f06eac3db375e82d9c7f88b4f15c473b79ef609ec98f19c27257428f528ea278dbb86d503286c782e3399aa667611c8654a5277add3c0392ac3c3242af0 SHA512 cfba3cc26f4a8f0999a902ce50f2a96c7ce2dfd96a490f810001fbe01915864a5dc76c81ed5653bf5b733cdfc764d77c9854dce557c95b8b9f6442fff567aa32
+EBUILD vdr-wirbelscan-0.0.7-r1.ebuild 910 BLAKE2B aa6c99bdac945fe418739e02c37a8b941aae70ffdcef07e4b3e819a2406c11fae344342ec0b71cb65a585520c2524c1c5f886978f0057d7e53ebab884e6faeab SHA512 c02a7fd38ecbfb5b74e47cd4d224d4d58497247f6e75716a48d6590c04b258b7e0f7170bdf824cf5b7ef4e7f93231e8392ea75b15736f171ef5acbe407d6dfcf
 EBUILD vdr-wirbelscan-2018.11.04-r1.ebuild 956 BLAKE2B 2b6f11dec929084aefdc4ab591c49a56ac87093fe19c19511c8b8b745b2c7262852efc97731a0a559d762690bde4b62bbbc9cfb4824dc383293e4a8632df6576 SHA512 c08121db325c25198fc86a4efdb63d861fcb66a354858dc888082e0f1940aa99980c119f73b84a8ac30cf39ff8519742f56691acb5801e52cdf6ec103d765d96
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-wirbelscan/files/wirbelscan.mk b/media-plugins/vdr-wirbelscan/files/wirbelscan.mk
index 0d7706769f3b..59095922939d 100644
--- a/media-plugins/vdr-wirbelscan/files/wirbelscan.mk
+++ b/media-plugins/vdr-wirbelscan/files/wirbelscan.mk
@@ -15,7 +15,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell ${PKG_CONFIG} --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
diff --git a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
index 7920122c681b..493e2988151f 100644
--- a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
+++ b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit vdr-plugin-2
+inherit toolchain-funcs vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards"
 HOMEPAGE="https://github.com/CvH/vdr-plugin-wirbelscan"
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=media-video/vdr-2"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	# remove untranslated po files
@@ -24,6 +25,8 @@ src_prepare() {
 
 	eapply "${FILESDIR}/receiver-api-fixes.patch"
 
+	tc-export PKG_CONFIG
+
 	vdr-plugin-2_src_prepare
 
 	fix_vdr_libsi_include scanfilter.h
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index e1c2f32dac61..d1642ddb5e3f 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -4,6 +4,6 @@ AUX vdr-xineliboutput-2.2.0_no-gcc.patch 981 BLAKE2B ea8daf82a19d7f8dd7cf5b56e90
 DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
 DIST vdr-xineliboutput-2.2.0_clang.patch.bz2 7405 BLAKE2B 80d4a0ca3673f61cd14538c2fbdc03017f8c993a55b4c3de0349c799b7239052bc452fbd78689e9ccace2e865b4d08ec69365ed9ad6900e08205676135dac3b9 SHA512 c02cc9a6ee8c9b3458dec6439ea4fa85421f3ac01828e65b123d13db689a75cbba5622a7e1fd76066a19a714c2debdb08f4c78139573a4563aefab19107a5512
 EBUILD vdr-xineliboutput-2.2.0-r2.ebuild 3302 BLAKE2B fdf7d87e60040c920e51471a355502bc16bcb2d90d283e61d6372df570c905eb5f9a60e704452d3caa6231305d69db682bc9c9608e5a5ad747d9fed15aeb980c SHA512 ef250e619f44b4171cc81bd9b7c31d2fa16d915d024efe6a59b730f48961508035a36045be484af9a02b9ab5fbff6e361fd274c0a01f8d8a3dce7b0e5d10daac
-EBUILD vdr-xineliboutput-2.2.0-r4.ebuild 3445 BLAKE2B b1b14d6f9223524d5ab239d85e3f64b6670852b6f042aefb3cd35b3e397edfac81913b33ac3df4dfb5fc2dbf9538a6ba6c6d0095ddf42a130de7dc02ff576f9d SHA512 2a5ae525383b7ca2883420f4b9d742e126c90714fa05a681e48689bd86949b08bcc7d8c2ab77dddce932c32a3b212edd289380deaa438f39fc3a8d205133e57b
-EBUILD vdr-xineliboutput-9999.ebuild 3352 BLAKE2B a41dec91c3b93b71253984d17bc9bf4c959d25c112983d379f7e919fcd840f5cbc836a1ec1ad93ac2b129679e86d571594be8c1bd59e8e05065a93d4b98a40ca SHA512 6a9b0b7df8b77304b347b574840b69295d2916296e39298a74e7f0f90d84e4d19cba212b7eadad6cd2023b74126cc0db4dacd3983d654e999627db81e6927278
+EBUILD vdr-xineliboutput-2.2.0-r4.ebuild 3479 BLAKE2B c87cd877a0d2b5d3b53e6ad307795b0ff5e5efa80fd4e8da955053df041d4afa827ef9adc8eb37ac66e70df310f5b45969b4e87c11d8fb6837901199f96dad37 SHA512 40dbadc09aa6e1949850b9aaa047dbefae8361b25fcf5c8aee49423b9d93c5fb92a4e43f5100799f2567444f84298bc4968ae1b018ce0261333abe2d5cca8711
+EBUILD vdr-xineliboutput-9999.ebuild 3370 BLAKE2B 571c6598ff3de71c9ba9bc45c772fafc01ffd3c0391ea2a716db9b7107c05c17dbe90f487df45795723a50b8ab7f3a25a595aaa3de259cfecc885eabec5120cd SHA512 8e4728d5272095bf0dcc55cccf1a4c7c2acb1abc1ee3775c23f5ed6333893aa47f7b093f3f97ae3f1da01585acff40e4a8494987b9835625db89213ff26d0fbb
 MISC metadata.xml 830 BLAKE2B 04a0e0ba5a0afc1b2c3669a442bb5b62f44d25159c16c3a6539c541b43d22b4f30c8c6ea60b076f6326aed51ca4308af52971c3b3cc5bb5c93c3128ec22f6302 SHA512 4407810d8c94d896214a12e33698432024ffed5e788be0bf850aa706f2b3eefd9a5ecb58eaf37d6f3d28611ccaae9683b8feb97d2b1cc074386e67b6dc58e1e0
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index b9d615c9322d..fb37a10e6c22 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit vdr-plugin-2
+inherit toolchain-funcs vdr-plugin-2
 
 GENTOO_VDR_CONDITIONAL=yes
 
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	)"
 
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	sys-kernel/linux-headers
 	nls? ( sys-devel/gettext )
 	xine? (
@@ -53,6 +52,7 @@ DEPEND="${COMMON_DEPEND}
 		)
 	)"
 RDEPEND="${COMMON_DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE=" || ( vdr xine )"
 
@@ -62,7 +62,7 @@ pkg_setup() {
 	vdr-plugin-2_pkg_setup
 
 	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
 		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
 	fi
 }
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index b81bf629a3f0..bc97c78bee09 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,6 @@ COMMON_DEPEND="
 	cec? ( dev-libs/libcec )"
 
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	sys-kernel/linux-headers
 	nls? ( sys-devel/gettext )
 	xine? (
@@ -54,6 +53,7 @@ DEPEND="${COMMON_DEPEND}
 		)
 	)"
 RDEPEND="${COMMON_DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${P}
 
@@ -67,7 +67,7 @@ pkg_setup() {
 	vdr-plugin-2_pkg_setup
 
 	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
 		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
 	fi
 }
diff --git a/media-plugins/x42-avldrums/Manifest b/media-plugins/x42-avldrums/Manifest
index ab06977d7c56..6966f07e76f4 100644
--- a/media-plugins/x42-avldrums/Manifest
+++ b/media-plugins/x42-avldrums/Manifest
@@ -1,5 +1,5 @@
 DIST robtk-0.7.5.tar.gz 117218 BLAKE2B ed1d19644b0d1bbc072098971062b66810cf137499a6ac4a706865c3f7dbd1c4741fb7dc9d8fe7f9112a43744c9bc9dc97d9e53264bbf9625291c6b49724bd35 SHA512 93527d5c67af786f93338c722e10e8c71379372846d06905af1b10b7085c34c09ebf445e174c32206b06cac876ed8093b3631f8ed15c10fcbe44317b6b8e2559
 DIST x42-avldrums-0.4.2.tar.gz 35246454 BLAKE2B aa8197e9b4e49f106f223cdc59886c76e33901b78c017b63598ff777cbbc7731318aeee90eb0687ce6bcf53b5f372218a0a8998c53d3c16ead9e8451d28f270b SHA512 4a8e51a02022294eedcb676579db7fbbf6d0054c71bb86a600403dd251a5bc179785d9a436ceba27a27cc49a370801e3838081d787d9b6345c85ae45b5f0e9e9
-EBUILD x42-avldrums-0.4.2.ebuild 1039 BLAKE2B 76fe87281bf86b38dd65b8c1e365b221a8458a171ec8d97a25b067a19270744225fa13569194c21a2478b8b98967ee1ec3d2be6e230b975beaf1410e6c419325 SHA512 e3e79c35848333ec55c66ca6e334b51e96abf588d3472671960d4497bf2cd301fd8e89b4a657ec3fb5b59ecd78bd5e17de29adc0530e5be4857ba5fffd7a0c0d
+EBUILD x42-avldrums-0.4.2.ebuild 1038 BLAKE2B 3b9354dad477afa900f6a37e35b91393f43012e6ea738936c4787e60736f07284e61d5b55d102d372a6c89de45a1ab5a90c2434e2d00cf6823edbe31b50380b7 SHA512 abf3e9de294f431482546a413de9ca50015061d07dd97fbb9f12caa9f0182c1ecad9e31490b2a9603d4e5bcdcde9d72155d4dacd91ff80056dd4dd9f1154c70e
 EBUILD x42-avldrums-9999.ebuild 1039 BLAKE2B 76fe87281bf86b38dd65b8c1e365b221a8458a171ec8d97a25b067a19270744225fa13569194c21a2478b8b98967ee1ec3d2be6e230b975beaf1410e6c419325 SHA512 e3e79c35848333ec55c66ca6e334b51e96abf588d3472671960d4497bf2cd301fd8e89b4a657ec3fb5b59ecd78bd5e17de29adc0530e5be4857ba5fffd7a0c0d
 MISC metadata.xml 340 BLAKE2B d5cbd8288964ad9666df4937cc4d1404ae0d184798e4eae7bf0452132764b4dcb7c08c667b7d8bfe28e0a879afebbe610ca8167133f135cdefe5782760194020 SHA512 8ab84573278eaf3c9a1f58930be664a6494293e2ece2196c154a4c639738616011310e3774d09697d8cee6ba333a67c3a0a06ac62be7e41437ff6169c03386b3
diff --git a/media-plugins/x42-avldrums/x42-avldrums-0.4.2.ebuild b/media-plugins/x42-avldrums/x42-avldrums-0.4.2.ebuild
index 1fdd52ce392e..b62c86af7c8f 100644
--- a/media-plugins/x42-avldrums/x42-avldrums-0.4.2.ebuild
+++ b/media-plugins/x42-avldrums/x42-avldrums-0.4.2.ebuild
@@ -16,7 +16,7 @@ else
 		https://github.com/x42/avldrums.lv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/x42/robtk/archive/refs/tags/v${ROBTK_PV}.tar.gz -> robtk-${ROBTK_PV}.tar.gz
 	"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	S="${WORKDIR}/avldrums.lv2-${PV}"
 	ROBTK_DIR="${WORKDIR}/robtk-${ROBTK_PV}/"
 fi