gentoo resync : 15.12.2017

7 files changed, 66 insertions, 836 deletions

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 68c8d545122d..8a74e3f99fa5 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,19 +1,18 @@
 AUX bareos-12.4.5-Makefile.patch 924 BLAKE2B ea4e413f5e1ddb5d23aa030e5d7a4e96b23cd987fc86d2958c5275994198f8aa3705b5554e545440f31cfaed45283e34a08aa4e27087d81edc192d1e9884d63f SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed
 AUX bareos-12.4.5-bat-ldflags.patch 389 BLAKE2B 9e1d80037755eba2ae47951aa1e603ac3bac1b26f1cbc0681730ab7ba08846f4670989c517bfe02a6b869b880456e992d3e40fd0d7488d63494a547a902c3c24 SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434
 AUX bareos-dir.confd 672 BLAKE2B 2114e8dc155166550e4adabb7bcb9216a41dd2eb0e38870f1d260f612f568bc9435ebb7dc46109b97f43aaa214fbddc47037ef707df3e07c7e0626a2ef51988a SHA512 24e01b4baddaedce2a667c1d9f5422c3134a742fd8a4ddad9502a6b7a62a080e9133472e791cdea7ac2bb4a1737be9798405fc61b01096cc179f50139bcf7a24
+AUX bareos-dir.confd-16 641 BLAKE2B d13945b9459a3900d1695815d4076f884b9269aa2ea0661aa9fb18345c6febff34154dce976fc467b60e339257d61e6d0403623fe44a2903b51cc44bfe0fb8a3 SHA512 f25d778958fc4081b54bd88a357cb8ba7bc3573c7e262e66996fdc9c05d184cb48e34941e7e1f5ee6c96605c7224ef475b72d6815d2ed5f72fd2ce0cf66c5776
 AUX bareos-dir.initd 491 BLAKE2B 8b937fedf288587f0180fd83ad4e13c383d476b62f9cc8a58cf1a75d8394de2ec2a1ff0314030577bc439ac1b7c1825a929c4d22df0599eccdd00b169d199d29 SHA512 044136eb9260001943d377f977ab913b7999374d9389c275744087cbd18d0a7311c87d96d05551e83a179dc82ab2d5151bf2c5945082eae4f9e6bf44cb5bf060
 AUX bareos-fd.confd 241 BLAKE2B 436301b0bcea5ab2f5cbfc4ad801c1903f1ec615832b6a04edb0bf56aa653f8181241510e060bb72e33cc16c8e067bcfba643d50a5729f960e09d899fd91dd92 SHA512 e646adbd06765172da6f4af749b617c49cf57f072402a44dcb1eb4a289337c20c7677701489e5fe8991729097b55fe57d09a6573a7b4af4005435fd03ab39de5
+AUX bareos-fd.confd-16 211 BLAKE2B bc1a36f5f2c1c42d2dbe0ae5bb922d01d2d26beabf3a890e8b8cec48521b73a14904dd3faba3e681fc03a4bd8ccfb0520e0d0ae28bbba45c9082c7e985953153 SHA512 e1e2d8784a7309acc93c4028a88770e642fa69261d1798e4a763ddcf92995916d29f199fad31d6fbb09209c5967fcc2fe6602ac0d28693213878692c634d837c
 AUX bareos-fd.initd 457 BLAKE2B b02399e5112673c94afcbca67399b5a4627d3e0c863a7e9a61255598bf5b846a344b1eaf8a59665bc9abd091b68d67fe4bacfd796a1b97beebe66e28ee6a6fba SHA512 444802b07cff09feb931795869e7cb50f3406a9f895c3baf69a16607ea7ae2da6553d6f819f7fca2ec4c7c86ebffbc9ba925513325b547fb12aab411ac4d68eb
 AUX bareos-sd.confd 391 BLAKE2B ff2be9b80ff80e719aa224e65e58d12150ba08e38992f989d75c3c3f6669d7b450d7cbb8d8d0c11dbe094c9c74073fe8f5c658873d98f33ee477480af66ad655 SHA512 4db591d0818e0d53b663e1e96371713269fddeac2a46ca5938f8b69185578b61ba530d4357f0cc9f9232834c66692a77708b70140fb856635e7cb2e16870b28d
+AUX bareos-sd.confd-16 361 BLAKE2B 3c5feb7e6615db5395f2895ed4ea3e0745c4da0ca68cbdd6c899da0be63db0a7ee561aa44404490ef227a08fe5f339c337fd4eadf43a384741d3071ef4332772 SHA512 1cd7a0a6b16d95db4ac39a4858caf0df35b3cd68e6ed87dff687c48008e4f31597e8510ac6a2e1442a80dec7e5608341832b55d3e2ae96793f203fd95700da22
 AUX bareos-sd.initd 481 BLAKE2B c14f2640be1685aaa0304dcfff2c272e37cb55cce92c7e2808eeaa94b20d4cfb4a705b53d06880f5b5c50b96162ea4d6cb23160b6e31ec34889b867c3aad09e1 SHA512 e094df3f44ed39207129bb86020b223037acc7bda408a69711b68376d1044dbe67001370395dd4442df6b4e78e92dc5125dd14dad6c4826716df2084fbd45916
-DIST bareos-13.2.4.tar.gz 3467542 BLAKE2B 7e9ef15ad3ec86af8e60d90d27660b1e10a18eb928e76af319cc59ce6a39805874fc27dc8e62b81fb9fccfbd0b6b2e73583e54f5c9580db96469b85e48736ce6 SHA512 d7e4bc016993f68521f4438b56adf51e88685195693d00d34103259c3c24d1d7c03cc2b7aecbb55ff88a00d5f169e9e42accd23b17bcd3c837ca78079a9f394f
-DIST bareos-14.2.2.tar.gz 3811787 BLAKE2B ace5a3d25c98df852308cef0ff603e416aff2f4a437c0621732288c792fef1fb4e89f413b022586f7adf018fdae1dbe33b4124b942ed5fce24088f1caea99c4f SHA512 be490ab2f8085975f164ac554cac7d6bbef1af01c8350b5816b2033a37827de4a81bead6ce1e699fe5cc44085dce2b6a0330b91239fb87907e22f9c8dc710156
-DIST bareos-14.2.5.tar.gz 3820963 BLAKE2B 7f9736be72fbf03f277e8d8460e4343e9340c7c9fb50722566f16a09e97dcf921f54eee528e0b453e4f0251a4e91ec983006cbda027597ae98beb70265b1f22b SHA512 600cdf8175b1199b73ddcf8a32df7bca446c294c4c830038f93fe3f053482916745675df3a51bc494cdab00b362d57657a34a94e78bac4bae3acced06347023d
 DIST bareos-15.2.2.tar.gz 3928036 BLAKE2B ac331008e45c029bb3320a9a40264d350aedbb5550d65a606a95372241f5ec9c8a7e73f365f8b0c3972e59fa907764995b0173dcd762971cd2fdce1e025c75e2 SHA512 07b11c51695a6ff348317965625e5cdb8e296d4f3a4037718a98e266d94650ed1fb905c220ac791123d8ed92d0aed24854a6ab52887249849dbc00697d3300c3
 DIST bareos-16.2.4.tar.gz 4275141 BLAKE2B e7b8a5658a697436401659ecd24148f4f1ad982cbd6dd46c39f3d29ba461b54737950d6fe6ec2c36e7892d414306c7038af5221c28652109e047f66f2d9daa2e SHA512 91f7f2b3d9889f4faa9834dc414e2250015d3d26bf8bd0c04c1f3fd882a50a4066ced145f7c8609c070e8f74b53574953e3fef344726c6863cd7bbc73c76a88c
-EBUILD bareos-13.2.4-r1.ebuild 11271 BLAKE2B 9586e09997073310d839ee5ea325668d9b09999111dcce7665b756259f2b75feab31ee60b0252b12829366366b67c2b654505d3292fbddf03e4a09e31e294575 SHA512 c21ff041810eb4672260dbbff621b67c14120e52b2f7cc961c6b9dfb5fc2866b126c380f67eaea2b7a97bd1e9f4c57405fd4182c0c3dc1d00bf2ce4f73c609b3
-EBUILD bareos-14.2.2.ebuild 11625 BLAKE2B 60781fb81d8e133e3963b1092afbb0da80392f3af314a6d7a9361f0fd66702160eeca7467f6131002340c4d4ff72c871f1a651586383cfd26ccfc04468b77f59 SHA512 946d2f66d2334b2f077604395a80bf28e72b939d1569d88a0d865f941b430735b9da59f604821cbdf890c27f7702774d78d3607e516f6329426d8d55bff581b1
-EBUILD bareos-14.2.5.ebuild 11625 BLAKE2B 60781fb81d8e133e3963b1092afbb0da80392f3af314a6d7a9361f0fd66702160eeca7467f6131002340c4d4ff72c871f1a651586383cfd26ccfc04468b77f59 SHA512 946d2f66d2334b2f077604395a80bf28e72b939d1569d88a0d865f941b430735b9da59f604821cbdf890c27f7702774d78d3607e516f6329426d8d55bff581b1
+DIST bareos-16.2.7.tar.gz 4282998 BLAKE2B 9101a49d1178e0bcc4843cc4472a2082827a7bd7595389c0fa3699d36651ca70fce674509eeaddc8f806a5df1dba6afc89c05be183e7561e013d23bd157ef294 SHA512 028f38dd77fed5e3af6ee50aa44cb2f82349bd38e40eadebc552a95100166291ae0c68073daa2513919da330c66bb54a3050f1d99cbf3b5354f2450a789f6c00
 EBUILD bareos-15.2.2.ebuild 12003 BLAKE2B 4e3bcd25d3df29a12a56934e0ea1e0705667ceef3103c7733da6084fe9218566eba12f81226d907f5042c15d13d8e8e6e247252caeb2efe85c2fca3e2891cb2d SHA512 52cecb0c65a4c1ed7cb7d15190c5edc0c9827c8ed306d789c02d9df6d963487b3b1327802c6de85e12b3b39856c1f5e7a83852b754210078fab889641d3f152c
 EBUILD bareos-16.2.4.ebuild 12003 BLAKE2B 4e3bcd25d3df29a12a56934e0ea1e0705667ceef3103c7733da6084fe9218566eba12f81226d907f5042c15d13d8e8e6e247252caeb2efe85c2fca3e2891cb2d SHA512 52cecb0c65a4c1ed7cb7d15190c5edc0c9827c8ed306d789c02d9df6d963487b3b1327802c6de85e12b3b39856c1f5e7a83852b754210078fab889641d3f152c
+EBUILD bareos-16.2.7.ebuild 12006 BLAKE2B 8154ae6a5616f9693794dfeb242065963d79cae17c77f56f327b736a8773939913d8cd9ca2a61470fdb936aa3c510967b50c7f09d16acdd0f6b49bd9f52f6234 SHA512 67477519cc1a7c1991011ac698a2d2fa85fc50839282bb56f5aa8a6c338f6e40705324359caa84bc107e46d459ff4ac083eed121ab6a5b5016337d2083d946bb
 MISC metadata.xml 1440 BLAKE2B 588672b8975b109eb293f8a251ea5745cbcdab83acac5b1efb3318e2b06eeecfb48114974fd0854fc98480a8607ef7603e0882a2c74d3a301023cdafc67348ff SHA512 b76bc10f031dc5ab0abd71980706a3beebfb50a8e7d273bdfbf85124309ba98ab4542d6e273691a8105c8c5a078b3886d891131a79c587ab62f361e7bba7b5b7
diff --git a/app-backup/bareos/bareos-13.2.4-r1.ebuild b/app-backup/bareos/bareos-13.2.4-r1.ebuild
deleted file mode 100644
index 1890fd8e3bd8..000000000000
--- a/app-backup/bareos/bareos-13.2.4-r1.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit eutils multilib python-single-r1 qt4-r2 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="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp postgres
-		python qt4 readline scsi-crypto sql-pooling +sqlite ssl static +storage-daemon
-		tcpd vim-syntax X"
-
-DEPEND="
-	!app-backup/bacula
-	dev-libs/gmp:0
-	!clientonly? (
-		postgres? ( dev-db/postgresql:*[threads] )
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		director? ( virtual/mta )
-	)
-	qt4? (
-		dev-qt/qtsvg:4
-		x11-libs/qwt:5
-	)
-	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? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/lzo
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		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 && use static && use qt4; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
-		ewarn
-	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 \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bareos/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# stop build for errors in subdirs
-	epatch "${FILESDIR}"/${PN}-12.4.5-Makefile.patch
-
-	# bat needs to respect LDFLAGS
-	epatch "${FILESDIR}"/${PN}-12.4.5-bat-ldflags.patch
-
-	# do not strip binaries
-	for d in filed console dird stored; do
-		sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die
-	done
-}
-
-src_configure() {
-	local myconf=''
-
-	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
-
-	# do not build bat and traymonitor if 'static' clientonly
-	if ! use clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt4 bat) \
-			$(use_enable qt4 traymonitor)"
-	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) \
-		"
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/run/bareos \
-		--sysconfdir=/etc/bareos \
-		--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-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 \
-		--enable-smartalloc \
-		--enable-dynamic-cats-backends \
-		--enable-batch-insert \
-		--disable-afs \
-		--host=${CHOST} \
-		${myconf}
-	# correct configuration for QT based bat
-	if use qt4 ; then
-		pushd src/qt-console
-		eqmake4
-		popd
-		pushd src/qt-tray-monitor
-		eqmake4
-		popd
-	fi
-}
-
-src_compile() {
-	# workaround for build failing with high -j values
-	# if ndmp is enabled
-	use ndmp && MAKEOPTS="$MAKEOPTS -j1"
-
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bareos.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt4 && ! use static ; then
-		doicon src/images/bat.png
-		domenu scripts/bat.desktop
-	fi
-
-	# 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 qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	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
-	if ! use qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bareos-tray-monitor.1*
-	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 "${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
-
-	# 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 databases with:"
-		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
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}
diff --git a/app-backup/bareos/bareos-14.2.5.ebuild b/app-backup/bareos/bareos-14.2.5.ebuild
deleted file mode 100644
index e9e440269f51..000000000000
--- a/app-backup/bareos/bareos-14.2.5.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit eutils multilib python-single-r1 qt4-r2 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="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp postgres
-		python qt4 readline scsi-crypto sql-pooling +sqlite ssl static +storage-daemon
-		tcpd vim-syntax X cephfs glusterfs lmdb rados"
-
-DEPEND="
-	!app-backup/bacula
-	cephfs? ( sys-cluster/ceph )
-	rados? ( sys-cluster/ceph )
-	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 )
-	)
-	qt4? (
-		dev-qt/qtsvg:4
-		x11-libs/qwt:5
-	)
-	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? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/lzo
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		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 && use static && use qt4; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
-		ewarn
-	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 \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bareos/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# stop build for errors in subdirs
-	epatch "${FILESDIR}"/${PN}-12.4.5-Makefile.patch
-
-	# bat needs to respect LDFLAGS
-	epatch "${FILESDIR}"/${PN}-12.4.5-bat-ldflags.patch
-
-	# do not strip binaries
-	for d in filed console dird stored; do
-		sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die
-	done
-}
-
-src_configure() {
-	local myconf=''
-
-	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
-
-	# do not build bat and traymonitor if 'static' clientonly
-	if ! use clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt4 bat) \
-			$(use_enable qt4 traymonitor)"
-	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 cephfs) \
-		"
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/run/bareos \
-		--sysconfdir=/etc/bareos \
-		--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 \
-		--enable-smartalloc \
-		--enable-dynamic-cats-backends \
-		--enable-dynamic-storage-backends \
-		--enable-batch-insert \
-		--disable-afs \
-		--host=${CHOST} \
-		${myconf}
-	# correct configuration for QT based bat
-	if use qt4 ; then
-		pushd src/qt-console
-		eqmake4
-		popd
-		pushd src/qt-tray-monitor
-		eqmake4
-		popd
-	fi
-}
-
-src_compile() {
-	# workaround for build failing with high -j values
-	# if ndmp is enabled
-	use ndmp && MAKEOPTS="$MAKEOPTS -j1"
-
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bareos.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt4 && ! use static ; then
-		doicon src/images/bat.png
-		domenu scripts/bat.desktop
-	fi
-
-	# 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 qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	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
-	if ! use qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bareos-tray-monitor.1*
-	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 "${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
-
-	# 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 databases with:"
-		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
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}
diff --git a/app-backup/bareos/bareos-14.2.2.ebuild b/app-backup/bareos/bareos-16.2.7.ebuild
index e9e440269f51..099882b6e3d4 100644
--- a/app-backup/bareos/bareos-14.2.2.ebuild
+++ b/app-backup/bareos/bareos-16.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,14 +16,16 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp postgres
-		python qt4 readline scsi-crypto sql-pooling +sqlite ssl static +storage-daemon
-		tcpd vim-syntax X cephfs glusterfs lmdb rados"
+IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
+	logwatch mysql ndmp postgres python qt4 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
@@ -31,7 +33,10 @@ DEPEND="
 		postgres? ( dev-db/postgresql:*[threads] )
 		mysql? ( virtual/mysql )
 		sqlite? ( dev-db/sqlite:3 )
-		director? ( virtual/mta )
+		director? (
+			virtual/mta
+			jansson? ( dev-libs/jansson )
+		)
 	)
 	qt4? (
 		dev-qt/qtsvg:4
@@ -47,16 +52,22 @@ DEPEND="
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
 		ssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
+			!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? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			!gnutls? (
+				!libressl? ( dev-libs/openssl:0= )
+				libressl? ( dev-libs/libressl:0= )
+			)
+			gnutls? ( net-libs/gnutls )
 		)
 		sys-libs/ncurses:=
 		sys-libs/zlib
@@ -141,6 +152,8 @@ src_prepare() {
 src_configure() {
 	local myconf=''
 
+	addpredict /var/lib/logrotate.status
+
 	if use clientonly; then
 		myconf="${myconf} \
 			$(use_enable clientonly client-only) \
@@ -177,7 +190,9 @@ src_configure() {
 		$(use_enable lmdb) \
 		$(use_with glusterfs) \
 		$(use_with rados) \
+		$(use_with rados-striper) \
 		$(use_with cephfs) \
+		$(use_with jansson) \
 		"
 
 	econf \
@@ -185,7 +200,7 @@ src_configure() {
 		--docdir=/usr/share/doc/${PF} \
 		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/run/bareos \
-		--sysconfdir=/etc/bareos \
+		--sysconfdir=/etc \
 		--with-subsys-dir=/run/lock/subsys \
 		--with-working-dir=/var/lib/bareos \
 		--with-logdir=/var/log/bareos \
@@ -200,7 +215,6 @@ src_configure() {
 		--with-fd-group=bareos \
 		--with-sbin-perm=0755 \
 		--with-systemd \
-		--enable-smartalloc \
 		--enable-dynamic-cats-backends \
 		--enable-dynamic-storage-backends \
 		--enable-batch-insert \
@@ -229,7 +243,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	doicon scripts/bareos.png
+	newicon src/images/bareos_logo_shadow.png bareos.png
 
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
@@ -339,7 +353,7 @@ src_install() {
 	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}/${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
diff --git a/app-backup/bareos/files/bareos-dir.confd-16 b/app-backup/bareos/files/bareos-dir.confd-16
new file mode 100644
index 000000000000..a11eba90a755
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir.confd-16
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bareos-dir
+
+# Bareos can use more than one catalog database and each one can 
+# be of any supported type.
+# If a database server where you store a bareos catalog
+# is on a different machine, you might want to remove the corresponding
+# type from the rc_need variable.
+rc_need="%databasetypes%"
+
+# Options for the director daemon.
+# The director can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+DIR_OPTIONS="-u root -g bareos"
diff --git a/app-backup/bareos/files/bareos-fd.confd-16 b/app-backup/bareos/files/bareos-fd.confd-16
new file mode 100644
index 000000000000..e3b8a1f576fd
--- /dev/null
+++ b/app-backup/bareos/files/bareos-fd.confd-16
@@ -0,0 +1,7 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bareos-fd
+
+# Options for the file daemon.
+FD_OPTIONS="-u root -g bareos"
diff --git a/app-backup/bareos/files/bareos-sd.confd-16 b/app-backup/bareos/files/bareos-sd.confd-16
new file mode 100644
index 000000000000..5d377b978dd5
--- /dev/null
+++ b/app-backup/bareos/files/bareos-sd.confd-16
@@ -0,0 +1,10 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bareos-sd
+
+# Options for the storage daemon.
+# The storage daemon can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+SD_OPTIONS="-u root -g bareos"