gentoo resync : 18.12.2020

25 files changed, 44 insertions, 39 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index fe37c601f3cf..be3ac5c1b224 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/bashburn/Manifest b/app-cdr/bashburn/Manifest
index 886033fb799b..db8b56e4cbe1 100644
--- a/app-cdr/bashburn/Manifest
+++ b/app-cdr/bashburn/Manifest
@@ -1,3 +1,3 @@
 DIST BashBurn-3.1.0.tar.gz 91295 BLAKE2B 98b813a78029becdd2b2167e9c0d318bb2d8aed6ed5d697047ba81cc4fb87795439c8f4182b53e5db0286a03028b489d0b6e73d5d4032d47eaaf2ea0b88894e9 SHA512 9bded7a67b762be89993a6a7564d6a32f4cac209f9d16a4a861a5a36db92eda6436c2b80b89d57c051bbdafb0549999e54ce6e26477f664481cf60092eef90e5
-EBUILD bashburn-3.1.0-r1.ebuild 1346 BLAKE2B 46502ddeae8726bba3b5512a89010443b72dfa0f9ac5380ff216a130d68a3bd5c05b202bc6db5bfc12e7b772fedebe28bc73ec7068f0c4f13352a0fa14d5a73d SHA512 70a48f14f109daff7b563a3f17ec6dec6a2af979c2aceabc1c66b47c211b4bbd2154aaa3abb49decefcbf800f5fc6b4498f78571475f3133ec482c34ae201a19
+EBUILD bashburn-3.1.0-r1.ebuild 1346 BLAKE2B 98ff776542708064808508680b348b24445e4711b03466876002c1b5ee2ca49af15907d243afcf08564f76aa9b7add11c797bac41630ccd46d65e51b96abbbd5 SHA512 79eb96a3166940ae61856e9fdd7117aa2c6417daf22b29878dbad613df99d697024439ca7d67d5c06ceef3743bbe0bac0d10df9a4d8240c0b4ee1d5cbda38af9
 MISC metadata.xml 570 BLAKE2B 29e9f0d65fb879b7abee7605a0627de25f37952bf81072fee9e9d4bf2772b82321d4f4750e812983bea4f77d718b908584af76582fbfd4574447e1ce7ead0b2e SHA512 4a4f80ae83dd1cdf986675bfe70800be286e9041933602739a44756d88a12ad129acea090d36d37460eacef32e375efcaa21d074f0e53b30529ee0987fa2d1e4
diff --git a/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild b/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
index d4b529bc22ec..d945b4ada648 100644
--- a/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
+++ b/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 
 BDEPEND="app-shells/bash"
 RDEPEND="
+	app-cdr/cdrtools
 	app-shells/bash
 	app-cdr/cdrdao
 	app-cdr/dvd+rw-tools
@@ -25,7 +26,6 @@ RDEPEND="
 	|| ( media-sound/mpg123 media-sound/mpg321 )
 	media-sound/normalize
 	media-sound/vorbis-tools
-	virtual/cdrtools
 	virtual/eject
 "
 
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index d469a3da8b1b..d571d975c4f6 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,3 +1,3 @@
 DIST brasero-3.12.2.tar.xz 3742120 BLAKE2B 42cc60d3f4e26e948321c34f2514172aeac5a1b2624e6b23f27cc9725efd5cf0844a54175161b4c94601bbd5c4a6f18ccdd62353e862eddaab17e0d164f4694c SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f
-EBUILD brasero-3.12.2-r1.ebuild 1965 BLAKE2B 465d7dd1e994898970a10bcc7f98c352dc0902e6ada2712f85d5034a5397c56d38ad52c4b95559baf0a9317c3b63165a7ed8f3d77bac9208cdb894c3d7c5d852 SHA512 a06e610e8f9e5a76e1c13f105b07e72f1e8485805ade65c76b1edfabe6ad61c48e4e4e8f4372bdaf522658134a67ec238ca1eb3ea4e0127853fe09b751d5fd5a
+EBUILD brasero-3.12.2-r1.ebuild 1966 BLAKE2B 64356df46aec4079532b22f9e4a9f5ab68dc2d88e0d49c31acc4b776c87e51af1e99a9abe2bacea7267944097cfec49063afb44f294346bf5418d97ea66e5d93 SHA512 a9bdb3a140a76bfe07e795509d3e568297b18218a6dc80dc94b0097ba7f983964d8acbdda5fa6ff05466ee70abc4e1a55c212927985732476557e0d91c192d2f
 MISC metadata.xml 746 BLAKE2B cc74b666873593a356e42643f62e16a4919441f08ce9645e367ce5f52b6b3c3d0a2bd1a5bc64b49348239b04c7543a66993926d216a7ada19f2129417106e1dd SHA512 9824ae80fa067cedf46aa47f83d481b18704b94af6258657eb099bde328abae196b8f86ce7e92a800fea6b657b5a774afc37888fb92b560fda1403d8adf06c7d
diff --git a/app-cdr/brasero/brasero-3.12.2-r1.ebuild b/app-cdr/brasero/brasero-3.12.2-r1.ebuild
index 15af48340c06..917812f33104 100644
--- a/app-cdr/brasero/brasero-3.12.2-r1.ebuild
+++ b/app-cdr/brasero/brasero-3.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,8 +42,9 @@ RDEPEND="${COMMON_DEPEND}
 	css? ( media-libs/libdvdcss:1.2 )
 	!libburn? (
 		app-cdr/cdrdao
+		app-cdr/cdrtools
 		app-cdr/dvd+rw-tools
-		virtual/cdrtools )
+	)
 	packagekit? ( app-admin/packagekit-base )
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/app-cdr/burncdda/Manifest b/app-cdr/burncdda/Manifest
index 98abe94e0f5e..98c815d25895 100644
--- a/app-cdr/burncdda/Manifest
+++ b/app-cdr/burncdda/Manifest
@@ -1,3 +1,3 @@
 DIST burncdda-1.8.3.tar.gz 23710 BLAKE2B 60e70eaa31d2c2eee2a3e3a874f28dde1fc1c4d221b9eb14119666f505f94275c78f4aa87b823ee7c926bb657492a0cbc9830635d2a3d781b9853ec8866c5caa SHA512 b0ddf9457ca9a1b8ad07b43aba4b5c6532ef09aae85b363802084bcf7bbb4d4bfadf980af98862dfbdd72e257d287f1e517323ebec7432be3514880e393e9f1d
-EBUILD burncdda-1.8.3.ebuild 713 BLAKE2B e420f819d332959355b55b3723c49bcab504c88fa923ef378fb8bca1f0d0642c31af6868d21fb04214e7965504175fca919d0dd7a36221c5163362075ea48074 SHA512 8f62740382d174173d5f31e048e3831a287d65a0025ccdbb4d4b546d84cf6872a2a4bde2f2322febe1349b8b669c01f8f9ed7ee54401b236f48132031b548a70
+EBUILD burncdda-1.8.3.ebuild 710 BLAKE2B a3635263c7054e6a305c68a8a68226094d04e96dd8729493a06e4f14c61ccfc3811ddefdd10e0367555c6a3c01c9fd7b1729d8d4bce78c2828672c4cb1bf031c SHA512 25e3f5322989e148592caf598134ad88db3258c67755b865dbe712c1f94b00b24d7460537fb3dcf681239402a5f3b1fff74343faf7148ca6b5e292f6242f0181
 MISC metadata.xml 527 BLAKE2B 9051fc1e5e9905f5e86eb2b8cc3cbfaeb1caa5e25ac730a45f63c99c7acdec20e49f004d3248efb7bbee886758b9ec350ffffc6c979c172cdb6898eebbb27da0 SHA512 7b37753fad3ed11f3afa59b31d51ae2a90336ebb16f22b20a8c1cbed06c4f430126708eb5ff63724204b6cb10489c966cae3d3cb6703b2d440c52c98ce987352
diff --git a/app-cdr/burncdda/burncdda-1.8.3.ebuild b/app-cdr/burncdda/burncdda-1.8.3.ebuild
index 0d02e2c31549..b782ab530772 100644
--- a/app-cdr/burncdda/burncdda-1.8.3.ebuild
+++ b/app-cdr/burncdda/burncdda-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,10 +14,10 @@ IUSE="flac mp3 vorbis"
 
 RDEPEND="
 	app-cdr/cdrdao
+	app-cdr/cdrtools
 	dev-util/dialog
 	media-sound/normalize
 	media-sound/sox
-	virtual/cdrtools
 	flac? ( media-libs/flac )
 	mp3? (
 		media-sound/mpg123
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index a91ac72b159f..b2e3878a02a2 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,5 +1,5 @@
 AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
 AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
 DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
-EBUILD cdrdao-1.2.4.ebuild 1276 BLAKE2B ab937b86d99dcf9f2e97a5f42bb88f54ecca1ebc30eaf2afa5e3bdd2becd4b219cae6dc04f1755d1e891d6d01ed94a42d3b6094e324ce2f4d24ddf7870a86c6e SHA512 2826430e12617ed865524ce4b70c21b250cd48b3d28d8c72f53758667082e9cbd8d2b484a8de7899b5b950323967f91de9e6157f137daf3f36b9e28f64975edb
+EBUILD cdrdao-1.2.4.ebuild 1276 BLAKE2B ae784b2cf7a87ff73009efdfb21adb805f292ac44fd9595429340faf82cb94f24f1019c4a552f81e2d085b8b8d2d963be541f8f15f5717dd4d6ca66003905788 SHA512 74b72d8c9979d868c49e4a25bfef8bb4555c76a183a8d6f040e4fca1b9e220d226964492767ef98cfbaf67093f4f386778cbd9cd4b8fc304ea38890117318fd5
 MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index 242e7767047c..89a6b02600a9 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="encode mad vorbis"
 
 COMMON_DEPEND="
-	virtual/cdrtools
+	app-cdr/cdrtools
 	encode? ( >=media-sound/lame-3.99 )
 	mad? (
 		media-libs/libmad
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 14fe60c4a20d..57c70cee8925 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,6 +1,6 @@
 AUX cdw-0.8.1-fix-ar-call.patch 680 BLAKE2B a258766221e3be5eee1d8b1ed9670b09d6119f868caee45c2af72e6c83d44c9073b679162fe275d98e4aa5f8a0e1d558cee83b7eb114d6a7584cff6c88a90a54 SHA512 412da6962e86f263214e883935778cab987a0895cd633dda250a80155f5304350dd4c0682d0b3f262c8801b6bfd858349b44af08288237b5c0d53ef0cd4c0dc6
 DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
-EBUILD cdw-0.8.1-r1.ebuild 773 BLAKE2B be965818072076042539e98c73559d2f38034446019a24b1ca8e7a87727ceac103a7df491754165019979ffc47e970ecea816b71bb256c1e352c9b113f3e939f SHA512 7389a0b4a34041b1dfea66c984c94f4200f42b619cd356c849fc828813715e19f25caf1207b9fa1dead1b4dbf4f701511af0451e6968d641ce4b71c755fd3e3d
-EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 6be4e48db38ceb81cb4c819552def61d7f96a8b35faa01d02bce8fde9e3915e2fe39cb6010dfd114c24836db2b2b34beed798203d7541022d6acef57a8271208 SHA512 e2f975ae1e5cba6b086d52fa104aa67d0acab99cf6b4cbc04a36880b12cde300d788fb41a7e65e37e2594ad009211d1106c377ed1fb0890052c63c9ed874b0d5
-EBUILD cdw-9999.ebuild 849 BLAKE2B 0323ea79202be7e1a0a90b614296e3542d5a9c906dafa65a52b346b62cd0760dedef8f35b09d4a458730b63417fcca8ad2bdd8720a35ec3efed4e9cd2ea6567d SHA512 d692d443175347a3719df1375897d4f94f99e6d3538521ea9465368646afa862c0531bce39f44d68a88fa761541a02326bbda0a9dd6b2eec0de2c5df22c8f5f7
+EBUILD cdw-0.8.1-r1.ebuild 773 BLAKE2B 21f23121e6a768553ba716406f5f6a85f2439ae89f72d3c544be6da81804966a2df259c22470608a50183afbff0dc3e612eda3915481eb7bf696806a1a2da9df SHA512 4a638e201cc290a51223f48eaf82a46b05e50ace89bf881952ab0e76e66fa38077d84dd8359e8a133bd53774110f83b2d6949f349629cd1b7ee774e37d7f1f1d
+EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 7db6d921230dc4e4ef268c3d20399c428de148f5a1293593530f6f651736d3ecc9b6ae203d209a490890d4379e54e34f06e9857901e809bccf7108020bf79213 SHA512 4c0447b1797904aeb82b6137d1cb5be39a37510171dc5c7457ab796168ab6fa1a5560ad41fb3db5bde9420e415101e1b8eba12e2796f33e9c70f71f546a96bd6
+EBUILD cdw-9999.ebuild 849 BLAKE2B 90d2548a91d97e58118ab8d1bdd5ba50a36742c3ec35b8e163c3c35d46eff7d095c9a823a34c29cc1bff3447fe2c0234f6984da2ddaabbcbf55c1406ff81108d SHA512 a21229cfe723712d29c76746a3613c214ba6098ba13b3672096a2e756d203362fa4afb91c9a230d8e9f79328a3d59406159ed0713e9e3add5421f06ee6b2984f
 MISC metadata.xml 446 BLAKE2B 6313db12893912ba680ec7c27d939ba2fa7c81b6cb2d7132052b5a0eaf674ce7f71703a8ea8324c61fcad6101b6bbb1e07f9a857bdc1646d96c27e6110b6b495 SHA512 304f1a9a99962e295db23822a327cc5d1b8f2f049bcbbbe562a516a5bf5171b5d93a9886353d02dedc32d1d1220f519bff13c35a7c00d1463a6af4906ad63161
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
index c524d89d06de..317cc629ee9f 100644
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
@@ -13,11 +13,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
+	app-cdr/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
 	dev-libs/libcdio:=[-minimal]
 	sys-libs/ncurses:0=[unicode]
-	virtual/cdrtools
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-cdr/cdw/cdw-0.8.1.ebuild b/app-cdr/cdw/cdw-0.8.1.ebuild
index 3b50e3848a7f..b4597335f09b 100644
--- a/app-cdr/cdw/cdw-0.8.1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
-	virtual/cdrtools
+	app-cdr/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
 	dev-libs/libcdio[-minimal]
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index f23f85b84c76..1e52c861c848 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -15,11 +15,11 @@ LICENSE="GPL-2+"
 SLOT="0"
 
 RDEPEND="
+	app-cdr/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
 	dev-libs/libcdio:=[-minimal]
 	sys-libs/ncurses:0=[unicode]
-	virtual/cdrtools
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index 0e7ce70906c0..bd30ed42ad0a 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -9,5 +9,5 @@ AUX dvd+rw-tools-7.1-bluray_srm+pow.patch 427 BLAKE2B 5caea4e6afd1af9b0afd33e9cf
 AUX dvd+rw-tools-7.1-lastshort.patch 593 BLAKE2B e24b41b6eb39961568133f91a110afc87b26597ead0b623deb22bff11a40638bd5faca1de75b8289484889d2d2768077fd637dfe57fdb8bc9f61c1ddd6bed91d SHA512 554b1eb09a00e6bba38acc6ab983f3e0e810b919eb2205f9ee6473d83edd0fdd524e29b844f4c5a55f8044bb72457b2896a24488d691773a00aa355dd1be9975
 AUX dvd+rw-tools-7.1-noevent.patch 783 BLAKE2B 78f27d65759b98607ac6e3eb29ce44c2d88029f7fdaffd3a6d305166b82a069c8a8621b2c680bfbb3a9a2e6585370bc6c1503b4107e903f69099565bfdc0de8d SHA512 0df88a56b3b776934fea0caca1ac247b5b5416fa4985601ac7996633a833b4d264b334d6bb9c5d7587227529ee36a7f2087fad9f6851b4cde8918204d8718b47
 DIST dvd+rw-tools-7.1.tar.gz 140846 BLAKE2B e456be6ee8d1863e78abc6d494a1ce08a49e3aec9b45533408c33ff4620dfc450b968280ce0453b0c0d966f3afca0d23e1ed7e3497caee8216561ad85599b138 SHA512 938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31
-EBUILD dvd+rw-tools-7.1-r3.ebuild 1535 BLAKE2B 87c7c1af66dffb6b9fe9d6c0bbc7264e6718d73b5ddf2bb6f5f780825cb79e96a49f4ced1cfcc2b200879786d73e27f7fdb4a6f1d80eed1827809305b57a4552 SHA512 6100514ba13ee7e65b7e41baf6da9bd98a3e46e78cbd0d48b4073852e237dcfa9e0ae73d0a27eb29f6a994e28185508c79b62d0d1dc7eb9973a5a909d284a921
+EBUILD dvd+rw-tools-7.1-r3.ebuild 1535 BLAKE2B 9266e418664e83e9420a0bb1dc367550c2b61f2422e224f5024ded0194c6933d79eb5781cb11391d6144e5af3f22aee8b49bea6e05f9f049256cbeb24121e5cd SHA512 c3d701aa8c6da697c6031d03532df6dec5f89f9adf1555f1a4708122b727ece5a4f0f5b8e8c6e07b35b5861c6714692f3c4e07861f4bea24a0721ee50a070d99
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
index aee2f063fd21..c797c1c67194 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="virtual/cdrtools"
+RDEPEND="app-cdr/cdrtools"
 DEPEND="${RDEPEND}
 	sys-devel/m4"
 
diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest
index 9e0bf01a1b2c..3c62878d4d3c 100644
--- a/app-cdr/dvdshrink/Manifest
+++ b/app-cdr/dvdshrink/Manifest
@@ -1,4 +1,4 @@
 AUX dvdshrink-2.6.1_p10-fix-paths.patch 793 BLAKE2B 7bca779d2e17ed4388dfdf8e6798bf11111a3a25c3bac722f0a5e428b703ccaaad0cd83f8e906d5ed17d123745d073f12d83c130f03fbf38d8a13f981b85cf5f SHA512 8302a9e62b57346a107857c3c3b7095c5838771919b16d4f248c03582100fbb9ab3d55aafbe8b3a911dc1fa89c746a438a9da60ca77af7419068c5bafb9816a3
 DIST dvdshrink-2.6.1-10mdk.tar.gz 1087571 BLAKE2B a45427483b5519ee7abbc787e7afea2f9edcb49f8f6a15843184e7c62e51f7ebb18ad1db35ea695004eda9763dfc9b2a5522b7b4c279a2b63a71b96d091ffe37 SHA512 6766f95bd2bb29ef0877d9b22bc45eb2c508ad2d1a7bb99f84b3f858987fc098a696f15f953efe006bf9556a73f6aa0e6247afcdf8e4c5dad826ddba97f02c06
-EBUILD dvdshrink-2.6.1_p10.ebuild 1057 BLAKE2B f01d636320244c7ee4bf287a376bb8afa4e1d436501fd8ff590e0412fe6ae6e8d8155f94246bcd2c81c9f407eefb90214db7cbc8bd7f62a48e1a85d2eb438f04 SHA512 9b093d7c68411904176f8884c1aeb579a0b56f7c3d8ee8b2c93c032c446ac51f0d175a80c816a53d451918969c939eb2cf7832cfa4edb8aaf846e62097c5c0e6
+EBUILD dvdshrink-2.6.1_p10.ebuild 1057 BLAKE2B fb2aec0b5becdf5fb614772ea354e83b2f016ef7188738693f5f7989cda135c8829a420c9fac0eae4f0504f3028ee24e6d07565e1a4c079c6c7826dc993ec05e SHA512 8543b0872cd04663d1aa27bafb38c1fb7415ffe2bfdbc0c86295906a893f9eb06c6915b0881dca073619a55e00e8e12279763550349a931fd41eb07699a802e6
 MISC metadata.xml 427 BLAKE2B 0d25c5f4c9d81b6c2e3fefb76d87d1df9e975455fe0d55b241b43549cedde20ff538cff1472121c3a21f9e176a233b69890cd60e55e50018819467192aa4bb53 SHA512 c0a8f2ce1679df431c652810e91285db1f1602a281b432c0dfe5e013ff3d25c22ab23852991a0fdb9cbccbebc5d07d61cce10ffb235012cb0b0b064219d5391c
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
index c7e5f5c4269e..e052a53b1fb1 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,14 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk"
 
-RDEPEND=">=media-video/transcode-1.0.2-r2[dvd]
+RDEPEND="
+	app-cdr/cdrtools
+	>=app-cdr/dvd+rw-tools-6.1
+	>=app-text/gocr-0.40
+	>=media-video/dvdauthor-0.6.11
 	>=media-video/mjpegtools-1.8.0-r1
 	>=media-video/subtitleripper-0.3.4-r1
-	>=media-video/dvdauthor-0.6.11
-	>=app-cdr/dvd+rw-tools-6.1
+	>=media-video/transcode-1.0.2-r2[dvd]
 	gtk? ( >=dev-perl/Gtk2-1.104 )
-	>=app-text/gocr-0.40
-	virtual/cdrtools"
+"
 DEPEND=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-cdr/graveman/Manifest b/app-cdr/graveman/Manifest
index 1625da4ae1be..605cea0dbc7a 100644
--- a/app-cdr/graveman/Manifest
+++ b/app-cdr/graveman/Manifest
@@ -3,5 +3,5 @@ AUX joliet-long.patch 796 BLAKE2B 308e8471cbbcd2767370c452417d64bad6839126f95a4e
 AUX rename.patch 505 BLAKE2B a7794bdc1a45b34fee773fb0482054b80506d7865c98e7c88f5995c3c4ee377086470d8288640f7e9686e208ba43e49ca2631348d709fa48357ceb815ec5218e SHA512 5ae9769ddd1c26a34d155d38ec2dede550e63be6fa7cb7f8a3cdd7b289aadce370c3f015bac91d0379b20f9f5a2265daff6f69b22350df9486b515c956d7abf5
 AUX sox.patch 1396 BLAKE2B c6f193498e8086111a90aa0811e4d3396c743722a8c31ac8286d37d3bf98d17bb12bd505574af2fc10633a796cdc5bf07924ebd7a2bf63e2fc8cb470feaa8ccb SHA512 545e3439a81e131a704c53e0c5a016d32a99e5bbda788ef5f3a6b1819cac7f4d5b98688e3738f3e6f1440eaba3a69efc1b2718edd578c9e4499166e4d527bd2d
 DIST graveman-0.3.12-5.tar.gz 962523 BLAKE2B b7650c79ccd379ede48d9b1a9abbb1504e88e787feaf7897f50509d92ff51171e366e99bba4c9f9d153d92b4bbc5970b9775064e7f482fb0b1ccf12e5e50c4e0 SHA512 c09ec1b5273411e61ee568260eb921bb10aafa90ccd0f4074228741c1f0470650368f96e595763d77b46c87fa4a038a1d5a3a022f8019afd5f772754f9636ee4
-EBUILD graveman-0.3.12_p5-r2.ebuild 1674 BLAKE2B 9de76d9cc919a3859e57e0eefb3b8310b370729ee22b73219f69aa0ba6ffe6de88f8988f376a9730b787229e21347f64fee77d9ded6c28e56a354c9643702cbb SHA512 5907963ae33523bb1eb1460ef9438d5240ba19a9f79f89f6d2c7ccda05e3112badb9881f3354ed43244990773622e91fa9462b31c5133ba75c468adea9c8d7a6
+EBUILD graveman-0.3.12_p5-r2.ebuild 1671 BLAKE2B dfd7db4044f5e0f72cd2561191cc7938d5c64e4ad7f60883d155ef0a32e02b85048c04c561b94998d220bfeaa8d98fc47b2553ec624067952967f326a8ea3d1a SHA512 db1f956b2c3d8588760d7bad8f651c0fadc925e3ef0faaa7860d25b7337195037809bc608d4d04af6e2b4b19920035bb8dc24c834c113649aac0f0360613a140
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
index f38d627c9490..bb2aeac49bd6 100644
--- a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,10 +15,10 @@ IUSE="debug dvdr flac mp3 nls vorbis"
 
 RDEPEND="
 	app-cdr/cdrdao
+	app-cdr/cdrtools
 	>=dev-libs/glib-2.4:2
 	>=gnome-base/libglade-2.4:2.0
 	media-libs/libmng:=
-	virtual/cdrtools
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.4:2
 	dvdr? ( app-cdr/dvd+rw-tools )
diff --git a/app-cdr/mp3burn/Manifest b/app-cdr/mp3burn/Manifest
index b6f2c5f00149..1b7c48df7b38 100644
--- a/app-cdr/mp3burn/Manifest
+++ b/app-cdr/mp3burn/Manifest
@@ -1,4 +1,4 @@
 AUX mp3burn-0.4.2-build.patch 450 BLAKE2B 495a56ba698a6e160583cdcdfff895f09cb478c9a7d03142aef5e4a038488a5127f0d8ad5a01f2ce2b4b351f5309339251c39582f49471b3865b182184ffc7a9 SHA512 0b3d88fb3d716da0ba97e4a041f7df3204c67b3033374f592a37d4cc9414ee6fb95fe7ab50b9e47036ba353c2382fe18cea5d8bc2993cfb374c93a31858f38f2
 DIST mp3burn-0.4.2.tar.gz 17166 BLAKE2B 099954b2bd5ba6ff2dcbdade63b7bd2ffeaf4c269eee9c856149b8a899ed995e131516446b80c905850733e385bb4f6cb52ad2cb15fe4306dce417cadbb359ec SHA512 96234f7e7a528b0073e3cb8130d5f606741532954e54de56757b4b0945d24fa72860e62ae1d78a13463ed8dca22848d99d49791957ba3c92cb60591d0f54f261
-EBUILD mp3burn-0.4.2.ebuild 705 BLAKE2B 63105038984bc944b75d49b76ec82b66e6102fef55cd01266964d9980e277cc72072394e820e97e7b377e7a80b4db94ea7eceec3df738268e3e73605180bcc3b SHA512 5ebe8e11aa4b933137dc69d9f3473b6d41dc81d2ebb158262bd549d3617c037fd048774b6831766b8356b25e323016b1b18ad959ae901cfb36b1909f9d78e079
+EBUILD mp3burn-0.4.2.ebuild 702 BLAKE2B e2a8ba047672e76cdf26c973a6f4c020abce25acde9bde05088ca87da109c495e42923da9de83e0fc328e87da59dcb83c4dec46d04fd05801eeb6d377ef4e54e SHA512 d75cfca9a5520d161a46ac749834fd6639f2b3f88a7e36acc6ed104d176eca593cedf4d8f7ca310ac37c80c3265d17228e30589ae620534996c80e1c60fb6f83
 MISC metadata.xml 244 BLAKE2B e3e13de16e966b5bf7cb78a5941c209f349ad3862e14028e8b48825b691269a8397f681ef076c017ef72c14d1adecc64f6a9582a20eaad8c002f5d254b4cdbd5 SHA512 5dadcff7ab9780843e5ff9b58fc515cfb20b2d19633112459a961e4fdceff3f6e17b3490ecb891d47d5f448500a826ff673b62709e91864e4f0d87c624d62445
diff --git a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
index c391931b7233..8c1183cd0515 100644
--- a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
+++ b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,10 +15,10 @@ IUSE=""
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
+	app-cdr/cdrtools
 	media-sound/mpg123
 	media-libs/flac
 	media-sound/vorbis-tools
-	virtual/cdrtools
 	dev-perl/MP3-Info
 	dev-perl/Ogg-Vorbis-Header
 	dev-perl/String-ShellQuote
diff --git a/app-cdr/multicd/Manifest b/app-cdr/multicd/Manifest
index dd4bb0070bae..0b3e4c5b99de 100644
--- a/app-cdr/multicd/Manifest
+++ b/app-cdr/multicd/Manifest
@@ -1,3 +1,3 @@
 DIST multicd-1.7.5.tar.gz 22437 BLAKE2B 7b355fb6a7a99322fa4c3502da7f3949ca372fdebff786ca239260129432596a8556c68d62184ec22ca1c4b1f31b1ab3940793f8656c88f6e1fadd75c96c18d0 SHA512 c17be38d36e0c81a5a230729bbf78c26bfc4e1288f959f6a176951b142772727b58e976e30d12beb05b835aa4126b5410f6f2f8a5aca4bbb89794d336c072b85
-EBUILD multicd-1.7.5-r1.ebuild 473 BLAKE2B d6079aebd43092ac316711947e140f55141a77729fae1234638bcf8b6da5e5baa61e213834b98f9931e11d217626178d134b194a519494dc8ff3a55aff1e6dd7 SHA512 ae46e61d90dff98ee5b3122dd64a88d6f7df04e04c7cb1f3ebfbdf3750c60fd0ad403d996bfbaeb10b3ae57309b712b09cbd706feabe05fb925939ea5048c407
+EBUILD multicd-1.7.5-r1.ebuild 473 BLAKE2B 1492453c3e9c37cafd7f06f778ecd9ea2001b5c2b2167351340e8b0ba57bdd367c0e048b35ee6a5dfbe0c6384717ac4e8d9c4148e479b7b782935ec71a03da90 SHA512 220e3680e807516c947484f8cd4794c8d20566e84eda0584f94d549dcee56f14351b7a8e86ad52d2c166910bf6ddcb4eabd2696f3cfd12680705f39c8148bc32
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
index a0811c55ef76..aaba8ca308a8 100644
--- a/app-cdr/multicd/multicd-1.7.5-r1.ebuild
+++ b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,8 +12,10 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.8.6
-	virtual/cdrtools"
+RDEPEND="
+	app-cdr/cdrtools
+	>=dev-lang/perl-5.8.6
+"
 
 src_install() {
 	dobin multicd
diff --git a/app-cdr/tkdvd/Manifest b/app-cdr/tkdvd/Manifest
index 7dba05d7a58b..e05edbc4756b 100644
--- a/app-cdr/tkdvd/Manifest
+++ b/app-cdr/tkdvd/Manifest
@@ -1,3 +1,3 @@
 DIST tkdvd-4.0.9.tar.gz 71046 BLAKE2B 0253f9c891f6ee617ef392279a126b23e031025df96fdd261a440277724d910714db721cf0d92e8f20c6ce4df5a5ae5c7fac1776a5fd42bf73cb5ff31dbef628 SHA512 948cbbf98338aaf92e4e74e81fbd996d7646f6737a7adfad16063bd8747994e33e034b277942536423d9c099f85dec6649c2be6f1a0e1efba8da7537ea426820
-EBUILD tkdvd-4.0.9-r1.ebuild 803 BLAKE2B 72214a8c5f5aecf08cf62a894963cf9dd787930844ab00414991871483e3dc76ca1705b5c1532089ad2745815a00e8acc8749f2266ef64859d7f14b292437451 SHA512 2b8546dd82fbcf558ef752c8f3cc4e4b366ed28f392f06fae9a00acc2c8e596e8ceac9ca89613933a037c0af2821597c0a28d93c0eae2ff50e259539966e8fdd
+EBUILD tkdvd-4.0.9-r1.ebuild 800 BLAKE2B 4728e13410c05f400ad0c7769fb0f62bbfa6148e792f63638f69af9d4696638cef885a2388f3f0b1895e22411ef552c94ce8ef3092a3a09c405aa4cafbe1d3e1 SHA512 bceed84c447a61e86502eef8100d9edf0fa5484101fddcf6c0a16926560c32f796aa39ca18857e1cf0cfca85193dde1bc5aa44076fe03bb6ac26c14ed77c720c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
index 96e958e6843d..4370360dc7ad 100644
--- a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
+++ b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,10 +15,10 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
+	app-cdr/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-lang/tcl:0
 	dev-lang/tk:0
-	virtual/cdrtools
 "
 
 S=${WORKDIR}/tkdvd