Remove old versions and fix deps for 0.9.10-r1

(Portage version: 2.1.2.2)

6 files changed, 7 insertions, 205 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index afb828381a03..350e6d4aa67b 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.29 2007/04/29 15:09:46 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.30 2007/04/29 19:33:47 dcoutts Exp $
+
+  29 Apr 2007; Duncan Coutts <dcoutts@gentoo.org> -gtk2hs-0.9.9.ebuild,
+  -gtk2hs-0.9.10.ebuild, gtk2hs-0.9.10-r1.ebuild:
+  Remove old versions and fix deps for 0.9.10-r1
 
 *gtk2hs-0.9.11 (29 Apr 2007)
 
diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10
deleted file mode 100644
index 7326ea1f2c69..000000000000
--- a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13d300e07153f37ba5893ac336b078bc gtk2hs-0.9.10.tar.gz 830866
-RMD160 2b0a5275b43c0b22588028ba7944622ff08fbbb6 gtk2hs-0.9.10.tar.gz 830866
-SHA256 da99b248f3674acba43bd636d1c67813851290ed11860f7f99a44a882cdea924 gtk2hs-0.9.10.tar.gz 830866
diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9
deleted file mode 100644
index 3530192df60e..000000000000
--- a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3276545190248d40c683cd42f51a1b6e gtk2hs-0.9.9.tar.gz 765222
-RMD160 f048076a02bf4dabd0279c5311e7b79bed84287e gtk2hs-0.9.9.tar.gz 765222
-SHA256 e62fa9795fd952826e1eab5b74ad125a72a38ce5c4cecb727f20da4a16c2d6f0 gtk2hs-0.9.9.tar.gz 765222
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
index 304c93a63624..46ac134128c4 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild,v 1.2 2007/01/06 19:06:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild,v 1.3 2007/04/29 19:33:47 dcoutts Exp $
 
 inherit base eutils ghc-package multilib autotools
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="doc glade gnome firefox"
 
-RDEPEND=">=virtual/ghc-5.04.3
+RDEPEND="<virtual/ghc-6.6
 		!>=virtual/ghc-6.6
 		amd64? ( || ( >=dev-lang/ghc-6.4.1 >=dev-lang/ghc-bin-6.4.1 ) )
 		>=x11-libs/gtk+-2
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
deleted file mode 100644
index 73cebcc6124c..000000000000
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.10.ebuild
+++ /dev/null
@@ -1,112 +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/gtk2hs/gtk2hs-0.9.10.ebuild,v 1.9 2007/01/06 19:06:55 dcoutts Exp $
-
-inherit base eutils ghc-package multilib autotools
-
-DESCRIPTION="A GUI Library for Haskell based on Gtk+"
-HOMEPAGE="http://haskell.org/gtk2hs/"
-SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-#enable sparc when CFLAGS/-mcpu ebuild bug is fixed
-
-IUSE="doc glade gnome firefox"
-
-RDEPEND=">=virtual/ghc-5.04.3
-		!>=virtual/ghc-6.6
-		amd64? ( || ( >=dev-lang/ghc-6.4.1 >=dev-lang/ghc-bin-6.4.1 ) )
-		>=x11-libs/gtk+-2
-		glade? ( >=gnome-base/libglade-2 )
-		gnome? ( >=gnome-base/libglade-2
-				 >=x11-libs/gtksourceview-0.6
-				 >=gnome-base/gconf-2 )
-		firefox? ( >=www-client/mozilla-firefox-1.0.4 )"
-DEPEND="${RDEPEND}
-		doc? ( >=dev-haskell/haddock-0.7 )"
-
-src_unpack() {
-	base_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.9.10-cflags.patch"
-	epatch "${FILESDIR}/${PN}-0.9.10-ghc622.patch"
-}
-
-src_compile() {
-	# only needed because of the cflags patch above.
-	eautoreconf
-
-	econf \
-		--enable-packager-mode \
-		$(has_version '>=x11-libs/gtk+-2.8' && echo --enable-cairo) \
-		$(use glade || use gnome && echo --enable-libglade) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome sourceview) \
-		$(use_enable firefox firefox) \
-		$(use_enable doc docs) \
-		|| die "Configure failed"
-
-	# parallel build doesn't work, so specify -j1
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-
-	make install \
-		DESTDIR="${D}" \
-		htmldir="/usr/share/doc/${PF}/html" \
-		haddockifacedir="/usr/share/doc/${PF}" \
-		|| die "Make install failed"
-
-	# for some reason it creates the doc dir even if it is configured
-	# to not generate docs, so lets remove the empty dirs in that case
-	# (and lets be cautious and only remove them if they're empty)
-	if ! use doc; then
-		rmdir "${D}/usr/share/doc/${PF}/html"
-		rmdir "${D}/usr/share/doc/${PF}"
-		rmdir "${D}/usr/share/doc"
-		rmdir "${D}/usr/share"
-	fi
-
-	# arrange for the packages to be registered
-	if ghc-cabal; then
-		pkgext=package.conf
-	else
-		pkgext=pkg
-	fi
-	ghc-setup-pkg \
-		"${D}/usr/$(get_libdir)/gtk2hs/glib.${pkgext}" \
-		$(has_version '>=x11-libs/gtk+-2.8' && echo \
-			"${D}/usr/$(get_libdir)/gtk2hs/cairo.${pkgext}") \
-		"${D}/usr/$(get_libdir)/gtk2hs/gtk.${pkgext}" \
-		"${D}/usr/$(get_libdir)/gtk2hs/mogul.${pkgext}" \
-		$(use glade || use gnome && echo \
-			"${D}/usr/$(get_libdir)/gtk2hs/glade.${pkgext}") \
-		$(use gnome && echo \
-			"${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
-			"${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}") \
-		$(use firefox && echo \
-			"${D}/usr/$(get_libdir)/gtk2hs/mozembed.${pkgext}")
-	ghc-install-pkg
-
-	# build ghci .o files from .a files
-	ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSglib.a"
-	if has_version '>=x11-libs/gtk+-2.8'; then
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHScairo.a"
-	fi
-	ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSgtk.a"
-	ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSmogul.a"
-	if use glade || use gnome; then
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSglade.a"
-	fi
-	if use gnome; then
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSgconf.a"
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSsourceview.a"
-	fi
-	if use firefox; then
-		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSmozembed.a"
-	fi
-}
-
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild
deleted file mode 100644
index 0714d271c925..000000000000
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.9.ebuild
+++ /dev/null
@@ -1,84 +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/gtk2hs/gtk2hs-0.9.9.ebuild,v 1.2 2007/01/06 19:06:55 dcoutts Exp $
-
-inherit base ghc-package multilib
-
-DESCRIPTION="GTK+-2.x bindings for Haskell"
-HOMEPAGE="http://haskell.org/gtk2hs/"
-SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-
-KEYWORDS="-amd64 ~x86 ~ppc"
-#enable amd64 when ghc-6.4.1 is out
-#enable sparc when CFLAGS/-mcpu ebuild bug is fixed
-
-IUSE="doc gnome"
-
-DEPEND=">=virtual/ghc-5.04
-		!>=virtual/ghc-6.6
-		>=x11-libs/gtk+-2
-		gnome? ( >=gnome-base/libglade-2
-				 >=x11-libs/gtksourceview-0.6
-				 >=gnome-base/gconf-2 )
-		doc? ( >=dev-haskell/haddock-0.7 )"
-
-src_compile() {
-	econf \
-		--enable-packager-mode \
-		`use_enable gnome libglade` \
-		`use_enable gnome gconf` \
-		`use_enable gnome sourceview` \
-		`use_enable doc docs` \
-		|| die "Configure failed"
-
-	# parallel build doesn't work, so specify -j1
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-
-	make install \
-		DESTDIR=${D} \
-		htmldir="/usr/share/doc/${PF}/html" \
-		haddockifacedir="/usr/share/doc/${PF}" \
-		|| die "Make install failed"
-
-	# for some reason it creates the doc dir even if it is configured
-	# to not generate docs, so lets remove the empty dirs in that case
-	# (and lets be cautious and only remove them if they're empty)
-	if ! use doc; then
-		rmdir ${D}/usr/share/doc/${PF}/html
-		rmdir ${D}/usr/share/doc/${PF}
-		rmdir ${D}/usr/share/doc
-		rmdir ${D}/usr/share
-	fi
-
-	# arrange for the packages to be registered
-	if ghc-cabal; then
-		pkgext=package.conf
-	else
-		pkgext=pkg
-	fi
-	ghc-setup-pkg \
-		"${D}/usr/$(get_libdir)/gtk2hs/glib.${pkgext}" \
-		"${D}/usr/$(get_libdir)/gtk2hs/gtk.${pkgext}" \
-		"${D}/usr/$(get_libdir)/gtk2hs/mogul.${pkgext}" \
-		$(useq gnome && echo \
-			"${D}/usr/$(get_libdir)/gtk2hs/glade.${pkgext}" \
-			"${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
-			"${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}")
-	ghc-install-pkg
-
-	# build ghci .o files from .a files
-	ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSglib.a
-	ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSgtk.a
-	ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSmogul.a
-	if use gnome; then
-		ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSglade.a
-		ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSgconf.a
-		ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSsourceview.a
-	fi
-}
-