Cleanup

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

7 files changed, 7 insertions, 365 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 3e5bdd1bf80a..aeda414fd1c3 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.167 2009/08/19 11:25:24 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.168 2009/08/19 11:29:47 tove Exp $
+
+  19 Aug 2009; Torsten Veller <tove@gentoo.org> -fetchmail-6.3.8-r1.ebuild,
+  -files/fetchmail-6.3.8-null-msg-pointer.patch,
+  -files/fetchmail-6.3.8-resize-buffer.patch, -fetchmail-6.3.9.ebuild,
+  -fetchmail-6.3.9-r1.ebuild, -files/fetchmail:
+  Cleanup
 
   19 Aug 2009; Torsten Veller <tove@gentoo.org> fetchmail-6.3.11-r1.ebuild:
   Stable on x86, amd64 (282015)
diff --git a/net-mail/fetchmail/fetchmail-6.3.8-r1.ebuild b/net-mail/fetchmail/fetchmail-6.3.8-r1.ebuild
deleted file mode 100644
index 52b7587eb972..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.8-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.8-r1.ebuild,v 1.1 2007/09/03 14:31:41 falco 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
-
-	# 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/fetchmail-6.3.9-r1.ebuild b/net-mail/fetchmail/fetchmail-6.3.9-r1.ebuild
deleted file mode 100644
index fc5062ef52b7..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.9-r1.ebuild
+++ /dev/null
@@ -1,112 +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.9-r1.ebuild,v 1.1 2009/02/20 04:26:15 darkside Exp $
-
-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 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 )
-	virtual/python"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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
-
-	# dont compile during src_install
-	: > "${S}"/py-compile
-}
-
-src_compile() {
-#	PYTHON=: \
-		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() {
-	# 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
-
-	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.9.ebuild b/net-mail/fetchmail/fetchmail-6.3.9.ebuild
deleted file mode 100644
index 3afdb0e5f7ff..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.9.ebuild
+++ /dev/null
@@ -1,96 +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.9.ebuild,v 1.6 2009/01/10 10:11:52 maekke Exp $
-
-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 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 )
-	virtual/python"
-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
-
-	# dont compile during src_install
-	: > "${S}"/py-compile
-}
-
-src_compile() {
-#	PYTHON=: \
-		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
-	python_need_rebuild
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES NEWS NOTES README README.NTLM README.SSL TODO || die
-
-	newinitd "${FILESDIR}"/fetchmail 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
-
-	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/files/fetchmail b/net-mail/fetchmail/files/fetchmail
deleted file mode 100644
index bef969479d8f..000000000000
--- a/net-mail/fetchmail/files/fetchmail
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	use mta
-}
-
-checkconfig() {
-        if [ ! -f /etc/fetchmailrc ]; then
-                eerror "Configuration file /etc/fetchmailrc not found"
-                return 1
-        fi
-}
-
-start() {
-        checkconfig || return 1
-
-        ebegin "Starting fetchmail"
-        start-stop-daemon --start --quiet --exec /usr/bin/fetchmail \
-                -- -d ${polling_period} -f /etc/fetchmailrc
-        eend ${?}
-}
-
-stop() {
-        ebegin "Stopping fetchmail"
-        start-stop-daemon --stop --quiet --pidfile /var/run/fetchmail.pid
-        eend ${?}
-}
-
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.8-null-msg-pointer.patch b/net-mail/fetchmail/files/fetchmail-6.3.8-null-msg-pointer.patch
deleted file mode 100644
index cc89aa6a44c4..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.3.8-null-msg-pointer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sink.c
-===================================================================
---- sink.c	(revision 5118)
-+++ sink.c	(revision 5119)
-@@ -262,7 +262,7 @@
-     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
- 
-     /* don't bounce in reply to undeliverable bounces */
--    if (!msg->return_path[0] ||
-+    if (!msg || !msg->return_path[0] ||
- 	strcmp(msg->return_path, "<>") == 0 ||
- 	strcasecmp(msg->return_path, md1) == 0 ||
- 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0) 
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.8-resize-buffer.patch b/net-mail/fetchmail/files/fetchmail-6.3.8-resize-buffer.patch
deleted file mode 100644
index 31075fabd709..000000000000
--- a/net-mail/fetchmail/files/fetchmail-6.3.8-resize-buffer.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- report.c.orig	2008-06-15 12:35:20.974808379 +0200
-+++ report.c	2008-06-15 12:36:51.961927723 +0200
-@@ -238,11 +238,17 @@
-     rep_ensuresize();
- 
- #if defined(VA_START)
--    VA_START (args, message);
-     for ( ; ; )
-     {
-+	/*
-+	 * args has to be initialized before every call of vsnprintf(),
-+	 * because vsnprintf() invokes va_arg macro and thus args is
-+	 * undefined after the call.
-+	 */
-+	VA_START(args, message);
- 	n = vsnprintf (partial_message + partial_message_size_used, partial_message_size - partial_message_size_used,
- 		       message, args);
-+	va_end (args);
- 
- 	if (n >= 0
- 	    && (unsigned)n < partial_message_size - partial_message_size_used)
-@@ -254,7 +260,6 @@
- 	partial_message_size += 2048;
- 	partial_message = REALLOC (partial_message, partial_message_size);
-     }
--    va_end (args);
- #else
-     for ( ; ; )
-     {