Big ebuild cleanup, as 6.2.5.2-r1 is stable on all supported arches.

(Portage version: 2.0.53_rc5)

25 files changed, 12 insertions, 1018 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 8a20563ffa16..476e01d97260 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.82 2005/10/28 03:32:55 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.83 2005/10/31 08:37:41 ticho Exp $
+
+  31 Oct 2005; Andrej Kacian <ticho@gentoo.org>
+  -files/configure-5.9.14.diff, -files/fetchmail-6.1.0-gentoo.diff,
+  -files/fetchmail-6.2.0-gentoo.diff,
+  -files/fetchmail-6.2.2-multiple-return-path.diff,
+  -files/fetchmail-6.2.5-fetchsizelimit.patch, -fetchmail-5.9.14.ebuild,
+  -fetchmail-6.2.1-r1.ebuild, -fetchmail-6.2.2-r2.ebuild,
+  -fetchmail-6.2.3.ebuild, -fetchmail-6.2.4.ebuild, -fetchmail-6.2.5.ebuild,
+  -fetchmail-6.2.5-r1.ebuild, -fetchmail-6.2.5-r2.ebuild,
+  -fetchmail-6.2.5.2.ebuild:
+  Big ebuild cleanup, as 6.2.5.2-r1 is stable on all supported arches.
 
   28 Oct 2005; Luis Medinas <metalgod@gentoo.org>
   fetchmail-6.2.5.2-r1.ebuild:
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 1817692afb34..18adc0a70704 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,43 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 623450c9198c544afbe614db34b122b3 ChangeLog 12389
-MD5 d01bc5cb58cfda170f585b3e89bef8ed fetchmail-5.9.14.ebuild 1894
-MD5 faaffbf24a8f1845717127119690cbc9 fetchmail-6.2.1-r1.ebuild 1773
-MD5 00c01108df1dd1d60f071b2e1b929253 fetchmail-6.2.2-r2.ebuild 2038
-MD5 243728bcac42ad79161b92714363d75d fetchmail-6.2.3.ebuild 1961
-MD5 fad43483dd30edcc1e3d5da45141a535 fetchmail-6.2.4.ebuild 2138
-MD5 e2e0aea60ed02e6393a387a2288ecb6b fetchmail-6.2.5-r1.ebuild 2734
-MD5 20841a593098014840ac383e73ef3aa8 fetchmail-6.2.5-r2.ebuild 2699
 MD5 04125f54e4be33fd55348f69c38e0942 fetchmail-6.2.5.2-r1.ebuild 3051
-MD5 5321e0e013f45f2fcdf97cb2d7926ad0 fetchmail-6.2.5.2.ebuild 2790
-MD5 900f6ef3ff4d10ef0668f4d197558e9c fetchmail-6.2.5.ebuild 2609
 MD5 29d376a1042aeeeba94e911a943d5a7f files/conf.d-fetchmail 347
-MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
-MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
-MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
-MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
-MD5 b8f3ceb78e16e9c26c34908229893659 files/digest-fetchmail-6.2.3 68
-MD5 c1c69ebb34b0848d22249ae32b770061 files/digest-fetchmail-6.2.4 68
-MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5 68
-MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5-r1 68
-MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5-r2 68
-MD5 4e030c7ea8258e15f970dfd6a6077461 files/digest-fetchmail-6.2.5.2 137
 MD5 c74bd41e6321522be59c6c475ce005f3 files/digest-fetchmail-6.2.5.2-r1 204
 MD5 44ab8af6373e139c7c4b8b8df77b0658 files/fetchmail 591
-MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
-MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
-MD5 74bad5b4190b32597543a61ed0c7ec7a files/fetchmail-6.2.2-multiple-return-path.diff 1142
 MD5 cd9176a56e402a922bcf53d3ccf15e11 files/fetchmail-6.2.5-broken-headers.patch 288
-MD5 fa0432a854f2a63b2b6fa0a8e65985f7 files/fetchmail-6.2.5-fetchsizelimit.patch 526
 MD5 bc67e24e50b2607de8ed8bbfe8c475ea files/fetchmail-6.2.5-gentoo.patch 1878
 MD5 9e74bd5507acf5a39559d76646bac254 files/fetchmail-6.2.5-kerberos.patch 1175
 MD5 9fdac9fcc5797bfb643d850abe200105 files/fetchmail-6.2.5-mit-krb5-1.4.patch 406
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDZF5FgIKl8Uu19MoRAjFTAJ9dJk3V5KL00lms/PkxFR+KFgYdKACfetkN
-vwldSyLUguQVADgh3fhax1k=
-=fp8F
------END PGP SIGNATURE-----
diff --git a/net-mail/fetchmail/fetchmail-5.9.14.ebuild b/net-mail/fetchmail/fetchmail-5.9.14.ebuild
deleted file mode 100644
index 0edd7b3b5dd2..000000000000
--- a/net-mail/fetchmail/fetchmail-5.9.14.ebuild
+++ /dev/null
@@ -1,85 +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/fetchmail/fetchmail-5.9.14.ebuild,v 1.16 2005/07/01 16:38:17 ticho Exp $
-
-IUSE="ssl nls"
-
-DESCRIPTION="Fetchmail is a full-featured remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/fetchmail/${P}.tar.gz"
-
-DEPEND="virtual/libc
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="x86 ppc sparc"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/configure-5.9.14.diff || die "patch failed"
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use ssl && myconf="${myconf} --with-ssl=/usr"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	# This needs inet6-apps, which we don't have
-	#use ipv6 && myconf="{myconf} --enable-inet6"
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		${myconf} || die "Configuration failed."
-
-	emake || die "Compilation failed."
-
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-
-	doman /usr/share/man/*.1
-	dosym /usr/share/man/man1/fetchmailconf* /usr/share/man/man1/fetchmail.1.gz
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/fetchmail
-
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-
-}
diff --git a/net-mail/fetchmail/fetchmail-6.2.1-r1.ebuild b/net-mail/fetchmail/fetchmail-6.2.1-r1.ebuild
deleted file mode 100644
index ef9bac72d8aa..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.1-r1.ebuild
+++ /dev/null
@@ -1,73 +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/fetchmail/fetchmail-6.2.1-r1.ebuild,v 1.11 2005/04/28 18:22:34 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="Fetchmail is a full-featured remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/fetchmail/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="x86 alpha"
-IUSE="ssl nls ipv6"
-
-DEPEND="virtual/libc
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fetchmail-6.2.0-gentoo.diff || die
-}
-
-src_compile() {
-	local myconf
-	use ssl && myconf="${myconf} --with-ssl=/usr"
-	use nls || myconf="${myconf} --disable-nls"
-	use ipv6 && myconf="${myconf} --enable-inet6"
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		${myconf} || die "Configuration failed."
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/fetchmail
-
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-}
diff --git a/net-mail/fetchmail/fetchmail-6.2.2-r2.ebuild b/net-mail/fetchmail/fetchmail-6.2.2-r2.ebuild
deleted file mode 100644
index 639b3ec1da5e..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.2-r2.ebuild
+++ /dev/null
@@ -1,80 +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/fetchmail/fetchmail-6.2.2-r2.ebuild,v 1.6 2005/07/01 16:38:17 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="Fetchmail is a full-featured remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/fetchmail/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="x86 ~alpha"
-IUSE="ssl nls ipv6"
-
-DEPEND="virtual/libc
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fetchmail-6.2.0-gentoo.diff || die
-	epatch ${FILESDIR}/fetchmail-6.2.2-multiple-return-path.diff || die
-}
-
-src_compile() {
-	local myconf
-	use ssl && myconf="${myconf} --with-ssl=/usr"
-	use nls || myconf="${myconf} --disable-nls"
-	use ipv6 && myconf="${myconf} --enable-inet6"
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		${myconf} || die "Configuration failed."
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/fetchmail
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d-fetchmail fetchmail
-
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-
-	einfo "Please see /etc/conf.d/fetchmail if you want to adjust"
-	einfo "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.2.3.ebuild b/net-mail/fetchmail/fetchmail-6.2.3.ebuild
deleted file mode 100644
index e432cf64d8dc..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.3.ebuild
+++ /dev/null
@@ -1,83 +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/fetchmail/fetchmail-6.2.3.ebuild,v 1.9 2005/07/01 16:38:17 ticho Exp $
-
-IUSE="ssl nls ipv6"
-
-inherit eutils
-
-DESCRIPTION="a full-featured remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/fetchmail/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="x86 alpha mips"
-
-DEPEND="virtual/libc
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fetchmail-6.2.0-gentoo.diff || die
-}
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="${myconf} --with-ssl=/usr"
-	use nls || myconf="${myconf} --disable-nls"
-	use ipv6 && myconf="${myconf} --enable-inet6"
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		${myconf} || die "Configuration failed."
-
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/fetchmail
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d-fetchmail fetchmail
-
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-
-	einfo "Please see /etc/conf.d/fetchmail if you want to adjust"
-	einfo "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.2.4.ebuild b/net-mail/fetchmail/fetchmail-6.2.4.ebuild
deleted file mode 100644
index e30fa6e4138f..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.4.ebuild
+++ /dev/null
@@ -1,88 +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/fetchmail/fetchmail-6.2.4.ebuild,v 1.7 2005/07/01 16:38:17 ticho Exp $
-
-IUSE="ssl nls ipv6 kerberos krb4"
-
-inherit eutils
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/fetchmail/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 -alpha"
-
-DEPEND="virtual/libc
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	nls? ( sys-devel/gettext )
-	kerberos? ( virtual/krb5 )
-	krb4? ( app-crypt/kth-krb )"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/fetchmail-6.2.0-gentoo.diff || die
-}
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="${myconf} --with-ssl"
-	use nls || myconf="${myconf} --disable-nls"
-	use ipv6 && myconf="${myconf} --enable-inet6"
-	use kerberos && myconf="${myconf} --with-gssapi --with-kerberos5"
-	use krb4 && myconf="${myconf} --with-kerberos"
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		${myconf} || die "Configuration failed."
-
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/fetchmail
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d-fetchmail fetchmail
-
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-
-	einfo "Please see /etc/conf.d/fetchmail if you want to adjust"
-	einfo "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild b/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
deleted file mode 100644
index e181861d6961..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
+++ /dev/null
@@ -1,101 +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/fetchmail/fetchmail-6.2.5-r1.ebuild,v 1.5 2005/07/01 16:35:11 ticho Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~mips"
-IUSE="ssl nls ipv6 kerberos krb4"
-
-DEPEND="virtual/libc
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	nls? ( sys-devel/gettext )
-	kerberos? ( virtual/krb5 )
-	krb4? ( app-crypt/kth-krb )
-	sys-devel/autoconf"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-6.2.0-gentoo.diff || die
-	epatch ${FILESDIR}/${P}-kerberos.patch
-	# patch fixes bug #40126 (tomk@gentoo.org 2004-08-07)
-	epatch ${FILESDIR}/${P}-fetchsizelimit.patch || die
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch ${FILESDIR}/${P}-broken-headers.patch || die
-	# this patch fixes bug #97263 (ticho@gentoo.org 2005-06-01)
-	if has_version '>=app-crypt/mit-krb5-1.4' ; then
-		epatch ${FILESDIR}/${P}-mit-krb5-1.4.patch || die
-	fi
-}
-
-src_compile() {
-	autoconf
-
-	gnuconfig_update
-
-	local myconf
-
-	use ssl && myconf="${myconf} --with-ssl"
-	use nls || myconf="${myconf} --disable-nls"
-	use ipv6 && myconf="${myconf} --enable-inet6"
-	use kerberos && myconf="${myconf} --with-gssapi --with-kerberos5"
-	use krb4 && myconf="${myconf} --with-kerberos"
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		${myconf} || die "Configuration failed."
-	# wont compile reliably on smp (mkennedy@gentoo.org 2003-11-12)
-	make || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/fetchmail
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d-fetchmail fetchmail
-
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-
-	einfo "Please see /etc/conf.d/fetchmail if you want to adjust"
-	einfo "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild b/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild
deleted file mode 100644
index d49accd7df04..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild
+++ /dev/null
@@ -1,96 +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/fetchmail/fetchmail-6.2.5-r2.ebuild,v 1.6 2005/08/12 21:34:43 ferdy Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ssl nls ipv6 kerberos krb4 hesiod"
-
-RDEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( app-crypt/mit-krb5 )
-	sys-devel/gettext
-	elibc_FreeBSD? ( sys-libs/com_err )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-6.2.0-gentoo.diff || die
-	epatch ${FILESDIR}/${P}-kerberos.patch
-	# patch fixes bug #40126 (tomk@gentoo.org 2004-08-07)
-	epatch ${FILESDIR}/${P}-fetchsizelimit.patch || die
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch ${FILESDIR}/${P}-broken-headers.patch || die
-	# this patch fixes bug #97263 (ticho@gentoo.org 2005-06-01)
-	if has_version '>=app-crypt/mit-krb5-1.4' ; then
-		epatch ${FILESDIR}/${P}-mit-krb5-1.4.patch || die
-	fi
-
-	autoconf
-	gnuconfig_update
-}
-
-src_compile() {
-	econf  --disable-dependency-tracking \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_enable ipv6 inet6) \
-		$(use_with kerberos gssapi) $(use_with kerberos kerberos5) \
-		$(use_with krb4 kerberos) \
-		$(use_with ssl) \
-		$(use_with hesiod) \
-		${myconf} || die "Configuration failed."
-	# wont compile reliably on smp (mkennedy@gentoo.org 2003-11-12)
-	make || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-
-	newinitd ${FILESDIR}/fetchmail fetchmail
-	newconfd ${FILESDIR}/conf.d-fetchmail fetchmail
-
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-
-	einfo "Please see /etc/conf.d/fetchmail if you want to adjust"
-	einfo "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.2.5.2.ebuild b/net-mail/fetchmail/fetchmail-6.2.5.2.ebuild
deleted file mode 100644
index 3f5e33e4f63f..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.5.2.ebuild
+++ /dev/null
@@ -1,100 +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/fetchmail/fetchmail-6.2.5.2.ebuild,v 1.12 2005/08/13 17:21:50 ka0ttic Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/${PN}/${PN}-6.2.5.tar.gz
-		http://download.berlios.de/fetchmail/fetchmail-patch-6.2.5.2.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="ssl nls ipv6 kerberos krb4 hesiod"
-
-RDEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( app-crypt/mit-krb5 )
-	sys-devel/gettext
-	elibc_FreeBSD? ( sys-libs/com_err )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-S="${WORKDIR}/${PN}-6.2.5"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/${PN}-patch-${PV} || die "epatch to ${PV} failed"
-
-	epatch ${FILESDIR}/${PN}-6.2.5-gentoo.patch || die
-	epatch ${FILESDIR}/${PN}-6.2.5-kerberos.patch || die
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch ${FILESDIR}/${PN}-6.2.5-broken-headers.patch || die
-	# this patch fixes bug #97263 (ticho@gentoo.org 2005-06-01)
-	if has_version '>=app-crypt/mit-krb5-1.4' ; then
-		epatch ${FILESDIR}/${PN}-6.2.5-mit-krb5-1.4.patch || die
-	fi
-
-	autoconf
-	gnuconfig_update
-}
-
-src_compile() {
-	econf  --disable-dependency-tracking \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_enable ipv6 inet6) \
-		$(use_with kerberos gssapi) $(use_with kerberos kerberos5) \
-		$(use_with krb4 kerberos) \
-		$(use_with ssl) \
-		$(use_with hesiod) \
-		${myconf} || die "Configuration failed."
-	# wont compile reliably on smp (mkennedy@gentoo.org 2003-11-12)
-	make || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-
-	newinitd ${FILESDIR}/fetchmail fetchmail
-	newconfd ${FILESDIR}/conf.d-fetchmail fetchmail
-
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-
-	einfo "Please see /etc/conf.d/fetchmail if you want to adjust"
-	einfo "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.2.5.ebuild b/net-mail/fetchmail/fetchmail-6.2.5.ebuild
deleted file mode 100644
index 554c236c1f6b..000000000000
--- a/net-mail/fetchmail/fetchmail-6.2.5.ebuild
+++ /dev/null
@@ -1,99 +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/fetchmail/fetchmail-6.2.5.ebuild,v 1.20 2005/07/01 16:35:11 ticho Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
-SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~mips"
-IUSE="ssl nls ipv6 kerberos krb4"
-
-DEPEND="virtual/libc
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	nls? ( sys-devel/gettext )
-	kerberos? ( virtual/krb5 )
-	krb4? ( app-crypt/kth-krb )
-	sys-devel/autoconf"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-6.2.0-gentoo.diff || die
-	epatch ${FILESDIR}/${P}-kerberos.patch
-	# patch fixes bug #40126 (tomk@gentoo.org 2004-08-07)
-	epatch ${FILESDIR}/${P}-fetchsizelimit.patch || die
-	# this patch fixes bug #97263 (ticho@gentoo.org 2005-06-01)
-	if has_version '>=app-crypt/mit-krb5-1.4' ; then
-		epatch ${FILESDIR}/${P}-mit-krb5-1.4.patch || die
-	fi
-}
-
-src_compile() {
-	autoconf
-
-	gnuconfig_update
-
-	local myconf
-
-	use ssl && myconf="${myconf} --with-ssl"
-	use nls || myconf="${myconf} --disable-nls"
-	use ipv6 && myconf="${myconf} --enable-inet6"
-	use kerberos && myconf="${myconf} --with-gssapi --with-kerberos5"
-	use krb4 && myconf="${myconf} --with-kerberos"
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		${myconf} || die "Configuration failed."
-	# wont compile reliably on smp (mkennedy@gentoo.org 2003-11-12)
-	make || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING MANIFEST
-
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/fetchmail
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d-fetchmail fetchmail
-
-	docinto contrib
-	local f
-	for f in contrib/*
-	do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		einfo
-		einfo "You will not be able to use fetchmailconf(1), because you"
-		einfo "don't seem to have Python with tkinter support."
-		einfo
-		einfo "If you want to be able to use fetchmailconf(1), do the following:"
-		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
-		einfo "  2.  (Re-)merge Python."
-		einfo
-	fi
-
-	einfo "Please see /etc/conf.d/fetchmail if you want to adjust"
-	einfo "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/files/configure-5.9.14.diff b/net-mail/fetchmail/files/configure-5.9.14.diff
deleted file mode 100644
index 3847ca4e80c5..000000000000
--- a/net-mail/fetchmail/files/configure-5.9.14.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -urN fetchmail-5.9.14/configure fetchmail-5.9.14-modified/configure
---- fetchmail-5.9.14/configure	Wed Sep  4 08:43:37 2002
-+++ fetchmail-5.9.14-modified/configure	Wed Sep 11 16:57:12 2002
-@@ -6949,7 +6949,7 @@
- #define KERBEROS_V5 1
- EOF
- 
--        test "$dir" != "/usr" && CEFLAGS="$CEFLAGS -I$dir/include"
-+        test "$dir" != "/usr" && CEFLAGS="$CEFLAGS"
-         LDEFLAGS="$LDEFLAGS -L$dir/lib"
-        LIBS="$LIBS $ac_krblibs $libk5crypto"
-         with_kerberos5=$dir
-@@ -7259,7 +7259,7 @@
-   then
-     ###	ssl.h found under openssl.  Use openssl configuration preferentially
-     echo "Enabling OpenSSL support in $with_ssl"
--    CEFLAGS="$CEFLAGS -I$with_ssl/include -I$with_ssl/include/openssl"
-+    CEFLAGS="$CEFLAGS -I$with_ssl/include/openssl"
-     ###	OpenBSD comes with ssl headers
-   elif test -r /usr/include/ssl/ssl.h
-   then
-@@ -7267,7 +7267,7 @@
-     CEFLAGS="$CEFLAGS -I/usr/include/ssl"
-   else
-     echo "Enabling SSLeay support in $with_ssl"
--    CEFLAGS="$CEFLAGS -I$with_ssl/include"
-+    CEFLAGS="$CEFLAGS"
-   fi
-   LDEFLAGS="$LDEFLAGS -L$with_ssl/lib"
-   LIBS="$LIBS -lssl -lcrypto"
-@@ -7484,7 +7484,7 @@
-     do
-       if test -f "$dir/include/hesiod.h"
-       then
--        CEFLAGS="$CEFLAGS -DHESIOD -I$dir/include"
-+        CEFLAGS="$CEFLAGS -DHESIOD"
-         LDEFLAGS="$LDEFLAGS -L$dir/lib"
-         LIBS="$LIBS -lhesiod"
-         with_hesiod=$dir
-@@ -7494,7 +7494,7 @@
-     ;;
- *)
-     # Path given
--    CEFLAGS="$CEFLAGS -DHESIOD -I$with_hesiod/include"
-+    CEFLAGS="$CEFLAGS -DHESIOD"
-     LDEFLAGS="$LDEFLAGS -L$with_hesiod/lib"
-     LIBS="$LIBS -lhesiod"
-     ;;
-@@ -7513,7 +7513,7 @@
-   fi
-   if test "$with_gssapi" != "yes" -a -n "$with_gssapi"
-   then
--    CFLAGS="$CFLAGS -I$with_gssapi/include"
-+    CFLAGS="$CFLAGS"
-     LDFLAGS="$LDFLAGS -L$with_gssapi/lib"
-   fi
- 
-@@ -7613,7 +7613,7 @@
- EOF
- 
-   save_CPPFLAGS=$CPPFLAGS
--  CPPFLAGS="-I$with_gssapi/include"
-+  CPPFLAGS=""
-   for ac_hdr in gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
diff --git a/net-mail/fetchmail/files/digest-fetchmail-5.9.14 b/net-mail/fetchmail/files/digest-fetchmail-5.9.14
deleted file mode 100644
index e9097dcbecfa..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-5.9.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c8a9b828e734723ff48e79246aef92f4 fetchmail-5.9.14.tar.gz 984070
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.1-r1 b/net-mail/fetchmail/files/digest-fetchmail-6.2.1-r1
deleted file mode 100644
index 8d67be225e13..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f9f8f809caf03e064b42361ae5756d2 fetchmail-6.2.1.tar.gz 1139251
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.2-r2 b/net-mail/fetchmail/files/digest-fetchmail-6.2.2-r2
deleted file mode 100644
index a1f977811cec..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3544890a2452b5b04c709c65109c43a fetchmail-6.2.2.tar.gz 1205198
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.3 b/net-mail/fetchmail/files/digest-fetchmail-6.2.3
deleted file mode 100644
index 5c3d17e60bbe..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e131bdb6c3977fd47a3e122c43dcf19d fetchmail-6.2.3.tar.gz 1239344
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.4 b/net-mail/fetchmail/files/digest-fetchmail-6.2.4
deleted file mode 100644
index 61cc41599e08..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3614acbda936548d2f8d5bffb161ff59 fetchmail-6.2.4.tar.gz 1247210
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.5 b/net-mail/fetchmail/files/digest-fetchmail-6.2.5
deleted file mode 100644
index 11752ef97731..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9956b30139edaa4f5f77c4d0dbd80225 fetchmail-6.2.5.tar.gz 1257376
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r1 b/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r1
deleted file mode 100644
index 11752ef97731..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9956b30139edaa4f5f77c4d0dbd80225 fetchmail-6.2.5.tar.gz 1257376
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r2 b/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r2
deleted file mode 100644
index 11752ef97731..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9956b30139edaa4f5f77c4d0dbd80225 fetchmail-6.2.5.tar.gz 1257376
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2 b/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2
deleted file mode 100644
index 0be546c5a44c..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9956b30139edaa4f5f77c4d0dbd80225 fetchmail-6.2.5.tar.gz 1257376
-MD5 be18f89b94e937a22560aa452e524c4b fetchmail-patch-6.2.5.2.gz 2000
diff --git a/net-mail/fetchmail/files/fetchmail-6.1.0-gentoo.diff b/net-mail/fetchmail/files/fetchmail-6.1.0-gentoo.diff
deleted file mode 100644
index 383595de4bbb..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.1.0-gentoo.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN fetchmail-6.1.0/Makefile fetchmail-6.1.0-modified/Makefile
---- fetchmail-6.1.0/Makefile	2002-10-08 10:35:26.000000000 -0500
-+++ fetchmail-6.1.0-modified/Makefile	2002-10-08 10:36:06.000000000 -0500
-@@ -23,9 +23,9 @@
- # YACC = yacc
- YACCFLAGS = -d # -t
- 
--CEFLAGS =  -I/usr/include -I/usr/include/openssl -DHESIOD -I/usr/include
-+CEFLAGS = -I/usr/include/openssl -DHESIOD
- CPFLAGS = 
--LDEFLAGS =  -L/usr/lib -L/usr/lib
-+LDEFLAGS =  -L/usr/lib
- 
- # for gettext (used by fetchmail.c, NOT by GNU gettext)
- localedir = $(datadir)/locale
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.0-gentoo.diff b/net-mail/fetchmail/files/fetchmail-6.2.0-gentoo.diff
deleted file mode 100644
index ce2d0b4109cf..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.2.0-gentoo.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- fetchmail-6.1.2/pop2.c.old	Thu Mar 22 08:45:35 2001
-+++ fetchmail-6.1.2/pop2.c	Thu Nov 28 22:47:51 2002
-@@ -129,8 +129,8 @@
- {
-     "POP2",				/* Post Office Protocol v2 */
- #if INET6_ENABLE
--    "pop2",				/* standard POP2 port */
--    "pop2",				/* ssl POP2 port */
-+    "pop-2",				/* standard POP2 port */
-+    "pop-2",				/* ssl POP2 port */
- #else /* INET6_ENABLE */
-     109,				/* standard POP2 port */
-     109,				/* ssl POP2 port - not */
---- fetchmail-6.1.2/imap.c.old	Thu Nov 28 22:52:07 2002
-+++ fetchmail-6.1.2/imap.c	Thu Nov 28 22:48:20 2002
-@@ -1012,7 +1012,7 @@
- {
-     "IMAP",		/* Internet Message Access Protocol */
- #if INET6_ENABLE
--    "imap",
-+    "imap2",
-     "imaps",
- #else /* INET6_ENABLE */
-     143,                /* standard IMAP2bis/IMAP4 port */
---- fetchmail-6.1.2/etrn.c.old	Sun Mar 10 22:34:50 2002
-+++ fetchmail-6.1.2/etrn.c	Thu Nov 28 22:53:26 2002
-@@ -124,7 +124,7 @@
-     "ETRN",		/* ESMTP ETRN extension */
- #if INET6_ENABLE
-     "smtp",		/* standard SMTP port */
--    "smtps",		/* ssl SMTP port */
-+    "ssmtp",		/* ssl SMTP port */
- #else /* INET6_ENABLE */
-     25,			/* standard SMTP port */
-     465,			/* ssl SMTP port */
---- fetchmail-6.1.2/pop3.c.old	Thu Oct 31 15:41:37 2002
-+++ fetchmail-6.1.2/pop3.c	Thu Nov 28 22:47:30 2002
-@@ -817,7 +817,7 @@
- {
-     "POP3",		/* Post Office Protocol v3 */
- #if INET6_ENABLE
--    "pop3",		/* standard POP3 port */
-+    "pop-3",		/* standard POP3 port */
-     "pop3s",		/* ssl POP3 port */
- #else /* INET6_ENABLE */
-     110,		/* standard POP3 port */
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.2-multiple-return-path.diff b/net-mail/fetchmail/files/fetchmail-6.2.2-multiple-return-path.diff
deleted file mode 100644
index d3cfc08c6ba8..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.2.2-multiple-return-path.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- fetchmail-6.2.2/transact.c.orig	2003-04-14 12:46:42.000000000 +0800
-+++ fetchmail-6.2.2/transact.c	2003-04-14 13:04:33.000000000 +0800
-@@ -381,6 +381,7 @@
-     flag		headers_ok, has_nuls;
-     int			olderrs, good_addresses, bad_addresses;
-     int			retain_mail = 0;
-+    flag		already_has_return_path = FALSE;
- 
-     sizeticker = 0;
-     has_nuls = headers_ok = FALSE;
-@@ -676,9 +677,15 @@
- 	 * not trigger bounces if delivery fails.  What we *do* need to do is
- 	 * make sure we never try to rewrite such a blank Return-Path.  We
- 	 * handle this with a check for <> in the rewrite logic above.
-+	 *
-+	 * Also, if an email has multiple Return-Path: statement, we only
-+	 * read the first occurance, as some spam email has more than one
-+	 * Return-Path.
-+	 *
- 	 */
--	if (!strncasecmp("Return-Path:", line, 12) && (cp = nxtaddr(line)))
-+	if ((already_has_return_path==FALSE) && !strncasecmp("Return-Path:", line, 12) && (cp = nxtaddr(line)))
- 	{
-+	    already_has_return_path = TRUE;
- 	    strncpy(msgblk.return_path, cp, sizeof(msgblk.return_path));
- 	    msgblk.return_path[sizeof(msgblk.return_path)-1] = '\0';
- 	    if (!ctl->mda) {
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.5-fetchsizelimit.patch b/net-mail/fetchmail/files/fetchmail-6.2.5-fetchsizelimit.patch
deleted file mode 100644
index 54f0042d4db4..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.2.5-fetchsizelimit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- driver.c	2003-10-16 00:52:31 +0530
-+++ driver.c	2003-10-17 11:24:27 +0530
-@@ -429,8 +429,11 @@
- 	/* for POP3, we can get the size of one mail only! Unfortunately, this
- 	 * protocol specific test cannot be done elsewhere as the protocol
- 	 * could be "auto". */
--	if (ctl->server.protocol == P_POP3)
-+	switch (ctl->server.protocol)
-+	{
-+	    case P_POP3: case P_APOP: case P_RPOP:
- 	    fetchsizelimit = 1;
-+	}
- 
- 	/* Time to allocate memory to store the sizes */
- 	xalloca(msgsizes, int *, sizeof(int) * fetchsizelimit);