remove old and change to new style virtual/mailx - bug 350792

(Portage version: 2.1.9.44/cvs/Linux x86_64)

4 files changed, 14 insertions, 108 deletions

diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog
index 0005f0077c9f..11466a51119e 100644
--- a/mail-client/nail/ChangeLog
+++ b/mail-client/nail/ChangeLog
@@ -1,6 +1,10 @@
 # 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.76 2010/10/04 19:55:54 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.77 2011/03/20 13:18:38 eras Exp $
+
+  20 Mar 2011; Eray Aslan <eras@gentoo.org> nail-12.4.ebuild,
+  -nail-12.4-r1.ebuild, nail-12.4-r2.ebuild:
+  remove old and change to new style virtual/mailx - bug 350792
 
   04 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org> nail-12.4-r2.ebuild:
   Use -j1 when building config or it'll produce bad files.
diff --git a/mail-client/nail/nail-12.4-r1.ebuild b/mail-client/nail/nail-12.4-r1.ebuild
deleted file mode 100644
index ad60411b38c3..000000000000
--- a/mail-client/nail/nail-12.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.3 2010/09/23 20:51:49 maekke 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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-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 \
-		SENDMAIL="${EPREFIX}/usr/lib/sendmail" \
-		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
-}
diff --git a/mail-client/nail/nail-12.4-r2.ebuild b/mail-client/nail/nail-12.4-r2.ebuild
index 5fa52d829194..cc2c70f7db04 100644
--- a/mail-client/nail/nail-12.4-r2.ebuild
+++ b/mail-client/nail/nail-12.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4-r2.ebuild,v 1.2 2010/10/04 19:55:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4-r2.ebuild,v 1.3 2011/03/20 13:18:38 eras Exp $
 
 EAPI="3"
 
@@ -17,13 +17,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ssl net kerberos"
 
-PROVIDE="virtual/mailx"
 RDEPEND="
 	net? (
 		ssl? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
 	)
-	!virtual/mailx
+	!mail-client/mailx
+	!net-mail/mailutils
 "
 DEPEND="${RDEPEND}"
 
diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
index 0cf406a07a5b..576f21f687a1 100644
--- a/mail-client/nail/nail-12.4.ebuild
+++ b/mail-client/nail/nail-12.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.15 2010/09/04 14:53:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.16 2011/03/20 13:18:38 eras Exp $
 
 EAPI="3"
 
@@ -17,11 +17,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~x86-interix"
 IUSE="ssl net kerberos"
 
-PROVIDE="virtual/mailx"
 RDEPEND="
 	ssl? ( dev-libs/openssl )
 	kerberos? ( virtual/krb5 )
-	!virtual/mailx
+	!mail-client/mailx
+	!net-mail/mailutils
 "
 DEPEND="${RDEPEND}"