Fix build failure for USE=-doc case. Discovered and fixed by Yvan Royon, bug #377827.

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog
index db6bb05ff9e91fcb75c7cde8c239d715b7b0f7b9..e81e148a965c0935fba58b1343a9a8eeb820b1da 100644 (file)
--- a/dev-haskell/happy/ChangeLog
+++ b/dev-haskell/happy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/happy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.51 2011/08/02 10:15:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.52 2011/08/05 10:53:54 slyfox Exp $
+
+  05 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> happy-1.18.6.ebuild:
+  Fix build failure for USE=-doc case. Discovered and fixed by Yvan Royon, bug
+  #377827.
 
 *happy-1.18.6 (02 Aug 2011)
 

diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
index 7f460f380f91aef30730d4871c51446aaa5ebbb2..42fd9b9e92134109a286b3b604b365e962069659 100644 (file)
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -9,13 +9,13 @@ DIST happy-1.18.6.tar.gz 158096 RMD160 c0d0a69af1ec783e60623b3ee0ce07428bdd128e
 DIST mtl-1.1.0.2.tar.gz 18901 RMD160 e7032fc069c8b24b97725b259d2e6fb05ace208b SHA1 883deca3cdf8052173c995b741bdedccc3c91440 SHA256 a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36
 EBUILD happy-1.18.2.ebuild 967 RMD160 0f4c3cdc3834e3189a3d4696060ac1d8605dd7d8 SHA1 f7b325a57fb576c0934b5ef1dc7abc1e36b462ab SHA256 0c3a84a5f9f7580540f894351a8d295311d98c64bceb625521d1ddfa999edde4
 EBUILD happy-1.18.4.ebuild 1727 RMD160 b8ecabdd63c36e7ec8e4920de262d12b2f6e59e1 SHA1 30513c7cfa307bbd5c80418c4a7d2ba44da954e0 SHA256 8e001a1c4ef7e1d28b03d88013982999ba2ed7aae7c62d06a799cbfc5bd26a89
-EBUILD happy-1.18.6.ebuild 1348 RMD160 dc3811fdd9eb539bada44c15dbe919e25f03f862 SHA1 2cbb01e72fc394d4e07be78cf127e14ba6149c75 SHA256 cf6d90dcd2a895c7b42054e5c6a55103214a9c2fcfd3b8ceeb2a8c6d15a917e0
-MISC ChangeLog 6293 RMD160 63c14d2034a0fe44c61baa8ed5b02b0180080940 SHA1 c01890fccdaa64ba9a5b5cecbb0800e3c68a867d SHA256 50a23095f07430c918319729dc0952615b3e6dbab58174edee7fab55ee491b65
+EBUILD happy-1.18.6.ebuild 1372 RMD160 ba175ef179d2da6969d8be3371e017b793345a94 SHA1 54a89da07386468a59f1ddeb3ef450e4a9aeca3b SHA256 e3d884bb71de39568b6dbac2c1fb17e90397cf4837947ff01b13b479ab44fa7d
+MISC ChangeLog 6459 RMD160 b37dd3d2b55532988112e080d9cc2e5d409a9739 SHA1 97437f856a256c9de363036369ef92141bce1bc1 SHA256 a1fd21114aaae7b2fa4cfdc5dc29b1bf5531f3953b389877109437e68d24418e
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk43zv4ACgkQcaHudmEf86qLxgCggGGIchGijsMH5zGnvmX159Q0
-CA4AmwSuIpZkVYbuIDEVcy6x21Nt1rAj
-=zLtd
+iEYEARECAAYFAk47zJEACgkQcaHudmEf86pGdgCdEJuiIzmdvQboSLDh4TuPibO2
+lxEAn07LhgM3V3nOnCsJGop0LRQ5daM0
+=qe4L
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/happy/happy-1.18.6.ebuild b/dev-haskell/happy/happy-1.18.6.ebuild
index b0ba2a830a228e74c3876d1abf5d61fd7584c13e..57344ee13780006ebf7b05ae8a7f7aa10ec7600a 100644 (file)
--- a/dev-haskell/happy/happy-1.18.6.ebuild
+++ b/dev-haskell/happy/happy-1.18.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.6.ebuild,v 1.1 2011/08/02 10:15:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.6.ebuild,v 1.2 2011/08/05 10:53:54 slyfox Exp $
 
 # ebuild generated by hackport 0.2.9
 
@@ -39,13 +39,17 @@ src_prepare() {
 src_configure() {
        cabal_src_configure
 
-       use doc && cd doc && econf || die "econf failed in /doc"
+       if use doc; then
+               cd doc && econf || die "econf failed in /doc"
+       fi
 }
 
 src_compile() {
        cabal_src_compile
 
-       use doc && cd doc && emake -j1 || die "emake failed in /doc"
+       if use doc; then
+               cd doc && emake -j1 || die "emake failed in /doc"
+       fi
 }
 
 src_test() {