(non maintainer commit) Remove old and apply file locking call to configure. bug #153840 by David Fellows

(Portage version: 2.2_rc17/cvs/Linux 2.6.27.7 x86_64)

4 files changed, 9 insertions, 106 deletions

diff --git a/mail-client/nmh/ChangeLog b/mail-client/nmh/ChangeLog
index 62c822f548af..383e948632e7 100644
--- a/mail-client/nmh/ChangeLog
+++ b/mail-client/nmh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/nmh
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.22 2008/12/09 03:47:59 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.23 2008/12/09 03:53:43 darkside Exp $
+
+  09 Dec 2008; Jeremy Olexa <darkside@gentoo.org> -nmh-1.0.4-r3.ebuild,
+  -nmh-1.1.ebuild, nmh-1.1-r1.ebuild:
+  (non maintainer commit) Remove old and apply file locking call to configure.
+  bug #153840 by David Fellows
 
 *nmh-1.3-r1 (09 Dec 2008)
 
diff --git a/mail-client/nmh/nmh-1.0.4-r3.ebuild b/mail-client/nmh/nmh-1.0.4-r3.ebuild
deleted file mode 100644
index bba1f7b3635d..000000000000
--- a/mail-client/nmh/nmh-1.0.4-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/nmh-1.0.4-r3.ebuild,v 1.4 2004/07/27 17:57:57 gustavoz Exp $
-
-inherit eutils
-DESCRIPTION="New MH mail reader"
-SRC_URI="ftp://ftp.mhost.com/pub/nmh/${P}.tar.gz"
-HOMEPAGE="http://www.mhost.com/nmh/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc ~ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	=sys-libs/db-1.85*
-	>=sys-libs/ncurses-5.2"
-
-src_compile() {
-
-	[ -z "${EDITOR}" ] && export EDITOR="prompter"
-	[ -z "${PAGER}" ] && export PAGER="/usr/bin/more"
-
-	# vitest access violation patch
-	epatch ${FILESDIR}/${P}-configure-vitest.patch || die "patch failed."
-	# bug #57886
-	epatch ${FILESDIR}/${P}-m_getfld.patch || die "patch failed."
-
-	# Redifining libdir to be bindir so the support binaries get installed
-	# correctly.  Since no libraries are installed with nmh, this does not
-	# pose a problem at this time.
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-editor=${EDITOR} \
-		--with-pager=${PAGER} \
-		--enable-nmh-pop \
-		--sysconfdir=/etc/nmh \
-		--libdir=/usr/bin || die
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/bin \
-		etcdir=${D}/etc/nmh install || die
-	dodoc COMPLETION-TCSH COMPLETION-ZSH TODO FAQ DIFFERENCES \
-		MAIL.FILTERING Changelog* COPYRIGHT
-}
diff --git a/mail-client/nmh/nmh-1.1-r1.ebuild b/mail-client/nmh/nmh-1.1-r1.ebuild
index b3d3905cefa4..5769aa370d02 100644
--- a/mail-client/nmh/nmh-1.1-r1.ebuild
+++ b/mail-client/nmh/nmh-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/nmh-1.1-r1.ebuild,v 1.5 2005/11/23 00:36:48 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/nmh-1.1-r1.ebuild,v 1.6 2008/12/09 03:53:43 darkside Exp $
 
 inherit eutils
 DESCRIPTION="New MH mail reader"
@@ -41,6 +41,7 @@ src_compile() {
 		--with-editor=${EDITOR} \
 		--with-pager=${PAGER} \
 		--enable-nmh-pop \
+		--with-locking=lockf \
 		--sysconfdir=/etc/nmh \
 		--libdir=/usr/bin || die
 	make || die
diff --git a/mail-client/nmh/nmh-1.1.ebuild b/mail-client/nmh/nmh-1.1.ebuild
deleted file mode 100644
index 1c8695b0fc0c..000000000000
--- a/mail-client/nmh/nmh-1.1.ebuild
+++ /dev/null
@@ -1,54 +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/nmh/nmh-1.1.ebuild,v 1.5 2005/06/05 11:51:50 hansmi Exp $
-
-inherit eutils
-DESCRIPTION="New MH mail reader"
-SRC_URI="http://savannah.nongnu.org/download/nmh/${P}.tar.gz"
-HOMEPAGE="http://www.nongnu.org/nmh/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="ppc sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	=sys-libs/db-1.85*
-	>=sys-libs/ncurses-5.2"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-
-	[ -z "${EDITOR}" ] && export EDITOR="prompter"
-	[ -z "${PAGER}" ] && export PAGER="/usr/bin/more"
-
-	# Patches from bug #22173.
-	epatch ${FILESDIR}/${P}-inc-login.patch
-	epatch ${FILESDIR}/${P}-install.patch
-	# vi test access violation patch
-	epatch ${FILESDIR}/${P}-configure-vitest.patch || die "patch failed."
-	# bug #57886
-	epatch ${FILESDIR}/${P}-m_getfld.patch || die "patch failed."
-
-	# Redifining libdir to be bindir so the support binaries get installed
-	# correctly.  Since no libraries are installed with nmh, this does not
-	# pose a problem at this time.
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-editor=${EDITOR} \
-		--with-pager=${PAGER} \
-		--enable-nmh-pop \
-		--sysconfdir=/etc/nmh \
-		--libdir=/usr/bin || die
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/bin \
-		etcdir=${D}/etc/nmh install || die
-	dodoc COMPLETION-TCSH COMPLETION-ZSH TODO FAQ DIFFERENCES \
-		MAIL.FILTERING Changelog* COPYRIGHT
-}