Fix building with ghc-6.2.2. Fixes bug #115657.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 70 insertions, 9 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 6af1db1e56b3..4d7ca97e1c63 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.22 2006/02/14 12:34:00 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.23 2006/02/20 18:25:32 dcoutts Exp $
+
+  20 Feb 2006; <duncan@gentoo.org> +files/gtk2hs-0.9.10-ghc622.patch,
+  gtk2hs-0.9.10.ebuild:
+  Fix building with ghc-6.2.2. Fixes bug #115657.
 
   14 Feb 2006; <duncan@gentoo.org> +files/gtk2hs-0.9.10-cflags.patch,
   gtk2hs-0.9.10.ebuild:
diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index a16d22f0b366..b5dc4f305f44 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,19 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 89ba8ce13b0c7d70c41cb8932023036e ChangeLog 2864
-MD5 8319243ace207791970c6cd5b177f097 files/digest-gtk2hs-0.9.10 65
+MD5 8eda91ad94e64aa34243be7c6fd2daa9 ChangeLog 3009
+RMD160 0b7560516c906a47ef3962267f2ed46f17f31554 ChangeLog 3009
+SHA256 80843ad70129c678bca5743f71e7b5b997fd44f94948b5158e0335de0b1d9c4f ChangeLog 3009
+MD5 d165e3eb925c10e6c6316aec5b6b7477 files/digest-gtk2hs-0.9.10 241
+RMD160 935c458d76ad82bde6181be1f45d59deb695926d files/digest-gtk2hs-0.9.10 241
+SHA256 501f52c81b4d0072d05c93246175010dc391d7bf6b3e8b36f3d6eeed99a436bd files/digest-gtk2hs-0.9.10 241
 MD5 a047e2d5a7b724ba3e75c21b0efed475 files/digest-gtk2hs-0.9.7 134
+RMD160 e1ec758e0abe34a420edae46b9d9e4ffc8109315 files/digest-gtk2hs-0.9.7 134
+SHA256 a49e0733cc2bf627019c65c157b510849c9c0a26e6ffcd553a78f0cc3838580f files/digest-gtk2hs-0.9.7 134
 MD5 a0148d13d7414bb83ec383c7124ea654 files/digest-gtk2hs-0.9.9 64
+RMD160 0363b492a3048160b3ae3cd414bf15e54ef16957 files/digest-gtk2hs-0.9.9 64
+SHA256 6f6c55dfd880134a0fe7d0e247b9244c0c65212f0fa5ec9a42825065e7576dee files/digest-gtk2hs-0.9.9 64
 MD5 a9f993b40c06f3946a5ea7135e753bb3 files/gtk2hs-0.9.10-cflags.patch 1233
-MD5 45115aa419c899aa5e1177b2fa3d0841 gtk2hs-0.9.10.ebuild 3481
+RMD160 eb5cb160a304cc4f5535be9a218549aaaad7c56c files/gtk2hs-0.9.10-cflags.patch 1233
+SHA256 867b3dec0d2d0bea714f85eadcc4825dd1815f021feb53bb070d1f78e330ccef files/gtk2hs-0.9.10-cflags.patch 1233
+MD5 1d88116a10dcaabba0212ade034f0815 files/gtk2hs-0.9.10-ghc622.patch 1440
+RMD160 aa50f1a098efbb464993c2824314f79b58131ead files/gtk2hs-0.9.10-ghc622.patch 1440
+SHA256 48d5b2565eb8a77658f0e6950e021cbf1a0c88ba2810fd8f4ece0c92d4d23b66 files/gtk2hs-0.9.10-ghc622.patch 1440
+MD5 1e37717107b11351074d56db76dae73a gtk2hs-0.9.10.ebuild 3529
+RMD160 d82105f2dd360b6603d217759ac91cf3851e16b5 gtk2hs-0.9.10.ebuild 3529
+SHA256 b30df92437c0b89548567cd1613927eca5feaabbba81c9730b2c10130abd3544 gtk2hs-0.9.10.ebuild 3529
 MD5 1d0ad325305cc65427866006d30132b8 gtk2hs-0.9.7.ebuild 2875
+RMD160 18c5323909695132a3756f030c7c267c5cf3b465 gtk2hs-0.9.7.ebuild 2875
+SHA256 3c77f5f07d69af6e1709844caeba48d77c0caa73d98e06a45fe65bac30e8e3a5 gtk2hs-0.9.7.ebuild 2875
 MD5 05c2042c54431c623ff56c03e7b5c1f1 gtk2hs-0.9.9.ebuild 2698
+RMD160 6df67a58d8596e648acbdf6c2d369bf032f681ba gtk2hs-0.9.9.ebuild 2698
+SHA256 aa1337b8b7f89adb27b00e3ad5f73f20665c61cdd1853c651b82d0b661c9f43c gtk2hs-0.9.9.ebuild 2698
 MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
+RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be metadata.xml 223
+SHA256 8c4b3cde4b0d254edca1f695296876df4ac96ca844d68e8152cfc5f6dbe39792 metadata.xml 223
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD8c5H/B0cxt+cq+wRAphEAKCFpKwPsj2VTrCGkPuhxBCg3kT2dACfREv6
-m+46BPFqe7ozS8tkqFYNH/A=
-=z5ke
+iD8DBQFD+gmc/B0cxt+cq+wRAngKAJ9ZWD5yAtVtAsUTKxMPJZplPd2wwACeLNJT
+L36qQahvXvZlioZKdvclZtk=
+=N17K
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10
index 71d9304cb1dd..7326ea1f2c69 100644
--- a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10
+++ b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10
@@ -1 +1,3 @@
 MD5 13d300e07153f37ba5893ac336b078bc gtk2hs-0.9.10.tar.gz 830866
+RMD160 2b0a5275b43c0b22588028ba7944622ff08fbbb6 gtk2hs-0.9.10.tar.gz 830866
+SHA256 da99b248f3674acba43bd636d1c67813851290ed11860f7f99a44a882cdea924 gtk2hs-0.9.10.tar.gz 830866
diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-ghc622.patch b/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-ghc622.patch
new file mode 100644
index 000000000000..10e9ce8ba527
--- /dev/null
+++ b/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-ghc622.patch
@@ -0,0 +1,33 @@
+diff -urwpN gtk2hs-0.9.10.orig/configure.ac gtk2hs-0.9.10/configure.ac
+--- gtk2hs-0.9.10.orig/configure.ac	2006-02-20 17:30:07.000000000 +0000
++++ gtk2hs-0.9.10/configure.ac	2006-02-20 17:57:55.000000000 +0000
+@@ -381,7 +381,8 @@ dnl bindings for Haskell. So set the GTK
+ dnl appropaiate value to substitute into the gtk package files
+ 
+ if test "$HAVE_GTK_VERSION_2_8" = "yes" -a "$ENABLE_CAIRO" = "yes"; then
+-  GTK_CAIRO_DEPEND=", cairo-${PACKAGE_VERSION}"
++  GTK_CAIRO_DEPEND=", cairo-${PACKAGE_VERSION}";
++  GTK_CAIRO_DEPEND_NO_CABAL=",\"cairo\"";
+ fi
+ 
+ dnl The configuration program for GTK is kind of stupid in that it
+@@ -713,6 +714,7 @@ AC_SUBST(GHCPKG_USE_AUTOLIBS)
+ AC_SUBST(GHCPKG_BUILD_GHCI_LIB)
+ dnl Optional packages
+ AC_SUBST(GTK_CAIRO_DEPEND)
++AC_SUBST(GTK_CAIRO_DEPEND_NO_CABAL)
+ dnl Documentation
+ AC_SUBST(HADDOCK)
+ AC_SUBST(GHC_DOCDIR)
+diff -urwpN gtk2hs-0.9.10.orig/gtk/gtk.pkg.in gtk2hs-0.9.10/gtk/gtk.pkg.in
+--- gtk2hs-0.9.10.orig/gtk/gtk.pkg.in	2006-02-20 17:30:07.000000000 +0000
++++ gtk2hs-0.9.10/gtk/gtk.pkg.in	2006-02-20 17:32:33.000000000 +0000
+@@ -8,7 +8,7 @@ Package {
+      extra_libraries = [@GTK_LIBS_CQ@],
+      include_dirs    = [@GTK_CFLAGS_CQ@],
+      c_includes      = ["gtk/gtk.h"],
+-     package_deps    = ["glib" @GTK_CAIRO_DEPEND@],
++     package_deps    = ["glib" @GTK_CAIRO_DEPEND_NO_CABAL@],
+      extra_ghc_opts  = [],
+      extra_cc_opts   = [],
+      extra_ld_opts   = [@GTK_LIBEXTRA_CQ@]
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
index 8552265dad0d..f0da60bb5f1f 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild,v 1.5 2006/02/14 12:34:00 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild,v 1.6 2006/02/20 18:25:32 dcoutts Exp $
 
 inherit base eutils ghc-package multilib autotools
 
@@ -31,6 +31,7 @@ src_unpack() {
 	base_src_unpack
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-0.9.10-cflags.patch"
+	epatch "${FILESDIR}/${PN}-0.9.10-ghc622.patch"
 }
 
 src_compile() {