The ghc-bin ebuild will not be continued. Its function has been merged into the ghc ebuild as of 6.6

Package-Manager: portage-2.1.2.9

4 files changed, 13 insertions, 184 deletions

diff --git a/dev-lang/ghc-bin/ChangeLog b/dev-lang/ghc-bin/ChangeLog
index 883298006df6..5b83b167d84b 100644
--- a/dev-lang/ghc-bin/ChangeLog
+++ b/dev-lang/ghc-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc-bin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.70 2007/07/02 14:41:42 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.71 2007/07/06 01:07:09 dcoutts Exp $
+
+  06 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> -ghc-bin-6.6.ebuild:
+  The ghc-bin ebuild will not be continued. Its function has been merged into
+  the ghc ebuild as of 6.6. There will be no new versions of this ebuild.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   ghc-bin-6.2.2-r1.ebuild, ghc-bin-6.4.1.ebuild, ghc-bin-6.4.1-r1.ebuild,
diff --git a/dev-lang/ghc-bin/Manifest b/dev-lang/ghc-bin/Manifest
index ce34f3114466..e99fb1db1cfd 100644
--- a/dev-lang/ghc-bin/Manifest
+++ b/dev-lang/ghc-bin/Manifest
@@ -29,11 +29,6 @@ DIST ghc-bin-6.4.2-r1-ppc64.tbz2 28803955 RMD160 0bba1bbfae87722e2abab57fc7ad3e0
 DIST ghc-bin-6.4.2-sparc.tbz2 22175545 RMD160 fa8fa8d85a167db895ea74b9ce40590ceae503ab SHA1 0dd7de97eaadf548d152300a131629371648a8aa SHA256 c95edaff53778edcfd275e41f70cadc2fd7e83c058b5d09e2a44081ae1c29d30
 DIST ghc-bin-6.4.2-x86-fbsd.tbz2 19091807 RMD160 6071878b02b87066f8937b671d6414330a41a841 SHA1 9f3a66fcfe872980d073e5f6cb309dcee1a7d2cb SHA256 f2a397d233a491ab65ab43223e7657f7fc47311413e168bcd6a735e705c1acf3
 DIST ghc-bin-6.4.2-x86.tbz2 19367589 RMD160 5d3ad1b92c3785db1090799ee6da6182a4771248 SHA1 71876713bbe4cbd335ac50118c9c50219e02d2a5 SHA256 9628c3d3ca3c095c5c423cffb0d0daf801e518f6d6ace17c032c6ca6d5e3e24c
-DIST ghc-bin-6.6-alpha.tbz2 35338275 RMD160 82b7dca5f3c8b89e7e395da95d596197eca92888 SHA1 931a6d3db14272a72398ed4b520a162f78c84a27 SHA256 3a8e6cacccdb95313a22b8a8c27ecc0311ef83380f303a286f1d8ab216aa4f5d
-DIST ghc-bin-6.6-amd64.tbz2 26093530 RMD160 b44c90a8e3f99a462af0400d0d31c315833606bb SHA1 1bde6e886df681da8ff65529ca1fd288e1b768a0 SHA256 acde821d26abbd0838e5bcd41cbde0daf5a538fea7619e3f2bc6cbe491d4b387
-DIST ghc-bin-6.6-ppc.tbz2 34668445 RMD160 33f811104146dc8ef4d2839f71d39eb821128515 SHA1 b7ab12fe30ada669b7241bd604280674d94a8284 SHA256 f0bc5583396666da4f03f519cec9fc239e96ae06d5fdb5bd951de8dae1cb1d79
-DIST ghc-bin-6.6-sparc.tbz2 30576579 RMD160 0392fc6529f48f34a009dc9d4cd51da68db072eb SHA1 4d748c4b5b504245f1d9c793f57dc0008466371c SHA256 7588d5adc444cf82dfeaa336b4bd6ccf6dbc4621f929ad664ae6742836229503
-DIST ghc-bin-6.6-x86.tbz2 24960612 RMD160 086a7784e616d0d789be8ceb3b3ba01832d3430b SHA1 4f51e60c73e1f256dc4954a2f3191415361436c5 SHA256 38f58d9fef8ccf2544c4da75c4ce6e04393cf261a2de2e253bcafbdaf4e8ea72
 EBUILD ghc-bin-6.2.2-r1.ebuild 1012 RMD160 48afcc70720373f24fa9572b1a7791b2c74808df SHA1 a54ccc601fa64504259dc2df0e17e5e2a2ffd521 SHA256 0843689f8cb56616bf544045d8a53304a31b4b94cc0e0eb5fdf29e790972222e
 MD5 7cfcd47c8f7c286274838e6c7289d777 ghc-bin-6.2.2-r1.ebuild 1012
 RMD160 48afcc70720373f24fa9572b1a7791b2c74808df ghc-bin-6.2.2-r1.ebuild 1012
@@ -54,14 +49,10 @@ EBUILD ghc-bin-6.4.2.ebuild 4655 RMD160 187f0cc4b53e6bd20d65cfb6603db7a92818efe6
 MD5 a6ac59ece98527433f825f7b99284f8a ghc-bin-6.4.2.ebuild 4655
 RMD160 187f0cc4b53e6bd20d65cfb6603db7a92818efe6 ghc-bin-6.4.2.ebuild 4655
 SHA256 a1d8a992b32ff951bd37df5c29ca41f0c419412466fc92c3b8ef3f6218440823 ghc-bin-6.4.2.ebuild 4655
-EBUILD ghc-bin-6.6.ebuild 4533 RMD160 abc37909b03219eb1d3df6031128218e03c1aa03 SHA1 048135cf858101e0e720751e5fd0631d3bee7105 SHA256 30d8f55fd198449423f7c966f908ab5f3277102f4d7780d2a3ea8f04b2ffac5a
-MD5 25238c439b0b915807bcbef75b912fdc ghc-bin-6.6.ebuild 4533
-RMD160 abc37909b03219eb1d3df6031128218e03c1aa03 ghc-bin-6.6.ebuild 4533
-SHA256 30d8f55fd198449423f7c966f908ab5f3277102f4d7780d2a3ea8f04b2ffac5a ghc-bin-6.6.ebuild 4533
-MISC ChangeLog 10828 RMD160 a57a74494079ec49d54adcb0012c1e3ebb5330cc SHA1 c2ef37c74e5bd7c756c2d93950ec81f3a12740e0 SHA256 7d82590f962eff3ec89cdce98f6eb62f5cdff2b608edcd2a73344020491cd74c
-MD5 92a7af45f28ae8957b3cbc479ce589e6 ChangeLog 10828
-RMD160 a57a74494079ec49d54adcb0012c1e3ebb5330cc ChangeLog 10828
-SHA256 7d82590f962eff3ec89cdce98f6eb62f5cdff2b608edcd2a73344020491cd74c ChangeLog 10828
+MISC ChangeLog 11054 RMD160 74f4f446934b3ce65c544258fcbf4a4acf2f3b4c SHA1 788581f12be9f45518886ab31a0bde086d32ba8d SHA256 32c4f96ca36089a875ecbc009a7a5f679f9a21ee49825afffb88af6bd0574345
+MD5 f354199d69a58c810f4fee56d1c9990d ChangeLog 11054
+RMD160 74f4f446934b3ce65c544258fcbf4a4acf2f3b4c ChangeLog 11054
+SHA256 32c4f96ca36089a875ecbc009a7a5f679f9a21ee49825afffb88af6bd0574345 ChangeLog 11054
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -81,13 +72,10 @@ SHA256 06fd71c34403fb1b3fe0c60561bd4597d1afb623fce887c62117204592fa4981 files/di
 MD5 c9c50aef4ac1f140a1c936c30391e897 files/digest-ghc-bin-6.4.2-r1 268
 RMD160 b8e387d43fe47b3b1fcc7939974359fa5d570f23 files/digest-ghc-bin-6.4.2-r1 268
 SHA256 b12465c73b1d2cbfc6e2db3e3dfdafceceb68b5ac63ef197860dfc8e33aa43ce files/digest-ghc-bin-6.4.2-r1 268
-MD5 b540825824e9f4f168b10b123f73bdd7 files/digest-ghc-bin-6.6 1253
-RMD160 1103a477cb5b42d5fab834c5e5cc00ece93e396e files/digest-ghc-bin-6.6 1253
-SHA256 8b439e2c73d60848d846cacff579bf0efd31a8061db646cb4459a5481530499d files/digest-ghc-bin-6.6 1253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGiQ6uppoStNGKGywRAp+pAJ4kF5I4zHIC/rUYIYxFf+JoMIhsmwCgmiX/
-GQPxzLLIWteXhRPdw7+2kMc=
-=yL02
+iD8DBQFGjZXynUVyUObPUL4RAqT+AJ9HLpoBK/aoncHx8DDbeXoqNDiIxACfbUwv
+L/13C/9OKVW5kEvoWauZVD4=
+=ZcO2
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-6.6 b/dev-lang/ghc-bin/files/digest-ghc-bin-6.6
deleted file mode 100644
index ae5de8e9ac5f..000000000000
--- a/dev-lang/ghc-bin/files/digest-ghc-bin-6.6
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 0c97822252e94de3c3a8d588cebbcdcf ghc-bin-6.6-alpha.tbz2 35338275
-RMD160 82b7dca5f3c8b89e7e395da95d596197eca92888 ghc-bin-6.6-alpha.tbz2 35338275
-SHA256 3a8e6cacccdb95313a22b8a8c27ecc0311ef83380f303a286f1d8ab216aa4f5d ghc-bin-6.6-alpha.tbz2 35338275
-MD5 9aac2e2c31e7532b613b871fa9b95694 ghc-bin-6.6-amd64.tbz2 26093530
-RMD160 b44c90a8e3f99a462af0400d0d31c315833606bb ghc-bin-6.6-amd64.tbz2 26093530
-SHA256 acde821d26abbd0838e5bcd41cbde0daf5a538fea7619e3f2bc6cbe491d4b387 ghc-bin-6.6-amd64.tbz2 26093530
-MD5 fbd10ef5e4a5adcb635e1cd8ed288030 ghc-bin-6.6-ppc.tbz2 34668445
-RMD160 33f811104146dc8ef4d2839f71d39eb821128515 ghc-bin-6.6-ppc.tbz2 34668445
-SHA256 f0bc5583396666da4f03f519cec9fc239e96ae06d5fdb5bd951de8dae1cb1d79 ghc-bin-6.6-ppc.tbz2 34668445
-MD5 b5063ed3f244f7816cdc43eea0626d53 ghc-bin-6.6-sparc.tbz2 30576579
-RMD160 0392fc6529f48f34a009dc9d4cd51da68db072eb ghc-bin-6.6-sparc.tbz2 30576579
-SHA256 7588d5adc444cf82dfeaa336b4bd6ccf6dbc4621f929ad664ae6742836229503 ghc-bin-6.6-sparc.tbz2 30576579
-MD5 935c4d43fa82b220010fa593edfe97d0 ghc-bin-6.6-x86.tbz2 24960612
-RMD160 086a7784e616d0d789be8ceb3b3ba01832d3430b ghc-bin-6.6-x86.tbz2 24960612
-SHA256 38f58d9fef8ccf2544c4da75c4ce6e04393cf261a2de2e253bcafbdaf4e8ea72 ghc-bin-6.6-x86.tbz2 24960612
diff --git a/dev-lang/ghc-bin/ghc-bin-6.6.ebuild b/dev-lang/ghc-bin/ghc-bin-6.6.ebuild
deleted file mode 100644
index 38dbabace608..000000000000
--- a/dev-lang/ghc-bin/ghc-bin-6.6.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2007 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.6.ebuild,v 1.5 2007/07/02 14:41:42 peper Exp $
-
-# Note to users of hardened gcc-3.x:
-#
-# If you emerge ghc-bin with hardened gcc it should work fine (because
-# we turn off the hardened features that would otherwise break ghc).
-# However, emerging ghc-bin while using a vanilla gcc and then switching
-# to hardened gcc (using gcc-config) will leave you with a broken ghc. To
-# fix it you would need to either switch back to vanilla gcc or re-emerge
-# ghc-bin (or ghc). Note that also if you are using hardened gcc-3.x and
-# you switch to gcc-4.x that this will also break ghc and you'll need to
-# re-emerge ghc-bin (or ghc). People using vanilla gcc can switch between
-# gcc-3.x and 4.x with no problems.
-
-inherit base multilib flag-o-matic toolchain-funcs ghc-package
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="http://www.haskell.org/ghc/"
-# list all arches for proper digest building:
-SRC_URI="amd64?		( mirror://gentoo/${P}-amd64.tbz2 )
-		 x86?		( mirror://gentoo/${P}-x86.tbz2 )
-		 alpha?		( mirror://gentoo/${P}-alpha.tbz2 )
-		 sparc?		( mirror://gentoo/${P}-sparc.tbz2 )
-		 ppc?		( mirror://gentoo/${P}-ppc.tbz2 )"
-
-LICENSE="as-is"
-KEYWORDS="-* ~alpha ~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="" # use the non-binary version if you want to have more choice
-
-RESTRICT="strip" # already stripped
-
-LOC="/opt/ghc"
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=dev-libs/gmp-4.1
-	=sys-libs/readline-5*"
-
-PDEPEND=">=dev-haskell/cabal-1.1.6.1"
-
-PROVIDE="virtual/ghc"
-
-S="${WORKDIR}"
-
-append-ghc-cflags() {
-	local flag compile assemble link
-	for flag in $*; do
-		case ${flag} in
-			compile)	compile="yes";;
-			assemble)	assemble="yes";;
-			link)		link="yes";;
-			*)
-				[[ ${compile}  ]] && GHC_CFLAGS="${GHC_CFLAGS} -optc${flag}"
-				[[ ${assemble} ]] && GHC_CFLAGS="${GHC_CFLAGS} -opta${flag}"
-				[[ ${link}     ]] && GHC_CFLAGS="${GHC_CFLAGS} -optl${flag}";;
-		esac
-	done
-}
-
-ghc_setup_cflags() {
-	# We need to be very careful with the CFLAGS we ask ghc to pass through to
-	# gcc. There are plenty of flags which will make gcc produce output that
-	# breaks ghc in various ways. The main ones we want to pass through are
-	# -mcpu / -march flags. These are important for arches like alpha & sparc.
-	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
-	strip-flags
-	strip-unsupported-flags
-	filter-flags -fPIC
-
-	GHC_CFLAGS=""
-	for flag in ${CFLAGS}; do
-		case ${flag} in
-
-			# Ignore extra optimisation (ghc passes -O to gcc anyway)
-			# -O2 and above break on too many systems
-			-O*) ;;
-
-			# Arch and ABI flags are what we're really after
-			-m*) append-ghc-cflags compile assemble ${flag};;
-
-			# Debugging flags don't help either. You can't debug Haskell code
-			# at the C source level and the mangler discards the debug info.
-			-g*) ;;
-
-			# Ignore all other flags, including all -f* flags
-		esac
-	done
-
-	# hardened-gcc needs to be disabled, because the mangler doesn't accept
-	# its output.
-	gcc-specs-pie && append-ghc-cflags compile link	-nopie
-	gcc-specs-ssp && append-ghc-cflags compile		-fno-stack-protector
-
-	# We also add -Wa,--noexecstack to get ghc to generate .o files with
-	# non-exectable stack. This it a hack until ghc does it itself properly.
-	append-ghc-cflags assemble "-Wa,--noexecstack"
-}
-
-ghc_setup_wrapper() {
-	echo '#!/bin/bash'
-	echo "GHCBIN=\"${LOC}/$(get_libdir)/ghc-$1/ghc-$1\";"
-	echo "TOPDIROPT=\"-B${LOC}/$(get_libdir)/ghc-$1\";"
-	echo "GHC_CFLAGS=\"${GHC_CFLAGS}\";"
-	echo '# Mini-driver for GHC'
-	echo 'exec $GHCBIN $TOPDIROPT $GHC_CFLAGS ${1+"$@"}'
-}
-
-src_unpack() {
-	base_src_unpack
-
-	# Setup the ghc wrapper script
-	ghc_setup_cflags
-	ghc_setup_wrapper ${PV} > "${S}/usr/bin/ghc-${PV}"
-
-	# Relocate from /usr to /opt/ghc
-	sed -i -e "s|/usr|${LOC}|g" \
-		"${S}/usr/bin/ghci-${PV}" \
-		"${S}/usr/bin/ghc-pkg-${PV}" \
-		"${S}/usr/bin/hsc2hs" \
-		"${S}/usr/$(get_libdir)/ghc-${PV}/package.conf"
-
-	sed -i -e "s|/usr/$(get_libdir)|${LOC}/$(get_libdir)|" \
-		"${S}/usr/bin/ghcprof"
-}
-
-src_compile() {
-	true
-}
-
-src_install () {
-	mkdir "${D}/opt"
-	mv "${S}/usr" "${D}/opt/ghc"
-
-	doenvd "${FILESDIR}/10ghc"
-}
-
-pkg_postinst () {
-	ghc-reregister
-	ewarn "IMPORTANT:"
-	ewarn "If you have upgraded from another version of ghc-bin or"
-	ewarn "if you have switched from ghc to ghc-bin, please run:"
-	ewarn "	/opt/ghc/sbin/ghc-updater"
-	ewarn "to re-merge all ghc-based Haskell libraries."
-}