Re-SLOT'd all cyrus-sasl packages back to 0 as there are conflicting

files between the 1.x and the 2.x version of cyrus-sasl.

6 files changed, 18 insertions, 11 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 1520d528ec49..696824eb862f 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.9 2002/07/22 21:00:18 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.10 2002/07/22 21:12:13 raker Exp $
+
+*cyrus-sasl-* (22 Jul 2002)
+
+  22 Jul 2002; Nick Hadaway <raker@gentoo.org>
+
+  Re-SLOT'd all cyrus-sasl packages back to 0 as there are conflicting files
+  between the 1.x and the 2.x version of cyrus-sasl.
 
 *cyrus-sasl-2.1.6 (22 Jul 2002)
 
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r3.ebuild
index d5dedf78d03a..a721e22b6564 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r3.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r3.ebuild,v 1.2 2002/07/13 21:33:14 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r3.ebuild,v 1.3 2002/07/22 21:12:13 raker Exp $
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
@@ -9,7 +9,7 @@ S=${WORKDIR}/${P}
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 DEPEND="virtual/glibc >=sys-libs/db-3.2 >=sys-libs/pam-0.75"
 LICENSE="as-is"
-SLOT="1"
+SLOT="0"
 KEYWORDS="x86"
 
 src_unpack() {
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild
index 516d5ad62bc0..62875855a469 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild,v 1.3 2002/07/13 21:33:14 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild,v 1.4 2002/07/22 21:12:13 raker Exp $
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
@@ -8,7 +8,7 @@ HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
 S=${WORKDIR}/${P}
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 LICENSE="as-is"
-SLOT="1"
+SLOT="0"
 KEYWORDS="x86"
 
 DEPEND="virtual/glibc
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5-r2.ebuild
index 47e723f3d9b6..07b62781e79b 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5-r2.ebuild,v 1.1 2002/07/13 21:33:14 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5-r2.ebuild,v 1.2 2002/07/22 21:12:13 raker Exp $
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
 HOMEPAGE="http://asg.web.cmu.edu/sasl/"
@@ -8,7 +8,7 @@ HOMEPAGE="http://asg.web.cmu.edu/sasl/"
 S=${WORKDIR}/${P}
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 LICENSE="as-is"
-SLOT="2"
+SLOT="0"
 KEYWORDS="x86"
 
 DEPEND="virtual/glibc
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5.ebuild
index c284baea1ee2..4f0044d7ad2c 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5.ebuild,v 1.1 2002/07/08 18:21:46 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5.ebuild,v 1.2 2002/07/22 21:12:13 raker Exp $
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
 HOMEPAGE="http://asg.web.cmu.edu/sasl/"
@@ -8,7 +8,7 @@ HOMEPAGE="http://asg.web.cmu.edu/sasl/"
 S=${WORKDIR}/${P}
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 LICENSE="as-is"
-SLOT="2"
+SLOT="0"
 KEYWORDS="x86"
 
 DEPEND="virtual/glibc
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.6.ebuild
index baa3534260ce..4bafc611a1c0 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.6.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.6.ebuild,v 1.1 2002/07/22 21:00:18 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.6.ebuild,v 1.2 2002/07/22 21:12:13 raker Exp $
 
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
 HOMEPAGE="http://asg.web.cmu.edu/sasl/"
@@ -8,7 +8,7 @@ HOMEPAGE="http://asg.web.cmu.edu/sasl/"
 S=${WORKDIR}/${P}
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 LICENSE="as-is"
-SLOT="2"
+SLOT="0"
 KEYWORDS="x86"
 
 DEPEND="virtual/glibc