summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Short <zul@gentoo.org>2004-01-29 23:42:35 +0000
committerChuck Short <zul@gentoo.org>2004-01-29 23:42:35 +0000
commit6f7d612cae94c7adee12af1a5590d12bf9a5372e (patch)
tree99bb951c111716b31d09047133be465ffc20206e /app-admin
parenttouchups (diff)
downloadgentoo-2-6f7d612cae94c7adee12af1a5590d12bf9a5372e.tar.gz
gentoo-2-6f7d612cae94c7adee12af1a5590d12bf9a5372e.tar.bz2
gentoo-2-6f7d612cae94c7adee12af1a5590d12bf9a5372e.zip
Force the user to use mysql if they have both mysql and sqlite as use flags.
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/bacula/ChangeLog6
-rw-r--r--app-admin/bacula/bacula-1.31.ebuild7
2 files changed, 11 insertions, 2 deletions
diff --git a/app-admin/bacula/ChangeLog b/app-admin/bacula/ChangeLog
index c7e90e0812e5..d84419f4595a 100644
--- a/app-admin/bacula/ChangeLog
+++ b/app-admin/bacula/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/bacula
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.9 2004/01/28 22:39:01 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.10 2004/01/29 23:42:35 zul Exp $
+
+ 29 Jan 2004; Chuck Short <zul@gentoo.org> bacula-1.31.ebuild:
+ Force the user to use mysql if they have both sqlite and mysql as use flags.
+ Closes #39764.
28 Jan 2004; Chuck Short <zul@gentoo.org> bacula-1.29.ebuild,
bacula-1.31.ebuild, metadata.xml:
diff --git a/app-admin/bacula/bacula-1.31.ebuild b/app-admin/bacula/bacula-1.31.ebuild
index 99f2907e6710..6e5b4baa5f07 100644
--- a/app-admin/bacula/bacula-1.31.ebuild
+++ b/app-admin/bacula/bacula-1.31.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.31.ebuild,v 1.6 2004/01/28 22:39:01 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.31.ebuild,v 1.7 2004/01/29 23:42:35 zul Exp $
NEWP=${P}-04Jun03
S=${WORKDIR}/${NEWP}
@@ -60,6 +60,11 @@ src_compile() {
myconf="${myconf} --with-sqlite=/usr"
fi
+ if use sqlite && use mysql
+ then
+ myconf="${myconf/--with-sqlite/}"
+ fi
+
./configure \
--prefix=/usr \
--mandir=/usr/share/man \