gentoo resync : 18.12.2020

9 files changed, 14 insertions, 13 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 8da5e7422e4e..6466b075b4e6 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 9202bec20c97..c51e6d433267 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -15,9 +15,9 @@ AUX bareos-sd.initd 481 BLAKE2B c14f2640be1685aaa0304dcfff2c272e37cb55cce92c7e28
 AUX bareos-sd.service 243 BLAKE2B 198c1f93f63fc015989523bae1932637c9e25d9b02719dfaa8aa1900d0a408ff686bf25f3966645d5c09d6ec6c78f3326a70c5c53cae42f1dd5fdbd88a164541 SHA512 efd8ee4abfde37cf0c9c660ba714b22cf5bd7ce895af20deb80c1d2747b985e2a61ddfa76a557374d78feeec3c68f855976bd9af5f7d61c9588b8db41287211d
 AUX tmpfiles.d-bareos.conf 35 BLAKE2B b670a9951d736618456644aacb28fbd2784c640efdc8aadd85e78d091d6d1655fc93e7dbf7df72c563f07baaf3802a4fa9d836a56766030b86b103a6b4715c4b SHA512 dbda57d059cb9e2e12e1e0c50cf8e58ab63b4ee0eff7ab6330d1dd5226483eb5be6b15b92dc996c979c4cec5586b97084f0687cb43e1f3b0edf742ff072975f4
 DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001 SHA512 3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2
-DIST bareos-18.2.9.tar.gz 10554581 BLAKE2B 1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1 SHA512 f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934
-DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
+DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096 SHA512 2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
+DIST bareos-19.2.9.tar.gz 12886739 BLAKE2B 93b01a71e0824efc8a82c62107de03a0e6df23f600e005c9a98f5f0e541b13c4181dbb11b79fdd2a6f144e1cdbc25a95b1b310576bd3b79721f757c652881626 SHA512 b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e
 EBUILD bareos-17.2.10.ebuild 10373 BLAKE2B dfb04bc664c47f10a7fcaa77d61f3432f14c53c585d0ea2b46e9a997995a7c0d181870402f920179c37928384a439aa92d98df27a2ebc4d75a03fe52c39a4350 SHA512 fdfae478a86f778f26667200a8b85b3f9453cdb240b8b02c7d0a01ce8c56f86ae7f16b3923db0a3a1ff4bccb5168191cf26f147316bd356bcbbe2b025bfe43a5
-EBUILD bareos-18.2.9.ebuild 11428 BLAKE2B 0266b5f4143431436bf8fcdeea238b6c080adb1180ee8fb14f42c2f1664dafa74cefee35f8c1dac544794f49ce6463ef8c7c5aa6b7604dee1ccff1c212fb5edd SHA512 ed8964a3a79470c3c8e4d88c79afd11dcfa6f5f5b83e0ad6feff9f17179dbe9151b95f6600e4e1fbf152ede80ea751c96768dfc2e719b4bfc8e088e69e65e0dc
-EBUILD bareos-19.2.8.ebuild 11052 BLAKE2B ad851f4d0bdd768ebb4bc5ab15591103f49c216a966bd028a5bbd4895c83f9da62bdec70ae17f9b056839cf1a58e936700f7cf95ca138b4f6b21eb64b5959e5c SHA512 f5e1e0a29224b0301379bc5307654bdf3e893aeef50a3fc35b9ddbd913ccf0c924ca5cc634ee472f145b68c6147aff360d2ba9c90148442eb98b4e08747593c0
+EBUILD bareos-18.2.10.ebuild 11428 BLAKE2B 0266b5f4143431436bf8fcdeea238b6c080adb1180ee8fb14f42c2f1664dafa74cefee35f8c1dac544794f49ce6463ef8c7c5aa6b7604dee1ccff1c212fb5edd SHA512 ed8964a3a79470c3c8e4d88c79afd11dcfa6f5f5b83e0ad6feff9f17179dbe9151b95f6600e4e1fbf152ede80ea751c96768dfc2e719b4bfc8e088e69e65e0dc
+EBUILD bareos-19.2.9.ebuild 11052 BLAKE2B ad851f4d0bdd768ebb4bc5ab15591103f49c216a966bd028a5bbd4895c83f9da62bdec70ae17f9b056839cf1a58e936700f7cf95ca138b4f6b21eb64b5959e5c SHA512 f5e1e0a29224b0301379bc5307654bdf3e893aeef50a3fc35b9ddbd913ccf0c924ca5cc634ee472f145b68c6147aff360d2ba9c90148442eb98b4e08747593c0
 MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872
diff --git a/app-backup/bareos/bareos-18.2.9.ebuild b/app-backup/bareos/bareos-18.2.10.ebuild
index cf1622b6e1ad..cf1622b6e1ad 100644
--- a/app-backup/bareos/bareos-18.2.9.ebuild
+++ b/app-backup/bareos/bareos-18.2.10.ebuild
diff --git a/app-backup/bareos/bareos-19.2.8.ebuild b/app-backup/bareos/bareos-19.2.9.ebuild
index beb2d8324673..beb2d8324673 100644
--- a/app-backup/bareos/bareos-19.2.8.ebuild
+++ b/app-backup/bareos/bareos-19.2.9.ebuild
diff --git a/app-backup/cdbkup/Manifest b/app-backup/cdbkup/Manifest
index 80b4b27cbf05..63c9566b2750 100644
--- a/app-backup/cdbkup/Manifest
+++ b/app-backup/cdbkup/Manifest
@@ -1,3 +1,3 @@
 DIST cdbkup-1.0.tar.gz 38252 BLAKE2B f16209fac8a4c64b628caf9770c67e944add326a7aeeec0b76a1018b8441fd7cfd92de1a657eb8efe0eb49f30fb3f0e135f090291d8c07da1fef313a81f4b0ab SHA512 f95a7540704c16a01e65397fb63b5b97011685c62d3c9a9b2e303470fed5a31f909cb700035466e89ccd181401fd3c19d427fa32c40ece1ba77c1dba9322969d
-EBUILD cdbkup-1.0-r2.ebuild 711 BLAKE2B f0242e29f54a329c823460e24a66d9c1f229cc76cd4104979c40b8451af0dbfcef96912b401bd9f12497108030b7ef0c31c1e39b59ae755d0de7968064070d3c SHA512 d7ba064e80eba0e7955b2de762350d1d87bfa00591f1a3da0c5105e205ea41bd9944cdf99b3d7918d14649afdaab960efcb4a5c533f07b1fa296a94aeda8d9f9
+EBUILD cdbkup-1.0-r2.ebuild 710 BLAKE2B 5621a7e85b63ed277e10586b6a99cbcc13d7ee500331c0b2b61cb770750ee6586202d27feb6eb7a9899b90955df3679177cd5206b92949d46763093d5c6ad934 SHA512 b33475e857a6d5081051fe24fb6e726de3cb940eadbb8bf0dfc0e0ca5e28ef7f9e3cfad53fb9a1398e8fa139ed367b9ec064bc42ac9ad6ff507cf5ceaa7d61e9
 MISC metadata.xml 392 BLAKE2B d840db592ea3cc9fe268652b9fe71d4fb5ce2637e4d0b97d1329d3e389678775677a530de9a31c76b0fd61667964d0a7899b899fa3d39d01b5ce39f2c4910c65 SHA512 12309a51f3fd6a5fe322a90d71cb554c07b1dcbe42aa5052f3b84f9e361dce74e90bf4915852b7d7d563488451f4e6148a9fc24bb7ef539178f4abc8f0805ff8
diff --git a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild b/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
index 3c748f2a7b6a..82f0538a7ffb 100644
--- a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
+++ b/app-backup/cdbkup/cdbkup-1.0-r2.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
@@ -12,8 +12,9 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="net-misc/openssh
-	virtual/cdrtools
+DEPEND="
+	app-cdr/cdrtools
+	net-misc/openssh
 	virtual/eject
 "
 RDEPEND="${DEPEND}
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
index 81ce58b4b27e..1d8937efb07f 100644
--- a/app-backup/rear/Manifest
+++ b/app-backup/rear/Manifest
@@ -1,6 +1,6 @@
 AUX rear-2.6-Makefile.patch 879 BLAKE2B 60db156e4ac420f6d370b65c4a32b503f0ad958f1f2d3e698fe24248ebfeb94ccada049f580b6099385ad39ce57d06a3d4fbf30fa4372d85b7df57281de8f15c SHA512 8d1e3329b768b153124ebbebd0d70ecac19fababaad92d7789474709f785f74adaea3665d8f1889c344e03f58552616a16b71f541a8077c7b41adcbd9fa54c75
 DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088
 DIST rear-2.6.tar.gz 750866 BLAKE2B de803951c040bb85d4659fc81ffb9264b2771a45675aca4eb0a6318201802475014c2b760415ac61ab734286f5e1e84b0c858df166b9be356384a243a7badb78 SHA512 0b6deac8f1b4adc3bcfcd19e82b5e5719df1c1c2347e3dde9bb47b6086856ebf5d08e485b876633190bb6f92a0e1c567bb65a30554205a32eec4b929e5815a6c
-EBUILD rear-2.4.ebuild 848 BLAKE2B cb6d62e0984c11bbde7f61cea72f16b10119c98047341100b2c6e8dcdb25a02551f5f8683df2b4efc65727ba9777b057f388e28dd2a6df95bde3cc37606a960d SHA512 78a8fd39ea5df4f65362a33c5d18dc16e52cea47b0aeaaf10ada27eb0ed01679b0254c55bba318ff1464f9ca55c3dd606b99a4cb71c37956eb961e64dba099b7
-EBUILD rear-2.6.ebuild 1384 BLAKE2B 5f52d341548b80d46cd461a02c049c6c11947f2f6cd7d00b0ef9c8e7c8b27a2d1e0f836758cfa7bca670ff182af5553e2341d4eeec2f676b922b6d01dc96589c SHA512 f8feb2cec9b17a9726c693bbcf5c6cfcc2b685bc22abb2a22f053807b4f4e099da833cbfa3d54cc8a46ddd458ab0601877b926668add49206d95d4980e7290ff
+EBUILD rear-2.4.ebuild 845 BLAKE2B 4b0b46b7e0bac21849b77d41da8a442377a006fbebe868a53dcf2aaca4dde192ad5b95700112b800a3b55cb631901ffa32522be4dd094db87c8702f68ee4bbe3 SHA512 bd11af749e16c4c65ccf87a0f059c9c5b389b23b74ae6792b07b7667ad38198b3904357b4fa6597b18fce7405c43435b1c646e03111654fe7c474b7d32f5b68c
+EBUILD rear-2.6.ebuild 1384 BLAKE2B db9f7f3bebb2f3727bd0880432b8ae3735dfc94d310276e4ed1469869546f6d76f9c3aa1bd96140b6fd196497bdc7018a0dfcc6e4e3b1965ab53cad70997b88e SHA512 4f9d2114d74414b1679f3f3b01e2beb8fa7301935955f53ff41245415e23148311c7dd681811b136ff4d90d8cff651eb7f295e9a33fba70489eba92f4ff79769
 MISC metadata.xml 1014 BLAKE2B 8216e23c54712cf7b79858ef34b46a4f232aae0f9f3ccec5626059c07a0070445cc2db019badfb1129365d1d47de8b02d11107796f7e86d4889d39cc4e2b7a9c SHA512 b3b62cb4b708bf7fe291d5245eba04d53afca274e0e20f48f9291a7c76d64abcda07176bb9679b95b25e3246683157e5369f16535bc7b37f7a338f1b938e139d
diff --git a/app-backup/rear/rear-2.4.ebuild b/app-backup/rear/rear-2.4.ebuild
index 55b55d0c90cc..498e7a6f47ab 100644
--- a/app-backup/rear/rear-2.4.ebuild
+++ b/app-backup/rear/rear-2.4.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,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="libressl udev samba"
 
 RDEPEND="
+	app-cdr/cdrtools
 	net-dialup/mingetty
 	net-fs/nfs-utils
 	sys-apps/gawk
@@ -23,7 +24,6 @@ RDEPEND="
 	sys-apps/util-linux
 	sys-block/parted
 	sys-boot/syslinux
-	virtual/cdrtools
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	samba? ( net-fs/cifs-utils )
diff --git a/app-backup/rear/rear-2.6.ebuild b/app-backup/rear/rear-2.6.ebuild
index 6e4df5c99df6..79da6fa23dec 100644
--- a/app-backup/rear/rear-2.6.ebuild
+++ b/app-backup/rear/rear-2.6.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE="udev"
 
 RDEPEND="
+	app-cdr/cdrtools
 	app-shells/bash
 	net-dialup/mingetty
 	net-fs/nfs-utils
@@ -25,7 +26,6 @@ RDEPEND="
 	sys-apps/util-linux
 	sys-block/parted
 	sys-boot/syslinux
-	virtual/cdrtools
 	udev? ( virtual/udev )
 "