Update rpcgen ioctl patch to reflect changes in upstream.

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

6 files changed, 19 insertions, 14 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 9b79c0b62dfc..96ceca4b9493 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.159 2009/06/02 19:03:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.160 2009/08/25 02:43:17 vapier Exp $
+
+  25 Aug 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/nfs-utils-1.1.2-rpcgen-ioctl.patch, nfs-utils-1.1.4-r1.ebuild,
+  +files/nfs-utils-1.1.4-rpcgen-ioctl.patch, nfs-utils-1.1.5.ebuild,
+  nfs-utils-1.1.6.ebuild, nfs-utils-1.1.6-r1.ebuild:
+  Update rpcgen ioctl patch to reflect changes in upstream.
 
 *nfs-utils-1.2.0 (02 Jun 2009)
 
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.2-rpcgen-ioctl.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch
index 2115345755ed..176541845ed9 100644
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.2-rpcgen-ioctl.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch
@@ -2,12 +2,11 @@ http://bugs.gentoo.org/174393
 
 --- tools/rpcgen/rpc_main.c
 +++ tools/rpcgen/rpc_main.c
-@@ -548,6 +548,9 @@
- #ifndef linux
- 	if( !tirpcflag && inetdflag )
+@@ -548,7 +548,7 @@
  	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
-+#else
-+	if( !tirpcflag )
+ #else
+ 	if( !tirpcflag )
+-	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
 +	  f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
  #endif
  	if( Cflag && (inetdflag || pmflag ) ) {
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
index 9fbc7a8f08d8..d6de0c9759d7 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild,v 1.8 2009/03/25 18:46:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild,v 1.9 2009/08/25 02:43:17 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
index 306ddebb7eb8..14fba74d53ca 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild,v 1.2 2009/03/06 09:32:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild,v 1.3 2009/08/25 02:43:17 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
index 1b27837ea30a..470918ae9644 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild,v 1.2 2009/05/30 22:01:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild,v 1.3 2009/08/25 02:43:17 vapier Exp $
 
 EAPI="1"
 
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild
index eb99605c5b53..f8974464d49e 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild,v 1.1 2009/05/09 18:28:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild,v 1.2 2009/08/25 02:43:17 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch