bacula: fixes, refactoring

	- bat build fix patch
	- cleanup

1 files changed, 8 insertions, 41 deletions

diff --git a/packages/app-backup/bacula/bacula.exlib b/packages/app-backup/bacula/bacula.exlib
index 0c8cdc2..768cf84 100644
--- a/packages/app-backup/bacula/bacula.exlib
+++ b/packages/app-backup/bacula/bacula.exlib
@@ -12,11 +12,10 @@ fi
 
 require scm-git systemd-service
 
-export_exlib_phases pkg_setup src_prepare src_install
+export_exlib_phases src_install pkg_setup
 
 DOWNLOADS=""
 SLOT="0"
-
 SUMMARY="Featureful client/server network backup suite"
 HOMEPAGE="https://blog.bacula.org"
 LICENCES="AGPL-3"
@@ -84,12 +83,6 @@ DEPENDENCIES="
 
 WORK="${WORK}"/bacula
 
-bacula_pkg_setup() {
-    option mysql && export mydbtype="mysql"
-    option postgres && export mydbtype="postgresql"
-    option sqlite && export mydbtype="sqlite3"
-}
-
 DEFAULT_SRC_PREPARE_PATCHES=(
     -p0 "${FILES}"/7.2.0/${PN}-7.2.0-doc.patch
     -p1 "${FILES}"/5.2.3/${PN}-5.2.3-as-needed.patch
@@ -99,39 +92,9 @@ DEFAULT_SRC_PREPARE_PATCHES=(
     "${FILES}"/7.0.2/${PN}-7.0.2-depend.patch
     -p0 "${FILES}"/9.0.6/${PN}-9.0.6-libressl.patch
     -p1 "${FILES}"/bacula-libressl-2.7.patch
+    "${FILES}"/bacula-fix-configure-bat.patch
 )
 
-bacula_src_prepare() {
-    #NOTE: ciphertext mostly copypasted from gentoo follows
-    #do not ask me to decipher this, i probably can't
-
-    edo pushd src >&/dev/null
-    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
-            edo sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}"
-    done
-    edo popd >&/dev/null
-    edo sed -i -e 's/Application;//' scripts/bat.desktop.in
-    edo sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in
-    expatch -p0 "${FILES}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-    edo sed -i -e "s/strip /# strip /" src/filed/Makefile.in
-    edo sed -i -e "s/strip /# strip /" src/console/Makefile.in
-    edo sed -i -e '/Requires/d' platforms/systemd/*.service.in
-    edo sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in
-    edo sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in
-    edo sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in
-    edo sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-        src/qt-console/bat.pro.in
-    edo mkdir src/qt-console/.libs
-    edo touch src/qt-console/.libs/bat
-    edo chmod 755 src/qt-console/.libs/bat
-    edo mv autoconf/libtool autoconf/libtool1
-
-    default
-}
-
 DEFAULT_SRC_CONFIGURE_PARAMS=(
     --hates=disable-dependency-tracking
     --hates=disable-silent-rules
@@ -146,10 +109,10 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
     --with-subsys-dir=/var/lock/subsys
     --sysconfdir=/etc/bacula
     --with-pid-dir=/var/run
-    --libdir=/usr/$(exhost --target)/lib
     --enable-smartalloc
     --disable-afs
     --with-systemd="${SYSTEMDSYSTEMUNITDIR}"
+    --libdir=/usr/$(exhost --target)/lib
 )
 
 DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
@@ -173,6 +136,10 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
     'ssl openssl'
 )
 
+bacula_pkg_setup() {
+    export QMAKE="/usr/$(exhost --target)/bin/qmake-qt5"
+}
+
 DEFAULT_SRC_COMPILE_PARAMS=(
     NO_ECHO=""
 )
@@ -253,7 +220,7 @@ bacula_src_install() {
         newins scripts/filetype.vim bacula_ft.vim
     fi
     
-    if option minimal; then
+    if option minimal && ! option qt5; then
         edo rmdir "${IMAGE}"/usr/share/man/man1
     fi
     edo rmdir "${IMAGE}"/tmp