Fix building on uClibc systems #222099 by Sergey Dryabzhinsky.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 48 insertions, 9 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 17831b0d7879..4546cb06f504 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/gpm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.77 2009/02/15 21:06:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.78 2009/02/15 21:23:06 vapier Exp $
+
+  15 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch, gpm-1.20.5.ebuild,
+  gpm-1.20.6.ebuild:
+  Fix building on uClibc systems #222099 by Sergey Dryabzhinsky.
 
 *gpm-1.20.6 (15 Feb 2009)
 
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index df104c1b12be..98607c698ccd 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0001-daemon-use-sys-ioctl.h-for-ioctl.patch 1145 RMD160 61a5c2d0d7c84baf8d2916dcdab21b64eb0d9849 SHA1 5199e94ec3e1c78c66bbe5a0d9b25cb64f5513ad SHA256 e9e2690d2c29e5e166f726638d90e1bfbc54815d36336b5cc539a31ff56650bf
 AUX gpm-1.20.5-abi.patch 383 RMD160 782fc099dc3e10b0de022a9a89fdf77d0559f359 SHA1 c6db4819c5bfd296971cf135d7052194f41990a4 SHA256 aafaa4c1e3f216b6ad5880653dfb6fd8eb264644cbca08dad219bab7a9cefda5
 AUX gpm.conf.d 580 RMD160 5ce706d89a3e2c01b75a01dd614267f918290be9 SHA1 44035e2059ac0fc178bfe427900d43ad33aeaa2a SHA256 73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8
 AUX gpm.rc6 951 RMD160 770208133f13fd02207095f7b71a63ac790467d7 SHA1 ca001d11faa1e28a16bfffc1ad880763399b354b SHA256 b893aa660a50014ea3dae4ce9925117b3b8bec9d50abf10f2da946a845789d04
@@ -9,14 +10,14 @@ DIST gpm-1.20.1.tar.bz2 565014 RMD160 2650ae1e3e87fcf8bdad80acf62777e8a62b6582 S
 DIST gpm-1.20.5.tar.lzma 1298963 RMD160 eacb47488d48b7281b70568b24ca3cfa523567df SHA1 4edff15d7fd8a5052b89e8506efefc08c7e26fd3 SHA256 1ecb09421507e9bc409a5d7052ae56a6159d706982a951ba150b2c6fde29ad06
 DIST gpm-1.20.6.tar.lzma 1280871 RMD160 c51995e868fa824aa25fa3333e74ac6b6496b07f SHA1 4677da0eb2f1910a5a744bbefa08fea82e0dca0c SHA256 27abb8a9142d3f7c31aeade2f2f1ed4b76bc760e181f552c504a7a9be00a868f
 EBUILD gpm-1.20.1-r6.ebuild 1882 RMD160 af915732f0ec9cfc32da3a326ee3b6f7fc2f3b02 SHA1 5f9953d4561ecd74fccd31eb481f26f0ebe04be9 SHA256 a6993212b8c9cea1d6dfe9430c83c9a04d265cd6b6b863232ce1ba9c170ede68
-EBUILD gpm-1.20.5.ebuild 1499 RMD160 d82c0229df63205870d6b6f1ea44604c50d56417 SHA1 8b0b81c402b476487a5ee750f35a82e51a2e6ae2 SHA256 f70f41577265144b0d879840d91c9146396980ef6014dca96e77f75232fd83e0
-EBUILD gpm-1.20.6.ebuild 1514 RMD160 ea8c37a3afd8b32f0973fa043e2478d8614e6dd8 SHA1 f6db2adbf6844ef436b3418db82c1bc00f52ff31 SHA256 4b1621085cb5753a9323fdd14233e9fffd55b13357897ffde1e7a791a75071c2
-MISC ChangeLog 10584 RMD160 6534cd04e7b50c405db145ad43335bc16c757d2f SHA1 7812df9ccb457896efffd6c220412025034872c6 SHA256 8d8163b97cfb9babed5406960d060bcd37b3d0cdf12e775fad1c908d6bcaf255
+EBUILD gpm-1.20.5.ebuild 1576 RMD160 e363e552c67b14ca982289b1c65f2bff05fe12a2 SHA1 aa238db04c57df749519de64bcf7ec1ceb0104d6 SHA256 4b5d65f4270d40a41152b786f647652b68f18d130e7c0b084254252604d6cb81
+EBUILD gpm-1.20.6.ebuild 1588 RMD160 0ee35cae47e5cff87cdad3e5b98d560564d18f09 SHA1 c44447cca472613b576b40e0ba7d172ce0ac2dae SHA256 94287ad98f15d4106f2e0e32d5f81c4aa14eaebf9624dcf4609282807c52de44
+MISC ChangeLog 10794 RMD160 2368ae365563d7b08b00b9aea923c9b1a62ab8bc SHA1 7ad9a5b9a0ec0f1e29ffc1d43fd8118b65410e7b SHA256 aac6d89815d36a2aee91d2da1a859a222dbda93d82e0c50f4ce228e791446bc0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmYg+MACgkQn/5bYzqsSmEY5gCgyQqniMXoBgtch9OYK8BshXui
-dFMAnRPcL87RAWWOUNebKJ1N7OXKkNCO
-=bR5Y
+iEYEARECAAYFAkmYh8AACgkQn/5bYzqsSmERjACfScei61Hkz7FdSyplJNLhyH09
+RSYAmwZYlRqLTgtJBmvsW6jW1sX2YA8/
+=HduT
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/gpm/files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch b/sys-libs/gpm/files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch
new file mode 100644
index 000000000000..b6c7809c0eb5
--- /dev/null
+++ b/sys-libs/gpm/files/0001-daemon-use-sys-ioctl.h-for-ioctl.patch
@@ -0,0 +1,31 @@
+From b184152761d8a4dbf73adcffaddac85709949c2f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 15 Feb 2009 16:16:51 -0500
+Subject: [PATCH] daemon: use sys/ioctl.h for ioctl()
+
+Including stropts.h for the ioctl() prototype is weird and breaks some
+systems that do not implement stropts.h.  Use sys/ioctl.h like normal.
+
+URL: http://bugs.gentoo.org/222099
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Reported-by: Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com>
+---
+ src/daemon/open_console.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
+index 27b62e2..98297c9 100644
+--- a/src/daemon/open_console.c
++++ b/src/daemon/open_console.c
+@@ -21,7 +21,7 @@
+ 
+ #include <fcntl.h>                  /* open and co.      */
+ #include <sys/stat.h>               /* stat()            */
+-#include <stropts.h>                /* ioctl             */
++#include <sys/ioctl.h>              /* ioctl             */
+ 
+ /* Linux specific (to be outsourced in gpm2 */
+ #include <linux/serial.h>           /* for serial console check */
+-- 
+1.6.1.3
+
diff --git a/sys-libs/gpm/gpm-1.20.5.ebuild b/sys-libs/gpm/gpm-1.20.5.ebuild
index dc6f8bd78117..b216d1ca0019 100644
--- a/sys-libs/gpm/gpm-1.20.5.ebuild
+++ b/sys-libs/gpm/gpm-1.20.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/sys-libs/gpm/gpm-1.20.5.ebuild,v 1.7 2009/01/21 20:25:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.5.ebuild,v 1.8 2009/02/15 21:23:06 vapier Exp $
 
 # emacs support disabled due to Bug 99533
 
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.20.5-abi.patch
+	epatch "${FILESDIR}"/0001-daemon-use-sys-ioctl.h-for-ioctl.patch #222099
 }
 
 src_compile() {
diff --git a/sys-libs/gpm/gpm-1.20.6.ebuild b/sys-libs/gpm/gpm-1.20.6.ebuild
index 65cacbbf05ab..7877b5f02f8e 100644
--- a/sys-libs/gpm/gpm-1.20.6.ebuild
+++ b/sys-libs/gpm/gpm-1.20.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/sys-libs/gpm/gpm-1.20.6.ebuild,v 1.1 2009/02/15 21:06:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.6.ebuild,v 1.2 2009/02/15 21:23:06 vapier Exp $
 
 # emacs support disabled due to Bug 99533
 
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.20.5-abi.patch
+	epatch "${FILESDIR}"/0001-daemon-use-sys-ioctl.h-for-ioctl.patch #222099
 }
 
 src_compile() {