fix ssl dependency and add net flag support. clean broken versions

(Portage version: 2.0.51.22-r2)

8 files changed, 62 insertions, 133 deletions

diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog
index c0d5335b3208..f5d257ba9ac3 100644
--- a/mail-client/nail/ChangeLog
+++ b/mail-client/nail/ChangeLog
@@ -1,6 +1,13 @@
 # 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.29 2005/07/31 20:12:21 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.30 2005/08/10 18:16:46 ferdy Exp $
+
+*nail-11.25-r1 (10 Aug 2005)
+
+  10 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  -files/nail-10.8-Makefile.patch, -nail-11.23.ebuild, -nail-11.25.ebuild,
+  +nail-11.25-r1.ebuild:
+  fix ssl dependency and add net flag support. clean broken versions
 
 *nail-11.25 (31 Jul 2005)
 
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index e33dd256f2e5..51aa992fa321 100644
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 80e593db4250ca0818dbfba72c66c292 nail-11.25-r1.ebuild 1572
 MD5 a1c303889a67831140364679b2b776f0 nail-11.23.ebuild 2130
 MD5 3ec123b5a6c6746f176aa328af836ef8 nail-11.25.ebuild 1410
 MD5 b0c010b0212638a72c54a72ba6053db6 nail-11.20.ebuild 2121
@@ -11,11 +9,5 @@ MD5 1d08241dbf0e85e0fbd84acd2eee579e files/digest-nail-11.20 63
 MD5 e1c6a2dec491cb6b6a57344c05e75ca3 files/digest-nail-11.22 63
 MD5 87d9af32866cf00fcc4d618fee10dd9b files/digest-nail-11.23 63
 MD5 95cdf41668e1dc14af7ed74c9eb1cb76 files/digest-nail-11.25 63
+MD5 95cdf41668e1dc14af7ed74c9eb1cb76 files/digest-nail-11.25-r1 63
 MD5 7382aa86560d45a33ff12f4a091a5cee files/nail-10.8-Makefile.patch 498
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC7TOVViELBEf1JB0RAsWqAJ9bCI54lCYUz1FJ++wXmK4QWaC6IwCePoJF
-0Iz0c7Y+0Jf/ZBEJ6ozr1Vw=
-=FBxK
------END PGP SIGNATURE-----
diff --git a/mail-client/nail/files/digest-nail-11.23 b/mail-client/nail/files/digest-nail-11.23
deleted file mode 100644
index d7ec9271d322..000000000000
--- a/mail-client/nail/files/digest-nail-11.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2665649cd77110493ce465dad7c5103d nail-11.23.tar.bz2 266114
diff --git a/mail-client/nail/files/digest-nail-11.25 b/mail-client/nail/files/digest-nail-11.25-r1
index 0b5aacd7f34c..0b5aacd7f34c 100644
--- a/mail-client/nail/files/digest-nail-11.25
+++ b/mail-client/nail/files/digest-nail-11.25-r1
diff --git a/mail-client/nail/files/nail-10.8-Makefile.patch b/mail-client/nail/files/nail-10.8-Makefile.patch
deleted file mode 100644
index 525f85c62ff0..000000000000
--- a/mail-client/nail/files/nail-10.8-Makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	2004-07-26 15:14:25.839795128 -0700
-+++ Makefile	2004-07-26 15:15:34.546350144 -0700
-@@ -6,18 +6,18 @@
- # See the file INSTALL if you need help.
- #
- 
--PREFIX		= /usr/local
-+PREFIX		= /usr
- BINDIR		= $(PREFIX)/bin
- MANDIR		= $(PREFIX)/share/man
- SYSCONFDIR	= /etc
- 
- MAILRC		= $(SYSCONFDIR)/nail.rc
--MAILSPOOL	= /var/mail
-+MAILSPOOL	= ~/.maildir
- SENDMAIL	= /usr/lib/sendmail
- 
- DESTDIR		=
- 
--UCBINSTALL	= /usr/ucb/install
-+UCBINSTALL	= /usr/bin/install
- 
- #CFLAGS		=
- #CPPFLAGS	=
diff --git a/mail-client/nail/nail-11.23.ebuild b/mail-client/nail/nail-11.23.ebuild
deleted file mode 100644
index 59e8d5efcd12..000000000000
--- a/mail-client/nail/nail-11.23.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.23.ebuild,v 1.1 2005/06/28 23:29:06 ticho Exp $
-
-inherit eutils
-DESCRIPTION="Nail is a mail user agent derived from Berkeley Mail 8.1 and contains builtin support for MIME messages."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://nail.sourceforge.net/"
-PROVIDE="virtual/mailx"
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )
-	!virtual/mailx"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~ia64 ~hppa"
-IUSE="ssl"
-
-src_compile() {
-	# ./configure no longer required
-	emake PREFIX=/usr MAILSPOOL='~/.maildir' || die "emake failed"
-}
-
-src_install () {
-	#add smtp flag to nail.rc so that it uses smtp by default (making it
-	#essentially mailer independent
-	echo -e "\n#use smtp on the local system by default.  Change" >> nail.rc
-	echo -e "#\"localhost\" to your smtp server if you use a remote" >> nail.rc
-	echo -e "#smtp server.  (Delete this line to use sendmail instead)" >> nail.rc
-	echo -e "set smtp=localhost" >> nail.rc
-
-	make DESTDIR=${D} UCBINSTALL=/bin/install PREFIX=/usr install || die "install failed"
-	dodoc AUTHORS COPYING I18N 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
-}
-
-pkg_postinst () {
-	echo
-	einfo "NOTE: This build has ~/.maildir compiled in as the"
-	einfo "      mail spool directory (for incoming mail)."
-	einfo "      Nail will work for sending outgoing mail even if"
-	einfo "      the mail spool directory does not exist."
-	echo
-	einfo "NOTE: When used to send mail via a remote smtp server"
-	einfo "      nail does not require a local mail transfer agent."
-	einfo "      ISP smtp servers tend to have names like"
-	einfo "        mail.ispname.com"
-	einfo "      or"
-	einfo "        smtp.ispname.com."
-	einfo "      If you do not wish to use a remote smtp server,"
-	einfo "      then you WILL have to install a mta such as sendmail,"
-	einfo "      postfix, exim, etcetera."
-	echo
-}
diff --git a/mail-client/nail/nail-11.25-r1.ebuild b/mail-client/nail/nail-11.25-r1.ebuild
new file mode 100644
index 000000000000..084814c4bf12
--- /dev/null
+++ b/mail-client/nail/nail-11.25-r1.ebuild
@@ -0,0 +1,52 @@
+# 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-r1.ebuild,v 1.1 2005/08/10 18:16:46 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="~x86 ~sparc ~ppc ~amd64 ~alpha ~ia64 ~hppa"
+IUSE="ssl net"
+
+src_compile() {
+	# Build config.h and LIBS, neccesary to tweak the config
+	make config.h
+
+	# Hack to remove openssl
+	if ! use ssl ; then
+		sed -i -e 's~#define USE_\(OPEN\)\?SSL~#undef USE_\1SSL~' config.h
+		sed -i -e 's~-lssl~~' -e 's~-lcrypto~~' LIBS
+	fi
+
+	# And now to remove the IMAP/POP/SMTP stuff
+	use net || \
+		sed -i -e 's~#define HAVE_SOCKETS~#undef HAVE_SOCKETS~' config.h
+
+	# Now really build it
+	emake PREFIX=/usr MAILSPOOL='~/.maildir' || die "emake failed"
+}
+
+src_install () {
+	# Use /usr/lib/sendmail by default and provide an example
+	use net && 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
+}
diff --git a/mail-client/nail/nail-11.25.ebuild b/mail-client/nail/nail-11.25.ebuild
deleted file mode 100644
index f6288198bdc0..000000000000
--- a/mail-client/nail/nail-11.25.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.ebuild,v 1.1 2005/07/31 20:12:21 ferdy Exp $
-
-inherit eutils
-DESCRIPTION="Nail is a mail user agent derived from Berkeley Mail 8.1 and contains builtin support for MIME messages."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://nail.sourceforge.net/"
-PROVIDE="virtual/mailx"
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )
-	!virtual/mailx"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~ia64 ~hppa"
-IUSE="ssl"
-
-src_compile() {
-	# ./configure no longer required
-	emake PREFIX=/usr MAILSPOOL='~/.maildir' || die "emake failed"
-}
-
-src_install () {
-	#add smtp flag to nail.rc so that it uses smtp by default (making it
-	#essentially mailer independent
-	echo -e "\n#use smtp on the local system by default.  Change" >> nail.rc
-	echo -e "#\"localhost\" to your smtp server if you use a remote" >> nail.rc
-	echo -e "#smtp server.  (Delete this line to use sendmail instead)" >> nail.rc
-	echo -e "set smtp=localhost" >> nail.rc
-
-	make DESTDIR=${D} UCBINSTALL=/bin/install PREFIX=/usr install || die "install failed"
-	dodoc AUTHORS COPYING I18N 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
-}