gentoo resync : 03.11.2018

14 files changed, 1022 insertions, 10 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 86908edfa3d2..63d4b7043943 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index ec43f6c37a2b..5504a8e317af 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -20,6 +20,7 @@ AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27
 AUX bacula-dir.initd 505 BLAKE2B 385c24291c0a0108baf441d078054f70fd0346dfe4b6de7a236f9c1e7a4416b895c73075509dfcc03d1b58760668ca1fc5415033188f9dcb3acceea7f5e1044a SHA512 de0003d6c873ecf9609a6e1838772a29555b4e5e251369035746ede296f4b0f1c85dcbe8822d526d6a5489ba0921a8566f7f2b963682fddb3560f6f7e817c40a
 AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
 AUX bacula-fd.initd 430 BLAKE2B f16aff397175de0f58dd0569dbc77f90a5d923dfeb22c5cbf360ca3e818e93c49f3568864ff18d84b1ed282bd5faa517c4130e179fb0aa939eb48fe34f838108 SHA512 e6bad66d11c3c82ba32e052bb2040205c4e1c5994c8dadc09a6235b9c2e5e3c49ea33ef9a9a76d3bcec0054488a14350f9963590c1834b15023735138adad48d
+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 bacula-sd.initd 437 BLAKE2B f3c86121dae447807e32e7966372c710728fe1747177738df0ce36235b1b05d5d5291bebb66cec6544e6941bb6b0269631d06ed4cdfb8159aba09a96aa54b6e5 SHA512 50603d6d5d5df95ac1752ecc7c3a48a0a5f42eca6c5af390a4f1af084861dbbcfa5d476d3f24ec473fd9b225f6ac78f3542e26cce5d499289d1ec44e22c5682f
@@ -29,8 +30,10 @@ AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516c
 DIST bacula-5.2.13.tar.gz 4243395 BLAKE2B 5cad5d2675f8a2dd28a76c1a4e4c649d1bf9b031e5e4febfb537a72a0481c2f7c3e80d39b84657238bc147b58174ce544749aed70882f66678edfaa2fb51ac2f SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0
 DIST bacula-9.0.6.tar.gz 3984215 BLAKE2B 89d0c83ae1ffd2c2677f5882eebc0feac12780a78f9fcf6d30e44981a09f29dd8bd3f0e55ba963a0ed03099117f2d645cf0402cf528fe939d88210ed547ea157 SHA512 a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e
 DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B be321a2a215cc2b127423cf8d103303957c7064ba4453f0da8b82b3c23a38d45df7ee0e434da8a010911976812b23886fcf366d0dee9f1880c0f14fa641c1937 SHA512 4041525f594e23bfb231ea182a680899020347dd26e1d7f6d05c9f97aac8000a1bbeb9acaf2f73b283616fe03caf38fbb335b0e65e6a18e0322ca64da6f98e64
-EBUILD bacula-5.2.13-r6.ebuild 11653 BLAKE2B 440c77c8b85dc4f65ff10f3a7bfc09d471a6f9e344ac3722163b592f48c2af18951fc54541e8c7b3e75cc445a0ea8364729ad0a2e411892989fedfb79a08a182 SHA512 6b6f9a5b04d7e818fbe4f73928f6b00f393b82e0a1d36e0c4a700ec95b5049006d8b73d1c2cd7906d405f15511d63862fbf19e1b42bed484c8e285dc8b29b07e
+DIST bacula-9.2.1.tar.gz 4115337 BLAKE2B 17c678bee46c9788d9abf220d0c810f94864f9f1609fc25513b2cf0a11ac584fc2ca4429fa49d7af567d316b92c243900bed21511b59f8976fd230186896c70f SHA512 6b14372fb505a4c5e084b96154c764b20e173504e335813cfffd406eb1739a301a5352047696501a11fcc297381a9fbed6e0e8714ad62998f02edbd9e0ff8d1b
+EBUILD bacula-5.2.13-r7.ebuild 11663 BLAKE2B 77bc96341c0450302e7ede70cbffb446a9aaeeaac012663a4e69f31dcc54b99dde1a79684a4763cfb2368dff5e0f5191973ce374099bd9f8234e823f5f66e909 SHA512 8c660e98f9e45f92535a16a32723077588a922b33c8fabb513a4c36968082002a93fb8f30b24d2ca620516945e48f35954a83b185657dfaa8849ad9200031a50
 EBUILD bacula-9.0.6-r2.ebuild 12450 BLAKE2B 405b703434852e97b72a68392c19078c6f9fd93446fa81b152bc347ad6c8a1acee7fc65909179faab1352429956e3fd5f4153a6c5a9ab509b3ea58406a1447d1 SHA512 6d3f4ba7e0d2a47b52df08a726374ef0febf026b3d3e63e6ff1c22ddc0032988e187c69d0f8ed63057e5af4636935759a8debf840813eaeda9798e6b7127a171
-EBUILD bacula-9.0.6-r3.ebuild 12761 BLAKE2B 8a764bcca23d81b9dac25d79ef8ee00d53a648a10b4b2ed617fba4b9d5bffba7a4ce4cf223d470a751c7b293df65ec90f4d495b39ff8d4bfc06b4197522fc3d3 SHA512 abd5f26d664befe85e5950e39138656ce735c6d1ead499f440e7dbeb688dd95692faa1e29c04dbf54e1a762b73116663f692831f103a6494c2156dd14f1cd9ec
-EBUILD bacula-9.0.8.ebuild 12621 BLAKE2B 189e0d891de4a111cc47976633b1077ae92f05fea891c9dd32873c18c5c4097868230c3777cd7792259a1820214d1d4746f7b8a8983f3d6fcc7b0f40b719574e SHA512 a31b61cd032ed878c7edfef39288d06a6631f50099949af3065fe344c73338345e2808d368a5422e44ccdcdbe36b3b71dd44937eb1e80b9fbb41fee5315ffb19
+EBUILD bacula-9.0.6-r4.ebuild 12771 BLAKE2B 0fc64ea5973fb0b00d9c1f3526cf1e152447fd553277f244f72570564d17dccfd7a1ba4c8975f5487c09e128915c89b5da093038d1c1829b5adfecd07f576db0 SHA512 44c3ce89ec455c7e53c5e17f730898f08cda0c696c53d17ce94df8658be35aea7d6a5b4a196a213291cf9f29db306ff6a35edbfe9128835c3299c4695f7261f6
+EBUILD bacula-9.0.8-r1.ebuild 12630 BLAKE2B b178d0cfb28d1097e1ab042e9ee5053e00ffbe129ccbd4ee978d671400dfd6af69fa38bc190d53924900619889c3f9fb977bf92813b9dfae81025a6341964899 SHA512 580d20efe50042635d7ac161fd2ae5f5973ecd022ece41ae6f0a6c302c17d610440984b7a9084cd59e5f4204dbfaeaa8714adc0b3eec01c5ef6c3bfc0e85e9e7
+EBUILD bacula-9.2.1.ebuild 12706 BLAKE2B 45820bbe4312c2bd27d63cbb353e35e9e2248c5469b84c4453edb47f97c71e23306b1753ae2df02e86ffb02da21c6f94c9a3a0fb1d70a811ff7a548e63679b4b SHA512 7646a09bf6353023d6bf8d37701fa45c7a01deb5239cf2901f84f1720602df2e81d41adb0f93aa182dcf74ccd844b741ae32ea1736afcf02f5e668a2c14f82a3
 MISC metadata.xml 626 BLAKE2B 5794ff725aacf865d2f20f402d057e6358a2c68be16f760f1446b2de5292c9582247ab86417131063e181168f003e1d6f5d200ac0dc3d47da24a3bca688dd93c SHA512 69d63f22a63a53daada5561d751f9903932c9a4596c164894a9aa6465a0f4ac90af99548439545fff1cfbcac9a1eb266a91119cbf73cb13edebd16b440613e55
diff --git a/app-backup/bacula/bacula-5.2.13-r6.ebuild b/app-backup/bacula/bacula-5.2.13-r7.ebuild
index 463523e8d36b..5c90175fbb99 100644
--- a/app-backup/bacula/bacula-5.2.13-r6.ebuild
+++ b/app-backup/bacula/bacula-5.2.13-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -24,7 +24,7 @@ DEPEND="
 	dev-libs/gmp:0
 	!bacula-clientonly? (
 		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( virtual/mysql )
+		mysql? ( dev-db/mysql-connector-c:= )
 		sqlite? ( dev-db/sqlite:3 )
 		!bacula-nodir? ( virtual/mta )
 	)
diff --git a/app-backup/bacula/bacula-9.0.6-r3.ebuild b/app-backup/bacula/bacula-9.0.6-r4.ebuild
index 0c4d61e2a766..bda740bbcd9b 100644
--- a/app-backup/bacula/bacula-9.0.6-r3.ebuild
+++ b/app-backup/bacula/bacula-9.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ DEPEND="
 	dev-libs/gmp:0
 	!bacula-clientonly? (
 		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( virtual/mysql )
+		mysql? ( dev-db/mysql-connector-c:= )
 		sqlite? ( dev-db/sqlite:3 )
 		!bacula-nodir? ( virtual/mta )
 	)
diff --git a/app-backup/bacula/bacula-9.0.8.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild
index 7b76c7626f61..99cacd67cf8e 100644
--- a/app-backup/bacula/bacula-9.0.8.ebuild
+++ b/app-backup/bacula/bacula-9.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,14 +14,14 @@ 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 examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
 	dev-libs/gmp:0
 	!bacula-clientonly? (
 		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( virtual/mysql )
+		mysql? ( dev-db/mysql-connector-c:= )
 		sqlite? ( dev-db/sqlite:3 )
 		!bacula-nodir? ( virtual/mta )
 	)
diff --git a/app-backup/bacula/bacula-9.2.1.ebuild b/app-backup/bacula/bacula-9.2.1.ebuild
new file mode 100644
index 000000000000..4d4577e24ba1
--- /dev/null
+++ b/app-backup/bacula/bacula-9.2.1.ebuild
@@ -0,0 +1,440 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop libtool qmake-utils systemd user
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://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 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/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}
+	!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"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+
+	if ! use bacula-clientonly; then
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	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 wrong 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.0.6/${PN}-9.0.6-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl27.patch
+	fi
+
+	# Don't let program instal 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}"
+		if use mysql; then
+		    myconf="${myconf} \
+			--disable-batch-insert"
+		else
+		    myconf="${myconf} \
+			--enable-batch-insert"
+		fi
+	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 !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 \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--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 \
+		--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
+
+	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 all man pages
+	doman "${S}"/manpages/*
+
+	# 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
+
+	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/files/bacula-fix-manpages.patch b/app-backup/bacula/files/bacula-fix-manpages.patch
new file mode 100644
index 000000000000..5ab0f084da29
--- /dev/null
+++ b/app-backup/bacula/files/bacula-fix-manpages.patch
@@ -0,0 +1,32 @@
+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 716e251d7a5e..906c10f1a6f0 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -2,10 +2,15 @@ AUX bareos-12.4.5-Makefile.patch 924 BLAKE2B ea4e413f5e1ddb5d23aa030e5d7a4e96b23
 AUX bareos-12.4.5-bat-ldflags.patch 389 BLAKE2B 9e1d80037755eba2ae47951aa1e603ac3bac1b26f1cbc0681730ab7ba08846f4670989c517bfe02a6b869b880456e992d3e40fd0d7488d63494a547a902c3c24 SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434
 AUX bareos-dir.confd-16 641 BLAKE2B d13945b9459a3900d1695815d4076f884b9269aa2ea0661aa9fb18345c6febff34154dce976fc467b60e339257d61e6d0403623fe44a2903b51cc44bfe0fb8a3 SHA512 f25d778958fc4081b54bd88a357cb8ba7bc3573c7e262e66996fdc9c05d184cb48e34941e7e1f5ee6c96605c7224ef475b72d6815d2ed5f72fd2ce0cf66c5776
 AUX bareos-dir.initd 491 BLAKE2B 8b937fedf288587f0180fd83ad4e13c383d476b62f9cc8a58cf1a75d8394de2ec2a1ff0314030577bc439ac1b7c1825a929c4d22df0599eccdd00b169d199d29 SHA512 044136eb9260001943d377f977ab913b7999374d9389c275744087cbd18d0a7311c87d96d05551e83a179dc82ab2d5151bf2c5945082eae4f9e6bf44cb5bf060
+AUX bareos-dir.service 263 BLAKE2B 4ee4fc9da7fb1deeb2f880e52c2fccd7f742c273b4a46b66dec04a8377c71e42a3054901d2381b255d2e4022a7b3967a7399359da13900143aef07b17a53cfa7 SHA512 628444c68e85c0540e4ef74ef283fa1cd70d718cdbf8e82eb6aedc44e737bfc47f8803e25ab1fce80c7084bfe1430cbab0cdd6c1adc7aa44219d0af574349f8f
 AUX bareos-fd.confd-16 211 BLAKE2B bc1a36f5f2c1c42d2dbe0ae5bb922d01d2d26beabf3a890e8b8cec48521b73a14904dd3faba3e681fc03a4bd8ccfb0520e0d0ae28bbba45c9082c7e985953153 SHA512 e1e2d8784a7309acc93c4028a88770e642fa69261d1798e4a763ddcf92995916d29f199fad31d6fbb09209c5967fcc2fe6602ac0d28693213878692c634d837c
 AUX bareos-fd.initd 457 BLAKE2B b02399e5112673c94afcbca67399b5a4627d3e0c863a7e9a61255598bf5b846a344b1eaf8a59665bc9abd091b68d67fe4bacfd796a1b97beebe66e28ee6a6fba SHA512 444802b07cff09feb931795869e7cb50f3406a9f895c3baf69a16607ea7ae2da6553d6f819f7fca2ec4c7c86ebffbc9ba925513325b547fb12aab411ac4d68eb
+AUX bareos-fd.service 219 BLAKE2B 741e82a3d1369b5e33642a80381e0d0604ef852552aba2501d632e0f56fbb8da376d0aa7b4ef5478ec0fdd45ed2bcfc91a30517da4022cfabadb671400eb05bb SHA512 3233ee11054ea1b4ab44f183f88614b55a5b6999bec5914c1ba69e98805df9d9515a0e57612ae66b00132bd776cbcca60f5daaf7647241f5c0faa0570c86859b
 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-16.2.7.tar.gz 4282998 BLAKE2B 9101a49d1178e0bcc4843cc4472a2082827a7bd7595389c0fa3699d36651ca70fce674509eeaddc8f806a5df1dba6afc89c05be183e7561e013d23bd157ef294 SHA512 028f38dd77fed5e3af6ee50aa44cb2f82349bd38e40eadebc552a95100166291ae0c68073daa2513919da330c66bb54a3050f1d99cbf3b5354f2450a789f6c00
+DIST bareos-17.2.6.tar.gz 4181984 BLAKE2B a1666b38626228ebf00f6a42f1a5b74c78c26a7178fa5333c9c8fb24ccfda146d20c35d35cbe43b6f53ba1b0ce1dd9b8ad30309997689c39493b51a0db9f5c9b SHA512 5f5ac8cfe028c97fa3120e149f1eb029406b74530517bf6e21574bd726e26c6b78740977635b45cbc2232fda0ee28f1b4338d91a8fa0a86ba05209cce82cd0b2
 EBUILD bareos-16.2.7-r1.ebuild 11323 BLAKE2B 0abe24334ae68f7ef819d76cc03bce740158c0fa600850640eb907e33e32c07822e10633bf0d1bbb86d8acb5a0e2d0a37c228eb93544b256d68d43b32cea1748 SHA512 3c43211665dc550212218b87063d6094016db80ac9c620be9d88268d17141b9f08946faaf25ee1c90f2b58bb5519c6d96a4ce1960fdbf1c62664f94b9be55c44
+EBUILD bareos-17.2.6.ebuild 11245 BLAKE2B 825e335734933a03ea224f90cb5d843dc99a3831f17387cf8e4129751e6c2d9b3b80b189f6b1be644ba4dd807f13b61121d65bef9449ba40f9f686c9c91caedd SHA512 1f2039ab93d3a7434acc66048cc674230dd7b5bd14c09860b5a493b677db34e8436669f7ae2f19fb70bec9b34f79eb72ee43b4cace821dcdde316c5a62bbae38
 MISC metadata.xml 1440 BLAKE2B 588672b8975b109eb293f8a251ea5745cbcdab83acac5b1efb3318e2b06eeecfb48114974fd0854fc98480a8607ef7603e0882a2c74d3a301023cdafc67348ff SHA512 b76bc10f031dc5ab0abd71980706a3beebfb50a8e7d273bdfbf85124309ba98ab4542d6e273691a8105c8c5a078b3886d891131a79c587ab62f361e7bba7b5b7
diff --git a/app-backup/bareos/bareos-17.2.6.ebuild b/app-backup/bareos/bareos-17.2.6.ebuild
new file mode 100644
index 000000000000..25469bc0f107
--- /dev/null
+++ b/app-backup/bareos/bareos-17.2.6.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit eutils multilib python-single-r1 systemd user
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+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
+	sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax"
+REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
+
+DEPEND="
+	!app-backup/bacula
+	cephfs? ( sys-cluster/ceph )
+	rados? ( sys-cluster/ceph )
+	rados-striper? ( >=sys-cluster/ceph-0.94.2 )
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		postgres? ( dev-db/postgresql:*[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		director? (
+			virtual/mta
+			jansson? ( dev-libs/jansson )
+		)
+	)
+	fastlz? ( dev-libs/bareos-fastlzlib )
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		ssl? (
+			!gnutls? (
+				!libressl? ( dev-libs/openssl:0=[static-libs] )
+				libressl? ( dev-libs/libressl:0=[static-libs] )
+			)
+			gnutls? ( net-libs/gnutls[static-libs] )
+		)
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/lzo
+		ssl? (
+			!gnutls? (
+				!libressl? ( dev-libs/openssl:0= )
+				libressl? ( dev-libs/libressl:0= )
+			)
+			gnutls? ( net-libs/gnutls )
+		)
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="static? ( clientonly )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_setup() {
+	use mysql && export mydbtypes+="mysql"
+	use postgres && export mydbtypes+=" postgresql"
+	use sqlite && export mydbtypes+=" sqlite"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bareos 2>/dev/null)" ]; then
+		enewgroup bareos
+		einfo
+		einfo "The group 'bareos' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if ! use clientonly; then
+		if [ -z "$(egetent passwd bareos 2>/dev/null)" ]; then
+			enewuser bareos -1 -1 /var/lib/bareos bareos,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bareos' has been created.  Please see the bareos manual"
+			einfo "for information about running bareos as a non-root user."
+			einfo
+		fi
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bareos/<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; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bareos/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# enables default database driver in catalog
+	pushd src/defaultconfigs/bareos-dir.d/catalog >&/dev/null || die
+		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE/d' MyCatalog.conf.in \
+			|| die "sed on MyCatalog.conf.in failed"
+	popd >&/dev/null || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# do not strip binaries
+	for d in filed console dird stored; do
+		sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=''
+
+	addpredict /var/lib/logrotate.status
+
+	if use clientonly; then
+		myconf="${myconf} \
+			$(use_enable clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable acl) \
+		$(use_enable ipv6) \
+		$(use_enable ndmp) \
+		$(use_enable readline) \
+		$(use_enable !readline conio) \
+		$(use_enable scsi-crypto) \
+		$(use_enable sql-pooling) \
+		$(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") \
+		$(use_with ssl openssl) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable lmdb) \
+		$(use_with glusterfs) \
+		$(use_with rados) \
+		$(use_with rados-striper) \
+		$(use_with cephfs) \
+		$(use_with jansson) \
+		"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/run/bareos \
+		--sysconfdir=/etc \
+		--with-subsys-dir=/run/lock/subsys \
+		--with-working-dir=/var/lib/bareos \
+		--with-logdir=/var/log/bareos \
+		--with-scriptdir=/usr/libexec/bareos \
+		--with-plugindir=/usr/$(get_libdir)/${PN}/plugin \
+		--with-backenddir=/usr/$(get_libdir)/${PN}/backend \
+		--with-dir-user=bareos \
+		--with-dir-group=bareos \
+		--with-sd-user=root \
+		--with-sd-group=bareos \
+		--with-fd-user=root \
+		--with-fd-group=bareos \
+		--with-sbin-perm=0755 \
+		--with-systemd \
+		--with-db-password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` \
+		--enable-dynamic-cats-backends \
+		--enable-dynamic-storage-backends \
+		--enable-batch-insert \
+		--disable-afs \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newicon src/images/bareos_logo_shadow.png bareos.png
+
+	# 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}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts
+	rm -f "${D}"/etc/init.d/bareos-*
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	use ndmp && dodoc README.NDMP
+	use scsi-crypto && dodoc README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts="${myscripts} bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts="${myscripts} bareos-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-16 "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bareos-dir)
+				sed -i -e "s:%databasetypes%:${mydbtypes}:" "${T}/${script}".confd || die
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	# install systemd unit files
+	use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
+	use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+	systemd_dounit "${FILESDIR}"/bareos-fd.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		if use postgres; then
+			einfo
+			einfo "For postgresql:"
+			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
+		fi
+		if use mysql; then
+			einfo
+			einfo "For mysql:"
+			einfo
+			einfo "  Make sure root has direct access to your mysql server. You may want to"
+			einfo "  create a /root/.my.cnf file with"
+			einfo "    [client]"
+			einfo "    user=root"
+			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
+			einfo "  before running:"
+			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
+			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
+			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
+		fi
+		einfo
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bareos does not officially support SQLite database."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+		einfo "It is strongly recommended to use either postgresql or mysql as"
+		einfo "catalog database backend."
+		einfo
+	fi
+}
diff --git a/app-backup/bareos/files/bareos-dir.service b/app-backup/bareos/files/bareos-dir.service
new file mode 100644
index 000000000000..440d3c3be98d
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir.service
@@ -0,0 +1,13 @@
+[Unit]
+	Description=Bareos Director
+	After=syslog.target network.target
+	Requires=bareos-sd.service bareos-fd.service
+
+[Install]
+	WantedBy=multi-user.target
+
+[Service]
+	Type=forking
+	User=root
+	ExecStartPre=-/bin/mkdir /run/bareos
+	ExecStart=/usr/sbin/bareos-dir
diff --git a/app-backup/bareos/files/bareos-fd.service b/app-backup/bareos/files/bareos-fd.service
new file mode 100644
index 000000000000..103286094250
--- /dev/null
+++ b/app-backup/bareos/files/bareos-fd.service
@@ -0,0 +1,12 @@
+[Unit]
+	Description=Bareos File Daemon
+	After=syslog.target network.target
+
+[Install]
+	WantedBy=multi-user.target
+
+[Service]
+	Type=forking
+	User=root
+	ExecStartPre=-/bin/mkdir /run/bareos
+	ExecStart=/usr/sbin/bareos-fd
diff --git a/app-backup/bareos/files/bareos-sd.service b/app-backup/bareos/files/bareos-sd.service
new file mode 100644
index 000000000000..6c617ec6a37f
--- /dev/null
+++ b/app-backup/bareos/files/bareos-sd.service
@@ -0,0 +1,12 @@
+[Unit]
+        Description=Bareos Storage Daemon
+        After=syslog.target network-online.target
+
+[Install]
+	WantedBy=multi-user.target
+
+[Service]
+	Type=forking
+	User=root
+	ExecStartPre=-/bin/mkdir /run/bareos
+	ExecStart=/usr/sbin/bareos-sd
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index 374f97a64b7c..28d43d75538f 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -1,4 +1,7 @@
 DIST spideroak-bin-7.2.0_amd64.deb 24854982 BLAKE2B 9eab89f2c7713f9edbf97da986744c605113830efa971b5327794aa05640ab6386d76d4473cd3a5f6373611bdf7f2ee5ec8eb59d1b9914de48a7b2f724ce4c4e SHA512 9edaf0a7e6e6e985dd7ae1e969c43373393ea6293b8895d74be48f364513a992865ca5cb3150e5fce23eb49635a3442f5162a2606d8fac1ab1036ed922c214cb
 DIST spideroak-bin-7.2.0_x86.deb 24773806 BLAKE2B 4c4c778f50efa8b77c6d0b2ff522ce3ccacc9c0b6fba5b9acb8e6ea25816b303b34751e47f3e27f6b014c03e02473d22b1eba280618cdd9b6c639b82f2425d70 SHA512 758bdaefe307c4c7b7eebc47ebbb835e66c0a57350e34a2cd818212de1d800ae432459933d9613af60b877889724fe90726dd6705fa152b2478bd55552e541ba
+DIST spideroak-bin-7.3.0_amd64.deb 18514400 BLAKE2B 3c0d617c4b791cc0e5a9c82111c9486c18ab09d2bfc4102d69b266f6e3d4185a9d74d640ddd3733a86dac1f87f3360968636407ee4f3da6c2bd20779c16e6ddb SHA512 f27cfac3f9055281fece38ba68781287cd886c7c40b998e63cfc1aba0a036b375a06b9cc60390b7e4845ef9c4eae2d94914669dd345ba8de90424ff98ec28d58
+DIST spideroak-bin-7.3.0_x86.deb 24779422 BLAKE2B 8cdae243794e5de6a8326e335b539d004c0ba0f1121b85067acbffffbef67f4a0c785f3b794abb62a5eedfd459c8e4d5e48cf8848b005ba637150b286b13db22 SHA512 32504b6e6931f1e923d4202f0b3201c93190128d30767ec41ac11cf7c8c751b87094bdedcf44dda3ae8089543418366c5a78093b9236fee5f95e7f89a29141fc
 EBUILD spideroak-bin-7.2.0.ebuild 2664 BLAKE2B fc53873462c7f98e69ac926273c6c62bf19e4d47d3028ad5eed684417dd0827505b1960b30005714fd564a52ebee59e3da2f44ad101312fa680e85409968b1d4 SHA512 75ad609ca59dfc51da9feac1953314c15b5914e56b8d7c89d3ee91e66536b37e1b5ae0d48c47d34536403aa4cf164b1568e44d97242b5598e2d5341fb55e173e
+EBUILD spideroak-bin-7.3.0.ebuild 2661 BLAKE2B 0ee7181887b9c96864a6e724b4ab517bce73fef8202df19b6a99710b6f8fa01b7f8eb5d471cdb3865d8f2f08f5a953cf65b33583a52eedda8c354a8cdddfb9dc SHA512 6a1297e673ffd891768504629a0bc0fffe9437bda4fe7c3990f85831696305c6f4b9cae73fc554e1b1d5e4a341be6e1816c4432da272a9e2b0270fdbbe9f8fa8
 MISC metadata.xml 352 BLAKE2B d51f327fe859d894ae43eebfeac7b983b9b450ebd190352dedaaa95f844d1df86c6e8ea6b7478dafbc419af1fa273760b0c53c02280050947058ba052650f53b SHA512 fd3c4eea494c4e8e5f093e5cc099577c2f944d0f05c6376798a1e7680e9b194c45719e09a6cec755054b174dd6f9039c69d10e863f0bec72b6a15420d0c9bd7b
diff --git a/app-backup/spideroak-bin/spideroak-bin-7.3.0.ebuild b/app-backup/spideroak-bin/spideroak-bin-7.3.0.ebuild
new file mode 100644
index 000000000000..8dd6ec9d73fe
--- /dev/null
+++ b/app-backup/spideroak-bin/spideroak-bin-7.3.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils unpacker
+
+DESCRIPTION="Secure free online backup, storage, and sharing system"
+HOMEPAGE="https://spideroak.com"
+
+SRC_URI_BASE="https://spideroak.com/release/spideroak"
+SRC_URI="x86? ( ${SRC_URI_BASE}/deb_x86 -> ${P}_x86.deb )
+	amd64? ( ${SRC_URI_BASE}/deb_x64 -> ${P}_amd64.deb )"
+
+RESTRICT="mirror strip"
+
+LICENSE="spideroak"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus X"
+
+DEPEND="dev-util/patchelf"
+RDEPEND="
+	app-crypt/mit-krb5[keyutils]
+	media-libs/libpng:1.2
+	dbus? ( sys-apps/dbus )
+	X? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		dev-libs/glib:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Set RPATH for preserve-libs handling (bug #400979).
+	cd "${S}/opt/SpiderOakONE/lib" || die
+	local x
+	for x in `find` ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		patchelf --set-rpath '$ORIGIN' "${x}" || \
+			die "patchelf failed on ${x}"
+	done
+
+	#Remove the libraries that break compatibility in modern systems
+	#SpiderOak will use the system libs instead
+	rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6"
+	rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1"
+	rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0"
+	rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1"
+
+	eapply_user
+}
+
+src_install() {
+	#install the wrapper script
+	exeinto /usr/bin
+	doexe usr/bin/SpiderOakONE
+
+	# inotify_dir_watcher needs to be marked executable, bug #453266
+	#chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher
+
+	#install the executable
+	exeinto /opt/SpiderOakONE/lib
+	doexe opt/SpiderOakONE/lib/SpiderOakONE
+	doexe opt/SpiderOakONE/lib/inotify_dir_watcher
+	rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher}
+
+	#install the prebundled libraries
+	insinto /opt/SpiderOakONE
+	doins -r opt/SpiderOakONE/lib
+
+	#install the config files
+	use dbus || rm -rf etc/dbus-1
+	insinto /
+	doins -r etc
+
+	#install the manpage
+	doman usr/share/man/man1/SpiderOakONE.1.gz
+
+	if use X; then
+		domenu usr/share/applications/SpiderOakONE.desktop
+		doicon usr/share/pixmaps/SpiderOakONE.png
+	fi
+}
+
+pkg_postinst() {
+	if ! use X; then
+		einfo "For instructions on running SpiderOakONE without a GUI, please read the FAQ:"
+		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
+		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
+	fi
+}