Version bump.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 220 insertions, 5 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index af4c7c82dc06..1889e53d1bc8 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.65 2005/09/01 14:53:36 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.66 2005/09/22 13:37:55 dcoutts Exp $
+
+*ghc-6.4.1 (22 Sep 2005)
+
+  22 Sep 2005; <duncan@gentoo.org> +ghc-6.4.1.ebuild:
+  Version bump.
 
   01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> ghc-6.2.2.ebuild:
   Stable on sparc
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 446c5499e8ef..811c9333a3cf 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 ff2ada07b7eb78fe8bd3b887ed44e471 ghc-6.4.1.ebuild 6004
 MD5 6b0575f665b30bd942f60a152f52dca8 ghc-6.0.1.ebuild 4709
 MD5 44522ba468aae54fcea378e3817fcd72 ghc-6.2.2.ebuild 5562
 MD5 9620778937a1aff6ef88863c81222cfc ghc-6.4.ebuild 6109
-MD5 826d31ff131228d18edf4ce4e181ed97 ChangeLog 12193
+MD5 8f2072fc6e6925a51d0991c3ed579744 ChangeLog 12289
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 558c6b9e9b0e15185b69cdfe241dad9a files/ghc-updater 8775
 MD5 1ae8c6b539b6706ba0e8b988a918a944 files/ghc-6.2.hardened.patch 525
 MD5 ffd472c0685cf2766ce6533265f9a3c9 files/ghc-6.4-powerpc.patch 908
 MD5 d417c9e24a826959ad6d921247e43328 files/digest-ghc-6.0.1 67
 MD5 9e9c22452b545fd9ec1367155c15d8e2 files/digest-ghc-6.2.2 67
+MD5 7c38a5e2d5ecf8446f38ff41fa4d4152 files/digest-ghc-6.4.1 67
 MD5 75417bc4dea34cd08ea105457ccd3032 files/digest-ghc-6.4 65
 MD5 9c15b50bf0b73b7d70a06fd47510a3ef files/ghc-6.0.1.haddock.patch 380
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDFxYLKRy60XGEcJIRAknxAJ9kVNBgaCHjf1ttOZX2kSbLLtWKrgCeIxar
-znL7C4m3nNhoLEOC90C+hMk=
-=Nc2p
+iD8DBQFDMrREkyZuKN4EQ6YRAjxFAJ9MrcbItexpyMRniGUQQXVWyrCV0gCeOiI5
+tI43tEDOP4H7Vx7DCDGd+W8=
+=xJqZ
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/digest-ghc-6.4.1 b/dev-lang/ghc/files/digest-ghc-6.4.1
new file mode 100644
index 000000000000..1581d6c5629c
--- /dev/null
+++ b/dev-lang/ghc/files/digest-ghc-6.4.1
@@ -0,0 +1 @@
+MD5 fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 6826112
diff --git a/dev-lang/ghc/ghc-6.4.1.ebuild b/dev-lang/ghc/ghc-6.4.1.ebuild
new file mode 100644
index 000000000000..3bc6d3c65817
--- /dev/null
+++ b/dev-lang/ghc/ghc-6.4.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1.ebuild,v 1.1 2005/09/22 13:37:55 dcoutts Exp $
+
+# We abandon virtual/ghc in favor of || dependencies.
+# Here's a brief explanation of the new bootstrap logic:
+#
+# ghc requires ghc-bin to bootstrap.
+# Therefore, 
+# (1) ghc depends on || (ghc-bin ghc)
+# (2) all packages that need ghc do the same
+#
+# Having the binary first everywhere doesn't force
+# anyone to do the full bootstrap. Still, ghc-bin can
+# be removed from a system after the first successful
+# install of ghc.
+
+inherit base flag-o-matic eutils ghc-package
+
+IUSE="doc java opengl"
+
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="http://www.haskell.org/ghc/"
+
+# discover if this is a snapshot release
+IS_SNAPSHOT="${PV%%*pre*}" # zero if snapshot
+MY_PV="${PV/_pre/.}"
+MY_P="${PN}-${MY_PV}"
+EXTRA_SRC_URI="${MY_PV}"
+[[ -z "${IS_SNAPSHOT}" ]] && EXTRA_SRC_URI="stable/dist"
+
+SRC_URI="http://www.haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+# re-add ~ppc64 once dependencies are fulfilled
+KEYWORDS="-alpha ~amd64 ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+# we still provide virtual/ghc to maintain compatibility for now
+PROVIDE="virtual/ghc"
+
+# ghc cannot usually be bootstrapped using later versions ...
+DEPEND="|| ( <=dev-lang/ghc-bin-6.5 <=dev-lang/ghc-6.5 )
+	>=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
+	>=sys-libs/readline-4.2
+	doc? (  ~app-text/docbook-xml-dtd-4.2
+		app-text/docbook-xsl-stylesheets
+		>=dev-libs/libxslt-1.1.2
+		>=dev-haskell/haddock-0.6-r2
+		java? ( >=dev-java/fop-0.20.5 ) )
+	opengl? ( virtual/opengl
+		virtual/glu
+		virtual/glut )"
+
+RDEPEND="virtual/libc
+	>=sys-devel/gcc-2.95.3
+	>=dev-lang/perl-5.6.1
+	>=dev-libs/gmp-4.1
+	>=sys-libs/readline-4.2
+	opengl? ( virtual/opengl virtual/glu virtual/glut )"
+
+SUPPORTED_CFLAGS=""
+
+# Setup supported CFLAGS.
+check_cflags() {
+	OLD_CFLAGS="${CFLAGS}"
+	CFLAGS="$1"
+	strip-unsupported-flags
+	SUPPORTED_CFLAGS="${SUPPORTED_CFLAGS} ${CFLAGS}"
+	CFLAGS="${OLD_CFLAGS}"
+}
+
+setup_cflags() {
+	check_cflags "-nopie -fno-stack-protector -fno-stack-protector-all"
+}
+
+# Portage's resolution of virtuals fails on virtual/ghc in some Portage releases,
+# the following function causes the build to fail with an informative error message
+# in such a case.
+# pkg_setup() {
+# 	if ! has_version virtual/ghc; then
+# 		eerror "This ebuild needs a version of GHC to bootstrap from."
+# 		eerror "Please emerge dev-lang/ghc-bin to get a binary version."
+# 		eerror "You can either use the binary version directly or emerge"
+# 		eerror "dev-lang/ghc afterwards."
+# 		die "virtual/ghc version required to build"
+# 	fi
+# }
+
+src_unpack() {
+	base_src_unpack
+
+	# TODO: test if ppc/ppc64 works without patch now ...
+
+	# hardened-gcc needs to be disabled, because the
+	# mangler doesn't accept its output; yes, the 6.2 version
+	# should do ...
+	cd "${S}/ghc/driver"
+	setup_cflags
+
+	epatch "${FILESDIR}/${PN}-6.2.hardened.patch"
+	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS// -/ -optc-}|" ghc/ghc.sh
+	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS// -/ -optc-}|" ghci/ghci.sh
+}
+
+src_compile() {
+	local myconf
+	local mydoc
+
+	if use opengl; then
+		myconf="--enable-hopengl"
+	fi
+
+	# initialize build.mk
+	echo '# Gentoo changes' > mk/build.mk
+
+	# determine what to do with documentation
+	if use doc; then
+		mydoc="html"
+		if use java; then
+			mydoc="${mydoc} ps"
+		fi
+	else
+		mydoc=""
+		# needed to prevent haddock from being called
+		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
+	fi
+	echo XMLDocWays="${mydoc}" >> mk/build.mk
+
+	# disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
+	# thanks to Peter Simons for finding this and giving notice on bugs.gentoo.org
+	# (this is still necessary, even though we have the patch, because
+	# we might be bootstrapping from a version that didn't have the
+	# patch included)
+	setup_cflags
+	echo "SRC_CC_OPTS+=${SUPPORTED_CFLAGS}" >> mk/build.mk
+	echo "SRC_HC_OPTS+=${SUPPORTED_CFLAGS// -/ -optc-}" >> mk/build.mk
+
+	# force the config variable ArSupportsInput to be unset;
+	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
+	# incorrectly by the configure script
+	echo "ArSupportsInput:=" >> mk/build.mk
+
+	# Required for some architectures, because they don't support ghc fully ...
+	use ppc || use ppc64 && echo "SplitObjs=NO" >> mk/build.mk
+	use ppc64 && echo "GhcWithInterpreter=NO" >> mk/build.mk
+
+	econf ${myconf} || die "econf failed"
+
+	# the build does not seem to work all that
+	# well with parallel make
+	emake -j1 all datadir="/usr/share/doc/${PF}" || die "make failed"
+	# the explicit datadir is required to make the haddock entries
+	# in the package.conf file point to the right place ...
+
+}
+
+src_install () {
+	local insttarget
+
+	insttarget="install"
+	use doc && insttarget="${insttarget} install-docs"
+
+	# the libdir0 setting is needed for amd64, and does not
+	# harm for other arches
+	emake -j1 ${insttarget} \
+		prefix="${D}/usr" \
+		datadir="${D}/usr/share/doc/${PF}" \
+		infodir="${D}/usr/share/info" \
+		mandir="${D}/usr/share/man" \
+		libdir0="${D}/usr/$(get_libdir)" \
+		|| die "make ${insttarget} failed"
+
+	#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
+
+	dosbin ${FILESDIR}/ghc-updater
+}
+
+pkg_postinst () {
+	ebegin "Unregistering ghc's built-in cabal "
+	$(ghc-getghcpkg) unregister Cabal > /dev/null
+	eend $?
+	ghc-reregister
+	einfo "If you have dev-lang/ghc-bin installed, you might"
+	einfo "want to unmerge it. It is no longer needed."
+	einfo
+	ewarn "IMPORTANT:"
+	ewarn "If you upgrade from another ghc version, please run"
+	ewarn "/usr/sbin/ghc-updater to re-merge all ghc-based"
+	ewarn "Haskell libraries."
+}
+