Hopefully fix parallel make for every USE combination

(Portage version: 2.1.2.11)

3 files changed, 42 insertions, 22 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 7a71d8be8e82..2277e30a6801 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.117 2007/08/11 15:10:31 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.118 2007/08/16 20:30:10 ferdy Exp $
+
+  16 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  files/mutt-1.5.16-parallel-make.patch, mutt-1.5.16.ebuild:
+  Hopefully fix parallel make for every USE combination
 
   11 Aug 2007; Steve Dibb <beandog@gentoo.org> mutt-1.5.16.ebuild:
   amd64 stable, security bug 178003
diff --git a/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch b/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch
index 7305251e7d46..9fb39c86a4d1 100644
--- a/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch
+++ b/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch
@@ -1,16 +1,34 @@
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 173f352..1d974f9 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -132,10 +132,9 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
- mutt.1: $(srcdir)/mutt.man
- 	$(EDIT) $(srcdir)/mutt.man > $@
+diff --git a/Makefile.am b/Makefile.am
+index 1f36629..20d205e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,14 +2,16 @@
+ ## Use aclocal -I m4; automake --foreign
+ 
+ AUTOMAKE_OPTIONS = 1.6 foreign
+-EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap makedoc
++EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap
++
++noinst_PROGRAMS = makedoc
+ 
+ if BUILD_IMAP
+ IMAP_SUBDIR = imap
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl $(IMAP_SUBDIR) . doc contrib
+ 
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 
+@@ -37,10 +39,6 @@ mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+ mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
+ 	$(INTLDEPS)
+ 
+-makedoc_SOURCES = makedoc.c
+-makedoc_LDADD =
+-makedoc_DEPENDENCIES = 
+-
+ # $(makedoc_OBJECTS): $(makedoc_SOURCES)
+ # 	$(HOST_CC) $(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
  
--stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
-+stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
-                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
-                $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
--	$(MAKE) ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds
- 	( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \
- 	  sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \
- 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s && \
diff --git a/mail-client/mutt/mutt-1.5.16.ebuild b/mail-client/mutt/mutt-1.5.16.ebuild
index 403529a77ae2..36c74268e6b8 100644
--- a/mail-client/mutt/mutt-1.5.16.ebuild
+++ b/mail-client/mutt/mutt-1.5.16.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/mail-client/mutt/mutt-1.5.16.ebuild,v 1.9 2007/08/11 15:10:31 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.16.ebuild,v 1.10 2007/08/16 20:30:10 ferdy Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -64,15 +64,10 @@ src_unpack() {
 	unpack ${A//${SIDEBAR_PATCH_N}} && cd "${S}" || die "unpack failed"
 
 	if ! use vanilla && ! use sidebar ; then
-		epatch "${FILESDIR}"/${P}-parallel-make.patch
-
 		use nntp || rm "${PATCHDIR}"/06-nntp.patch
-
 		for p in "${PATCHDIR}"/*.patch ; do
 			epatch "${p}"
 		done
-
-		AT_M4DIR="m4" eautoreconf
 	fi
 
 	if use sidebar ; then
@@ -80,6 +75,9 @@ src_unpack() {
 			ewarn "The sidebar patch is only applied to a vanilla mutt tree."
 		epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
 	fi
+
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {