Remove old versions that depend on wxGTK-2.4. Fixes bug #164145.

Package-Manager: portage-2.1.2-r4

6 files changed, 13 insertions, 231 deletions

diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index efe6ab28795f..2c727c9a1adb 100644
--- a/dev-haskell/wxhaskell/ChangeLog
+++ b/dev-haskell/wxhaskell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/wxhaskell
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.22 2007/01/06 18:11:19 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.23 2007/01/29 12:11:47 dcoutts Exp $
+
+  28 Jan 2007; Duncan Coutts <dcoutts@gentoo.org> -wxhaskell-0.8-r1.ebuild,
+  -wxhaskell-0.9.ebuild:
+  Remove old versions that depend on wxGTK-2.4. Fixes bug #164145.
 
   06 Jan 2007; Andres Loeh <kosmikus@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 dc82c7efe4f8..ad55748208b8 100644
--- a/dev-haskell/wxhaskell/Manifest
+++ b/dev-haskell/wxhaskell/Manifest
@@ -1,42 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST wxhaskell-src-0.8.zip 545291 RMD160 6802992948677663e4543070875963a7932ee99a SHA1 415dd824e5bd60d6cca97d9545327fd5b80c28c7 SHA256 81527b40468a87183c2d7d46cc0b1fa886caaad3abb5c0ae7b8c57eb875824b0
 DIST wxhaskell-src-0.9.4.zip 569954 RMD160 70c386cb2451509dbd5bca652435bab35b808ed1 SHA1 6133991fb1e6c76a3b5b2bf175277ce56c2adad3 SHA256 586ad7eb706442e44c070455b32800ba2a5e24a67ffd5b90a9aa4f803238fdcd
-DIST wxhaskell-src-0.9.zip 564588 RMD160 9509c0da854abb4b6f82a0585968832c892efaec SHA1 a4c3a38214efa03b33550f9cc50614294932ff61 SHA256 5794a9fe1023b07bcd53459f81751157643cc129e712b2cda657065e3cb769b7
-EBUILD wxhaskell-0.8-r1.ebuild 2865 RMD160 904a2113033afc09d80dabc9cfd9ff8164a27981 SHA1 5ebbf92c191d95a53cfdfc5e61feea8c338f160c SHA256 703b248a502b1de83432588cc099893b2e5dfcc72be9b68bb421023a616d2c8b
-MD5 3d23159a7aad62b1719b67b984511236 wxhaskell-0.8-r1.ebuild 2865
-RMD160 904a2113033afc09d80dabc9cfd9ff8164a27981 wxhaskell-0.8-r1.ebuild 2865
-SHA256 703b248a502b1de83432588cc099893b2e5dfcc72be9b68bb421023a616d2c8b wxhaskell-0.8-r1.ebuild 2865
 EBUILD wxhaskell-0.9.4.ebuild 3038 RMD160 19f3b9d874374586d2e6526cc7de3f686437315c SHA1 4f27100ab59be50680c919393b8ae351ce31d6ee SHA256 a1e3ddefb049c27524a8176e93b6ab5d73a263cc25dcc261a4eb4353f73d65fb
 MD5 27f65922a3d1c095de95d89d10db5e4d wxhaskell-0.9.4.ebuild 3038
 RMD160 19f3b9d874374586d2e6526cc7de3f686437315c wxhaskell-0.9.4.ebuild 3038
 SHA256 a1e3ddefb049c27524a8176e93b6ab5d73a263cc25dcc261a4eb4353f73d65fb wxhaskell-0.9.4.ebuild 3038
-EBUILD wxhaskell-0.9.ebuild 2862 RMD160 d8465ba373703b2721fea6c550e1d14f9cdfb7bc SHA1 79c75274fea7f0d1b76483d05ded1ad9a6c99f40 SHA256 aab2fcfb1fc43f09a8870ed609ee0a2763700329f07f12f1977007c52da684aa
-MD5 8c0b78d13fd55362df4fa87d68b1f64a wxhaskell-0.9.ebuild 2862
-RMD160 d8465ba373703b2721fea6c550e1d14f9cdfb7bc wxhaskell-0.9.ebuild 2862
-SHA256 aab2fcfb1fc43f09a8870ed609ee0a2763700329f07f12f1977007c52da684aa wxhaskell-0.9.ebuild 2862
-MISC ChangeLog 3759 RMD160 ba417ad76582f26aa79c67617194f96c461a84b8 SHA1 fdba92e8cb72e55fe37aa9cbf2877d4d0f30cf6f SHA256 31bf56d94e671eea9be9baa22e14e215bb8afb913a7307a6e1617f50f074801e
-MD5 ebaec628ced518311864a5d0eb6dd8c0 ChangeLog 3759
-RMD160 ba417ad76582f26aa79c67617194f96c461a84b8 ChangeLog 3759
-SHA256 31bf56d94e671eea9be9baa22e14e215bb8afb913a7307a6e1617f50f074801e ChangeLog 3759
+MISC ChangeLog 3927 RMD160 c7c50a3a22faeaa70d4f35950db5962ec1ac4a43 SHA1 6da607819ae50dcaa9aa058ec0a7ce8d6235c3a1 SHA256 80bffb4ab69ddf2a3d0486d3a763cc4f2ef7bc3239c09bc2d7ccdbc1cf914ad4
+MD5 69ecdfe9b988ab49f82c9ca5d637be63 ChangeLog 3927
+RMD160 c7c50a3a22faeaa70d4f35950db5962ec1ac4a43 ChangeLog 3927
+SHA256 80bffb4ab69ddf2a3d0486d3a763cc4f2ef7bc3239c09bc2d7ccdbc1cf914ad4 ChangeLog 3927
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
-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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFn+fyOKSBj1ObwosRAohbAJ9oN9i40eAt792eW+2j1CtTwDRmTQCfS5MD
-JEzg8AnmSLpFtVGhc7NTKjM=
-=fgtX
+iD8DBQFFveSVnUVyUObPUL4RAgc5AJ0R+zj8ue/tJoQdirCr/n/4Ffe/4QCfWe4O
+SKY++5BXHd83V0uOy5j58vE=
+=wMig
 -----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
deleted file mode 100644
index ba586abd8d53..000000000000
--- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index ef1b1582cfed..000000000000
--- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 89687c73f808..000000000000
--- a/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 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.9 2007/01/06 18:11:19 kosmikus 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"
-
-IUSE="doc"
-
-RDEPEND=">=virtual/ghc-6.2
-	!>=virtual/ghc-6.4
-	=x11-libs/wxGTK-2.4*"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( >=dev-haskell/haddock-0.6-r2 )"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/wxGTK X; then
-		eerror "wxhaskell needs wxGTK that has been built with X11 support."
-		eerror "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; then
-		eerror "Sadly wxhaskell does not work with wxGTK that has been built"
-		eerror "with USE=\"odbc\"."
-		eerror "Please re-emerge wxGTK with USE=\"-odbc\""
-		die "wxhaskell requires wxGTK to be built with USE=\"-odbc\""
-	fi
-}
-
-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() {
-	ghc-setup-pkg
-
-	#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
-
-	# every C compiler result ends up in a shared lib
-	append-flags -fPIC
-
-	# non-standard configure, so econf is not an option
-	# --wx-config must appear first according to configure file comments 
-	./configure \
-		--wx-config="${WX_CONFIG}" \
-		--prefix=/usr \
-		--with-opengl \
-		--libdir=/usr/lib/${P} \
-		--package-conf=${S}/$(ghc-localpkgconf) \
-		|| die "./configure failed"
-
-	emake -j1 || die "make failed"
-
-	# create documentation
-	if use doc; then
-		emake -j1 doc || die "make doc failed"
-	fi
-}
-
-src_install() {
-	local f
-
-	# 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
-		dohtml -A haddock -r out/doc/*
-		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
deleted file mode 100644
index 21bc2ef9a7c7..000000000000
--- a/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 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.6 2007/01/06 18:11:19 kosmikus 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"
-
-IUSE="doc"
-
-RDEPEND=">=virtual/ghc-6.2
-	!>=virtual/ghc-6.4
-	=x11-libs/wxGTK-2.4*"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( >=dev-haskell/haddock-0.6-r2 )"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/wxGTK X; then
-		eerror "wxhaskell needs wxGTK that has been built with X11 support."
-		eerror "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; then
-		eerror "Sadly wxhaskell does not work with wxGTK that has been built"
-		eerror "with USE=\"odbc\"."
-		eerror "Please re-emerge wxGTK with USE=\"-odbc\""
-		die "wxhaskell requires wxGTK to be built with USE=\"-odbc\""
-	fi
-}
-
-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() {
-	ghc-setup-pkg
-
-	#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
-
-	# every C compiler result ends up in a shared lib
-	append-flags -fPIC
-
-	# non-standard configure, so econf is not an option
-	# --wx-config must appear first according to configure file comments 
-	./configure \
-		--wx-config="${WX_CONFIG}" \
-		--prefix=/usr \
-		--with-opengl \
-		--libdir=/usr/lib/${P} \
-		--package-conf=${S}/$(ghc-localpkgconf) \
-		|| die "./configure failed"
-
-	emake -j1 || die "make failed"
-
-	# create documentation
-	if use doc; then
-		emake -j1 doc || die "make doc failed"
-	fi
-}
-
-src_install() {
-	local f
-
-	# 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
-		dohtml -A haddock -r out/doc/*
-		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
-}