Block the other fork of mod_auth_mysql.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

diff --git a/www-apache/mod_auth_mysql/ChangeLog b/www-apache/mod_auth_mysql/ChangeLog
index 4225b4f8daf9924abe2b0a56b21aaad0099673ad..9774ca95c4237af2d59aeb3ec46f19ec625fde63 100644 (file)
--- a/www-apache/mod_auth_mysql/ChangeLog
+++ b/www-apache/mod_auth_mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_auth_mysql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/ChangeLog,v 1.9 2010/03/24 19:52:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/ChangeLog,v 1.10 2010/03/24 20:35:36 robbat2 Exp $
+
+  24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
+  mod_auth_mysql-3.0.0-r2.ebuild:
+  Block the other fork of mod_auth_mysql.
 
   11 Jan 2010; Benedikt Böhm <hollow@gentoo.org>
   mod_auth_mysql-3.0.0-r2.ebuild:

diff --git a/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild b/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild
index 170c7ef87a775b9eae4f95548ebe3e6ab3225217..697992e58b7021a673532ee5ec5f1ddce2afe3e1 100644 (file)
--- a/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild
+++ b/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild,v 1.6 2010/01/11 08:22:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild,v 1.7 2010/03/24 20:35:36 robbat2 Exp $
 
 EAPI="2"
 
@@ -17,7 +17,8 @@ IUSE=""
 
 DEPEND="virtual/mysql
                sys-libs/zlib"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+               !www-apache/mod-auth-mysql"
 
 APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient_r -lm -lz ${PN}.c"
 APACHE2_MOD_CONF="12_${PN}"