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

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.7 x86_64

5 files changed, 11 insertions, 111 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/Manifest b/mail-client/nmh/Manifest
index 262e78b3dfa5..8f115565c7b6 100644
--- a/mail-client/nmh/Manifest
+++ b/mail-client/nmh/Manifest
@@ -8,12 +8,9 @@ AUX nmh-1.1-m_getfld.patch 571 RMD160 45813d23f8c9fefe0e5fc3e1789f100d5b2a4648 S
 AUX nmh-1.3-inc-login.patch 625 RMD160 e5f6edd8fd49c3baff074aeab949401a9580c48e SHA1 3ddc61705f2bb9f75e5cba9d721ac6d743305367 SHA256 83015653f6b21241285a0c36c496bb42d188005a09caf8363e73683b6d0d543a
 AUX nmh-1.3-install.patch 493 RMD160 265cc0038b1c0e5586c4e1169b4ff8e4b00ed407 SHA1 66083fe3241ad40e17512c1f18e7535838054aa5 SHA256 8477686bdf9675c096e034f7d2a9812b06d30d50e3a59f72df5b01d37853d278
 AUX nmh-1.3-m_getfld.patch 627 RMD160 d47738a9f1c3f99350ff9433201ade5b9713307a SHA1 274495b527598904f307954c7ab42f881fd692d4 SHA256 5ef443b0d0ad3de47d3ee96abdd82479f1efa01fd2820ca77680705cc6e93889
-DIST nmh-1.0.4.tar.gz 683215 RMD160 32f0a0cb7aa76f7d7efc59d99b6e5aeeea519037 SHA1 71441a884d898db2fd9184a92e663682536425f5 SHA256 828de9461f5fc6dd70eab2db20f95761f66351ea91425c0d3fd4e96cbda3a350
 DIST nmh-1.1.tar.gz 808466 RMD160 20127d220b6de6531ff772bd03fec09a284a1b4c SHA1 3f906fcc48aa299c9a78f88679df963fcbeb121e SHA256 a0709e88188623e0ca7ff81a96836578ad617d42a9fa32aeda8ea47f0bac8967
 DIST nmh-1.3.tar.gz 847614 RMD160 a862789cc8edb28c0fc3295bd12787440797da92 SHA1 65b52b7db727c391cae7af60ee0b888cbdc2718a SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
-EBUILD nmh-1.0.4-r3.ebuild 1391 RMD160 60e152a15777556d21c0ba955ed2147b4473ee49 SHA1 650c12e36fd6a74015d0c3b5cd46bb9f90cf591f SHA256 271d46a4010fe11335fa9643d628454e1e29ad709c6f56131251adacd3378bae
-EBUILD nmh-1.1-r1.ebuild 1664 RMD160 e57fca84a55cfebc3d00c880da84d7871395af97 SHA1 9053d72ddf65b1cf9ce07db21cd4bb93e5aa8ee0 SHA256 a86c27aba6b9f374abb52c367f89ecfa8b78ecd067776c70535326137bab1127
-EBUILD nmh-1.1.ebuild 1525 RMD160 0f3f58eea24db82a82d6fd9cdb6916791d2bd2bd SHA1 5a45dc6a5bf2caa5942aee8312a244ecd9b1b562 SHA256 8f26feffda340ac671f2feda949eec0b104a264d67178354532e31d87b16a790
+EBUILD nmh-1.1-r1.ebuild 1689 RMD160 cb1806c19939b08473000f4159967dc24991e98e SHA1 589a849913bdde8db03c817c81f4f8c46d9f0b56 SHA256 7a1328caf198fe05842eeabd1141e4f21f9f4343ccec904382a2f782280cd8c1
 EBUILD nmh-1.3-r1.ebuild 1461 RMD160 0d3cbd505a0139f3f3862570735a7829a591a540 SHA1 89d4c661b84f2e002156d6e59e19f28fd0726c56 SHA256 a9f7c4edfa67793a6804a6b3c36dfb3d967ffd20a2f494223dab2cca4b9a192a
-MISC ChangeLog 3926 RMD160 19e7e1d957618da5cb0be44232cd43eca5ad26e8 SHA1 8f40be361246ddb2f7d526ed83a6099a246fe4a1 SHA256 cfac85a65027be0fe85185fce637c70d1a6a33735c178df5f541016d1a2b0ba3
+MISC ChangeLog 4147 RMD160 75e7ab7c2c2aee152d5498680e32bfd877346a8b SHA1 f3ace7616f25ad274fb536843611a1fda69e11d2 SHA256 c7ad818760a88c65a0f9eef3818b398de7b3ddd0b826c8526a0147762750b320
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
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
-}