Ebuild cleanup. 2004g-r2 stable on x86.

(Portage version: 2.1_pre1)

16 files changed, 9 insertions, 975 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index 71a4943092dc..5cfcb9306cac 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/uw-imap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.82 2005/10/07 11:43:51 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.83 2005/12/19 18:30:20 ticho Exp $
+
+  19 Dec 2005; Andrej Kacian <ticho@gentoo.org> -files/uw-imap.pam,
+  -files/uw-imap.pam-system-auth, -uw-imap-2004a.ebuild,
+  -uw-imap-2004c.ebuild, -uw-imap-2004c-r1.ebuild, -uw-imap-2004c-r2.ebuild,
+  -uw-imap-2004c-r3.ebuild, -uw-imap-2004g.ebuild, uw-imap-2004g-r2.ebuild:
+  Ebuild cleanup. 2004g-r2 stable on x86.
 
   07 Oct 2005; Simon Stelling <blubb@gentoo.org> uw-imap-2004g-r1.ebuild:
   marked stable on amd64 wrt bug 108206
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2004a b/net-mail/uw-imap/files/digest-uw-imap-2004a
deleted file mode 100644
index 158d1b2e7ab5..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2004a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34d2c66271302cd2f926094fb5e8705d imap-2004a.tar.Z 2224181
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2004c b/net-mail/uw-imap/files/digest-uw-imap-2004c
deleted file mode 100644
index 3e0d89c32ffc..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2004c
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f0a1a2abfa4b1ed8074ce023724416f3 imap-2004c1.tar.Z 2227092
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2004c-r1 b/net-mail/uw-imap/files/digest-uw-imap-2004c-r1
deleted file mode 100644
index 3e0d89c32ffc..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2004c-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f0a1a2abfa4b1ed8074ce023724416f3 imap-2004c1.tar.Z 2227092
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2004c-r2 b/net-mail/uw-imap/files/digest-uw-imap-2004c-r2
deleted file mode 100644
index 3e0d89c32ffc..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2004c-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f0a1a2abfa4b1ed8074ce023724416f3 imap-2004c1.tar.Z 2227092
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2004c-r3 b/net-mail/uw-imap/files/digest-uw-imap-2004c-r3
deleted file mode 100644
index 3e0d89c32ffc..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2004c-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f0a1a2abfa4b1ed8074ce023724416f3 imap-2004c1.tar.Z 2227092
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2004g b/net-mail/uw-imap/files/digest-uw-imap-2004g
deleted file mode 100644
index 08b5c3d7e20d..000000000000
--- a/net-mail/uw-imap/files/digest-uw-imap-2004g
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a80f58d8d6a0979c13714ae69050020 imap-2004g.tar.Z 2246713
diff --git a/net-mail/uw-imap/files/uw-imap.pam b/net-mail/uw-imap/files/uw-imap.pam
deleted file mode 100644
index e802b4115ba4..000000000000
--- a/net-mail/uw-imap/files/uw-imap.pam
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imap.pam,v 1.2 2002/06/07 02:01:38 woodchip Exp $
-auth       required     pam_pwdb.so shadow nullok
-account    required     pam_pwdb.so
-session    required     pam_pwdb.so
diff --git a/net-mail/uw-imap/files/uw-imap.pam-system-auth b/net-mail/uw-imap/files/uw-imap.pam-system-auth
deleted file mode 100644
index b90d2cbaee38..000000000000
--- a/net-mail/uw-imap/files/uw-imap.pam-system-auth
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imap.pam-system-auth,v 1.1 2002/06/07 02:01:38 woodchip Exp $
-auth       required     pam_nologin.so
-auth       required     pam_stack.so service=system-auth
-account    required     pam_stack.so service=system-auth
-session    required     pam_stack.so service=system-auth
diff --git a/net-mail/uw-imap/uw-imap-2004a.ebuild b/net-mail/uw-imap/uw-imap-2004a.ebuild
deleted file mode 100644
index 841b136e4908..000000000000
--- a/net-mail/uw-imap/uw-imap-2004a.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004a.ebuild,v 1.8 2005/01/03 07:40:38 josejx Exp $
-
-inherit flag-o-matic
-
-MY_P=imap-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc ppc hppa alpha amd64"
-IUSE="ipv6 ssl pic kerberos"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-DEPEND="!net-mail/vimap
-	!virtual/imap-c-client
-	virtual/libc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )"
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-
-	use pic || use alpha && append-flags -fPIC
-
-	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
-
-	# Uncomment this for MBX support
-	#cp Makefile Makefile.orig2
-	#sed \
-	#	-e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
-	#	-e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
-	#	< Makefile.orig2 > Makefile
-	cd ${S}
-}
-
-src_compile() {
-	local mymake
-	local ipver
-	ipver="IP=4"
-
-	use ipv6 && echo ipv6
-	use kerberos && echo kerberos
-	use ssl && echo ssl
-	use ipv6 && ipver="IP=6"
-	use kerberos \
-	  && mymake="EXTRAAUTHENTICATORS=gss"
-	if use ssl; then
-		cd ${S}
-		echo ${mymake}
-		yes | make lnp ${mymake} ${ipver} 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 ${mymake} ${ipver} SSLTYPE=none || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
-	dobin mailutil/mailutil mlock/mlock mtest/mtest
-
-	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.8 src/imapd/imapd.8
-	doman src/dmail/dmail.1 src/tmail/tmail.1 src/mailutil/mailutil.1
-
-	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
-}
diff --git a/net-mail/uw-imap/uw-imap-2004c-r1.ebuild b/net-mail/uw-imap/uw-imap-2004c-r1.ebuild
deleted file mode 100644
index 7ce35b46e603..000000000000
--- a/net-mail/uw-imap/uw-imap-2004c-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c-r1.ebuild,v 1.2 2005/03/03 02:39:53 ticho Exp $
-
-inherit flag-o-matic
-
-MY_P="imap-${PV}1"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~hppa ~alpha ~amd64"
-IUSE="ipv6 ssl pic kerberos"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-DEPEND="!net-mail/vimap
-	!virtual/imap-c-client
-	virtual/libc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )"
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-
-	cd ${S}
-
-	if use amd64; then
-		# Now we must make all the individual Makefiles use different CFLAGS,
-		# otherwise they would all use -fPIC
-		sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
-			src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
-			src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-			|| die "sed failed patching Makefile CFLAGS."
-		# Now there is only c-client left, which should be built with -fPIC
-		append-flags -fPIC
-		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${P}-amd64-so-fix.patch
-	fi
-
-	use pic || use alpha && append-flags -fPIC
-
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		< Makefile.orig > Makefile
-
-	# Uncomment this for MBX support
-	#cp Makefile Makefile.orig2
-	#sed \
-	#	-e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
-	#	-e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
-	#	< Makefile.orig2 > Makefile
-}
-
-src_compile() {
-	local mymake
-	local ipver
-	ipver="IP=4"
-
-	use ipv6 && echo ipv6
-	use kerberos && echo kerberos
-	use ssl && echo ssl
-	use ipv6 && ipver="IP=6"
-	use kerberos \
-	  && mymake="EXTRAAUTHENTICATORS=gss"
-	if use ssl; then
-		cd ${S}
-		echo ${mymake}
-		yes | make lnp ${mymake} ${ipver} SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" || 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 ${mymake} ${ipver} SSLTYPE=none EXTRACFLAGS="${CFLAGS}" || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
-	dobin mailutil/mailutil mlock/mlock mtest/mtest
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	if use amd64; then
-		dolib.so c-client/libc-client.so*
-		cd ${D}/usr/$(get_libdir)
-		ln -s libc-client.so.1.0.0 libc-client.so.1
-		ln -s libc-client.so.1 libc-client.so
-	fi
-
-	cd ${S}
-
-	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/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
-
-	doman src/ipopd/ipopd.8 src/imapd/imapd.8
-	doman src/dmail/dmail.1 src/tmail/tmail.1 src/mailutil/mailutil.1
-
-	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
-}
diff --git a/net-mail/uw-imap/uw-imap-2004c-r2.ebuild b/net-mail/uw-imap/uw-imap-2004c-r2.ebuild
deleted file mode 100644
index a9d81bd34ce2..000000000000
--- a/net-mail/uw-imap/uw-imap-2004c-r2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c-r2.ebuild,v 1.2 2005/02/18 22:08:58 ferdy Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="imap-${PV}1"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha ~amd64"
-IUSE="ipv6 ssl pic kerberos"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-DEPEND="!net-mail/vimap
-	!virtual/imap-c-client
-	virtual/libc
-	>=sys-libs/pam-0.72
-	>=net-mail/mailbase-0.00-r8
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )"
-
-pkg_setup() {
-	# ewarn people not using pam with this file
-	if ! built_with_use net-mail/mailbase pam;
-	then
-		echo
-		ewarn "It is recommended to have the net-mail/mailbase package"
-		ewarn "  built with the pam use flag activated. Please rebuild"
-		ewarn "  net-mail/mailbase with pam activated."
-		echo
-		epause 3
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-
-	cd ${S}
-
-	if use amd64; then
-		# Now we must make all the individual Makefiles use different CFLAGS,
-		# otherwise they would all use -fPIC
-		sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
-			src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
-			src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-			|| die "sed failed patching Makefile CFLAGS."
-		# Now there is only c-client left, which should be built with -fPIC
-		append-flags -fPIC
-		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${P}-amd64-so-fix.patch
-	fi
-
-	use pic || use alpha && append-flags -fPIC
-
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		< Makefile.orig > Makefile
-
-	# Uncomment this for MBX support
-	#cp Makefile Makefile.orig2
-	#sed \
-	#	-e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
-	#	-e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
-	#	< Makefile.orig2 > Makefile
-}
-
-src_compile() {
-	local mymake
-	local ipver
-	ipver="IP=4"
-
-	use ipv6 && echo ipv6
-	use kerberos && echo kerberos
-	use ssl && echo ssl
-	use ipv6 && ipver="IP=6"
-	use kerberos \
-	  && mymake="EXTRAAUTHENTICATORS=gss"
-	if use ssl; then
-		cd ${S}
-		echo ${mymake}
-		yes | make lnp ${mymake} ${ipver} SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" || 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 ${mymake} ${ipver} SSLTYPE=none EXTRACFLAGS="${CFLAGS}" || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
-	dobin mailutil/mailutil mlock/mlock mtest/mtest
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	if use amd64; then
-		dolib.so c-client/libc-client.so*
-		cd ${D}/usr/$(get_libdir)
-		ln -s libc-client.so.1.0.0 libc-client.so.1
-		ln -s libc-client.so.1 libc-client.so
-	fi
-
-	cd ${S}
-
-	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/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
-
-	doman src/ipopd/ipopd.8 src/imapd/imapd.8
-	doman src/dmail/dmail.1 src/tmail/tmail.1 src/mailutil/mailutil.1
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	# gentoo config stuff
-
-	## Those are now provided by mailbase
-	#   but if mailbase didn't provide them, install needed files
-	if ! built_with_use net-mail/mailbase pam;
-	then
-		insinto /etc/pam.d
-		newins ${FILESDIR}/uw-imap.pam-system-auth imap
-		newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	fi
-
-	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
-}
diff --git a/net-mail/uw-imap/uw-imap-2004c-r3.ebuild b/net-mail/uw-imap/uw-imap-2004c-r3.ebuild
deleted file mode 100644
index 7fc39b9f4e6f..000000000000
--- a/net-mail/uw-imap/uw-imap-2004c-r3.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c-r3.ebuild,v 1.13 2005/06/27 07:41:49 corsair Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="imap-${PV}1"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="ipv6 ssl pic kerberos clearpasswd"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-DEPEND="!net-mail/vimap
-	!virtual/imap-c-client
-	virtual/libc
-	>=sys-libs/pam-0.72
-	>=net-mail/mailbase-0.00-r8
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )"
-
-pkg_setup() {
-	echo
-	if use clearpasswd; then
-		ewarn "Building uw-imap with cleartext LOGIN allowed. Disable \"clearpasswd\" USE"
-		ewarn "flag to restrict cleartext LOGIN to SSL/TLS sessions only."
-	else
-		if use ssl; then
-			ewarn "Building uw-imap with cleartext LOGIN restricted to SSL/TLS sessions only."
-			ewarn "Enable \"clearpasswd\" flag to allow unrestricted cleartext LOGIN."
-		else
-			ewarn "You have disabled SSL for uw-imap, but want cleartext passwords restricted to"
-			ewarn "SSL/TLS sessions only. Either enable \"ssl\" USE flag, or \"clearpasswd\""
-			ewarn "USE flag."
-			die "Impossible USE flag combination, see above message"
-		fi
-	fi
-	echo
-	# ewarn people not using pam with this file
-	if ! built_with_use net-mail/mailbase pam ; then
-		echo
-		ewarn "It is needed to have the net-mail/mailbase package"
-		ewarn "  built with the pam use flag activated. Please rebuild"
-		ewarn "  net-mail/mailbase with pam activated."
-		echo
-		die "mailbase has to be built with pam use flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-
-	cd ${S}
-
-	if use amd64; then
-		# Now we must make all the individual Makefiles use different CFLAGS,
-		# otherwise they would all use -fPIC
-		sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
-			src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
-			src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-			|| die "sed failed patching Makefile CFLAGS."
-		# Now there is only c-client left, which should be built with -fPIC
-		append-flags -fPIC
-		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${P}-amd64-so-fix.patch
-	fi
-
-	use pic || use alpha && append-flags -fPIC
-
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		< Makefile.orig > Makefile
-
-	# Uncomment this for MBX support
-	#cp Makefile Makefile.orig2
-	#sed \
-	#	-e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
-	#	-e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
-	#	< Makefile.orig2 > Makefile
-}
-
-src_compile() {
-	local mymake
-	local ipver
-	ipver="IP=4"
-
-	use ipv6 && echo ipv6
-	use kerberos && echo kerberos
-	use ssl && echo ssl
-	use ipv6 && ipver="IP=6"
-	use kerberos \
-	  && mymake="EXTRAAUTHENTICATORS=gss"
-	if use ssl; then
-		cd ${S}
-		echo ${mymake}
-		if use clearpasswd; then
-			yes | make lnp ${mymake} ${ipver} SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" || die
-		else
-			yes | make lnp ${mymake} ${ipver} SSLTYPE=unix.nopwd EXTRACFLAGS="${CFLAGS}" || die
-		fi
-
-
-		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 ${mymake} ${ipver} SSLTYPE=none EXTRACFLAGS="${CFLAGS}" || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
-	dobin mailutil/mailutil mlock/mlock mtest/mtest
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	if use amd64; then
-		dolib.so c-client/libc-client.so.1.0.0
-		cd ${D}/usr/$(get_libdir)
-		ln -s libc-client.so.1.0.0 libc-client.so.1
-		ln -s libc-client.so.1.0.0 libc-client.so
-	fi
-
-	cd ${S}
-
-	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/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
-
-	doman src/ipopd/ipopd.8 src/imapd/imapd.8
-	doman src/dmail/dmail.1 src/tmail/tmail.1 src/mailutil/mailutil.1
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	# gentoo config stuff
-	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
-}
diff --git a/net-mail/uw-imap/uw-imap-2004c.ebuild b/net-mail/uw-imap/uw-imap-2004c.ebuild
deleted file mode 100644
index 8c6adf1864af..000000000000
--- a/net-mail/uw-imap/uw-imap-2004c.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c.ebuild,v 1.6 2005/02/01 20:20:24 tester Exp $
-
-inherit flag-o-matic
-
-MY_P="imap-${PV}1"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc ppc ~hppa alpha amd64"
-IUSE="ipv6 ssl pic kerberos"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-DEPEND="!net-mail/vimap
-	!virtual/imap-c-client
-	virtual/libc
-	>=sys-libs/pam-0.72
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )"
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-
-	use pic || use alpha && append-flags -fPIC
-
-	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
-
-	# Uncomment this for MBX support
-	#cp Makefile Makefile.orig2
-	#sed \
-	#	-e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
-	#	-e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
-	#	< Makefile.orig2 > Makefile
-	cd ${S}
-}
-
-src_compile() {
-	local mymake
-	local ipver
-	ipver="IP=4"
-
-	use ipv6 && echo ipv6
-	use kerberos && echo kerberos
-	use ssl && echo ssl
-	use ipv6 && ipver="IP=6"
-	use kerberos \
-	  && mymake="EXTRAAUTHENTICATORS=gss"
-	if use ssl; then
-		cd ${S}
-		echo ${mymake}
-		yes | make lnp ${mymake} ${ipver} 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 ${mymake} ${ipver} SSLTYPE=none || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
-	dobin mailutil/mailutil mlock/mlock mtest/mtest
-
-	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.8 src/imapd/imapd.8
-	doman src/dmail/dmail.1 src/tmail/tmail.1 src/mailutil/mailutil.1
-
-	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
-}
diff --git a/net-mail/uw-imap/uw-imap-2004g-r2.ebuild b/net-mail/uw-imap/uw-imap-2004g-r2.ebuild
index 641e1fa506ed..009d3de15c14 100644
--- a/net-mail/uw-imap/uw-imap-2004g-r2.ebuild
+++ b/net-mail/uw-imap/uw-imap-2004g-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g-r2.ebuild,v 1.2 2005/10/07 08:16:49 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g-r2.ebuild,v 1.3 2005/12/19 18:30:20 ticho Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.washington.edu/imap/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~sparc ~x86"
+KEYWORDS="~alpha ~sparc x86"
 IUSE="ipv6 ssl kerberos clearpasswd"
 
 PROVIDE="virtual/imapd"
diff --git a/net-mail/uw-imap/uw-imap-2004g.ebuild b/net-mail/uw-imap/uw-imap-2004g.ebuild
deleted file mode 100644
index 101b9d5a5b5e..000000000000
--- a/net-mail/uw-imap/uw-imap-2004g.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g.ebuild,v 1.2 2005/10/07 08:16:49 ticho Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="imap-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
-HOMEPAGE="http://www.washington.edu/imap/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 ssl pic kerberos clearpasswd"
-
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
-DEPEND="!net-mail/vimap
-	!virtual/imap-c-client
-	virtual/libc
-	>=sys-libs/pam-0.72
-	>=net-mail/mailbase-0.00-r8
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )"
-
-pkg_setup() {
-	echo
-	if use clearpasswd; then
-		ewarn "Building uw-imap with cleartext LOGIN allowed. Disable \"clearpasswd\" USE"
-		ewarn "flag to restrict cleartext LOGIN to SSL/TLS sessions only."
-	else
-		if use ssl; then
-			ewarn "Building uw-imap with cleartext LOGIN restricted to SSL/TLS sessions only."
-			ewarn "Enable \"clearpasswd\" flag to allow unrestricted cleartext LOGIN."
-		else
-			ewarn "You have disabled SSL for uw-imap, but want cleartext passwords restricted to"
-			ewarn "SSL/TLS sessions only. Either enable \"ssl\" USE flag, or \"clearpasswd\""
-			ewarn "USE flag."
-			die "Impossible USE flag combination, see above message"
-		fi
-	fi
-	echo
-	# ewarn people not using pam with this file
-	if ! built_with_use net-mail/mailbase pam ; then
-		echo
-		ewarn "It is needed to have the net-mail/mailbase package"
-		ewarn "  built with the pam use flag activated. Please rebuild"
-		ewarn "  net-mail/mailbase with pam activated."
-		echo
-		die "mailbase has to be built with pam use flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Tarball packed with bad file perms
-	chmod -R ug+w ${S}
-
-	cd ${S}
-
-	if use amd64; then
-		# Now we must make all the individual Makefiles use different CFLAGS,
-		# otherwise they would all use -fPIC
-		sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
-			src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
-			src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-			|| die "sed failed patching Makefile CFLAGS."
-		# Now there is only c-client left, which should be built with -fPIC
-		append-flags -fPIC
-		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${PN}-2004c-amd64-so-fix.patch
-	fi
-
-	use pic || use alpha && append-flags -fPIC
-
-	cd ${S}/src/osdep/unix/
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		< Makefile.orig > Makefile
-
-	# Uncomment this for MBX support
-	#cp Makefile Makefile.orig2
-	#sed \
-	#	-e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
-	#	-e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
-	#	< Makefile.orig2 > Makefile
-}
-
-src_compile() {
-	local mymake
-	local ipver
-	ipver="IP=4"
-
-	use ipv6 && echo ipv6
-	use kerberos && echo kerberos
-	use ssl && echo ssl
-	use ipv6 && ipver="IP=6"
-	use kerberos \
-	  && mymake="EXTRAAUTHENTICATORS=gss"
-	if use ssl; then
-		cd ${S}
-		echo ${mymake}
-		if use clearpasswd; then
-			yes | make lnp ${mymake} ${ipver} SSLTYPE=unix EXTRACFLAGS="${CFLAGS}" || die
-		else
-			yes | make lnp ${mymake} ${ipver} SSLTYPE=unix.nopwd EXTRACFLAGS="${CFLAGS}" || die
-		fi
-
-
-		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 ${mymake} ${ipver} SSLTYPE=none EXTRACFLAGS="${CFLAGS}" || die
-	fi
-}
-
-src_install() {
-	into /usr
-	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
-	dobin mailutil/mailutil mlock/mlock mtest/mtest
-
-	if use ssl; then
-		dodir /etc/ssl/certs
-		mv imapd.pem ${D}/etc/ssl/certs
-		mv ipop3d.pem ${D}/etc/ssl/certs
-	fi
-
-	if use amd64; then
-		dolib.so c-client/libc-client.so.1.0.0
-		cd ${D}/usr/$(get_libdir)
-		ln -s libc-client.so.1.0.0 libc-client.so.1
-		ln -s libc-client.so.1.0.0 libc-client.so
-	fi
-
-	cd ${S}
-
-	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/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
-
-	doman src/ipopd/ipopd.8 src/imapd/imapd.8
-	doman src/dmail/dmail.1 src/tmail/tmail.1 src/mailutil/mailutil.1
-
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
-
-	docinto rfc
-	dodoc docs/rfc/*.txt
-
-	# gentoo config stuff
-	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
-}