more cleanups and einfo improvements

2 files changed, 29 insertions, 22 deletions

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index eb715f5..f880a8f 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -7,5 +7,5 @@ AUX bareos-fd.initd 442 SHA256 85c2e72112400180187b39eb3733f746b28141a235c1a4e0e
 AUX bareos-sd.confd 404 SHA256 61d0da00895796331122eb235283b9b1f31b04c5b85ab68437d21c280577fcf6 SHA512 fce624688561ab81c4233bb7c474f611eaa21377b427da612aded499fa71118204399e9ec6b36fcbaa6806e1723e728b37d9467a5ac8046e36b68ed6b83dec9a WHIRLPOOL dadc545bb75cb1bbf6eb865821227d1ed0e14986a03999e2fcc50a0cb601a4215aa62390e91aabd3555c4f4fbdf81dca074dcdd013a32bcc126e516487d6e00c
 AUX bareos-sd.initd 449 SHA256 8f56ac5b188316367d38190dfc53495cf36b3a89cf1711ded0457d79af1daea4 SHA512 d91aba327f1322277e0f2a6d494dc45b83113f07b86bb222f849ae008b90d11a95159753cd464a4250f549149f6c1fcadce29b521831ed19662cb0da759aa941 WHIRLPOOL 287adef27983c407beb77b18d0da71b27a095a9c5798327257afef9dd02b039b1d4416cbc361fea06ff39584405d71bd5f7884ca759ae239bfad105f69c15408
 DIST bareos-12.4.5.tar.gz 3496879 SHA256 2defc15ed4fb6483e1d45ea63bb9cb8ba009e2b31c7755544984f1813bf4e017 SHA512 a59e95bc9b4a5147d8254e6b802c411956d324571ac084f5cb11629ddad59d605cdad2ab7b86f001af8c32faf15070833f233a44cbefaf71d13cad05faaba5cf WHIRLPOOL c95492acb57729e45a6ff5d2ae1894de4ebdb9e416d9f8a5beeef89ccf563a12ea8d5cdb943c2b6ec5681fb2bf0d348fb5e089ecac571256a835b4fd1a4459c8
-EBUILD bareos-12.4.5.ebuild 10832 SHA256 74b565056574a62a2431444a2b339c582938852c65e40a27e7c68fc27040c7b9 SHA512 dcf1959b68f9032b554da014c4350ed6946afb21d3f38d3beb99ad259bbf7d62905b70f0e20c84eb0083e39034c4f86765ba3a3480da1a0d112834c587d0b3a2 WHIRLPOOL 7302cd9d6564388898654d768b0777217eed0787ef035daac232578c6d0c9e1c9c45441f5e1ea401f763428f33c9fa578495860dfa08b640c9f98cc89f1147a1
+EBUILD bareos-12.4.5.ebuild 11116 SHA256 e857b613b5ce17b3bb9ccebc84f44feebd4385732f8ec7509c596f8d1008ef78 SHA512 26bec329c9d51655a532ec3252dfa12c3d045bcd066cbb0fb3a07e76b85121d72401d7d748b2fdf26d38f847644b352b1fd472e49f90b37c71a9d2b99d722464 WHIRLPOOL 192d4a8f33a56c0921bc83901951624763ecbc594fdd12641935a3890372f66a48c3f39f259c9c1a48a53c12680d63533ad81b55d1bb7b92ec579d4a4c219972
 MISC metadata.xml 747 SHA256 6768fbb6797156facd489a2a04c577b11c0b4399827818a3d35cfeba806e06d7 SHA512 02514d479215f287fbbde5860a4cbd7217e2239b2f3f307630061fc340830cb895f001d12566d3db333a4f27446499f646f84f8bdd520eec86405fa398652207 WHIRLPOOL 82cc934911233a460210beb21cef759448f4dbeeecc785130e1425e43c0e231c3d78c75c46ec944a47065c5341d03e6a97682ec6758eb24edbd2f7212774556a
diff --git a/app-backup/bareos/bareos-12.4.5.ebuild b/app-backup/bareos/bareos-12.4.5.ebuild
index ce3f1e4..741a235 100644
--- a/app-backup/bareos/bareos-12.4.5.ebuild
+++ b/app-backup/bareos/bareos-12.4.5.ebuild
@@ -9,9 +9,6 @@ PYTHON_REQ_USE="threads"
 
 inherit eutils multilib python-single-r1 qt4-r2 user
 
-#MY_PV=${PV/_beta/-b}
-#MY_P=${PN}-${MY_PV}
-
 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"
@@ -64,14 +61,12 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-#REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) clientonly )
 REQUIRED_USE="static? ( clientonly )
-				python? ( ${PYTHON_REQUIRED_USE} )"
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 S=${WORKDIR}/${PN}-Release-${PV}
 
 pkg_setup() {
-	#XOR and !clientonly controlled by REQUIRED_USE
 	use mysql && export mydbtypes+="mysql"
 	use postgres && export mydbtypes+=" postgresql"
 	use sqlite3 && export mydbtypes+=" sqlite3"
@@ -117,9 +112,6 @@ src_prepare() {
 	done
 	popd >&/dev/null || die
 
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' src/qt-console/bat.desktop.in || die
-
 	# bug 466690 Use CXXFLAGS instead of CFLAGS
 	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
 
@@ -133,9 +125,6 @@ src_prepare() {
 	for d in filed console dird stored; do
 		sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die
 	done
-
-	# fix file not found error during make depend
-	#epatch "${FILESDIR}"/5.2.12/${PN}-5.2.12-depend.patch
 }
 
 src_configure() {
@@ -149,7 +138,7 @@ src_configure() {
 			$(use_enable static static-fd)"
 	fi
 
-	# do not build bat if 'static' clientonly
+	# do not build bat and traymonitor if 'static' clientonly
 	if ! use clientonly || ! use static; then
 		myconf="${myconf} \
 			$(use_enable qt4 bat) \
@@ -203,6 +192,9 @@ src_configure() {
 		pushd src/qt-console
 		eqmake4
 		popd
+		pushd src/qt-tray-monitor
+		eqmake4
+		popd
 	fi
 }
 
@@ -356,9 +348,6 @@ src_install() {
 
 	# make sure bareos group can execute bareos libexec scripts
 	fowners -R root:bareos /usr/libexec/bareos
-
-	# make sure bareos group can execute bareos programs
-	# TBD
 }
 
 pkg_postinst() {
@@ -371,19 +360,37 @@ pkg_postinst() {
 	if ! use clientonly && use director; then
 		einfo
 		einfo "If this is a new install, you must create the databases with:"
-		einfo "  /usr/libexec/bareos/create_bareos_database <dbtype>"
-		einfo "  /usr/libexec/bareos/make_bareos_tables <dbtype>"
-		einfo "  /usr/libexec/bareos/grant_bareos_privileges <dbtype>"
 		einfo
-		einfo "where <dbtype> is one sqlite3, mysql or postgresql"
+		if use postgresql; then
+			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 "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 anymore."
+		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'"