Block net-misc/gsasl.

(Portage version: 2.2_rc62/cvs/Linux i686)

6 files changed, 21 insertions, 11 deletions

diff --git a/net-libs/libgsasl/ChangeLog b/net-libs/libgsasl/ChangeLog
index f4166d1080a3..a90f11d9b1c0 100644
--- a/net-libs/libgsasl/ChangeLog
+++ b/net-libs/libgsasl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libgsasl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/ChangeLog,v 1.46 2010/02/17 20:47:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/ChangeLog,v 1.47 2010/02/17 20:55:11 jer Exp $
+
+  17 Feb 2010; Jeroen Roovers <jer@gentoo.org> libgsasl-0.2.4.ebuild,
+  libgsasl-0.2.28.ebuild, libgsasl-0.2.29.ebuild, libgsasl-1.1.ebuild,
+  libgsasl-1.4.1.ebuild:
+  Block net-misc/gsasl.
 
   17 Feb 2010; Jeroen Roovers <jer@gentoo.org> libgsasl-0.2.4.ebuild,
   libgsasl-0.2.28.ebuild, libgsasl-0.2.29.ebuild, libgsasl-1.1.ebuild,
diff --git a/net-libs/libgsasl/libgsasl-0.2.28.ebuild b/net-libs/libgsasl/libgsasl-0.2.28.ebuild
index ec7112d8cf36..8f4f73c5336a 100644
--- a/net-libs/libgsasl/libgsasl-0.2.28.ebuild
+++ b/net-libs/libgsasl/libgsasl-0.2.28.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/net-libs/libgsasl/libgsasl-0.2.28.ebuild,v 1.6 2010/02/17 20:47:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-0.2.28.ebuild,v 1.7 2010/02/17 20:55:11 jer Exp $
 
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -15,7 +15,8 @@ IUSE="idn kerberos nls"
 DEPEND="nls? ( >=sys-devel/gettext-0.16.1 )
 	kerberos? ( virtual/krb5 )
 	idn? ( net-dns/libidn )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!net-misc/gsasl"
 
 src_compile() {
 	econf \
diff --git a/net-libs/libgsasl/libgsasl-0.2.29.ebuild b/net-libs/libgsasl/libgsasl-0.2.29.ebuild
index 9e777969e7d4..450cb4ea4ef9 100644
--- a/net-libs/libgsasl/libgsasl-0.2.29.ebuild
+++ b/net-libs/libgsasl/libgsasl-0.2.29.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/net-libs/libgsasl/libgsasl-0.2.29.ebuild,v 1.2 2010/02/17 20:47:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-0.2.29.ebuild,v 1.3 2010/02/17 20:55:11 jer Exp $
 
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -15,7 +15,8 @@ IUSE="idn kerberos nls"
 DEPEND="nls? ( >=sys-devel/gettext-0.16.1 )
 	kerberos? ( virtual/krb5 )
 	idn? ( net-dns/libidn )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!net-misc/gsasl"
 
 src_compile() {
 	econf \
diff --git a/net-libs/libgsasl/libgsasl-0.2.4.ebuild b/net-libs/libgsasl/libgsasl-0.2.4.ebuild
index 694502d60529..a96775d60f3e 100644
--- a/net-libs/libgsasl/libgsasl-0.2.4.ebuild
+++ b/net-libs/libgsasl/libgsasl-0.2.4.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/net-libs/libgsasl/libgsasl-0.2.4.ebuild,v 1.14 2010/02/17 20:47:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-0.2.4.ebuild,v 1.15 2010/02/17 20:55:11 jer Exp $
 
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -14,7 +14,8 @@ IUSE="kerberos nls static idn"
 DEPEND="nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )
 	idn? ( net-dns/libidn )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!net-misc/gsasl"
 
 src_compile() {
 	econf \
diff --git a/net-libs/libgsasl/libgsasl-1.1.ebuild b/net-libs/libgsasl/libgsasl-1.1.ebuild
index 05522b0265d4..f3cb5b72871e 100644
--- a/net-libs/libgsasl/libgsasl-1.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.1.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/net-libs/libgsasl/libgsasl-1.1.ebuild,v 1.4 2010/02/17 20:47:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.1.ebuild,v 1.5 2010/02/17 20:55:11 jer Exp $
 
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -15,7 +15,8 @@ IUSE="idn kerberos nls"
 DEPEND="nls? ( >=sys-devel/gettext-0.16.1 )
 	kerberos? ( virtual/krb5 )
 	idn? ( net-dns/libidn )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!net-misc/gsasl"
 
 src_compile() {
 	econf \
diff --git a/net-libs/libgsasl/libgsasl-1.4.1.ebuild b/net-libs/libgsasl/libgsasl-1.4.1.ebuild
index e053d5815e5d..ed1e0a1b1f16 100644
--- a/net-libs/libgsasl/libgsasl-1.4.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.4.1.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/net-libs/libgsasl/libgsasl-1.4.1.ebuild,v 1.2 2010/02/17 20:47:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.4.1.ebuild,v 1.3 2010/02/17 20:55:11 jer Exp $
 
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -15,7 +15,8 @@ IUSE="idn kerberos nls"
 DEPEND="nls? ( >=sys-devel/gettext-0.16.1 )
 	kerberos? ( virtual/krb5 )
 	idn? ( net-dns/libidn )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!net-misc/gsasl"
 
 src_compile() {
 	econf \