Make ssl and kerberos USE flags to be dependent on net; make sure that kerberos is disabled (to avoid automagic dependencies); describe the USE flags better.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 121 insertions, 3 deletions

diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog
index 9aa07be5bc47..739a6c25fcf7 100644
--- a/mail-client/nail/ChangeLog
+++ b/mail-client/nail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/nail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.69 2010/07/25 15:24:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.70 2010/07/26 22:50:28 flameeyes Exp $
+
+*nail-12.4-r1 (26 Jul 2010)
+
+  26 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +nail-12.4-r1.ebuild, metadata.xml:
+  Make ssl and kerberos USE flags to be dependent on net; make sure that
+  kerberos is disabled (to avoid automagic dependencies); describe the USE
+  flags better.
 
   25 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> nail-12.4.ebuild:
   ppc64 stable wrt #324127
diff --git a/mail-client/nail/metadata.xml b/mail-client/nail/metadata.xml
index 5f58cc6d09b4..e0b4a839f0a2 100644
--- a/mail-client/nail/metadata.xml
+++ b/mail-client/nail/metadata.xml
@@ -3,7 +3,20 @@
 <pkgmetadata>
 <herd>net-mail</herd>
 <use>
-	<flag name='net'>Enable network support (thus enabling POP, IMAP and
-		SMTP)</flag>
+  <flag name='net'>
+    Enable support for network protocols (POP, IMAP and SMTP). If you
+    only need to send mail with the local Transport Agent, disabling
+    this will get you support for only /usr/sbin/sendmail call.
+  </flag>
+
+  <flag name='ssl'>
+    If network is enabled, this adds support for S/MIME and
+    SSL/TLS-powered protocols through <pkg>dev-libs/openssl</pkg>.
+  </flag>
+
+  <flag name='kerberos'>
+    If network is enabled, this adds support for GSSAPI login on IMAP
+    through <pkg>virtual/kerberos</pkg>.
+  </flag>
 </use>
 </pkgmetadata>
diff --git a/mail-client/nail/nail-12.4-r1.ebuild b/mail-client/nail/nail-12.4-r1.ebuild
new file mode 100644
index 000000000000..475e45664515
--- /dev/null
+++ b/mail-client/nail/nail-12.4-r1.ebuild
@@ -0,0 +1,97 @@
+# 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-r1.ebuild,v 1.1 2010/07/26 22:50:28 flameeyes Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+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 ~x86-freebsd ~x86-interix"
+IUSE="ssl net kerberos"
+
+PROVIDE="virtual/mailx"
+RDEPEND="
+	net? (
+		ssl? ( dev-libs/openssl )
+		kerberos? ( virtual/krb5 )
+	)
+	!virtual/mailx
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+undef() {
+	sed -i -e "/$1/s:#define:#undef:" config.h || die
+}
+
+droplib() {
+	sed -i -e "/$1/s:^:#:" LIBS || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch
+	# 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 ssl || ! use net ; then
+		undef 'USE_\(OPEN\)\?SSL'
+		droplib -lssl
+	fi
+
+	if ! use kerberos || ! use net ; then
+		undef 'USE_GSSAPI'
+		droplib -lgssapi_krb5
+	fi
+
+	if ! use net ; then
+		undef 'HAVE_SOCKETS'
+	fi
+}
+
+src_compile() {
+	# No configure script to check for and set this
+	tc-export CC
+
+	emake \
+		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
+		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="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+		|| die
+	dodoc AUTHORS README
+	dodir /bin
+	dosym /usr/bin/mailx /bin/mail
+	dosym /usr/bin/mailx /usr/bin/mail
+	dosym /usr/bin/mailx /usr/bin/Mail
+}