Hopefully fix parallel make for every USE combination

Package-Manager: portage-2.1.2.11

4 files changed, 64 insertions, 34 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/Manifest b/mail-client/mutt/Manifest
index 0dd2342c830c..3a89fca4c7cb 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 files/Muttrc 667
@@ -34,10 +37,10 @@ AUX mutt-1.5.15-parallel-make.patch 946 RMD160 80c9bfa187c784d650f5850469021f945
 MD5 bdbf9eadab5bd4f2755ca8295e168661 files/mutt-1.5.15-parallel-make.patch 946
 RMD160 80c9bfa187c784d650f5850469021f94547c897e files/mutt-1.5.15-parallel-make.patch 946
 SHA256 d4b6abc9f43989a6c7a22f3fbaafd4ffa524ad516c4cb5b8cfe884985cce74f6 files/mutt-1.5.15-parallel-make.patch 946
-AUX mutt-1.5.16-parallel-make.patch 966 RMD160 deeafaf9a771c5a42279d143de42d76faf202da1 SHA1 9ae0c01e373984af0102e953671ab5f61cda1654 SHA256 5cdff3f2f824ffdd32900f2ad95235c7b506859eb33893fe40588513be317a0d
-MD5 7ae6e107cc9d0b96a76ea99a253a54a2 files/mutt-1.5.16-parallel-make.patch 966
-RMD160 deeafaf9a771c5a42279d143de42d76faf202da1 files/mutt-1.5.16-parallel-make.patch 966
-SHA256 5cdff3f2f824ffdd32900f2ad95235c7b506859eb33893fe40588513be317a0d files/mutt-1.5.16-parallel-make.patch 966
+AUX mutt-1.5.16-parallel-make.patch 936 RMD160 f6a216d9ff06ae55d9569e05632b60332cf49ebe SHA1 0a9b98b37987ffa10039424bb6f5849a08dbb168 SHA256 3ecc199b83f6fa747d342694d8ffacf0aedd4590e0d9943c9b6004c31cbdb931
+MD5 4fede49427ed7826ba6f0eea1108adb3 files/mutt-1.5.16-parallel-make.patch 936
+RMD160 f6a216d9ff06ae55d9569e05632b60332cf49ebe files/mutt-1.5.16-parallel-make.patch 936
+SHA256 3ecc199b83f6fa747d342694d8ffacf0aedd4590e0d9943c9b6004c31cbdb931 files/mutt-1.5.16-parallel-make.patch 936
 AUX slang.patch 493 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 SHA1 f913e8c717f76186b0edc8856bf02a167d540c70 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 files/slang.patch 493
@@ -90,14 +93,14 @@ EBUILD mutt-1.5.15-r2.ebuild 4528 RMD160 2359d39b6d5758d977b1cbfce4c320dc0abb0ed
 MD5 1eb11e8a227f9913a0d2e7ebc3fa8c31 mutt-1.5.15-r2.ebuild 4528
 RMD160 2359d39b6d5758d977b1cbfce4c320dc0abb0ed7 mutt-1.5.15-r2.ebuild 4528
 SHA256 37c613bcdc54cef3d93b013c6cb792deb2be3ca2de85765a937323bae5041264 mutt-1.5.15-r2.ebuild 4528
-EBUILD mutt-1.5.16.ebuild 4869 RMD160 7fe6abaf7f985e8d0dbfbc94e269ee4ac865b287 SHA1 45fd8fd892e3e58a6c0de6456c970243c981f56a SHA256 548f7f91f8821d06dd9da5b45f8423ed972251a20d8220972fe2f25fc965ec01
-MD5 e395092ca0d96a08a35502f08d179d5b mutt-1.5.16.ebuild 4869
-RMD160 7fe6abaf7f985e8d0dbfbc94e269ee4ac865b287 mutt-1.5.16.ebuild 4869
-SHA256 548f7f91f8821d06dd9da5b45f8423ed972251a20d8220972fe2f25fc965ec01 mutt-1.5.16.ebuild 4869
-MISC ChangeLog 26908 RMD160 3fce2b28824b624d5cc6b654b717b3a14ab5560f SHA1 42c8f10525f451c950edc3a6cf28b19b8daa6e2f SHA256 17eea8ea77c0a690c5fa8994c125b80c4a414ec18c53693e1f462f5bbe47fb16
-MD5 9b7ac126630fd18e89257cea80fad3af ChangeLog 26908
-RMD160 3fce2b28824b624d5cc6b654b717b3a14ab5560f ChangeLog 26908
-SHA256 17eea8ea77c0a690c5fa8994c125b80c4a414ec18c53693e1f462f5bbe47fb16 ChangeLog 26908
+EBUILD mutt-1.5.16.ebuild 4864 RMD160 8bd4b06d0544182f18e70d8034d089b21e092b6f SHA1 b90f3b0893239af1bfe779f7d28c7307f0e583ab SHA256 c2efba9d33371eeb07931f6e447cfee91d1b6a80432c77751f78eb5eb0ee40a3
+MD5 a194db755c5dd6160a97ca545b7c8a8c mutt-1.5.16.ebuild 4864
+RMD160 8bd4b06d0544182f18e70d8034d089b21e092b6f mutt-1.5.16.ebuild 4864
+SHA256 c2efba9d33371eeb07931f6e447cfee91d1b6a80432c77751f78eb5eb0ee40a3 mutt-1.5.16.ebuild 4864
+MISC ChangeLog 27077 RMD160 210585e5f73d43ee60297db0ccb05d2e5e6607a2 SHA1 48d4445a36996d6c910c152b4ca79c872de9de92 SHA256 961b6a2ad317646902fc68c2d7cba72cdff7aa890ae35ea5d9bb430eefa25fbf
+MD5 8d0986133953202a4329ce1ab1594b8b ChangeLog 27077
+RMD160 210585e5f73d43ee60297db0ccb05d2e5e6607a2 ChangeLog 27077
+SHA256 961b6a2ad317646902fc68c2d7cba72cdff7aa890ae35ea5d9bb430eefa25fbf ChangeLog 27077
 MISC metadata.xml 344 RMD160 6fb7283d0c812896b18cf91969a744fe9f34f57a SHA1 6a2f5f2822e49aadad2f8b16b8a565f627cc697f SHA256 9241b10ef441b7a14e730c2feff17fa387c48291caa52e788acca2befc4ad480
 MD5 cb5fc428c975ffb2fc20fc8c577cca9a metadata.xml 344
 RMD160 6fb7283d0c812896b18cf91969a744fe9f34f57a metadata.xml 344
@@ -126,3 +129,10 @@ SHA256 dc27ec1f685f76f03b11ef2dfdc78868893a9be351276d98b87efa32d90a0c44 files/di
 MD5 65c06b986600968d41ef9d7a9b311cec files/digest-mutt-1.5.16 804
 RMD160 c61df8768ec4ef909b3bd8e960bf296647b2d135 files/digest-mutt-1.5.16 804
 SHA256 679223e93cbc3badb93902838093767d1ddef8d4febcd63d256c3f17b358957b files/digest-mutt-1.5.16 804
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGxLPhViELBEf1JB0RAju8AJ9w1T6xKrEnFEyRzLMM1jp3zT8NPACfUS67
+z76QTuLVCtd7XtygRpGUxj0=
+=/JEh
+-----END PGP SIGNATURE-----
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() {