Inlude a fix to allow it to be built without network support

(Portage version: 2.0.51.22-r2)

5 files changed, 107 insertions, 4 deletions

diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog
index 57cbe0052a20..8fe9c9ef0958 100644
--- a/mail-client/nail/ChangeLog
+++ b/mail-client/nail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/nail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.35 2005/08/22 19:15:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.36 2005/08/22 20:06:36 ferdy Exp $
+
+*nail-11.25-r2 (22 Aug 2005)
+
+  22 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/nail-nosocket.patch, +nail-11.25-r2.ebuild:
+  Inlude a fix to allow it to be built without network support
 
   22 Aug 2005; Markus Rothe <corsair@gentoo.org> nail-11.25-r1.ebuild:
   Stable on ppc64 (bug #103291)
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index a2bddfc0e460..83f564e3693c 100644
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -1,8 +1,11 @@
-MD5 a9e01e9d6d89efcc029203d1d47b7c82 ChangeLog 5088
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 a2b124e28dcb29c1b10eb53dd50cc5a6 nail-11.25-r1.ebuild 1438
 MD5 b0c010b0212638a72c54a72ba6053db6 nail-11.20.ebuild 2121
 MD5 7f43acb89cb196fd87f503be8f75f678 nail-11.22.ebuild 2130
-MD5 a2b124e28dcb29c1b10eb53dd50cc5a6 nail-11.25-r1.ebuild 1438
+MD5 7359a655370199e92a65c8ff40102c34 nail-11.25-r2.ebuild 1872
+MD5 a9e01e9d6d89efcc029203d1d47b7c82 ChangeLog 5088
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 1d08241dbf0e85e0fbd84acd2eee579e files/digest-nail-11.20 63
 MD5 e1c6a2dec491cb6b6a57344c05e75ca3 files/digest-nail-11.22 63
 MD5 95cdf41668e1dc14af7ed74c9eb1cb76 files/digest-nail-11.25-r1 63
+MD5 95cdf41668e1dc14af7ed74c9eb1cb76 files/digest-nail-11.25-r2 63
+MD5 40398648c9e2e41662ae61caea846c57 files/nail-nosocket.patch 473
diff --git a/mail-client/nail/files/digest-nail-11.25-r2 b/mail-client/nail/files/digest-nail-11.25-r2
new file mode 100644
index 000000000000..0b5aacd7f34c
--- /dev/null
+++ b/mail-client/nail/files/digest-nail-11.25-r2
@@ -0,0 +1 @@
+MD5 54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 267959
diff --git a/mail-client/nail/files/nail-nosocket.patch b/mail-client/nail/files/nail-nosocket.patch
new file mode 100644
index 000000000000..986694669bfc
--- /dev/null
+++ b/mail-client/nail/files/nail-nosocket.patch
@@ -0,0 +1,28 @@
+--- imap.c.orig	2005-08-22 01:59:19.000000000 +0200
++++ imap.c	2005-08-22 01:59:46.000000000 +0200
+@@ -44,6 +44,12 @@
+ 
+ #include "config.h"
+ 
++#include "rcv.h"
++#include <errno.h>
++#include <sys/stat.h>
++#include <unistd.h>
++#include <time.h>
++
+ /*
+  * Mail -- a mail program
+  *
+@@ -52,12 +58,6 @@
+ 
+ #ifdef	HAVE_SOCKETS
+ 
+-#include "rcv.h"
+-#include <errno.h>
+-#include <sys/stat.h>
+-#include <unistd.h>
+-#include <time.h>
+-
+ #include "md5.h"
+ 
+ #include <sys/socket.h>
diff --git a/mail-client/nail/nail-11.25-r2.ebuild b/mail-client/nail/nail-11.25-r2.ebuild
new file mode 100644
index 000000000000..6fbf0d3fbf3e
--- /dev/null
+++ b/mail-client/nail/nail-11.25-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-11.25-r2.ebuild,v 1.1 2005/08/22 20:06:36 ferdy Exp $
+
+inherit eutils
+DESCRIPTION="Nail is an enhanced mailx-compatible mail client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://nail.sourceforge.net/"
+PROVIDE="virtual/mailx"
+DEPEND="ssl? ( dev-libs/openssl )
+	!virtual/mailx"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="ssl net"
+
+remove_ssl() {
+	einfo "Disabling SSL support"
+	sed -i -e 's~#define USE_\(OPEN\)\?SSL~#undef USE_\1SSL~' config.h
+	sed -i -e 's~-ssl~~' -e 's~-lcrypto~~' LIBS
+}
+
+remove_sockets() {
+	einfo "Not enabling sockets (thus disabling IMAP, POP and SMTP)"
+	sed -i -e 's~#define HAVE_SOCKETS~#undef HAVE_SOCKETS~' config.h
+}
+
+src_compile() {
+	# Build config.h and LIBS, neccesary to tweak the config
+	make config.h
+
+	# Fix nail to allow it to be built without sockets
+	epatch "${FILESDIR}/${PN}-nosocket.patch"
+
+	# Logic to 'configure' the package
+	if use net && ! use ssl ; then
+		remove_ssl
+	elif ! use net ; then
+		# Linking to ssl without net support is pointless
+		remove_ssl
+		remove_sockets
+	fi
+
+	# Now really build it
+	emake PREFIX=/usr MAILSPOOL='~/.maildir' || die "emake failed"
+}
+
+src_install () {
+	# Use /usr/lib/sendmail by default and provide an example
+	cat <<- EOSMTP >> nail.rc
+
+		# Use the local sendmail (/usr/lib/sendmail) binary by default.
+		# (Uncomment the following line to use a SMTP server)
+		#set smtp=localhost
+	EOSMTP
+
+	make DESTDIR=${D} UCBINSTALL=/bin/install PREFIX=/usr install || die "install failed"
+	dodoc AUTHORS COPYING INSTALL README
+	dodir /bin
+	dosym /usr/bin/nail /bin/mail
+	dosym /usr/bin/nail /usr/bin/mailx
+	dosym /usr/bin/nail /usr/bin/mail
+	dosym /usr/bin/nail /usr/bin/Mail
+}