Cleanup

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 10 insertions, 239 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 7ec7a4f2cf35..e8b680e972e2 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.183 2010/03/29 09:14:37 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.184 2010/03/29 09:40:25 tove Exp $
+
+  29 Mar 2010; Torsten Veller <tove@gentoo.org>
+  -files/6.3.11-fix-free-corruption.patch, -fetchmail-6.3.11-r1.ebuild,
+  -fetchmail-6.3.13.ebuild:
+  Cleanup
 
 *fetchmail-6.3.15 (29 Mar 2010)
 
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 40922318941c..6d3f998e79ae 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 6.3.11-fix-free-corruption.patch 563 RMD160 5afa1aaca400ae194c79a4d77b76ab60a721c03c SHA1 0a5b87f7e310a1269bc8d0b080f7a98f7d5c46c2 SHA256 3527f203d485c4400823afc8c8c894b40809d62396b3a2925878e4b0f6adae0c
 AUX conf.d-fetchmail 347 RMD160 5a042695f6849653d32b17a6852025d1d695770a SHA1 9a0956877f5d8ac3e1c7c949a9921c3f1b1e7307 SHA256 8ba3e51b5a51b42daf8cfa2183c938afb04fd6a9cc941e1adb9faa10aff677bf
 AUX fetchmail-6.2.5-broken-headers.patch 288 RMD160 1e5237c2cd24223ec4b98b2f67c5780d2026a559 SHA1 006d59dc95138a5db241a0536b10978b05227f26 SHA256 a72666259b30fed72a5c63519bfa0c888d14570c14c227c2418a2100cf08d326
 AUX fetchmail.new 686 RMD160 d686776466385ec205dd704dbab999953cb9ee17 SHA1 660e9c766cbf4629a3e74ecd74ef56b5a1a299ce SHA256 5ef42ca61fcf0e60529e0be9c6bef4b61a9e34e7a82f766f046c8457bc9392b5
-DIST fetchmail-6.3.11.tar.bz2 1608923 RMD160 8d6b0e42b9ead6e836e40e8ae494a6f5b7d3a59b SHA1 e769bcb81b393a55e02ec4bf7e94a52cf0c8ef8f SHA256 ba679cef82b9520bc5dbe9e2e54381e488b5712faf885deb7612393b5ab80c6f
-DIST fetchmail-6.3.13.tar.bz2 1614718 RMD160 7468325f3b2b03a47175b3728393cc440d3a98e6 SHA1 930cf3aae54108572b1c695c75dd14cf865f5d16 SHA256 206a299f7ced9d7359621cc8e590a22f9cfc9c713696474e2119a1340c2e98ee
 DIST fetchmail-6.3.14.tar.bz2 1621188 RMD160 62001764dead52a66cdec239209493f1503fe397 SHA1 2bc18f121d5b99e22584970c6f8b62bb65430c4c SHA256 8657f786f5af1857ddb3b50203e6cde2efad43f49828973cbb22f6d431208607
 DIST fetchmail-6.3.15.tar.bz2 1629190 RMD160 fa3cb6c504d91b25aab5cc929130160d17ae8125 SHA1 17dd8257586b8d67a7b925e12314eb37b245b287 SHA256 8e5c5e7f839ed7995adff3c359b11a87820ac3d033d71689b3a829b50abd5374
-EBUILD fetchmail-6.3.11-r1.ebuild 2998 RMD160 18eb656cef9f10d2d3a221844dd7ed69da749c7c SHA1 e4f9dc650a1fc43704b0c2c486e4dbc0bcb2137e SHA256 0f980141d5f32b7dd917d17e1d6a9cb853defc43200219d789b252b044d5c7ba
-EBUILD fetchmail-6.3.13.ebuild 2723 RMD160 899dd58ade15c932e2575ffffdf2303c9524fb0a SHA1 fb8db6f686f8a5a6b6adf4f584d6c548fd88f37a SHA256 e6278d601a4c9f6caf6a8bb026ab1cdd95a1a216f4ece70f8dcab1192bedf865
 EBUILD fetchmail-6.3.14.ebuild 2711 RMD160 90f1c5e7af5ecc2bee7a01ef8952740d92676c3f SHA1 fb1bb2cbeea03791ffed095e20ae58bf512e2cbd SHA256 92c16fe0911201e8480644b7c364afb8b09148038167076c658ac8a8c78a8ce6
 EBUILD fetchmail-6.3.15.ebuild 3158 RMD160 55ef32eda54a5c321a8bcec7fbd22a655ae9b7d6 SHA1 11a5a4f5b01eec30893954f3d5f88769e4dc7fc1 SHA256 356c5735357406a9b17dd771f9c4d933ed96731b15a857ff13aa365220dde061
-MISC ChangeLog 26791 RMD160 2629c8fe8c1d76ff4cfef2f75b943f780056986a SHA1 b41ff423137178954eeebad81092e518c4cae560 SHA256 d32ceca0528c10eb7afe256c7ea3d19c9c08eac8fb8f0ba8dcf790338848e618
+MISC ChangeLog 26950 RMD160 49fe206d0a6e4d3f252da9dd00a73776af00a83e SHA1 0f32c13abbaf2a1bec37fe1878ba42b315f3ed3f SHA256 655f371d859d7d6b0d0f0e333666db04325699167e7e409388203b5fb947c0b4
 MISC metadata.xml 237 RMD160 c2a1a048559257005241ad0985c814bd6aab17a7 SHA1 d448f9b9c9f2a92d95efaf4cf9ce3b83b3f9ad3b SHA256 2ff40136507932f8146b07f93d8414eef1cba8bbed94c9eeccf42b6cbbebf7c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuwcHEACgkQV3J2n04EauzfLgCgwMi82HLzLwB8cVbTUnASqBqR
-DNgAoMH8kndgB1dO5kX3gaEt+MJt2GQV
-=TdSl
+iEYEARECAAYFAkuwdY8ACgkQV3J2n04EauyDUACfUkHo6yKvDGoYb1mAHsgeL9K2
+XNwAnjLeDdaJmTzk1agTWGNr+cDom1q3
+=DS0G
 -----END PGP SIGNATURE-----
diff --git a/net-mail/fetchmail/fetchmail-6.3.11-r1.ebuild b/net-mail/fetchmail/fetchmail-6.3.11-r1.ebuild
deleted file mode 100644
index bafdb7507ed1..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.11-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.11-r1.ebuild,v 1.7 2009/09/27 15:12:16 nixnut Exp $
-
-EAPI=2
-
-inherit multilib python eutils
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://fetchmail.berlios.de"
-SRC_URI="mirror://berlios/${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 kerberos krb4 hesiod"
-
-RDEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( app-crypt/mit-krb5 )
-	krb4? ( <app-crypt/mit-krb5-1.7[krb4] )
-	nls? ( virtual/libintl )
-	elibc_FreeBSD? ( sys-libs/com_err )
-	virtual/python"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch "${FILESDIR}"/${PN}-6.2.5-broken-headers.patch
-
-	epatch "${FILESDIR}"/${PV}-fix-free-corruption.patch
-
-	# dont compile during src_install
-	: > "${S}"/py-compile
-}
-
-src_configure() {
-#	PYTHON=: \
-		econf \
-		--disable-dependency-tracking \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos kerberos5) \
-		$(use_with krb4 kerberos) \
-		$(use_with ssl) \
-		$(use_with hesiod) \
-		${myconf} || die "Configuration failed."
-}
-
-src_install() {
-	# dir for pidfile
-	dodir /var/run/${PN} || die "dodir failed"
-	keepdir /var/run/${PN}
-	fowners ${PN}:${PN} /var/run/${PN} || die "fowners failed"
-
-	# fetchmail's homedir (holds fetchmail's .fetchids)
-	dodir /var/lib/${PN} || die "dodir failed"
-	keepdir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN} || die "fowners failed"
-	fperms 700 /var/lib/${PN} || die "fperms failed"
-
-	emake DESTDIR="${D}" install || die
-	python_need_rebuild
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO || die
-
-	newinitd "${FILESDIR}"/fetchmail.new fetchmail || die
-	newconfd "${FILESDIR}"/conf.d-fetchmail fetchmail || die
-
-	docinto contrib
-	local f
-	for f in contrib/* ; do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/fetchmailconf.py
-
-	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."
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
-}
diff --git a/net-mail/fetchmail/fetchmail-6.3.13.ebuild b/net-mail/fetchmail/fetchmail-6.3.13.ebuild
deleted file mode 100644
index 26dc3545cd9f..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.13.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.13.ebuild,v 1.2 2009/10/30 10:16:51 tove Exp $
-
-EAPI=2
-
-inherit multilib python eutils
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://fetchmail.berlios.de"
-SRC_URI="mirror://berlios/${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 kerberos hesiod tk"
-
-RDEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 )
-	nls? ( virtual/libintl )
-	elibc_FreeBSD? ( sys-libs/com_err )
-	dev-lang/python[tk?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-RESTRICT=test
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch "${FILESDIR}"/${PN}-6.2.5-broken-headers.patch
-
-	# dont compile during src_install
-	: > "${S}"/py-compile
-}
-
-src_configure() {
-#	PYTHON=: \
-		econf \
-		--disable-dependency-tracking \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use kerberos && echo "--with-ssl" ) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos kerberos5) \
-		$(use_with hesiod) \
-		${myconf} || die "Configuration failed."
-}
-
-src_install() {
-	# dir for pidfile
-	dodir /var/run/${PN} || die "dodir failed"
-	keepdir /var/run/${PN}
-	fowners ${PN}:${PN} /var/run/${PN} || die "fowners failed"
-
-	# fetchmail's homedir (holds fetchmail's .fetchids)
-	dodir /var/lib/${PN} || die "dodir failed"
-	keepdir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN} || die "fowners failed"
-	fperms 700 /var/lib/${PN} || die "fperms failed"
-
-	emake DESTDIR="${D}" install || die
-	python_need_rebuild
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO || die
-
-	newinitd "${FILESDIR}"/fetchmail.new fetchmail || die
-	newconfd "${FILESDIR}"/conf.d-fetchmail fetchmail || die
-
-	docinto contrib
-	local f
-	for f in contrib/* ; do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/fetchmailconf.py
-
-	if ! has_version dev-lang/python[tk] ; then
-		elog "Reinstall ${CATEGORY}/${PN} with USE=tk"
-		elog "if you want to use fetchmailconf."
-	fi
-
-	elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-	elog "the polling delay used by the fetchmail init script."
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
-}
diff --git a/net-mail/fetchmail/files/6.3.11-fix-free-corruption.patch b/net-mail/fetchmail/files/6.3.11-fix-free-corruption.patch
deleted file mode 100644
index d84d50cc8c94..000000000000
--- a/net-mail/fetchmail/files/6.3.11-fix-free-corruption.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- socket.c
-+++ socket.c
-@@ -628,9 +628,10 @@
- 				report(stdout, GT_("Unknown Issuer CommonName\n"));
- 		}
- 		if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) {
--			if (outlevel >= O_VERBOSE)
-+			if (outlevel >= O_VERBOSE) {
- 				report(stdout, GT_("Server CommonName: %s\n"), (tt = sdump(buf, i)));
--			xfree(tt);
-+				xfree(tt);
-+			}
- 			if ((size_t)i >= sizeof(buf) - 1) {
- 				/* Possible truncation. In this case, this is a DNS name, so this
- 				 * is really bad. We do not tolerate this even in the non-strict case. */