marked ghc-6.2 stable on x86 (related to bug #46212)

4 files changed, 7 insertions, 241 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 19b3ef4a8443..e2ee3e5499fd 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.30 2004/03/23 01:03:20 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.31 2004/03/31 09:38:36 kosmikus Exp $
+
+  31 Mar 2004; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild,
+  ghc-6.2-r1.ebuild:
+  Marked ghc-6.2-r1 stable on x86. Removed 5 series due to bug #46212.
 
   23 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> ghc-6.2.ebuild:
   Added ~ppc keyword, highly experimental build (linux-ppc is not entirely
diff --git a/dev-lang/ghc/files/digest-ghc-5.04.3-r1 b/dev-lang/ghc/files/digest-ghc-5.04.3-r1
deleted file mode 100644
index 4a11d128985b..000000000000
--- a/dev-lang/ghc/files/digest-ghc-5.04.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d4d60f11e8f5909c4f28a02b2c69917 ghc-5.04.3-src.tar.bz2 4741512
diff --git a/dev-lang/ghc/ghc-5.04.3-r1.ebuild b/dev-lang/ghc/ghc-5.04.3-r1.ebuild
deleted file mode 100644
index 5d9120b86b62..000000000000
--- a/dev-lang/ghc/ghc-5.04.3-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-5.04.3-r1.ebuild,v 1.9 2004/01/11 21:26:11 kosmikus Exp $
-
-#Some explanation of bootstrap logic:
-#
-#After thinking through the best way to bootstrap ghc I decided to split it into
-#ghc and ghc-bin and make ghc depend on ghc-bin.
-#  The ebuild has been revamped and greatly simplified. Bootstrap off old 4x hc files no longer works on x86.
-#Not sure what happens with old scheme on sparc, as I did not see any test reports.
-#
-#The considerations:
-#Making ghc unpack binary build first (under ${WORKDIR}) and bootstrapping from that will effectively force
-#ghc-bin reinstall every time ghc is rebuilt or upgraded. What is worse it will likely force download of binary image
-#at upgrade, which is not nice (in fact quite bad for modem users - 16+ MB).
-#
-#The best results are achieved if ghc-bin is left alone after ghc installation -
-#Both ebuilds install in the same place, thus space penalty is minimal. In fact only the docs exist in double
-#(considering that ghc is not installing much docs at present this looks more like an advantage).
-#When the upgrade time comes, if you still have ghc-bin around, portage will happily bootstrap off
-#your existing ghc (or ghc-bin, whichever was merged last), without attempting to ruin anything...
-#
-#There is only one issue: ghci will be successfully built only if ghc is bootstrapped from the same version.
-#Thus we need to detect presently installed one and bootstrap in one or two stages..
-
-inherit base flag-o-matic
-
-IUSE="doc tetex opengl"
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="http://www.haskell.org/ghc/"
-
-SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ~sparc -ppc -alpha"
-
-
-PROVIDE="virtual/ghc"
-# FIXME: Add USE support for parallel haskell (requires PVM)
-#        Get PVM from ftp://ftp.netlib.org/pvm3/
-DEPEND="virtual/ghc
-	>=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=sys-devel/make-3.79.1
-	>=sys-apps/sed-3.02.80
-	>=sys-devel/flex-2.5.4a
-	>=dev-libs/gmp-4.1
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		=app-text/docbook-sgml-dtd-3.1-r1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		>=dev-haskell/haddock-0.4
-		tetex? ( >=app-text/tetex-1.0.7
-			>=app-text/jadetex-3.12 ) )
-	opengl? ( virtual/opengl
-		virtual/glu
-		virtual/glut )"
-
-RDEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.3
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-4.1
-	opengl? ( virtual/opengl virtual/glu virtual/glut )"
-
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
-pkg_setup() {
-	#determine what version of ghc we have around:
-	if test -z "${GHC}"; then
-		GHC=`which ghc`
-	fi
-
-	BASE_GHC_VERSION=`"$GHC" --version | sed 's/^.*version //'`
-
-	# If the base GHC version matches wanted one we can skip stage1
-	if test x${BASE_GHC_VERSION} = x${PV}; then
-		need_stage1=no
-	else
-		need_stage1=yes
-	fi
-
-	# If we update from certain package combinations, we need to compile
-	# twice to get a GHCi bug fixed ...
-	has_version '>=sys-libs/glibc-2.3.2' \
-		&& has_version '<=virtual/ghc-5.04.3' \
-		&& need_stage1=yes
-
-	# some vars
-	STAGE1_B="${WORKDIR}/stage1-build"
-	STAGE2_B="${WORKDIR}/stage2-build"
-	STAGE1_D="${WORKDIR}/stage1-image"
-}
-
-src_unpack() {
-	base_src_unpack
-
-	# apply patch to Linker.c to fix a problem with undefined symbols
-	# when starting GHCi
-	patch -p0 < ${FILESDIR}/ghc-5.04.3-r1.patch
-
-}
-
-src_compile() {
-	local LNDIR
-	local myconf
-
-	# Create GHC's lndir if none installed
-
-	if which lndir; then
-		LNDIR=lndir
-	else
-		echo "You don\'t seem to have lndir available (yet) ..."
-		PATH="${GHCPATH}" econf || die "lndir configure failed"
-		make glafp-utils || die "glafp-utils make failed"
-		LNDIR="${S}/glafp-utils/lndir/lndir"
-	fi
-
-	# Create build directories.
-	if test x$need_stage1 = xyes; then
-		echo '>>> Creating stage 1 build dir'
-		mkdir ${STAGE1_B} || die
-		${LNDIR} ${S} ${STAGE1_B} || die
-	fi
-	echo '>>> Creating stage 2 build dir'
-	mkdir ${STAGE2_B} || die
-	${LNDIR} ${S} ${STAGE2_B} || die
-
-# disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
-	if has_version "sys-devel/hardened-gcc"
-	then
-		# fix proposed by Peter simons according to bug #30789
-		echo "SRC_CC_OPTS+=-yet_exec -yno_propolice" >> ${STAGE1_B}/mk/build.mk
-		echo "SRC_HC_OPTS+=-optc-yet_exec -optc-yno_propolice" >> ${STAGE1_B}/mk/build.mk
-		echo "SRC_CC_OPTS+=-yet_exec -yno_propolice" >> ${STAGE2_B}/mk/build.mk
-		echo "SRC_HC_OPTS+=-optc-yet_exec -optc-yno_propolice" >> ${STAGE2_B}/mk/build.mk
-	fi
-
-	use opengl && myconf="--enable-hopengl" || myconf="--disable-hopengl"
-
-	if test x$need_stage1 = xyes; then
-		echo ">>> Bootstrapping intermediate GHC ${PV} using GHC ${BASE_GHC_VERSION}"
-
-		if has_version "sys-devel/hardened-gcc"
-		then
-			# flag-o-matic will automatically insert -yet_exec if -fPIC is filtered
-			# and the flag-o-matic eclass is inherited above
-			filter-flags "-fPIC"
-			pushd "${STAGE1_B}" || die
-			PATH="${GHCPATH}" ./configure \
-				-host="${CHOST}" \
-				--prefix="${STAGE1_D}/usr" \
-				--with-ghc="${GHC}" \
-				--with-gcc="gcc ${CFLAGS}" \
-				--without-happy || die "intermediate stage configure failed"
-			# the configure will tell ghc to use the gcc toolchain assembler with -yet_exec for compiling
-			# so ghc-asm will not bug about the PIC prologue that would otherwise be inserted by gcc
-			# specs file which is provided by sys-devel/hardened-gcc and it's transparent PIC specs file
-		else
-
-		pushd "${STAGE1_B}" || die
-			PATH="${GHCPATH}" ./configure \
-				-host="${CHOST}" \
-				--prefix="${STAGE1_D}/usr" \
-				--with-ghc="${GHC}" \
-				--without-happy || die "intermediate stage configure failed"
-		fi
-			#parallel make causes trouble
-			make || die "intermediate stage make failed"
-			make install || die
-			GHC=${STAGE1_D}/usr/bin/ghc
-		popd
-	fi
-
-	pushd "${STAGE2_B}" || die
-		# unset SGML_CATALOG_FILES because documentation installation
-		# breaks otherwise ...
-		PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf \
-			--enable-threaded-rts \
-			--with-ghc="${GHC}" \
-			${myconf}|| die "./configure failed"
-		# the build does not seem to work all that
-		# well with parallel make
-		make || die
-
-		# if documentation has been requested, build documentation ...
-		if use doc; then
-			emake html || die
-			if use tetex; then
-				emake ps || die
-			fi
-		fi
-	popd
-
-}
-
-src_install () {
-	local mydoc
-
-	pushd "${STAGE2_B}" || die
-		# determine what to do with documentation
-		if [ `use doc` ]; then
-			mydoc="html"
-			if [ `use tetex` ]; then
-				mydoc="${mydoc} ps"
-			fi
-		else
-			mydoc=""
-			# needed to prevent haddock from being called
-			echo NO_HADDOCK_DOCS=YES >> mk/build.mk
-		fi
-		echo SGMLDocWays="${mydoc}" >> mk/build.mk
-
-		make install install-docs \
-			prefix="${D}/usr" \
-			datadir="${D}/usr/share/doc/${PF}" \
-			infodir="${D}/usr/share/info" \
-			mandir="${D}/usr/share/man" || die
-	popd
-
-	#need to remove ${D} from ghcprof script
-	cd ${D}/usr/bin
-	mv ghcprof ghcprof-orig
-	sed -e 's:$FPTOOLS_TOP_ABS:#$FPTOOLS_TOP_ABS:' ghcprof-orig > ghcprof
-	chmod a+x ghcprof
-	rm -f ghcprof-orig
-
-	cd ${S}/ghc
-	dodoc README ANNOUNCE LICENSE VERSION
-}
-
-pkg_postinst () {
-	einfo "If you have dev-lang/ghc-bin installed, you might"
-	einfo "want to unmerge it again. It is no longer needed."
-}
diff --git a/dev-lang/ghc/ghc-6.2-r1.ebuild b/dev-lang/ghc/ghc-6.2-r1.ebuild
index 2f503a926074..44e43e11bba7 100644
--- a/dev-lang/ghc/ghc-6.2-r1.ebuild
+++ b/dev-lang/ghc/ghc-6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2-r1.ebuild,v 1.1 2004/03/11 12:43:23 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2-r1.ebuild,v 1.2 2004/03/31 09:38:36 kosmikus Exp $
 
 #Some explanation of bootstrap logic:
 #
@@ -34,7 +34,7 @@ SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 -ppc -alpha"
+KEYWORDS="x86 -ppc -alpha"
 
 
 PROVIDE="virtual/ghc"