Version bump, #245425

Package-Manager: portage-2.2_rc21/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 34 insertions, 21 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index b6af7d55f5bc..08d6cb3314b4 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/uw-imap
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.106 2008/09/20 10:04:49 dertobi123 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.107 2009/01/13 17:45:03 dertobi123 Exp $
+
+*uw-imap-2007e (13 Jan 2009)
+
+  13 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -uw-imap-2004g-r2.ebuild, +uw-imap-2007e.ebuild:
+  Version bump, #245425
 
   20 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   uw-imap-2007b.ebuild:
diff --git a/net-mail/uw-imap/uw-imap-2004g-r2.ebuild b/net-mail/uw-imap/uw-imap-2007e.ebuild
index ce453185187a..8c19c7173d53 100644
--- a/net-mail/uw-imap/uw-imap-2004g-r2.ebuild
+++ b/net-mail/uw-imap/uw-imap-2007e.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.17 2008/03/15 23:17:20 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2007e.ebuild,v 1.1 2009/01/13 17:45:03 dertobi123 Exp $
 
 inherit eutils flag-o-matic
 
 MY_P="imap-${PV}"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
 SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 HOMEPAGE="http://www.washington.edu/imap/"
 
-LICENSE="as-is"
+LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 ssl kerberos clearpasswd"
 
 PROVIDE="virtual/imapd"
 PROVIDE="${PROVIDE} virtual/imap-c-client"
 DEPEND="!net-mail/vimap
 	!virtual/imap-c-client
-	>=net-mail/uw-mailutils-2004g
 	virtual/libc
 	>=sys-libs/pam-0.72
 	>=net-mail/mailbase-0.00-r8
@@ -28,6 +27,7 @@ DEPEND="!net-mail/vimap
 	kerberos? ( virtual/krb5 )"
 
 RDEPEND="${DEPEND}
+	>=net-mail/uw-mailutils-${PV}
 	sys-apps/xinetd
 	!virtual/imapd"
 
@@ -164,7 +164,7 @@ src_install() {
 	cd "${S}"
 
 	insinto /usr/include/imap
-	doins c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp}.h
+	doins c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp,utf8,utf8aux}.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
@@ -173,7 +173,7 @@ src_install() {
 	doman src/ipopd/ipopd.8 src/imapd/imapd.8
 	doman src/dmail/dmail.1 src/tmail/tmail.1
 
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
+	dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
 
 	docinto rfc
 	dodoc docs/rfc/*.txt
diff --git a/net-mail/uw-mailutils/ChangeLog b/net-mail/uw-mailutils/ChangeLog
index 3333377cb1cf..5729a82db6b6 100644
--- a/net-mail/uw-mailutils/ChangeLog
+++ b/net-mail/uw-mailutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/uw-mailutils
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/ChangeLog,v 1.22 2008/09/20 10:02:50 dertobi123 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/ChangeLog,v 1.23 2009/01/13 17:44:34 dertobi123 Exp $
+
+*uw-mailutils-2007e (13 Jan 2009)
+
+  13 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -uw-mailutils-2004g.ebuild, +uw-mailutils-2007e.ebuild:
+  Version bump, #245425
 
   20 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   uw-mailutils-2007b.ebuild:
diff --git a/net-mail/uw-mailutils/uw-mailutils-2004g.ebuild b/net-mail/uw-mailutils/uw-mailutils-2007e.ebuild
index 2cbe0104650e..15d36c553a99 100644
--- a/net-mail/uw-mailutils/uw-mailutils-2004g.ebuild
+++ b/net-mail/uw-mailutils/uw-mailutils-2007e.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/uw-mailutils-2004g.ebuild,v 1.13 2007/08/02 17:34:12 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/uw-mailutils-2007e.ebuild,v 1.1 2009/01/13 17:44:34 dertobi123 Exp $
 
 inherit eutils flag-o-matic
 
 MY_P="imap-${PV}"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Mail utilities from the UW"
 HOMEPAGE="http://www.washington.edu/imap/"
 SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
-LICENSE="as-is"
+LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="virtual/libc
-	!<net-mail/uw-imap-2004g-r1
 	!<mail-client/pine-4.64-r1"
+RDEPEND="${DEPEND}
+	!<net-mail/uw-imap-${PV}"
 
 src_unpack() {
 	unpack ${A}
-	chmod -R ug+w ${S}
+	chmod -R ug+w "${S}"
 
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}.patch || die "epatch failed"
+	epatch "${FILESDIR}/${PN}-2004g.patch" || die "epatch failed"
 
 	sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" \
 		src/mailutil/Makefile \