Patch to make "make check" work, #177904.

(Portage version: 2.1.2.7)

4 files changed, 43 insertions, 13 deletions

diff --git a/app-emacs/mew/ChangeLog b/app-emacs/mew/ChangeLog
index 0f4692087e9f..dd04915da9fc 100644
--- a/app-emacs/mew/ChangeLog
+++ b/app-emacs/mew/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/mew
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/ChangeLog,v 1.42 2007/05/10 09:50:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/ChangeLog,v 1.43 2007/05/10 13:44:11 ulm Exp $
+
+  10 May 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/mew-5.1-make-check.patch, mew-4.2.ebuild, mew-5.1.ebuild:
+  Patch to make "make check" work; thanks to Torsten Veller <tove@gentoo.org>
+  for pointing this out (bug #177904). Don't install 00copyright* in doc.
 
   10 May 2007; Ulrich Mueller <ulm@gentoo.org> -files/3.x/50mew-gentoo.el,
   files/50mew-gentoo.el, mew-4.1.ebuild, mew-4.2.ebuild, mew-5.1.ebuild:
diff --git a/app-emacs/mew/files/mew-5.1-make-check.patch b/app-emacs/mew/files/mew-5.1-make-check.patch
new file mode 100644
index 000000000000..450eedda2974
--- /dev/null
+++ b/app-emacs/mew/files/mew-5.1-make-check.patch
@@ -0,0 +1,11 @@
+--- Makefile.in~	2006-05-23 07:16:05.000000000 +0200
++++ Makefile.in	2007-05-10 14:36:24.000000000 +0200
+@@ -34,7 +34,7 @@
+ #EMACS = xemacs
+ #EMACS = mule
+ 
+-CHECK = xemacs
++CHECK = $(EMACS)
+ 
+ ##
+ ## A directory where mew*.el[c] will be installed.
diff --git a/app-emacs/mew/mew-4.2.ebuild b/app-emacs/mew/mew-4.2.ebuild
index 87abb0e4f307..21f09ce9ee43 100644
--- a/app-emacs/mew/mew-4.2.ebuild
+++ b/app-emacs/mew/mew-4.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-4.2.ebuild,v 1.5 2007/05/10 09:50:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-4.2.ebuild,v 1.6 2007/05/10 13:44:11 ulm Exp $
 
-inherit elisp
+inherit elisp eutils
 
 DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
 HOMEPAGE="http://www.mew.org/"
@@ -17,9 +17,15 @@ RDEPEND="ssl? ( net-misc/stunnel )"
 
 SITEFILE=50${PN}-gentoo.el
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/mew-5.1-make-check.patch"
+}
+
 src_compile() {
-	econf || die
-	emake || die
+	econf || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -27,11 +33,12 @@ src_install() {
 		infodir=${D}/usr/share/info \
 		elispdir=${D}/${SITELISP}/${PN} \
 		etcdir=${D}/usr/share/${PN} \
-		mandir=${D}/usr/share/man/man1 || die
+		mandir=${D}/usr/share/man/man1 || die "einstall failed"
 
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 
-	dodoc 00* mew.dot.*
+	dodoc 00api 00changes* 00diff 00readme* 00roadmap mew.dot.* \
+		|| die "dodoc failed"
 }
 
 pkg_postinst() {
diff --git a/app-emacs/mew/mew-5.1.ebuild b/app-emacs/mew/mew-5.1.ebuild
index 4c1cd0c30f93..52008d2c90cf 100644
--- a/app-emacs/mew/mew-5.1.ebuild
+++ b/app-emacs/mew/mew-5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-5.1.ebuild,v 1.3 2007/05/10 09:50:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-5.1.ebuild,v 1.4 2007/05/10 13:44:11 ulm Exp $
 
-inherit elisp
+inherit elisp eutils
 
 DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
 HOMEPAGE="http://www.mew.org/"
@@ -17,9 +17,15 @@ RDEPEND="ssl? ( net-misc/stunnel )"
 
 SITEFILE=50${PN}-gentoo.el
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/mew-5.1-make-check.patch"
+}
+
 src_compile() {
-	econf || die
-	emake || die
+	econf || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -27,11 +33,12 @@ src_install() {
 		infodir=${D}/usr/share/info \
 		elispdir=${D}/${SITELISP}/${PN} \
 		etcdir=${D}/usr/share/${PN} \
-		mandir=${D}/usr/share/man/man1 || die
+		mandir=${D}/usr/share/man/man1 || die "einstall failed"
 
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 
-	dodoc 00* mew.dot.*
+	dodoc 00api 00changes* 00diff 00readme* 00roadmap mew.dot.* \
+		|| die "dodoc failed"
 }
 
 pkg_postinst() {