Cleanup

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 6 insertions, 338 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index f94674dff266..0a8aab690547 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.194 2010/05/18 06:10:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.195 2010/05/31 16:24:02 tove Exp $
+
+  31 May 2010; Torsten Veller <tove@gentoo.org>
+  -files/fetchmail-6.2.5-broken-headers.patch, -fetchmail-6.3.14.ebuild,
+  -fetchmail-6.3.15.ebuild, -fetchmail-6.3.16.ebuild:
+  Cleanup
 
 *fetchmail-6.3.17-r1 (18 May 2010)
 
diff --git a/net-mail/fetchmail/fetchmail-6.3.14.ebuild b/net-mail/fetchmail/fetchmail-6.3.14.ebuild
deleted file mode 100644
index 0c1a608df924..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.14.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.14.ebuild,v 1.7 2010/03/10 11:08:12 jer 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/fetchmail-6.3.15.ebuild b/net-mail/fetchmail/fetchmail-6.3.15.ebuild
deleted file mode 100644
index d8c51d2da58b..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.15.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.15.ebuild,v 1.2 2010/03/29 09:18:36 tove Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH_OPT="tk"
-PYTHON_USE_WITH="tk"
-
-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 )"
-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
-
-	# 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
-
-	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_mod_optimize "$(python_get_sitedir)/fetchmailconf.py"
-
-	ewarn "From the NEWS:"
-	ewarn "Fetchmail now supports a bad-header command line or rcfile option that takes"
-	ewarn "exactly one argument, accept or reject (default).  This specifies how messages"
-	ewarn "with bad headers retrieved from the current server are to be treated."
-	ewarn ""
-	ewarn "Gentoo's previous fetchmail versions accepted messages with bad"
-	ewarn "headers. So if you upgrade you must update your configuration files"
-	ewarn "to imitate the old behavior."
-	echo
-
-	if ! has_version dev-lang/python[tk] ; then
-		elog "Reinstall ${CATEGORY}/${PN} with USE=tk"
-		elog "if you want to use fetchmailconf."
-		echo
-	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_mod_cleanup "$(python_get_sitedir)/fetchmailconf.py"
-}
diff --git a/net-mail/fetchmail/fetchmail-6.3.16.ebuild b/net-mail/fetchmail/fetchmail-6.3.16.ebuild
deleted file mode 100644
index bc2fcd274258..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.16.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.16.ebuild,v 1.1 2010/04/07 06:23:01 tove Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH_OPT="tk"
-PYTHON_USE_WITH="tk"
-
-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 )"
-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
-
-	# 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
-
-	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_mod_optimize "$(python_get_sitedir)/fetchmailconf.py"
-
-	ewarn "From the NEWS:"
-	ewarn "Fetchmail now supports a bad-header command line or rcfile option that takes"
-	ewarn "exactly one argument, accept or reject (default).  This specifies how messages"
-	ewarn "with bad headers retrieved from the current server are to be treated."
-	ewarn ""
-	ewarn "Gentoo's previous fetchmail versions accepted messages with bad"
-	ewarn "headers. So if you upgrade you must update your configuration files"
-	ewarn "to imitate the old behavior."
-	echo
-
-	if ! has_version dev-lang/python[tk] ; then
-		elog "Reinstall ${CATEGORY}/${PN} with USE=tk"
-		elog "if you want to use fetchmailconf."
-		echo
-	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_mod_cleanup "$(python_get_sitedir)/fetchmailconf.py"
-}
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch b/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch
deleted file mode 100644
index 1f1ce04e6fdd..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fetchmail-6.2.5.orig/transact.c~	2004-06-01 16:51:33.769501872 +0200
-+++ fetchmail-6.2.5/transact.c		2004-06-01 16:52:18.322728752 +0200
-@@ -516,6 +516,7 @@
- 		if (linelen != strlen (line))
- 		    has_nuls = TRUE;
- 		free(line);
-+		refuse_mail = 0;
- 		goto process_headers;
- 	    }
-