Version bump thanks to Andreas Niederl and many others (bug #156878). Respect CC (bug #244132).

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 101 insertions, 16 deletions

diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog
index 42132f3e5814..2989e6372db2 100644
--- a/mail-client/nail/ChangeLog
+++ b/mail-client/nail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/nail
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.55 2008/08/23 01:42:24 cardoe Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.56 2010/02/02 17:45:35 jer Exp $
+
+*nail-12.4 (02 Feb 2010)
+
+  02 Feb 2010; Jeroen Roovers <jer@gentoo.org> +nail-12.4.ebuild:
+  Version bump thanks to Andreas Niederl and many others (bug #156878).
+  Respect CC (bug #244132).
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index d9b0d585ce91..4c57ee08727b 100644
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nail-nosocket.patch 473 RMD160 1598331c9a0ea4fcaa6682bae9e04cb5d7bb3117 SHA1 600c8bb47a17008c992297e28e29c73fb44108ef SHA256 840a0f3f592de84d03c225ccdc6c363b4d372eb605750a0ee7e1b02320547dc9
+DIST mailx-12.4.tar.bz2 271482 RMD160 8244d04d0a0058fdbe9867ca503c7cda8d580154 SHA1 b1e105adf9d36269daf317dedf68b6e4cca404a7 SHA256 92201e769fe346bc0364c87437a330ef3c97ab3e9d7b2235b93f509e85e5716a
 DIST nail-11.25.tar.bz2 267959 RMD160 d72a5a4760cc43bcc2e9223e2eca4f0a8de7605f SHA1 dd15a5bdedb74175763ababa8be70989334963e4 SHA256 ae831aa7ebee1a348d84cb37228fe784b32c6ccf2d06edfba141de8f165515c5
-EBUILD nail-11.25-r3.ebuild 1957 RMD160 c35abee6a028afdc00f43bfec04ee078d65142c6 SHA1 b4756038a89ea810e11e882fde07a1bfb48819a5 SHA256 c31cf9e60c437378b8dc22442faa0d5d4b661336eb2cf7aedb8b5eae80dc20ae
-MISC ChangeLog 7492 RMD160 7217ffa0894c13bbca849d3591c307d30e96551a SHA1 70f49e0efbbc493414c2a78be47ff337020efc47 SHA256 bdc1ddaa90da8fa7179a815e8c7ff8daa06fa7d51b539dc5a9187d7bc0eeb05d
+EBUILD nail-11.25-r3.ebuild 1953 RMD160 e35c183b48a49c4c740d62de453cde8639c45919 SHA1 fe999b4267fc04fd71773f92a6c886addf2a4214 SHA256 8905abfc7554db228c872553e13f51ce3b53dd1bacc9147ca5a1e6251a2be380
+EBUILD nail-12.4.ebuild 2081 RMD160 39f9d2ba46528f3b397c56682bb7ab3ec8069f3c SHA1 3b2845a04d411f16c81a500a4e36e9d66ae38c3d SHA256 c62018cdf89a28b6dc65a88a679fe59b6cb4fe126b9523063b7cf4d39bb0b7f4
+MISC ChangeLog 7682 RMD160 5390f200aa58801044fa381527472ee59a18636f SHA1 772ee83948917980feb00e4f9ed420bf8d573cae SHA256 2c0f3d4a995e820f942bb39cabc6ce69bf9251c9de22e761705b5bf03402006c
 MISC metadata.xml 259 RMD160 7bd304e664ab666fab49794d575652f4a5e1587c SHA1 1f0507ccb185c8f48f26b7ad1cfe4df64ce01ad1 SHA256 2b207df02a39323049a95d476319fcaafda0b918c0c4e1feaab97b61ca1a93c6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivawYACgkQoeSe8B0zEfywwwCfWpB72xd69TCcPXYSJky4LTQ7
-2P4AnR2I+c99I7M0zTLBJda9fidhqp5r
-=VFZF
------END PGP SIGNATURE-----
diff --git a/mail-client/nail/nail-11.25-r3.ebuild b/mail-client/nail/nail-11.25-r3.ebuild
index f8fc6e18bff0..9cbd9d762fd1 100644
--- a/mail-client/nail/nail-11.25-r3.ebuild
+++ b/mail-client/nail/nail-11.25-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-11.25-r3.ebuild,v 1.13 2007/07/09 05:37:56 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-11.25-r3.ebuild,v 1.14 2010/02/02 17:45:35 jer Exp $
 
 inherit eutils
 DESCRIPTION="Nail is an enhanced mailx-compatible mail client"
@@ -58,7 +58,7 @@ src_install () {
 		#set smtp=localhost
 	EOSMTP
 
-	make DESTDIR=${D} \
+	make DESTDIR="${D}" \
 		UCBINSTALL=$(type -p install) \
 		PREFIX=/usr install || die "install failed"
 	dodoc AUTHORS INSTALL README
diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
new file mode 100644
index 000000000000..6d2784e83ea3
--- /dev/null
+++ b/mail-client/nail/nail-12.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.1 2010/02/02 17:45:35 jer Exp $
+
+EAPI="2"
+
+inherit eutils
+
+HOMEPAGE="http://heirloom.sourceforge.net/"
+DESCRIPTION="an enhanced mailx-compatible mail client"
+LICENSE="BSD"
+
+MY_PN="mailx"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ssl net kerberos"
+
+PROVIDE="virtual/mailx"
+RDEPEND="
+	ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )
+	!virtual/mailx
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+remove_ssl() {
+	elog "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() {
+	elog "Not enabling sockets (thus disabling IMAP, POP and SMTP)"
+	sed -i -e 's~#define HAVE_SOCKETS~#undef HAVE_SOCKETS~' config.h
+}
+
+src_prepare() {
+	# Do not strip the binary
+	sed -i -e '/STRIP/d' Makefile
+}
+
+src_configure() {
+	# Build config.h and LIBS, neccesary to tweak the config
+	make config.h LIBS
+
+	# 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
+}
+
+src_compile() {
+	# No configure script to check for and set this
+	tc-export CC
+
+	emake \
+		PREFIX=/usr \
+		MAILSPOOL='/var/spool/mail' \
+		|| 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=$(type -p install) \
+		PREFIX=/usr install || die "install failed"
+	dodoc AUTHORS INSTALL README
+	dodir /bin
+	dosym /usr/bin/mailx /bin/mail
+	dosym /usr/bin/mailx /usr/bin/mail
+	dosym /usr/bin/mailx /usr/bin/Mail
+}