Make sure rpcgen includes sys/ioctl.h #174393.

Package-Manager: portage-2.2_pre5

4 files changed, 32 insertions, 7 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 74bb9ffa04d2..faef152b3195 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.123 2008/04/20 10:41:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.124 2008/04/20 10:49:29 vapier Exp $
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/nfs-utils-1.1.2-rpcgen-ioctl.patch, nfs-utils-1.1.2.ebuild:
+  Make sure rpcgen includes sys/ioctl.h #174393.
 
 *nfs-utils-1.1.2 (20 Apr 2008)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 62c32d1b17a4..5bc3ff38b5f1 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e084cfc17ff4638c2e06c86602034 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5
 AUX nfs 6879 RMD160 2016eebfaaa69337eee02e2b2a973f7b7e5798ad SHA1 c2d35305c9a4d6d47c5f2611324cfa0fe33e741d SHA256 25d6f28b67b4c90f0fa1b9a2cbff54240d527f83a1c61faac9d8f8dcbd72d680
 AUX nfs-utils-1.0.12-mountd-memleak.patch 548 RMD160 c4b9c3ad1c857d4389cb727356de0a5eda74030e SHA1 2d1dddeb135a70b50b242d12c1a8167458aa0017 SHA256 d9ae3561bbb7067a833891139107b2e54565dbb36104268289e35e1e18e3da92
+AUX nfs-utils-1.1.2-rpcgen-ioctl.patch 398 RMD160 1ff3225a3d4f3dd3e21a9d34f9839e266ee3a8fa SHA1 2f8da1c38ae4f93c600e0710d002d94f036fa09c SHA256 b769bfe5f47f1556ded750ba3cf4c0ab210d1296ce3f575b69b18b7173f4f298
 AUX nfs.confd 630 RMD160 3628b5df5589c700905afc8054d1ee22fb5be0b9 SHA1 b5e8e37f3611008626f3f1fc633202fbefb8c101 SHA256 9ca3b7dfbac5bedd818a3637805380f4e873ef8e809c21c26f410c86ac16e03e
 AUX nfs.confd.old 533 RMD160 bad552a256a86bc374cd7ff3d685afa4ff5d816e SHA1 43fbdfba5a61ad79375265c120fb4784da7b1462 SHA256 a9b8395590b8d15b52eee8cb637fdc23afce007de42442ef4448e76f2ac899fd
 AUX nfs.initd 4004 RMD160 89bed24bd184fca28f23a8e034950b6bd1f2daaa SHA1 dc2a74ba75404b02bd4504aedb22ad98f0c748da SHA256 81dfed1f143fe8df05d9da3d5cec7cd7012f9b6cd1e63fb3ec9344e2b92027a4
@@ -24,13 +25,13 @@ EBUILD nfs-utils-1.0.12-r5.ebuild 3081 RMD160 f1023d33e4861504ce99efe243876ff2f4
 EBUILD nfs-utils-1.1.0-r1.ebuild 3109 RMD160 39f05350068ae5c8ed3a4470c8ab050faa2fa769 SHA1 7ec8b04ae813687a8c9f41b4001112cf3430b32f SHA256 a9fd270fc52bbee05d230b5e96280f7696c2ad96f796fa99ad4481c104710c07
 EBUILD nfs-utils-1.1.1-r1.ebuild 3476 RMD160 0e3eb6fbd0ae1730ce36f00b4bf6a063fdb9ccb9 SHA1 23fbd6747a87e753558dcd6cbd59861eca0f33fc SHA256 e866461cbe94ab5acada6b9a11448081518fbace7ee82e31fab4d20c67687c51
 EBUILD nfs-utils-1.1.1.ebuild 3473 RMD160 da80132e799485c625dd4bb6630b4f687f41ec17 SHA1 a3778a9054ea2b1367afe099d609e9b0f6b9e1a9 SHA256 aeb695b65d9ff762018444996322bb71224c87e9e1a098871c45367db7ed32c4
-EBUILD nfs-utils-1.1.2.ebuild 2934 RMD160 fbe171e08c58c937406f7af9682d89e10c75596b SHA1 836095c32fa4a736bf49f966aac9102b2d2dc44b SHA256 5720c5c7ec99f744423cf767afce9589e7f067cb34c6f6b357720e174d5ae818
-MISC ChangeLog 18603 RMD160 e89b8288b6c1a62d7529aae4c124d63f82ed29a6 SHA1 c55b4481ae4de49645958302518ddf0df6d7ec22 SHA256 ade04a2681a4cc99a62a3597ac840a76b0e1359d6451409c0b34670152249df2
+EBUILD nfs-utils-1.1.2.ebuild 3022 RMD160 a481a76bb1fd9619bb8c7e958e6ed37f52d623f6 SHA1 ca5553cd12188f0bdd7b98b3f6d04f644537943d SHA256 bb7ca1021e066b15e4cdf22541723b9905d0d174dfac96685a0a711ae2f75347
+MISC ChangeLog 18772 RMD160 3789ebff33ad780edccb85148dbc63c0ce1fe66b SHA1 33e9d31c4fa313855540661844bf528d214960e7 SHA256 6f15db25f71379b0ad0247497d8f88271318fa469935b06908ce3d507b26de37
 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFICx38j9hvisErhMIRAhN8AKDhdM6jhLCnpic6LV57nneQ0OlL6gCfZn8A
-mPmTZu+cb8HmJcqyTTdYiWE=
-=ZLwH
+iD8DBQFICx+/j9hvisErhMIRApNDAKCEOGTFtnU08vM1a48KSKAJokFovQCffUKA
+03/jQeDD0FlpYouaeMxLTY4=
+=CN4b
 -----END PGP SIGNATURE-----
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.2-rpcgen-ioctl.patch
new file mode 100644
index 000000000000..2115345755ed
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.1.2-rpcgen-ioctl.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/174393
+
+--- tools/rpcgen/rpc_main.c
++++ tools/rpcgen/rpc_main.c
+@@ -548,6 +548,9 @@
+ #ifndef linux
+ 	if( !tirpcflag && inetdflag )
+ 	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
++#else
++	if( !tirpcflag )
++	  f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
+ #endif
+ 	if( Cflag && (inetdflag || pmflag ) ) {
+ 	  f_print(fout, "#ifdef __cplusplus\n");
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.2.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.2.ebuild
index 121220ca9c5b..f8df80a4253a 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.2.ebuild,v 1.1 2008/04/20 10:41:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.2.ebuild,v 1.2 2008/04/20 10:49:29 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -32,6 +32,12 @@ RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
 DEPEND="${RDEPEND}
 	>=sys-apps/util-linux-2.12r-r7"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-rpcgen-ioctl.patch
+}
+
 src_compile() {
 	econf \
 		--mandir=/usr/share/man \