Ebuild improvement. Closes #84687.

(Portage version: 2.0.51.20-r5)

6 files changed, 122 insertions, 20 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 9edcd7f3c2ae..32ffdb911e71 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/fetchmail
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.55 2004/11/03 04:24:04 psi29a Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.56 2005/04/28 18:22:34 ticho Exp $
+
+*fetchmail-6.2.5-r2 (28 Apr 2005)
+
+  28 Apr 2005; Andrej Kacian <ticho@gentoo.org> +fetchmail-6.2.5-r2.ebuild:
+  Some ebuild enhancements - mostly DEPEND related. Closes bug #84687, patch
+  provided by Diego Pettenò <flameeyes@gentoo.org>.
 
   02 Nov 2004; Bret Curtis,,, <psi@gentoo.org> fetchmail-6.2.3.ebuild,
   fetchmail-6.2.5-r1.ebuild, fetchmail-6.2.5.ebuild:
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index e643355ccf3d..5fdc356c9326 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,25 +1,29 @@
-MD5 282521759c67404a7cc1137ca467b6e9 ChangeLog 8508
+MD5 dfd9bda1fd8499be5d1e8847c6c6e477 fetchmail-6.2.1-r1.ebuild 1778
+MD5 4699605e930914b11ab0b894d5b8c545 fetchmail-6.2.4.ebuild 2143
 MD5 0e3513a92097cbf36de0d981f0c6489e fetchmail-5.9.14.ebuild 1897
+MD5 93696635908b3e9f12e791de449a82c8 fetchmail-6.2.2-r2.ebuild 2043
+MD5 9e66c5be4574659106bf5e28ee59a9f2 fetchmail-6.2.5-r2.diff 2284
 MD5 8a5a81b6cd89c3cf5fe341accd3ed708 fetchmail-6.2.3.ebuild 1962
-MD5 4699605e930914b11ab0b894d5b8c545 fetchmail-6.2.4.ebuild 2143
+MD5 86b4417f2b71267a518bb3b269dc2ba5 fetchmail-6.2.5-r2.ebuild 2412
+MD5 81feec820140373991a64991b9c99b5d f.patch 2053
 MD5 47387ea53567967ca0058104cba62288 fetchmail-6.2.5.ebuild 2443
+MD5 282521759c67404a7cc1137ca467b6e9 ChangeLog 8508
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 dfd9bda1fd8499be5d1e8847c6c6e477 fetchmail-6.2.1-r1.ebuild 1778
-MD5 93696635908b3e9f12e791de449a82c8 fetchmail-6.2.2-r2.ebuild 2043
 MD5 d8c4ff6091e85f5404447a2e338a8037 fetchmail-6.2.5-r1.ebuild 2568
-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 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 c9baecd4bea485a075f696462c9ab6cc files/fetchmail 581
 MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
 MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
 MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5-r1 68
-MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
-MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
+MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5-r2 68
+MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
 MD5 74bad5b4190b32597543a61ed0c7ec7a files/fetchmail-6.2.2-multiple-return-path.diff 1142
-MD5 32b3f4317fd807e171da3cd6c27217c2 files/fetchmail-6.2.5-kerberos.patch 1143
+MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
+MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
 MD5 91b291c03a6f375401dc2fee56beeeef files/fetchmail-6.2.5-broken-headers.patch 250
+MD5 29d376a1042aeeeba94e911a943d5a7f files/conf.d-fetchmail 347
+MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
 MD5 fa0432a854f2a63b2b6fa0a8e65985f7 files/fetchmail-6.2.5-fetchsizelimit.patch 526
+MD5 c9baecd4bea485a075f696462c9ab6cc files/fetchmail 581
+MD5 32b3f4317fd807e171da3cd6c27217c2 files/fetchmail-6.2.5-kerberos.patch 1143
+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
diff --git a/net-mail/fetchmail/fetchmail-6.2.1-r1.ebuild b/net-mail/fetchmail/fetchmail-6.2.1-r1.ebuild
index dc7e47c472f1..ef9bac72d8aa 100644
--- a/net-mail/fetchmail/fetchmail-6.2.1-r1.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.10 2004/07/01 22:31:31 eradicator Exp $
+# $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
 
diff --git a/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild b/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
index 15b730406095..b665514b87ff 100644
--- a/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3 2004/11/03 04:24:04 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild,v 1.4 2005/04/28 18:22:34 ticho Exp $
 
 inherit eutils gnuconfig
 
diff --git a/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild b/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild
new file mode 100644
index 000000000000..32534d217c22
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.2.5-r2.ebuild
@@ -0,0 +1,91 @@
+# 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.1 2005/04/28 18:22:34 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 ~sparc ~x86"
+IUSE="ssl nls ipv6 kerberos krb4 hesiod"
+
+DEPEND="virtual/libc
+	hesiod? ( net-dns/hesiod )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( app-crypt/kth-krb )
+	sys-devel/gettext
+	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
+
+	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/files/digest-fetchmail-6.2.5-r2 b/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r2
new file mode 100644
index 000000000000..11752ef97731
--- /dev/null
+++ b/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r2
@@ -0,0 +1 @@
+MD5 9956b30139edaa4f5f77c4d0dbd80225 fetchmail-6.2.5.tar.gz 1257376