From 9165b6e544da166e43fae4542e73fe2d3fff5077 Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Fri, 17 Feb 2006 10:59:58 +0000 Subject: [PATCH] Require that wxGTK was built with USE="X -odbc -unicode". Hopefully this will address bugs #92827 and #110932. Package-Manager: portage-2.1_pre4-r1 --- dev-haskell/wxhaskell/ChangeLog | 7 ++++- dev-haskell/wxhaskell/Manifest | 30 +++++++++---------- dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild | 16 +++++++++- dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild | 16 +++++++++- dev-haskell/wxhaskell/wxhaskell-0.9.ebuild | 16 +++++++++- 5 files changed, 66 insertions(+), 19 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; 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; 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..efcf1412163a 100644 --- a/dev-haskell/wxhaskell/Manifest +++ b/dev-haskell/wxhaskell/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 f09ae412a45ed2414887b3486fa31b4b ChangeLog 2652 -RMD160 b461635e5ab1eb710e520ae68764847f5773a9c7 ChangeLog 2652 -SHA256 1391b4e0767cdc78088d22f950bb91db5a89e5ece7fc68021605734f5c40abf6 ChangeLog 2652 +MD5 1e1737da8cdaf895e424492707277509 ChangeLog 2875 +RMD160 2c91fcbdebc52ec9e6fe446f4a25e4c969838f45 ChangeLog 2875 +SHA256 9f7652a153137d39f66b7ffa460e8d8c2a89c9aa56d5f13c8ea6d0f8f87f4bc9 ChangeLog 2875 MD5 08efb7ecd02832c5599b968bdc329dc9 files/digest-wxhaskell-0.8-r1 66 RMD160 e965d869ae1e7002e54a4daa1aa804b727ddf54f files/digest-wxhaskell-0.8-r1 66 SHA256 9b171172f9fd8956b6c931065ff615fcb578aa81e2ea85794789e1ea7797aeae files/digest-wxhaskell-0.8-r1 66 @@ -16,19 +16,19 @@ 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 +MD5 483ac7de5da8558141720d44ee5989a7 wxhaskell-0.8-r1.ebuild 2503 +RMD160 e2e2b9c5fbc7f42e8cadb290d5b2a16d16eb9da7 wxhaskell-0.8-r1.ebuild 2503 +SHA256 6e2f5b03d4d07e7f62b9edad0ab9dfeda7be9f39f4f4c53aada01d05e192458f wxhaskell-0.8-r1.ebuild 2503 +MD5 e8742d96b05da8eab21d8568042c2be6 wxhaskell-0.9.4.ebuild 2717 +RMD160 9c7fb293bb3794e5ee0723335d8fe96c5bc2a29c wxhaskell-0.9.4.ebuild 2717 +SHA256 ca54cc045b44242c6539f16ff9d06ad714633af466e8a0599b277544e3252905 wxhaskell-0.9.4.ebuild 2717 +MD5 de2ece49471302b30cd04d85fdae4441 wxhaskell-0.9.ebuild 2502 +RMD160 14505b07b3a428894752d2b62dca5e233e3b04f6 wxhaskell-0.9.ebuild 2502 +SHA256 a71e5add4b3f181f4d84bd6ff219f226f95fbcee8d50ee6cbb23b446e3d16314 wxhaskell-0.9.ebuild 2502 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFD9O+d/B0cxt+cq+wRAoi+AKCI9A5oNL1eCaKKjkj9cQHpxxA2MwCcCChO -YflJT7lXo6IlhKH3FcGjn4A= -=hJqM +iD8DBQFD9ay4/B0cxt+cq+wRAtrFAJ9lUIFNBHr2PDvk3Cn8xtoxCNveIQCfUeoj +Wb+P9n22G8anLl1Iucsn/nI= +=AcSX -----END PGP SIGNATURE----- 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 -- 2.26.2