clean up of old files;remove dependencies on automake, autotools, libtool (not needed); fix LDAP support (bug 132980); drop stable KEYWORDS by clean-up: Unsupported upstream and considererd dead

Package-Manager: portage-2.1.3.9

9 files changed, 23 insertions, 420 deletions

diff --git a/net-mail/cyrus-imspd/ChangeLog b/net-mail/cyrus-imspd/ChangeLog
index a5e11f3048be..42dd7d1756f2 100644
--- a/net-mail/cyrus-imspd/ChangeLog
+++ b/net-mail/cyrus-imspd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/cyrus-imspd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.12 2007/04/22 09:11:11 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.13 2007/10/05 13:02:49 opfer Exp $
+
+  05 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
+  -files/cyrus-imspd-db4.patch, -files/cyrus-imspd-gentoo.patch,
+  -cyrus-imspd-1.7b.ebuild, -cyrus-imspd-1.7b-r1.ebuild,
+  cyrus-imspd-1.8.ebuild:
+  clean up of old files;remove dependencies on automake, autotools, libtool
+  (not needed); fix LDAP support (bug 132980); drop stable KEYWORDS by
+  clean-up: Unsupported upstream and considererd dead
 
   22 Apr 2007; Andrej Kacian <ticho@gentoo.org> cyrus-imspd-1.7b.ebuild,
   cyrus-imspd-1.7b-r1.ebuild:
diff --git a/net-mail/cyrus-imspd/Manifest b/net-mail/cyrus-imspd/Manifest
index 9a597aa64cdc..87851e7bc08c 100644
--- a/net-mail/cyrus-imspd/Manifest
+++ b/net-mail/cyrus-imspd/Manifest
@@ -5,14 +5,6 @@ AUX cyrus-imspd-1.8-gentoo.patch 4220 RMD160 7fc112653a96cbcaf0fdeb47923186ef014
 MD5 e98cef6cedfbfa85f5b7a199a1366a7b files/cyrus-imspd-1.8-gentoo.patch 4220
 RMD160 7fc112653a96cbcaf0fdeb47923186ef01468388 files/cyrus-imspd-1.8-gentoo.patch 4220
 SHA256 c5ad4e69c91da01ee17adf374bd11abe8ed7d4f34bb78c6c2270572e2e439f8f files/cyrus-imspd-1.8-gentoo.patch 4220
-AUX cyrus-imspd-db4.patch 3446 RMD160 0f6687dab7babe2a2237b4eee5a7f86723db6916 SHA1 20ab4d172478c0c5ed02a293bc0f668879d872c0 SHA256 86b59cbea34b9ae12becab940f102dfb0c737ac4f58e040b9f5e872d21a3a4b0
-MD5 bbf3166bc707a84443c5e396c1d6d6f9 files/cyrus-imspd-db4.patch 3446
-RMD160 0f6687dab7babe2a2237b4eee5a7f86723db6916 files/cyrus-imspd-db4.patch 3446
-SHA256 86b59cbea34b9ae12becab940f102dfb0c737ac4f58e040b9f5e872d21a3a4b0 files/cyrus-imspd-db4.patch 3446
-AUX cyrus-imspd-gentoo.patch 4188 RMD160 2dfdbf950406d558c3949fe04efb84504732bf4f SHA1 16c2104f62f02a1972156468469ea3268c2a2249 SHA256 b96f95b0d9bed872189665cd51cfb32619d295491ad87518e50c8ad3ce788339
-MD5 d97f9081cc542625ba06e672f58e7377 files/cyrus-imspd-gentoo.patch 4188
-RMD160 2dfdbf950406d558c3949fe04efb84504732bf4f files/cyrus-imspd-gentoo.patch 4188
-SHA256 b96f95b0d9bed872189665cd51cfb32619d295491ad87518e50c8ad3ce788339 files/cyrus-imspd-gentoo.patch 4188
 AUX imspd.conf 156 RMD160 1acaad154c759f91ea3327643785b43b186d08a6 SHA1 eb4f7a67bccff9b318276c6bbc6d55de972c18ff SHA256 5c9e5bb2df3b48e4a62923591459a1d004b92cd9f90066d2607a1004b2125475
 MD5 aa6f51b5cf7fcffd8af00e26c81c2eed files/imspd.conf 156
 RMD160 1acaad154c759f91ea3327643785b43b186d08a6 files/imspd.conf 156
@@ -25,41 +17,26 @@ AUX stunnel.conf 220 RMD160 3964a9ee3d8ed070814a7eeaff217155ab7f182b SHA1 de9423
 MD5 9cc4403d49faa5913f7cafe219e0ce41 files/stunnel.conf 220
 RMD160 3964a9ee3d8ed070814a7eeaff217155ab7f182b files/stunnel.conf 220
 SHA256 1051f85d65e78debd298c7db8109a5834538365222615fff7da4b5ef9618db04 files/stunnel.conf 220
-DIST cyrus-imspd-v1.7b.tar.gz 636760 RMD160 f55f7b212f63bb2c41e68b384010cb9083fa6b52 SHA1 a229811c589a63876174e657f15acb2fa3e8b4f1 SHA256 bbffc0096c17770fe990d14d5b1a106659b750ca2e71c76e5145c71fb5f94453
 DIST cyrus-imspd-v1.8.tar.gz 650596 RMD160 c145cc0a0d8e1fe2950887f6ab0ac84ae9d9a4a4 SHA1 dc8d9de6dc5c9e2ae528c550e624606850b82a95 SHA256 ba1026dca5440b6a24a298cb9aa350321f9c6f921ba6404a74b9d546c02b70cd
-EBUILD cyrus-imspd-1.7b-r1.ebuild 2227 RMD160 3811c7207acb34cee2ccfad621bdf7482c8a6f71 SHA1 789c90ffe1d8293206a26ef935aaec45132d5e06 SHA256 dcd3b896d2439dd639c32fe436db72c6503b5f3ab7a9bf2850c79ec18484b73f
-MD5 0cea000bb23fbaaf692d2c7b6afc7cc5 cyrus-imspd-1.7b-r1.ebuild 2227
-RMD160 3811c7207acb34cee2ccfad621bdf7482c8a6f71 cyrus-imspd-1.7b-r1.ebuild 2227
-SHA256 dcd3b896d2439dd639c32fe436db72c6503b5f3ab7a9bf2850c79ec18484b73f cyrus-imspd-1.7b-r1.ebuild 2227
-EBUILD cyrus-imspd-1.7b.ebuild 2116 RMD160 e626dc6b366ba14b2b22883246051c3135b1c929 SHA1 bc356f9860574d26dd99d523be3d058c867e4ad1 SHA256 dc94efe170fbdc6f4da167b6f9e2f1b13fdb7f6ef77dcd8b4bc3d8e4bd0f4c47
-MD5 c1b485b565763b948579b318c8f9bf59 cyrus-imspd-1.7b.ebuild 2116
-RMD160 e626dc6b366ba14b2b22883246051c3135b1c929 cyrus-imspd-1.7b.ebuild 2116
-SHA256 dc94efe170fbdc6f4da167b6f9e2f1b13fdb7f6ef77dcd8b4bc3d8e4bd0f4c47 cyrus-imspd-1.7b.ebuild 2116
-EBUILD cyrus-imspd-1.8.ebuild 1860 RMD160 11fef147caa71995484be702d650252bfc28dce5 SHA1 d5597e2653e2391e777de468bc10e6ef7ddea956 SHA256 55769d4c0f4449d3070d6813fcf241ac8b4e1dabe6525aeb39d73777f4f0f333
-MD5 7f97f971e04757b6908f8245f218550a cyrus-imspd-1.8.ebuild 1860
-RMD160 11fef147caa71995484be702d650252bfc28dce5 cyrus-imspd-1.8.ebuild 1860
-SHA256 55769d4c0f4449d3070d6813fcf241ac8b4e1dabe6525aeb39d73777f4f0f333 cyrus-imspd-1.8.ebuild 1860
-MISC ChangeLog 3550 RMD160 0bdbd7a6ea81826924901deb151aad95d05d744b SHA1 6a46371f5460b5601a2a1f27773b43270b78efe5 SHA256 a216993176b56093bb307b66b5a0a6b245ac2ea3064856c33f6b77b6d5cd1bd8
-MD5 69c8b66a0a0b058c7d2a3fe269552de3 ChangeLog 3550
-RMD160 0bdbd7a6ea81826924901deb151aad95d05d744b ChangeLog 3550
-SHA256 a216993176b56093bb307b66b5a0a6b245ac2ea3064856c33f6b77b6d5cd1bd8 ChangeLog 3550
+EBUILD cyrus-imspd-1.8.ebuild 1800 RMD160 270da0fb71b7dbf96c3969e9d33ed7451369750f SHA1 0cf8a2ad82159ea8029f4e6e262afdd94a5bda60 SHA256 4a52a7fa3bef90fa64341c4d6faa07911ad808ecf91a8d0a31abd5cf1658eb4e
+MD5 10ad3e0f981ee34822ce3803f5960e98 cyrus-imspd-1.8.ebuild 1800
+RMD160 270da0fb71b7dbf96c3969e9d33ed7451369750f cyrus-imspd-1.8.ebuild 1800
+SHA256 4a52a7fa3bef90fa64341c4d6faa07911ad808ecf91a8d0a31abd5cf1658eb4e cyrus-imspd-1.8.ebuild 1800
+MISC ChangeLog 3955 RMD160 df69fa4623a9ef78b7c3e8ac606bd2ef4f2b9ed6 SHA1 f21fd273d251acbf71e6e1932898dcac0dec2cd4 SHA256 bb664c3253fab1cf8616822e85be4f2e74a15b89c8c5d78c2a7eeefc8502717b
+MD5 c84ad765ed7f7abf2c0e32de1427a574 ChangeLog 3955
+RMD160 df69fa4623a9ef78b7c3e8ac606bd2ef4f2b9ed6 ChangeLog 3955
+SHA256 bb664c3253fab1cf8616822e85be4f2e74a15b89c8c5d78c2a7eeefc8502717b ChangeLog 3955
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 c1a78f238230de9756a3dff1d52d748a files/digest-cyrus-imspd-1.7b 253
-RMD160 5d0b2653030f964b554200e0f6524ba03c306845 files/digest-cyrus-imspd-1.7b 253
-SHA256 6731b9a5432fc6749ed7df57bf50f7789730aed7c9443ac4680663879c783a42 files/digest-cyrus-imspd-1.7b 253
-MD5 c1a78f238230de9756a3dff1d52d748a files/digest-cyrus-imspd-1.7b-r1 253
-RMD160 5d0b2653030f964b554200e0f6524ba03c306845 files/digest-cyrus-imspd-1.7b-r1 253
-SHA256 6731b9a5432fc6749ed7df57bf50f7789730aed7c9443ac4680663879c783a42 files/digest-cyrus-imspd-1.7b-r1 253
 MD5 eda50d49ddfab2a8cbce76d9d57d86a9 files/digest-cyrus-imspd-1.8 250
 RMD160 014ac4c965a9901b0cfbcc7f96365c80b76c6d6b files/digest-cyrus-imspd-1.8 250
 SHA256 192b0bc6df4030f191543819f89d5b1c367934572f5a34d694696ff5f08600d4 files/digest-cyrus-imspd-1.8 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGKya2QlM6RnzZP+IRAoU+AJ99MZiN3xBjBgh9I5aKTiPFvoJgDgCcC6md
-GjsHESORhKqLBO5vUnB6zDQ=
-=WQSH
+iD8DBQFHBjX/NQqtfCuFneMRAl/jAJ4mrbX0wSEb0e3nbQaGtxniE28nWwCePqtO
+okxE/4U7M4cdtBscWu8LduM=
+=JBRz
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.7b-r1.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.7b-r1.ebuild
deleted file mode 100644
index cbd056fb36b1..000000000000
--- a/net-mail/cyrus-imspd/cyrus-imspd-1.7b-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.7b-r1.ebuild,v 1.3 2007/04/22 09:11:11 ticho Exp $
-
-inherit eutils ssl-cert
-
-DESCRIPTION="Internet Message Support Protocol (IMSP) server."
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${PN}-v${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="kerberos ldap ssl"
-
-RDEPEND=">=sys-libs/db-3.2
-	>=dev-libs/cyrus-sasl-2.1.3
-	>=dev-libs/cyrus-imap-dev-2.1.14
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? ( >=net-misc/stunnel-4 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}/cyrus-imspd-db4.patch"
-	epatch "${FILESDIR}/cyrus-imspd-gentoo.patch"
-
-	# Cyrus 2.2.x has an extra library.
-	if [ "`best_version '=dev-libs/cyrus-imap-dev-2.2*'`" ] ; then
-		sed -e "s:-lcyrus:-lcyrus -lcyrus_min:" \
-			-i "${S}/imsp/Makefile.in" \
-			-i "${S}/cmulocal/libcyrus.m4" || die "sed failed"
-	fi
-
-	export WANT_AUTOCONF=2.5
-	touch config.{guess,sub}
-
-	# Recreate configure.
-	ebegin "Recreating configure"
-	rm -f configure acconfig.h
-	aclocal -I cmulocal && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with ldap ldap ldap`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-
-	econf \
-		--without-krb \
-		--with-auth=unix \
-		${myconf} || die "econf failed"
-
-	# Fix some malloc definitions
-	sed -i -e \
-		's~extern char \*malloc()~extern void *malloc()~g' imsp/*.c
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	newsbin imsp/cyrus-imspd imspd
-
-	newinitd "${FILESDIR}/imspd.rc6" imspd
-	newconfd "${FILESDIR}/imspd.conf" imspd
-
-	keepdir /var/imsp{,/user}
-
-	if use ssl ; then
-		insinto /etc/stunnel
-		newins "${FILESDIR}/stunnel.conf" imspd.conf
-
-		dosed "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" /etc/conf.d/imspd
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMSP Server}"
-		insinto /etc/ssl/imspd
-		docert server
-	fi
-
-	dodoc README imsp/options.sample notes/*
-}
diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild
deleted file mode 100644
index fc05e5f2f05e..000000000000
--- a/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.7b.ebuild,v 1.11 2007/04/22 09:11:11 ticho Exp $
-
-inherit eutils ssl-cert
-
-DESCRIPTION="Internet Message Support Protocol (IMSP) server."
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${PN}-v${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="kerberos ldap ssl"
-
-RDEPEND=">=sys-libs/db-3.2
-	>=dev-libs/cyrus-sasl-2.1.3
-	>=dev-libs/cyrus-imap-dev-2.1.14
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? ( >=net-misc/stunnel-4 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}/cyrus-imspd-db4.patch"
-	epatch "${FILESDIR}/cyrus-imspd-gentoo.patch"
-
-	# Cyrus 2.2.x has an extra library.
-	if [ "`best_version '=dev-libs/cyrus-imap-dev-2.2*'`" ] ; then
-		sed -e "s:-lcyrus:-lcyrus -lcyrus_min:" \
-			-i "${S}/imsp/Makefile.in" \
-			-i "${S}/cmulocal/libcyrus.m4" || die "sed failed"
-	fi
-
-	export WANT_AUTOCONF=2.5
-	touch config.{guess,sub}
-
-	# Recreate configure.
-	ebegin "Recreating configure"
-	rm -f configure acconfig.h
-	aclocal -I cmulocal && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with ldap ldap ldap`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-
-	econf \
-		--without-krb \
-		--with-auth=unix \
-		${myconf} || die "econf failed"
-	emake || die "compile problem"
-}
-
-src_install() {
-	newsbin imsp/cyrus-imspd imspd
-
-	newinitd "${FILESDIR}/imspd.rc6" imspd
-	newconfd "${FILESDIR}/imspd.conf" imspd
-
-	keepdir /var/imsp{,/user}
-
-	if use ssl ; then
-		insinto /etc/stunnel
-		newins "${FILESDIR}/stunnel.conf" imspd.conf
-
-		dosed "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" /etc/conf.d/imspd
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMSP Server}"
-		insinto /etc/ssl/imspd
-		docert server
-	fi
-
-	dodoc README imsp/options.sample notes/*
-}
diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild
index 41b4a12bcb4c..fac4948f7b34 100644
--- a/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild
+++ b/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild,v 1.2 2007/01/05 07:11:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild,v 1.3 2007/10/05 13:02:49 opfer Exp $
 
 inherit eutils ssl-cert
 
@@ -20,10 +20,7 @@ RDEPEND=">=sys-libs/db-3.2
 	ldap? ( >=net-nds/openldap-2.0 )
 	ssl? ( >=net-misc/stunnel-4 )"
 
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-v${PV}"
 
@@ -41,7 +38,7 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		$(use_with ldap) \
+		$(use_with ldap ldap ldap) \
 		$(use_enable kerberos gssapi) \
 		--without-krb \
 		--with-auth=unix || \
diff --git a/net-mail/cyrus-imspd/files/cyrus-imspd-db4.patch b/net-mail/cyrus-imspd/files/cyrus-imspd-db4.patch
deleted file mode 100644
index c66f0c11cef1..000000000000
--- a/net-mail/cyrus-imspd/files/cyrus-imspd-db4.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4
---- cyrus-sasl-2.1.14/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,21 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-           do
--            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
--              dblib="berkeley"; break, dblib="no")
-+            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+               dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")))
-           done
-         if test "$dblib" = "no"; then
-+          for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+            do
-+              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+                dblib="berkeley"; break, dblib="no")
-+            done
-+       fi
-+        if test "$dblib" = "no"; then
-           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
-             dblib="berkeley"; dbname=db,
-             dblib="no")
---- cyrus-sasl-2.1.14/configure.in	2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/configure.in	2003-07-09 03:17:48.000000000 -0500
-@@ -57,28 +57,34 @@
- CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
- CMU_ADD_LIBPATH("/usr/local/lib")
- 
--dnl
--dnl  Get ready to use DB
--dnl
-+dnl Berkeley DB Detection
-+
-+dnl support old-style
-+AC_ARG_WITH(dbdir,
-+        [  --with-dbdir=DIR        Berkeley DB files are in prefix DIR],
-+        with_bdb_lib="$withval/lib"; with_bdb_inc="$withval/include",
-+        with_bdb_lib=none; with_bdb_inc=none)
-+
-+CYRUS_BERKELEY_DB_CHK()
-+
-+if test "$dblib" = "no"; then
-+  AC_ERROR([this version requires Berkeley DB 3.x or later.
-+(Get it from http://www.sleepycat.com/).  You may need to suppply the
-+--with-bdb-libdir or --with-bdb-incdir configure options.])
-+fi
- 
--AC_CHECK_FUNC(dbopen, [AC_DEFINE(HAVE_LIBDB,[],[Berkeley DB?])
--                       use_db=1], 
--  AC_CHECK_LIB(db,dbopen,[AC_DEFINE(HAVE_LIBDB,[],[Berkeley DB?])
--                          LIBS=" -ldb ${LIBS}"
--                          use_db=1]))
--dnl if db_185.h is present, we're using db2 or 3 and should include db_185.h
--dnl instead of db.h; otherwise, include db.h.  this is handled in the code
--dnl itself.
--AC_CHECK_HEADER(db_185.h, [AC_DEFINE(HAVE_DB_185_H,[],[DB 185 h?])
--                           AC_DEFINE(HAVE_LIBDB,[],[Berkeley DB?])
--                           LIBS="-ldb ${LIBS}"
--                           use_db=1])
--
--if test -z "use_db"; then
--  AC_CHECK_LIB(ndbm, dbm_open)
--  AC_CHECK_LIB(dbm, dbm_open)
-+if test "$with_bdb_lib" != "none"; then
-+  CMU_ADD_LIBPATH($with_bdb_lib)
- fi
- 
-+BDB_INC=${BDB_INCADD}
-+BDB_LIB=${BDB_LIBADD}
-+AC_SUBST(BDB_INC)
-+AC_SUBST(BDB_LIB)
-+
-+LIBS="${LIBS} ${BDB_LIBADD}"
-+CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
-+
- dnl
- dnl  Random other libraries
- dnl
diff --git a/net-mail/cyrus-imspd/files/cyrus-imspd-gentoo.patch b/net-mail/cyrus-imspd/files/cyrus-imspd-gentoo.patch
deleted file mode 100644
index bb4493130cec..000000000000
--- a/net-mail/cyrus-imspd/files/cyrus-imspd-gentoo.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -ruN cyrus-imspd-v1.7a-vanilla/Makefile.in cyrus-imspd-v1.7a/Makefile.in
---- cyrus-imspd-v1.7a-vanilla/Makefile.in	1997-10-28 19:12:07.000000000 -0800
-+++ cyrus-imspd-v1.7a/Makefile.in	2003-09-10 13:24:02.000000000 -0700
-@@ -21,7 +21,7 @@
- # SOFTWARE.
- # 
- 
--SUBDIRS = lib imsp
-+SUBDIRS = imsp
- 
- srcdir = @srcdir@
- VPATH = @srcdir@
-diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/Makefile.in cyrus-imspd-v1.7a/imsp/Makefile.in
---- cyrus-imspd-v1.7a-vanilla/imsp/Makefile.in	2000-12-17 19:37:53.000000000 -0800
-+++ cyrus-imspd-v1.7a/imsp/Makefile.in	2003-09-10 13:25:06.000000000 -0700
-@@ -48,8 +48,8 @@
- 
- DEFS = @DEFS@ $(DEFINES)
- CPPFLAGS = -I.. -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ 
--LIBS = @LIBS@
--DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
-+LIBS = @LIBS@ -L/usr/lib -lcyrus
-+DEPLIBS = @DEPLIBS@
- 
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/abook.c cyrus-imspd-v1.7a/imsp/abook.c
---- cyrus-imspd-v1.7a-vanilla/imsp/abook.c	2000-12-17 17:47:03.000000000 -0800
-+++ cyrus-imspd-v1.7a/imsp/abook.c	2003-09-10 13:27:47.000000000 -0700
-@@ -108,7 +108,7 @@
-     
-     /* get the ACL */
-     if (!acl && sdb_get(abooks, name, SDB_ICASE, &acl) < 0) return (0);
--    if (acl) mask = acl_myrights(auth_get_state(id), acl);
-+    if (acl) mask = cyrus_acl_myrights(auth_get_state(id), acl);
- 
-     /* check for administrator */
-     if (auth_level(id) == AUTH_ADMIN) mask |= ACL_ALL;
-@@ -700,7 +700,7 @@
- 		    strcpy(tmpacl, "\t");
- 		    tmpc = name[osrclen];
- 		    name[osrclen] = '\0';
--		    acl_set(&tmpacl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
-+		    cyrus_acl_set(&tmpacl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
- 		    name[osrclen] = tmpc;
- 		}
- 		value = tmpacl;
-@@ -932,7 +932,7 @@
- 		strcpy(acl, "\t");
- 		tmpc = name[ownerlen];
- 		name[ownerlen] = '\0';
--		acl_set(&acl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
-+		cyrus_acl_set(&acl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
- 		name[ownerlen] = tmpc;
- 	    }
- 	} else {
-@@ -941,9 +941,9 @@
- 	}
- 	/* update acl */
- 	if (acl
--	    && acl_set(&acl, ident, ACL_MODE_SET, 
--		       rights ? acl_strtomask(rights) : 0L, 
--		       NULL, NULL) == 0) {
-+	    && cyrus_acl_set(&acl, ident, ACL_MODE_SET, 
-+		             rights ? cyrus_acl_strtomask(rights) : 0L, 
-+		             NULL, NULL) == 0) {
- 	    if (sdb_set(abooks, name, SDB_ICASE, acl) == 0) {
- 		result = AB_SUCCESS;
- 	    }
-@@ -966,7 +966,7 @@
-     char *name, *rights;
- {
-     /* some more error checking might be in order... */
--    acl_masktostr(abook_rights(id, name, NULL), rights);
-+    cyrus_acl_masktostr(abook_rights(id, name, NULL), rights);
- 
-     return (AB_SUCCESS);
- }
-diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/authize.c cyrus-imspd-v1.7a/imsp/authize.c
---- cyrus-imspd-v1.7a-vanilla/imsp/authize.c	2003-08-06 09:56:53.000000000 -0700
-+++ cyrus-imspd-v1.7a/imsp/authize.c	2003-09-10 13:28:11.000000000 -0700
-@@ -122,7 +122,7 @@
- 
-     /* Get an authentication state from the libcyrus "auth" module
-      * (not to be confused the the IMSP authize module in this file).
--     * This is needed for acl_myrights(). 
-+     * This is needed for cyrus_acl_myrights(). 
-      * Free id->state in case this isn't the first authentication this session.
-      */
-     if (id->state)
-diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/bb.c cyrus-imspd-v1.7a/imsp/bb.c
---- cyrus-imspd-v1.7a-vanilla/imsp/bb.c	2000-02-10 14:10:21.000000000 -0800
-+++ cyrus-imspd-v1.7a/imsp/bb.c	2003-09-10 13:28:37.000000000 -0700
-@@ -385,7 +385,7 @@
-     struct auth_state *id;
-     char *name, *acl;
- {
--    long rights = acl_myrights(id, acl);
-+    long rights = cyrus_acl_myrights(id, acl);
-     char *user = auth_username(id);
-     int len = strlen(user);
- 
-diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/imsp_server.c cyrus-imspd-v1.7a/imsp/imsp_server.c
---- cyrus-imspd-v1.7a-vanilla/imsp/imsp_server.c	2003-08-06 09:56:54.000000000 -0700
-+++ cyrus-imspd-v1.7a/imsp/imsp_server.c	2003-09-10 13:30:25.000000000 -0700
-@@ -1273,7 +1273,7 @@
- 		    defacl = malloc(defacllen);
- 		    if (defacl) {
- 			snprintf(acl = defacl, defacllen, "%s\t%s\t", user,
--				acl_masktostr(ACL_ALL, rbuf));
-+				cyrus_acl_masktostr(ACL_ALL, rbuf));
- 		    }
- 		}
- 	    }
diff --git a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7b b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7b
deleted file mode 100644
index 58897c7a7446..000000000000
--- a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7b
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58aed9741f975e29f364e7e604ddc5e9 cyrus-imspd-v1.7b.tar.gz 636760
-RMD160 f55f7b212f63bb2c41e68b384010cb9083fa6b52 cyrus-imspd-v1.7b.tar.gz 636760
-SHA256 bbffc0096c17770fe990d14d5b1a106659b750ca2e71c76e5145c71fb5f94453 cyrus-imspd-v1.7b.tar.gz 636760
diff --git a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7b-r1 b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7b-r1
deleted file mode 100644
index 58897c7a7446..000000000000
--- a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7b-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58aed9741f975e29f364e7e604ddc5e9 cyrus-imspd-v1.7b.tar.gz 636760
-RMD160 f55f7b212f63bb2c41e68b384010cb9083fa6b52 cyrus-imspd-v1.7b.tar.gz 636760
-SHA256 bbffc0096c17770fe990d14d5b1a106659b750ca2e71c76e5145c71fb5f94453 cyrus-imspd-v1.7b.tar.gz 636760