Make the wxhaskell package be exposed by default with ghc-6.2.2. Add ~sparc to KEYWORDS. See bug #124902

Package-Manager: portage-2.1_pre5-r4

4 files changed, 30 insertions, 34 deletions

diff --git a/dev-haskell/wash/Manifest b/dev-haskell/wash/Manifest
index c136609c2e7e..cb806182f3e2 100644
--- a/dev-haskell/wash/Manifest
+++ b/dev-haskell/wash/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0b2e31fbdc810e55cca73b33dc279660 ChangeLog 1276
-RMD160 ec45ada63a71135ece966451ac9929c3b49047ee ChangeLog 1276
-SHA256 53e64d786acfd534ba6b7d479092976e349a294ccbfe9f6626eb45873dad909e ChangeLog 1276
+MD5 279faa5bcd920b0cc034d2febe6d9037 ChangeLog 1447
+RMD160 99714e633897bf2ba42833d5a902928ba850a4a5 ChangeLog 1447
+SHA256 e5305be908a18b6958760ccb0e23aecdfd831387d3aa0a58fe6ae78b3d6f20c2 ChangeLog 1447
 MD5 ce436420e114151be54e562439be9a55 files/digest-wash-2.0.6 62
 RMD160 c81584876666b0d50ba96bec98ee823fdaa0f4fb files/digest-wash-2.0.6 62
 SHA256 f745d7a94112c786151648ab5169deee30e1f6006fb0c0ba5fed960d02de81db files/digest-wash-2.0.6 62
@@ -22,13 +19,6 @@ SHA256 0f4e22d87891ecb8814b180e60bd7459a0db8be1e9b1df8a040f402e14930560 wash-2.0
 MD5 00d3e43edc0b378f2e75a709f693c56c wash-2.3.1.ebuild 1384
 RMD160 90d38bb8baca12009ccdad1ea2b5cd1f06619a6a wash-2.3.1.ebuild 1384
 SHA256 6bfbfb8ca3a03c5c31b9ded74cd76523f06008cf55c09078b8859d1121103f78 wash-2.3.1.ebuild 1384
-MD5 f59a977dd30ef91a7aee2660faf5ccc2 wash-2.5.6.ebuild 3337
-RMD160 b90c95b88dab8ab9aa3a0b1ed883fc4b31a42447 wash-2.5.6.ebuild 3337
-SHA256 ec44a01d75ef9688d4f8c8222588c7387f0b0f7991c9aae409f4f507cbce6c9b wash-2.5.6.ebuild 3337
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD/Hq8/B0cxt+cq+wRAs10AKCjKkVGQnR8MbGrrxkbxRwNGe1LWACdEpQY
-nYXLQWpdOurJS4UZOfkIqPY=
-=otQN
------END PGP SIGNATURE-----
+MD5 d7251dc659ef030577e9405172352563 wash-2.5.6.ebuild 3304
+RMD160 60a8b25d70105e104361080e49bcf8f2d747f85c wash-2.5.6.ebuild 3304
+SHA256 dce4d1bce111962f4ee87160c9f5e282216dbab887281e8c3e49968f50b14f42 wash-2.5.6.ebuild 3304
diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index f93a51f80e13..ce7ad1b5dbff 100644
--- a/dev-haskell/wxhaskell/ChangeLog
+++ b/dev-haskell/wxhaskell/ChangeLog
@@ -1,20 +1,24 @@
 # 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.19 2006/02/19 18:50:26 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.20 2006/03/11 11:50:30 dcoutts Exp $
 
-  19 Feb 2006; <duncan@gentoo.org> wxhaskell-0.8-r1.ebuild,
+  10 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> wxhaskell-0.9.4.ebuild:
+  Make the wxhaskell package be exposed by default with ghc-6.2.2
+  Add ~sparc to KEYWORDS. See bug #124902
+
+  19 Feb 2006; <dcoutts@gentoo.org> wxhaskell-0.8-r1.ebuild,
   wxhaskell-0.9.ebuild, wxhaskell-0.9.4.ebuild:
   Masking 0.8-r1 and 0.9 since wxGTK-2.4.x doesn't work due to bug #123323
   Updating all ebuild versions to remove gtk2 USE flag (bug #106560).
   Also add app-arch/unzip to DEPEND (bug #69831)
   Other changes to install location and how the package is registered.
 
-  17 Feb 2006; <duncan@gentoo.org> wxhaskell-0.8-r1.ebuild,
+  17 Feb 2006; <dcoutts@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,
+  16 Feb 2006; <dcoutts@gentoo.org> metadata.xml, wxhaskell-0.8-r1.ebuild,
   wxhaskell-0.9.ebuild, wxhaskell-0.9.4.ebuild:
   Seriously broken on amd64. Temporarily disabling all versions on amd64.
   It appears to install a file as "/usr/lib" which overwrites the /usr/lib
diff --git a/dev-haskell/wxhaskell/Manifest b/dev-haskell/wxhaskell/Manifest
index 2d5967214fd3..0f2f54b7fd77 100644
--- a/dev-haskell/wxhaskell/Manifest
+++ b/dev-haskell/wxhaskell/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9ac9dfcb73672985bf8dd03e469b5a81 ChangeLog 3249
-RMD160 f6b038bb3402b85bb607284f2d1310c7eb868f07 ChangeLog 3249
-SHA256 add7d579cedbf8e806ba24cee44cb274fa0ca9e94c111837168c0edbfc36788f ChangeLog 3249
+MD5 2aaed4b381fbf95c5ebe0b73932c73bb ChangeLog 3435
+RMD160 f0f5d6d88a3d8357becaedabab001979225d1596 ChangeLog 3435
+SHA256 6fb5e4175a9f299226782f048d5c8a5924cdc98234b767f215c9ecf9f8aa66bf ChangeLog 3435
 MD5 045506c36a937e84a6203f2205c9dfd4 files/digest-wxhaskell-0.8-r1 244
 RMD160 396f688c25e1c117f0f3c5a2a8ca372d230db9de files/digest-wxhaskell-0.8-r1 244
 SHA256 4ad92a7532e732e05f38cc736707005c632d6f326ae32a140c705cd9db63e824 files/digest-wxhaskell-0.8-r1 244
@@ -19,16 +19,16 @@ SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata
 MD5 67196ffe4b985a8118e89a0ac673e114 wxhaskell-0.8-r1.ebuild 2859
 RMD160 c7b76e5ce6ce99dbf3a4c0aa9928845d2363bdef wxhaskell-0.8-r1.ebuild 2859
 SHA256 c4cd43db6ff6b65cbf2fac0dbcd78c8f9da8fcc9ce0d6f26efc425405ee93950 wxhaskell-0.8-r1.ebuild 2859
-MD5 b64f100228db701180e2761fb0baf435 wxhaskell-0.9.4.ebuild 2840
-RMD160 60f8d78ae0a4a16ab797a660b22523e772659ebb wxhaskell-0.9.4.ebuild 2840
-SHA256 a26e453fca882f837bf305fa4a109f94c0f5fdb21ca128fc7eb29df7e10d04b7 wxhaskell-0.9.4.ebuild 2840
+MD5 53887ef9622903fd025b45079fcd0542 wxhaskell-0.9.4.ebuild 2953
+RMD160 d8c347bd7d8fe0508edd3b9a92b22756c6e24d7c wxhaskell-0.9.4.ebuild 2953
+SHA256 01a79decd8651bc3a49f0dd9f75157ae7e24c35cf23334395b3b3eaaf344d8de wxhaskell-0.9.4.ebuild 2953
 MD5 40618bf3fcadeef0837c0b8a6c281b64 wxhaskell-0.9.ebuild 2856
 RMD160 bee28d1368b27bedd59168c2d313cc057859628a wxhaskell-0.9.ebuild 2856
 SHA256 4e902a85da1903f6b7678796e2809339947bbb99f0d077e1068ba9c1567f96f1 wxhaskell-0.9.ebuild 2856
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD+L3p/B0cxt+cq+wRApxUAJ4sXpl8RlO1lbOqk3LKMjg3+GQCJgCfe62l
-gSaAgicOqj5lAmhXv07Q3Wk=
-=IvCH
+iD8DBQFEErl2/B0cxt+cq+wRAqEGAKCFgXlmFAICS8dfkNa6wgtjDnqTawCeLr9Q
+KyHqg2okP8OuXbaUVGpuaek=
+=EW44
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
index 271c8783c931..ab41230b8067 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
@@ -1,17 +1,16 @@
 # 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.4 2006/02/19 18:50:26 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.5 2006/03/11 11:50:30 dcoutts Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
 DESCRIPTION="a portable and native GUI library for Haskell"
 HOMEPAGE="http://wxhaskell.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wxhaskell/${PN}-src-${PV}.zip"
+
 LICENSE="wxWinLL-3"
 SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~amd64"
-
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND=">=virtual/ghc-6.2
@@ -93,7 +92,10 @@ src_install() {
 	fi
 
 	# substitute for the ${wxhlibdir} in package files and register them
-	sed -i -e "s:\${wxhlibdir}:${D}/usr/lib/${P}:" ${D}/usr/lib/${P}/*.pkg
+	# for ghc-6.2 change the package to be exposed by default.
+	sed -i -e "s:\${wxhlibdir}:${D}/usr/lib/${P}:" \
+		   -e "s:auto = False:auto = True:" \
+		   ${D}/usr/lib/${P}/*.pkg
 	ghc-setup-pkg ${D}/usr/lib/${P}/*.pkg
 	ghc-install-pkg
 }