Fix building with gcc-4.7.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 177 insertions, 19 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 660f5cbe3f80..3e1a2011d5a8 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/powertop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.48 2012/04/19 01:22:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.49 2012/04/19 16:17:48 vapier Exp $
+
+  19 Apr 2012; Mike Frysinger <vapier@gentoo.org> powertop-1.98.ebuild,
+  +files/powertop-1.98-gcc-4.7.patch, powertop-9999.ebuild:
+  Fix building with gcc-4.7.
 
   19 Apr 2012; Mike Frysinger <vapier@gentoo.org> powertop-1.98.ebuild,
   files/powertop-1.98-build.patch, +files/powertop-1.98-build-libnl-3.patch,
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 405e68d1bff4..36356fc9a574 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX powertop-1.98-build-cc.patch 704 RMD160 487e240229d57fabf82dc6c1979123fc3055f6b9 SHA1 55a3fe982b5e24e208ce137d143a39929fb36532 SHA256 36ccfeec0c64f0131415238316e14fee2239d4af0a52b48c0162181f49ad9457
 AUX powertop-1.98-build-libnl-3.patch 611 RMD160 351d9db264b89a2976d209a2759055b14fa90296 SHA1 ccfa0bf775208e17b9b6577b1f5393f166e5be6b SHA256 0799362cdf6923a1a8a0c9ac61097dbaa6ffa21d5b0dd038bae44f58102e4328
 AUX powertop-1.98-build.patch 2266 RMD160 b8be82c9f2763e0a566768bf0a99cee65209ca55 SHA1 3bc5880bcf2994fac6b37a7c490ee5b50120ee79 SHA256 8b76948494deb0bece80e7300ec8f84c2fab7bf1d79838faa3e52478142ebfeb
+AUX powertop-1.98-gcc-4.7.patch 3720 RMD160 cf4fefe9b31baa8b9c7365fecf8ba5223bb0843c SHA1 439f14fd47bbdb8293ce71514fd81082a74724d3 SHA256 44335480e32fbd591e5fe45cc8f47c45ad45fcf656f371b05e6d2751dd248549
 DIST powertop-1.11.tar.gz 73136 RMD160 be05916afbb808ae17f6becbef7d456a753bd652 SHA1 d1d71db9a0854fab51f295a87ec505d89e451de3 SHA256 70e7cc53e5fbade5e447bda9f0ca12f2153bf426e074dbac3a2e97adf46180f2
 DIST powertop-1.13.tar.gz 104675 RMD160 e6cf649e387a9a6f8cf036ddfa0f5def50303f76 SHA1 91a6f1ec9ca768c1a04409e154e6909458028d66 SHA256 2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98
 DIST powertop-1.97.tar.bz2 84657 RMD160 8e9f0db989a42a9a368a45cbf6e9e1985e3fb82a SHA1 0227d5199ef3092915a62aca63aaa1d3ba1a9c12 SHA256 d3dafe1ce4dabeb4edb724616d7b8533ac40ed71fca43e81b007e9fd7011e516
@@ -11,24 +12,24 @@ DIST powertop-1.98.tar.bz2 88110 RMD160 ebbd0867aba4d2a72584e19e3ab55c50cd82911c
 EBUILD powertop-1.11.ebuild 1103 RMD160 352796f0e4974260fe498de282270cb388e211bc SHA1 137f2c60671829387c573203f9813a6f33f50e2a SHA256 5c961061f2e057b2258f55323c0d618006abf9039816d3811064ca0f6fa84911
 EBUILD powertop-1.13.ebuild 1121 RMD160 6e9e4a84aaf6b643a4cd83f28516b0e51d36d5e9 SHA1 84deca5fe572d0820751741fb8c5bf8c114e33b4 SHA256 ad10c47049432ef0f9047eee7c5c6db033843f699cd2003c5b087169a296a030
 EBUILD powertop-1.97-r1.ebuild 1290 RMD160 6fbe1dab20b7d9986d87fe7baf9b04aafe59a4a9 SHA1 9362d7f11e5f3f581e35e2d4d326ece6c49137c4 SHA256 4004da3a6e306bc45c7058ba918798733b06a321c1472ed56ae1cae58b1a1706
-EBUILD powertop-1.98.ebuild 1372 RMD160 bf4374af3e878702e75dbc49ff6cb00c51063b5a SHA1 86df5d1f03a58a617cfa82b2e09f2c72c93010a9 SHA256 31ba70fcb3f1f0a31c9db9bd5f5509cce076b3dd7b90dbbaa1d0cd41a5a31090
-EBUILD powertop-9999.ebuild 1372 RMD160 5b273239a5e93274eaa00db6c1b643eff90fe2a6 SHA1 667e7500a42d81434f548d6cb06e596aba25ea13 SHA256 c7d15d6ef79b91febdfbe45aa72c1d79ad4442ba3dc7d7da55b2b9cf5f22ec27
-MISC ChangeLog 7039 RMD160 2f8ca5c6ddd1220e9ef4beb5d1f514783a2bcfc3 SHA1 508db075fe03d36a96bf698122a9a0a2ecf6dba9 SHA256 6734e7621da6284ee84fcf97e01282a0478b7c9ef61e52120c0b7ef1277963e7
+EBUILD powertop-1.98.ebuild 1419 RMD160 2e2cfe6511f5766cb75aec6539119f8e2bb83ed2 SHA1 777a6f520a0a5a1ed08e8046a9f117da7bdcee58 SHA256 f56d3362de9e9819c4937f1648c51bafeb1b071b27b08dde1be1a6f7636b9260
+EBUILD powertop-9999.ebuild 1419 RMD160 f79f79a181bcdbb81c7fee7114727cb6e3a9d54c SHA1 39e7875bcef8ccd74a31eb2b4ff5bd42f0ef4220 SHA256 73ff861a054ccb03e64ae64f77dbf7c3d75f2cbebbed92871c1d403f1091475a
+MISC ChangeLog 7201 RMD160 89afbd1f416c3582074f8f315c41d5a716876d34 SHA1 f42e3abc7b5349ac14bcef60202b7aeac0f111ba SHA256 f5635dd2a96803d6e76bc91f7b941982b8cca41d8bb7066dd99a0cf17039b8f4
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPj2kVAAoJELEHsLL7fEFWDUYQAIgKutu46prkaTfVjkPHrLxh
-me3cWjOsMUW+cgrX5TgKuFYt8pocPcZsq8tCdSb2ZqDoE8ONHzrm/rZPE/kT9qyt
-6jdy38pLIMpUW/ILThAsMBwx/XNlsECEeNc25Su930tYDTazQxZNkn8a2ObYjs1Z
-GU6uELw12OYC9oG0jzCp1ANy6UsXbd4BaAD9m7WzqLJVRt/YbyW7TYhBWYID3p2X
-8OHQ7suuIjBhaxHzb6XiNrqhQMr2MJRVbPm9RgVxpMdH/IhC5u1WILZY4HNaMD6z
-XvENHHdRW6+wHQr1Ko4Sv0ma8cCyR91lt80wKFugrl39xdhNUJtrmM6fILwZkJbM
-owZPw+sOoG1h25tpKZMz7+i6PDtK2SzRWcTpKdBmu8Z/2Co/zi+h0LiOxPF1dEX2
-g5FBsld//W130qOiqNW4k1CpwXYHSmd11KaYM15sffvOjCwd2pzvo7uSOMTUNpDM
-47Q4phQw7w/ccMOUR225hEYhHHwWDzQ32Wzu8DLhICCmN+D0uyVEGMrGObUHgKU+
-7S7zX94jiz5nMwiMMt1C4SmM+at/hpYs17h4vraLtzXhbEYEYGOMoVZYrad+UGz0
-ZkMV3xqaXIwhRyTgA13vDPnXO30wfg8OW83WwsGnD/ltn/kbPksNnh2dVJDkgEHD
-9KB7YzQt9MueLEbD2oBq
-=cCPL
+iQIcBAEBAgAGBQJPkDrrAAoJELEHsLL7fEFWvAQQAJqynYxEGEp1ugs8IMQfck2t
+eIMW+Xv2qVFwlpym+BcioA/pAYnBqZFP++MTBKWJ5Reo7U/b3sI71d4rRYbsY8uM
+rxWk4TAg9g6Zn05don555kxqeeeB/DAymLHYYGhCRbdCSnZlCPvDC6CvUaeKVYPb
+n5FIo41R0XgHNrkUHr1pGrsCggzmD2zaZiDP48ZWzoVE0m6EivlE6dxkhRSoo8Il
+RSaPqJpvu0KLWat1rP3kLYZhuNIcN6l10aflOQYch/PFPNzTqcFhfBPJY2exPPOW
+iR15MRZwE2pmZmEad4LmdKCRaoW05NHVZrEb5Dz32Z1xZ9icXs3kokC3rUQUSFAf
+xBktD66SrA85bwTruZdqbOPUAe65Djapix3iQCe8z82wHS6hWNa2MS7e2rZxk6fs
+wSLnjme/zibx/Tc5wJoj6EXjLTDbJJr6ty/M6sB8RW3W/h3d7Dwg3gw53g5unt6v
+esRJ3/CbSbytCPCJ/vKvMEd9rCmIQ60S/HL/9UvT9VRC+OCoWnAivrcQAhGKoLbx
+QyqEC4p457Zbs+V/Gqkl+UtKz8a6MxBgiAZ2xmNwkMbhyLfFkX0LVfjq6LHaiqD8
+cFGnSQ4CH8oL/htgDrwvSMigjxmCgsSVCRq+wiFY3VHa+X2IIscK+wcSVKXpZwH4
+TVODZ1G9iG4ScT9qjkki
+=F5Hg
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/files/powertop-1.98-gcc-4.7.patch b/sys-power/powertop/files/powertop-1.98-gcc-4.7.patch
new file mode 100644
index 000000000000..78d2d70e5ebb
--- /dev/null
+++ b/sys-power/powertop/files/powertop-1.98-gcc-4.7.patch
@@ -0,0 +1,151 @@
+From b86877fb2f24563d74cd3faf7eceffcc8fa59299 Mon Sep 17 00:00:00 2001
+From: Han Shen <shenhan@chromium.org>
+Date: Thu, 19 Apr 2012 12:14:08 -0400
+Subject: [PATCH] include unistd.h when necessary
+
+Older versions of gcc (pre-4.7) would implicitly include unistd.h in some
+of its internal headers.  With newer versions though, that is no longer
+the case, so building powertop breaks with files that use things from the
+unistd.h header but don't include it explicitly.
+
+Signed-off-by: Han Shen <shenhan@chromium.org>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ cpu/intel_cpus.cpp         |    1 +
+ devices/alsa.cpp           |    2 +-
+ devices/device.cpp         |    1 +
+ devices/i915-gpu.cpp       |    2 +-
+ devices/network.cpp        |    1 +
+ devices/rfkill.cpp         |    2 +-
+ devices/thinkpad-fan.cpp   |    1 +
+ devices/thinkpad-light.cpp |    1 +
+ html.cpp                   |    1 +
+ main.cpp                   |    1 +
+ 10 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/cpu/intel_cpus.cpp b/cpu/intel_cpus.cpp
+index f42f3b4..bbbd460 100644
+--- a/cpu/intel_cpus.cpp
++++ b/cpu/intel_cpus.cpp
+@@ -34,6 +34,7 @@
+ #include <sys/time.h>
+ #include <string.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ #include "../lib.h"
+ #include "../parameters/parameters.h"
+diff --git a/devices/alsa.cpp b/devices/alsa.cpp
+index b0bcd3f..5100c36 100644
+--- a/devices/alsa.cpp
++++ b/devices/alsa.cpp
+@@ -39,7 +39,7 @@ using namespace std;
+ #include "../devlist.h"
+ 
+ #include <string.h>
+-
++#include <unistd.h>
+ 
+ alsa::alsa(char *_name, char *path): device()
+ {
+diff --git a/devices/device.cpp b/devices/device.cpp
+index c38b96c..9ce4509 100644
+--- a/devices/device.cpp
++++ b/devices/device.cpp
+@@ -29,6 +29,7 @@
+ #include <stdio.h>
+ #include <limits.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
+diff --git a/devices/i915-gpu.cpp b/devices/i915-gpu.cpp
+index a9dc899..ca2dad1 100644
+--- a/devices/i915-gpu.cpp
++++ b/devices/i915-gpu.cpp
+@@ -28,7 +28,7 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <dirent.h>
+-
++#include <unistd.h>
+ 
+ using namespace std;
+ 
+diff --git a/devices/network.cpp b/devices/network.cpp
+index 5f3ddf2..72c766d 100644
+--- a/devices/network.cpp
++++ b/devices/network.cpp
+@@ -33,6 +33,7 @@
+ #include <dirent.h>
+ #include <libgen.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ #include <linux/ethtool.h>
+ 
+diff --git a/devices/rfkill.cpp b/devices/rfkill.cpp
+index 5bf40c4..33a8fcd 100644
+--- a/devices/rfkill.cpp
++++ b/devices/rfkill.cpp
+@@ -29,7 +29,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <libgen.h>
+-
++#include <unistd.h>
+ 
+ using namespace std;
+ 
+diff --git a/devices/thinkpad-fan.cpp b/devices/thinkpad-fan.cpp
+index 4ac3d11..8750c6e 100644
+--- a/devices/thinkpad-fan.cpp
++++ b/devices/thinkpad-fan.cpp
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <math.h>
++#include <unistd.h>
+ 
+ #include "../lib.h"
+ 
+diff --git a/devices/thinkpad-light.cpp b/devices/thinkpad-light.cpp
+index ba4c553..7e91637 100644
+--- a/devices/thinkpad-light.cpp
++++ b/devices/thinkpad-light.cpp
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <math.h>
++#include <unistd.h>
+ 
+ #include "../lib.h"
+ 
+diff --git a/html.cpp b/html.cpp
+index 0a4db2e..8260ed5 100644
+--- a/html.cpp
++++ b/html.cpp
+@@ -29,6 +29,7 @@
+ #include <utility>
+ #include <iostream>
+ #include <fstream>
++#include <unistd.h>
+ 
+ #include "css.h"
+ #include "lib.h"
+diff --git a/main.cpp b/main.cpp
+index 45a126e..0bbb4aa 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -33,6 +33,7 @@
+ #include <time.h>
+ #include <sys/stat.h>
+ #include <getopt.h>
++#include <unistd.h>
+ 
+ #include "cpu/cpu.h"
+ #include "process/process.h"
+-- 
+1.7.8.5
+
diff --git a/sys-power/powertop/powertop-1.98.ebuild b/sys-power/powertop/powertop-1.98.ebuild
index dec17f677bf1..2ecdd68d1a53 100644
--- a/sys-power/powertop/powertop-1.98.ebuild
+++ b/sys-power/powertop/powertop-1.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.98.ebuild,v 1.3 2012/04/19 01:22:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.98.ebuild,v 1.4 2012/04/19 16:17:48 vapier Exp $
 
 EAPI="4"
 
@@ -41,6 +41,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.98-build.patch
 	epatch "${FILESDIR}"/${PN}-1.98-build-cc.patch
 	epatch "${FILESDIR}"/${PN}-1.98-build-libnl-3.patch
+	epatch "${FILESDIR}"/${PN}-1.98-gcc-4.7.patch
 }
 
 src_configure() {
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 0216a6645f77..938c3a2f621b 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.8 2012/04/19 01:22:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.9 2012/04/19 16:17:48 vapier Exp $
 
 EAPI="4"
 
@@ -41,6 +41,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.98-build.patch
 	epatch "${FILESDIR}"/${PN}-1.98-build-cc.patch
 	epatch "${FILESDIR}"/${PN}-1.98-build-libnl-3.patch
+	epatch "${FILESDIR}"/${PN}-1.98-gcc-4.7.patch
 }
 
 src_configure() {