Remove some stale files. Fix date headers.

16 files changed, 12 insertions, 563 deletions

diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index 8b36927b1fd5..e6db050c791c 100644
--- a/net-mail/cyrus-imap-admin/ChangeLog
+++ b/net-mail/cyrus-imap-admin/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-mail/cyrus-imap-admin
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.18 2003/09/18 22:35:09 max Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.19 2004/01/20 18:07:08 max Exp $
 
   18 Sep 2003; Max Kalika <max@gentoo.org> cyrus-imap-admin-2.1.11-r1.ebuild,
   cyrus-imap-admin-2.1.11.ebuild, cyrus-imap-admin-2.1.12.ebuild,
diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
index 21e9df9518d7..d4f8ead12f13 100644
--- a/net-mail/cyrus-imap-admin/Manifest
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -1,21 +1,11 @@
-MD5 8fce6621b04eb2bafc58a7702d59e2f4 cyrus-imap-admin-2.1.12.ebuild 2728
-MD5 f59c1444693fe2f2f9c6bf9b38f9e190 cyrus-imap-admin-2.1.9.ebuild 2081
-MD5 5ee56c97eafb863a67bd02ac320d5e60 cyrus-imap-admin-2.1.11-r1.ebuild 2160
-MD5 0fa6c391876de0e8cb2a25054b9ab801 cyrus-imap-admin-2.1.14.ebuild 3242
-MD5 473e09451ba38881fe43aa5e37fb1580 cyrus-imap-admin-2.1.11.ebuild 2126
-MD5 c7bbc4e39a85b7a8421f19dd01607224 cyrus-imap-admin-2.1.13.ebuild 2747
-MD5 6bd0885a8c378b04fd72b8c14b90472e ChangeLog 2793
+MD5 c553f24a76b6dccbfe38eccae5f224a3 cyrus-imap-admin-2.1.12.ebuild 2729
+MD5 904bf674baf9c6f980da02e356a57caa cyrus-imap-admin-2.1.14.ebuild 3242
+MD5 4db4a7093c61efe314ed3087134ba89a cyrus-imap-admin-2.1.13.ebuild 2747
+MD5 dd725e11cfb7522fe75f9c9499acdc75 ChangeLog 2793
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imap-admin-2.1.12-libwrap.patch 494
-MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
-MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-admin-2.1.11-r1 71
-MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
 MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
-MD5 cb725a049e69aaf090ea308ecf7b41ab files/digest-cyrus-imap-admin-2.1.9 70
-MD5 a26c1601811d0fd0cc3da0bae6d76693 files/imap-overflow.diff 871
-MD5 86761cabdb2db244e47b2185c083acc9 files/config.diff 389
 MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-admin-2.1.11 71
 MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-admin-2.1.12 71
 MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-admin-2.1.13 71
 MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imap-admin-2.1.14 155
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild
deleted file mode 100644
index 975b77ad4c6e..000000000000
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild,v 1.6 2003/09/18 22:35:09 max Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/cyrus-imapd-${PV}
-
-DESCRIPTION="Utilities to administer a Cyrus IMAP Server (includes Perl modules)"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc "
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
-	afs? ( >=net-fs/openafs-1.2.2 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	>=dev-lang/perl-5.6.1
-	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.2
-	>=sys-apps/tcp-wrappers-7.6
-	dev-perl/ExtUtils-MakeMaker
-	dev-perl/Term-ReadLine-Perl"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/configure.diff || die "patch failed"
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use afs && myconf="--with-afs" \
-		|| myconf="--without-afs"
-
-	use snmp && myconf="${myconf} --with-ucdsnmp=/usr" \
-		|| myconf="${myconf} --without-ucdsnmp"
-
-	use ssl && myconf="${myconf} --with-openssl=/usr" \
-		|| myconf="${myconf} --without-openssl"
-
-	use kerberos && myconf="${myconf} --with-krb --with-auth=krb" \
-		|| myconf="${myconf} --without-krb --with-auth=unix"
-
-	econf \
-		--enable-listext \
-		--with-cyrus-group=mail \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		--with-perl=/usr/bin/perl \
-		--enable-cyradm \
-		--with-libwrap=/usr \
-		${myconf} || die "bad ./configure"
-
-	# make depends break with -f... in CFLAGS
-	make depend CFLAGS="" || die "make depend problem"
-
-	cd ${S}/lib
-	make || die "compile problem"
-	cd ${S}/perl
-	make || die "compile problem"
-
-}
-
-src_install () {
-
-	echo "Installation of perl-modules"
-	export DESTDIR=${D}
-	cd ${S}/perl/imap
-	perl-module_src_prep
-	perl-module_src_compile
-	perl-module_src_install
-	cd ${S}/perl/sieve
-	perl-module_src_prep
-	perl-module_src_compile
-	perl-module_src_test
-	perl-module_src_install
-}
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild
deleted file mode 100644
index f58016ec5fdd..000000000000
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild,v 1.8 2003/09/18 22:35:09 max Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/cyrus-imapd-${PV}
-
-DESCRIPTION="Utilities to administer a Cyrus IMAP Server (includes Perl modules)"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc "
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
-	afs? ( >=net-fs/openafs-1.2.2 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	>=dev-lang/perl-5.6.1
-	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.2
-	>=sys-apps/tcp-wrappers-7.6
-	dev-perl/ExtUtils-MakeMaker"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/configure.diff || die "patch failed"
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use afs && myconf="--with-afs" \
-		|| myconf="--without-afs"
-
-	use snmp && myconf="${myconf} --with-ucdsnmp=/usr" \
-		|| myconf="${myconf} --without-ucdsnmp"
-
-	use ssl && myconf="${myconf} --with-openssl=/usr" \
-		|| myconf="${myconf} --without-openssl"
-
-	use kerberos && myconf="${myconf} --with-krb --with-auth=krb" \
-		|| myconf="${myconf} --without-krb --with-auth=unix"
-
-	econf \
-		--enable-listext \
-		--with-cyrus-group=mail \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		--with-perl=/usr/bin/perl \
-		--enable-cyradm \
-		--with-libwrap=/usr \
-		${myconf} || die "bad ./configure"
-
-	# make depends break with -f... in CFLAGS
-	make depend CFLAGS="" || die "make depend problem"
-
-	cd ${S}/lib
-	make || die "compile problem"
-	cd ${S}/perl
-	make || die "compile problem"
-}
-
-src_install () {
-	echo "Installation of perl-modules"
-	export DESTDIR=${D}
-	cd ${S}/perl/imap
-	perl-module_src_prep
-	perl-module_src_compile
-	perl-module_src_install
-	cd ${S}/perl/sieve
-	perl-module_src_prep
-	perl-module_src_compile
-	perl-module_src_test
-	perl-module_src_install
-}
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild
index 2669b076d2ca..097baa348e33 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild,v 1.9 2003/09/18 22:35:09 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild,v 1.10 2004/01/20 18:07:08 max Exp $
 
 inherit perl-module eutils
 
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild
index 337ff0f48274..117e2f5747da 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild,v 1.4 2003/09/18 22:35:09 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild,v 1.5 2004/01/20 18:07:08 max Exp $
 
 inherit perl-module eutils
 
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild
index 0cbe04777e7e..8662649c3d74 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild,v 1.5 2003/09/18 22:35:09 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild,v 1.6 2004/01/20 18:07:08 max Exp $
 
 inherit perl-module eutils
 
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild
deleted file mode 100644
index 846d49927d5e..000000000000
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild,v 1.10 2003/09/18 22:35:09 max Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/cyrus-imapd-${PV}
-
-DESCRIPTION="Utilities to administer a Cyrus IMAP Server (includes Perl modules)"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc "
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
-	afs? ( >=net-fs/openafs-1.2.2 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	>=dev-lang/perl-5.6.1
-	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
-	>=sys-libs/db-3.2
-	>=sys-libs/pam-0.75
-	>=dev-libs/cyrus-sasl-2.1.2
-	>=sys-apps/tcp-wrappers-7.6
-	dev-perl/ExtUtils-MakeMaker"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch < ${FILESDIR}/config.diff || die "patch failed"
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use afs && myconf="--with-afs" \
-		|| myconf="--without-afs"
-
-	use snmp && myconf="${myconf} --with-ucdsnmp=/usr" \
-		|| myconf="${myconf} --without-ucdsnmp"
-
-	use ssl && myconf="${myconf} --with-openssl=/usr" \
-		|| myconf="${myconf} --without-openssl"
-
-	use kerberos && myconf="${myconf} --with-krb --with-auth=krb" \
-		|| myconf="${myconf} --without-krb --with-auth=unix"
-
-	econf \
-		--enable-listext \
-		--with-cyrus-group=mail \
-		--enable-netscapehack \
-		--with-com_err=yes \
-		--with-perl \
-		--enable-cyradm \
-		${myconf} || die "bad ./configure"
-
-	# make depends break with -f... in CFLAGS
-	make depend CFLAGS="" || die "make depend problem"
-
-	cd ${S}/lib
-	make || die "compile problem"
-	cd ${S}/perl
-	make || die "compile problem"
-}
-
-src_install () {
-	echo "Installation of perl-modules"
-	export DESTDIR=${D}
-	cd ${S}/perl/imap
-	perl-module_src_prep
-	perl-module_src_compile
-	perl-module_src_install
-	cd ${S}/perl/sieve
-	perl-module_src_prep
-	perl-module_src_compile
-	perl-module_src_test
-	perl-module_src_install
-}
diff --git a/net-mail/cyrus-imap-admin/files/config.diff b/net-mail/cyrus-imap-admin/files/config.diff
deleted file mode 100644
index 49ac51c55e66..000000000000
--- a/net-mail/cyrus-imap-admin/files/config.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure	Tue Sep 10 15:30:44 2002
-+++ configure.modified	Tue Sep 10 15:30:34 2002
-@@ -4036,9 +4036,9 @@
- 
- 		
- 		;;
--	*)  OPENSSL_INC="-I${with_openssl}/include"
-+	*)  OPENSSL_INC=""
- 	    OPENSSL_LIB="-L${with_openssl}/lib"
--	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
-+	    CPPFLAGS="${CPPFLAGS}"
- 	    LDFLAGS="${LDFLAGS} ${OPENSSL_LIB}"
- 	    LIBS="${LIBS} -lssl -lcrypto";;
- esac
diff --git a/net-mail/cyrus-imap-admin/files/configure.diff b/net-mail/cyrus-imap-admin/files/configure.diff
deleted file mode 100644
index e7cb5757c64a..000000000000
--- a/net-mail/cyrus-imap-admin/files/configure.diff
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -urN cyrus-imapd-2.1.11/configure cyrus-imapd-2.1.11-modified/configure
---- cyrus-imapd-2.1.11/configure	2002-12-04 10:18:28.000000000 -0600
-+++ cyrus-imapd-2.1.11-modified/configure	2002-12-04 16:49:23.000000000 -0600
-@@ -1493,10 +1493,10 @@
-     CFLAGS="-Wall ${CFLAGS}"
-   GCC_VERSION=`$CC -v 2>&1 | sed -n -e '/version/s/.*version \([0-9]\)\..*/\1/p'`
-   if test "$GCC_VERSION" != "3"; then
--    CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-+    CPPFLAGS="${CPPFLAGS}"
-   fi
- else
--  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-+  CPPFLAGS="${CPPFLAGS}"
- fi 
- 
-   # this is CMU ADD LIBPATH
-@@ -1962,7 +1962,7 @@
-   if test -d $withval/include/db3; then
-     CPPFLAGS="-I$withval/include/db3 $CPPFLAGS"
-   else
--    CPPFLAGS="-I$withval/include $CPPFLAGS"
-+    CPPFLAGS="$CPPFLAGS"
-   fi
- else
-   # otherwise, check for ../include/db3
-@@ -3571,7 +3571,7 @@
- if test "${with_afs+set}" = set; then
-   withval="$with_afs"
-   with_afs="${withval}"
--	CFLAGS="${CFLAGS} -I${withval}/include"
-+	CFLAGS="${CFLAGS}"
- else
-   with_afs="/usr/local"
- fi
-@@ -3783,14 +3783,14 @@
- 	{ echo "configure: error: --enable-statickrb specified but --with-krb did not specify a valid directory" 1>&2; exit 1; }
-   fi 
- 
--  echo $ac_n "checking for des_ecb_encrypt in -ldes""... $ac_c" 1>&6
--echo "configure:3788: checking for des_ecb_encrypt in -ldes" >&5
-+  echo $ac_n "checking for des_ecb_encrypt in -ldes425""... $ac_c" 1>&6
-+echo "configure:3788: checking for des_ecb_encrypt in -ldes425" >&5
- ac_lib_var=`echo des'_'des_ecb_encrypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldes  $LIBS"
-+LIBS="-ldes425  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3796 "configure"
- #include "confdefs.h"
-@@ -3821,7 +3821,7 @@
-   if test "$with_statickrb" = "yes"; then
- 	    KRB_LIBS="$with_krb/lib/libdes.a"
- 	else
--	    KRB_LIBS="-ldes"
-+	    KRB_LIBS="-ldes425"
- 	fi
- else
-   echo "$ac_t""no" 1>&6
-@@ -4091,8 +4091,8 @@
- 
- 		
- 		;;
--	*)  OPENSSL_INC="-I${with_openssl}/include"
--	    OPENSSL_LIB="-L${with_openssl}/lib"
-+	*)  OPENSSL_INC=""
-+	    OPENSSL_LIB=""
- 	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
- 	    LDFLAGS="${LDFLAGS} ${OPENSSL_LIB}"
- 	    LIBS="${LIBS} -lssl -lcrypto";;
-@@ -4187,7 +4187,7 @@
-        *)  if test -d ${with_zephyr}/include/zephyr; then
-                ZEPHYR_CPPFLAGS="-I${with_zephyr}/include/zephyr"
-            else
--               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include"
-+               ZEPHYR_CPPFLAGS=""
-            fi
-            ZEPHYR_LIBS="-lzephyr";;
- esac
-@@ -4428,10 +4428,10 @@
-   *) # use whatever they told us, or whatever we found
-      COMPILE_ET="${with_com_err}/bin/compile_et"
-      COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
--     COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-+     COM_ERR_CPPFLAGS=""
-      # Ever get the feeling people hide this stuff on purpose?
-      if test -d "${with_com_err}/include/et" ; then
--       COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-+       COM_ERR_CPPFLAGS=""
-      fi
-      COMPILE_ET="${with_com_err}/bin/compile_et"
- esac
-@@ -5035,7 +5035,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
-+LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes425 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 5041 "configure"
- #include "confdefs.h"
-@@ -5073,7 +5073,7 @@
-      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
-   elif test "$gss_impl" = "heimdal"; then
--     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
-+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes425 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
-      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libdes.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-   else
-      gssapi="no"
-@@ -5235,7 +5235,7 @@
-             ac_cv_sasl_where_lib=${with_sasl}/lib
-             ac_cv_sasl_where_inc=${with_sasl}/include
- 
--	    DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
-+	    DYNSASLFLAGS=""
- 	    if test "$ac_cv_sasl_where_lib" != ""; then
- 		
-   # this is CMU ADD LIBPATH TO
-@@ -5247,7 +5247,7 @@
- 
- 	    fi
- 	    LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
--	    CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
-+	    CPPFLAGS="${cmu_saved_CPPFLAGS}"
- 	    LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
- 	fi
- 
-@@ -5909,7 +5909,7 @@
- 
-   if test "$with_libwrap" != no; then
-     if test -d "$with_libwrap"; then
--      CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
-+      CPPFLAGS="$CPPFLAGS"
-       LDFLAGS="$LDFLAGS -L${with_libwrap}/lib"
-     fi
-     cmu_save_LIBS="$LIBS"
-@@ -6055,7 +6055,7 @@
- 
-   if test "$with_ucdsnmp" != no; then
-     if test -d "$with_ucdsnmp"; then
--      CPPFLAGS="$CPPFLAGS -I${with_ucdsnmp}/include"
-+      CPPFLAGS="$CPPFLAGS"
-       LDFLAGS="$LDFLAGS -L${with_ucdsnmp}/lib"
-     fi
-     cmu_save_LIBS="$LIBS"
-@@ -6153,7 +6153,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lrpm -lpopt $LIBS"
-+LIBS="-lrpm -lpopt -lrpmdb -lrpmio $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6159 "configure"
- #include "confdefs.h"
-@@ -6181,7 +6181,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
-+  LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lrpmdb -lrpmio -lpopt"
- else
-   echo "$ac_t""no" 1>&6
- fi
-diff -urN cyrus-imapd-2.1.11/master/master.c cyrus-imapd-2.1.11-modified/master/master.c
---- cyrus-imapd-2.1.11/master/master.c	2002-11-01 10:44:33.000000000 -0600
-+++ cyrus-imapd-2.1.11-modified/master/master.c	2002-12-07 18:21:41.000000000 -0600
-@@ -103,6 +103,10 @@
- static int verbose = 0;
- static int listen_queue_backlog = 32;
- 
-+int allow_severity = LOG_DEBUG;
-+int deny_severity = LOG_ERR;
-+int hosts_ctl;
-+
- struct service *Services = NULL;
- int allocservices = 0;
- int nservices = 0;
diff --git a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.1.11 b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.1.11
deleted file mode 100644
index b65aec333d9e..000000000000
--- a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5742500ce1f6c655d1a49273d8b46261 cyrus-imapd-2.1.11.tar.gz 1646196
diff --git a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.1.11-r1 b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.1.11-r1
deleted file mode 100644
index b65aec333d9e..000000000000
--- a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.1.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5742500ce1f6c655d1a49273d8b46261 cyrus-imapd-2.1.11.tar.gz 1646196
diff --git a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.1.9 b/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.1.9
deleted file mode 100644
index 4613b3ff368d..000000000000
--- a/net-mail/cyrus-imap-admin/files/digest-cyrus-imap-admin-2.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09e9a5ad1d20c0650b3787b951d2e86f cyrus-imapd-2.1.9.tar.gz 1633031
diff --git a/net-mail/cyrus-imap-admin/files/imap-overflow.diff b/net-mail/cyrus-imap-admin/files/imap-overflow.diff
deleted file mode 100644
index c6ee0cac3864..000000000000
--- a/net-mail/cyrus-imap-admin/files/imap-overflow.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN cyrus-imapd-2.1.10/imap/imapparse.c cyrus-imapd-2.1.10-modified/imap/imapparse.c
---- cyrus-imapd-2.1.10/imap/imapparse.c	2002-12-03 17:08:02.000000000 -0600
-+++ cyrus-imapd-2.1.10-modified/imap/imapparse.c	2002-12-03 17:45:52.000000000 -0600
-@@ -97,7 +97,7 @@
- 	       struct buf *buf, int type)
- {
-     int c;
--    int i;
-+    unsigned int i;
-     unsigned int len = 0;
-     int sawdigit = 0;
-     int isnowait;
-@@ -228,6 +228,16 @@
- 	    if (c != EOF) prot_ungetc(c, pin);
- 	    return EOF;
- 	}
-+	if (len > 65536) {
-+	    if (isnowait) {
-+	        for (i = 0; i < len; i++)
-+	            c = prot_getc(pin);
-+	    }
-+	    prot_printf(pout, "* BAD Literal too large\r\n");
-+	    prot_flush(pout);
-+	    if (c != EOF) prot_ungetc(c, pin);
-+	    return EOF;
-+	}
- 	if (len >= buf->alloc) {
- 	    buf->alloc = len+1;
- 	    buf->s = xrealloc(buf->s, buf->alloc+1);
diff --git a/net-mail/cyrus-imap-admin/files/libsieve-overflow.diff b/net-mail/cyrus-imap-admin/files/libsieve-overflow.diff
deleted file mode 100644
index 6878a3074192..000000000000
--- a/net-mail/cyrus-imap-admin/files/libsieve-overflow.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN cyrus-imapd-2.1.10/sieve/addr.y cyrus-imapd-2.1.10-modified/sieve/addr.y
---- cyrus-imapd-2.1.10/sieve/addr.y	2002-12-03 17:08:02.000000000 -0600
-+++ cyrus-imapd-2.1.10-modified/sieve/addr.y	2002-12-03 17:06:38.000000000 -0600
-@@ -82,8 +82,9 @@
- /* copy address error message into buffer provided by sieve parser */
- int yyerror(char *s)
- {
--extern char addrerr[];
-+extern char addrerr[512];
- 
--    strcpy(addrerr, s);
-+    strncpy(addrerr, s, sizeof(addrerr)-1);
-+    addrerr[sizeof(addrerr)-1] = '\0';
-     return 0;
- }
-diff -urN cyrus-imapd-2.1.10/sieve/sieve.y cyrus-imapd-2.1.10-modified/sieve/sieve.y
---- cyrus-imapd-2.1.10/sieve/sieve.y	2002-12-03 17:08:02.000000000 -0600
-+++ cyrus-imapd-2.1.10-modified/sieve/sieve.y	2002-12-03 17:06:38.000000000 -0600
-@@ -810,7 +810,7 @@
-     addrptr = s;
-     addrerr[0] = '\0';	/* paranoia */
-     if (addrparse()) {
--	sprintf(errbuf, "address '%s': %s", s, addrerr);
-+	snprintf(errbuf, sizeof(errbuf), "address '%s': %s", s, addrerr);
- 	yyerror(errbuf);
- 	return 0;
-     }
-@@ -835,7 +835,7 @@
- 	   ;  controls, SP, and
- 	   ;  ":". */
- 	if (!((*h >= 33 && *h <= 57) || (*h >= 59 && *h <= 126))) {
--	    sprintf(errbuf, "header '%s': not a valid header", hdr);
-+	    snprintf(errbuf, sizeof(errbuf), "header '%s': not a valid header", hdr);
- 	    yyerror(errbuf);
- 	    return 0;
- 	}
-@@ -853,14 +853,14 @@
- 	if (strcmp(f, "\\seen") && strcmp(f, "\\answered") &&
- 	    strcmp(f, "\\flagged") && strcmp(f, "\\draft") &&
- 	    strcmp(f, "\\deleted")) {
--	    sprintf(errbuf, "flag '%s': not a system flag", f);
-+	    snprintf(errbuf, sizeof(errbuf), "flag '%s': not a system flag", f);
- 	    yyerror(errbuf);
- 	    return 0;
- 	}
- 	return 1;
-     }
-     if (!imparse_isatom(f)) {
--	sprintf(errbuf, "flag '%s': not a valid keyword", f);
-+	snprintf(errbuf, sizeof(errbuf), "flag '%s': not a valid keyword", f);
- 	yyerror(errbuf);
- 	return 0;
-     }
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index e57dbd05e5a4..95915ad86452 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -2,23 +2,18 @@ MD5 d59b0a5cf6ed32b1c7a0396bfac7eb2b cyrus-imapd-2.1.13.ebuild 6857
 MD5 dab068e909a550a7d3e6d3c8f9865f93 cyrus-imapd-2.1.15.ebuild 6969
 MD5 364f5458b670bd7020eb601e4d7db405 cyrus-imapd-2.1.12.ebuild 6850
 MD5 0602a253eccbf2b4595ae8c4d77e6f9c cyrus-imapd-2.1.15-r1.ebuild 7025
-MD5 60895c27e68f78431f7f7abd6f710d21 cyrus-imapd-2.1.11-r1.ebuild 6270
 MD5 0e5c5b2696c8eac9a40953e6f54ffacd cyrus-imapd-2.1.14.ebuild 6987
 MD5 ce4c0440ec57ed1de1e0ea1bf963a017 cyrus-imapd-2.2.3.ebuild 5228
 MD5 038d7c96897f6a10cc390bcee2aee5a9 ChangeLog 7950
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
 MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.3-db4.patch 1604
-MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
 MD5 0f386c3329ab147378de86a6f6c5a946 files/cyrus.rc6 570
 MD5 8ef2ff8ab18c79ca0fc96e0ec58e084a files/cyrus_2.conf 1340
 MD5 75e1eaf365d192b2992bac8d61595a79 files/cyrus-imapd-2.1.15-db4.patch 2759
 MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
-MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imapd-2.1.11-r1 71
 MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15-r1 155
 MD5 2ab208e74aeb2017de29d08632d2535b files/imapd.conf 868
 MD5 49f1642ca5d96db10f40a7c37a52dbd8 files/cyrus.rc6_2 631
-MD5 a26c1601811d0fd0cc3da0bae6d76693 files/imap-overflow.diff 871
 MD5 c6c0c19a7fdab57bee419fac05f20f36 files/cyrus-imapd-2.1.14-db4.patch 2756
 MD5 cbd00df5ef9288b1c830d95fa5e5831f files/gentestcrt.sh 8799
 MD5 ef68faa77664a88f939cee2f12019507 files/imap.pam 195