Masking 0.8-r1 and 0.9 since wxGTK-2.4.x doesn't work due to bug #123323

Package-Manager: portage-2.1_pre4-r1

7 files changed, 131 insertions, 99 deletions

diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index cefcebf21f12..f93a51f80e13 100644
--- a/dev-haskell/wxhaskell/ChangeLog
+++ b/dev-haskell/wxhaskell/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2006/02/17 10:59:58 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.19 2006/02/19 18:50:26 dcoutts Exp $
+
+  19 Feb 2006; <duncan@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,
   wxhaskell-0.9.ebuild, wxhaskell-0.9.4.ebuild:
diff --git a/dev-haskell/wxhaskell/Manifest b/dev-haskell/wxhaskell/Manifest
index efcf1412163a..2d5967214fd3 100644
--- a/dev-haskell/wxhaskell/Manifest
+++ b/dev-haskell/wxhaskell/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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
-MD5 252f6e6df89834ca7cc1f0b68cecbd3c files/digest-wxhaskell-0.9 66
-RMD160 32aef4fcf5a09906a33feb665bf9c3fd8a94f4f9 files/digest-wxhaskell-0.9 66
-SHA256 0a9085cb68f9626940939dc6a297436aa9733c866419168022414b2283e09bca files/digest-wxhaskell-0.9 66
+MD5 9ac9dfcb73672985bf8dd03e469b5a81 ChangeLog 3249
+RMD160 f6b038bb3402b85bb607284f2d1310c7eb868f07 ChangeLog 3249
+SHA256 add7d579cedbf8e806ba24cee44cb274fa0ca9e94c111837168c0edbfc36788f ChangeLog 3249
+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
+MD5 0353b85e538ad092f04792a6c0ab31f2 files/digest-wxhaskell-0.9 244
+RMD160 ad01c1ee971663b76f91e3689d1fbe326293eed5 files/digest-wxhaskell-0.9 244
+SHA256 0fa6e1bcccc39b28f68aed38d9f800f7f52668df7b588afa3b8c4f932e6a4346 files/digest-wxhaskell-0.9 244
 MD5 d65df2d0e35a232f916aa03605183014 files/digest-wxhaskell-0.9.4 250
 RMD160 44e2bab5fe15dc3bc1c736c008068884ad674953 files/digest-wxhaskell-0.9.4 250
 SHA256 38ad5e3401720ff06d5eead8cd11d7646b4f6ee7c896d1b191d9d5b68077f7d0 files/digest-wxhaskell-0.9.4 250
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
-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
+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 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)
 
-iD8DBQFD9ay4/B0cxt+cq+wRAtrFAJ9lUIFNBHr2PDvk3Cn8xtoxCNveIQCfUeoj
-Wb+P9n22G8anLl1Iucsn/nI=
-=AcSX
+iD8DBQFD+L3p/B0cxt+cq+wRApxUAJ4sXpl8RlO1lbOqk3LKMjg3+GQCJgCfe62l
+gSaAgicOqj5lAmhXv07Q3Wk=
+=IvCH
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1
index e1024cadae05..ba586abd8d53 100644
--- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1
+++ b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1
@@ -1 +1,3 @@
 MD5 40e9765fbab3ace2cfdd1fe5571ceaec wxhaskell-src-0.8.zip 545291
+RMD160 6802992948677663e4543070875963a7932ee99a wxhaskell-src-0.8.zip 545291
+SHA256 81527b40468a87183c2d7d46cc0b1fa886caaad3abb5c0ae7b8c57eb875824b0 wxhaskell-src-0.8.zip 545291
diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9
index 94e2db72d49a..ef1b1582cfed 100644
--- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9
+++ b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9
@@ -1 +1,3 @@
 MD5 d510ba16540e280093edd2ee50d43f3e wxhaskell-src-0.9.zip 564588
+RMD160 9509c0da854abb4b6f82a0585968832c892efaec wxhaskell-src-0.9.zip 564588
+SHA256 5794a9fe1023b07bcd53459f81751157643cc129e712b2cda657065e3cb769b7 wxhaskell-src-0.9.zip 564588
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild
index 433ffdae0f77..2d4d818af6d0 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.7 2006/02/17 10:59:58 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild,v 1.8 2006/02/19 18:50:26 dcoutts Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
@@ -10,15 +10,16 @@ SRC_URI="mirror://sourceforge/wxhaskell/${PN}-src-${PV}.zip"
 LICENSE="wxWinLL-3"
 SLOT="0"
 
-KEYWORDS="x86 ppc -amd64"
-# potentially seriously broken on amd64, check carefully before re-enabling.
+KEYWORDS="~x86 ~ppc -amd64"
 
-IUSE="doc gtk2"
+IUSE="doc"
 
-DEPEND="${DEPEND}
-	>=virtual/ghc-6.2
+RDEPEND=">=virtual/ghc-6.2
 	!>=virtual/ghc-6.4
-	>=x11-libs/wxGTK-2.4.2-r2
+	=x11-libs/wxGTK-2.4*"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
 	doc? ( >=dev-haskell/haddock-0.6-r2 )"
 
 pkg_setup() {
@@ -27,11 +28,11 @@ pkg_setup() {
 		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
+	if built_with_use x11-libs/wxGTK odbc; 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\""
+		einfo "with USE=\"odbc\"."
+		einfo "Please re-emerge wxGTK with USE=\"-odbc\""
+		die "wxhaskell requires wxGTK to be built with USE=\"-odbc\""
 	fi
 }
 
@@ -39,31 +40,31 @@ src_unpack() {
 	unpack ${A}
 	# adapt to Gentoo path convention
 	sed -i 's:/doc/html:/share/doc/html:' ${S}/configure
+	# fix superfluous dependencies on hslibs packages
+	sed -i -e 's:,lang::' -e 's:,"lang"::' \
+		-e 's:,concurrent::' -e 's:,"concurrent"::' ${S}/configure
 	# fix Makefile to respect CXXFLAGS
 	sed -i 's:^\(WXC-CXXFLAGS.*=\):\1\$(CXXFLAGS) :' ${S}/makefile
 }
 
 src_compile() {
-	local wxconfig
 	ghc-setup-pkg
 
-	#wxhaskell supports gtk or gtk2, but not unicode yet:
-	if ! use gtk2; then
-		need-wxwidgets gtk
-	else
-		need-wxwidgets gtk2
-	fi
+	#wxhaskell supports gtk or gtk2, but not unicode yet. However since the gtk2
+	#USE flag is deprecated we now only build with gtk2:
+	WX_GTK_VER=2.4
+	need-wxwidgets gtk2
 
-	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+	# every C compiler result ends up in a shared lib
+	append-flags -fPIC
 
 	# non-standard configure, so econf is not an option
-	wxconfig="${WX_CONFIG}"
 	# --wx-config must appear first according to configure file comments 
 	./configure \
-		--wx-config=${wxconfig} \
-		--prefix=${D}/usr \
+		--wx-config="${WX_CONFIG}" \
+		--prefix=/usr \
 		--with-opengl \
-		--libdir=${D}/$(ghc-libdir) \
+		--libdir=/usr/lib/${P} \
 		--package-conf=${S}/$(ghc-localpkgconf) \
 		|| die "./configure failed"
 
@@ -77,9 +78,14 @@ src_compile() {
 
 src_install() {
 	local f
-	emake -j1 install || die "make install failed"
-	for f in ${D}/$(ghc-libdir)/libwxc-*.so; do
-		mv ${f} ${D}/usr/lib
+
+	# don't register the packages, just install the files
+	emake -j1 install-files DESTDIR="${D}" || die "make install failed"
+
+	# the .so needs to be on the lib path
+	mkdir -p ${D}/usr/lib
+	for f in ${D}/usr/lib/${P}/libwxc-*.so; do
+		mv ${f} ${D}/usr/lib/
 	done
 
 	if use doc; then
@@ -87,5 +93,8 @@ src_install() {
 		cp -r samples ${D}/usr/share/doc/${PF}
 	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
+	ghc-setup-pkg ${D}/usr/lib/${P}/*.pkg
 	ghc-install-pkg
 }
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
index 34de5b50911f..271c8783c931 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.3 2006/02/17 10:59:58 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.4 2006/02/19 18:50:26 dcoutts Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
@@ -10,14 +10,15 @@ SRC_URI="mirror://sourceforge/wxhaskell/${PN}-src-${PV}.zip"
 LICENSE="wxWinLL-3"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc -amd64"
-# seriously broken on amd64! Do not touch!
+KEYWORDS="~x86 ~ppc ~amd64"
 
-IUSE="doc gtk2"
+IUSE="doc"
 
-DEPEND="${DEPEND}
-	>=virtual/ghc-6.2
-	>=x11-libs/wxGTK-2.4.2
+RDEPEND=">=virtual/ghc-6.2
+	>=x11-libs/wxGTK-2.6.2"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
 	doc? ( >=dev-haskell/haddock-0.6-r2 )"
 
 pkg_setup() {
@@ -26,11 +27,11 @@ pkg_setup() {
 		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
+	if built_with_use x11-libs/wxGTK odbc; 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\""
+		einfo "with USE=\"odbc\"."
+		einfo "Please re-emerge wxGTK with USE=\"-odbc\""
+		die "wxhaskell requires wxGTK to be built with USE=\"-odbc\""
 	fi
 }
 
@@ -46,18 +47,12 @@ src_unpack() {
 }
 
 src_compile() {
-	# use the highest possible wxGTK version, i.e., 2.6 by default
-	if has_version '>=x11-libs/wxGTK-2.6'; then
-		WX_GTK_VER=2.6
-	fi
 	ghc-setup-pkg
 
-	#wxhaskell supports gtk or gtk2, but not unicode yet:
-	if ! use gtk2; then
-		need-wxwidgets gtk
-	else
-		need-wxwidgets gtk2
-	fi
+	#wxhaskell supports gtk or gtk2, but not unicode yet. However since the gtk2
+	#USE flag is deprecated we now only build with gtk2:
+	WX_GTK_VER=2.6
+	need-wxwidgets gtk2
 
 	# every C compiler result ends up in a shared lib
 	append-flags -fPIC
@@ -66,9 +61,9 @@ src_compile() {
 	# --wx-config must appear first according to configure file comments 
 	./configure \
 		--wx-config="${WX_CONFIG}" \
-		--prefix=${D}/usr \
+		--prefix=/usr \
 		--with-opengl \
-		--libdir=${D}/$(ghc-libdir) \
+		--libdir=/usr/lib/${P} \
 		--package-conf=${S}/$(ghc-localpkgconf) \
 		|| die "./configure failed"
 
@@ -82,9 +77,14 @@ src_compile() {
 
 src_install() {
 	local f
-	emake -j1 install || die "make install failed"
-	for f in ${D}/$(ghc-libdir)/libwxc-*.so; do
-		mv ${f} ${D}/usr/lib
+
+	# don't register the packages, just install the files
+	emake -j1 install-files DESTDIR="${D}" || die "make install failed"
+
+	# the .so needs to be on the lib path
+	mkdir -p ${D}/usr/lib
+	for f in ${D}/usr/lib/${P}/libwxc-*.so; do
+		mv ${f} ${D}/usr/lib/
 	done
 
 	if use doc; then
@@ -92,5 +92,8 @@ src_install() {
 		cp -r samples ${D}/usr/share/doc/${PF}
 	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
+	ghc-setup-pkg ${D}/usr/lib/${P}/*.pkg
 	ghc-install-pkg
 }
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild
index efde709e28cd..8e69bfde1aa0 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.4 2006/02/17 10:59:58 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild,v 1.5 2006/02/19 18:50:26 dcoutts Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
@@ -11,14 +11,15 @@ LICENSE="wxWinLL-3"
 SLOT="0"
 
 KEYWORDS="~x86 ~ppc -amd64"
-# potentially seriously broken on amd64, check carefully before re-enabling.
 
-IUSE="doc gtk2"
+IUSE="doc"
 
-DEPEND="${DEPEND}
-	>=virtual/ghc-6.2
+RDEPEND=">=virtual/ghc-6.2
 	!>=virtual/ghc-6.4
-	>=x11-libs/wxGTK-2.4.2-r2
+	=x11-libs/wxGTK-2.4*"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
 	doc? ( >=dev-haskell/haddock-0.6-r2 )"
 
 pkg_setup() {
@@ -27,11 +28,11 @@ pkg_setup() {
 		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
+	if built_with_use x11-libs/wxGTK odbc; 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\""
+		einfo "with USE=\"odbc\"."
+		einfo "Please re-emerge wxGTK with USE=\"-odbc\""
+		die "wxhaskell requires wxGTK to be built with USE=\"-odbc\""
 	fi
 }
 
@@ -39,31 +40,31 @@ src_unpack() {
 	unpack ${A}
 	# adapt to Gentoo path convention
 	sed -i 's:/doc/html:/share/doc/html:' ${S}/configure
+	# fix superfluous dependencies on hslibs packages
+	sed -i -e 's:,lang::' -e 's:,"lang"::' \
+		-e 's:,concurrent::' -e 's:,"concurrent"::' ${S}/configure
 	# fix Makefile to respect CXXFLAGS
 	sed -i 's:^\(WXC-CXXFLAGS.*=\):\1\$(CXXFLAGS) :' ${S}/makefile
 }
 
 src_compile() {
-	local wxconfig
 	ghc-setup-pkg
 
-	#wxhaskell supports gtk or gtk2, but not unicode yet:
-	if ! use gtk2; then
-		need-wxwidgets gtk
-	else
-		need-wxwidgets gtk2
-	fi
+	#wxhaskell supports gtk or gtk2, but not unicode yet. However since the gtk2
+	#USE flag is deprecated we now only build with gtk2:
+	WX_GTK_VER=2.4
+	need-wxwidgets gtk2
 
-	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+	# every C compiler result ends up in a shared lib
+	append-flags -fPIC
 
 	# non-standard configure, so econf is not an option
-	wxconfig="${WX_CONFIG}"
 	# --wx-config must appear first according to configure file comments 
 	./configure \
-		--wx-config=${wxconfig} \
-		--prefix=${D}/usr \
+		--wx-config="${WX_CONFIG}" \
+		--prefix=/usr \
 		--with-opengl \
-		--libdir=${D}/$(ghc-libdir) \
+		--libdir=/usr/lib/${P} \
 		--package-conf=${S}/$(ghc-localpkgconf) \
 		|| die "./configure failed"
 
@@ -77,9 +78,14 @@ src_compile() {
 
 src_install() {
 	local f
-	emake -j1 install || die "make install failed"
-	for f in ${D}/$(ghc-libdir)/libwxc-*.so; do
-		mv ${f} ${D}/usr/lib
+
+	# don't register the packages, just install the files
+	emake -j1 install-files DESTDIR="${D}" || die "make install failed"
+
+	# the .so needs to be on the lib path
+	mkdir -p ${D}/usr/lib
+	for f in ${D}/usr/lib/${P}/libwxc-*.so; do
+		mv ${f} ${D}/usr/lib/
 	done
 
 	if use doc; then
@@ -87,5 +93,8 @@ src_install() {
 		cp -r samples ${D}/usr/share/doc/${PF}
 	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
+	ghc-setup-pkg ${D}/usr/lib/${P}/*.pkg
 	ghc-install-pkg
 }