Removed maildir USE flag. 4.62 stable on x86.

Package-Manager: portage-2.0.51.16

5 files changed, 194 insertions, 10 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 938cb4aa0a6b..e3b427517b3e 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.35 2005/01/22 20:12:26 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.36 2005/02/25 01:36:20 ticho Exp $
+
+*pine-4.62-r1 (25 Feb 2005)
+
+  25 Feb 2005; Andrej Kacian <ticho@gentoo.org> +pine-4.62-r1.ebuild,
+  pine-4.62.ebuild:
+  Updated chappa-all patch. Removed maildir USE flag, and print an URL for
+  "incoming folders" guide. Changed my devspace URIs in SRC_URI to
+  mirror://gentoo/. 4.62 stable on x86.
 
 *pine-4.62 (22 Jan 2005)
 
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index 73cec4e2ef51..d0ce9b16db53 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a51260399f64d1853c3c0bdc193ad9b2 ChangeLog 13712
+MD5 69e2652a4da167f2055e2582ec86969d ChangeLog 14014
+MD5 08c58b0b5006c6f30adbbb6657e7188f pine-4.62-r1.ebuild 5198
 MD5 d3210060048b2a6df3bbb18110bec61e pine-4.61-r2.ebuild 4688
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 8ec3c94572364f8758088a64b46344a7 pine-4.61-r5.ebuild 5004
-MD5 e183a4065c16cdbdcd12ec39ef332025 pine-4.62.ebuild 5754
+MD5 38e94d344d3c1ea72b054d78e4676161 pine-4.62.ebuild 5787
 MD5 e47ce30788b990def76b3429e05647a4 pine-4.61-r3.ebuild 4691
 MD5 4e9b706db460df4a4f4392b4c519b837 pine-4.61-r4.ebuild 4813
 MD5 8f1d4661a745dab7f2113e7068c6e04e files/digest-pine-4.61-r3 139
@@ -20,6 +21,7 @@ MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
 MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
 MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
 MD5 fa3a8604150ceb9b876b6c5f1f2309ab files/digest-pine-4.62 206
+MD5 599476895556ce91c067c6f39c7c3acc files/digest-pine-4.62-r1 139
 MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
 MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
 MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
@@ -27,7 +29,7 @@ MD5 1057540bd7b50f92e88b3af6f8d69c99 files/pine-4.61-subjectlength.patch 2363
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB8rOzQlM6RnzZP+IRAtBqAJ0Uwxa1GSnFeqfIntZTfU26U8JPCACgtGM3
-PmKLPsBkyqsLxkYX7K8aMJU=
-=E+5p
+iD8DBQFCHoEnQlM6RnzZP+IRAph8AKDFaGO55Pn6SkCKPxiNhFRsqK9h7QCgkYNr
+vgZytnqaNYISs1e3J6/XxXU=
+=Gw0h
 -----END PGP SIGNATURE-----
diff --git a/mail-client/pine/files/digest-pine-4.62-r1 b/mail-client/pine/files/digest-pine-4.62-r1
new file mode 100644
index 000000000000..3a79df78ad8c
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.62-r1
@@ -0,0 +1,2 @@
+MD5 60e58c0676b4761d1e9bd3570dd7c222 pine4.62.tar.bz2 3079348
+MD5 83dbfe276e5074f858680087d907c9a3 pine-4.62-r1-chappa-all.patch.gz 156944
diff --git a/mail-client/pine/pine-4.62-r1.ebuild b/mail-client/pine/pine-4.62-r1.ebuild
new file mode 100644
index 000000000000..aea821a68322
--- /dev/null
+++ b/mail-client/pine/pine-4.62-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.62-r1.ebuild,v 1.1 2005/02/25 01:36:21 ticho Exp $
+
+inherit eutils
+
+# Using this ugly hack, since we're making our own versioned copies of chappa 
+# patch, as upstream doesn't version them. (see #59573) 
+CHAPPA_PF="${P}-r1"
+
+DESCRIPTION="A tool for reading, sending and managing electronic messages."
+HOMEPAGE="http://www.washington.edu/pine/
+	http://www.math.washington.edu/~chappa/pine/patches/"
+SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
+	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz"
+#	ipv6? (
+#		http://www.ngn.euro6ix.org/IPv6/${PN}/${P}-v6-20031001.diff
+#		http://www.ngn.euro6ix.org/IPv6/${PN}/readme.${P}-v6-20031001
+#	)"
+
+LICENSE="PICO"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos"
+IUSE="ssl ldap kerberos largeterminal pam passfile debug"
+
+DEPEND="virtual/libc
+	>=sys-apps/sed-4
+	>=sys-libs/ncurses-5.1
+	pam? ( >=sys-libs/pam-0.72 )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( app-crypt/mit-krb5 )"
+RDEPEND="${DEPEND} app-misc/mime-types"
+
+S="${WORKDIR}/${P/-/}"
+
+maildir_warn() {
+	einfo
+	einfo "This build of Pine has Maildir support built in as"
+	einfo "part of the chappa-all patch."
+	einfo
+	einfo "If you have a maildir at ~/Maildir it will be your"
+	einfo "default INBOX. The path may be changed with the"
+	einfo "\"maildir-location\" setting in Pine."
+	einfo
+	einfo "To use /var/spool/mail INBOX again, set"
+	einfo "\"disable-these-drivers=md\" in your .pinerc file."
+	einfo
+	einfo "Alternately, you might want to read following webpage, which explains, how to"
+	einfo "use multiple mailboxes simultaneously:"
+	echo
+	echo "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
+	echo
+}
+
+pkg_setup() {
+	maildir_warn
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Various fixes and features.
+	epatch "${WORKDIR}/${CHAPPA_PF}-chappa-all.patch"
+	# Fix flock() emulation.
+	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix"
+	# Build the flock() emulation.
+	epatch "${FILESDIR}/imap-4.7c2-flock_4.60.patch"
+	if use ldap ; then
+		# Link to shared ldap libs instead of static.
+		epatch "${FILESDIR}/pine-4.30-ldap.patch"
+		mkdir "${S}/ldap"
+		ln -s /usr/lib "${S}/ldap/libraries"
+		ln -s /usr/include "${S}/ldap/include"
+	fi
+#	if use ipv6 ; then
+#		epatch "${DISTDIR}/${P}-v6-20031001.diff"
+#	fi
+	if use passfile ; then
+		#Is this really the correct place to define it?
+		epatch "${FILESDIR}/pine-4.56-passfile.patch"
+	fi
+	if use largeterminal ; then
+		# Add support for large terminals by doubling the size of pine's internal display buffer
+		epatch "${FILESDIR}/pine-4.61-largeterminal.patch"
+	fi
+
+	# Something from RedHat.
+	epatch "${FILESDIR}/pine-4.31-segfix.patch"
+	# Create lockfiles with a mode of 0600 instead of 0666.
+	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
+	# Add missing time.h includes.
+	epatch "${FILESDIR}/imap-2000-time.patch"
+	# Bug #23336 - makes pine transparent in terms that support it.
+	epatch "${FILESDIR}/transparency.patch"
+
+	# Bug #72861 - relaxes subject length for base64-encoded subjects
+	epatch "${FILESDIR}/pine-4.61-subjectlength.patch"
+
+	if use debug ; then
+		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
+			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
+		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
+			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
+	else
+		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
+			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
+		sed -e "s:-g -DDEBUG:${CFLAGS}:" \
+			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
+	fi
+
+	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
+		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
+}
+
+src_compile() {
+	local myconf
+	if use ssl ; then
+		myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
+		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
+			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
+			-e "s:-I\$(SSLINCLUDE) ::" \
+			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
+	else
+		myconf="${myconf} NOSSL"
+	fi
+	if use ldap ; then
+		./contrib/ldap-setup lnp lnp
+		myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP"
+	else
+		myconf="${myconf} NOLDAP"
+	fi
+	if use kerberos ; then
+		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
+	fi
+	if use pam ; then
+		target=lnp
+	else
+		target=slx
+	fi
+
+	./build ${myconf} ${target} || die "compile problem"
+}
+
+src_install() {
+	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload \
+	      mailutil/mailutil
+
+	# Only mailbase should install /etc/mailcap
+#	donewins doc/mailcap.unx mailcap
+
+	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1 \
+	      imap/src/mailutil/mailutil.1
+	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
+#	if use ipv6 ; then
+#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
+#	fi
+
+	docinto imap
+	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
+
+	docinto imap/rfc
+	dodoc imap/docs/rfc/*.txt
+
+	docinto html/tech-notes
+	dohtml -r doc/tech-notes/
+}
+
+pkg_postinst() {
+	maildir_warn
+}
diff --git a/mail-client/pine/pine-4.62.ebuild b/mail-client/pine/pine-4.62.ebuild
index 60611e985962..15da4092a9e6 100644
--- a/mail-client/pine/pine-4.62.ebuild
+++ b/mail-client/pine/pine-4.62.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.62.ebuild,v 1.1 2005/01/22 20:12:26 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.62.ebuild,v 1.2 2005/02/25 01:36:21 ticho Exp $
 
 inherit eutils
 
-# Using this ugly hack, since we're using chappa patch revision 1 (see #59573)
+# Using this ugly hack, since we're making our own versioned copies of chappa
+# patch, as upstream doesn't version them. (see #59573)
 CHAPPA_PF="${P}"
 
 DESCRIPTION="A tool for reading, sending and managing electronic messages."
 HOMEPAGE="http://www.washington.edu/pine/
 	http://www.math.washington.edu/~chappa/pine/patches/"
 SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
-	http://dev.gentoo.org/~ticho/portage/${CHAPPA_PF}-chappa-all.patch.gz
+	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz
 	!maildir? ( http://dev.gentoo.org/~ticho/portage/pine-4.62-maildir.patch.gz )"
 # using my webspace until the patch gets fully distributed to mirrors  -Ticho
 #	mirror://gentoo/${CHAPPA_PF}-chappa-all.patch.gz"
@@ -23,7 +24,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2
 
 LICENSE="PICO"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos"
 #IUSE="ipv6 maildir ssl ldap kerberos passfile"
 IUSE="ssl ldap kerberos largeterminal pam passfile debug maildir"