Marked 6.2.2-r1 stable on x86, and removed old versions.

(Portage version: 2.0.51.22-r2)

11 files changed, 12 insertions, 267 deletions

diff --git a/dev-lang/ghc-bin/ChangeLog b/dev-lang/ghc-bin/ChangeLog
index 25400cc31224..0eaf207d44ab 100644
--- a/dev-lang/ghc-bin/ChangeLog
+++ b/dev-lang/ghc-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc-bin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.27 2005/08/08 14:58:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.28 2005/08/17 10:25:02 kosmikus Exp $
+
+  17 Aug 2005; Andres Loeh <loeh@gentoo.org> -ghc-bin-6.0.ebuild,
+  -ghc-bin-6.2.ebuild, -ghc-bin-6.2.1.ebuild, -ghc-bin-6.2.2.ebuild,
+  ghc-bin-6.2.2-r1.ebuild:
+  Marked 6.2.2-r1 stable on x86, and removed old versions.
 
   08 Aug 2005; Markus Rothe <corsair@gentoo.org> ghc-bin-6.4.ebuild:
   Updated binary package for ppc64
diff --git a/dev-lang/ghc-bin/Manifest b/dev-lang/ghc-bin/Manifest
index daa731c0dc27..7226b085e59f 100644
--- a/dev-lang/ghc-bin/Manifest
+++ b/dev-lang/ghc-bin/Manifest
@@ -1,17 +1,9 @@
-MD5 7c7ebb769604a7485c51e15b0933eb69 ChangeLog 4695
+MD5 82dfea76831ace70fb7a77d8142d8ff0 ghc-bin-6.4.ebuild 1091
+MD5 c8b5e7951778b569544c506b3fb2ef1f ghc-bin-6.2.2-r1.ebuild 990
 MD5 87f638e52cf614305933dde23f040a8c ghc-bin-5.04.3.ebuild 1500
-MD5 b212f1597cb7af84480f1179b52b56b3 ghc-bin-6.0.ebuild 1497
-MD5 c02506789223046ac719ef24f918fab9 ghc-bin-6.2.1.ebuild 1640
-MD5 04d35b7ee7b202750883df4987c78e1a ghc-bin-6.2.2-r1.ebuild 991
-MD5 2e378d24e7b65a23163b540a7dd4ae26 ghc-bin-6.2.2.ebuild 1381
-MD5 94cd2dd0f18a3b65e9740d6d1148e09a ghc-bin-6.2.ebuild 1369
+MD5 7c7ebb769604a7485c51e15b0933eb69 ChangeLog 4695
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 82dfea76831ace70fb7a77d8142d8ff0 ghc-bin-6.4.ebuild 1091
 MD5 a82ba08a8abb4ae38bcc8d467c665e7b files/10ghc 40
-MD5 ce04d15467611dcd307d16509c9dec15 files/digest-ghc-bin-6.4 286
 MD5 2b726390b70f784de758ee02184ef450 files/digest-ghc-bin-5.04.3 171
-MD5 981523171b835c239b68613e6080246d files/digest-ghc-bin-6.0 162
-MD5 7131d05db80999f47946fedb5083ad01 files/digest-ghc-bin-6.2 81
-MD5 42a1da9d86ec405ba28644ee8036a40c files/digest-ghc-bin-6.2.1 69
-MD5 f64b7d061f8c67720e33afb647de7486 files/digest-ghc-bin-6.2.2 83
 MD5 ac6910947007f15e0171e8cd1f3ff457 files/digest-ghc-bin-6.2.2-r1 146
+MD5 ce04d15467611dcd307d16509c9dec15 files/digest-ghc-bin-6.4 286
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-6.0 b/dev-lang/ghc-bin/files/digest-ghc-bin-6.0
deleted file mode 100644
index e66914d580da..000000000000
--- a/dev-lang/ghc-bin/files/digest-ghc-bin-6.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 28b9e6d52f3dc41111d0dce65468a8e7 ghc-6.0-i386-unknown-linux.tar.bz2 13353634
-MD5 fc054a80a6ae9b25d8f83509505ee4d6 ghc-6.0-sparc-sun-solaris2.tar.bz2 17593707
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-6.2 b/dev-lang/ghc-bin/files/digest-ghc-bin-6.2
deleted file mode 100644
index 618a81cccc60..000000000000
--- a/dev-lang/ghc-bin/files/digest-ghc-bin-6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b2f19ca00fd7494002047d7fb4dce3e ghc-6.2-i386-unknown-linux.tar.bz2 13466593
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.1 b/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.1
deleted file mode 100644
index 53df8b219841..000000000000
--- a/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68bed415c325be437174fd4750b74e91 ghc6_6.2.1-5_amd64.deb 29591090
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.2 b/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.2
deleted file mode 100644
index e0a3f407e2c2..000000000000
--- a/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee3c9d20763ff5b23291e0be2c307ccc ghc-6.2.2-i386-unknown-linux.tar.bz2 14136384
diff --git a/dev-lang/ghc-bin/ghc-bin-6.0.ebuild b/dev-lang/ghc-bin/ghc-bin-6.0.ebuild
deleted file mode 100644
index 18121cce3df5..000000000000
--- a/dev-lang/ghc-bin/ghc-bin-6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.0.ebuild,v 1.6 2005/02/19 18:53:42 weeve Exp $
-
-IUSE="opengl"
-
-S="${WORKDIR}/ghc-${PV}"
-DESCRIPTION="Glasgow Haskell Compiler"
-SRC_URI="x86? ( http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-i386-unknown-linux.tar.bz2 )
-	sparc? ( http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-sparc-sun-solaris2.tar.bz2 )"
-HOMEPAGE="http://www.haskell.org"
-
-LICENSE="as-is"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-SLOT="0"
-
-LOC="/opt/ghc"
-
-DEPEND="virtual/libc"
-RDEPEND=">=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=dev-libs/gmp-4.1
-	opengl? ( virtual/opengl
-		virtual/glu
-		virtual/glut )"
-
-PROVIDE="virtual/ghc"
-
-src_compile() {
-	econf || die "./configure failed"
-}
-
-src_install () {
-	make \
-		prefix=${D}${LOC} \
-		datadir=${D}${LOC}/share \
-		mandir=${D}${LOC}/share/man \
-		infodir=${D}${LOC}/share/info \
-		install || die
-
-	# Install documentation.
-	dodoc ANNOUNCE INSTALL LICENSE README VERSION
-
-	cd ${D}${LOC}/share
-	mv hslibs.ps users_guide.ps html ${D}/usr/share/doc/${PF}
-
-	#ghc seems to set locations in wrapper scripts from make install
-	#need to strip the ${D} part out
-	cd ${D}${LOC}/bin
-	clean_wrappers ghc-${PV} ghci-${PV} ghc-pkg-${PV} hsc2hs
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/10ghc
-}
-
-clean_wrappers () {
-	for i in $*; do
-		mv ${i} ${i}-orig
-		sed -e "s:${D}::" ${i}-orig > ${i}
-		chmod a+x ${i}
-		rm ${i}-orig
-	done
-}
diff --git a/dev-lang/ghc-bin/ghc-bin-6.2.1.ebuild b/dev-lang/ghc-bin/ghc-bin-6.2.1.ebuild
deleted file mode 100644
index 7f6b5b946c60..000000000000
--- a/dev-lang/ghc-bin/ghc-bin-6.2.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.2.1.ebuild,v 1.4 2005/02/19 18:53:42 weeve Exp $
-
-IUSE=""
-
-S="${WORKDIR}"
-DESCRIPTION="Glasgow Haskell Compiler (binary-only version for amd64)"
-SRC_URI="http://debian-amd64.alioth.debian.org/pure64/pool/unstable/main/amd64/g/ghc6/ghc6_6.2.1-5_amd64.deb"
-HOMEPAGE="http://www.haskell.org"
-
-LICENSE="as-is"
-KEYWORDS="-* ~amd64 -sparc"
-SLOT="0"
-
-DEPEND="app-arch/dpkg"
-RDEPEND=">=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=dev-libs/gmp-4.1"
-
-PROVIDE="virtual/ghc"
-
-src_unpack() {
-	for i in ${A}; do
-		dpkg -x ${DISTDIR}/${i} .
-	done
-}
-
-src_install () {
-	# Copy it
-	mkdir -p ${D}/opt/ghc
-	for i in lib share; do
-		cp -rl usr/$i/ghc-6.2.1 ${D}/opt/ghc/$i
-	done
-
-	# Provide package.conf
-	pushd ${D}/opt/ghc/lib
-	cp -a package.conf.shipped package.conf
-	popd
-
-	# Generate symlinks in ${D}/opt/ghc/bin
-	mkdir -p ${D}/opt/ghc/bin
-	pushd ${D}/opt/ghc/bin
-	ln -s ../lib/bin/ghc ghc-${PV}
-	ln -s ../lib/bin/ghci ghci-${PV}
-	ln -s ../lib/bin/ghc-pkg ghc-pkg-${PV}
-	ln -s ghc-${PV} ghc
-	ln -s ghci-${PV} ghci
-	ln -s ghc-pkg-${PV} ghc-pkg
-	popd
-
-	# TODO: what about documentation
-	# TODO: can clean_wrappers be reused from the other ghc-bin
-	# ebuilds; isn't RDEPEND perl needed if we call perl here?
-
-	# Adjust paths in ${D}/opt/ghc/lib/bin
-	pushd ${D}/opt/ghc/lib/bin
-	perl -i -ne "s:/usr/lib/ghc-${PV}:/opt/ghc/lib:g;
-			 s:/usr/share/ghc-${PV}:/opt/ghc/share:g;print" \
-		ghc-${PV} ghci-${PV} ghcprof hsc2hs ghc-pkg-${PV}
-	popd
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/10ghc
-
-}
diff --git a/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild b/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild
index e916650b24c1..1a4b735ecdd4 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild,v 1.2 2005/07/26 16:31:44 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild,v 1.3 2005/08/17 10:25:02 kosmikus Exp $
 
 IUSE="" # use the non-binary version if you want to have more choice
 
@@ -11,7 +11,7 @@ SRC_URI="x86? (  mirror://gentoo/${P}-r1-x86.tbz2 )
 HOMEPAGE="http://www.haskell.org/ghc/"
 
 LICENSE="as-is"
-KEYWORDS="~x86 -amd64 -ppc ~sparc -alpha"
+KEYWORDS="x86 -amd64 -ppc ~sparc -alpha"
 SLOT="0"
 
 RESTRICT="nostrip" # already stripped
diff --git a/dev-lang/ghc-bin/ghc-bin-6.2.2.ebuild b/dev-lang/ghc-bin/ghc-bin-6.2.2.ebuild
deleted file mode 100644
index 51104ea75df7..000000000000
--- a/dev-lang/ghc-bin/ghc-bin-6.2.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.2.2.ebuild,v 1.3 2005/02/19 18:53:42 weeve Exp $
-
-IUSE="" # opengl not included in binary
-
-S="${WORKDIR}/ghc-${PV}"
-DESCRIPTION="Glasgow Haskell Compiler"
-SRC_URI="x86? ( http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-i386-unknown-linux.tar.bz2  )"
-HOMEPAGE="http://www.haskell.org"
-
-LICENSE="as-is"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-SLOT="0"
-
-LOC="/opt/ghc"
-
-DEPEND="virtual/libc"
-RDEPEND=">=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=dev-libs/gmp-4.1"
-
-PROVIDE="virtual/ghc"
-
-src_compile() {
-	econf || die "./configure failed"
-}
-
-src_install () {
-	make \
-		prefix=${D}${LOC} \
-		datadir=${D}${LOC}/share \
-		mandir=${D}${LOC}/share/man \
-		infodir=${D}${LOC}/share/info \
-		install || die
-
-	# Install documentation.
-	dodoc ANNOUNCE INSTALL LICENSE README VERSION
-
-	cd ${D}${LOC}/share
-	mv hslibs.ps users_guide.ps html ${D}/usr/share/doc/${PF}
-
-	#ghc seems to set locations in wrapper scripts from make install
-	#need to strip the ${D} part out
-	cd ${D}${LOC}/bin
-	clean_wrappers ghc-${PV} ghci-${PV} ghc-pkg-${PV} hsc2hs
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/10ghc
-}
-
-clean_wrappers() {
-	for i in $*; do
-		mv ${i} ${i}-orig
-		sed -e "s:${D}::" ${i}-orig > ${i}
-		chmod a+x ${i}
-		rm ${i}-orig
-	done
-}
diff --git a/dev-lang/ghc-bin/ghc-bin-6.2.ebuild b/dev-lang/ghc-bin/ghc-bin-6.2.ebuild
deleted file mode 100644
index 21d6acf67205..000000000000
--- a/dev-lang/ghc-bin/ghc-bin-6.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.2.ebuild,v 1.5 2005/02/19 18:53:42 weeve Exp $
-
-IUSE="" # opengl not included in binary
-
-S="${WORKDIR}/ghc-${PV}"
-DESCRIPTION="Glasgow Haskell Compiler"
-SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-i386-unknown-linux.tar.bz2"
-HOMEPAGE="http://www.haskell.org"
-
-LICENSE="as-is"
-KEYWORDS="x86 -ppc -sparc -alpha"
-SLOT="0"
-
-LOC="/opt/ghc"
-
-DEPEND="virtual/libc"
-RDEPEND=">=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=dev-libs/gmp-4.1"
-
-PROVIDE="virtual/ghc"
-
-src_compile() {
-	econf || die "./configure failed"
-}
-
-src_install () {
-	make \
-		prefix=${D}${LOC} \
-		datadir=${D}${LOC}/share \
-		mandir=${D}${LOC}/share/man \
-		infodir=${D}${LOC}/share/info \
-		install || die
-
-	# Install documentation.
-	dodoc ANNOUNCE INSTALL LICENSE README VERSION
-
-	cd ${D}${LOC}/share
-	mv hslibs.ps users_guide.ps html ${D}/usr/share/doc/${PF}
-
-	#ghc seems to set locations in wrapper scripts from make install
-	#need to strip the ${D} part out
-	cd ${D}${LOC}/bin
-	clean_wrappers ghc-${PV} ghci-${PV} ghc-pkg-${PV} hsc2hs
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/10ghc
-}
-
-clean_wrappers () {
-	for i in $*; do
-		mv ${i} ${i}-orig
-		sed -e "s:${D}::" ${i}-orig > ${i}
-		chmod a+x ${i}
-		rm ${i}-orig
-	done
-}