Re: Bug #40260; add warning to ebuild if both USE=postgres and mysql are set

4 files changed, 28 insertions, 6 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index ff274809fea2..34e6d5cb0e8c 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.51 2004/02/12 19:14:14 blkdeath Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.52 2004/02/12 19:47:21 blkdeath Exp $
+
+  12 Feb 2004; Stewart Honsberger <blkdeath@gentoo.org>
+  proftpd-1.2.9-r1.ebuild, proftpd-1.2.9.ebuild:
+  Re: Bug #40260; add warning to ebuild if both USE=postgres and mysql are set
 
 *proftpd-1.2.9-r1 (12 Feb 2004)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index a9647c289182..90fe76c6018c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,4 +1,4 @@
-MD5 20e2a817d925b43799a0c0bb4104f9db ChangeLog 8103
+MD5 3675bd639724c698c67369bfbdff3648 ChangeLog 8288
 MD5 63bd6e87942a25d48bd5365edd8246c0 metadata.xml 268
 MD5 af980038dfeb68c33f10ce7f7a8664bd proftpd-1.2.5-r1.ebuild 2484
 MD5 8403cc3447fabc18a92eeb5dc891ed26 proftpd-1.2.7.ebuild 3668
@@ -7,8 +7,8 @@ MD5 f29eb6e755937b7bd540ae7a64309a49 proftpd-1.2.9_rc1.ebuild 2908
 MD5 4f9ff456a1e0bc583b44fff8c2392e40 proftpd-1.2.9_rc2-r1.ebuild 3160
 MD5 3bc8ce3f5baacf0756ccc0a5d7d08ce9 proftpd-1.2.9_rc2.ebuild 3036
 MD5 8b61bc1b4a71805531b36c33915858dd proftpd-1.2.9_rc3.ebuild 3123
-MD5 9e47bcea764c8c0102b1f209f7ea8cb9 proftpd-1.2.9.ebuild 3018
-MD5 ceae0e2b800c4e2cb2bef5184bc928c9 proftpd-1.2.9-r1.ebuild 3117
+MD5 62650c3bb171e990434577969ea2b288 proftpd-1.2.9.ebuild 3326
+MD5 c377bba2c44a2bc85872fa39e300dbb8 proftpd-1.2.9-r1.ebuild 3421
 MD5 6236a589ef01778d118911281b20be51 files/digest-proftpd-1.2.5-r1 66
 MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211
 MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66
diff --git a/net-ftp/proftpd/proftpd-1.2.9-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.9-r1.ebuild
index 5e19028346f9..19fd6764490c 100644
--- a/net-ftp/proftpd/proftpd-1.2.9-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.9-r1.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/net-ftp/proftpd/proftpd-1.2.9-r1.ebuild,v 1.1 2004/02/12 19:14:14 blkdeath Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9-r1.ebuild,v 1.2 2004/02/12 19:47:21 blkdeath Exp $
 
 inherit flag-o-matic
 
@@ -49,6 +49,15 @@ src_compile() {
 		modules="${modules}:mod_tls"
 	fi
 
+	if use mysql && use postgres
+	then
+		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
+		ewarn "Presently this ebuild defaults to mysql. If you would like to"
+		ewarn "change the default behaviour, merge ProFTPD with;"
+		ewarn "USE=\"-mysql postgres\" emerge proftpd"
+		sleep 5
+	fi
+
 	if use mysql; then
 		modules="${modules}:mod_sql:mod_sql_mysql"
 		myconf="--with-includes=/usr/include/mysql"
diff --git a/net-ftp/proftpd/proftpd-1.2.9.ebuild b/net-ftp/proftpd/proftpd-1.2.9.ebuild
index e4c2ca79f72c..b131d9ad888c 100644
--- a/net-ftp/proftpd/proftpd-1.2.9.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.9.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/net-ftp/proftpd/proftpd-1.2.9.ebuild,v 1.9 2004/01/31 14:26:46 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9.ebuild,v 1.10 2004/02/12 19:47:21 blkdeath Exp $
 
 inherit flag-o-matic
 
@@ -43,6 +43,15 @@ src_compile() {
 		modules="${modules}:mod_tls"
 	fi
 
+	if use mysql && use postgres
+	then
+		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
+		ewarn "Presently this ebuild defaults to mysql. If you would like to"
+		ewarn "change the default behaviour, merge ProFTPD with;"
+		ewarn "USE=\"-mysql postgres\" emerge proftpd"
+		sleep 5
+	fi
+
 	if use mysql; then
 		modules="${modules}:mod_sql:mod_sql_mysql"
 		myconf="--with-includes=/usr/include/mysql"