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

Package-Manager: portage-2.1.2.7

5 files changed, 62 insertions, 28 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/Manifest b/app-emacs/mew/Manifest
index 6b7633f5882b..e6cd66fbeeb7 100644
--- a/app-emacs/mew/Manifest
+++ b/app-emacs/mew/Manifest
@@ -5,6 +5,10 @@ AUX 50mew-gentoo.el 234 RMD160 a6ab622a67c7d08b2127ade1c3903d2f8e4292fd SHA1 015
 MD5 58675969f76e417ac4d23ccaad0de5f0 files/50mew-gentoo.el 234
 RMD160 a6ab622a67c7d08b2127ade1c3903d2f8e4292fd files/50mew-gentoo.el 234
 SHA256 8c2bdddd4631d1897c8b51e5976263a99dc8414095b24b3f4b9f18f9f4b79bd2 files/50mew-gentoo.el 234
+AUX mew-5.1-make-check.patch 249 RMD160 4c8425337c4226b796a55af5e337103af5f859fe SHA1 6aac2fc55975516bc9c508d568e7260fbef79d7c SHA256 472759cecc780a4c54d9df90ee874a16024cccb1a3add52788894bc95dd7fb5d
+MD5 fd025be4d1c3719df7c5f748011a2b2b files/mew-5.1-make-check.patch 249
+RMD160 4c8425337c4226b796a55af5e337103af5f859fe files/mew-5.1-make-check.patch 249
+SHA256 472759cecc780a4c54d9df90ee874a16024cccb1a3add52788894bc95dd7fb5d files/mew-5.1-make-check.patch 249
 DIST mew-4.1.tar.gz 899279 RMD160 70d049339bc103bd0b49da9604fd687ca65e3145 SHA1 4a89e7d32acd5bfae10aae40b4c5728262f2c750 SHA256 2b81b20c415fd719832cd497b39d0f930eade57f608f76bb984995027407a338
 DIST mew-4.2.tar.gz 925037 RMD160 fd7ff4620b6d27eff6baf31ccba98cc10dfcb88d SHA1 5c425000122ff00a0f02460b46ed4915808d107a SHA256 0e316e703f0d1754cf4cc1331f72292d454af11f8a13a43edceae418bda127da
 DIST mew-5.1.tar.gz 948533 RMD160 6f578b74fce677115e37bc27bf6756e59eabaf23 SHA1 144b90ddac4ce7295c7f710f9f53d15dcb032301 SHA256 bedaabe37ddd52894f7129fd1240939b836f205a6f4d7c5a5072809f6dc1f336
@@ -12,18 +16,18 @@ EBUILD mew-4.1.ebuild 963 RMD160 ae95185e17d65285c8818faab12543d68416c1cc SHA1 5
 MD5 42c5433fbfba07aa8d50ddc94b8dabc3 mew-4.1.ebuild 963
 RMD160 ae95185e17d65285c8818faab12543d68416c1cc mew-4.1.ebuild 963
 SHA256 65f62b9c3f6382e33565c6c0fe2b1016d18f1595601e4b650b90fd6ce26a9685 mew-4.1.ebuild 963
-EBUILD mew-4.2.ebuild 981 RMD160 cd26a11306050793099b1a781f1634788e0bbb18 SHA1 0784f1cbd511ee55dda087dc7bc5b41c5652c2cd SHA256 feab052142cd1a622b1d8458ec49247cabcc30b2052b1d014d45bf998aec1066
-MD5 5a43916052e97de6d978f08545f3dfaf mew-4.2.ebuild 981
-RMD160 cd26a11306050793099b1a781f1634788e0bbb18 mew-4.2.ebuild 981
-SHA256 feab052142cd1a622b1d8458ec49247cabcc30b2052b1d014d45bf998aec1066 mew-4.2.ebuild 981
-EBUILD mew-5.1.ebuild 981 RMD160 a0040953574814ba396087e38c81156d26a32fe9 SHA1 ac92900255a5cdedb2cfc6aad53bac3d691d73ad SHA256 9bbf0208b7882242b0ef254b041a1462dc67943c380a4ffc60f0c30abf90a746
-MD5 304fe7b66fff3d6e9b35725d4afb86b0 mew-5.1.ebuild 981
-RMD160 a0040953574814ba396087e38c81156d26a32fe9 mew-5.1.ebuild 981
-SHA256 9bbf0208b7882242b0ef254b041a1462dc67943c380a4ffc60f0c30abf90a746 mew-5.1.ebuild 981
-MISC ChangeLog 6016 RMD160 b6070c4cbc769d92ed1ab743c497897dfe32ce4c SHA1 21425f8944959e3f5dc3e4a06f49bdd631288535 SHA256 15a8506672846e50e46b9f28ec1818c642a9d678fd8f4254f0f0caf100e19f75
-MD5 bff675976df0b20c53f64ae445cd781f ChangeLog 6016
-RMD160 b6070c4cbc769d92ed1ab743c497897dfe32ce4c ChangeLog 6016
-SHA256 15a8506672846e50e46b9f28ec1818c642a9d678fd8f4254f0f0caf100e19f75 ChangeLog 6016
+EBUILD mew-4.2.ebuild 1191 RMD160 13085331001b8118706bccd4cf185d29be7cb4a8 SHA1 e1d8f39a60d9404a8682622ac87cf65fe4bbd530 SHA256 528400a793fb3e506b2ca82d4fb2036e19b5726f06700ef9fc15ff42e915ddfb
+MD5 1541d0edd64b4f7a1f73d390a334815e mew-4.2.ebuild 1191
+RMD160 13085331001b8118706bccd4cf185d29be7cb4a8 mew-4.2.ebuild 1191
+SHA256 528400a793fb3e506b2ca82d4fb2036e19b5726f06700ef9fc15ff42e915ddfb mew-4.2.ebuild 1191
+EBUILD mew-5.1.ebuild 1191 RMD160 c94e9d2ab939837857c45c4cb9cc26a87bf68cbf SHA1 338326bd47a1a53681d4de08cb1d0decfb08af27 SHA256 6b97784ea54c6c704881d6b3f0aa118c700d1e97f325cafea654f69ade9df097
+MD5 045406fbe345d8f4d4644442d117292e mew-5.1.ebuild 1191
+RMD160 c94e9d2ab939837857c45c4cb9cc26a87bf68cbf mew-5.1.ebuild 1191
+SHA256 6b97784ea54c6c704881d6b3f0aa118c700d1e97f325cafea654f69ade9df097 mew-5.1.ebuild 1191
+MISC ChangeLog 6283 RMD160 ba786b686f5fab84a5c588886e38ab14b0fe87c6 SHA1 0ed559e03930ac2ab276dd562ef988568de2bd7f SHA256 d5245990ff7b27ad4f8f77ff4a10856888faa01234149862208f5ca6ea095cb1
+MD5 954e65b67504cf33e93cb98a43faf1a5 ChangeLog 6283
+RMD160 ba786b686f5fab84a5c588886e38ab14b0fe87c6 ChangeLog 6283
+SHA256 d5245990ff7b27ad4f8f77ff4a10856888faa01234149862208f5ca6ea095cb1 ChangeLog 6283
 MISC metadata.xml 424 RMD160 e052dfa6794183ce087e81d6462c12e4d6fb91a7 SHA1 35011c424b1e4bdd5e2b1615b5cc730c72bb601f SHA256 4be2d2a37a254f6bab19864ed2d0f5c685a0a828aa98f82a942fd343d8caa0fa
 MD5 b8a5a05dc587cbca65b831dedcd4488c metadata.xml 424
 RMD160 e052dfa6794183ce087e81d6462c12e4d6fb91a7 metadata.xml 424
@@ -40,7 +44,7 @@ SHA256 a58b2f71f57379e22eafc25926c0c671e0a152698822864f7667c222c778ba0a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGQuuEOeoy/oIi7uwRAi+wAKCXLzlV9YAsdjtbPbQnS0KblyOPSQCg0Is+
-F4qUXLb12gg8EOxTX95wXqE=
-=Ylpr
+iD8DBQFGQyIuOeoy/oIi7uwRAi+6AJwOFfqPHJLA9ZIsPNrONrjAVwQ9HACdGBNs
+3NHpYDeuu8vsYnyM0WuAwY0=
+=ELIJ
 -----END PGP SIGNATURE-----
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() {