Fix for recent glib that changes the type of the gtype typedef

Package-Manager: portage-2.1.3.16

3 files changed, 39 insertions, 17 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 5810d268fa64..cf85a4d669c5 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.34 2007/10/12 08:41:45 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.35 2007/10/29 06:51:08 araujo Exp $
+
+  29 Oct 2007; Luis F. Araujo <araujo@gentoo.org> gtk2hs-0.9.12.ebuild:
+  Fix for recent glib that changes the type of the gtype typedef
 
   12 Oct 2007; Rémi Cardona <remi@gentoo.org> gtk2hs-0.9.10-r1.ebuild,
   gtk2hs-0.9.11.ebuild, gtk2hs-0.9.12.ebuild:
diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index 5692f764e22b..94cb4136cf6c 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk2hs-0.9.10-cflags.patch 1233 RMD160 eb5cb160a304cc4f5535be9a218549aaaad7c56c SHA1 68f3d351fa801f77f3ebce853919b604fbb26b18 SHA256 867b3dec0d2d0bea714f85eadcc4825dd1815f021feb53bb070d1f78e330ccef
 MD5 a9f993b40c06f3946a5ea7135e753bb3 files/gtk2hs-0.9.10-cflags.patch 1233
 RMD160 eb5cb160a304cc4f5535be9a218549aaaad7c56c files/gtk2hs-0.9.10-cflags.patch 1233
@@ -21,14 +24,14 @@ EBUILD gtk2hs-0.9.11.ebuild 3090 RMD160 31838bcb1080634a42a97d732870b2ae8cf515d2
 MD5 4926e9a61a21e2416124539cc26241d7 gtk2hs-0.9.11.ebuild 3090
 RMD160 31838bcb1080634a42a97d732870b2ae8cf515d2 gtk2hs-0.9.11.ebuild 3090
 SHA256 554a1b2341e13851d4c01327839a44a16e637f1f449b6f0b18f07f887e55ed38 gtk2hs-0.9.11.ebuild 3090
-EBUILD gtk2hs-0.9.12.ebuild 3090 RMD160 efe348145bb0b1a66fd011a4d97128e937f47c90 SHA1 2d019c99ac9a2216a273f21516bd2efa9d5fb275 SHA256 81a897d5f409c4816007e95f943d87f349d3475c7a19a669cdc803b5188db5b8
-MD5 8a72eac83d39a063e7b83bf57f3aeeb9 gtk2hs-0.9.12.ebuild 3090
-RMD160 efe348145bb0b1a66fd011a4d97128e937f47c90 gtk2hs-0.9.12.ebuild 3090
-SHA256 81a897d5f409c4816007e95f943d87f349d3475c7a19a669cdc803b5188db5b8 gtk2hs-0.9.12.ebuild 3090
-MISC ChangeLog 4673 RMD160 b4950bd8fc23776ef77ca5e26adab7da75d2fce7 SHA1 338fc9028f89d7ae836503fbe76ccdb4269f484c SHA256 37a47a839bb512e483f647323e80fcafc415dc048c9d8789b99ffcdf5bebdc29
-MD5 c130e06712ae7de8f63a64822a090b98 ChangeLog 4673
-RMD160 b4950bd8fc23776ef77ca5e26adab7da75d2fce7 ChangeLog 4673
-SHA256 37a47a839bb512e483f647323e80fcafc415dc048c9d8789b99ffcdf5bebdc29 ChangeLog 4673
+EBUILD gtk2hs-0.9.12.ebuild 3319 RMD160 b9e7d5350797aba1ce22e0a6e9d7f5d28f209e61 SHA1 6de28188e5900062547c7b01b2b9f109693b297e SHA256 d64fe21ff5b7c350573517687fbb5e22aa185cce6edd6a19a26009ffa19e13bf
+MD5 f7e21163c06acbc38f1e86510193c8c7 gtk2hs-0.9.12.ebuild 3319
+RMD160 b9e7d5350797aba1ce22e0a6e9d7f5d28f209e61 gtk2hs-0.9.12.ebuild 3319
+SHA256 d64fe21ff5b7c350573517687fbb5e22aa185cce6edd6a19a26009ffa19e13bf gtk2hs-0.9.12.ebuild 3319
+MISC ChangeLog 4813 RMD160 b56c5276c303d56bf3c9905884accc44b119185c SHA1 dafcee2b187984fde67cb826f867e7edeb329bd8 SHA256 34a9f8590fa639e4824d7d4fcca87d7ac7201e3695e62897dbfc3c8983b39ee0
+MD5 328a6d3ec4d27f85cff4126f8dce6024 ChangeLog 4813
+RMD160 b56c5276c303d56bf3c9905884accc44b119185c ChangeLog 4813
+SHA256 34a9f8590fa639e4824d7d4fcca87d7ac7201e3695e62897dbfc3c8983b39ee0 ChangeLog 4813
 MISC metadata.xml 223 RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be SHA1 3be3a7139f7e71b712959fb7465f73d1bcb6ba07 SHA256 8c4b3cde4b0d254edca1f695296876df4ac96ca844d68e8152cfc5f6dbe39792
 MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
 RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be metadata.xml 223
@@ -42,3 +45,10 @@ SHA256 7eab83713a72a347386048baa114234bd534649f3922e492185a866a994aa970 files/di
 MD5 fadc6b41161855b94e3613e416fb4753 files/digest-gtk2hs-0.9.12 241
 RMD160 2987165e22784b9c2da37bbeb59c144428ea0fde files/digest-gtk2hs-0.9.12 241
 SHA256 01706b1a5b475ce0f70a53d4786f06144357c315d88f57609d5dad0336487966 files/digest-gtk2hs-0.9.12 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHJYEdBCmRZan6aegRAhbwAKDacrqMZTifDyttj46O711Yb3IXaQCglJnG
+vnqlNK1XjK5/X/HHsta01iE=
+=mfow
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
index b7320d9e58d2..509c4d60ddd6 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v 1.2 2007/10/12 08:41:45 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v 1.3 2007/10/29 06:51:08 araujo Exp $
 
 inherit base eutils ghc-package multilib toolchain-funcs versionator
 
@@ -12,16 +12,16 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="doc glade gnome opengl firefox seamonkey profile xulrunner"
+IUSE="doc glade gnome opengl svg firefox seamonkey profile xulrunner"
 
 RDEPEND=">=dev-lang/ghc-6.2
 		dev-haskell/mtl
 		>=x11-libs/gtk+-2
 		glade? ( >=gnome-base/libglade-2 )
 		gnome? ( >=gnome-base/libglade-2
-				 =x11-libs/gtksourceview-1*
-				 >=gnome-base/gconf-2
-				 >=gnome-base/librsvg-2.16 )
+				>=x11-libs/gtksourceview-0.6
+				>=gnome-base/gconf-2 )
+		svg?   ( >=gnome-base/librsvg-2.16 )
 		opengl? ( x11-libs/gtkglext )
 		seamonkey? ( >=www-client/seamonkey-1.0.2 )
 		firefox? ( >=www-client/mozilla-firefox-1.0.4 )
@@ -29,6 +29,14 @@ RDEPEND=">=dev-lang/ghc-6.2
 DEPEND="${RDEPEND}
 		doc? ( >=dev-haskell/haddock-0.8 )"
 
+src_unpack() {
+	unpack "${A}"
+
+	# Fix for recent glib that changes the type of the gtype typedef:
+	sed -i -e 's/(CULong)/(CULong, CUInt)/' \
+		"${S}/tools/hierarchyGen/Hierarchy.chs.template"
+}
+
 src_compile() {
 	econf \
 		--enable-packager-mode \
@@ -38,7 +46,7 @@ src_compile() {
 		$(use glade || use gnome && echo --enable-libglade) \
 		$(use_enable gnome gconf) \
 		$(use_enable gnome sourceview) \
-		$(use_enable gnome svg) \
+		$(use_enable svg svg) \
 		$(use_enable opengl opengl) \
 		$(use_enable seamonkey seamonkey) \
 		$(use_enable firefox firefox) \
@@ -85,8 +93,9 @@ src_install() {
 			"${D}/usr/$(get_libdir)/gtk2hs/glade.${pkgext}") \
 		$(use gnome && echo \
 			"${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
-			"${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}" \
-			"${D}/usr/$(get_libdir)/gtk2hs/svgcairo.${pkgext}") \
+			"${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}" ) \
+		$(use svg && echo \
+			"${D}/usr/$(get_libdir)/gtk2hs/svgcairo.${pkgext}")
 		$(use opengl && echo \
 			"${D}/usr/$(get_libdir)/gtk2hs/gtkglext.${pkgext}") \
 		$(use seamonkey || use firefox || use xulrunner && echo \