Added new revision number.

Package-Manager: portage-2.1_pre4-r1

3 files changed, 3 insertions, 217 deletions

diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 72dbc49e6641..ced870153749 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -13,9 +13,6 @@ SHA256 8dcc9591644345db37aa15ef7ee91a72f2bc358653565d4aadfcf85264f41d9b files/di
 MD5 75417bc4dea34cd08ea105457ccd3032 files/digest-ghc-6.4 65
 RMD160 da3f7883200986441fcccd20fcc0efcedbb8b223 files/digest-ghc-6.4 65
 SHA256 e64b36910754f2b2cf4b82aa22ed5bb4394d9971fb8de08f41cde286caf9170a files/digest-ghc-6.4 65
-MD5 7c38a5e2d5ecf8446f38ff41fa4d4152 files/digest-ghc-6.4.1 67
-RMD160 232a1ace169fa7f49b88e032565d82a3d4285051 files/digest-ghc-6.4.1 67
-SHA256 1c8b5dc526b93d9a85915fa851511c0d4f86928206f748d42e48a747a7aaf760 files/digest-ghc-6.4.1 67
 MD5 67634d2dcbaa8444838580a45ac915d3 files/digest-ghc-6.4.1-r2 247
 RMD160 3a660bda8203ea505f0ae443df45b679d80fe6f3 files/digest-ghc-6.4.1-r2 247
 SHA256 8d86b8d15bea6298f853e838c5d0800e21ad2a4e3eaebfb6ba3c7a75768ec5c5 files/digest-ghc-6.4.1-r2 247
@@ -37,9 +34,6 @@ SHA256 4473941a958beec2da286f5823b62def6737504cd0524a4dcd6aa777847ccd1d ghc-6.2.
 MD5 f65412ecd628a1ccf189880cc1669408 ghc-6.4.1-r2.ebuild 6912
 RMD160 e9016bb0515c19d38613e09449cba9940f65c5f7 ghc-6.4.1-r2.ebuild 6912
 SHA256 19e1be38dd1edeb7dcb05bf915f5f4bb5738c38f26e0036b23af49640768437a ghc-6.4.1-r2.ebuild 6912
-MD5 670ea0013a01dc7771a7ee918ae62187 ghc-6.4.1.ebuild 5943
-RMD160 f1991110799fe8e21417f774888aa0e6b05b166a ghc-6.4.1.ebuild 5943
-SHA256 9eaf0673a3bb7f468111379a87917fb26b5fa5ed28e4c14d0b72c0f1ed006e1c ghc-6.4.1.ebuild 5943
 MD5 9620778937a1aff6ef88863c81222cfc ghc-6.4.ebuild 6109
 RMD160 a6588f6fdd9d5420e13ba1ef545ae35cf647a523 ghc-6.4.ebuild 6109
 SHA256 8bd0631d7a331b61f8686d8c1db0ed7d30a689a723ff53d9a029e3f8ea406a25 ghc-6.4.ebuild 6109
@@ -49,7 +43,7 @@ SHA256 2b30834e4d9f141a1e1b63457d4af1f6a8cb6d4a47f8dd3b14e726277079769b metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD88gSdZ42PGEF17URAhlzAKC1Ff9ejo4j8npic66vm3tNgBKAXACg+4GS
-CT3uf07fefYDCDl8VxGTAS8=
-=+8Ns
+iD8DBQFD8+abdZ42PGEF17URAlilAKD2LHO7gjXtqA+0HjLEFJCDuxsFtACgu6FU
+PZftZof7i6D4ANx7DAlM9X0=
+=HJSC
 -----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
deleted file mode 100644
index 1581d6c5629c..000000000000
--- a/dev-lang/ghc/files/digest-ghc-6.4.1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 0e7eede52b36..000000000000
--- a/dev-lang/ghc/ghc-6.4.1.ebuild
+++ /dev/null
@@ -1,207 +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/ghc-6.4.1.ebuild,v 1.6 2005/10/06 21:47:41 swegener Exp $
-
-# Brief explanation of the bootstrap logic:
-#
-# ghc requires ghc-bin to bootstrap.
-# Therefore, 
-# (1) both ghc-bin and ghc provide virtual/ghc
-# (2) virtual/ghc *must* default to ghc-bin
-# (3) ghc depends on virtual/ghc
-#
-# This solution has the advantage that the binary distribution
-# can be removed once an forall after the first succesful install
-# of ghc.
-
-inherit base flag-o-matic eutils ghc-package
-
-IUSE="doc opengl"
-#java use flag disabled because of bug #106992
-
-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 ~sparc ~ppc"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/ghc"
-
-# ghc cannot usually be bootstrapped using later versions ...
-DEPEND="<virtual/ghc-6.5
-	!>=virtual/ghc-6.6
-	>=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 )
-	opengl? ( virtual/opengl
-		virtual/glu
-		virtual/glut )"
-# removed: java? ( >=dev-java/fop-0.20.5 )
-
-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 || use sparc && 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."
-}
-