Clean up

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo i686

7 files changed, 8 insertions, 370 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index a0170428e895..c0c9012dcbbc 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.153 2009/01/10 10:11:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.154 2009/01/11 15:56:08 dertobi123 Exp $
+
+  11 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/fetchmail-6.3.7-poll-again.patch, -fetchmail-6.3.6.ebuild,
+  -fetchmail-6.3.7-r1.ebuild, -fetchmail-6.3.8.ebuild,
+  -fetchmail-6.3.8-r2.ebuild:
+  Clean up
 
   10 Jan 2009; Markus Meier <maekke@gentoo.org> fetchmail-6.3.9.ebuild:
   amd64 stable, bug #253871
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 476dc95eb996..c23f5c3532d9 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,28 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conf.d-fetchmail 347 RMD160 5a042695f6849653d32b17a6852025d1d695770a SHA1 9a0956877f5d8ac3e1c7c949a9921c3f1b1e7307 SHA256 8ba3e51b5a51b42daf8cfa2183c938afb04fd6a9cc941e1adb9faa10aff677bf
 AUX fetchmail 591 RMD160 a24c5d093db4e8212ec7307dc070dc35a8da144b SHA1 fb3413326873829c2a894afa83f2d118b85d3dc7 SHA256 0de1c32b1a94755476cd81ba2c846adefb6680414d5e865a85743a1ff091f53f
 AUX fetchmail-6.2.5-broken-headers.patch 288 RMD160 1e5237c2cd24223ec4b98b2f67c5780d2026a559 SHA1 006d59dc95138a5db241a0536b10978b05227f26 SHA256 a72666259b30fed72a5c63519bfa0c888d14570c14c227c2418a2100cf08d326
-AUX fetchmail-6.3.7-poll-again.patch 473 RMD160 daedf8181972b4759870618ea287a0221b309aaf SHA1 2941445e48c1bcb021bd7bec806e0a698840aff1 SHA256 c97a7dc9be48b3e0b8a6e9de329c412990e25677f361c749011b779557c35626
 AUX fetchmail-6.3.8-null-msg-pointer.patch 497 RMD160 6b0da53abcb4eee861a8ddba47b1353ef5e58f4f SHA1 707d678ce3a7c0a0898db80cbb6d903873014a5b SHA256 6625692842a1c654fd7e07389ab476ac2a45a73a7dfcf4907524bffebdca7e67
 AUX fetchmail-6.3.8-resize-buffer.patch 848 RMD160 4d51e00ccdc170870d58691727b43fbc430323b0 SHA1 bef21c6cf56068fe580ebc24a4dbd104d3ecdba6 SHA256 79a4e58c18050d746a8b978203274838e971235fa3705c262c6c4f7562e75231
-DIST fetchmail-6.3.6.tar.bz2 1307730 RMD160 455c1413cc5090f834e82be4876b572d4bef35cc SHA1 4c362d8d86c0d4efb191d0faae0b48b54b0887ba SHA256 3c81e7776617b78f18d9cd8b5e5f62944e70f1d7bd47a840fd8d44bcded784ff
-DIST fetchmail-6.3.7.tar.bz2 1315062 RMD160 95b06b5e014c89416269dbc762c8556b20ce74ad SHA1 163634b7b6b491c5f5e84a535f7943ba4d4f0001 SHA256 7957f5eaf4aca6d839ca9869f607b005d09ded884774b8757693410b492ce9f3
 DIST fetchmail-6.3.8.tar.bz2 1323515 RMD160 34034f9ae9fe44ba35f0a16d3128d4a9b0001df2 SHA1 b8e8c51ed6cf53fc398c821fdb29d166c6713bb0 SHA256 5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b
 DIST fetchmail-6.3.9.tar.bz2 1538134 RMD160 5fcea0ae97ff64633a50e164270ab68435186fbc SHA1 2ed705ffe40afd6d085535cf2af06914507da36a SHA256 3dfd3b04aa552331f91f96bdf5f5afe489c31a600ae7973f5814bde5555813dc
-EBUILD fetchmail-6.3.6.ebuild 2237 RMD160 30604a55ccada907417c3c16be6cacd561c713bc SHA1 2e285a1559211e200e9397cb9d7e63dfe697e317 SHA256 fc397ad32f5b2ece730b00cd9dbd4d63598639ac692e3c3ac2d2efeb7aa799be
-EBUILD fetchmail-6.3.7-r1.ebuild 2358 RMD160 0fa7183be2437032fe6804491b20a3188da95952 SHA1 036760b4b5597064cf3ad8c26a4bf2f05f019456 SHA256 1a211a31d48f83b62aece15fc376f69b8d68bfa6c67721b44db535e749a218c3
 EBUILD fetchmail-6.3.8-r1.ebuild 2323 RMD160 788471b5d315537e9a7b3ab5bddd761f4d5d6d0f SHA1 0841eeff6b217faa238a46505c1c1af0ba89a1a2 SHA256 dc4af9dfea9d93050e3ccd05a42b59e28deed9c3c2c02e7fe19eef85d8a56d16
-EBUILD fetchmail-6.3.8-r2.ebuild 2381 RMD160 f115782d09f355799635addd0eee2c037934ce5f SHA1 c76af528f126a359c85a9919662c44f5222860b0 SHA256 84aa8550700569f5542af0bbde23546d8e59af0904966bcb0ee8c0cdda9a9fdf
-EBUILD fetchmail-6.3.8.ebuild 2249 RMD160 51878f1893e020d090fc89120bbf4d96121e8a47 SHA1 f9b54fa54f7592ddd3393f4b046fff37652e0192 SHA256 7b3521f1a44e48fd8b0c37afbe43e281265309c0d87b91bbd5c82072d0610ebe
 EBUILD fetchmail-6.3.9.ebuild 2571 RMD160 78107230834a7369b66c1054daddab293cd6f9a6 SHA1 15e8112ccb36172269985462ad983143ff9045ad SHA256 5308da4442d6b1a6d084c0ebd58ecddc3f0c9d1dd314ecf4a69b37a7a9bcd0a0
-MISC ChangeLog 22770 RMD160 18e5b35919d176bec23a1d3cca840c70fc9cd19f SHA1 38b6ae6330707140801a1fbb5096b8b34d8d1479 SHA256 ef3034ce78e73ea0dbb4236e3a5c8ecd797c0b09e01713bee2ede157b93c0eb9
+MISC ChangeLog 22995 RMD160 0d524e60a904cf6f5718f177200f86d28da0d661 SHA1 64546c00c858ce57eac750dfd9c5ca8f85639bdc SHA256 05aaf09cbcfe6e8c8e610e5da9c0139ad06580a2861f8cecbffa2514ccd5b0c2
 MISC metadata.xml 237 RMD160 c2a1a048559257005241ad0985c814bd6aab17a7 SHA1 d448f9b9c9f2a92d95efaf4cf9ce3b83b3f9ad3b SHA256 2ff40136507932f8146b07f93d8414eef1cba8bbed94c9eeccf42b6cbbebf7c3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklodHIACgkQkKaRLQcq0GJgrwCaA0y0x4DbmnUTvRjVrtGLDzO7
-TMYAoI8hZiZeAvfmbdIqyTnG1YKS3m/H
-=G7VR
------END PGP SIGNATURE-----
diff --git a/net-mail/fetchmail/fetchmail-6.3.6.ebuild b/net-mail/fetchmail/fetchmail-6.3.6.ebuild
deleted file mode 100644
index 640aacdcc345..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.6.ebuild,v 1.11 2007/06/12 12:27:08 genone Exp $
-
-inherit eutils
-
-FCONF_P="fetchmailconf-1.43.2"
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://fetchmail.berlios.de"
-SRC_URI="http://download2.berlios.de/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ssl nls ipv6 kerberos krb4 hesiod"
-
-DEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( app-crypt/mit-krb5 )
-	nls? ( sys-devel/gettext )
-	elibc_FreeBSD? ( sys-libs/com_err )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch "${FILESDIR}"/${PN}-6.2.5-broken-headers.patch || die
-}
-
-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)
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README README.NTLM README.SSL TODO
-
-	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
-		elog
-		elog "You will not be able to use fetchmailconf(1), because you"
-		elog "don't seem to have Python with tkinter support."
-		elog
-		elog "If you want to be able to use fetchmailconf(1), do the following:"
-		elog "  1.  Add 'tk' to the USE variable in /etc/make.conf."
-		elog "  2.  (Re-)merge Python."
-		elog
-	fi
-
-	elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-	elog "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.3.7-r1.ebuild b/net-mail/fetchmail/fetchmail-6.3.7-r1.ebuild
deleted file mode 100644
index e6dd0f964193..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.7-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.7-r1.ebuild,v 1.2 2007/06/12 12:27:08 genone Exp $
-
-inherit eutils
-
-FCONF_P="fetchmailconf-1.43.2"
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://fetchmail.berlios.de"
-SRC_URI="http://download2.berlios.de/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl nls ipv6 kerberos krb4 hesiod"
-
-DEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( app-crypt/mit-krb5 )
-	nls? ( sys-devel/gettext )
-	elibc_FreeBSD? ( sys-libs/com_err )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch "${FILESDIR}"/${PN}-6.2.5-broken-headers.patch
-
-	# Poll again without SSL on error after USER command (bug #163782).
-	epatch "${FILESDIR}"/${P}-poll-again.patch
-}
-
-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)
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README README.NTLM README.SSL TODO
-
-	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
-		elog
-		elog "You will not be able to use fetchmailconf(1), because you"
-		elog "don't seem to have Python with tkinter support."
-		elog
-		elog "If you want to be able to use fetchmailconf(1), do the following:"
-		elog "  1.  Add 'tk' to the USE variable in /etc/make.conf."
-		elog "  2.  (Re-)merge Python."
-		elog
-	fi
-
-	elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-	elog "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.3.8-r2.ebuild b/net-mail/fetchmail/fetchmail-6.3.8-r2.ebuild
deleted file mode 100644
index 1f9c17bbe948..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.8-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.8-r2.ebuild,v 1.8 2008/06/22 11:32:32 maekke Exp $
-
-inherit eutils
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://fetchmail.berlios.de"
-SRC_URI="http://download2.berlios.de/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="ssl nls ipv6 kerberos krb4 hesiod"
-
-RDEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( app-crypt/mit-krb5 )
-	nls? ( virtual/libintl )
-	elibc_FreeBSD? ( sys-libs/com_err )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fixes DoS, #191154
-	epatch "${FILESDIR}"/${P}-null-msg-pointer.patch
-
-	# bug #227105
-	epatch "${FILESDIR}"/${P}-resize-buffer.patch
-
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch "${FILESDIR}"/${PN}-6.2.5-broken-headers.patch
-}
-
-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)
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES NEWS NOTES README README.NTLM README.SSL TODO
-
-	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
-		elog
-		elog "You will not be able to use fetchmailconf(1), because you"
-		elog "don't seem to have Python with tkinter support."
-		elog
-		elog "If you want to be able to use fetchmailconf(1), do the following:"
-		elog "  1.  Add 'tk' to the USE variable in /etc/make.conf."
-		elog "  2.  (Re-)merge Python."
-		elog
-	fi
-
-	elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-	elog "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/fetchmail-6.3.8.ebuild b/net-mail/fetchmail/fetchmail-6.3.8.ebuild
deleted file mode 100644
index 6d007bbdf454..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.8.ebuild,v 1.11 2007/06/24 22:09:07 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://fetchmail.berlios.de"
-SRC_URI="http://download2.berlios.de/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ssl nls ipv6 kerberos krb4 hesiod"
-
-RDEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( app-crypt/mit-krb5 )
-	nls? ( virtual/libintl )
-	elibc_FreeBSD? ( sys-libs/com_err )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch "${FILESDIR}"/${PN}-6.2.5-broken-headers.patch
-}
-
-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)
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README README.NTLM README.SSL TODO
-
-	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
-		elog
-		elog "You will not be able to use fetchmailconf(1), because you"
-		elog "don't seem to have Python with tkinter support."
-		elog
-		elog "If you want to be able to use fetchmailconf(1), do the following:"
-		elog "  1.  Add 'tk' to the USE variable in /etc/make.conf."
-		elog "  2.  (Re-)merge Python."
-		elog
-	fi
-
-	elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-	elog "the polling delay used by the fetchmail init script."
-}
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.7-poll-again.patch b/net-mail/fetchmail/files/fetchmail-6.3.7-poll-again.patch
deleted file mode 100644
index e3a2f67c7705..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.3.7-poll-again.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: pop3.c
-===================================================================
---- pop3.c	(revision 5042)
-+++ pop3.c	(working copy)
-@@ -686,7 +686,8 @@
- #ifdef SSL_ENABLE
-     /* this is for servers which claim to support TLS, but actually
-      * don't! */
--    if (connection_may_have_tls_errors && ok == PS_SOCKET)
-+    if (connection_may_have_tls_errors
-+		    && (ok == PS_SOCKET || ok == PS_PROTOCOL))
-     {
- 	xfree(ctl->sslproto);
- 	ctl->sslproto = xstrdup("");