[gentoo-commits] gentoo-x86 commit in mail-client/nail: metadata.xml ChangeLog nail-12.4-r1.ebuild

[Diego Petteno (flameeyes)]

flameeyes    10/07/26 22:50:28

  Modified:             metadata.xml ChangeLog
  Added:                nail-12.4-r1.ebuild
  Log:
  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)

Revision  Changes    Path
1.3                  mail-client/nail/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/nail/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/nail/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/nail/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/nail/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	23 Aug 2008 01:42:24 -0000	1.2
+++ metadata.xml	26 Jul 2010 22:50:28 -0000	1.3
@@ -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>



1.70                 mail-client/nail/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/nail/ChangeLog?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/nail/ChangeLog?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/nail/ChangeLog?r1=1.69&r2=1.70

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog	25 Jul 2010 15:24:17 -0000	1.69
+++ ChangeLog	26 Jul 2010 22:50:28 -0000	1.70
@@ -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@g.o>
+  +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@g.o> nail-12.4.ebuild:
   ppc64 stable wrt #324127



1.1                  mail-client/nail/nail-12.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/nail/nail-12.4-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/nail/nail-12.4-r1.ebuild?rev=1.1&content-type=text/plain

Index: nail-12.4-r1.ebuild
===================================================================
# 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
}