summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Short <zul@gentoo.org>2004-04-22 16:53:42 +0000
committerChuck Short <zul@gentoo.org>2004-04-22 16:53:42 +0000
commit794c02656ccf0de4ac7c8d2f145b90dc4de750cb (patch)
tree46e14d5932800c94fae0de948be94b325fa812c5 /app-admin
parentMarked 0.10.10 stable (x86) (diff)
downloadhistorical-794c02656ccf0de4ac7c8d2f145b90dc4de750cb.tar.gz
historical-794c02656ccf0de4ac7c8d2f145b90dc4de750cb.tar.bz2
historical-794c02656ccf0de4ac7c8d2f145b90dc4de750cb.zip
Force mysql to be used. Closes #47836.
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/bacula/ChangeLog6
-rw-r--r--app-admin/bacula/Manifest4
-rw-r--r--app-admin/bacula/bacula-1.34.0.ebuild10
3 files changed, 10 insertions, 10 deletions
diff --git a/app-admin/bacula/ChangeLog b/app-admin/bacula/ChangeLog
index 2861008bfc2e..74adaa3b24d3 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.23 2004/04/14 07:27:00 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.24 2004/04/22 16:53:42 zul Exp $
+
+ 22 Apr 2004; Chuck Short <zul@gentoo.org> bacula-1.34.0.ebuild:
+ Force mysql to be used if sqlite and mysql are both in use flags. Closes
+ #47836.
14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> bacula-1.32f.ebuild:
Removed S=, inherit eutils for epatch.
diff --git a/app-admin/bacula/Manifest b/app-admin/bacula/Manifest
index cdd8bdd4c604..105bd0f43d29 100644
--- a/app-admin/bacula/Manifest
+++ b/app-admin/bacula/Manifest
@@ -1,9 +1,9 @@
MD5 44a42713d947389c5e6f8593da166466 bacula-1.31.ebuild 3160
-MD5 1958846c378a26fd34923578d3d9bcb1 bacula-1.34.0.ebuild 3684
+MD5 9d16ce8367016102bd991c618b965e70 bacula-1.34.0.ebuild 3668
MD5 7d8026ac27aab1258edb0554f0eb5033 bacula-1.29.ebuild 3294
MD5 997fcf3c7fc219928109b372d3aaaa67 bacula-1.32f.ebuild 3917
MD5 06d8cffcbd637869d2e5eef9a8ee0d46 bacula-1.32f-r5.ebuild 3899
-MD5 5d7b92ae3dc987bdf4c495d19e1a3ef7 ChangeLog 3196
+MD5 245721870d80b429400e980f286fe92f ChangeLog 3347
MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
MD5 c453d7375a93ff187e5bc03ede9417b8 files/digest-bacula-1.32f-r5 67
MD5 68cdbb97c1064de4654b8db6160442ca files/digest-bacula-1.32f 268
diff --git a/app-admin/bacula/bacula-1.34.0.ebuild b/app-admin/bacula/bacula-1.34.0.ebuild
index 77bcc644fdf8..f1162e11e148 100644
--- a/app-admin/bacula/bacula-1.34.0.ebuild
+++ b/app-admin/bacula/bacula-1.34.0.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.34.0.ebuild,v 1.1 2004/04/13 16:29:23 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.34.0.ebuild,v 1.2 2004/04/22 16:53:42 zul Exp $
DESCRIPTION="featureful client/server network backup suite"
HOMEPAGE="http://www.bacula.org/"
@@ -48,14 +48,10 @@ src_compile() {
if use mysql
then
myconf="${myconf} --with-mysql=/usr"
- fi
-
- if use sqlite
+ elif use sqlite
then
myconf="${myconf} --with-sqlite=/usr/include"
- fi
-
- if use sqlite && use mysql && postgres
+ elif use sqlite && use mysql
then
myconf="${myconf/--with-sqlite/}"
fi