6 files changed, 445 insertions, 3 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 440d6c0c6ded..19f0b963aa4f 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 97657185b931..0cc018bcad18 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -18,11 +18,13 @@ DIST bareos-22.1.5.tar.gz 14747894 BLAKE2B 560bc1ceb34fccfb370e8643d24917e24b244
 DIST bareos-22.1.6.tar.gz 14758055 BLAKE2B e49c2f6b38394b71a15e4826286a761e78b8c301429843630bbf024a76505381a84581296e7bcdd537bf04194e10abc3c8b4f358234ae968a10163993c9451bc SHA512 6fda879ed6ac05843d9c8c0da16228e2b009ee094230ce7cec0deb9125723f1bd8964517c355f61fda34ee5664ebaf4e76b3c6ce2b0e9b88c66788abf5d9b93e
 DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5
 DIST bareos-23.1.0.tar.gz 14002357 BLAKE2B f063bf0d4ce422766f8d71133e69ed39bf914672f2ff3321d792cd28bf58d6e2daac53a1fe48586e4accd6a895e9ef83b17e51e3f6b4dabccf7c54bf02fb2680 SHA512 480a7f420c7f0a626f5261e0b9c136f3ed71f08ee09ce9d493b66645e0f2c5dc00455719a3ce06a57a5424206b1c0f62cd19904f83bcaaa45066726a6b223281
+DIST bareos-23.1.1.tar.gz 14010988 BLAKE2B ee56a93fdffaee51ff43fda272f48f18b811447401885538afa5fa7a59bc5b31eac884a7552439765955e08a20708101725b7561526ab7204970bcfb67dffca3 SHA512 3ff7bb42537d2654dfaa967e4b63f624953572499f118f870857bfb9f83c84d6e27adcf34ef3a1347e7dd23c54d1bcb17db7820070268f29dda69a89e661791b
 EBUILD bareos-21.1.10.ebuild 11633 BLAKE2B d0394fc3ccd10ee5074b2de6066529b58f55c0c8260790c7aecbcf0b558ddd6918e96c768bca851a5d20009d36df25ebd8fbf6fdf383a9b3a70c7c6a8187fcb2 SHA512 4eb5a628e0be7f1e815599b2b8223569f881e161e58511d8b990adaae286b45682e5c0453dbd8db5b9b00c8322b6f616fa989ef1da9ee9d72776112179c34e7c
 EBUILD bareos-21.1.11.ebuild 11631 BLAKE2B 5b794afe9039e83c19dc5239259db5f000be75a2255a5e33b69111143bc0f6bd4d6b3b24b8592fbd425e3f0a557ee5ace5e57b962a7fae61c89e017ad503928e SHA512 46bbb6a9323e16587768f351be2325f9c05041e791b45091f788808a63ac95b1c0e1045c587b30233cd1eaaef0fce22fb3ec964366897ca32a0073560ad5aef5
 EBUILD bareos-22.1.5.ebuild 12005 BLAKE2B 3eef9af6b2fcd0f74608fd9c7f75c9bf61e526eb7d7636875c7c265c12e89a2beb8f0316ba26aad6182dd1656dff865d052acf3baa1e783b69d9e74cf742aad6 SHA512 61272e827db0c7d17a7a4f5be66cb7855e403dbbf4cfb3d367bd27a420526f58c50897a1baea7c63bb16da018cf5838c5002a4b992e2aef36c629e8188095171
 EBUILD bareos-22.1.6.ebuild 12005 BLAKE2B 3eef9af6b2fcd0f74608fd9c7f75c9bf61e526eb7d7636875c7c265c12e89a2beb8f0316ba26aad6182dd1656dff865d052acf3baa1e783b69d9e74cf742aad6 SHA512 61272e827db0c7d17a7a4f5be66cb7855e403dbbf4cfb3d367bd27a420526f58c50897a1baea7c63bb16da018cf5838c5002a4b992e2aef36c629e8188095171
 EBUILD bareos-23.0.4.ebuild 12076 BLAKE2B 79225efaedacac0ba6721e45da5e91de20f87afe22d2c59f5418fd2a25445aff873025826128ad790f0c03622edb7727f41db55e5863f42a12273be0898dcf4e SHA512 cf6b598e14d3d4e32cdfcd8f75b216ad9222ecf74e67a5eb09fe4b611f17c464b6624adf8f71750d337f1c783a37ac49c00f69ef7cf8d68caa42528550f98777
 EBUILD bareos-23.1.0-r2.ebuild 12217 BLAKE2B b87549e3e6766d8b70ae22eb8806cf58a8740ca4c82a9001edd1de5e68f30b51476e6ea522e47adb4a34e28b7af8f8133969ae0b8c71d11a5b2d5ac9be480142 SHA512 7ad4cfccc7e7dddc44c35c4ff36bf7e8a10b9ce5c7a9ba29e6107de27916c27409472f4dbf52a856885b1fda7ec7706570731dc70b2a28452baf2f9a57602020
-EBUILD bareos-9999.ebuild 12217 BLAKE2B b87549e3e6766d8b70ae22eb8806cf58a8740ca4c82a9001edd1de5e68f30b51476e6ea522e47adb4a34e28b7af8f8133969ae0b8c71d11a5b2d5ac9be480142 SHA512 7ad4cfccc7e7dddc44c35c4ff36bf7e8a10b9ce5c7a9ba29e6107de27916c27409472f4dbf52a856885b1fda7ec7706570731dc70b2a28452baf2f9a57602020
+EBUILD bareos-23.1.1.ebuild 12234 BLAKE2B 0ef6b83d071bcca0993cc53e3b05295de27b52db05c01ff372d8e79f34e388c300657f9ff3b850474141d58cf38a50428189b9faf0c0f8c9bf10be9613669744 SHA512 b07be823598e2db225a61f57e1ee3793d3fc1189d97cb8e23daeeb19e483fccf7937d4610ea016ce3bb6f7e1ee42f883b035c584fe45e9f3bdb0f99176e44d2f
+EBUILD bareos-9999.ebuild 12234 BLAKE2B 0ef6b83d071bcca0993cc53e3b05295de27b52db05c01ff372d8e79f34e388c300657f9ff3b850474141d58cf38a50428189b9faf0c0f8c9bf10be9613669744 SHA512 b07be823598e2db225a61f57e1ee3793d3fc1189d97cb8e23daeeb19e483fccf7937d4610ea016ce3bb6f7e1ee42f883b035c584fe45e9f3bdb0f99176e44d2f
 MISC metadata.xml 1125 BLAKE2B 5a9eafa553c8eab9c1c7eaf885c588841ed919b97ad0e0e2ef1b9d1f54eb1ccccd33d4f437cb202315acfde472fc1dbbd9633d3d9e32cfbf566176279e1bb5c8 SHA512 5007401bad8f271317a2b9d8af26760df9a2f211d32719bd4a50597d2ae53c3e65cbdb0cdbfa611f638834a56acfc30754003c1c6555c8fe4f4fdf16b11b10df
diff --git a/app-backup/bareos/bareos-23.1.1.ebuild b/app-backup/bareos/bareos-23.1.1.ebuild
new file mode 100644
index 000000000000..1d4157e60a04
--- /dev/null
+++ b/app-backup/bareos/bareos-23.1.1.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+CMAKE_WARN_UNUSED_CLI=no
+
+inherit python-any-r1 systemd cmake tmpfiles flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN}-Release-${PV}
+fi
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb
+	logwatch ndmp readline scsi-crypto split-usr
+	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#	mirror
+#	!test? ( test )
+#"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	dev-libs/libfmt
+	dev-libs/utfcpp
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		dev-db/postgresql:*[threads(+)]
+		director? (
+			virtual/mta
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		dev-libs/jansson:=[static-libs]
+		dev-libs/lzo[static-libs]
+		dev-libs/openssl:0=[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/jansson:=
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	X? (
+		dev-qt/qtwidgets:5=
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		dev-cpp/gtest
+		dev-db/postgresql:*[server,threads(+)]
+		dev-db/mariadb:*[server]
+	)
+"
+
+REQUIRED_USE="
+	static? ( clientonly )
+	clientonly? ( !director !storage-daemon !ceph !glusterfs !lmdb !ndmp !scsi-crypto )
+	x86? ( !ceph )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+	"${FILESDIR}/${PN}-22.0.2-werror.patch"
+	"${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+)
+
+pkg_pretend() {
+	local active_removed_backend=""
+	if has_version "<app-backup/bareos-21[director,mysql]"; then
+		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
+			active_removed_backend=MySQL
+		fi
+	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
+		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
+			active_removed_backend=SQLite
+		fi
+	fi
+	if [[ -n $active_removed_backend ]]; then
+		ewarn
+		ewarn "You are currently using bareos with the $active_removed_backend"
+		ewarn "catalog backend."
+		ewarn
+		ewarn "THIS IS NOT SUPPORTED ANYMORE"
+		ewarn
+		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
+		ewarn "MySQL and SQLite catalog backends."
+		ewarn
+		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
+		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
+		ewarn "installation first."
+		ewarn
+		die "current catalog backend not supported anymore"
+	fi
+}
+
+src_test() {
+	# initialze catalog test database
+	initdb -D "${T}"/pgsql || die
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createuser -h "${T}" bareos || die
+	createdb -h "${T}" --owner bareos bareos || die
+	export PGHOST="${T}"
+
+	# initiale mariadb database for backup tests
+	# $USER must be set and != root
+	export USER=portage
+
+	default
+	cmake_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+	rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+	if use X; then
+		mycmakeargs+=( -Dtraymonitor=yes )
+	fi
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-DCPM_USE_LOCAL_PACKAGES=1
+		-DCPM_LOCAL_PACKAGES_ONLY=1
+		-DENABLE_WEBUI=0
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=no
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		use cpu_flags_x86_avx && append-flags "-DXXH_X86DISPATCH_ALLOW_AVX"
+
+		# disable droplet support for now as it does not build with gcc 10
+		# ... and this is a bundled lib, which should have its own package
+		cd core && cmake_comment_add_subdirectory "src/droplet"
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# remove misc stuff we do not need in production
+	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
+
+	# remove duplicate binaries being installed in /usr/sbin and replace
+	# them by symlinks to not break systems that still use split-usr
+	if use split-usr; then
+		for f in bwild bregex bsmtp bconsole; do
+			rm -f "${D}/usr/sbin/$f" || die
+			ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
+		done
+	fi
+
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7 || die
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
+	if ! use vmware; then
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
+	fi
+
+	# 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}"/core/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}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			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
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# install init script and config
+		newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
+		newconfd "${FILESDIR}/${script}-21".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	# set log directory ownership
+	if ! use clientonly; then
+		diropts -m0755 -o bareos -g bareos
+	fi
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	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:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database'"
+		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables'"
+		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'"
+		einfo
+		einfo "or run"
+		einfo
+		einfo " emerge --config app-backup/bareos"
+		einfo
+		einfo "to do this"
+		einfo
+		einfo "For major upgrades you may need to run:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/update_bareos_tables'"
+		einfo
+		einfo "Please see release notes for details."
+		einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )"
+		einfo
+	fi
+}
+
+pkg_config() {
+	su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database"
+	su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables"
+	su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges"
+}
diff --git a/app-backup/bareos/bareos-9999.ebuild b/app-backup/bareos/bareos-9999.ebuild
index 71d78326e86d..1d4157e60a04 100644
--- a/app-backup/bareos/bareos-9999.ebuild
+++ b/app-backup/bareos/bareos-9999.ebuild
@@ -42,6 +42,7 @@ DEPEND="
 		ceph? ( sys-cluster/ceph )
 	)
 	dev-libs/libfmt
+	dev-libs/utfcpp
 	glusterfs? ( sys-cluster/glusterfs )
 	lmdb? ( dev-db/lmdb )
 	dev-libs/gmp:0
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 92d8b3e21d67..c30ce379e56a 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,9 +1,9 @@
 AUX snapper-0.10.1-testsuite.patch 2525 BLAKE2B 0ece146356113d456ef0a56e46e76eae1f9509e3b454459499fa457119c75a9e5fecb85d5530caaab340cea7f4deba0f155ac9e31706ab3899372c45e381cf77 SHA512 e0e1a4ed7c9ef069bc0bc5449f784c2deda1ce6851e98ca6d04c03988361f00e06b6a4f347671ee905f496dba19f8dffa64e5bdcba89f547292fc9c8d276ecd7
 AUX snapper-0.11.0-cron-confd.patch 424 BLAKE2B beb358e0405a680963fc5776dc2bdd6de36958c53579d4097dd43655a4e4abd1dba0eaeff789da435b7f6fd13993e2dca29f07dd0b29e9bfcb29fa31c3623848 SHA512 1ac7ed0de6be97219282bcff82ebb0c62a9ae1a8869fd8e1246dc06b20aac81e3f95d306198d29d69223226b4efd5b1f4555b3280935f09c1c374803236c1bee
 DIST snapper-0.11.0.tar.gz 445685 BLAKE2B 301e6d745d8d6d7acc6ca0c9fc431a0e46700aabd9882785bb2be38152693f9dbe897f85f6ad724c9529a0754b6146b53dda0a24141b386e59e7737855bc5da2 SHA512 fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40
-DIST snapper-0.11.1.tar.gz 450693 BLAKE2B 06c90cfdca71550e8dc8a246008a94bceb582f98dc4d56546592ae70ec69bd21f1f73ff1e41776f7eb5a02c42c382e05b771afa3fe583eb63486f640dc1d23d4 SHA512 0d7f6d9a012892c3ea0916cc92da5a6a435aa0a90067941f03b6e5a08adff54a7f3c52cc500cd28e7a7b496fb436c88db4399307cdd5518cfa54f2287e285993
 DIST snapper-0.11.2.tar.gz 451240 BLAKE2B 08afbdb7808d16555ca476e2a4336b9ee7da7e368a8bba1f131b7413d60ce0c61cb8e6ebc14cfebf5184d426b39c2d042f450494dcd65de30627870407ec8652 SHA512 b418ff91c6ba655edebd600691e2a7c0bc277eb6e327d5c57d0e5b2e008ee859e82a7dc49f2b25003001f0e6e5fc69e611c843231160bbb4626867cfc4cf95e2
+DIST snapper-0.12.0.tar.gz 530406 BLAKE2B 575a1cf251c789c38f3cce623e6074dde4d195914f7b391f2a0d4f588e5ff90b47c56b1897cb9a6d6a7789ed6d5e3676cb9ac3719fa33e9dabdc26227ea5b1e2 SHA512 f022ce76633e3d64e2c3c825a9113b2f77d0e672188b4af644e37388cb3636b4878131917a734aab3b74e744b5e437d53657744df37ec53671442cef4e3bb873
 EBUILD snapper-0.11.0.ebuild 2052 BLAKE2B 13fdc4dfc90e5413b187cb3445b23b68fb271595553277861d5807ca2d7f93cc2719e1418ff8349d253f175d23b85a92a1e1fe73eca35ffd8ebc9fac4cdae51c SHA512 6fbb43ca53e9bf3e40be32bc0c2257b17128f2a8d61219465586de48be1404ed964a5fc6a156c5db3025da1c078a9ac04caf41b7d1f078204ff75678f2bdac57
-EBUILD snapper-0.11.1.ebuild 2062 BLAKE2B bfa3c6823b4d131caf04b10283cc4e91d957c9f8fe6608af4489370d23ff7801d31cc09dbd3d51d451228341921a6db29c04f35ec9228a0bcfbc346011b2d093 SHA512 6251093935e6c75abfc666711596ad52a15fcc78d0bf6aa5b70492ca6fa6246406d06632772b45a5dea05bf20be31b1ca379cc91581510b2231ee4d2078cc596
 EBUILD snapper-0.11.2.ebuild 2062 BLAKE2B bfa3c6823b4d131caf04b10283cc4e91d957c9f8fe6608af4489370d23ff7801d31cc09dbd3d51d451228341921a6db29c04f35ec9228a0bcfbc346011b2d093 SHA512 6251093935e6c75abfc666711596ad52a15fcc78d0bf6aa5b70492ca6fa6246406d06632772b45a5dea05bf20be31b1ca379cc91581510b2231ee4d2078cc596
+EBUILD snapper-0.12.0.ebuild 2062 BLAKE2B bfa3c6823b4d131caf04b10283cc4e91d957c9f8fe6608af4489370d23ff7801d31cc09dbd3d51d451228341921a6db29c04f35ec9228a0bcfbc346011b2d093 SHA512 6251093935e6c75abfc666711596ad52a15fcc78d0bf6aa5b70492ca6fa6246406d06632772b45a5dea05bf20be31b1ca379cc91581510b2231ee4d2078cc596
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/snapper-0.11.1.ebuild b/app-backup/snapper/snapper-0.12.0.ebuild
index 92c569f5b215..92c569f5b215 100644
--- a/app-backup/snapper/snapper-0.11.1.ebuild
+++ b/app-backup/snapper/snapper-0.12.0.ebuild