Fixup test failure when CFLAGS contains '-ggdbX' and join package to toolchain herd.

(Portage version: 2.1.1_rc1-r1)

6 files changed, 29 insertions, 9 deletions

diff --git a/sys-devel/autogen/ChangeLog b/sys-devel/autogen/ChangeLog
index 4eada13e235b..ce6106dc6975 100644
--- a/sys-devel/autogen/ChangeLog
+++ b/sys-devel/autogen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/autogen
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/ChangeLog,v 1.12 2006/08/25 07:42:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/ChangeLog,v 1.13 2006/08/30 21:42:51 kevquinn Exp $
+
+  30 Aug 2006; Kevin F. Quinn <kevquinn@gentoo.org> metadata.xml,
+  autogen-5.7.1.ebuild, autogen-5.8.3.ebuild:
+  Fixup test failure when CFLAGS contains '-ggdbX'.  Join package to toolchain
+  herd.
 
   25 Aug 2006; Markus Rothe <corsair@gentoo.org> autogen-5.7.1.ebuild:
   Stable on ppc64
diff --git a/sys-devel/autogen/autogen-5.7.1.ebuild b/sys-devel/autogen/autogen-5.7.1.ebuild
index c45823422bb3..8573f197daa9 100644
--- a/sys-devel/autogen/autogen-5.7.1.ebuild
+++ b/sys-devel/autogen/autogen-5.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.7.1.ebuild,v 1.9 2006/08/25 07:42:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.7.1.ebuild,v 1.10 2006/08/30 21:42:51 kevquinn Exp $
 
 DESCRIPTION="Program and text file generation"
 HOMEPAGE="http://www.gnu.org/software/autogen/"
@@ -20,7 +20,12 @@ src_unpack() {
 	cd "${S}"
 	# autogen-5.7.1 doesn't build the docs ...
 	# http://sourceforge.net/mailarchive/forum.php?thread_id=7629430&forum_id=7034
-	sed -i -e '/SUBDIRS = /s/ doc\>//' Makefile.in
+	sed -i -e '/SUBDIRS = /s/ doc\>//' Makefile.in ||
+		die "sed Makefile.in failed"
+	# immediate.test does a sed on CFLAGS, that assumes it does not contain
+	# '-gXXX' (e.g. -ggdb2)
+	sed -i -e 's:s/-g//:s/-g\\b//:' autoopts/test/immediate.test ||
+		die "sed immediate.test failed"
 }
 
 src_compile() {
diff --git a/sys-devel/autogen/autogen-5.8.3.ebuild b/sys-devel/autogen/autogen-5.8.3.ebuild
index 3787f64b75c7..0d7168c351a1 100644
--- a/sys-devel/autogen/autogen-5.8.3.ebuild
+++ b/sys-devel/autogen/autogen-5.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.8.3.ebuild,v 1.1 2006/08/15 20:57:14 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.8.3.ebuild,v 1.2 2006/08/30 21:42:51 kevquinn Exp $
 
 DESCRIPTION="Program and text file generation"
 HOMEPAGE="http://www.gnu.org/software/autogen/"
@@ -15,6 +15,16 @@ IUSE=""
 DEPEND=">=dev-util/guile-1.6.6
 	dev-libs/libxml2"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# immediate.test does a sed on CFLAGS, that assumes it does not contain
+	# '-gXXX' (e.g. -ggdb2)
+	sed -i -e 's:s/-g//:s/-g\\b//:' autoopts/test/immediate.test ||
+		die "sed immediate.test failed"
+
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake -j1 || die "emake failed"
diff --git a/sys-devel/autogen/files/digest-autogen-5.6.4 b/sys-devel/autogen/files/digest-autogen-5.6.4
index 0706492de996..a088b32f738e 100644
--- a/sys-devel/autogen/files/digest-autogen-5.6.4
+++ b/sys-devel/autogen/files/digest-autogen-5.6.4
@@ -1 +1,3 @@
 MD5 d85ea29a511b52975b91a75f9cefb71f autogen-5.6.4.tar.gz 1137673
+RMD160 6f787f51b1c46663f2cba0409f19225bbb6e5abe autogen-5.6.4.tar.gz 1137673
+SHA256 4ed2120ac24b7c6a7ca63610fa82a61bd97831ee14dc520f39d26412fc400433 autogen-5.6.4.tar.gz 1137673
diff --git a/sys-devel/autogen/files/digest-autogen-5.7.1 b/sys-devel/autogen/files/digest-autogen-5.7.1
index 22987394b374..f951ba151cdd 100644
--- a/sys-devel/autogen/files/digest-autogen-5.7.1
+++ b/sys-devel/autogen/files/digest-autogen-5.7.1
@@ -1 +1,3 @@
 MD5 0773129942c41960130b6ecf9cb96bc7 autogen-5.7.1.tar.gz 1224552
+RMD160 346fa0a126258d568bd4691733e1acf7f5539a39 autogen-5.7.1.tar.gz 1224552
+SHA256 acb04d5cb77059daae7e7b365f82c14baea6cff8d34e41c7ef7ecba398a789d0 autogen-5.7.1.tar.gz 1224552
diff --git a/sys-devel/autogen/metadata.xml b/sys-devel/autogen/metadata.xml
index c3330cf58d9d..fb4199eb7afe 100644
--- a/sys-devel/autogen/metadata.xml
+++ b/sys-devel/autogen/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-  <description>This package lacks a primary herd or maintainer.</description>
-</maintainer>
+<herd>toolchain</herd>
 </pkgmetadata>