mark 2.1.18 unstable, remove 2.1.17 from portage

4 files changed, 10 insertions, 146 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index e881f870e23e..d1f68ddc5ca8 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.73 2004/06/25 18:15:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.74 2004/07/01 14:08:55 merlin Exp $
+
+  01 Jul 2004; Cory Visi <merlin@gentoo.org> cyrus-sasl-2.1.18.ebuild:
+  Moved all archs to unstable due to numerous open bugs
+
+  01 Jul 2004; Cory Visi <merlin@gentoo.org> cyrus-sasl-2.1.17.ebuild:
+  Unstable 2.1.17 dropped due to broken db4 patch, please use 2.1.18; reference:
+  Bug 47027 & Bug Bug 46936
 
   25 Jun 2004; Aron Griffis <agriffis@gentoo.org> cyrus-sasl-2.1.17.ebuild,
   cyrus-sasl-2.1.18.ebuild:
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
deleted file mode 100644
index 42e01c3a5238..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild,v 1.19 2004/06/25 18:15:01 agriffis Exp $
-
-inherit eutils flag-o-matic gnuconfig
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 alpha ia64 hppa mips"
-IUSE="gdbm ldap mysql postgres kerberos static ssl java pam"
-
-RDEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	pam? ( >=sys-libs/pam-0.75 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kerberos? ( virtual/krb5 )
-	java? ( virtual/jdk )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	sys-devel/libtool
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# Fix broken include.
-	sed -e 's:sasl/sasl.h:sasl.h:' \
-		-i saslauthd/lak.c || die "sed failed"
-
-	# Fix default port name for rimap auth mechanism.
-	sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
-		-i saslauthd/auth_rimap.c || die "sed failed"
-
-	# DB4 detection and versioned symbols.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-db4.patch"
-
-	# Add configdir support.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -f configure config.h.in saslauthd/configure
-	ebegin "Recreating configure"
-	aclocal -I cmulocal -I config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-	cd "${S}/saslauthd"
-	ebegin "Recreating saslauthd/configure"
-	aclocal -I ../cmulocal -I ../config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf="--enable-login --enable-ntlm --disable-krb4 --disable-otp"
-	myconf="${myconf} `use_enable static`"
-	myconf="${myconf} `use_with ssl openssl`"
-	myconf="${myconf} `use_with pam`"
-	myconf="${myconf} `use_with ldap`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-	myconf="${myconf} `use_with mysql` `use_enable mysql sql`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres sql`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-	if use gdbm ; then
-		myconf="${myconf} --with-dblib=gdbm"
-	else
-		myconf="${myconf} --with-dblib=berkeley"
-	fi
-
-	# Compaq-sdk checks for -D_REENTRANT and -pthread takes care the cpp stuff.
-	# taviso #24998 (17 Aug 03)
-	use alpha && append-flags -D_REENTRANT -pthread
-
-	# Detect mips systems properly
-	use mips && gnuconfig_update
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		${myconf} || die "econf failed"
-
-	# Parallel build doesn't work.
-	emake -j1 || die "compile problem"
-}
-
-src_install () {
-	einstall
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Generate an empty sasldb2 with correct permissions.
-	LD_OLD="${LD_LIBRARY_PATH}"
-	export LD_LIBRARY_PATH="${D}/usr/lib" SASL_PATH="${D}/usr/lib/sasl2"
-	echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
-	"${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
-	export LD_LIBRARY_PATH="${LD_OLD}"
-	chown root:mail "${D}/etc/sasl2/sasldb2"
-	chmod 0640 "${D}/etc/sasl2/sasldb2"
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto examples
-	dodoc sample/{*.[ch],Makefile}
-
-	docinto saslauthd
-	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/saslauthd.pam" saslauthd
-	fi
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/pwcheck.rc6" pwcheck
-	newexe "${FILESDIR}/saslauthd2.rc6" saslauthd
-	insinto /etc/conf.d
-	newins "${FILESDIR}/saslauthd2.conf" saslauthd
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
index 5cea7f38e154..2218053505db 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild,v 1.13 2004/06/25 18:15:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild,v 1.14 2004/07/01 14:08:55 merlin Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="2"
-KEYWORDS="~x86 ~ppc sparc ~mips ~alpha arm hppa amd64 ~ia64 s390 ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
 IUSE="gdbm ldap mysql postgres kerberos static ssl java pam"
 
 RDEPEND="virtual/glibc
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
deleted file mode 100644
index 954839a230d0..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4add6be2f194dc51aafc64193a1dd77b cyrus-sasl-2.1.17.tar.gz 1499725