Fixing bug #154848

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24.3 x86_64

4 files changed, 22 insertions, 16 deletions

diff --git a/dev-haskell/hmake/ChangeLog b/dev-haskell/hmake/ChangeLog
index 8a0136dd5e93..ad283e784ad2 100644
--- a/dev-haskell/hmake/ChangeLog
+++ b/dev-haskell/hmake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/hmake
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.35 2008/03/10 22:42:35 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.36 2008/07/05 23:48:17 araujo Exp $
+
+  05 Jul 2008; Luis F. Araujo <araujo@gentoo.org> hmake-3.11.ebuild,
+  hmake-3.13.ebuild:
+  Fixed bug #154848. Latest hmake versions only compile with >= 6.8 too
 
   10 Mar 2008; Luis F. Araujo <araujo@gentoo.org> hmake-3.11.ebuild,
   hmake-3.13.ebuild:
diff --git a/dev-haskell/hmake/Manifest b/dev-haskell/hmake/Manifest
index b8a2b3af68df..4d2db803732d 100644
--- a/dev-haskell/hmake/Manifest
+++ b/dev-haskell/hmake/Manifest
@@ -7,14 +7,14 @@ DIST hmake-3.10.tar.gz 104656 RMD160 9a507639305e72218b3191e17433983ca4e8001a SH
 DIST hmake-3.11.tar.gz 104443 RMD160 9027f4bb87b7b825ff5ef05dc735e95a234c438a SHA1 3fcb92411a3146852cc665598fe76a58e460e18c SHA256 2a120adea7c5cb246d91ba3d8f7be858c3ba184c5f638e316f24271484c64720
 DIST hmake-3.13.tar.gz 104283 RMD160 3a08df9a47bb28be01a85c11e223d0186b38efa9 SHA1 f1290168c31a5b2e91777e2570039a187df2a30f SHA256 bc1ebc01a5d471daf6746bec3a1012806bd449359a304431072b40d2a12cde39
 EBUILD hmake-3.10.ebuild 1565 RMD160 bc2cf70824e021e0ac02fdde44c2607cc81711ce SHA1 1b66cbf615c4087318b796b4c49cda8030ab9d27 SHA256 f26477bfa8f033408cb15eb6af9503931749daf2477fd22c0fb60683051a3e7f
-EBUILD hmake-3.11.ebuild 1722 RMD160 9c6998e28eb8d5969657eb15a3f0656f045e63d7 SHA1 cf01411c36027ab3356cb62e2b6f113828554efc SHA256 17c75f32354a367b5d1015b6b88b6c08b7172b1c2eff0994ef8c06971a0a2a6d
-EBUILD hmake-3.13.ebuild 1443 RMD160 8a66b50fae682186b634e381a95dd853886807aa SHA1 ff5a7e8bddd9994ef79fa182971525876c7bad10 SHA256 00812e3dba8759caaf933fd2ba30cc211b225e211df9472882f01e46ad20dc5e
-MISC ChangeLog 4796 RMD160 9971d11f52c26923b0ca33a6eafed841f8ebae22 SHA1 f943e14312622c354bad2a74796813ed415494e6 SHA256 3671e2a36efb1f0e5ff4254d7a87c0e7d44400bd88796f6623d05711bfc3cab3
+EBUILD hmake-3.11.ebuild 1772 RMD160 0707af9858a206d2e906f30da112dca3aa9ba6e7 SHA1 2ba6d81b1e52ccc625e73e17afc9b1635f5274a3 SHA256 8e596fdb33fba7c1686d925c4ccfe26c854c56ef8dd1dcf88d702152c69fa0b2
+EBUILD hmake-3.13.ebuild 1501 RMD160 eb7eae97901173a5e557274da5581b91144bb764 SHA1 941788640645784ae3b294db823c9c4da695ab9a SHA256 890cfec86b2bebac31124d2f17dabd6ac5d48872b948934b5fd579136054bf25
+MISC ChangeLog 4959 RMD160 aab6c9727df56c450b13b4a1f5ee19acf7c92c30 SHA1 911509940c6f32edeefef1677bc5039c7177964d SHA256 c95013a0861e50999c3129310137bc7fc5f640710854b2eb3fec40945b79af92
 MISC metadata.xml 285 RMD160 15988fa26c91d66e822368f192c0ab541dbf1853 SHA1 e2ab5e4901e7d4fd8ad32143b781d8942b4c3dd4 SHA256 7a662b130d6c54436af26de89f516ebb376b381a03cccd2b4e339b86f0d16f7c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH1a+/BCmRZan6aegRAjRzAJ4h5qG0i0e4J8yO8kfGb+D3CAWHrQCfRDha
-hFbTXQgUzaNowglffBTqCSY=
-=y5tn
+iEYEARECAAYFAkhv/gcACgkQNir3WYj9aLpkvACeNwTnvzmXugAr03BJ+sdog5Ug
+06AAn2nx/NO373Itvw4IgkIkdSHMbDLu
+=YTC3
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/hmake/hmake-3.11.ebuild b/dev-haskell/hmake/hmake-3.11.ebuild
index c5ea41bc136d..1abe5838a5f2 100644
--- a/dev-haskell/hmake/hmake-3.11.ebuild
+++ b/dev-haskell/hmake/hmake-3.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.11.ebuild,v 1.13 2008/03/10 22:42:35 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.11.ebuild,v 1.14 2008/07/05 23:48:17 araujo Exp $
 
-inherit base eutils fixheadtails ghc-package
+inherit base eutils fixheadtails ghc-package flag-o-matic
 
 DESCRIPTION="A make tool for Haskell programs"
 HOMEPAGE="http://www.haskell.org/hmake/"
@@ -16,8 +16,7 @@ IUSE=""
 DEPEND="!>=dev-lang/ghc-6.8
 		sys-libs/readline
 		>=sys-apps/sandbox-1.2.12"
-RDEPEND="dev-lang/ghc
-		sys-libs/readline"
+RDEPEND="sys-libs/readline"
 
 # sandbox dependency due to bug #97441, #101433
 
@@ -41,6 +40,8 @@ src_unpack() {
 	# the line above prevents current fixheadtails.eclass from doing nonsense;
 	# double space before -n is significant
 	ht_fix_all
+	# Make it compile with -Wl, -O1
+	filter-ldflags -*
 }
 
 src_compile() {
diff --git a/dev-haskell/hmake/hmake-3.13.ebuild b/dev-haskell/hmake/hmake-3.13.ebuild
index 9f5d769f6a5e..396d1dabbbd7 100644
--- a/dev-haskell/hmake/hmake-3.13.ebuild
+++ b/dev-haskell/hmake/hmake-3.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.13.ebuild,v 1.4 2008/03/10 22:42:35 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.13.ebuild,v 1.5 2008/07/05 23:48:17 araujo Exp $
 
-inherit base eutils ghc-package
+inherit base eutils ghc-package flag-o-matic
 
 DESCRIPTION="A make tool for Haskell programs"
 HOMEPAGE="http://www.haskell.org/hmake/"
@@ -16,8 +16,7 @@ IUSE=""
 DEPEND="!>=dev-lang/ghc-6.8
 		sys-libs/readline
 		>=sys-apps/sandbox-1.2.12"
-RDEPEND="dev-lang/ghc
-		sys-libs/readline"
+RDEPEND="sys-libs/readline"
 
 # sandbox dependency due to bug #97441, #101433
 
@@ -33,6 +32,8 @@ src_unpack() {
 		$1 -E -cpp -optP-dM ghcsym.hs -o ghcsym.out; \
 		grep __GLASGOW_HASKELL__ ghcsym.out | cut -d" " -f 3 > $2;' \
 		"${S}/script/confhc"
+	# Make it compile with LDFLAGS -Wl, -O1
+	filter-ldflags -*
 }
 
 src_compile() {