From 06f65a5d337034f6dc58d9cee7a93368c59003f0 Mon Sep 17 00:00:00 2001
From: Sergey Morozov <sergey@blshadow.org.ru>
Date: Sat, 18 Apr 2015 22:47:10 +0300
Subject: [PATCH] Add app-backup/bareos-14.2.2

---
 app-backup/bareos/Manifest                    |  10 +
 app-backup/bareos/bareos-14.2.2.ebuild        | 409 ++++++++++++++++++
 .../bareos/files/bareos-12.4.5-Makefile.patch |  27 ++
 .../files/bareos-12.4.5-bat-ldflags.patch     |  11 +
 app-backup/bareos/files/bareos-dir.confd      |  18 +
 app-backup/bareos/files/bareos-dir.initd      |  22 +
 app-backup/bareos/files/bareos-fd.confd       |   8 +
 app-backup/bareos/files/bareos-fd.initd       |  22 +
 app-backup/bareos/files/bareos-sd.confd       |  11 +
 app-backup/bareos/files/bareos-sd.initd       |  22 +
 10 files changed, 560 insertions(+)
 create mode 100644 app-backup/bareos/Manifest
 create mode 100644 app-backup/bareos/bareos-14.2.2.ebuild
 create mode 100644 app-backup/bareos/files/bareos-12.4.5-Makefile.patch
 create mode 100644 app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
 create mode 100644 app-backup/bareos/files/bareos-dir.confd
 create mode 100644 app-backup/bareos/files/bareos-dir.initd
 create mode 100644 app-backup/bareos/files/bareos-fd.confd
 create mode 100644 app-backup/bareos/files/bareos-fd.initd
 create mode 100644 app-backup/bareos/files/bareos-sd.confd
 create mode 100644 app-backup/bareos/files/bareos-sd.initd

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
new file mode 100644
index 0000000..53dd80d
--- /dev/null
+++ b/app-backup/bareos/Manifest
@@ -0,0 +1,10 @@
+AUX bareos-12.4.5-Makefile.patch 924 SHA256 0b2428d3ee7ea5ceae4e02d3c315cc6f6b59d21d44749967dd121e29c060942d SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed WHIRLPOOL 0aeddbe01415260fce862dfa0b387bb5a443b29ed1367ea0fb0c2350c2af24f4f1934497d1590612fa3a3e62e929e5811caa9591e99e5a76fcfc6d73769baa1a
+AUX bareos-12.4.5-bat-ldflags.patch 389 SHA256 b4b569fecdecbef0b5e0c1bcafddd61a48893ee1e33b52289a455a4773adc9ca SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434 WHIRLPOOL 488a764b303c3ed077d55bf04ae91e33d24c69c71476d8ad3416608f60a8071471a96f2a539266509b20133d5cf0e0f66ac284aee99f5378030b7a6c394a1987
+AUX bareos-dir.confd 788 SHA256 9cd4ac430bfc29e9b6c71c24b94fc4d4baa6febaec062b3fc90eb3db86ff8a83 SHA512 85307268abd1bc15e7e1b7ab4d519aa579349f7c61e242aba6cf9d7613a25ad67034b7e8cc12be20d7b0b4ec73100fc859847fe676641f7d36e7b61a6988a7d0 WHIRLPOOL 18d0b42a01c77493d5867a5a17fd7cd5081937da22e0ff027814176398a2bbb5a246a81cfc3a9db3ea405a846e619d36f88063ed8b5b4e7822d71102200e4a21
+AUX bareos-dir.initd 606 SHA256 c8486c7b97ab77a3bbb857ab6a6183f4cc1877198224115aa824fd65af903f59 SHA512 9393044770b69018702e512a282152aded93f4ade9dc3de73590d69102b81f131f49c12d6d309609758ec6e29276ea7bf730cef86cc30f6f7b3de12405459d92 WHIRLPOOL bca82ad24f660683e75324f3a36be87917faf26369039a644c316b57e2e584c585decd5dfa73f8b981397d73b6d4dc7a52b360254c34c17964eeb494ab3754dd
+AUX bareos-fd.confd 357 SHA256 f1ecfc6945d1563aec0330943f7e887c99066de3350d84f994f4f5f42fa2e0f4 SHA512 59c4e304f4934c08dc99cbe43f8d989a7bf66d5c8177ce958bd76e4a5b6ef697db21bb79c3c586a1af18f2f3f1e1f350ea2afb7237f7ce86914b20169b7f5612 WHIRLPOOL 41708ac2ee0f90b82ddfbb74cfd41c0c7801fd096caeac32a312b80e6bd48744e23e422a04c3704f40ea717f9e9f70c98dc9885d266f19bb5e470a509236125b
+AUX bareos-fd.initd 571 SHA256 7ea2ffc24dcb5e6187c65690de3299a0692ec21510ede4d15d33f1e9acf41671 SHA512 68b38ac0db7427b6a86f4cbb3dc886d9842d8c011b63d8d43a47d4a4582ed8801f5a9b7bc728de607798401d15092539baf3d91eed2f2c3526f9b846f61444fd WHIRLPOOL 23811a417775f8852b7cfa91ee7538a6b959f60777c3fa6b38fcffc43397f1c5f78ee12d47bf825eac786eeb349dd5100c4fafc644798919d36d807d4782e5c6
+AUX bareos-sd.confd 506 SHA256 9842116be1e53c0a592db79cb01d67c36482171bfffba6459c5bfa93a58564b1 SHA512 33e26f6582b08d56936bd75994444fb79a7ee1940ef6e6a1e0ff2194a10e42611404b175330ff77f81ca52215ec8f0a97e05b39e27667560a861cf6b30055f18 WHIRLPOOL bb254d806e40d6e29c5ae284cadcbc7e5cbce0818035ba7c7fb9918970f0d90d85d5bba108d986569e62e7600281faf018253285012b8ee8f5ed0e682f9aff7a
+AUX bareos-sd.initd 595 SHA256 60317066caec54c6e4b30255affaec7f741e8a88e4fb5fc8346fb018d5dc82ad SHA512 576a1af894bb28ab49eac580dbfb610372da162d69fb091f30b903735c3274c3420604c2628fd121b642385bcc144c3bac1555de9fab34c709fc30b49c8a8e69 WHIRLPOOL 34098ad67131caf4fdd3bea371869bb093cb9765dd5a1a53d1d746aacad57f2c88b523abd5bb8ba391bf07c422a87de7f9320d11dc65981348620e136cb09ccc
+DIST bareos-14.2.2.tar.gz 3811787 SHA256 8792fe79689f7a1053ecb493ba52258acb29d0998b71d65178a311d46b7cf2bf SHA512 be490ab2f8085975f164ac554cac7d6bbef1af01c8350b5816b2033a37827de4a81bead6ce1e699fe5cc44085dce2b6a0330b91239fb87907e22f9c8dc710156 WHIRLPOOL 384415d553d61e7aa1eaa22611cc9d9eacf8338df82d911409e52a774e756b0539810c60be3dade91eadcc679794ad7c3bb5a155d7d699171f6a4fdead5a5470
+EBUILD bareos-14.2.2.ebuild 11582 SHA256 91e96bb47b6c70c127a98cf964c17fffd7e2dd12dfa5b571e6e4f7f64da32f7b SHA512 1e1b9fd0642f0436777f117fd1bd367969683f044a61587378b01baaf6d5dc1049761c80938de41e114ab9c770305afb9c92c67e165412e60297b92980d15b5e WHIRLPOOL f7d0f22ee5ad2709aaca9cd69cb5af945611c91ad697ef9f5927f96ad5e266d168bc7ee79ced9c92642967e048b4c37096c56d40b97862d333c31b610ef4bd1c
diff --git a/app-backup/bareos/bareos-14.2.2.ebuild b/app-backup/bareos/bareos-14.2.2.ebuild
new file mode 100644
index 0000000..6a73c78
--- /dev/null
+++ b/app-backup/bareos/bareos-14.2.2.ebuild
@@ -0,0 +1,409 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-14.2.1.ebuild,v 1.6 2015/04/08 07:30:31 mgorny Exp $
+
+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=""
+IUSE="acl clientonly +director fastlz ipv6 logwatch mysql ndmp postgres python qt4
+		readline scsi-crypto sql-pooling +sqlite3 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 )
+		sqlite3? ( 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? ( dev-libs/openssl:0[static-libs] )
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/lzo
+		ssl? ( dev-libs/openssl: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 sqlite3 && export mydbtypes+=" sqlite3"
+
+	# 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 sqlite3) \
+		$(use sqlite3 || 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 sqlite3; 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/files/bareos-12.4.5-Makefile.patch b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
new file mode 100644
index 0000000..3cdee15
--- /dev/null
+++ b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
@@ -0,0 +1,27 @@
+# stop build if there are errors in subdirs
+--- Makefile.in.orig	2010-07-20 16:53:44.000000000 +0000
++++ Makefile.in	2010-07-20 16:55:50.000000000 +0000
+@@ -44,9 +44,8 @@
+ 
+ all: Makefile
+ 	@for I in ${all_subdirs}; \
+-	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+-	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+-			    echo ""; echo ""; exit 1;)); \
++	  do \
++	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
+ 	done
+ 
+ depend:
+@@ -55,9 +54,8 @@
+ 	
+ bacula-fd: Makefile	   
+ 	@for I in ${fd_subdirs}; \
+-	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+-	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
+-			    echo ""; echo ""; exit 1;)); \
++	  do \
++	        $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ||  exit 1; \
+ 	done
+ 
+ #-------------------------------------------------------------------------
diff --git a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
new file mode 100644
index 0000000..94d8fb6
--- /dev/null
+++ b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
@@ -0,0 +1,11 @@
+# bat needs to respect LDFLAGS
+--- src/qt-console/bat.pro.in.orig	2010-07-20 18:28:50.000000000 +0000
++++ src/qt-console/bat.pro.in	2010-07-20 18:29:25.000000000 +0000
+@@ -26,6 +26,7 @@
+ QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += .libs/* bat
++QMAKE_LFLAGS += @LDFLAGS@
+ 
+ qwt {
+   INCLUDEPATH += @QWT_INC@ 
diff --git a/app-backup/bareos/files/bareos-dir.confd b/app-backup/bareos/files/bareos-dir.confd
new file mode 100644
index 0000000..5013291
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir.confd
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-dir.confd,v 1.1 2013/10/21 21:52:50 mschiff Exp $
+
+# 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 -c /etc/bareos/bareos-dir.conf"
diff --git a/app-backup/bareos/files/bareos-dir.initd b/app-backup/bareos/files/bareos-dir.initd
new file mode 100644
index 0000000..4d0f5f1
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-dir.initd,v 1.4 2014/05/04 17:03:59 mschiff Exp $
+
+depend() {
+	use dns bareos-fd bareos-sd
+}
+
+start() {
+	ebegin "Starting bareos director"
+	checkpath -d -m 0750 -o bareos:bareos /run/bareos
+	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
+		-- ${DIR_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bareos director"
+	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.*.pid
+	eend $?
+}
diff --git a/app-backup/bareos/files/bareos-fd.confd b/app-backup/bareos/files/bareos-fd.confd
new file mode 100644
index 0000000..e6e1fc5
--- /dev/null
+++ b/app-backup/bareos/files/bareos-fd.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-fd.confd,v 1.1 2013/10/21 21:52:50 mschiff Exp $ 
+
+# Config file for /etc/init.d/bareos-fd
+
+# Options for the file daemon.
+FD_OPTIONS="-u root -g bareos -c /etc/bareos/bareos-fd.conf"
diff --git a/app-backup/bareos/files/bareos-fd.initd b/app-backup/bareos/files/bareos-fd.initd
new file mode 100644
index 0000000..8e2c8f4
--- /dev/null
+++ b/app-backup/bareos/files/bareos-fd.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-fd.initd,v 1.5 2014/05/20 23:18:41 mschiff Exp $
+
+depend() {
+	use dns
+}
+
+start() {
+	ebegin "Starting bareos file daemon"
+	checkpath -d -m 0750 /run/bareos
+	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-fd \
+		-- ${FD_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bareos file daemon"
+	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-fd.*.pid
+	eend $?
+}
diff --git a/app-backup/bareos/files/bareos-sd.confd b/app-backup/bareos/files/bareos-sd.confd
new file mode 100644
index 0000000..a0219bf
--- /dev/null
+++ b/app-backup/bareos/files/bareos-sd.confd
@@ -0,0 +1,11 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-sd.confd,v 1.1 2013/10/21 21:52:50 mschiff Exp $
+
+# 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 -c /etc/bareos/bareos-sd.conf"
diff --git a/app-backup/bareos/files/bareos-sd.initd b/app-backup/bareos/files/bareos-sd.initd
new file mode 100644
index 0000000..ef33942
--- /dev/null
+++ b/app-backup/bareos/files/bareos-sd.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/files/bareos-sd.initd,v 1.4 2014/05/04 17:03:59 mschiff Exp $
+
+depend() {
+	use dns
+}
+
+start() {
+	ebegin "Starting bareos storage daemon"
+	checkpath -d -m 0750 -o bareos:bareos /run/bareos
+	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \
+		-- ${SD_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bareos storage daemon"
+	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-sd.*.pid 
+	eend $?
+}