Require that wxGTK was built with USE="X -odbc -unicode". Hopefully this will address bugs #92827 and #110932.

(Portage version: 2.1_pre4-r1)

5 files changed, 60 insertions, 23 deletions

diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index 0d11ce99599f..cefcebf21f12 100644
--- a/dev-haskell/wxhaskell/ChangeLog
+++ b/dev-haskell/wxhaskell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/wxhaskell
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.17 2006/02/16 21:33:07 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.18 2006/02/17 10:59:58 dcoutts Exp $
+
+  17 Feb 2006; <duncan@gentoo.org> wxhaskell-0.8-r1.ebuild,
+  wxhaskell-0.9.ebuild, wxhaskell-0.9.4.ebuild:
+  Require that wxGTK was built with USE="X -odbc -unicode"
+  Hopefully this will address bugs #92827 and #110932.
 
   16 Feb 2006; <duncan@gentoo.org> metadata.xml, wxhaskell-0.8-r1.ebuild,
   wxhaskell-0.9.ebuild, wxhaskell-0.9.4.ebuild:
diff --git a/dev-haskell/wxhaskell/Manifest b/dev-haskell/wxhaskell/Manifest
index a608c07b5e99..9d19a46aaff4 100644
--- a/dev-haskell/wxhaskell/Manifest
+++ b/dev-haskell/wxhaskell/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f09ae412a45ed2414887b3486fa31b4b ChangeLog 2652
 RMD160 b461635e5ab1eb710e520ae68764847f5773a9c7 ChangeLog 2652
 SHA256 1391b4e0767cdc78088d22f950bb91db5a89e5ece7fc68021605734f5c40abf6 ChangeLog 2652
@@ -16,19 +13,12 @@ SHA256 38ad5e3401720ff06d5eead8cd11d7646b4f6ee7c896d1b191d9d5b68077f7d0 files/di
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
-MD5 425a21f8b298709e5cb2a533e4420b3b wxhaskell-0.8-r1.ebuild 1887
-RMD160 8039e1a5c99c5830f7857952c490c0cdbd9ed237 wxhaskell-0.8-r1.ebuild 1887
-SHA256 222632aba332451e2b8a52c173e614f023432235d9db883f6ea55dbbaafc7595 wxhaskell-0.8-r1.ebuild 1887
-MD5 1a27807114c1545a0ff5e386d74204b6 wxhaskell-0.9.4.ebuild 2101
-RMD160 e837721b30b8ab630f8a6bb2ecd30e389fde11c6 wxhaskell-0.9.4.ebuild 2101
-SHA256 7b86c422fbbeb36fbd357a0473ca1944ff3c8e5465d007b26311d25e79b47ed7 wxhaskell-0.9.4.ebuild 2101
-MD5 8c6dcffe03a18fe44edf0a3cdba6a8e7 wxhaskell-0.9.ebuild 1886
-RMD160 db0c8cd3977a594a096ba400769d935af63e03ae wxhaskell-0.9.ebuild 1886
-SHA256 f65b6af8c0abc431dbcfb321401a1da9217b4b9493bcaa4ae1165e5f1d0882aa wxhaskell-0.9.ebuild 1886
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD9O+d/B0cxt+cq+wRAoi+AKCI9A5oNL1eCaKKjkj9cQHpxxA2MwCcCChO
-YflJT7lXo6IlhKH3FcGjn4A=
-=hJqM
------END PGP SIGNATURE-----
+MD5 1647fb3d083b2d78cae2213f3d7dd483 wxhaskell-0.8-r1.ebuild 2503
+RMD160 e87d91ea3a350f47618c6d95c1fc186a8e126466 wxhaskell-0.8-r1.ebuild 2503
+SHA256 a6d99d5e65d726561b5cfdd77fe8297014b13f6b734837584b26a5124ad52494 wxhaskell-0.8-r1.ebuild 2503
+MD5 9089630404120137ce0db9e5c2e19b73 wxhaskell-0.9.4.ebuild 2717
+RMD160 e4aaefc266cc733845eb0935cd41365e9f07a18d wxhaskell-0.9.4.ebuild 2717
+SHA256 9551936b0d96d124b85a75f254a35887bc0a63efdb36d03f4215ea4f0a76e17a wxhaskell-0.9.4.ebuild 2717
+MD5 471e04dffd329843cde93daeab9ecc04 wxhaskell-0.9.ebuild 2502
+RMD160 99b1d67078594420bf09aff66df2e025963310f7 wxhaskell-0.9.ebuild 2502
+SHA256 8e1f7fabc0d03558ab3de1b406897e2d6a756158dd99648661c45413f059c496 wxhaskell-0.9.ebuild 2502
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild
index 1cb8cee2f792..433ffdae0f77 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.8-r1.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/wxhaskell/wxhaskell-0.8-r1.ebuild,v 1.6 2006/02/16 21:33:07 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild,v 1.7 2006/02/17 10:59:58 dcoutts Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
@@ -21,6 +21,20 @@ DEPEND="${DEPEND}
 	>=x11-libs/wxGTK-2.4.2-r2
 	doc? ( >=dev-haskell/haddock-0.6-r2 )"
 
+pkg_setup() {
+	if ! built_with_use x11-libs/wxGTK X; then
+		einfo "wxhaskell needs wxGTK that has been built with X11 support."
+		einfo "Please re-emerge wxGTK with USE=\"X -odbc -unicode\""
+		die "wxhaskell requires wxGTK to be built with USE=\"X -odbc -unicode\""
+	fi
+	if built_with_use x11-libs/wxGTK odbc || built_with_use x11-libs/wxGTK unicode; then
+		einfo "Sadly wxhaskell does not work with wxGTK that has been built"
+		einfo "with USE=\"odbc\" or USE=\"unicode\"."
+		einfo "Please re-emerge wxGTK with USE=\"-odbc -unicode\""
+		die "wxhaskell requires wxGTK to be built with USE=\"-odbc -unicode\""
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	# adapt to Gentoo path convention
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
index c7da799f7e61..34de5b50911f 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.9.4.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/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.2 2006/02/16 21:33:07 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.3 2006/02/17 10:59:58 dcoutts Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
@@ -20,6 +20,20 @@ DEPEND="${DEPEND}
 	>=x11-libs/wxGTK-2.4.2
 	doc? ( >=dev-haskell/haddock-0.6-r2 )"
 
+pkg_setup() {
+	if ! built_with_use x11-libs/wxGTK X; then
+		einfo "wxhaskell needs wxGTK that has been built with X11 support."
+		einfo "Please re-emerge wxGTK with USE=\"X -odbc -unicode\""
+		die "wxhaskell requires wxGTK to be built with USE=\"X -odbc -unicode\""
+	fi
+	if built_with_use x11-libs/wxGTK odbc || built_with_use x11-libs/wxGTK unicode; then
+		einfo "Sadly wxhaskell does not work with wxGTK that has been built"
+		einfo "with USE=\"odbc\" or USE=\"unicode\"."
+		einfo "Please re-emerge wxGTK with USE=\"-odbc -unicode\""
+		die "wxhaskell requires wxGTK to be built with USE=\"-odbc -unicode\""
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	# adapt to Gentoo path convention
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild
index e473b2899758..efde709e28cd 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.9.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/wxhaskell/wxhaskell-0.9.ebuild,v 1.3 2006/02/16 21:33:07 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild,v 1.4 2006/02/17 10:59:58 dcoutts Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
@@ -21,6 +21,20 @@ DEPEND="${DEPEND}
 	>=x11-libs/wxGTK-2.4.2-r2
 	doc? ( >=dev-haskell/haddock-0.6-r2 )"
 
+pkg_setup() {
+	if ! built_with_use x11-libs/wxGTK X; then
+		einfo "wxhaskell needs wxGTK that has been built with X11 support."
+		einfo "Please re-emerge wxGTK with USE=\"X -odbc -unicode\""
+		die "wxhaskell requires wxGTK to be built with USE=\"X -odbc -unicode\""
+	fi
+	if built_with_use x11-libs/wxGTK odbc || built_with_use x11-libs/wxGTK unicode; then
+		einfo "Sadly wxhaskell does not work with wxGTK that has been built"
+		einfo "with USE=\"odbc\" or USE=\"unicode\"."
+		einfo "Please re-emerge wxGTK with USE=\"-odbc -unicode\""
+		die "wxhaskell requires wxGTK to be built with USE=\"-odbc -unicode\""
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	# adapt to Gentoo path convention