small fix0rs

8 files changed, 17 insertions, 243 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 878675d9410f..7edd6932fc27 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,9 +1,15 @@
 # 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.15 2002/08/23 19:33:20 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.16 2002/09/07 09:18:36 seemant Exp $
 
 *cyrus-sasl-2.1.7-r1 (23 Aug 2002)
 
+  07 Sep 2002; Seemant Kulleen <seemant@gentoo.org>
+  cyrus-sasl-2.1.7-r1.ebuild :
+
+  USE flag adjustments, as discovered by jap1@ionet.net (Jacob Perkins) and
+  kevin@aptbasilicata.it (j2ee) in bug #7598.
+
   23 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> files/digest-cyrus-sasl-2.1.7-r1 :
 
   Added digest file..
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
deleted file mode 100644
index 4c33f32d68d6..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.4 2002/08/14 11:52:27 murphy Exp $
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
-
-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="0"
-KEYWORDS="x86 sparc sparc64"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# some nice patches...  thanks mandrake ;-)
-	patch -p1 < ${FILESDIR}/${PN}-1.5.21-des.patch || die
-	patch -p1 < ${FILESDIR}/${PN}-configdir.patch || die
-	patch -p1 < ${FILESDIR}/${PN}-saslauthd.patch || die
-	patch -p1 < ${FILESDIR}/${PN}-1.5.24-rpath.patch || die
-	patch -p0 < ${FILESDIR}/${PN}-1.5.27-scram.patch || die
-	libtoolize --copy --force
-	aclocal -I cmulocal || die
-	automake || die
-	autoconf || die
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--with-configdir=/etc/sasl \
-		--with-pwcheck=/var/lib/sasl \
-		--with-plugindir=/usr/lib/sasl \
-		--with-saslauthd=/var/lib/sasl \
-		--with-dbpath=/var/lib/sasl/sasl.db \
-		--with-des \
-		--with-rc4 \
-		--enable-pam \
-		--enable-anon \
-		--enable-cram \
-		--with-gnu-ld \
-		--enable-scram \
-		--enable-plain \
-		--enable-login \
-		--disable-krb4 \
-		--enable-static \
-		--enable-shared \
-		--without-mysql \
-		--enable-digest \
-		--disable-gssapi \
-		--disable-sample \
-		--with-dblib=berkeley \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING AUTHORS INSTALL NEWS README* TODO \
-		ChangeLog testing.txt doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
-
-pkg_postinst() {
-	# empty directories..
-	install -d -m0755 ${ROOT}/var/lib/sasl
-	install -d -m0755 ${ROOT}/etc/sasl
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5.ebuild
deleted file mode 100644
index 27c66dd1bcb3..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.3 2002/08/14 11:52:27 murphy Exp $
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-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="0"
-KEYWORDS="x86 sparc sparc64"
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--with-configdir=/etc/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-dbpath=/var/lib/sasl2/sasl2.db \
-		--with-des \
-		--with-rc4 \
-		--enable-pam \
-		--enable-anon \
-		--enable-cram \
-		--with-gnu-ld \
-		--enable-scram \
-		--enable-plain \
-		--enable-login \
-		--disable-krb4 \
-		--enable-static \
-		--enable-shared \
-		--without-mysql \
-		--enable-digest \
-		--disable-gssapi \
-		--disable-sample \
-		--with-dblib=berkeley \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install problem"
-
-	dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoch pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
-
-pkg_postinst() {
-	# empty directories..
-	install -d -m0755 ${ROOT}/var/lib/sasl2
-	install -d -m0755 ${ROOT}/etc/sasl
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.6.ebuild
deleted file mode 100644
index 2ead7dc7d110..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.3 2002/08/14 11:52:27 murphy Exp $
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-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="0"
-KEYWORDS="x86 sparc sparc64"
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/openssl-0.9.6d"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/cyrus-sasl-2.1.6-iovec.diff
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var/state/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-dbpath=/var/lib/sasl2/sasl2.db \
-		--with-des \
-		--with-rc4 \
-		--enable-pam \
-		--enable-anon \
-		--enable-cram \
-		--with-gnu-ld \
-		--enable-scram \
-		--enable-plain \
-		--enable-login \
-		--disable-krb4 \
-		--enable-static \
-		--enable-shared \
-		--without-mysql \
-		--enable-digest \
-		--disable-gssapi \
-		--disable-sample \
-		--with-dblib=berkeley \
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--target=${CHOST} \
-		--with-openssl=/usr ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install problem"
-
-	dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt
-	docinto examples ; dodoc sample/{*.[ch],Makefile}
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
-}
-
-pkg_postinst() {
-	# empty directories..
-	install -d -m0755 ${ROOT}/var/lib/sasl2
-	install -d -m0755 ${ROOT}/etc/sasl
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r1.ebuild
index ddd61f1672fb..7bca01e561bb 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r1.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.7-r1.ebuild,v 1.1 2002/08/22 17:58:14 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.7-r1.ebuild,v 1.2 2002/09/07 09:18:36 seemant Exp $
 
 S=${WORKDIR}/${P}
 
@@ -12,15 +12,13 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc -sparc64"
 
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
+DEPEND=">=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
 	>=dev-libs/openssl-0.9.6d
-	cyrus-gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	cyrus-berkdb? ( >=sys-libs/db-3.2.9 )
-	cyrus-ldap? ( >=net-nds/openldap-2.0.25 )
-	cyrus-mysql? ( >=dev-db/mysql-3.23.51 )"
-RDEPEND="${DEPEND}"
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	berkdb? ( >=sys-libs/db-3.2.9 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( >=dev-db/mysql-3.23.51 )"
 
 src_unpack() {
 
@@ -35,15 +33,15 @@ src_compile() {
 
 	local myconf
 
-	use sasl-ldap && myconf="${myconf} --with-ldap" \
+	use ldap && myconf="${myconf} --with-ldap" \
 		|| myconf="${myconf} --without-ldap"
 
-	use sasl-mysql && myconf="${myconf} --with-mysql" \
+	use mysql && myconf="${myconf} --with-mysql" \
 		|| myconf="${myconf} --without-mysql"
 
-	if use cyrus-berkdb; then
+	if use berkdb; then
 		myconf="${myconf} --with-dblib=berkeley"
-	elif use cyrus-gdbm; then
+	elif use gdbm; then
 		myconf="${myconf} --with-dblib=gdbm --with-gdbm=/usr"
 	else
 		myconf="${myconf} --with-dblib=berkeley"
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r3 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r3
deleted file mode 100644
index 477dd8cc141c..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76ea426e2e2da3b8d2e3a43af5488f3b cyrus-sasl-1.5.27.tar.gz 528252
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.5 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.5
deleted file mode 100644
index 2d8b91047128..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 736784dd26a694e83d7e7a2fbe624711 cyrus-sasl-2.1.5.tar.gz 1249094
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.6 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.6
deleted file mode 100644
index d189612b10fa..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b60cf1f0d1a3230fbc1bb7490f5ae42 cyrus-sasl-2.1.6.tar.gz 1262015