Version bump (#288578). Adds heimdal support (#185652, #231400). Drops Kerberos V4 support. Cleanup

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

3 files changed, 33 insertions, 22 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index a4b07bd4917a..29a37b6b152c 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,13 @@
 # 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.173 2009/09/27 15:12:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.174 2009/10/30 08:57:00 tove Exp $
+
+*fetchmail-6.3.13 (30 Oct 2009)
+
+  30 Oct 2009; Torsten Veller <tove@gentoo.org> -fetchmail-6.3.11.ebuild,
+  +fetchmail-6.3.13.ebuild:
+  Version bump (#288578). Adds heimdal support (#185652, #231400). Drops
+  Kerberos V4 support. Cleanup
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> fetchmail-6.3.11-r1.ebuild:
   ppc stable #282015
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 3d2a599e6086..51236d086e9e 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,9 +1,20 @@
+-----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
 EBUILD fetchmail-6.3.11-r1.ebuild 2998 RMD160 18eb656cef9f10d2d3a221844dd7ed69da749c7c SHA1 e4f9dc650a1fc43704b0c2c486e4dbc0bcb2137e SHA256 0f980141d5f32b7dd917d17e1d6a9cb853defc43200219d789b252b044d5c7ba
-EBUILD fetchmail-6.3.11.ebuild 2923 RMD160 eacd9825ff608128cc77212257e9f7083f65a1c7 SHA1 b64e6170d536774858c1d5d7b7a791550e9d371c SHA256 2587b13e6bef1880ec0770084be64342c9470025a7ed292526ccab2401416a7a
-MISC ChangeLog 25334 RMD160 9ec9131648c1553d1ce8f7a7445386fbed96e691 SHA1 1a6f9e832dfd5fdda5026b659cb8165c4777e971 SHA256 7507bcb24b15339e59b0a656ef55d3bf8c01e5943101dea0e7bbdb3492ae1cdb
+EBUILD fetchmail-6.3.13.ebuild 2656 RMD160 aa3d460f5ce84a71039852b6e855f9722243f39b SHA1 01f9e0a03f2a8edc098a2c7bb47fc29594734445 SHA256 23a2951de928eeb8c367ab4cd43f836e97f8c0b1d4fb6f6ca112a5de3ec91470
+MISC ChangeLog 25572 RMD160 1a64f5748e2d70babe21c2ff7d38f85344cd1ea4 SHA1 7ba21150c2782cdbabbc3a1e0cdd551af7aeb31c SHA256 861f3984008b8ccc4a15aea232da397e4cc8593a1754877c567e8ea7f161dd20
 MISC metadata.xml 237 RMD160 c2a1a048559257005241ad0985c814bd6aab17a7 SHA1 d448f9b9c9f2a92d95efaf4cf9ce3b83b3f9ad3b SHA256 2ff40136507932f8146b07f93d8414eef1cba8bbed94c9eeccf42b6cbbebf7c3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrqqmIACgkQV3J2n04Eaux+KQCfaQDVkfmigQC7EZQ2NnXRKn/B
+6ikAnjKZTX7T6g2Z8vJp9khBdqzh38aM
+=txmK
+-----END PGP SIGNATURE-----
diff --git a/net-mail/fetchmail/fetchmail-6.3.11.ebuild b/net-mail/fetchmail/fetchmail-6.3.13.ebuild
index 4d67dbefa9b9..201fb15eaf2c 100644
--- a/net-mail/fetchmail/fetchmail-6.3.11.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.13.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.8 2009/08/10 22:19:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.13.ebuild,v 1.1 2009/10/30 08:57:00 tove Exp $
 
 EAPI=2
 
@@ -12,19 +12,20 @@ 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"
+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? ( app-crypt/mit-krb5 )
-	krb4? ( <app-crypt/mit-krb5-1.7[krb4] )
+	kerberos? ( virtual/krb5 )
 	nls? ( virtual/libintl )
 	elibc_FreeBSD? ( sys-libs/com_err )
-	virtual/python"
+	dev-lang/python[tk?]"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+RESTRICT=test
+
 pkg_setup() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
@@ -48,7 +49,6 @@ src_configure() {
 		$(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."
@@ -85,18 +85,11 @@ src_install() {
 
 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
+	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"