bug #50504, and slight ebuild cleanup

4 files changed, 144 insertions, 15 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index f3c29b3b2fe5..a9b9a45bf598 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/uw-imap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.28 2004/02/04 11:40:10 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.29 2004/05/10 05:56:14 robbat2 Exp $
+
+*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.
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index 94598df10873..629ea22f2702 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -1,17 +1,19 @@
+MD5 14dd0347fa9198bed4a72bc79834b227 uw-imap-2002e-r2.ebuild 3121
+MD5 67778d93cbed4d98778cb75d078770f6 uw-imap-2002e.ebuild 2944
+MD5 6c1411f33547ff002b8ddd90e8363efd uw-imap-2002e-r1.ebuild 3104
+MD5 2487af45d64ea6b1c8a3651a4482000a uw-imap-2002d-r1.ebuild 2947
+MD5 989de2a9aad689590dcb75ccd0f25388 ChangeLog 4803
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 08b4e68602123f98d00bd463d388f5f5 uw-imap-2002d.ebuild 2597
+MD5 506e7347cac698714cf5cd60eca761ba files/uw-ipop2.xinetd 563
+MD5 7fe0f2231e5e0d8b491a8c9780048ac3 files/uw-ipop3s.xinetd 469
+MD5 a0d3f290ad8a98968896a5315628d473 files/uw-imap.xinetd 491
 MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-uw-imap-2002d 62
-MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-uw-imap-2002d-r1 62
 MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-uw-imap-2002e 62
+MD5 113b8cca9a203707f69bd0f6632ded57 files/uw-imap.pam-system-auth 343
+MD5 dfcbb9b410d2d513c15520e713043769 files/uw-ipop3.xinetd 472
+MD5 f93adbc027c40ed405bbde4bb1330f2d files/uw-imaps.xinetd 486
+MD5 f9441b5a20dd2477f12e0b0f04e2748d files/uw-imap.pam 243
+MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-uw-imap-2002d-r1 62
 MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-uw-imap-2002e-r1 62
-MD5 f756533666f0e8b80583a709d4891be1 files/uw-imap.pam 244
-MD5 5627c6d3e66200c457bf24c47a02c6e9 files/uw-imap.pam-system-auth 344
-MD5 16682cd88c80588d22d34dd08678f1da files/uw-imap.xinetd 492
-MD5 c1398d15a74439d23bda99c4960ca625 files/uw-imaps.xinetd 487
-MD5 a64376593da1d4ed7900ab825abc42dc files/uw-ipop2.xinetd 564
-MD5 8e3bbe0dafb99203c2029f531ce4ec8a files/uw-ipop3.xinetd 473
-MD5 c35bb5e9cfa6e278eccde33e1a6e1b4c files/uw-ipop3s.xinetd 470
-MD5 4c14e0b82676807d132fc05ff7d6dea4 ChangeLog 4804
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 ffd0154033cfcd430248fd98cf4e4cc4 uw-imap-2002d-r1.ebuild 2948
-MD5 ef570b53934a0fddbbf5e87c04de4071 uw-imap-2002d.ebuild 2598
-MD5 7b6ea1170418ba843a7cdeb645661733 uw-imap-2002e-r1.ebuild 3105
-MD5 38fa69342d0d949bed9922527281f889 uw-imap-2002e.ebuild 2945
+MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-uw-imap-2002e-r2 62
diff --git a/net-mail/uw-imap/files/digest-uw-imap-2002e-r2 b/net-mail/uw-imap/files/digest-uw-imap-2002e-r2
new file mode 100644
index 000000000000..cbbff9d87969
--- /dev/null
+++ b/net-mail/uw-imap/files/digest-uw-imap-2002e-r2
@@ -0,0 +1 @@
+MD5 0d246d868f20d8c441d235b77c940676 imap-2002e.tar.Z 2157511
diff --git a/net-mail/uw-imap/uw-imap-2002e-r2.ebuild b/net-mail/uw-imap/uw-imap-2002e-r2.ebuild
new file mode 100644
index 000000000000..9ba1d2304abe
--- /dev/null
+++ b/net-mail/uw-imap/uw-imap-2002e-r2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002e-r2.ebuild,v 1.1 2004/05/10 05:56:14 robbat2 Exp $
+
+inherit flag-o-matic
+
+MY_P=imap-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
+HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha ~amd64"
+IUSE="ssl mbox pic"
+
+DEPEND="virtual/glibc
+		>=sys-libs/pam-0.72
+		ssl? ( dev-libs/openssl )"
+# vimap and imap-c-client are both based off the same codebase
+RDEPEND="${DEPEND}
+		!net-mail/vimap
+		!virtual/imap-c-client
+		virtual/inetd"
+PROVIDE="virtual/imapd 
+		 virtual/imap-c-client"
+
+src_unpack() {
+	unpack ${A}
+	# Tarball packed with bad file perms
+	chmod -R ug+w ${S}
+
+	use pic || use alpha || use amd64 && append-flags -fPIC
+
+	cd ${S}/src/osdep/unix/
+	cp Makefile Makefile.orig
+	sed \
+		-e "s,-g -fno-omit-frame-pointer -O6,${CFLAGS},g" \
+		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
+		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		< Makefile.orig > Makefile
+
+	# Uncomment this for MBX support
+	#cp Makefile Makefile.orig2
+	#sed \
+	#	-e "s:CREATEPROTO=unixproto:CREATEPROTO=mbxproto:" \
+	#	-e "s:EMPTYPROTO=unixproto:EMPTYPROTO=mbxproto:" \
+	#	< Makefile.orig2 > Makefile
+	cd ${S}
+}
+
+src_compile() {
+	if use ssl; then
+		cd ${S}
+		yes | make lnp SSLTYPE=unix || die
+
+		local i
+		for i in imapd ipop3d; do
+			umask 077
+			PEM1=`/bin/mktemp ${T}/openssl.XXXXXX`
+			PEM2=`/bin/mktemp ${T}/openssl.XXXXXX`
+			/usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 \
+				 -nodes -x509 -days 365 -out  $$PEM2 << EOF
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+localhost.localdomain
+root@localhost.localdomain
+EOF
+
+			cat $$PEM1 >  ${i}.pem
+			echo ""    >> ${i}.pem
+			cat $$PEM2 >> ${i}.pem
+			rm $$PEM1 $$PEM2
+			umask 022
+		done
+	else
+		yes | make lnp SSLTYPE=none || die
+	fi
+}
+
+src_install() {
+	into /usr
+	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
+	dobin mailutil/mailutil mlock/mlock mtest/mtest
+
+	if use ssl; then
+		dodir /etc/ssl/certs
+		mv imapd.pem ${D}/etc/ssl/certs
+		mv ipop3d.pem ${D}/etc/ssl/certs
+	fi
+
+	insinto /usr/include/imap
+	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
+	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
+	dolib.a c-client/c-client.a
+	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
+
+	doman src/ipopd/ipopd.8c src/imapd/imapd.8c
+	doman src/dmail/dmail.1 src/tmail/tmail.1 src/mailutil/mailutil.1
+
+	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
+
+	docinto rfc
+	dodoc docs/rfc/*.txt
+
+	# gentoo config stuff
+	insinto /etc/pam.d
+	newins ${FILESDIR}/uw-imap.pam-system-auth imap
+	newins ${FILESDIR}/uw-imap.pam-system-auth pop
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/uw-imap.xinetd  imap
+	newins ${FILESDIR}/uw-ipop2.xinetd ipop2
+	newins ${FILESDIR}/uw-ipop3.xinetd ipop3
+	newins ${FILESDIR}/uw-ipop3s.xinetd ipop3s
+	newins ${FILESDIR}/uw-imaps.xinetd imaps
+}