Fix testsuite with GCC 4.6 (bug #362661).

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

4 files changed, 51 insertions, 4 deletions

diff --git a/sys-devel/autogen/ChangeLog b/sys-devel/autogen/ChangeLog
index 99aaaab59b85..cc436937d146 100644
--- a/sys-devel/autogen/ChangeLog
+++ b/sys-devel/autogen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/autogen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/ChangeLog,v 1.73 2011/03/20 12:37:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/ChangeLog,v 1.74 2011/04/08 23:55:16 dirtyepic Exp $
+
+  09 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> autogen-5.11.6.ebuild,
+  +files/autogen-5.11.6-gcc46.patch:
+  Fix testsuite with GCC 4.6 (bug #362661).
 
   20 Mar 2011; Raúl Porcel <armin76@gentoo.org> autogen-5.11.5.ebuild:
   alpha/arm/ia64/s390/sh/sparc/x86 stable wrt #355941
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 10ed7b7b9f6c..d530b549917f 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX autogen-5.11.6-gcc46.patch 829 RMD160 046e1feb46052bb465614ea37c748e82bac392b4 SHA1 f95cfe4b04f0b5f25abe2464fc22ed01a366f523 SHA256 0d7af7fd2f84421aecc209fcd406b6c66069f130ae97e5d4c5fb869bc40644b4
 DIST autogen-5.11.5.tar.bz2 1039419 RMD160 7cc668ef8243cd219307ef01386766ce36419554 SHA1 f0950b57095cc6802fdd7f9d217289c99ec0bdb4 SHA256 f8e3d119ca64d4a8187bdd9c5bf44c9d69b0060eef4bfc4fefdc7e9e56f59311
 DIST autogen-5.11.6.tar.bz2 1045205 RMD160 a81da8b1d4a8e3f3393fbdd10479449be06aa614 SHA1 ed25e207f8586571b811a04c6ab0543eb097b8c4 SHA256 ca62e2bd17d65eb4e14eb8718da17cf904597af88abe9d428320409c06ec78b9
 DIST autogen-5.9.7.tar.gz 1332926 RMD160 2ce40a3a53c9788772bc6813ff230438557fff1f SHA1 ae877e8760db1af872ca3403ca7c338a0c397e19 SHA256 a83bb52d08b183147a0cb0ef71769c3537e7afde37b4ef60ca8c3b3c9379dc44
 EBUILD autogen-5.11.5.ebuild 836 RMD160 d8ec9a29aa9a3e786faff0aa8b0318a4df742803 SHA1 73a2a8e590a5b4eac32d6fb8b95353daa3e6571f SHA256 a3db22873bcb9fde1f2ee015dbf8dd2e4e87eb9f56bd3f07427b0f6e91f5fef6
-EBUILD autogen-5.11.6.ebuild 774 RMD160 03c20d2d5a884a43c4c3b1dcfed54e9390702772 SHA1 8895eac005098522f0f3bf26009d988a762a731d SHA256 c42716538c7f94fc63f97a65cf7967fde0d186d514a6f9b928076939b703a08d
+EBUILD autogen-5.11.6.ebuild 851 RMD160 0ec1e89b6fdc639b2febd26d23983116e74096a4 SHA1 45272fbdbeecaddfc82ad8e3640290e723319b84 SHA256 39b33ce096555f3bf642a2700824ff78447f654fd39bbcb74aad169e2e4e6355
 EBUILD autogen-5.9.7.ebuild 1165 RMD160 9dd95835ee39e3a46f0ac63fc9ff2da48394649c SHA1 445095e0d21fef69826876c93453aaa0550a3f39 SHA256 76be08041051f1ab5ac16a876d8ebd3f87b0ccb90dbefab8a5a515185403b187
-MISC ChangeLog 8407 RMD160 123966ffe32768b07af56f6aada0b2ba9a3463be SHA1 2ba48c7ef29fe05d6445bdd1e75da1857a25a1e8 SHA256 cd5d0a33a3e01139adbdf6413adbb57360dfb7307769dee6108d0b9a3ff5fdf9
+MISC ChangeLog 8562 RMD160 9d3a227891856d46748c9850fc316dd763fe104c SHA1 e60ffff822c7d25cca3fd384f24278c20d345e57 SHA256 71b589d33e72bd307d84218cdef20152e6fd42089d27bb18cf2302b805bdddb8
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2foesACgkQiqiDRvmkBmIEFACfRLcdXDxtfApDLhRMZ9NwRjrg
+hrwAoJhI/XSMzDSCwOczcQGxxwZRcXUD
+=3tAo
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/autogen/autogen-5.11.6.ebuild b/sys-devel/autogen/autogen-5.11.6.ebuild
index 96991eb015bd..9e742f1200c1 100644
--- a/sys-devel/autogen/autogen-5.11.6.ebuild
+++ b/sys-devel/autogen/autogen-5.11.6.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.11.6.ebuild,v 1.1 2011/02/22 03:24:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.11.6.ebuild,v 1.2 2011/04/08 23:55:16 dirtyepic Exp $
 
 EAPI="3"
 
+inherit eutils
+
 DESCRIPTION="Program and text file generation"
 HOMEPAGE="http://www.gnu.org/software/autogen/"
 SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.bz2"
@@ -16,6 +18,10 @@ IUSE=""
 DEPEND=">=dev-scheme/guile-1.8
 	dev-libs/libxml2"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
diff --git a/sys-devel/autogen/files/autogen-5.11.6-gcc46.patch b/sys-devel/autogen/files/autogen-5.11.6-gcc46.patch
new file mode 100644
index 000000000000..820472bea3e3
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.11.6-gcc46.patch
@@ -0,0 +1,26 @@
+Fix testsuite
+
+https://bugs.gentoo.org/362661
+https://sourceforge.net/tracker/?func=detail&atid=103593&aid=3280108&group_id=3593
+
+--- a/autoopts/test/cond.test
++++ b/autoopts/test/cond.test
+@@ -112,13 +112,11 @@ ${AG_L} ${testname}.def || \
+ 
+ ( eval `echo ${cc_cmd} | \
+   ${SED} 's/-Werror//;s/-DTEST_TEST/-DSECOND -DTEST_TEST/' ` 2>&1 ) \
+-  | ${SED} -n 's/.*# *warning:*/#warning/p' > ${testname}-cc.log
+-
+-echo '#warning undefining SECOND due to option name conflict' \
+-  > ${testname}-xx.log
+-
+-cmp -s ${testname}-??.log || \
+-  failure "warning diffs:  `diff ${testname}-??.log`"
++  | ${SED} -n '/undefining SECOND due to option name conflict/p' \
++  > ${testname}-cc.log
++ 
++test -s ${testname}-cc.log || \
++  failure "warning diffs: 'undefining SECOND' not found"
+ 
+ # # # # # # # # # # FOURTH TEST # # # # # # # # #
+