gentoo resync : 25.08.2020

59 files changed, 313 insertions, 2271 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 54d998ea7f95..b81654ae29c7 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/attic/Manifest b/app-backup/attic/Manifest
index ddd93d650d70..eacaf4361bda 100644
--- a/app-backup/attic/Manifest
+++ b/app-backup/attic/Manifest
@@ -1,4 +1,4 @@
 DIST attic-0.16.tar.gz 87985 BLAKE2B cc801d8e3b28f6041c053f368c1d5ab00b1b419928d6a84647da7dccb7fb46b477898249873e90ba15c721468c09ae243d450fc978fe8cc3947b2c2e035f2aae SHA512 16139cd93bff59414cc1ce3fd68e2dd0aed4937a20bd1003880961ad2e239a1e982fd0d4f6b791165464213b88dea6ccd8e5e59d2087809be2e1bfdfd3b3186c
-EBUILD attic-0.16-r1.ebuild 921 BLAKE2B 47a5c2735338228cc79180c44c4aa8b725aef0ae84831f9fc2ff4005f8bd74a4894ec07a390a96af3741899090ef09c855c6efed2b6f88cea5f1508cd6578b12 SHA512 2ec13d7a27cf1e78f3770780f856588b01879ca18c515c5129464fe209cc90db1adff62e04cd21da26616ac18033cea06d2d576ab440c0c828fc5f9209f3a757
-EBUILD attic-9999.ebuild 921 BLAKE2B 47a5c2735338228cc79180c44c4aa8b725aef0ae84831f9fc2ff4005f8bd74a4894ec07a390a96af3741899090ef09c855c6efed2b6f88cea5f1508cd6578b12 SHA512 2ec13d7a27cf1e78f3770780f856588b01879ca18c515c5129464fe209cc90db1adff62e04cd21da26616ac18033cea06d2d576ab440c0c828fc5f9209f3a757
+EBUILD attic-0.16-r1.ebuild 923 BLAKE2B 72eb2f0221725a4569f1201ae1e5225ca26083d64dad933257287bea4efd107c017c44133ec7d1c22e9dead55ca4fb2ede59878143303f7c7775b8807f5ff3ff SHA512 71e63a9d2fe5ace2fc4dbb5f8a9a02b61636c8417423ba5af7e91b60e97825a52f49ff70ceda9ba63928ea11381126616f589ae9d7c1d116400ce2aa2db90f67
+EBUILD attic-9999.ebuild 923 BLAKE2B 72eb2f0221725a4569f1201ae1e5225ca26083d64dad933257287bea4efd107c017c44133ec7d1c22e9dead55ca4fb2ede59878143303f7c7775b8807f5ff3ff SHA512 71e63a9d2fe5ace2fc4dbb5f8a9a02b61636c8417423ba5af7e91b60e97825a52f49ff70ceda9ba63928ea11381126616f589ae9d7c1d116400ce2aa2db90f67
 MISC metadata.xml 328 BLAKE2B 4b8c33c80a1e860ec347a8735aad642c9dc441f87b20c588dde534be6d4f9b6981a07314f0643769537ce946f1397eee20801d381c2632d5c98a1d6db12a00cd SHA512 2c24d7eaef0da74758f5726e2b88d2dc11db8a2ea3999abee9305c5e66b236b50d56034d5fae9a7b1d9caa98c7fa3aa54dd06d5279b3a636532010130e40f36a
diff --git a/app-backup/attic/attic-0.16-r1.ebuild b/app-backup/attic/attic-0.16-r1.ebuild
index de1ead336ea7..4fa4def16abf 100644
--- a/app-backup/attic/attic-0.16-r1.ebuild
+++ b/app-backup/attic/attic-0.16-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/app-backup/attic/attic-9999.ebuild b/app-backup/attic/attic-9999.ebuild
index de1ead336ea7..4fa4def16abf 100644
--- a/app-backup/attic/attic-9999.ebuild
+++ b/app-backup/attic/attic-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 50b8f9856d9c..56892ca25a53 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -4,24 +4,16 @@ AUX 7.0.2/bacula-7.0.2-depend.patch 599 BLAKE2B be676329434260e65f7dcbefbfa8d9a0
 AUX 7.2.0/bacula-7.2.0-doc.patch 435 BLAKE2B 65d528b337f9a3e2eaf456b6dad37ddc59bc1a3f6e54208899346a6bc285fe2b19a464b39cc0c9439c4266baf98c1b3a06afd235b3ee7c88373d3c890163e01a SHA512 27d2839658e3471487dce023c806261e5b5d03212f12eab75885b9b61eb22e57c96e85c07a5f81c812974963904ab81b6ce15abf5381647bd2188abd14139b34
 AUX 9.0.2/bacula-9.0.2-lib-search-path.patch 1431 BLAKE2B f04bbf695a926424092dd974994967eefcd48407f2de43b9e94bff25403e66f4a49cde08d667e3b5fc4fb9f8d273a786c3422325db3f589278d16f136d4a9a0c SHA512 3863102d2f8db4158dede306b07297da6550bbad1c77aea49a75de412a7f4630216ef2ae28fc51ffa8d8f9c373510e58982f28e32fdbb142a3551eef7f112b7d
 AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e0a6835b9f6cadb6b43b2b55ea33113e20c20b6a367d965ea12358597e9807c79846e45571b31f9b66dc3ad83265fed4e7 SHA512 d521759cad65ef73fb674cd6b58f9540ef6e86842bcd45ece4730f71a408076b38faea2088bf6f2993fed9a88d727ff2ff8c3e3619e27fcaa1d5afe4506640cf
-AUX 9.0.8/bacula-9.0.8-fix-static.patch 3705 BLAKE2B 5aef2b819608538d6fd360577b873cb1d7da459417fa03c05c007abe322e848429eb1b1d620d194f430233e3a9b72bd909f7ee6288b6f0c45dc0297c6b00f85f SHA512 4453a491c2b5a19e8f1e19e6e44e22032e0e626003bc871417d4e189abc29c0617d5079fd7a40b1ea6e94fd65d99e44098fef69543e036cb426cf87276fd0510
 AUX 9.4.0/bacula-9.4.0-libressl26.patch 1354 BLAKE2B b5d22a50e702a239aedd803c6f390572892124370c916887b166e263f1f3aae32fede777ba580e0a32401a58dc5ce10f6d5942e8764b5bf5d3abe1b9ae7c287c SHA512 3ae42c7c4e58e8e04cb444cb07399648f6962100b9f17146385c807fd5a5890f5f5b873bb790c5918be6a97bdfb7baa980798fe04f6adffbb1648fd4fa63c1fc
 AUX 9.4.0/bacula-9.4.0-libressl27.patch 414 BLAKE2B 29c2720cd05bd5d4ddc57db61e2729744efa4ac03985995b552b2570144dbb968d7e2f91c9a8ae01fe2286483555b72b72eea5110ab364fdf6203141ee9aadd3 SHA512 8f2ea8c552c0080eb56c2e39de78779567156c8198adc2ec775fa3282b01749b8c2b113123265fee88ade2c21c5819a0d8e4c0bda6a409ee5fee2d7352e2e3d6
 AUX 9.6.3/bacula-9.6.3-fix-static.patch 3731 BLAKE2B 0fe8e289a9ef38f79d4b2dacb5503a245e5fb871771b4fce800d9196de3ccce3edf596e013ee313f19fe3f575ff4a23a1bc97decb38d4dff08e2ac38a154f610 SHA512 ec1004d63df94eb9854c7c8ab8699645ac58051c02b99152224f2274767b2a329231fa0b8bf399545c4b9e7263b303a96c1e3401308a37d857ab2480fc3c5290
 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf
 AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
-AUX bacula-fix-manpages.patch 7252 BLAKE2B 42a2743bfb6f99c932b3babf71c70bec099671c66ca390d3ca298e367dfe9332a95c2034aaa7849644069028d69ddb45c246fccb7b4b6dc18e17488a1cc88062 SHA512 00dbadb6d156fb11f71b3aa96f0b77f1e57a7d6d5412451f9b39690df0348c3758b5be2c73307d9e71630ea6a92565803c6305e40c2a84863d1a9e70820997a5
 AUX bacula-fix-sonames.patch 1041 BLAKE2B 9b2b91cf3c281c1899bf545f02b4a48723bcba05f0305e531bdefb0ca822e805979e67d1d2f5ac949248d1e976126236d31c885d4e911e78c24d4ed013c9792f SHA512 0b7a78915ff789988c9fa2bc8fcfcd3d76d3cb8350720134563ece63a97162db273c7d61eee45365c4de8b94b409a3cd4576d6b0239853c2a0d3a9dc8ebf888f
 AUX bacula-sd.confd 391 BLAKE2B 922ebff1772470f611661b03e6216d3bf11a09e9e552e5df59d9fcd5c14bde1b943e151892648e6176cef643ede01ec710f0aa892c35b51753331c96885cbe9e SHA512 ee7372582f6f8c7b4552ed5fd71293f712af22d0de30d02e3f5e08b3738da978eebc42dd601d88735f0412b1429be624a28d86e5f32aba2ddb127ca1ebd10e0d
 AUX newscripts/bacula-dir.initd 318 BLAKE2B f482ce3c49ff8106244b62946ab8bc4ab14d32f3b5442e9d803f5f372c8e2ae73760b497800161f075f1c40da2d385871a77f5aa774dc85d950cd1863860b70d SHA512 aa6fddd67237f6f16e89e04290bc3540a87fe8ebaba9c641a3277d0d2f627cadf49dffb032a0fe5c77ab8983f4d67891b643279bad0a2aa9de5a86e6d64f196a
 AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
-DIST bacula-9.4.4.tar.gz 4159759 BLAKE2B 29628626a9654369ea1633878c16ff8af48bf568ccd54c140c5b9c1e9df7fb988296f4d6f0119a4904827790f7c8881cd7207c9f4b9355bfbc1395a12f24a9c3 SHA512 f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31
-DIST bacula-9.6.3.tar.gz 4246447 BLAKE2B c591fcd5a6c3a79b52cf778f7719ad59f35bfdf99293abb4f6e9c701c0d545125734721a926f071056433d7a9801c40c546f4a73770f5d0fea9fc33c334bcd93 SHA512 8ee14311945ff04c4d3ca736725e2187bcf3e9e0a3093df215c8651bd6a7b07792edea4912ba84189ee79df614c1e99a4333ce173163cfc7efb536dad582106f
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
-EBUILD bacula-9.4.4-r2.ebuild 12298 BLAKE2B bbb89cabb538ea1fde82056773d6f0463915b3a087006082ae083d6ef2f7b0250231e8c55dc6f8595a7c4fd58d82cf00c123ba2e6a362f20b2d41a200883afc6 SHA512 a699eb6220dd921b275ac5b660291548e5e57c0ca48ae8bc8b587e63cd002781218b85316916268dbd35cb29d7f2c476c76f5b08e3ad57206ccd84ed7d609ee3
-EBUILD bacula-9.4.4-r3.ebuild 12451 BLAKE2B bd1c38e2603655baaf59eea045e3a3a060fc13deb1ccecca4c25ddc585f67dcb9848b01fe25a09d94374bcaf6ff9d2f5da846e6e7cffae8eb3b768b3c91b5227 SHA512 42e95ceef2b902d9a24b2129915f07c2e3d5e147f1207ebfc3aee49455a1aa7136c805f89ad5a70b26df0857ab2fd8de2832c8bc93016ea76679b4dd1586e3ff
-EBUILD bacula-9.6.3-r1.ebuild 12363 BLAKE2B 3a7f9be5b6fd12780433d1a9fee56e0d59ea0ef379d0a4a3975ef1b3286394953c80ca2a160146974dd51d989bc7f08e44c4db4227a3fb746705b71f220833a9 SHA512 4e014e6996a167de2f4e5fef5504d9783c6e193265ecdd3fa2a6f3373c1409d9a7fcbc2b1eb9a2a20248a4970bd09822aadc1c7ae7c8206fb3ebaf35e88056aa
-EBUILD bacula-9.6.3.ebuild 12216 BLAKE2B e0e04979c5856f7832e67527472190c0ceff0840defdcf7a277e723cc3029bdd96264cd5cf682ce50b8b63e1732912cbbcc3aaa8fdef5871e11fff31c93bd99f SHA512 723d00d6dc36f1b7ca51cd959d882d7fa54734be1faf75ce8390e25f8300210aa342bff28a3079459a53332c4abc99f47dda9bb125d8298d9442fc8fceff69e6
-EBUILD bacula-9.6.5.ebuild 12370 BLAKE2B 43991de038a55b65dd3c693090f387d246acbd7d855c64e5682684a95852ccf15b87abf52a1135440a17b652689c6e090513b86df018165c9e3faf3f477798dd SHA512 ab1df73e75afc8035a7bb21707ef5cf0af3b7fc62c898c78d03e42342945fe27ce763e10d14f6b768b935925dc37447b4d5fda6c112e36e67941803e5441980d
+EBUILD bacula-9.6.5.ebuild 12367 BLAKE2B 80a045af37209989d6c6fcaba37a6185ab51faf737e6ccf75a911bc7fa3774a749213b332de725bd1ac3f983addf4cda2c46f549df90cc63422148c8a9e7aa99 SHA512 d49696d6a280ac96a3d478d6ea1c69980b3c056036c00a9794f3c83ffa019dc9c3ac22317260234dbcc231ac10b3e99309f6184732da41eaebb0a92076b89aec
 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875
diff --git a/app-backup/bacula/bacula-9.4.4-r2.ebuild b/app-backup/bacula/bacula-9.4.4-r2.ebuild
deleted file mode 100644
index 1abaa55baab0..000000000000
--- a/app-backup/bacula/bacula-9.4.4-r2.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs] )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
-
-	# Don't let program install man pages directly
-	rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in"
-	eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-}
diff --git a/app-backup/bacula/bacula-9.4.4-r3.ebuild b/app-backup/bacula/bacula-9.4.4-r3.ebuild
deleted file mode 100644
index 6ebe92cbe9a4..000000000000
--- a/app-backup/bacula/bacula-9.4.4-r3.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs(+)] )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
-
-	# Don't let program install man pages directly
-	rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in"
-	eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
-
-	# correct installation for plugins to mode 0755 (bug #725946)
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-}
diff --git a/app-backup/bacula/bacula-9.6.3-r1.ebuild b/app-backup/bacula/bacula-9.6.3-r1.ebuild
deleted file mode 100644
index 55c0d02d3b89..000000000000
--- a/app-backup/bacula/bacula-9.6.3-r1.ebuild
+++ /dev/null
@@ -1,428 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs(+)] )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/9.6.3/${P}-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
-
-	# Don't let program install man pages directly
-	sed -i -e 's/ manpages//' Makefile.in || die
-
-	# correct installation for plugins to mode 0755 (bug #725946)
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*.[18]
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-}
diff --git a/app-backup/bacula/bacula-9.6.3.ebuild b/app-backup/bacula/bacula-9.6.3.ebuild
deleted file mode 100644
index 604e97d35a89..000000000000
--- a/app-backup/bacula/bacula-9.6.3.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs(+)] )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/9.6.3/${P}-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# fix handling of libressl version
-	# needs separate handling for <libressl-2.7 and >=libressl2.7
-	# (see bug #655520)
-	if has_version "<dev-libs/libressl-2.7"; then
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
-	else
-		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
-	fi
-
-	# Don't let program install man pages directly
-	sed -i -e 's/ manpages//' Makefile.in || die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*.[18]
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-}
diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index 8b6104a81e97..d2d04673ea7d 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
diff --git a/app-backup/bacula/files/9.0.8/bacula-9.0.8-fix-static.patch b/app-backup/bacula/files/9.0.8/bacula-9.0.8-fix-static.patch
deleted file mode 100644
index a2034cefde87..000000000000
--- a/app-backup/bacula/files/9.0.8/bacula-9.0.8-fix-static.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/console/Makefile.in.orig	2017-07-25 19:03:05.664760298 +0200
-+++ src/console/Makefile.in	2017-07-25 19:05:43.576706091 +0200
-@@ -24,6 +24,7 @@
- CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
- CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
- JSONOBJS = bbconsjson.o console_conf.o
-+ZLIBS=@ZLIBS@
- 
- # these are the objects that are changed by the .configure process
- EXTRAOBJS = @OBJLIST@
-@@ -50,18 +51,18 @@
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 	strip $@
- 
- 
---- src/filed/Makefile.in.orig	2017-07-25 19:09:19.655852979 +0200
-+++ src/filed/Makefile.in	2017-07-25 19:11:39.519558592 +0200
-@@ -69,19 +69,19 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- bfdjson:  Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
--	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
--	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/bacula-fix-manpages.patch b/app-backup/bacula/files/bacula-fix-manpages.patch
deleted file mode 100644
index 5ab0f084da29..000000000000
--- a/app-backup/bacula/files/bacula-fix-manpages.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur bacula-9.2.1.orig/configure bacula-9.2.1/configure
---- bacula-9.2.1.orig/configure	2018-08-12 07:28:00.000000000 +0000
-+++ bacula-9.2.1/configure	2018-10-26 19:12:34.838003264 +0000
-@@ -31277,7 +31277,7 @@
- fi
- 
- 
--ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps scripts/bacula-tray-monitor.desktop src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/bacula-tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES"
-+ac_config_files="$ac_config_files autoconf/Make.common Makefile scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps scripts/bacula-tray-monitor.desktop src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/bacula-tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES"
- 
- ac_config_commands="$ac_config_commands default"
- 
-@@ -32368,7 +32368,6 @@
-     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-     "autoconf/Make.common") CONFIG_FILES="$CONFIG_FILES autoconf/Make.common" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--    "manpages/Makefile") CONFIG_FILES="$CONFIG_FILES manpages/Makefile" ;;
-     "scripts/btraceback") CONFIG_FILES="$CONFIG_FILES scripts/btraceback" ;;
-     "scripts/bconsole") CONFIG_FILES="$CONFIG_FILES scripts/bconsole" ;;
-     "scripts/baculabackupreport") CONFIG_FILES="$CONFIG_FILES scripts/baculabackupreport" ;;
-diff -ur bacula-9.2.1.orig/Makefile.in bacula-9.2.1/Makefile.in
---- bacula-9.2.1.orig/Makefile.in	2018-08-12 07:28:00.000000000 +0000
-+++ bacula-9.2.1/Makefile.in	2018-10-26 19:13:08.788012946 +0000
-@@ -27,7 +27,7 @@
- # Non-client-only directores
- subdirs =    src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
- 
--all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} manpages
-+all_subdirs = ${fd_subdirs} ${@ALL_DIRS@}
- 
- DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
- 
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index e86b92969a1d..9202bec20c97 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -13,10 +13,11 @@ AUX bareos-sd.confd 360 BLAKE2B d965bf4cf1db59982b57ee0b848f9f7156d695a37d2a3b4c
 AUX bareos-sd.confd-16 361 BLAKE2B 3c5feb7e6615db5395f2895ed4ea3e0745c4da0ca68cbdd6c899da0be63db0a7ee561aa44404490ef227a08fe5f339c337fd4eadf43a384741d3071ef4332772 SHA512 1cd7a0a6b16d95db4ac39a4858caf0df35b3cd68e6ed87dff687c48008e4f31597e8510ac6a2e1442a80dec7e5608341832b55d3e2ae96793f203fd95700da22
 AUX bareos-sd.initd 481 BLAKE2B c14f2640be1685aaa0304dcfff2c272e37cb55cce92c7e2808eeaa94b20d4cfb4a705b53d06880f5b5c50b96162ea4d6cb23160b6e31ec34889b867c3aad09e1 SHA512 e094df3f44ed39207129bb86020b223037acc7bda408a69711b68376d1044dbe67001370395dd4442df6b4e78e92dc5125dd14dad6c4826716df2084fbd45916
 AUX bareos-sd.service 243 BLAKE2B 198c1f93f63fc015989523bae1932637c9e25d9b02719dfaa8aa1900d0a408ff686bf25f3966645d5c09d6ec6c78f3326a70c5c53cae42f1dd5fdbd88a164541 SHA512 efd8ee4abfde37cf0c9c660ba714b22cf5bd7ce895af20deb80c1d2747b985e2a61ddfa76a557374d78feeec3c68f855976bd9af5f7d61c9588b8db41287211d
-DIST bareos-17.2.9.tar.gz 4190637 BLAKE2B 266627ac023695971acc5d730765c08ddde673ba75398547687d5f2ccbfb7c440221b8c0a617bc6a3b0d2089cd22604ebe838decc65ce3c1f7ae5cdb99833118 SHA512 ac40f867d495aa64693a209dbfceb55f22425a2079dc000dabd8c6ffce79b1a2578bc0110970a6aace7c3e039c7110d1d395c31b372c0d3e5f18b43e682a70a9
-DIST bareos-18.2.8.tar.gz 10552800 BLAKE2B c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2 SHA512 61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
-DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
-EBUILD bareos-17.2.9.ebuild 10551 BLAKE2B df36eaf96f8dbec36101d7dbc736502eaaeca8faf36b0c1dbf7624d031ae0835b5eaad7968ffc94402299ed4d72ebb921e7e16c862b7dd2e67b998a537063308 SHA512 e9052e3e59405361b129e99b163820559e71987b6452fb7936620679f805ba37494bca8bd55bffe45cd7e44958b2559fce3fb50f11cd8f95ce144680ede9a486
-EBUILD bareos-18.2.8.ebuild 11438 BLAKE2B 719291b1a95fe1aa6d602f88c8d71c0a94c7d77bdd0e3313632cb7701d2cb876f072830bcb515a2ef9c39be33b7e843a867510b48b976e51599a889e118b8aea SHA512 1abe95715a635c349c92eda1b695a9e15a5965aeb6eb471591497808c9e51cfd25158b65c98f9677261a7e1c137cf86fe89203296ce6ba7132ec395f36debf7c
-EBUILD bareos-19.2.7.ebuild 10787 BLAKE2B a1672ef75bba19ef60ca8b3392a4213574d8513ce6ceadf6bf8cd0e83e775bea9250e0c2f5aef3045018c66806818ed6b545ed1fc5c8dde445db23fe0982fc4a SHA512 ea2bd88ea61a71e18283f132928445aee016812021633a94233b04a99e6e64cdc0253d3490ba2fe95b41f929f250b293d7c4479159eefee107116a04ff5bf217
+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
+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
 MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872
diff --git a/app-backup/bareos/bareos-17.2.9.ebuild b/app-backup/bareos/bareos-17.2.10.ebuild
index aa5473acd458..f4a2b487a99f 100644
--- a/app-backup/bareos/bareos-17.2.9.ebuild
+++ b/app-backup/bareos/bareos-17.2.10.ebuild
@@ -3,10 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 systemd
+inherit desktop systemd
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
@@ -17,7 +14,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
-	logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto
+	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
 	sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax"
 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
 
@@ -70,7 +67,6 @@ DEPEND="
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)
-	python? ( ${PYTHON_DEPS} )
 	"
 RDEPEND="${DEPEND}
 	!clientonly? (
@@ -81,8 +77,7 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="static? ( clientonly )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="static? ( clientonly )"
 
 S=${WORKDIR}/${PN}-Release-${PV}
 
@@ -90,7 +85,6 @@ pkg_setup() {
 	use mysql && export mydbtypes+="mysql"
 	use postgres && export mydbtypes+=" postgresql"
 	use sqlite && export mydbtypes+=" sqlite"
-	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -147,7 +141,6 @@ src_configure() {
 		$(use_with fastlz) \
 		$(use_with mysql) \
 		$(use_with postgres postgresql) \
-		$(use_with python) \
 		$(use_with readline) \
 		$(use_with sqlite sqlite3) \
 		$(use sqlite || echo "--without-sqlite3") \
@@ -162,6 +155,7 @@ src_configure() {
 		"
 
 	econf \
+		--without-python \
 		--with-pid-dir=/run/bareos \
 		--with-subsys-dir=/run/lock/subsys \
 		--with-working-dir=/var/lib/bareos \
diff --git a/app-backup/bareos/bareos-18.2.8.ebuild b/app-backup/bareos/bareos-18.2.9.ebuild
index 4bf0b6c7c3b7..cf1622b6e1ad 100644
--- a/app-backup/bareos/bareos-18.2.8.ebuild
+++ b/app-backup/bareos/bareos-18.2.9.ebuild
@@ -3,12 +3,10 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
-inherit python-single-r1 systemd cmake-utils
+inherit desktop systemd cmake
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
@@ -19,7 +17,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
-	logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto
+	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
 	sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax"
 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
 
@@ -72,7 +70,6 @@ DEPEND="
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)
-	python? ( ${PYTHON_DEPS} )
 	"
 RDEPEND="${DEPEND}
 	!clientonly? (
@@ -83,15 +80,10 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="static? ( clientonly )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="static? ( clientonly )"
 
 S=${WORKDIR}/${PN}-Release-${PV}
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	use mysql    && export mydbtypes+=( mysql )
 	use postgres && export mydbtypes+=( postgresql )
@@ -111,10 +103,18 @@ src_prepare() {
 	# fix missing DESTDIR in symlink creation
 	eapply -p2 "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch"
 
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory filed
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
 	eapply_user
 
 	CMAKE_USE_DIR="$S/core"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -135,7 +135,7 @@ src_configure() {
 	fi
 
 	for useflag in acl ipv6 ndmp readline scsi-crypto sql-pooling \
-		systemd fastlz mysql python lmdb glusterfs rados \
+		systemd fastlz mysql lmdb glusterfs rados \
 		rados-striper cephfs jansson; do
 
 		mycmakeargs+=( -D$useflag=$(usex $useflag) )
@@ -178,7 +178,7 @@ src_configure() {
 		-Dbatch-insert=yes
 		-Dhost=${CHOST}
 		-Dcoverage=yes
-		-Dpython=yes
+		-Dpython=no
 		-Dsmartalloc=yes
 		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
 		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
@@ -190,12 +190,12 @@ src_configure() {
 		-Dhostname="`hostname -s`"
 		)
 
-		cmake-utils_src_configure
+		cmake_src_configure
 }
 
 src_install() {
 	#emake DESTDIR="${D}" install
-	cmake-utils_src_install
+	cmake_src_install
 	newicon core/src/images/bareos_logo_shadow.png bareos.png
 
 	# remove some scripts we don't need at all
diff --git a/app-backup/bareos/bareos-19.2.7.ebuild b/app-backup/bareos/bareos-19.2.8.ebuild
index cb87707808ea..beb2d8324673 100644
--- a/app-backup/bareos/bareos-19.2.7.ebuild
+++ b/app-backup/bareos/bareos-19.2.8.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
-inherit python-any-r1 systemd cmake-utils
+inherit python-any-r1 systemd cmake
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
@@ -97,8 +97,15 @@ src_prepare() {
 	# fix missing DESTDIR in symlink creation
 	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
 
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
 	CMAKE_USE_DIR="$S/core"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -124,6 +131,7 @@ src_configure() {
 	done
 
 	mycmakeargs+=(
+		-DHAVE_PYTHON=0
 		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
 		-Darchivedir=/var/lib/bareos/storage
 		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
@@ -169,11 +177,11 @@ src_configure() {
 		-Dx=$(usex X)
 		)
 
-		cmake-utils_src_configure
+		cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# remove some scripts we don't need at all
 	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
@@ -324,6 +332,9 @@ src_install() {
 	diropts -m0755
 	keepdir /var/log/bareos
 
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
 	# make sure bareos group can execute bareos libexec scripts
 	fowners -R root:bareos /usr/libexec/bareos
 }
diff --git a/app-backup/bareos/files/tmpfiles.d-bareos.conf b/app-backup/bareos/files/tmpfiles.d-bareos.conf
new file mode 100644
index 000000000000..6e2dacc41ad3
--- /dev/null
+++ b/app-backup/bareos/files/tmpfiles.d-bareos.conf
@@ -0,0 +1 @@
+d /run/bareos 0770 bareos bareos -
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 2ca69a4d6e82..419ec9cc0f31 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,6 +1,6 @@
 DIST borgbackup-1.1.11.tar.gz 3718055 BLAKE2B ea03d538bd7936cc12705f73c3f8e63dc28167f1930e84bdd04fc13bcc34c2b9f35e7e6ed945ba20b647dbdefe12c66c04645414c7efc974e53a312e3dff6991 SHA512 cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573
 DIST borgbackup-1.1.13.tar.gz 3754457 BLAKE2B 3d3dce66ad685fbde53cb78e288b4edc53af449ed54379e5f0b9ab3b10d8cf43ae983de5abeccb1874fbf1283f3e2796ac35ff9de349905d03d0b0c560f4fa93 SHA512 2480dba6c842659a248361b35b478120e50df3525b8f07d89dac4e78369bb1dad2679b9efa6a4d6f38637759666095dc2dcbb7750edccd97972e2c8980a51b84
 EBUILD borgbackup-1.1.11-r2.ebuild 937 BLAKE2B db7291e3b72e8d0bf447a05a6af19dbdb45f4e0e28ba43bc627dfffdc465ae21cee78cbe5a34f479332fb569e3824f9e076c683dbac709097bd742d8873e8d41 SHA512 b9c15bdb08e00811c83db2abae18e59a0918f71d91c84b7403e7395ee8a4fde513cdeeea6004009ab5a86830b0a8aa93395c5018385a06f001070debeace25fc
-EBUILD borgbackup-1.1.13.ebuild 948 BLAKE2B d4665d6abec1ac65340e303cd953222160f680f18a9f2330c2e361d2b1f8ddd6864ad1f5785172ac065d93be3bd6b77bda3338b886091d6d3f3ebe7c2b7ab7c2 SHA512 5bc1dccda50fdc0fa760723483ea136a4f54c3c778e3d33ca1380d1f15f45b4921933dffddf7e72e89b4a1673fcd82e0e7e245a298b10155528346696c03ab65
+EBUILD borgbackup-1.1.13.ebuild 947 BLAKE2B ed71df335f1d6a441444a94df5f87932972c2a2137d7ac369a143fd3e9c40c0fe30a7a958ebc05d6041ee1999e8f43ab072e06c0cfe94f873220b14b4cb65736 SHA512 998c17485df35f232fddeabc9d2574ec065bbc100c627c21cc7a19ba2439ff638f9be63d2a4658299ee142211aa6941b0c69e5505beec3784acd8b7489b3fcef
 EBUILD borgbackup-9999.ebuild 941 BLAKE2B b266fbe7d58428289fe1623f93ef8f45d536809fcd3502b8dfdb3cdd01675bc006b3f68bb4cc8549eaa4c42eb3bc6fb0fb4cf9ff043adf267324460648bd2e04 SHA512 155e3b33d23aac747c9143b78839bd50a45250b62a3480d710cd6375ac271d03123e1cedcd15a1ffc463ef5556a5189ec2f95a5ee0fce061083ac6e2cc526aef
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.13.ebuild b/app-backup/borgbackup/borgbackup-1.1.13.ebuild
index 6b2cd5162b06..1eaab2e22520 100644
--- a/app-backup/borgbackup/borgbackup-1.1.13.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.13.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index e24780201040..51ffe7cf3609 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,9 +1,11 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
-DIST borgmatic-1.5.1.tar.gz 67401 BLAKE2B c11f4b9f9acc7d7bf4e482953968dbaabc33f1513ec8f20868518bca22ffcafee90569c06ec603be919d47d724dd4a3a904e44fbb40c2309d8cb78e9277b5cc7 SHA512 9ded9bd5d6db866d196fedee88737f3d3eef6cb0e61c5f55ac543602c4429adcb57608d7f6c798edfd6ac1ecd14aadd9a88fdf94ef1f0eab4c26a9d2a29c5e38
+DIST borgmatic-1.5.10.tar.gz 71743 BLAKE2B b2b5f9135a15730ca7ddddeaa7f621f82207f1dcf383c3be7459eb39dbffc85a310184a4ddce3fb0bd47aa213cb588eb3f3e2f73418659330a421b7da5b87698 SHA512 52436535810ce42f5ab30ae8a4705005e8c7a5d91d52520aab4160320215196cdc088dfae1a21a0d65d0161fb2bb3c9b984cfe2cb5204f7b9bd0ed27c3a38c5b
 DIST borgmatic-1.5.6.tar.gz 70075 BLAKE2B 23e233c7457c25ae5b83571436dcfac4e70bf4c9a9bf9af95b8722533b48fdd82089152da220b7d61a01569233f2aedddf300c3a5ad2c69c631060f0b08e6b59 SHA512 e314fa1f20516dd52f4435c782bf634821a034925c0f11553483a1e55eef5d588e54e7abb1a88d239c1619f291548a5058a8f636d16dd829680089c20c601a79
-DIST borgmatic-1.5.7.tar.gz 71084 BLAKE2B b6ab2f80af47ba49e8f584b555b910bf94dbfb72da8a55433f147410059948fa844846bea007b317f10cb76811c5da6bd1c22f7fefb5c062213670fadb326cd9 SHA512 26fa9ee1b158c05cdb3ed60faa16b4eac431691ced454149091c302876550277f622cd67e45ef42a3070896e76b94d8a39f1604a08f604bada5bab1ec6691902
-EBUILD borgmatic-1.5.1-r2.ebuild 2024 BLAKE2B 3629401fb19f46a5079ed26c014d1f5507e8379bfa4cc6ae2fe40d98e1a3dfc124a964fb5deca43479cd9c0503c2beabcc85c4e3bf9bf01b1c24f04320d74cc6 SHA512 a59525b8c1ddcc2c34eee378650e9a4aba92ae5da248600fc18b66a290024ad8bf80300061790389d6b1d555601ad7af5cea977e9fb7da266b8b3ec70324c97f
-EBUILD borgmatic-1.5.6.ebuild 2024 BLAKE2B 3629401fb19f46a5079ed26c014d1f5507e8379bfa4cc6ae2fe40d98e1a3dfc124a964fb5deca43479cd9c0503c2beabcc85c4e3bf9bf01b1c24f04320d74cc6 SHA512 a59525b8c1ddcc2c34eee378650e9a4aba92ae5da248600fc18b66a290024ad8bf80300061790389d6b1d555601ad7af5cea977e9fb7da266b8b3ec70324c97f
-EBUILD borgmatic-1.5.7.ebuild 2024 BLAKE2B 3629401fb19f46a5079ed26c014d1f5507e8379bfa4cc6ae2fe40d98e1a3dfc124a964fb5deca43479cd9c0503c2beabcc85c4e3bf9bf01b1c24f04320d74cc6 SHA512 a59525b8c1ddcc2c34eee378650e9a4aba92ae5da248600fc18b66a290024ad8bf80300061790389d6b1d555601ad7af5cea977e9fb7da266b8b3ec70324c97f
+DIST borgmatic-1.5.8.tar.gz 71078 BLAKE2B 488a2d3a1689d16ac2e4e2e9e0f842fab51322a83b024f5bff742e31290d70e6acb683cfe74cc610b0bf0e3ff9d523bacd7faa309560f2ebb8b5b4820de54119 SHA512 25f38bbd48eb41ded8e315620fdcd929c10b38b89a3fc428db9e0053d4c1c46941962f6693018c5e26aa2187ed20bf366424b1b03f9c61cc56274c7008e824e9
+DIST borgmatic-1.5.9.tar.gz 71857 BLAKE2B c30c2629e327168ee81e9ecc26c811c5bab7369063f5711cd79567922f21d4e5c0980fe34021340d94923cea85ab0c307f9f348268c3f2063d084d0360e5fdfa SHA512 a1ea62ffdc1457fc1e7b964a474bc25d2b2d3d153ba2026018d5081011acf8d6d1329a440c2616e201ebf0351bf2f12a1e37ec2477a6f5da44de315ec3bb0c3a
+EBUILD borgmatic-1.5.10.ebuild 2023 BLAKE2B 175bcf279ff3809a491f0adda60907973ee7d3b25888bd13760a9f9aa90cfd17cb27310d27d83c3dea94febb853aab77cf0f671bc6ada7e986f9f8974b21eb63 SHA512 647c6005ffc4c3e86236b0ddab1c403e14a0599b3cae57bad130ef1fa618e0ad3093fb22c304a2b516b7b43765c74cefaa2e53dd1d19ea2e1667188504fecfee
+EBUILD borgmatic-1.5.6.ebuild 2023 BLAKE2B bb2ede921d9b7087b4665a5146e0bf5a963d34eb0d48d5e57a401974b80577429776ac4e9b581825a8ed8c3da907cac202500084dda839b3654fc4c9feffbe52 SHA512 c07d3132f22f4db916c9996f44e588429d5162a0d064253c7ef080e4b3e479eba58c64bb488a55a741de6281557872f5f2610bb5edbd4526b64bff25f142e187
+EBUILD borgmatic-1.5.8.ebuild 2023 BLAKE2B 175bcf279ff3809a491f0adda60907973ee7d3b25888bd13760a9f9aa90cfd17cb27310d27d83c3dea94febb853aab77cf0f671bc6ada7e986f9f8974b21eb63 SHA512 647c6005ffc4c3e86236b0ddab1c403e14a0599b3cae57bad130ef1fa618e0ad3093fb22c304a2b516b7b43765c74cefaa2e53dd1d19ea2e1667188504fecfee
+EBUILD borgmatic-1.5.9.ebuild 2023 BLAKE2B 175bcf279ff3809a491f0adda60907973ee7d3b25888bd13760a9f9aa90cfd17cb27310d27d83c3dea94febb853aab77cf0f671bc6ada7e986f9f8974b21eb63 SHA512 647c6005ffc4c3e86236b0ddab1c403e14a0599b3cae57bad130ef1fa618e0ad3093fb22c304a2b516b7b43765c74cefaa2e53dd1d19ea2e1667188504fecfee
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild b/app-backup/borgmatic/borgmatic-1.5.10.ebuild
index 040e887e7ced..80e8098f34d2 100644
--- a/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
diff --git a/app-backup/borgmatic/borgmatic-1.5.6.ebuild b/app-backup/borgmatic/borgmatic-1.5.6.ebuild
index 040e887e7ced..81303b9f901e 100644
--- a/app-backup/borgmatic/borgmatic-1.5.6.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
diff --git a/app-backup/borgmatic/borgmatic-1.5.7.ebuild b/app-backup/borgmatic/borgmatic-1.5.8.ebuild
index 040e887e7ced..80e8098f34d2 100644
--- a/app-backup/borgmatic/borgmatic-1.5.7.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
diff --git a/app-backup/borgmatic/borgmatic-1.5.9.ebuild b/app-backup/borgmatic/borgmatic-1.5.9.ebuild
new file mode 100644
index 000000000000..80e8098f34d2
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}]
+	')"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/flexmock[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Unlike the other two test files in integration/commands, which use the
+	# relevant modules' respective APIs, test_borgmatic.py tries to call the
+	# 'borgmatic' executable - which by the time we execute src_test will
+	# not have been created yet. distutils_install_for_testing would likely
+	# take care of this - but between the aforementioned behaviour inconsistency
+	# and the fact the only test run from this file as of version 1.5.1 is the
+	# parsing of contents of 'borgmatic --version', just skip it for now.
+	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
+}
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 14f04474438d..3dfecc8554db 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -4,6 +4,9 @@ AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610d
 AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef3fc3d42249e23a97555f9ce67d13a94565d0f3f61a7f4fd5c71300e7988b9d666f220122e0f1 SHA512 dc06be1e5433973f6bbabd86671ea20f12bf57d91871b4664bd7fbae32a561967f139b99674ac93a3a9ec56380e090500c118b45917f884b69395e3f03f9a311
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
 DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d
+DIST burp-2.3.30.tar.gz 617064 BLAKE2B 62aa65da16155d2a321d4ef700a83000e9754eeee53ad7605b97c589a09e1168cd4cece3076d2c4660c098967f5b19056875b5aa4f226f135a17965fc099bb44 SHA512 c315c30c064073f864058d1ec9341b6e800964f308fa5ea298759e35a58ff27a198a3b6886cc04692bc259f1cfe5a5e077542fd45d3e89813541af2e4ca03533
+DIST burp-2.3.32.tar.gz 617641 BLAKE2B f193b3ed42bb8456fbad72ca5625d4a32b498749d04fc187a87f68e03c1a4131dd8e7276bcd6ded40e551f17c6bda7c12ba538e0dc74a8d750bff91e4e2ae84b SHA512 a7393d5097b03a3684104693620ecc9646caf3f4556201977ea88462700274361b01f1134f9c18368ffec6a31d11b4a9bd9091af7a54ac98dfd724779dab41c6
 EBUILD burp-2.2.18-r1.ebuild 2832 BLAKE2B 91c0da9f9e456cde5b62dbe114efecc42aa9af1ac38c6e5bb0eac0c8b8aa8f6c454cd8d318b4cf27c039c3848d40c386d544b79e0a863b4b24f9dde41275eba2 SHA512 bb31a0f602f8bbaa50968a3085d84625711dc0d7f53ccd7f4216d8e1009b59da824d266729d0e2ac54ad0b02468146f770dcc45162a5dac950c35e503967ff5f
-EBUILD burp-2.2.18.ebuild 2874 BLAKE2B f6c253a5adfc5e945a9f9b8e919556c124fd0205b269409680f3ba3b7aed79ff420859ab574fb69e2364071232fd87eeacdf73263c9401bfc617284b40be9d29 SHA512 7b4b21657a6cc4abb6bee9bd2e86160e7620cc4df4ab9e42c502b26df265eed89c7da2fa7f10a26c80b7913f7261e754e9802f1842589f59f1491ed9f9a33477
+EBUILD burp-2.3.30.ebuild 3101 BLAKE2B 888c2c4e938d3d8fa385aa1c60cbee41807e3e09893b33561b0f8bd2b412642af3b9dcaedec605cf3a792341d8ccd7807cd24f1629a6419e90cae08eb26066be SHA512 94a2b64aea3d2dd2c792eb7fff090ab9b2910f2b80f8841868e2a7508525790e3c7cc67dbe4c7f90c950be5102793d4d99a277122da3b6c36d3caccf3e447fdc
+EBUILD burp-2.3.32.ebuild 3101 BLAKE2B 888c2c4e938d3d8fa385aa1c60cbee41807e3e09893b33561b0f8bd2b412642af3b9dcaedec605cf3a792341d8ccd7807cd24f1629a6419e90cae08eb26066be SHA512 94a2b64aea3d2dd2c792eb7fff090ab9b2910f2b80f8841868e2a7508525790e3c7cc67dbe4c7f90c950be5102793d4d99a277122da3b6c36d3caccf3e447fdc
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
diff --git a/app-backup/burp/burp-2.2.18.ebuild b/app-backup/burp/burp-2.3.30.ebuild
index 0d5a5cd5cd47..34645f772590 100644
--- a/app-backup/burp/burp-2.2.18.ebuild
+++ b/app-backup/burp/burp-2.3.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools systemd user
+inherit autotools systemd
 
 DESCRIPTION="Network backup and restore client and server for Unix and Windows"
 HOMEPAGE="https://burp.grke.org/"
@@ -11,12 +11,14 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl ipv6 libressl test xattr"
 
 RESTRICT="!test? ( test )"
 
-CDEPEND="dev-libs/uthash
+CDEPEND=" acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
 	net-libs/librsync
 	sys-libs/ncurses:0=
 	sys-libs/zlib
@@ -36,11 +38,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
 )
 
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
 src_prepare() {
 	default
 
@@ -78,6 +75,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	ewarn
+	ewarn "You are installing a development version of burp. These versions contain"
+	ewarn "new features but might have unexpected issues. It is recommended by upstream"
+	ewarn "to use the current stable version (i.e. currently the 2.2 branch) instead."
+	ewarn
+
 	elog "Burp ebuilds now support the autoupgrade mechanism in both"
 	elog "client and server mode. In both cases it is disabled by"
 	elog "default. You almost certainly do NOT want to enable it in"
diff --git a/app-backup/burp/burp-2.3.32.ebuild b/app-backup/burp/burp-2.3.32.ebuild
new file mode 100644
index 000000000000..34645f772590
--- /dev/null
+++ b/app-backup/burp/burp-2.3.32.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="https://burp.grke.org/"
+SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl ipv6 libressl test xattr"
+
+RESTRICT="!test? ( test )"
+
+CDEPEND=" acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
+	net-libs/librsync
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	virtual/logger"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
+	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
+	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		$(use_enable acl)
+		$(use_enable ipv6)
+		$(use_enable xattr)
+	)
+	# --runstatedir option will only work from autoconf-2.70 onwards
+	runstatedir='/run' \
+		econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/spool/burp
+	fowners -R root:${PN} /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:${PN} /etc/burp
+	fperms 0750 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "You are installing a development version of burp. These versions contain"
+	ewarn "new features but might have unexpected issues. It is recommended by upstream"
+	ewarn "to use the current stable version (i.e. currently the 2.2 branch) instead."
+	ewarn
+
+	elog "Burp ebuilds now support the autoupgrade mechanism in both"
+	elog "client and server mode. In both cases it is disabled by"
+	elog "default. You almost certainly do NOT want to enable it in"
+	elog "client mode because upgrades obtained this way will not be"
+	elog "managed by Portage."
+
+	if [[ ! -e /etc/burp/CA/index.txt ]]; then
+		elog ""
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  /etc/burp/burp-server.conf"
+		elog ""
+	fi
+
+	# According to PMS this can be a space-separated list of version
+	# numbers, even though in practice it is typically just one.
+	local oldver
+	for oldver in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_cut 1 ${oldver}) -lt 2 ]]; then
+			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+			ewarn "the server config file by default. If you use bedup, please"
+			ewarn "update your scripts to invoke it as"
+			ewarn ""
+			ewarn "  bedup -c /etc/burp/burp-server.conf"
+			ewarn ""
+			ewarn "Otherwise deduplication will not work!"
+			break
+		fi
+	done
+}
diff --git a/app-backup/cachedir/Manifest b/app-backup/cachedir/Manifest
index 0549e2416d1d..0173887b6395 100644
--- a/app-backup/cachedir/Manifest
+++ b/app-backup/cachedir/Manifest
@@ -1,3 +1,3 @@
 DIST cachedir-1.4.tar.gz 16254 BLAKE2B f70fe693d614ab90c4b235c2979e9323eb41976ea8a97c4d3107af26f411553a86e0409b354483a6e3c9af956597c9a4114dc28829cc2ed55abe7c7dd3bb8a99 SHA512 dabeb36a4b99febafbfcc3bff4de625491eee6649cac6c03ef782415cfdd519d36911bed8ae6e7bb94b0afe6279b17fd99fcb87f0c2d2e37032a76fa516dd6c7
 EBUILD cachedir-1.4.ebuild 882 BLAKE2B cd3a999ce6c82231d9d6d2a63b342dabb4d92102feb5a9fff90392c9d42793a815109a4c4406aba8957969c3c2b2e254f17262708635fd6a242167b8f542692f SHA512 3691003518a440a850cc6f05854dc8e39e91959ed0766ab300cb64b9aaf31d998787de61d2e2a60b0b95919a8237afb810ed9c5d96b1802e883c9973b4238cb8
-MISC metadata.xml 244 BLAKE2B 4e1d876bfd59de3a266b815e745f499103f7a51dcf049893964134956ff947d34e5d006fdb8bf714df0c6520c1e23e397816938f0782ddb392470ff8b08db25b SHA512 79a93c4e2d9e1408640cf5f3ca110863c932665f90383f7d71bd5e5324160ba83f8bb30de5095b9c5a0778a305c8bffe94d729daadea15991daa1aa641cadaf4
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/cachedir/metadata.xml b/app-backup/cachedir/metadata.xml
index b7595a302f22..7a38bb900964 100644
--- a/app-backup/cachedir/metadata.xml
+++ b/app-backup/cachedir/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jlec@gentoo.org</email>
-		<name>Justin Lecher</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-backup/holland-backup-example/Manifest b/app-backup/holland-backup-example/Manifest
deleted file mode 100644
index 80b6b875cbe7..000000000000
--- a/app-backup/holland-backup-example/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
-EBUILD holland-backup-example-1.0.10.ebuild 889 BLAKE2B 0dea10cf383013019f2044fa58daa72f0af1f029379387b1c21500d02d47b999e7cc708787d4a4a8f46c3411b318f02efbff2ee75f93471f84938e24fd5cf660 SHA512 8b40e08af7c36e67674a34237c4d4c07b92bcce2d0633d9097bc6adffac967c6c69f4e21bd74136a948d2bdb1e2d91471d1c3e83be728c83667783b83efce76c
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-backup-example/holland-backup-example-1.0.10.ebuild b/app-backup/holland-backup-example/holland-backup-example-1.0.10.ebuild
deleted file mode 100644
index 381e70da2771..000000000000
--- a/app-backup/holland-backup-example/holland-backup-example-1.0.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland Example Plugin"
-HOMEPAGE="http://www.hollandbackup.org/"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	keepdir /etc/holland
-	keepdir /etc/holland/backupsets
-	keepdir /etc/holland/providers
-
-	insinto /etc/holland/backupsets
-	doins "${S}"/../../config/backupsets/examples/${PN##*-}.conf
-
-	insinto /etc/holland/providers
-	doins "${S}"/../../config/providers/${PN##*-}.conf
-}
diff --git a/app-backup/holland-backup-example/metadata.xml b/app-backup/holland-backup-example/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/app-backup/holland-backup-example/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-backup/holland-backup-pgdump/Manifest b/app-backup/holland-backup-pgdump/Manifest
deleted file mode 100644
index e77005288c52..000000000000
--- a/app-backup/holland-backup-pgdump/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
-EBUILD holland-backup-pgdump-1.0.10.ebuild 854 BLAKE2B 7c4a04c39c38015cd03db694cf4c1c652f4a5a0c4e36f9571978a3a267c09c4e2716281773f72cefc6753676ab9f29aff752053a93b86500e4d3109b396ddd4b SHA512 6403157e9f8ccd422f1e035f48048989030108469379045dfce187974846db92d8181df4f3bc8b904a787c1b692f101d950edf305284285cc7e9e906bf38e4ba
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-backup-pgdump/holland-backup-pgdump-1.0.10.ebuild b/app-backup/holland-backup-pgdump/holland-backup-pgdump-1.0.10.ebuild
deleted file mode 100644
index 63609d1a9966..000000000000
--- a/app-backup/holland-backup-pgdump/holland-backup-pgdump-1.0.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland pgdump Plugin"
-HOMEPAGE="http://www.hollandbackup.org/"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	~app-backup/holland-lib-common-${PV}[${PYTHON_USEDEP}]
-	dev-python/psycopg[${PYTHON_USEDEP}]
-"
-PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	keepdir /etc/holland
-	keepdir /etc/holland/providers
-
-	insinto /etc/holland/providers
-	doins "${S}"/../../config/providers/${PN##*-}.conf
-}
diff --git a/app-backup/holland-backup-pgdump/metadata.xml b/app-backup/holland-backup-pgdump/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/app-backup/holland-backup-pgdump/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-backup/holland-backup-random/Manifest b/app-backup/holland-backup-random/Manifest
deleted file mode 100644
index 563978e1b6e0..000000000000
--- a/app-backup/holland-backup-random/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
-EBUILD holland-backup-random-1.0.10.ebuild 888 BLAKE2B b605414817799f9418f7062772e4ba6fd007eb5bc0bccc4f54cb5f5cb78461e2e9211d9f2003b8271366e610686ee83d079e8e094e013e0ac8500c1c07961d65 SHA512 84df887af065566efcedd8fe4358d2b4033445cbbb30cd941497a2dadc051c0edfc57d935f212df51b0a01c309cbb5eb362ac5588c77fd604dad0cdcb13a2540
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-backup-random/holland-backup-random-1.0.10.ebuild b/app-backup/holland-backup-random/holland-backup-random-1.0.10.ebuild
deleted file mode 100644
index c0c5500161e2..000000000000
--- a/app-backup/holland-backup-random/holland-backup-random-1.0.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland Random Plugin"
-HOMEPAGE="http://www.hollandbackup.org/"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	keepdir /etc/holland
-	keepdir /etc/holland/backupsets
-	keepdir /etc/holland/providers
-
-	insinto /etc/holland/backupsets
-	doins "${S}"/../../config/backupsets/examples/${PN##*-}.conf
-
-	insinto /etc/holland/providers
-	doins "${S}"/../../config/providers/${PN##*-}.conf
-}
diff --git a/app-backup/holland-backup-random/metadata.xml b/app-backup/holland-backup-random/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/app-backup/holland-backup-random/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-backup/holland-backup-sqlite/Manifest b/app-backup/holland-backup-sqlite/Manifest
deleted file mode 100644
index 52d3d95f61e5..000000000000
--- a/app-backup/holland-backup-sqlite/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
-EBUILD holland-backup-sqlite-1.0.10.ebuild 942 BLAKE2B 0e8981cb114af2e3f0d4c8d8eebc36f581d993b9327f8b144dab74dc3e4d1bee20a13e813b89b8e7721c84d89f3b720b4a694c8cea9152becb72f4cef2b2af0b SHA512 e53b99ff92a6f3426ec972a3fcfefd9740d34b4b9cd9abf07ed5a93a3bb8dd89a5a28dfb36058a186039d9bf798f36c071f86ff30fb49c099e04702bd63c787e
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-backup-sqlite/holland-backup-sqlite-1.0.10.ebuild b/app-backup/holland-backup-sqlite/holland-backup-sqlite-1.0.10.ebuild
deleted file mode 100644
index cdb9d844719b..000000000000
--- a/app-backup/holland-backup-sqlite/holland-backup-sqlite-1.0.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland sqlite Plugin"
-HOMEPAGE="http://www.hollandbackup.org/"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="~app-backup/holland-lib-common-${PV}[${PYTHON_USEDEP}]"
-PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	keepdir /etc/holland
-	keepdir /etc/holland/backupsets
-	keepdir /etc/holland/providers
-
-	insinto /etc/holland/backupsets
-	doins "${S}"/../../config/backupsets/examples/${PN##*-}.conf
-
-	insinto /etc/holland/providers
-	doins "${S}"/../../config/providers/${PN##*-}.conf
-}
diff --git a/app-backup/holland-backup-sqlite/metadata.xml b/app-backup/holland-backup-sqlite/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/app-backup/holland-backup-sqlite/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-backup/holland-lib-common/Manifest b/app-backup/holland-lib-common/Manifest
deleted file mode 100644
index 6d16667dff0e..000000000000
--- a/app-backup/holland-lib-common/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
-EBUILD holland-lib-common-1.0.10.ebuild 559 BLAKE2B 8dc0493c9c78b0864eb89c5c91c50c4c495891ddfa50acd449d6606ff467159272efa1d9e6ad6351a8d536dcd12bd75cd6ff148dd76178828bb6c7b446810c28 SHA512 942ac17570a3f255a44c7bb072b5a674f3f1f4461d382861a044c70b6937105eaed4c8267d374a48201e7a4464b6e3e23592402969ad19cef4d09aa00a79db9f
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-lib-common/holland-lib-common-1.0.10.ebuild b/app-backup/holland-lib-common/holland-lib-common-1.0.10.ebuild
deleted file mode 100644
index 0bcc8c88bfb8..000000000000
--- a/app-backup/holland-lib-common/holland-lib-common-1.0.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland Core Library"
-HOMEPAGE="http://www.hollandbackup.org/"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
diff --git a/app-backup/holland-lib-common/metadata.xml b/app-backup/holland-lib-common/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/app-backup/holland-lib-common/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-backup/holland-lib-lvm/Manifest b/app-backup/holland-lib-lvm/Manifest
deleted file mode 100644
index 15aabb534ca9..000000000000
--- a/app-backup/holland-lib-lvm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
-EBUILD holland-lib-lvm-1.0.10.ebuild 557 BLAKE2B 7149fdd1a26c983bf7c79bb5953f8b5f695c61d42484e978f40735ae742c0e33ef84a2d0657ed1560deec20d4173b0d1b82de44efa3a3e97df738109e9db2b61 SHA512 8747a20afab4defb9196a8f4a2f6f376d726b8f2015a8b87255be552e6b9f2110ccf11d23f9f9ef30b79e3b8f2465aceaef71cb7748c1061892312b788a9980c
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-lib-lvm/holland-lib-lvm-1.0.10.ebuild b/app-backup/holland-lib-lvm/holland-lib-lvm-1.0.10.ebuild
deleted file mode 100644
index 311e601e857b..000000000000
--- a/app-backup/holland-lib-lvm/holland-lib-lvm-1.0.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland LVM Library"
-HOMEPAGE="http://www.hollandbackup.org"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
diff --git a/app-backup/holland-lib-lvm/metadata.xml b/app-backup/holland-lib-lvm/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/app-backup/holland-lib-lvm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-backup/holland/Manifest b/app-backup/holland/Manifest
deleted file mode 100644
index 1596afb9f16c..000000000000
--- a/app-backup/holland/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
-EBUILD holland-1.0.10.ebuild 1329 BLAKE2B 330fb8b6f117577168a722b67c2a69e5ee3cd2c17faf8e29c410dc6797f012775ad000131b80b316465ab0a0f2cfa37bbd3475b40e8fcd42e479612a474f6e27 SHA512 aeffbcfa73de44b4ed9c27b106d7c75873d96ba6483a81a71d6fe8d47e46e5b4a74b94db07a40d16e6929a7ee232b6c01d0ba4d2a5c8784a922064f59de25248
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland/holland-1.0.10.ebuild b/app-backup/holland/holland-1.0.10.ebuild
deleted file mode 100644
index f7fadd3b2230..000000000000
--- a/app-backup/holland/holland-1.0.10.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland Core Plugins"
-HOMEPAGE="http://www.hollandbackup.org/"
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples postgres sqlite"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	postgres? ( ~app-backup/holland-backup-pgdump-${PV}[${PYTHON_USEDEP}] )
-	sqlite? ( ~app-backup/holland-backup-sqlite-${PV}[${PYTHON_USEDEP}] )
-	examples? (
-		~app-backup/holland-backup-example-${PV}[${PYTHON_USEDEP}]
-		~app-backup/holland-backup-random-${PV}[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local DOCS=( README config/README config/providers/README docs/man/README docs/man/holland.rst )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-
-	keepdir /var/log/holland
-
-	keepdir /etc/holland
-	keepdir /etc/holland/backupsets
-	keepdir /etc/holland/providers
-
-	insinto /etc/holland
-	doins config/holland.conf
-
-	insinto /etc/holland/backupsets
-	doins config/backupsets/default.conf
-
-	doman docs/man/holland.1
-}
diff --git a/app-backup/holland/metadata.xml b/app-backup/holland/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/app-backup/holland/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-backup/luckybackup/Manifest b/app-backup/luckybackup/Manifest
index 43bdddf01946..63e91e64b9c4 100644
--- a/app-backup/luckybackup/Manifest
+++ b/app-backup/luckybackup/Manifest
@@ -1,6 +1,4 @@
 AUX luckybackup-0.5.0-nomancompress.patch 991 BLAKE2B 6fcf029ea905d434215f61a49719d3e078b38d9193148d2266c08ae1cf22fe1b07b2afaed95f049fed7736b6c8bdf7a165e8746408516c553f252bdbe8b6d369 SHA512 344d182a44c3ad043f637b4c7ab5177b01db1f05773231fb41bdcf00bd25a1fd6dc31079a71c149a6983f756f8c42a1a707bbd7a48e512d87474ac6f1e3d6a5a
-DIST luckybackup-0.4.9.tar.gz 5954338 BLAKE2B 632738f8c422ba7d56536fae866ce31d224910b41495e4df3be28a8013ba776e30b4d8e70ceb26c92d28aaf70c96402f27687c55d8f5d7aa5d405bab506a66be SHA512 86d6f1bd84f3bfd89734f0f2066cb17bbf9b4ede96167398de03a460c14d24bf4b50a91bb380655ace9a23497271e102b940ea99a7595cf17f596660dae7f7dd
 DIST luckybackup-0.5.0.tar.gz 5954426 BLAKE2B 7243db713b8e5a6f3929e6d011faff8bdef8b7580c328d336843c71e738fd92a0fd19b2bc3dd0a4695f0af6ec5b436b18833dc20c5ad3479036a1a0bca22be12 SHA512 41fe878a8008b291c2e6f5f8a77ae7dba9d2c547689e53a2dde15cbe733eefd7debf21b3570bd3414dace522ec7843f645639af2cca49b7c2f950eeac62b1f45
-EBUILD luckybackup-0.4.9.ebuild 1442 BLAKE2B 07b9b559b32179733248d205b862f5e4eb1e4ccbf1e4fcd6ea63a0c07ffee7436055236bfc12fcc9aebfacd53b279379c1a0ee3d4d132fb892679f3cc338da4a SHA512 68d4d5e8b5d70b1b2a20471e97c65459969d2f7486fe700e1e18031c68eb612776970a2ac411b17cf8bc83e34e51dd87175bbfd62b405cbedecd32499eaf8cb8
-EBUILD luckybackup-0.5.0.ebuild 1146 BLAKE2B d3a1698afc0afc671b9cbaf98af9d3ae23593a9586b15af9d1098cb43238b949c8824659f64cd3baa64172f8334bb22547039693ed18af7d7271d8d40c9e9feb SHA512 ea328b39244632ec379b88b7e10a63b5caa0f3409981566342a4b256120b0e3765650fb2b0a568dfc880c66692747976557c933353024907e412bf8cfd426203
+EBUILD luckybackup-0.5.0.ebuild 1144 BLAKE2B e0fc9720077b8c73268a8c965cb84cf7257436d4140ae6fde8efcad2db578d3867a7110e565f544ef19ea130f5f833fd235ab966412df72dfd2cb3ca37afa626 SHA512 2271415bd65d0eb5868a3744fa9a7b5794899035359e0aabe550b207d39a7bd6a912482a71070d3e0bd4754ba36dbecd765e35b261f31e352a50952234cf603f
 MISC metadata.xml 328 BLAKE2B b41ac27e6b5c14d5c6bf9df4a47291ffe57bc679b06ab27b3cf9135be123195a161be705ffd2349f3cc4a5f618c2e75740a677696afa244a3a3716be625aa223 SHA512 64415b71b483e93f41d75f858bbdbce2c612b5e7c37753237d7c2374b1bb2bd2d30a86d18b32f5ac015e15c57e94553019756d2cc6021c803d25da527929ddeb
diff --git a/app-backup/luckybackup/luckybackup-0.4.9.ebuild b/app-backup/luckybackup/luckybackup-0.4.9.ebuild
deleted file mode 100644
index eab1f1a17131..000000000000
--- a/app-backup/luckybackup/luckybackup-0.4.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Powerful and flexible backup (and syncing) tool, using RSync and Qt"
-HOMEPAGE="http://luckybackup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	net-misc/rsync"
-
-DOCS=( readme/{AUTHORS,README,TODO,TRANSLATIONS,changelog} )
-
-src_prepare() {
-	sed -i \
-		-e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:g" \
-		-e "s:/usr/share/doc/packages/${PN}:/usr/share/doc/${PF}:g" \
-		luckybackup.pro src/global.cpp || die "sed failed"
-
-	# The su-to-root command is an ubuntu-specific script so it will
-	# not work with Gentoo. No reason to have it anyway.
-	sed -i -e "/^Exec/s:=.*:=/usr/bin/${PN}:" menu/${PN}-gnome-su.desktop \
-		|| die "failed to remove su-to-root"
-
-	# causes empty directory to be installed
-	sed -i -e '/^INSTALLS/s/debianmenu //' luckybackup.pro \
-		|| die "sed installs failed"
-
-	# bogus dependency - bug #645732
-	sed -i -e '/QT += network/s/^/#/' luckybackup.pro || die
-
-	# remove text version - cannot remote HTML version
-	# as it's used within the application
-	rm license/gpl.txt || die "rm failed"
-
-	default
-}
-
-src_configure() {
-	eqmake5 ${PN}.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/app-backup/luckybackup/luckybackup-0.5.0.ebuild b/app-backup/luckybackup/luckybackup-0.5.0.ebuild
index b829da8b431e..038a6912eae7 100644
--- a/app-backup/luckybackup/luckybackup-0.5.0.ebuild
+++ b/app-backup/luckybackup/luckybackup-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 80ffff793e3b..c88a8c441952 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -2,6 +2,8 @@ AUX rdiff-backup-2.0.0-no-docs.patch 942 BLAKE2B e9aff4e4d9d4e8fe42745ed0a8eebab
 AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
 DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec
 DIST rdiff-backup-2.0.3.tar.gz 422823 BLAKE2B 0d4f3165abb8893dfe0619ae80f4c93e676012c4cc763c28cd1aac4eee84e6f8ae2717b5b9722c1b89a9599f3ce487580eac6780799e028f269ea1ce4a40deea SHA512 a4d517182ba1521195f46abde67e7963c7b44722b37d20a7f9afb446a1b90095deba1da9aaa940d174d5cf8dd01948619846d689e5675326b271141b355831fb
+DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
 EBUILD rdiff-backup-2.0.0.ebuild 889 BLAKE2B 0708e964f2800cd15bebc1bf24955f7734ac0a691a08ace915e048fca68a3c929053240eb7145ca677eafc7d2cb0f393695183e7846e7196331cd921fce20af0 SHA512 6e82c511c23355b00b912b65df12c73b3a91ac0541d781d0e746b745b25dea1a127e5dcb80a8cab8d57da1967fa496ca0f9fafce9318e19f9b2c0471e630bcb9
 EBUILD rdiff-backup-2.0.3.ebuild 895 BLAKE2B ca33523446e5473b0efd027c1e8a8167a5113c35aba4dab4718f86ce3cbc68da2b75a9a362d561a7d7068202ebac4d6b2955f68f1ad816e63fbb0733b0e05c88 SHA512 1e0ecbb56029e27be0d29aa4792515a5b4d07344e3242031e69ae4dea5c9586bfab3eb5fcc584c230574539495f97a66be80a172335f51304dc17713e0776ada
+EBUILD rdiff-backup-2.0.5.ebuild 895 BLAKE2B ca33523446e5473b0efd027c1e8a8167a5113c35aba4dab4718f86ce3cbc68da2b75a9a362d561a7d7068202ebac4d6b2955f68f1ad816e63fbb0733b0e05c88 SHA512 1e0ecbb56029e27be0d29aa4792515a5b4d07344e3242031e69ae4dea5c9586bfab3eb5fcc584c230574539495f97a66be80a172335f51304dc17713e0776ada
 MISC metadata.xml 343 BLAKE2B c6de896c88011a54dd0bfc6abc3e5089419684a562ff231458a018a5179eec77e4b4ddeb69bf43b9659d330f0b1ce6102491bd84cda91a306f20913c7c5c98d6 SHA512 1b17e9542a47825d31dea5ebf2b61f091c1abb3f1cd318954693c1d9e1f03afc063890787167a411ab9c5d7108f173878578462bbffd3bceb2229160c23d49db
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.5.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.5.ebuild
new file mode 100644
index 000000000000..61297c203a58
--- /dev/null
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Local/remote mirroring+incremental backup"
+HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
+SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=net-libs/librsync-1.0:0="
+RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=net-libs/librsync-1.0:0="
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-no-docs.patch"
+)
+
+python_install_all() {
+	local DOCS=( docs/FAQ.md )
+	use examples && DOCS+=( docs/examples.md )
+	distutils-r1_python_install_all
+}
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
index 97713c202acf..c3cc4b870749 100644
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@@ -6,6 +6,6 @@ AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed6
 AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
 DIST 7.1.8.0-TIV-TSMBAC-LinuxX86.tar 221849600 BLAKE2B a57d15885c802925e92afca45bfd25c1aa56c33329f03d3de89f00dd139239da3b835ef514dd8d881e76e04e84656d3d630b8e8e44fe8ef331c3f2c5d6acf816 SHA512 68dce2463554b7bd6100d5bf6a617316a04898b747fcaec182c9c4870c34bceb16eea47d073c587c7184945a3cef0f6c98d9a59364589a4745fd1fdc195e3af9
 DIST 8.1.6.0-TIV-TSMBAC-LinuxX86.tar 215961600 BLAKE2B de7e3083a87e72763ffee5adbabc20f546edbc771a9ea0017af591b677cb55832c366ec42da6258ccbb81368f7934acfd116eee77236737d8015cc7588d95d3e SHA512 82897f8af6e1408b25eb95206500fa2e05f17983843de3a3456d71ee3cc25188e31a0a2b11c7ee5cf02c3a6aa46fbba03e2a31e697868905739e97c75bfd5984
-EBUILD tsm-7.1.8.0-r1.ebuild 7363 BLAKE2B 250828bb462c55293b3ec977b07d573bf92820231cdf7b52e6d4d3d090eeb943705597ee2865d96588a2740dfb25c6681ba7a311bcefa215089077106b718f83 SHA512 ebca5a44443ee1d1655364f53194dc9c745b0f9b99c2ac27b0f9ef6f2685d08c150a641cb0c3252f251b1abd3ad7c76c567d4ff9d5540c83dcef386ca75cf8ec
-EBUILD tsm-8.1.6.0.ebuild 7428 BLAKE2B d9308e428ecee65a55bdbb473f37eefbf9f1e08e211f08e308534c951a83c5ba18cb75adb7026bcb7c8242bf46046569f7dc97753e9b0e55bc477e3376494753 SHA512 73500c52e5f8939c2821bbdce16e97ccddaef5ed6502e192be348d7203c98ae1eb2f92aed7a95a6f0b15538fcf28c903ca2d0d2bb209474ec39df0020024ee61
-MISC metadata.xml 398 BLAKE2B fb4d250c3bf724349ac31d66b1c43e766d4ba9b001e88b47949c6fe188a629eb1b87321ef3391d2886e9b74daf235cff0139079fd6f72b7342119542438e30e6 SHA512 bd6ec11787dd6f2ff1a59e7e1027a01b80b22256530d35d6a2fb5b3398ee641b9c778f6a8c2555b7098a199bbb1eda1a5204be53509e5eb47399dbad83798547
+EBUILD tsm-7.1.8.0-r1.ebuild 7363 BLAKE2B 726ffedb11eadfb2fc21bb2c37fdad9652ff772991f53b1a17e6a14d14f1fe66ccfead965de39da1ecdb0b6fb3d1c4865ae47cceaf25d1b91905000964a3ac99 SHA512 7663d42123a4797b202289b362e14bb209b42873e8f68392a6f6fe465319fb2e232e3ed434d100d1979a659d1587983c5da5a3ab1404349b6582ff769346d5ca
+EBUILD tsm-8.1.6.0.ebuild 7427 BLAKE2B 822269ed5fe46c8da6201bd9fb674575aa4e3700ed438fa4ad4d2fd043a75630df0cfd291a9f684accd822f8f1ad30c43576f2e85cf6cdd58903581fa342548c SHA512 b402c233a8b13775639e80bbb9535b7339ea82b56257b8adcdf73a342b952666b62702101130441862bc3a6bef13f08355b37999f6e714dc15a6bf905a478f34
+MISC metadata.xml 398 BLAKE2B 78fb8e9d30a09caddcc2006326db44bbb2c12b83e174f8af3263d738a1ae958922297d910225137a0f9056f50f76086aeb5ee37e342a1302fb060159f1c50c99 SHA512 d232b0705cc9e5ec35eca0f5c2492b5211cc083db2f825268055b1097017f60967d2e12d61083173593a3c9387f6879584abc2cbe58da69c32fb2ff6d2e83903
diff --git a/app-backup/tsm/metadata.xml b/app-backup/tsm/metadata.xml
index 5c23451875cc..249336c90817 100644
--- a/app-backup/tsm/metadata.xml
+++ b/app-backup/tsm/metadata.xml
@@ -5,7 +5,7 @@
 		<email>dilfridge@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="tsm_cit">IBM Tivoli Common Inventory Technology</flag>
-		<flag name="tsm_hw">Difference snapshot support for NetApp and N-Series file servers</flag>
+		<flag name="tsm-cit">IBM Tivoli Common Inventory Technology</flag>
+		<flag name="tsm-hw">Difference snapshot support for NetApp and N-Series file servers</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-backup/tsm/tsm-7.1.8.0-r1.ebuild b/app-backup/tsm/tsm-7.1.8.0-r1.ebuild
index df5a6de943ef..58c58485a2bf 100644
--- a/app-backup/tsm/tsm-7.1.8.0-r1.ebuild
+++ b/app-backup/tsm/tsm-7.1.8.0-r1.ebuild
@@ -35,7 +35,7 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola
 
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="acl java +tsm_cit +tsm_hw"
+IUSE="acl java +tsm-cit +tsm-hw"
 QA_PREBUILT="*"
 
 # not available (yet?)
@@ -86,10 +86,10 @@ src_unpack() {
 	for rpm in *.rpm; do
 		case ${rpm} in
 			TIVsm-APIcit.*|TIVsm-BAcit.*)
-				use tsm_cit && rpms="${rpms} ./${rpm}"
+				use tsm-cit && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-BAhdw.*)
-				use tsm_hw && rpms="${rpms} ./${rpm}"
+				use tsm-hw && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-JBB.*|*-filepath-*)
 				# "journal based backup" for all filesystems
diff --git a/app-backup/tsm/tsm-8.1.6.0.ebuild b/app-backup/tsm/tsm-8.1.6.0.ebuild
index e440a76deaaf..6671f616235f 100644
--- a/app-backup/tsm/tsm-8.1.6.0.ebuild
+++ b/app-backup/tsm/tsm-8.1.6.0.ebuild
@@ -34,8 +34,8 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 
 SLOT="0"
-#KEYWORDS="-* ~amd64"
-IUSE="acl java +tsm_cit +tsm_hw"
+KEYWORDS="-* ~amd64"
+IUSE="acl java +tsm-cit +tsm-hw"
 QA_PREBUILT="*"
 
 # not available (yet?)
@@ -86,10 +86,10 @@ src_unpack() {
 	for rpm in *.rpm; do
 		case ${rpm} in
 			TIVsm-APIcit.*|TIVsm-BAcit.*)
-				use tsm_cit && rpms="${rpms} ./${rpm}"
+				use tsm-cit && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-BAhdw.*)
-				use tsm_hw && rpms="${rpms} ./${rpm}"
+				use tsm-hw && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-JBB.*|*-filepath-*)
 				# "journal based backup" for all filesystems