diff options
| author |   Chuck Short <zul@gentoo.org> | 2004-01-29 23:42:35 +0000 |
|---|---|---|
| committer | Chuck Short <zul@gentoo.org> | 2004-01-29 23:42:35 +0000 |
| commit | 06db3f9b385c1627ab242d22386a207c2f2f6ef4 (patch) | |
| tree | 33fad5eee5962af097292a2b6de00441e2bb2fb2 /app-admin | |
| parent | touchups (diff) | |
| download | historical-06db3f9b385c1627ab242d22386a207c2f2f6ef4.tar.gz historical-06db3f9b385c1627ab242d22386a207c2f2f6ef4.tar.bz2 historical-06db3f9b385c1627ab242d22386a207c2f2f6ef4.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/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/bacula/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/bacula/bacula-1.31.ebuild | 7 |
3 files changed, 13 insertions, 4 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/Manifest b/app-admin/bacula/Manifest index 21c8266be055..61e7110095d2 100644 --- a/app-admin/bacula/Manifest +++ b/app-admin/bacula/Manifest @@ -1,6 +1,6 @@ -MD5 7f3bb95363cbc2b2c068aee1e62624e5 bacula-1.31.ebuild 3036 +MD5 9d273bb484f3750e08bdfa33bbca0abe bacula-1.31.ebuild 3111 MD5 11425ffa147f8c7d2bbe659a29678427 bacula-1.29.ebuild 3237 -MD5 9d7ee729beab70b52b8c5bb0d78d83bb ChangeLog 1239 +MD5 6facba5d3c51563be18f47a18b354087 ChangeLog 1401 MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219 MD5 6bd8611e451dde617342c14501fc36ba files/digest-bacula-1.29 64 MD5 91ecc1b976fb0c99c2797d4c9bece479 files/digest-bacula-1.31 72 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 \ |