Bugfix for gcc4.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 46 insertions, 17 deletions

diff --git a/dev-haskell/hmake/ChangeLog b/dev-haskell/hmake/ChangeLog
index 3fcdbdfcd1ac..f3ebcc37066e 100644
--- a/dev-haskell/hmake/ChangeLog
+++ b/dev-haskell/hmake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/hmake
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.17 2005/08/17 12:51:36 kosmikus Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.18 2006/02/04 14:55:42 nattfodd Exp $
+
+  04 Feb 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  +files/ghc-version.patch, hmake-3.10.ebuild:
+  Refactored the way ghc version is obtained, as the old solution wasn't
+  working anymore with gcc4 and was too complicated (thanks to dcoutts for 
+  the cut/sed line).
 
   17 Aug 2005; Andres Loeh <loeh@gentoo.org> hmake-3.10.ebuild:
   Added dependency on sandbox-1.2.12 due to bug #97441.
diff --git a/dev-haskell/hmake/Manifest b/dev-haskell/hmake/Manifest
index 18d6033dd91b..8e5271c433b7 100644
--- a/dev-haskell/hmake/Manifest
+++ b/dev-haskell/hmake/Manifest
@@ -1,14 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 458a337aec610064f5c315112b5a3757 hmake-3.10.ebuild 1448
-MD5 f07083fcc033c17aa2752ffe81fa4fb2 ChangeLog 2395
+MD5 3cac5eba4251b9c6eb506c237534727f ChangeLog 2667
+RMD160 7ba904cbe727de59e09009953cff3dd1e7b74f78 ChangeLog 2667
+SHA256 29de5302477c9ad5bf4086c12d1652e6391d9405f92611a5063d7bbabbffc67a ChangeLog 2667
+MD5 1020e4e76558e82dd61cd44e68fb6039 files/digest-hmake-3.10 232
+RMD160 491624475d2362e53730c55d13aa642e2e37a726 files/digest-hmake-3.10 232
+SHA256 af66322abd2d615e144888981755eef2a8d9c904dafc5e001aac8d03b4526118 files/digest-hmake-3.10 232
+MD5 a81d915645cdda5a1ea66d47bb9a26b6 files/ghc-version.patch 580
+RMD160 129e0fb4ccf130bf3c0b6bac7ae602b3ac53e7d9 files/ghc-version.patch 580
+SHA256 2bd5c0f410166bb00d59cacecc5ecabf31f79892f135f2157a3441e64d6d4465 files/ghc-version.patch 580
+MD5 04395e78615f91827380aa4f27864b4f hmake-3.10.ebuild 1526
+RMD160 1d33202158ae08c49b131679ee0a26ec878e5150 hmake-3.10.ebuild 1526
+SHA256 2d3a715cbb579a037dcd60134d2e3d42c89a46707db5017e393bb38f5ec25197 hmake-3.10.ebuild 1526
 MD5 e0ce59fd27b9382896cdb87d5fa48f89 metadata.xml 286
-MD5 fdfe8526461bed837798b8d287cc82bb files/digest-hmake-3.10 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDAzMPOKSBj1ObwosRAvMxAKCCi8pQ0Pxyq71NqaEho2NyfblWfQCcCyPX
-At1XHEtRaod66WQZOBiOpa8=
-=SUtG
------END PGP SIGNATURE-----
+RMD160 eea8b96926379c8a0e31660f268dd917615d41a3 metadata.xml 286
+SHA256 0e0b237f9b1c40f9e276e0a0d11ba30285761b6348f19d6da06b0dc6c8a9efe2 metadata.xml 286
diff --git a/dev-haskell/hmake/files/digest-hmake-3.10 b/dev-haskell/hmake/files/digest-hmake-3.10
index fbb65aab0594..c8cc6c283ee3 100644
--- a/dev-haskell/hmake/files/digest-hmake-3.10
+++ b/dev-haskell/hmake/files/digest-hmake-3.10
@@ -1 +1,3 @@
 MD5 32c8fea53feaa9b2ead1622609ec052a hmake-3.10.tar.gz 104656
+RMD160 9a507639305e72218b3191e17433983ca4e8001a hmake-3.10.tar.gz 104656
+SHA256 309abe82803f50441caad64c4d5eddea424c5d9d89659c6e473cc4404cc90c48 hmake-3.10.tar.gz 104656
diff --git a/dev-haskell/hmake/files/ghc-version.patch b/dev-haskell/hmake/files/ghc-version.patch
new file mode 100644
index 000000000000..cd1f048a0432
--- /dev/null
+++ b/dev-haskell/hmake/files/ghc-version.patch
@@ -0,0 +1,14 @@
+--- script/confhc.old	2006-02-04 16:24:05.000000000 +0100
++++ script/confhc	2006-02-04 16:33:39.000000000 +0100
+@@ -76,10 +76,7 @@
+   
+ # Now look for GHC.  Determining the version number here is due to Simon Marlow.
+ ghcsym () {
+-  echo __GLASGOW_HASKELL__ >ghcsym.hs;
+-  $1 -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
+-  grep -v '^#' ghcsym.out > $2;
+-  rm -f ghcsym.hs ghcsym.out;
++  $1 --numeric-version | cut -d'.' -s -f 1,2 |sed 's/\([0-9]\)\.\([0-9]\)/\10\2/' | sed 's/\([0-9]\)0\([0-9][0-9]\)/\1\2/'i > $2;
+ }
+ echo -n "  Looking for ghc...   "
+ if which ghc >/dev/null 2>&1
diff --git a/dev-haskell/hmake/hmake-3.10.ebuild b/dev-haskell/hmake/hmake-3.10.ebuild
index 7a6428f4a2cc..88ed970464ab 100644
--- a/dev-haskell/hmake/hmake-3.10.ebuild
+++ b/dev-haskell/hmake/hmake-3.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.10.ebuild,v 1.3 2005/08/17 12:51:36 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.10.ebuild,v 1.4 2006/02/04 14:55:42 nattfodd Exp $
 
 inherit base fixheadtails
 
@@ -25,6 +25,12 @@ RDEPEND="sys-libs/readline
 # if using readline, hmake depends also on ncurses; but
 # readline already has this dependency
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/ghc-version.patch
+}
+
 src_compile() {
 	local buildwith
 	local arch