*** empty log message ***

17 files changed, 425 insertions, 75 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index 1635d705741a..5863f210c8cf 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,9 +1,333 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.1 2002/02/23 18:06:44 g2boojum Exp $
+# ChangeLog for net-mail/uw-imap
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.1.1.1 2005/11/30 10:03:06 chriswhite Exp $
 
-*uw-imap-2001a (23 Feb. 2002)
+  07 Oct 2005; Simon Stelling <blubb@gentoo.org> uw-imap-2004g-r1.ebuild:
+  marked stable on amd64 wrt bug 108206
 
-  22 Feb 2002; Grant Goodyear <g2boojum@gentoo.org>  :
+  07 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  uw-imap-2004g-r1.ebuild:
+  Stable on hppa, ppc. See bug #108206.
+
+  07 Oct 2005; Andrej Kacian <ticho@gentoo.org> uw-imap-2004g.ebuild,
+  uw-imap-2004g-r1.ebuild, uw-imap-2004g-r2.ebuild:
+  Fix amd64 patch name. Bug #108344.
+
+  06 Oct 2005; Brent Baude <ranger@gentoo.org> uw-imap-2004g-r1.ebuild:
+  Marking uw-imap-2004g-r1 ppc64 for bug 108206
+
+*uw-imap-2004g-r2 (06 Oct 2005)
+
+  06 Oct 2005; Andrej Kacian <ticho@gentoo.org> +uw-imap-2004g-r2.ebuild:
+  Remove pic USEflag, and build c-client with -fPIC unconditionally. Closes
+  bug #101051.
+
+  06 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  uw-imap-2004g-r1.ebuild:
+  Stable on sparc wrt #108206
+
+  06 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  uw-imap-2004g-r1.ebuild:
+  stable on alpha wrt bug #108206
+
+  06 Oct 2005; Andrej Kacian <ticho@gentoo.org> uw-imap-2004g-r1.ebuild:
+  Stable on x86, due to security bug #108206.
+
+*uw-imap-2004g-r1 (06 Oct 2005)
+
+  06 Oct 2005; Andrej Kacian <ticho@gentoo.org> +uw-imap-2004g-r1.ebuild:
+  Split mailutil and mtest utilities to a separate package
+  (net-mail/uw-mailutils), to fix file collisions with pine. Closes bug
+  #105313.
+
+*uw-imap-2004g (05 Oct 2005)
+
+  05 Oct 2005; Andrej Kacian <ticho@gentoo.org> +uw-imap-2004g.ebuild:
+  Version bump, due to security bug #108206.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> uw-imap-2004c-r3.ebuild:
+  Stable on ppc64
+
+  22 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  uw-imap-2004c-r3.ebuild:
+  pseudo-depend on mailbase +pam
+
+  22 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  uw-imap-2004c-r3.ebuild:
+  Stable on hppa
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> uw-imap-2004c-r3.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> uw-imap-2004c-r3.ebuild:
+  Tiny cleanup in symlink creation of the .so.
+
+  06 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  uw-imap-2004c-r3.ebuild:
+  Stable on alpha, bug 83797.
+
+  05 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> uw-imap-2004c-r3.ebuild:
+  Stable on amd64, bug 83797.
+
+  04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> uw-imap-2004c-r3.ebuild:
+  Stable on sparc wrt #83797
+
+  03 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  uw-imap-2004c-r3.ebuild:
+  Stable on ppc.
+
+  03 Mar 2005; Andrej Kacian <ticho@gentoo.org> uw-imap-2004c-r3.ebuild:
+  Stable on x86, bug #83797.
+
+  03 Mar 2005; Andrej Kacian <ticho@gentoo.org> uw-imap-2004c-r3.ebuild:
+  Correction in clearpasswd message.
+
+  03 Mar 2005; Andrej Kacian <ticho@gentoo.org> uw-imap-2004c-r3.ebuild:
+  Take ssl flag into account for clearpasswd.
+
+*uw-imap-2004c-r3 (03 Mar 2005)
+
+  03 Mar 2005; Andrej Kacian <ticho@gentoo.org> uw-imap-2004c-r1.ebuild,
+  +uw-imap-2004c-r3.ebuild:
+  Revision bump to restrict cleartext LOGIN to SSL/TLS sessions by default.
+  Introduced "clearpasswd" USE flag to toggle this restriction. Suggested by
+  Tero Pelander <tpeland@tkukoulu.fi> in bug #83797. 2004c-r1 stable on x86.
+
+  18 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  uw-imap-2004c-r2.ebuild:
+  Avoid problems if mailbase wasn't build with pam use flag
+
+*uw-imap-2004c-r2 (11 Feb 2005)
+
+  11 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +uw-imap-2004c-r2.ebuild:
+  Don't install pam.d files. #79240. Depend on mailbase-0.00-r8 at least
+
+  01 Feb 2005; Olivier CrĂŞte <tester@gentoo.org> :
+  Stable on x86 per security bug #79874
+
+  30 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> uw-imap-2004c.ebuild:
+  Stable on alpha, bug 79874.
+
+*uw-imap-2004c-r1 (01 Feb 2005)
+
+  01 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/uw-imap-2004c-amd64-so-fix.patch, +uw-imap-2004c-r1.ebuild:
+  Patched Makefile to build a shared library for amd64, allowing PHP 5 with imap
+  to compile. Also fixed the symlinking of c-client.a for multilib archs, and
+  made the ebuild respect user CFLAGS.
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> uw-imap-2004c.ebuild:
+  stable on amd64.
+
+  29 Jan 2005; Jason Wever <weeve@gentoo.org> uw-imap-2004c.ebuild:
+  Stable on sparc wrt security bug #79874.
+
+  28 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> uw-imap-2004c.ebuild:
+  Stable on ppc.
+
+  28 Jan 2005; Andrej Kacian <ticho@gentoo.org> -uw-imap-2002e-r4.ebuild:
+  Removing aging ebuild.
+
+*uw-imap-2004c (28 Jan 2005)
+
+  28 Jan 2005; Andrej Kacian <ticho@gentoo.org> +uw-imap-2004c.ebuild:
+  Version bump.
+
+  08 Jan 2005; Tom Martin <slarti@gentoo.org> uw-imap-2002e-r4.ebuild:
+  Added missing inherit flag-o-matic to 2002e-r4.
+
+*uw-imap-2002e-r3 (03 Jan 2005)
+
+  03 Jan 2005; Andrej Kacian <ticho@gentoo.org> -uw-imap-2002d-r1.ebuild,
+  -uw-imap-2002d.ebuild, -uw-imap-2002e-r1.ebuild, -uw-imap-2002e-r2.ebuild,
+  -uw-imap-2002e-r3.ebuild, -uw-imap-2002e.ebuild:
+  Old ebuild cleanup. Keeping 2002e-r4 just in case someone needs it.
+
+  03 Jan 2005; Joseph Jezak <josejx@gentoo.org> uw-imap-2004a.ebuild:
+  Marked ppc stable for bug #72323.
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> uw-imap-2004a.ebuild:
+  Stable on amd64.
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> uw-imap-2004a.ebuild:
+  Stable on alpha, bug 72323.
+
+  24 Nov 2004; Christian Birchinger <joker@gentoo.org> uw-imap-2004a.ebuild:
+  Added sparc stable keyword
+
+  24 Nov 2004; Andrej Kacian <ticho@gentoo.org> uw-imap-2004a.ebuild:
+  Stable on x86.
+
+  24 Nov 2004; Andrej Kacian <ticho@gentoo.org> uw-imap-2002e-r4.ebuild,
+  uw-imap-2004a.ebuild:
+  Removed mbox USE flag from 2002e-r4 and 2004a, as it is not used at all.
+  Inherit flag-o-matic.
+
+  31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  uw-imap-2002e-r4.ebuild:
+  Stable on alpha.
+
+  16 Oct 2004; Jason Wever <weeve@gentoo.org> uw-imap-2002e-r4.ebuild:
+  Stable on sparc.
+
+  13 Oct 2004; Guy Martin <gmsoft@gentoo.org> uw-imap-2002e-r4.ebuild:
+  Stable on hppa.
+
+  11 Oct 2004; Andrej Kacian <ticho@gentoo.org> uw-imap-2002e-r4.ebuild:
+  Stable on x86.
+
+*uw-imap-2004a (04 Oct 2004)
+
+  04 Oct 2004; Andrej Kacian <ticho@gentoo.org> +uw-imap-2004a.ebuild:
+  Version bump, closes #57177. Thanks to Mike Gilbert <mdgilber@umich.edu> for
+  the ebuild.
+
+  04 Sep 2004; Jon Hood <squinky86@gentoo.org> uw-imap-2002e-r4.ebuild:
+  Change virtual/glibc --> virtual/libc.
+
+*uw-imap-2002e-r4 (03 Sep 2004)
+
+  03 Sep 2004; Andrej Kacian <ticho@gentoo.org> +uw-imap-2002e-r4.ebuild:
+  Added kerberos USE flag. Ebuild submitted by Bob Smart <Bob.Smart@csiro.au>,
+  closes #34783.
+
+  15 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> :
+  bug #56917, pic stuff.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  uw-imap-2002d-r1.ebuild, uw-imap-2002d.ebuild, uw-imap-2002e-r1.ebuild,
+  uw-imap-2002e-r2.ebuild, uw-imap-2002e.ebuild:
+  virtual/glibc -> virtual/libc
+
+*uw-imap-2002e-r2 (09 May 2004)
+
+  09 May 2004; Robin H. Johnson <robbat2@gentoo.org> uw-imap-2002e-r2.ebuild:
+  bug #50504, and slight ebuild cleanup
+
+  03 Feb 2004; Guy Martin <gmsoft@gentoo.org> uw-imap-2002e-r1.ebuild :
+  Marked stable on hppa.
+
+  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> uw-imap-2002e-r1.ebuild:
+  stable on alpha
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> uw-imap-2002e-r1.ebuild:
+  Make stable on ppc
+  Thanks to Florian Daniel for the testing
+
+  08 Nov 2003; Brad House <brad_mssw@gentoo.org> uw-imap-2002e-r1.ebuild:
+  add amd64 flag
+
+  02 Nov 2003; Christian Birchinger <joker@gentoo.org>
+  uw-imap-2002e-r1.ebuild:
+  Added sparc stable keyword
+
+*uw-imap-2002e-r1 (25 Oct 2003)
+
+  25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> uw-imap-2002e-r1.ebuild,
+  uw-imap-2002e.ebuild:
+  bump to x86 and install more manpages
+
+*uw-imap-2002e (11 Sep 2003)
+
+  11 Sep 2003; Martin Holzer <mholzer@gentoo.org> uw-imap-2002e.ebuild:
+  Version bumped.
+
+*uw-imap-2002d-r1 (11 Aug 2003)
+
+  11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> uw-imap-2002d-r1.ebuild:
+  fix bug #18529 and ensure uw-imap is built with -fPIC where appropriate
+
+*uw-imap-2002d (30 May 2003)
+
+  20 Jun 2003; Robin Johnson <robbat2@gentoo.org> uw-imap-2002d.ebuild:
+  Add PROVIDE virtual/imap-c-client.
+
+  30 May 2003; Robin Johnson <robbat2@gentoo.org> uw-imap-2002d.ebuild,
+  files/digest-uw-imap-2002d:
+  Add in the digest file that Prez forgot to commit!
+  Clean hardcoded version numbers out.
+
+  30 May 2003; Preston A. Elder <prez@gentoo.org> uw-imap-2002d.ebuild,
+  files/digest-uw-imap-2002d :
+  Version bump (security issue).
+
+*uw-imap-2002c (25 May 2003)
+
+  27 May 2003; Robin Johnson <robbat2@gentoo.org> uw-imap-2002c.ebuild:
+  Fix bug #21565. Also ensure makefile doesn't ask the interactive question
+  for both SSL cases (assume yes). Fixed a userpriv install bug due to bad
+  permissions (444) inside the initial tarball.
+
+  25 May 2003; Preston A. Elder <prez@gentoo.org> uw-imap-2002c.ebuild,
+  files/digest-uw-imap-2002c files/uw-ipop3s.xinetd :
+  Version bump.
+
+*uw-imap-2002b (12 Jan 2003)
+
+  09 Feb 2003; Dean Bailey <alron@gentoo.org> uw-imap-2002b.ebuild, 
+  uw-imap-2001a-r3.ebuild :
+  Added !net-mail/vimap conflict.
+  
+  15 Apr 2003; Aron Griffis <agriffis@gentoo.org> uw-imap-2002b.ebuild:
+  Add ~alpha to KEYWORDS
+
+  20 Mar 2003; Guy Martin <gmsoft@gentoo.org> uw-imap-2002b.ebuild,
+  uw-imap-2002a.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  12 Jan 2003; Nick Hadaway <raker@gentoo.org> uw-imap-2002b.ebuild,
+  files/digest-uw-imap-2002b :
+  Version bump.
+
+*uw-imap-2002a (26 Dec 2002)
+
+  26 Dec 2002; Nick Hadaway <raker@gentoo.org> uw-imap-2002a.ebuild,
+  files/digest-uw-imap-2002a :
+  Version bump.  No patches this time.  Plaintext passwd file
+  authentication is currently turned of with ssl enabled.  The ssl 
+  certs directory is now /etc/ssl/certs to match with the newest openssl
+  builds.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*uw-imap-2001a-r3 (25 Sep 2002)
+
+  20 Mar 2003; Guy Martin <gmsoft@gento.org> uw-imap-2001a-r3.ebuild,
+  uw-imap-2001a-r2.ebuild :
+  Added hppa to KEYWORDS.
+
+  24 Sep 2002; Nick Hadaway <raker@gentoo.org> uw-imap-2001a-r3.ebuild,
+  files/digest-uw-imap-2001a-r3, files/gentoo-2001a-r3.diff,
+  files/imap-2001a.4-patch-with-delete-fix.bz2 :
+  Added initial Maildir support.  Much testing is needed.
+
+*uw-imap-2001a-r2 (6 Jun 2002)
+
+  17 Aug 2002; Nick Hadaway <raker@gentoo.org> uw-imap-2001a-r2.ebuild :
+  Reverted mailsubdir option change as it may break many client installs.
+  Disabled reverse DNS lookups.  Updated SSL configuration options.
+  Changed imap login timeout from 3 minutes to 1 minute.
   
-  New ebuild.  Thanks to CFuga.
+  16 Aug 2002; Nick Hadaway <raker@gentoo.org> uw-imap-2001a-r2.ebuild :
+  Added support for the default mailsubdir to be ~/mail.  Almost
+  added in support for the Y4K leap year bug fix, just in case the
+  maintainer of uw-imap disappears for a millenia or two.
+
+  6 Jun 2002; Donny Davies <woodchip@gentoo.org> uw-imap-2001a-r2.ebuild,
+  uw-imap.pam, uw-imap.pam-system-auth, uw-imap.xinetd, uw-imaps.xinetd,
+  uw-ipop2.xinetd, uw-ipop3.xinetd :
+  Default pam.d/ snippet should use system-auth; close #3218.  Add
+  $Header's, LICENSE, SLOT.
+
+*uw-imap-2001a-r1 (15 Apr 2002)
+  15 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> :  
+  Made uw-imap install more headers, so that php with imap
+  support will properly compile. Bug #1759
+  Removed virtual/imapUW PROVIDE because php will only DEPEND on
+  uw-imap specifically. pine will also no longer PROVIDE virtual/imapUW
+  now.
+
+*uw-imap-2001a (23 Feb. 2002)
+  22 Feb 2002; Grant Goodyear <g2boojum@gentoo.org>  :
+  New ebuild; submitted by Cristian Martinez <cfuga@itam.mx>.
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index 1f14a3155e83..c3cd3a83895d 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -1,21 +1,26 @@
-MD5 eb38708f31d37fcc9768211e3be1f04a uw-imap-2001a-r2.ebuild 2510
-MD5 0b42f0eba35868989c1bcbf656390d8f uw-imap-2002a.ebuild 2461
-MD5 da7dc6c869293e75bde9c16e3c7bd845 uw-imap-2002c.ebuild 2497
-MD5 c43aa0f40995b82920654304c199aa05 uw-imap-2001a-r3.ebuild 2794
-MD5 17dcc1630d3b37e682716540453f3f8c uw-imap-2002b.ebuild 2487
-MD5 8a487f4f6723ba7dca5bb4b426463c29 ChangeLog 3043
-MD5 a64376593da1d4ed7900ab825abc42dc files/uw-ipop2.xinetd 564
-MD5 c35bb5e9cfa6e278eccde33e1a6e1b4c files/uw-ipop3s.xinetd 470
-MD5 16682cd88c80588d22d34dd08678f1da files/uw-imap.xinetd 492
-MD5 7c4b4a6a777e1355796e8b01c59f2f78 files/gentoo-2001a-r3.diff 1436
-MD5 6f57109ecba31f54f53193f5526d52b4 files/digest-uw-imap-2002a 62
-MD5 bdb52c8ffd331360d9b8451c9b069f6c files/digest-uw-imap-2002b 62
-MD5 ff493c5938360a4411843914673d4a05 files/digest-uw-imap-2002c 63
-MD5 5627c6d3e66200c457bf24c47a02c6e9 files/uw-imap.pam-system-auth 344
-MD5 076df68c58666d62e9fbebb942a75680 files/gentoo.diff 1428
-MD5 8e3bbe0dafb99203c2029f531ce4ec8a files/uw-ipop3.xinetd 473
-MD5 c1398d15a74439d23bda99c4960ca625 files/uw-imaps.xinetd 487
-MD5 5527b2574df61826be5f1f6c21518260 files/imap-2001a.4-patch-with-delete-fix.bz2 29496
-MD5 f756533666f0e8b80583a709d4891be1 files/uw-imap.pam 244
-MD5 1c00a25b2ff584c8c9d98eedc1648f4a files/digest-uw-imap-2001a-r2 62
-MD5 1c00a25b2ff584c8c9d98eedc1648f4a files/digest-uw-imap-2001a-r3 62
+MD5 44c9f8125bd0c27bc570ef9d22931d01 ChangeLog 11772
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 e9a05288ecb9fada22fff84bf0c5962c uw-imap-2004a.ebuild 3292
+MD5 f86653fdd59e2727644fc31305b236c2 uw-imap-2004c-r1.ebuild 4127
+MD5 2a95a847286c5b23cb291f923f75c6e0 uw-imap-2004c-r2.ebuild 4648
+MD5 f3ec9bb4aab0e6c37b20265378f7d413 uw-imap-2004c-r3.ebuild 5209
+MD5 f8341ad011ccea95c157f34f869a0a69 uw-imap-2004c.ebuild 3296
+MD5 4fa46af9a321af2aa5c5c1f0e305aceb uw-imap-2004g-r1.ebuild 5211
+MD5 4241619a695423aca65be9e524afa0ee uw-imap-2004g-r2.ebuild 5137
+MD5 dda7fd03e70713743f3de84ee18d7542 uw-imap-2004g.ebuild 5216
+MD5 86da98c03bc68723a437d2cf135b0775 files/digest-uw-imap-2004a 62
+MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c 63
+MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c-r1 63
+MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c-r2 63
+MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-uw-imap-2004c-r3 63
+MD5 cde23dc2375a8c33998202c8f0c9ae0e files/uw-imap-2004c-amd64-so-fix.patch 675
+MD5 f9441b5a20dd2477f12e0b0f04e2748d files/uw-imap.pam 243
+MD5 113b8cca9a203707f69bd0f6632ded57 files/uw-imap.pam-system-auth 343
+MD5 a0d3f290ad8a98968896a5315628d473 files/uw-imap.xinetd 491
+MD5 f93adbc027c40ed405bbde4bb1330f2d files/uw-imaps.xinetd 486
+MD5 506e7347cac698714cf5cd60eca761ba files/uw-ipop2.xinetd 563
+MD5 dfcbb9b410d2d513c15520e713043769 files/uw-ipop3.xinetd 472
+MD5 7fe0f2231e5e0d8b491a8c9780048ac3 files/uw-ipop3s.xinetd 469
+MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-uw-imap-2004g 62
+MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-uw-imap-2004g-r1 62
+MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-uw-imap-2004g-r2 62
diff --git a/net-mail/uw-imap/files/uw-imap.pam b/net-mail/uw-imap/files/uw-imap.pam
index 196657df9389..531b907ab6d4 100644
--- a/net-mail/uw-imap/files/uw-imap.pam
+++ b/net-mail/uw-imap/files/uw-imap.pam
@@ -1,4 +1,5 @@
 #%PAM-1.0
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imap.pam,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 auth       required     pam_pwdb.so shadow nullok
 account    required     pam_pwdb.so
 session    required     pam_pwdb.so
diff --git a/net-mail/uw-imap/files/uw-imap.pam-system-auth b/net-mail/uw-imap/files/uw-imap.pam-system-auth
index b90d2cbaee38..39cd5056f0d9 100644
--- a/net-mail/uw-imap/files/uw-imap.pam-system-auth
+++ b/net-mail/uw-imap/files/uw-imap.pam-system-auth
@@ -1,5 +1,5 @@
 #%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imap.pam-system-auth,v 1.1 2002/06/07 02:01:38 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imap.pam-system-auth,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 auth       required     pam_nologin.so
 auth       required     pam_stack.so service=system-auth
 account    required     pam_stack.so service=system-auth
diff --git a/net-mail/uw-imap/files/uw-imap.xinetd b/net-mail/uw-imap/files/uw-imap.xinetd
index 959a45573bc1..7874b4540353 100644
--- a/net-mail/uw-imap/files/uw-imap.xinetd
+++ b/net-mail/uw-imap/files/uw-imap.xinetd
@@ -1,4 +1,5 @@
 # default: off
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imap.xinetd,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 # description: The IMAP service allows remote users to access their mail using \
 #              an IMAP client such as Mutt, Pine, fetchmail, or Netscape \
 #              Communicator.
diff --git a/net-mail/uw-imap/files/uw-imaps.xinetd b/net-mail/uw-imap/files/uw-imaps.xinetd
index 8fb2f3500a78..235fab65c730 100644
--- a/net-mail/uw-imap/files/uw-imaps.xinetd
+++ b/net-mail/uw-imap/files/uw-imaps.xinetd
@@ -1,4 +1,5 @@
 # default: off
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-imaps.xinetd,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 # description: The IMAPS service allows remote users to access their mail \
 #	       using an IMAP client with SSL support such as Netscape \
 #	       Communicator or fetchmail.
diff --git a/net-mail/uw-imap/files/uw-ipop2.xinetd b/net-mail/uw-imap/files/uw-ipop2.xinetd
index 2f52c4604bd5..792451b5ada3 100644
--- a/net-mail/uw-imap/files/uw-ipop2.xinetd
+++ b/net-mail/uw-imap/files/uw-ipop2.xinetd
@@ -1,6 +1,8 @@
 # default: off
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-ipop2.xinetd,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 # description: The POP2 service allows remote users to access their mail \
-#              using an POP2 client such as fetchmail.  In most cases, clients \#              support POP3 instead of POP2, so enabling this service is rarely \
+#              using an POP2 client such as fetchmail.  In most cases, clients \
+#              support POP3 instead of POP2, so enabling this service is rarely \
 #              necessary.
 service pop-2
 {
diff --git a/net-mail/uw-imap/files/uw-ipop3.xinetd b/net-mail/uw-imap/files/uw-ipop3.xinetd
index 60acaf219cf2..15b13ab438b0 100644
--- a/net-mail/uw-imap/files/uw-ipop3.xinetd
+++ b/net-mail/uw-imap/files/uw-ipop3.xinetd
@@ -1,4 +1,5 @@
 # default: off
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-ipop3.xinetd,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 # description: The POP3 service allows remote users to access their mail \
 #              using an POP3 client such as Netscape Communicator, mutt, \
 #	       or fetchmail.
diff --git a/net-mail/uw-imap/files/uw-ipop3s.xinetd b/net-mail/uw-imap/files/uw-ipop3s.xinetd
index 8a02f3de4b22..9fa063ef65ab 100644
--- a/net-mail/uw-imap/files/uw-ipop3s.xinetd
+++ b/net-mail/uw-imap/files/uw-ipop3s.xinetd
@@ -1,5 +1,5 @@
 # default: off
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-ipop3s.xinetd,v 1.1 2003/05/25 20:38:18 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/files/uw-ipop3s.xinetd,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 # description: The POP3 service allows remote users to access their mail \
 #              using an POP3 client such as Netscape Communicator, mutt, \
 #	       or fetchmail.
diff --git a/net-mail/uw-imap/uw-imap-2004a.ebuild b/net-mail/uw-imap/uw-imap-2004a.ebuild
index d7ef57b99fef..1cd3824bb0da 100644
--- a/net-mail/uw-imap/uw-imap-2004a.ebuild
+++ b/net-mail/uw-imap/uw-imap-2004a.ebuild
@@ -1,6 +1,8 @@
-# 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/uw-imap/uw-imap-2004a.ebuild,v 1.1 2004/10/03 22:31:54 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004a.ebuild,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
+
+inherit flag-o-matic
 
 MY_P=imap-${PV}
 S=${WORKDIR}/${MY_P}
@@ -11,8 +13,8 @@ HOMEPAGE="http://www.washington.edu/imap/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha ~amd64"
-IUSE="ipv6 ssl mbox pic kerberos"
+KEYWORDS="x86 sparc ppc hppa alpha amd64"
+IUSE="ipv6 ssl pic kerberos"
 
 PROVIDE="virtual/imapd"
 PROVIDE="${PROVIDE} virtual/imap-c-client"
diff --git a/net-mail/uw-imap/uw-imap-2004c-r1.ebuild b/net-mail/uw-imap/uw-imap-2004c-r1.ebuild
index 49beb1da2816..65ebc3727937 100644
--- a/net-mail/uw-imap/uw-imap-2004c-r1.ebuild
+++ b/net-mail/uw-imap/uw-imap-2004c-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c-r1.ebuild,v 1.1 2005/02/01 15:43:45 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.washington.edu/imap/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha ~amd64"
+KEYWORDS="x86 ~sparc ~ppc ~hppa ~alpha ~amd64"
 IUSE="ipv6 ssl pic kerberos"
 
 PROVIDE="virtual/imapd"
diff --git a/net-mail/uw-imap/uw-imap-2004c-r2.ebuild b/net-mail/uw-imap/uw-imap-2004c-r2.ebuild
index b194c30dc8a1..da6b6dcd3060 100644
--- a/net-mail/uw-imap/uw-imap-2004c-r2.ebuild
+++ b/net-mail/uw-imap/uw-imap-2004c-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c-r2.ebuild,v 1.1 2005/02/11 14:03:08 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c-r2.ebuild,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 MY_P="imap-${PV}1"
 S=${WORKDIR}/${MY_P}
@@ -26,6 +26,19 @@ DEPEND="!net-mail/vimap
 	ssl? ( dev-libs/openssl )
 	kerberos? ( virtual/krb5 )"
 
+pkg_setup() {
+	# ewarn people not using pam with this file
+	if ! built_with_use net-mail/mailbase pam;
+	then
+		echo
+		ewarn "It is recommended to have the net-mail/mailbase package"
+		ewarn "  built with the pam use flag activated. Please rebuild"
+		ewarn "  net-mail/mailbase with pam activated."
+		echo
+		epause 3
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	# Tarball packed with bad file perms
@@ -144,9 +157,14 @@ src_install() {
 	# gentoo config stuff
 
 	## Those are now provided by mailbase
-	# insinto /etc/pam.d
-	# newins ${FILESDIR}/uw-imap.pam-system-auth imap
-	# newins ${FILESDIR}/uw-imap.pam-system-auth pop
+	#   but if mailbase didn't provide them, install needed files
+	if ! built_with_use net-mail/mailbase pam;
+	then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/uw-imap.pam-system-auth imap
+		newins ${FILESDIR}/uw-imap.pam-system-auth pop
+	fi
+
 	insinto /etc/xinetd.d
 	newins ${FILESDIR}/uw-imap.xinetd  imap
 	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
diff --git a/net-mail/uw-imap/uw-imap-2004c-r3.ebuild b/net-mail/uw-imap/uw-imap-2004c-r3.ebuild
index eda6bba506b7..6b0d34ceaad3 100644
--- a/net-mail/uw-imap/uw-imap-2004c-r3.ebuild
+++ b/net-mail/uw-imap/uw-imap-2004c-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c-r3.ebuild,v 1.1 2005/03/03 02:39:53 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c-r3.ebuild,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.washington.edu/imap/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha ~amd64"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="ipv6 ssl pic kerberos clearpasswd"
 
 PROVIDE="virtual/imapd"
@@ -27,26 +27,30 @@ DEPEND="!net-mail/vimap
 	kerberos? ( virtual/krb5 )"
 
 pkg_setup() {
+	echo
 	if use clearpasswd; then
-		echo
 		ewarn "Building uw-imap with cleartext LOGIN allowed. Disable \"clearpasswd\" USE"
 		ewarn "flag to restrict cleartext LOGIN to SSL/TLS sessions only."
-		echo
 	else
-		echo
-		ewarn "Building uw-imap with cleartext LOGIN restricted to SSL/TLS sessions only."
-		ewarn "Enable \"clearpasswd\" flag to allow unrestricted cleartext LOGIN."
-		echo
+		if use ssl; then
+			ewarn "Building uw-imap with cleartext LOGIN restricted to SSL/TLS sessions only."
+			ewarn "Enable \"clearpasswd\" flag to allow unrestricted cleartext LOGIN."
+		else
+			ewarn "You have disabled SSL for uw-imap, but want cleartext passwords restricted to"
+			ewarn "SSL/TLS sessions only. Either enable \"ssl\" USE flag, or \"clearpasswd\""
+			ewarn "USE flag."
+			die "Impossible USE flag combination, see above message"
+		fi
 	fi
+	echo
 	# ewarn people not using pam with this file
-	if ! built_with_use net-mail/mailbase pam;
-	then
+	if ! built_with_use net-mail/mailbase pam ; then
 		echo
-		ewarn "It is recommended to have the net-mail/mailbase package"
+		ewarn "It is needed to have the net-mail/mailbase package"
 		ewarn "  built with the pam use flag activated. Please rebuild"
 		ewarn "  net-mail/mailbase with pam activated."
 		echo
-		epause 3
+		die "mailbase has to be built with pam use flag"
 	fi
 }
 
@@ -148,10 +152,10 @@ src_install() {
 	fi
 
 	if use amd64; then
-		dolib.so c-client/libc-client.so*
+		dolib.so c-client/libc-client.so.1.0.0
 		cd ${D}/usr/$(get_libdir)
 		ln -s libc-client.so.1.0.0 libc-client.so.1
-		ln -s libc-client.so.1 libc-client.so
+		ln -s libc-client.so.1.0.0 libc-client.so
 	fi
 
 	cd ${S}
@@ -171,16 +175,6 @@ src_install() {
 	dodoc docs/rfc/*.txt
 
 	# gentoo config stuff
-
-	## Those are now provided by mailbase
-	#   but if mailbase didn't provide them, install needed files
-	if ! built_with_use net-mail/mailbase pam;
-	then
-		insinto /etc/pam.d
-		newins ${FILESDIR}/uw-imap.pam-system-auth imap
-		newins ${FILESDIR}/uw-imap.pam-system-auth pop
-	fi
-
 	insinto /etc/xinetd.d
 	newins ${FILESDIR}/uw-imap.xinetd  imap
 	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
diff --git a/net-mail/uw-imap/uw-imap-2004c.ebuild b/net-mail/uw-imap/uw-imap-2004c.ebuild
index 5856e83e9560..4d645e2584aa 100644
--- a/net-mail/uw-imap/uw-imap-2004c.ebuild
+++ b/net-mail/uw-imap/uw-imap-2004c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c.ebuild,v 1.1 2005/01/28 11:54:46 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004c.ebuild,v 1.1.1.1 2005/11/30 10:03:06 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.washington.edu/imap/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha ~amd64"
+KEYWORDS="x86 sparc ppc ~hppa alpha amd64"
 IUSE="ipv6 ssl pic kerberos"
 
 PROVIDE="virtual/imapd"
diff --git a/net-mail/uw-imap/uw-imap-2004g-r1.ebuild b/net-mail/uw-imap/uw-imap-2004g-r1.ebuild
index 903fcce70a54..8680bff9724f 100644
--- a/net-mail/uw-imap/uw-imap-2004g-r1.ebuild
+++ b/net-mail/uw-imap/uw-imap-2004g-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g-r1.ebuild,v 1.1 2005/10/06 11:55:09 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.washington.edu/imap/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="ipv6 ssl pic kerberos clearpasswd"
 
 PROVIDE="virtual/imapd"
@@ -72,7 +72,7 @@ src_unpack() {
 		# Now there is only c-client left, which should be built with -fPIC
 		append-flags -fPIC
 		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${P}-amd64-so-fix.patch
+		epatch ${FILESDIR}/${PN}-2004c-amd64-so-fix.patch
 	fi
 
 	use pic || use alpha && append-flags -fPIC
@@ -162,7 +162,8 @@ src_install() {
 	cd ${S}
 
 	insinto /usr/include/imap
-	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
+	doins c-client/{c-client,mail,imap4r1,rfc822,misc,smtp,nntp}.h
+	doins c-client/linkage.{c,h}
 	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
 	dolib.a c-client/c-client.a
 	dosym /usr/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
diff --git a/net-mail/uw-imap/uw-imap-2004g-r2.ebuild b/net-mail/uw-imap/uw-imap-2004g-r2.ebuild
index a3ffacc3e69c..055d1554d7e9 100644
--- a/net-mail/uw-imap/uw-imap-2004g-r2.ebuild
+++ b/net-mail/uw-imap/uw-imap-2004g-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g-r2.ebuild,v 1.1 2005/10/06 21:03:30 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g-r2.ebuild,v 1.1.1.1 2005/11/30 10:03:06 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -64,7 +64,7 @@ src_unpack() {
 
 	if use amd64; then
 		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${P}-amd64-so-fix.patch
+		epatch ${FILESDIR}/${PN}-2004c-amd64-so-fix.patch
 	fi
 
 	# Now we must make all the individual Makefiles use different CFLAGS,
diff --git a/net-mail/uw-imap/uw-imap-2004g.ebuild b/net-mail/uw-imap/uw-imap-2004g.ebuild
index 9cdd8df7ffc7..8fc3396b55bd 100644
--- a/net-mail/uw-imap/uw-imap-2004g.ebuild
+++ b/net-mail/uw-imap/uw-imap-2004g.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g.ebuild,v 1.1 2005/10/05 22:03:17 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2004g.ebuild,v 1.1.1.1 2005/11/30 10:03:07 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -71,7 +71,7 @@ src_unpack() {
 		# Now there is only c-client left, which should be built with -fPIC
 		append-flags -fPIC
 		# Apply our patch to actually build the shared library for PHP5
-		epatch ${FILESDIR}/${P}-amd64-so-fix.patch
+		epatch ${FILESDIR}/${PN}-2004c-amd64-so-fix.patch
 	fi
 
 	use pic || use alpha && append-flags -fPIC