cleanup

14 files changed, 6 insertions, 606 deletions

diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index 70ced6903288..69329ed0f3eb 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -1,23 +1,10 @@
-MD5 eb38708f31d37fcc9768211e3be1f04a uw-imap-2001a-r2.ebuild 2510
-MD5 0b42f0eba35868989c1bcbf656390d8f uw-imap-2002a.ebuild 2461
-MD5 b9ed10cd983586d6dbad212f06fa8bbd uw-imap-2002c.ebuild 2573
-MD5 c43aa0f40995b82920654304c199aa05 uw-imap-2001a-r3.ebuild 2794
-MD5 17dcc1630d3b37e682716540453f3f8c uw-imap-2002b.ebuild 2487
 MD5 2f60f5a6ce013c5af9d78d91469a2e67 ChangeLog 3680
-MD5 8da6aecf662732bf7d77be497b1deb73 uw-imap-2002d.ebuild 2571
+MD5 61a9d8cfe9608ffca0dcdc7d5f1a1baf uw-imap-2002d.ebuild 2566
+MD5 f756533666f0e8b80583a709d4891be1 files/uw-imap.pam 244
+MD5 5627c6d3e66200c457bf24c47a02c6e9 files/uw-imap.pam-system-auth 344
+MD5 16682cd88c80588d22d34dd08678f1da files/uw-imap.xinetd 492
+MD5 c1398d15a74439d23bda99c4960ca625 files/uw-imaps.xinetd 487
 MD5 a64376593da1d4ed7900ab825abc42dc files/uw-ipop2.xinetd 564
+MD5 8e3bbe0dafb99203c2029f531ce4ec8a files/uw-ipop3.xinetd 473
 MD5 c35bb5e9cfa6e278eccde33e1a6e1b4c files/uw-ipop3s.xinetd 470
-MD5 16682cd88c80588d22d34dd08678f1da files/uw-imap.xinetd 492
-MD5 7c4b4a6a777e1355796e8b01c59f2f78 files/gentoo-2001a-r3.diff 1436
-MD5 6f57109ecba31f54f53193f5526d52b4 files/digest-uw-imap-2002a 62
-MD5 bdb52c8ffd331360d9b8451c9b069f6c files/digest-uw-imap-2002b 62
-MD5 ff493c5938360a4411843914673d4a05 files/digest-uw-imap-2002c 63
 MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-uw-imap-2002d 62
-MD5 5627c6d3e66200c457bf24c47a02c6e9 files/uw-imap.pam-system-auth 344
-MD5 076df68c58666d62e9fbebb942a75680 files/gentoo.diff 1428
-MD5 8e3bbe0dafb99203c2029f531ce4ec8a files/uw-ipop3.xinetd 473
-MD5 c1398d15a74439d23bda99c4960ca625 files/uw-imaps.xinetd 487
-MD5 5527b2574df61826be5f1f6c21518260 files/imap-2001a.4-patch-with-delete-fix.bz2 29496
-MD5 f756533666f0e8b80583a709d4891be1 files/uw-imap.pam 244
-MD5 1c00a25b2ff584c8c9d98eedc1648f4a files/digest-uw-imap-2001a-r2 62
-MD5 1c00a25b2ff584c8c9d98eedc1648f4a files/digest-uw-imap-2001a-r3 62
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2001a-r2 b/net-mail/uw-imap/files/digest-uw-imap-2001a-r2
deleted file mode 100644
index b752e9d05f97..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2001a-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42c5c8d049c209b15513a4f6ebba34d2 imap-2001a.tar.Z 1959777
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2001a-r3 b/net-mail/uw-imap/files/digest-uw-imap-2001a-r3
deleted file mode 100644
index b752e9d05f97..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2001a-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42c5c8d049c209b15513a4f6ebba34d2 imap-2001a.tar.Z 1959777
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2002a b/net-mail/uw-imap/files/digest-uw-imap-2002a
deleted file mode 100644
index 7244af10f0c1..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2002a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ceb02ccac5324e3c6dfcfac49d81f26 imap-2002a.tar.Z 2160968
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2002b b/net-mail/uw-imap/files/digest-uw-imap-2002b
deleted file mode 100644
index 674199950f96..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2002b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0da8616dec7d49cba860aeae43d966b4 imap-2002b.tar.Z 2168106
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2002c b/net-mail/uw-imap/files/digest-uw-imap-2002c
deleted file mode 100644
index 1b9bd49be383..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2002c
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90c255dcf3ee373e3fb174ea5d820f4d imap-2002c1.tar.Z 2111395
diff --git a/net-mail/uw-imap/files/gentoo-2001a-r3.diff b/net-mail/uw-imap/files/gentoo-2001a-r3.diff
deleted file mode 100644
index 9343a51d8ac0..000000000000
--- a/net-mail/uw-imap/files/gentoo-2001a-r3.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN imap-2001a/Makefile imap-2001a-modified/Makefile
---- imap-2001a/Makefile	Mon Oct 22 23:46:33 2001
-+++ imap-2001a-modified/Makefile	Sat Aug 17 19:01:19 2002
-@@ -212,7 +212,7 @@
- #	gradually-increasing intervals, starting at 2800-2900, and becoming
- #	permanent at 48,300.
- 
--EXTRACFLAGS=
-+EXTRACFLAGS=-DDISABLE_REVERSE_DNS_LOOKUP
- 
- 
- # Extra linker flags (additional/alternative libraries, etc.)
-diff -urN imap-2001a/src/imapd/imapd.c imap-2001a-modified/src/imapd/imapd.c
---- imap-2001a/src/imapd/imapd.c	Wed Nov 14 17:26:07 2001
-+++ imap-2001a-modified/src/imapd/imapd.c	Sat Aug 17 18:55:51 2002
-@@ -37,7 +37,7 @@
- 
- #define MINUTES *60
- 
--#define LOGINTIMEOUT 3 MINUTES	/* not logged in autologout timer */
-+#define LOGINTIMEOUT 1 MINUTES	/* not logged in autologout timer */
- #define TIMEOUT 30 MINUTES	/* RFC 2060 minimum autologout timer */
- #define ALERTTIMER 1 MINUTES	/* alert check timer */
- #define SHUTDOWNTIMER 1 MINUTES	/* shutdown dally timer */
-diff -urN imap-2001a/src/osdep/unix/Makefile imap-2001a-modified/src/osdep/unix/Makefile
---- imap-2001a/src/osdep/unix/Makefile	Tue Nov  6 18:16:43 2001
-+++ imap-2001a-modified/src/osdep/unix/Makefile	Sat Aug 17 19:14:37 2002
-@@ -28,8 +28,8 @@
- 
- # Extended flags needed for SSL.  You may need to modify.
- 
--SSLDIR=/usr/local/src/openssl
--SSLCERTS=$(SSLDIR)/certs
-+SSLDIR=/usr
-+SSLCERTS=$(SSLDIR)/lib/ssl/certs
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
- 
diff --git a/net-mail/uw-imap/files/gentoo.diff b/net-mail/uw-imap/files/gentoo.diff
deleted file mode 100644
index ae8f9a660cb6..000000000000
--- a/net-mail/uw-imap/files/gentoo.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN imap-2001a/Makefile imap-2001a-modified/Makefile
---- imap-2001a/Makefile	Mon Oct 22 23:46:33 2001
-+++ imap-2001a-modified/Makefile	Sat Aug 17 19:01:19 2002
-@@ -212,7 +212,7 @@
- #	gradually-increasing intervals, starting at 2800-2900, and becoming
- #	permanent at 48,300.
- 
--EXTRACFLAGS=
-+EXTRACFLAGS=-DDISABLE_REVERSE_DNS_LOOKUP
- 
- 
- # Extra linker flags (additional/alternative libraries, etc.)
-diff -urN imap-2001a/src/imapd/imapd.c imap-2001a-modified/src/imapd/imapd.c
---- imap-2001a/src/imapd/imapd.c	Wed Nov 14 17:26:07 2001
-+++ imap-2001a-modified/src/imapd/imapd.c	Sat Aug 17 18:55:51 2002
-@@ -37,7 +37,7 @@
- 
- #define MINUTES *60
- 
--#define LOGINTIMEOUT 3 MINUTES	/* not logged in autologout timer */
-+#define LOGINTIMEOUT 1 MINUTES	/* not logged in autologout timer */
- #define TIMEOUT 30 MINUTES	/* RFC 2060 minimum autologout timer */
- #define ALERTTIMER 1 MINUTES	/* alert check timer */
- #define SHUTDOWNTIMER 1 MINUTES	/* shutdown dally timer */
-diff -urN imap-2001a/src/osdep/unix/Makefile imap-2001a-modified/src/osdep/unix/Makefile
---- imap-2001a/src/osdep/unix/Makefile	Tue Nov  6 18:16:43 2001
-+++ imap-2001a-modified/src/osdep/unix/Makefile	Sat Aug 17 19:14:37 2002
-@@ -28,8 +28,8 @@
- 
- # Extended flags needed for SSL.  You may need to modify.
- 
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
-+SSLDIR=/usr
-+SSLCERTS=$(SSLDIR)/lib/ssl/certs
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
- 
diff --git a/net-mail/uw-imap/files/imap-2001a.4-patch-with-delete-fix.bz2 b/net-mail/uw-imap/files/imap-2001a.4-patch-with-delete-fix.bz2
deleted file mode 100644
index 155041741ab7..000000000000
--- a/net-mail/uw-imap/files/imap-2001a.4-patch-with-delete-fix.bz2
+++ /dev/null
diff --git a/net-mail/uw-imap/uw-imap-2001a-r2.ebuild b/net-mail/uw-imap/uw-imap-2001a-r2.ebuild
deleted file mode 100644
index e8ee97c8e78a..000000000000
--- a/net-mail/uw-imap/uw-imap-2001a-r2.ebuild
+++ /dev/null
@@ -1,94 +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/uw-imap/uw-imap-2001a-r2.ebuild,v 1.11 2003/03/20 17:21:05 gmsoft Exp $
-
-PN0=imap
-S=${WORKDIR}/${PN0}-${PV}
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/${PN0}/${PN0}-${PV}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc >=sys-libs/pam-0.72 ssl? ( dev-libs/openssl )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc hppa"
-IUSE="ssl"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src/osdep/unix/
-	sed "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:" Makefile > Makefile.bak
-	mv Makefile.bak Makefile
-	cd ${S}
-	patch -p1 < ${FILESDIR}/gentoo.diff || die
-}
-
-src_compile() {                           
-	if use ssl; then
-		cd ${S}
-		make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || die
-	# I was SO tempted to add -DY4KBUGFIX to the EXTRACFLAGS... 
-	# but I didn't.  S0meday s00n.
-
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		make lnp EXTRACFLAGS=-DMAILSUBDIR=\"mail\" || die
-	fi
-}
-
-src_install() {                               
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		dodir /usr/ssl/certs
-		mv imapd.pem ${D}/usr/ssl/certs
-		mv ipop3d.pem ${D}/usr/ssl/certs
-	fi
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/FAQ docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-        # gentoo config stuff
-	insinto /etc/pam.d
-	newins ${FILESDIR}/uw-imap.pam-system-auth imap
-	newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}
diff --git a/net-mail/uw-imap/uw-imap-2001a-r3.ebuild b/net-mail/uw-imap/uw-imap-2001a-r3.ebuild
deleted file mode 100644
index c10b6e2dfcc2..000000000000
--- a/net-mail/uw-imap/uw-imap-2001a-r3.ebuild
+++ /dev/null
@@ -1,113 +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/uw-imap/uw-imap-2001a-r3.ebuild,v 1.9 2003/03/20 17:17:15 gmsoft Exp $
-
-PN0=imap
-S=${WORKDIR}/${PN0}-${PV}
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/${PN0}/${PN0}-${PV}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc hppa"
-IUSE="ssl mbox"
-
-PROVIDE="virtual/imapd"
-DEPEND="!net-mail/vimap
-	virtual/glibc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Set CFLAGS
-	cd ${S}/src/osdep/unix/
-	sed "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:" Makefile > Makefile.bak
-	mv Makefile.bak Makefile
-
-	cd ${S}
-
-	# Use .maildir by default
-	if [ -z "`use mbox`" ]; then
-		bzcat ${FILESDIR}/imap-2001a.4-patch-with-delete-fix.bz2 \
-			| patch -p1 || die "patch failed"
-		# SSL cleanup
-		patch -p1 < ${FILESDIR}/gentoo-2001a-r3.diff \
-			|| die "patch failed"
-		export EXTRACFLAGS=-DMAILSUBDIR=\".maildir\"
-	else
-		patch -p1 < ${FILESDIR}/gentoo.diff \
-			|| die "patch failed"
-		export EXTRACFLAGS=-DMAILSUBDIR=\"mail\"
-	fi
-}
-
-src_compile() {                           
-	if use ssl; then
-		cd ${S}
-		make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix \
-			|| die
-
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		make lnp || die
-	fi
-}
-
-src_install() {                               
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		dodir /usr/ssl/certs
-		mv imapd.pem ${D}/usr/ssl/certs
-		mv ipop3d.pem ${D}/usr/ssl/certs
-	fi
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/FAQ docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-        # gentoo config stuff
-	insinto /etc/pam.d
-	newins ${FILESDIR}/uw-imap.pam-system-auth imap
-	newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}
diff --git a/net-mail/uw-imap/uw-imap-2002a.ebuild b/net-mail/uw-imap/uw-imap-2002a.ebuild
deleted file mode 100644
index 57bd99b6b4f1..000000000000
--- a/net-mail/uw-imap/uw-imap-2002a.ebuild
+++ /dev/null
@@ -1,98 +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/uw-imap/uw-imap-2002a.ebuild,v 1.4 2003/03/20 17:17:15 gmsoft Exp $
-
-S=${WORKDIR}/imap-2002a
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/imap-2002a.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa"
-IUSE="ssl mbox"
-
-PROVIDE="virtual/imapd"
-DEPEND="virtual/glibc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
-		-e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
-		-e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
-		< Makefile.orig > Makefile
-	cd ${S}
-}
-
-src_compile() {                           
-	if use ssl; then
-		cd ${S}
-		make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix.nopwd \
-			|| die
-
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		make lnp || die
-	fi
-}
-
-src_install() {                               
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-        # gentoo config stuff
-	insinto /etc/pam.d
-	newins ${FILESDIR}/uw-imap.pam-system-auth imap
-	newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}
diff --git a/net-mail/uw-imap/uw-imap-2002b.ebuild b/net-mail/uw-imap/uw-imap-2002b.ebuild
deleted file mode 100644
index d1b0b3192baf..000000000000
--- a/net-mail/uw-imap/uw-imap-2002b.ebuild
+++ /dev/null
@@ -1,99 +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/uw-imap/uw-imap-2002b.ebuild,v 1.5 2003/04/15 21:39:29 agriffis Exp $
-
-S=${WORKDIR}/imap-2002b
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/imap-2002b.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha"
-IUSE="ssl mbox"
-
-PROVIDE="virtual/imapd"
-DEPEND="!net-mail/vimap
-	virtual/glibc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
-		-e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
-		-e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
-		< Makefile.orig > Makefile
-	cd ${S}
-}
-
-src_compile() {                           
-	if use ssl; then
-		cd ${S}
-		make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix.nopwd \
-			|| die
-
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		make lnp || die
-	fi
-}
-
-src_install() {                               
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-        # gentoo config stuff
-	insinto /etc/pam.d
-	newins ${FILESDIR}/uw-imap.pam-system-auth imap
-	newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}
diff --git a/net-mail/uw-imap/uw-imap-2002c.ebuild b/net-mail/uw-imap/uw-imap-2002c.ebuild
deleted file mode 100644
index 06b659bab939..000000000000
--- a/net-mail/uw-imap/uw-imap-2002c.ebuild
+++ /dev/null
@@ -1,102 +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/uw-imap/uw-imap-2002c.ebuild,v 1.3 2003/05/28 05:21:04 robbat2 Exp $
-
-S=${WORKDIR}/imap-2002c1
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/imap-2002c1.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~hppa ~alpha"
-IUSE="ssl mbox"
-
-PROVIDE="virtual/imapd"
-DEPEND="!net-mail/vimap
-	virtual/glibc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S} 
-
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e 's,-g -fno-omit-frame-pointer -O6,${CFLAGS},g' \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		< Makefile.orig > Makefile
-	cd ${S}
-}
-
-src_compile() {                           
-	if use ssl; then
-		cd ${S}
-		yes | make lnp SSLTYPE=unix || die
-
-		local i
-		for i in imapd ipop3d; do
-			umask 077
-			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
-			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
-			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
-				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-			cat $$PEM1 >  ${i}.pem
-			echo ""    >> ${i}.pem
-			cat $$PEM2 >> ${i}.pem
-			rm $$PEM1 $$PEM2
-			umask 022
-		done
-	else
-		yes | make lnp SSLTYPE=none || die
-	fi
-}
-
-src_install() {                               
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
-	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
-	dolib.a c-client/c-client.a
-	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-
-	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	# gentoo config stuff
-	insinto /etc/pam.d
-	newins ${FILESDIR}/uw-imap.pam-system-auth imap
-	newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/uw-imap.xinetd  imap
-	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
-	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
-	newins ${FILESDIR}/uw-ipop3s.xinetd ipop3s
-	newins ${FILESDIR}/uw-imaps.xinetd imaps
-}