Fix building against sys-libs/glibc-2.16 by Diego Elio Pettenò (bug #430826).

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

4 files changed, 47 insertions, 4 deletions

diff --git a/dev-util/complexity/ChangeLog b/dev-util/complexity/ChangeLog
index 5c116e5c0239..106e72331e3f 100644
--- a/dev-util/complexity/ChangeLog
+++ b/dev-util/complexity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/complexity
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/complexity/ChangeLog,v 1.4 2012/04/25 00:29:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/complexity/ChangeLog,v 1.5 2012/08/11 15:35:02 jer Exp $
+
+  11 Aug 2012; Jeroen Roovers <jer@gentoo.org> complexity-0.4.ebuild,
+  +files/complexity-0.4-gets.patch:
+  Fix building against sys-libs/glibc-2.16 by Diego Elio Pettenò (bug
+  #430826).
 
   25 Apr 2012; Jeroen Roovers <jer@gentoo.org> complexity-0.4.ebuild:
   Add RDEPEND on sys-devel/autogen for libopts.
diff --git a/dev-util/complexity/Manifest b/dev-util/complexity/Manifest
index 11a469ab8d94..98ad37aa4abc 100644
--- a/dev-util/complexity/Manifest
+++ b/dev-util/complexity/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX complexity-0.4-gets.patch 669 SHA256 8a969d5a5140d792db0a727f83e7c6ca801ac4e53efb49c0d81c1dacec8a00d4 SHA512 d33acfb45bcd4181b05926c753fe46ee59c79aef9b8e05b4a1ec7b468a971c49d9911cb90f91726a68eb218e990e406d6cb0c03a8c90b67521189951bb98f7d0 WHIRLPOOL 930ae4019907d72c0592d1194985eb2ca9d26cbcccc73962678f2041e2ee9d252fa0b4e3ddb24de1927a4c5dd88e8361cc072c3697530313a3746fcb813dfd33
 DIST complexity-0.4.tar.gz 656660 SHA256 28fb64282b051de42f43f294f70a977a01624e2a772d0b052225c57dea15b336 SHA512 62f0479d499e6e08390c0c615e5bf74ecc98b020f0e143aff30bcb6cbfe277b1b0c2ce6569c57dbd4905e3fd7d01482e9b4313f0be315dcea5ab4f84f965f9e0 WHIRLPOOL 8f68893bb5eae06ee1bfcadcd0417128d04ff55d328ff74d7062b5a11db2508a62a6116e6fa1733699b67ce9dbb2a2382be1db09b0ef7d4ba03ff687af942281
-EBUILD complexity-0.4.ebuild 569 SHA256 69937af6c500b8eaf033b916349aa569dcd6e507e2c623922c3a602f3f3ae3ec SHA512 d4fffcdcbcc4cd659779d748ec631e4e8ab6182ab3c9d53002b3515ee61b10b2c95f3f99e47d2098c80a1e9478f591fb435421c22254c650f42f6af076bdd5f1 WHIRLPOOL 82e9ea956d5d56f35ba5cd70962975b500b1e678f531aa99d9c7449742a7056877e7148d32b7733f684416d81e04431f2c89258b23b0591ed4ed5b0df51f4f13
-MISC ChangeLog 643 SHA256 cd3c256e821210a6740a76b0068f1d4c2e7cd052b9d1a703a873508d5dfcf416 SHA512 caa23570d5eb320bf586190261554a30f20e5b2c1feed6ef4082a5dbb1f1ab8f599904d42794dfd4c670b8c9eb474ca5fe24f10bc3d4018ab879c5bb30ac9791 WHIRLPOOL 3c8c8235d7f75498e793c257845655b1c809c91dd318ad9f62e41df52395f3d230fa3e082ff3407f1a1995ef7b61419a9b8dd0d7e4ba28a01f28091507c035c7
+EBUILD complexity-0.4.ebuild 641 SHA256 e7ed8484951056caa304864b2ff8ad0a9b56b5306c110a125a38359c0da88854 SHA512 3eb8030f119561ee526f1ee04867df8542a12c29cf33baadcbebdcaac6fa1c24f624ec41011c81cbc285ef2e597d44c4780dec493ca434fb12725e95d1d14075 WHIRLPOOL 30176afc1aed4851417836d88d031a8b7f3de599fe62a78df7312bfc1350b306108fb6c0205341ad4da47cb2d11afd9d581ac5a36cd23fcac98202c54b913886
+MISC ChangeLog 833 SHA256 0ba59efc46bff05233b960a71a4e1d332c31f7a8b33b5b051ac3d35afb94390d SHA512 7641c81ae68772f5551b2171cf0dd0fd64fb96e6392ed925713504d859c43cb3c62145020393f7014f34e233c88bc80e8d7d4c4ceb5abcb0c0d21669bd123635 WHIRLPOOL cabe122b289a02742625b3a3c207a6f3abca3778b50b57735ea328058585cd2380b3637e736c53086348b7d83fc8e5dfc190c9182e0b630f5da292b781d3ba2e
 MISC metadata.xml 225 SHA256 3f19179bb9336815d32a7a92cc2a3bc7307c3fffc0443587ff818b76bb4ad8a0 SHA512 192294964ec170f533a3115f035540a960ad1f812f2a9730f54a441af5fe36f8e15b04c41a1449afe9070558439058f26fc5449d58fbd7a34001807a31ded189 WHIRLPOOL f6c5c190577e86b82de689a626dac9eb4439c20fe683ba611e98842edf74d605fa66e4b87ecae237ce82ef42c9f6d4d842d3de8b578aac9265e7a717d1c5c1be
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAme6sACgkQVWmRsqeSphMgmwCdHSEXnlvnc0GJpgTN+rFVV96J
+OcAAnjCGJsN8E2R2Xh//xh6p4B7S9TO6
+=YVey
+-----END PGP SIGNATURE-----
diff --git a/dev-util/complexity/complexity-0.4.ebuild b/dev-util/complexity/complexity-0.4.ebuild
index 488823fe1b99..18c7aba9d9e1 100644
--- a/dev-util/complexity/complexity-0.4.ebuild
+++ b/dev-util/complexity/complexity-0.4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/complexity/complexity-0.4.ebuild,v 1.4 2012/04/25 00:29:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/complexity/complexity-0.4.ebuild,v 1.5 2012/08/11 15:35:02 jer Exp $
 
 EAPI=4
+inherit eutils
 
 DESCRIPTION="a tool designed for analyzing the complexity of C program
 functions"
@@ -23,3 +24,7 @@ DEPEND="
 "
 
 DOCS=( ChangeLog )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gets.patch
+}
diff --git a/dev-util/complexity/files/complexity-0.4-gets.patch b/dev-util/complexity/files/complexity-0.4-gets.patch
new file mode 100644
index 000000000000..4f35df60f28f
--- /dev/null
+++ b/dev-util/complexity/files/complexity-0.4-gets.patch
@@ -0,0 +1,22 @@
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -720,8 +720,9 @@
+ #if @GNULIB_GETS@
+ # if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
++#   ifdef gets
++#    undef gets
++#    define gets rpl_gets
+ #  endif
+ _GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+ _GL_CXXALIAS_RPL (gets, char *, (char *s));
+@@ -734,6 +735,7 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#   endif
+ #endif
+ 
+