Fix generation of init script (Bug 426374). Thanks Koreth. Drop old

(Portage version: 2.1.11.9/cvs/Linux x86_64)

4 files changed, 35 insertions, 358 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 85075e5450d0..a03eaefbc10a 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-backup/bacula
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.128 2012/06/24 18:28:00 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.129 2012/08/07 18:09:06 tomjbe Exp $
+
+  07 Aug 2012; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.2.5.ebuild,
+  -bacula-5.2.6.ebuild, bacula-5.2.9.ebuild:
+  Fix generation of init script (Bug 426374). Thanks Koreth. Drop old
 
 *bacula-5.2.9 (24 Jun 2012)
 
diff --git a/app-backup/bacula/bacula-5.2.5.ebuild b/app-backup/bacula/bacula-5.2.5.ebuild
index fc64bb5e31b0..d33871d230e9 100644
--- a/app-backup/bacula/bacula-5.2.5.ebuild
+++ b/app-backup/bacula/bacula-5.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild,v 1.7 2012/05/24 04:36:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild,v 1.8 2012/08/07 18:09:06 tomjbe Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -287,6 +287,17 @@ src_install() {
 		newins scripts/filetype.vim bacula_ft.vim
 	fi
 
+	# set the value of $mydbtype depending on which database we
+	# specified in the use flags.
+	if use sqlite3; then
+		mydbtype="sqlite3"
+	fi
+	if use postgres; then
+		mydbtype="postgres"
+	fi
+	if use mysql; then
+		mydbtype="mysql"
+	fi
 	# setup init scripts
 	myscripts="bacula-fd"
 	if ! use bacula-clientonly; then
@@ -302,7 +313,8 @@ src_install() {
 		# 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"
-		# set database dependancy for the director init script
+
+		# now set the database dependancy for the director init script
 		case "${script}" in
 			bacula-dir)
 				case "${mydbtype}" in
@@ -319,6 +331,7 @@ src_install() {
 			*)
 				;;
 		esac
+
 		# install init script and config
 		newinitd "${T}/${script}".initd "${script}"
 		newconfd "${T}/${script}".confd "${script}"
diff --git a/app-backup/bacula/bacula-5.2.6.ebuild b/app-backup/bacula/bacula-5.2.6.ebuild
deleted file mode 100644
index 0d973d314c30..000000000000
--- a/app-backup/bacula/bacula-5.2.6.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.6.ebuild,v 1.4 2012/05/24 04:36:18 vapier Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils multilib python qt4-r2 user
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	dev-libs/gmp
-	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql-base[threads] )
-		mysql? ( virtual/mysql )
-		sqlite3? ( dev-db/sqlite:3 )
-		!bacula-nodir? ( virtual/mta )
-	)
-	qt4? (
-		x11-libs/qt-svg:4
-		x11-libs/qwt:5
-	)
-	ssl? ( dev-libs/openssl )
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	dev-libs/lzo
-	sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use qt4; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
-		ewarn
-	fi
-
-	if ! use bacula-clientonly; then
-		# USE=static only supported for bacula-clientonly
-		if use static; then
-			ewarn
-			ewarn "USE=static only supported together with USE=bacula-clientonly."
-			ewarn "Ignoring 'static' useflag."
-			ewarn
-		fi
-		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bacula' has been created.  Please see the bacula manual"
-			einfo "for information about running bacula as a non-root user."
-			einfo
-		fi
-	fi
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<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/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
-
-	# bug #310087
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-	# stop build for errors in subdirs
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
-
-	# bat needs to respect LDFLAGS
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-	# bug #328701
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-fix-static.patch
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf} \
-			$(use_with mysql) \
-			$(use_with sqlite3) \
-			$(use_with postgres postgresql) \
-			--enable-batch-insert"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt4 bat)"
-	fi
-
-	myconf="${myconf} \
-		--disable-tray-monitor \
-		$(use_with X x) \
-		$(use_with python) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--host=${CHOST} \
-		${myconf}
-	# correct configuration for QT based bat
-	if use qt4 ; then
-		pushd src/qt-console
-		eqmake4
-		popd
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt4 && ! use static ; then
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png
-		insinto /usr/share/applications
-		doins scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# 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/bacula-bwxconsole.1*
-	if ! use qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	if use bacula-clientonly || use bacula-nodir; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-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/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog LICENSE ReleaseNotes SUPPORT technotes
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-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"
-		# set database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite3 databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		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/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		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/bacula/bacula-5.2.9.ebuild b/app-backup/bacula/bacula-5.2.9.ebuild
index 60cdd2f6b20e..cd5ad9f44855 100644
--- a/app-backup/bacula/bacula-5.2.9.ebuild
+++ b/app-backup/bacula/bacula-5.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v 1.1 2012/06/24 18:28:00 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v 1.2 2012/08/07 18:09:06 tomjbe Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -286,6 +286,17 @@ src_install() {
 		newins scripts/filetype.vim bacula_ft.vim
 	fi
 
+	# set the value of $mydbtype depending on which database we
+	# specified in the use flags.
+	if use sqlite3; then
+		mydbtype="sqlite3"
+	fi
+	if use postgres; then
+		mydbtype="postgres"
+	fi
+	if use mysql; then
+		mydbtype="mysql"
+	fi
 	# setup init scripts
 	myscripts="bacula-fd"
 	if ! use bacula-clientonly; then
@@ -301,7 +312,8 @@ src_install() {
 		# 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"
-		# set database dependancy for the director init script
+
+		# now set the database dependancy for the director init script
 		case "${script}" in
 			bacula-dir)
 				case "${mydbtype}" in
@@ -318,6 +330,7 @@ src_install() {
 			*)
 				;;
 		esac
+
 		# install init script and config
 		newinitd "${T}/${script}".initd "${script}"
 		newconfd "${T}/${script}".confd "${script}"