updated with parallel make patch and automake deps (see bugs 142545 and 171502)

(Portage version: 2.1.2.2)

3 files changed, 83 insertions, 5 deletions

diff --git a/dev-util/cgdb/ChangeLog b/dev-util/cgdb/ChangeLog
index 82bfb3467fa5..7970474ffbab 100644
--- a/dev-util/cgdb/ChangeLog
+++ b/dev-util/cgdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cgdb
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/ChangeLog,v 1.29 2007/03/19 02:29:53 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/ChangeLog,v 1.30 2007/03/21 03:00:47 nerdboy Exp $
+
+  21 Mar 2007; Steve Arnold <nerdboy@gentoo.org>
+  +files/cgdb-0.6.3-makefile-race.patch, cgdb-0.6.3.ebuild:
+  Updated with new parallel make patch and automake deps (see bugs 142545 and
+  171502).
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove ka0ttic from metadata.xml due to retirement.
diff --git a/dev-util/cgdb/cgdb-0.6.3.ebuild b/dev-util/cgdb/cgdb-0.6.3.ebuild
index d8989a09d988..a92b4ee2b6df 100644
--- a/dev-util/cgdb/cgdb-0.6.3.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/cgdb-0.6.3.ebuild,v 1.1 2007/03/16 04:56:43 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/cgdb-0.6.3.ebuild,v 1.2 2007/03/21 03:00:47 nerdboy Exp $
 
 inherit eutils autotools
 
@@ -19,24 +19,29 @@ DEPEND=">=sys-libs/ncurses-5.3-r1
 RDEPEND="${DEPEND}
 	>=sys-devel/gdb-5.3"
 
-WANT_AUTOCONF="1.9"
-WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-fbsd.patch"
+	epatch "${FILESDIR}/${P}-makefile-race.patch"
 
 	AT_M4DIR="${S}/config" eautomake
 }
 
 src_compile() {
 	econf || die "econf failed"
+
+	# not very parallel-friendly makefiles have been patched
+	# (see bug 171502)
 	emake || die "emake failed"
 }
 
 src_install() {
-	einstall || die "make install failed"
+	emake DESTDIR=${D} install || die "make install failed"
+
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/dev-util/cgdb/files/cgdb-0.6.3-makefile-race.patch b/dev-util/cgdb/files/cgdb-0.6.3-makefile-race.patch
new file mode 100644
index 000000000000..9a9d8c8bf0d0
--- /dev/null
+++ b/dev-util/cgdb/files/cgdb-0.6.3-makefile-race.patch
@@ -0,0 +1,68 @@
+Index: tgdb/tgdb-base/src/Makefile.am
+===================================================================
+--- tgdb/tgdb-base/src/Makefile.am	(revision 841)
++++ tgdb/tgdb-base/src/Makefile.am	(working copy)
+@@ -34,4 +34,4 @@
+ $(top_builddir)/various/rline/src \
+ $(top_builddir)/tgdb/annotate-two/src \
+ $(top_builddir)/tgdb/gdbmi/src \
+-$(top_builddir)/tgdb/tgdb-base/src
++libtgdb.a
+Index: various/adt/src/Makefile.am
+===================================================================
+--- various/adt/src/Makefile.am	(revision 841)
++++ various/adt/src/Makefile.am	(working copy)
+@@ -19,7 +19,7 @@
+ ibuf_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src
+ ibuf_driver_LDADD = -ladt -lutil
+ ibuf_driver_SOURCES = ibuf_driver.c
+-ibuf_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \
++ibuf_driver_DEPENDENCIES = libadt.a \
+                            $(top_builddir)/various/util/src
+ ibuf_driver_CFLAGS = $(AM_CFLAGS)
+ 
+@@ -27,7 +27,7 @@
+ std_hash_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src
+ std_hash_driver_LDADD = -ladt -lutil
+ std_hash_driver_SOURCES = std_hash_driver.c
+-std_hash_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \
++std_hash_driver_DEPENDENCIES = libadt.a \
+                                $(top_builddir)/various/util/src
+ std_hash_driver_CFLAGS = $(AM_CFLAGS)
+ 
+@@ -35,7 +35,7 @@
+ std_list_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src
+ std_list_driver_LDADD = -ladt -lutil
+ std_list_driver_SOURCES = std_list_driver.c
+-std_list_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \
++std_list_driver_DEPENDENCIES = libadt.a \
+                                $(top_builddir)/various/util/src
+ std_list_driver_CFLAGS = $(AM_CFLAGS)
+ 
+@@ -43,7 +43,7 @@
+ std_btree_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src
+ std_btree_driver_LDADD = -ladt -lutil
+ std_btree_driver_SOURCES = std_btree_driver.c
+-std_btree_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \
++std_btree_driver_DEPENDENCIES = libadt.a \
+                                $(top_builddir)/various/util/src
+ std_btree_driver_CFLAGS = $(AM_CFLAGS)
+ 
+@@ -51,6 +51,6 @@
+ std_bbtree_driver_LDFLAGS = -L. -L$(top_builddir)/various/util/src
+ std_bbtree_driver_LDADD = -ladt -lutil
+ std_bbtree_driver_SOURCES = std_bbtree_driver.c
+-std_bbtree_driver_DEPENDENCIES = $(top_builddir)/various/adt/src \
++std_bbtree_driver_DEPENDENCIES = libadt.a \
+                                $(top_builddir)/various/util/src
+ std_bbtree_driver_CFLAGS = $(AM_CFLAGS)
+Index: lib/gdbmi/src/Makefile.am
+===================================================================
+--- lib/gdbmi/src/Makefile.am	(revision 841)
++++ lib/gdbmi/src/Makefile.am	(working copy)
+@@ -18,4 +18,4 @@
+ gdbmi_driver_LDFLAGS = -L.
+ gdbmi_driver_LDADD = -lgdbmi
+ gdbmi_driver_SOURCES = gdbmi_driver.c
+-gdbmi_driver_DEPENDENCIES = $(top_builddir)/src
++gdbmi_driver_DEPENDENCIES = libgdbmi.a