several small fixes to ghc-bin-5.04.3 and ghc-bin-6.0; see Changelog for details

4 files changed, 34 insertions, 27 deletions

diff --git a/dev-lang/ghc-bin/ChangeLog b/dev-lang/ghc-bin/ChangeLog
index c862e00b1022..b0e9e4c0483f 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.6 2003/06/12 15:24:53 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.7 2003/07/02 10:28:00 kosmikus Exp $
+
+  02 Jul 2003; Andres Loeh <kosmikus@gentoo.org> ghc-bin-5.04.3.ebuild,
+  ghc-bin-6.0.ebuild:
+  Marked 5.04.3 stable. Fixed installation of documentation (now to
+  /usr/share/doc/... The hsc2hs wrapper script no longer contains illegal paths.
 
 *ghc-bin-6.0 (12 Jun 2003)
 
diff --git a/dev-lang/ghc-bin/Manifest b/dev-lang/ghc-bin/Manifest
index 6b22c863ae0c..173d61e85f82 100644
--- a/dev-lang/ghc-bin/Manifest
+++ b/dev-lang/ghc-bin/Manifest
@@ -1,7 +1,7 @@
 MD5 f76a3e13ba398df26d227397c1af59ca ghc-bin-5.04.2.ebuild 1618
-MD5 9a2ae4ae505d756d3476331300c0b703 ghc-bin-5.04.3.ebuild 1700
-MD5 f6f17757192de379dc182655db565707 ghc-bin-6.0.ebuild 1697
-MD5 1faa00112a2a416adf06bac0cf6160ed ChangeLog 1628
+MD5 bc56db1850b8fa8807bc1a45ca76b6cf ghc-bin-5.04.3.ebuild 1522
+MD5 7d5fb5540e11feba842fc13b2882a42c ghc-bin-6.0.ebuild 1520
+MD5 daf780a60930148c2aa55341e0ad3f5f ChangeLog 1872
 MD5 2b946cf5ef71cb59f8d36fe5516b50e0 ghc-bin-5.04.2-r1.ebuild 1703
 MD5 a82ba08a8abb4ae38bcc8d467c665e7b files/10ghc 40
 MD5 1a0c5a5913e05b312194bc44cf1472e5 files/digest-ghc-bin-5.04.2 84
diff --git a/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild b/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild
index 977482dcf7fb..9ca039609cfd 100644
--- a/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild,v 1.1 2003/05/09 09:41:39 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild,v 1.2 2003/07/02 10:28:01 kosmikus Exp $
 
 IUSE="opengl"
 
@@ -11,7 +11,7 @@ SRC_URI="x86? ( http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-i386-unknown-lin
 HOMEPAGE="http://www.haskell.org"
 
 LICENSE="as-is"
-KEYWORDS="~x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 -ppc ~sparc -alpha"
 SLOT="0"
 
 LOC="/opt/ghc"
@@ -42,21 +42,22 @@ src_install () {
 	dodoc ANNOUNCE INSTALL LICENSE README VERSION
 
 	cd ${D}${LOC}/share
-	mkdir ${D}${LOC}/doc/${PF}
-	mv hslibs.ps users_guide.ps html/ ${D}${LOC}/doc/${PF}
+	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
-	mv ghc-${PV} ghc-${PV}-orig
-	sed -e "s:${D}::" ghc-${PV}-orig > ghc-${PV}
-	mv ghci-${PV} ghci-${PV}-orig
-	sed -e "s:${D}::" ghci-${PV}-orig > ghci-${PV}
-	mv ghc-pkg-${PV} ghc-pkg-${PV}-orig
-	sed -e "s:${D}::" ghc-pkg-${PV}-orig > ghc-pkg-${PV}
-	rm ghc-${PV}-orig ghci-${PV}-orig ghc-pkg-${PV}-orig
-	chmod a+x ghc-${PV} ghci-${PV} ghc-pkg-${PV}
+	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.0.ebuild b/dev-lang/ghc-bin/ghc-bin-6.0.ebuild
index bdd305992f73..43410f68a5ef 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.0.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.0.ebuild,v 1.1 2003/06/12 15:24:53 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.0.ebuild,v 1.2 2003/07/02 10:28:01 kosmikus Exp $
 
 IUSE="opengl"
 
@@ -42,21 +42,22 @@ src_install () {
 	dodoc ANNOUNCE INSTALL LICENSE README VERSION
 
 	cd ${D}${LOC}/share
-	mkdir ${D}${LOC}/doc/${PF}
-	mv hslibs.ps users_guide.ps html/ ${D}${LOC}/doc/${PF}
+	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
-	mv ghc-${PV} ghc-${PV}-orig
-	sed -e "s:${D}::" ghc-${PV}-orig > ghc-${PV}
-	mv ghci-${PV} ghci-${PV}-orig
-	sed -e "s:${D}::" ghci-${PV}-orig > ghci-${PV}
-	mv ghc-pkg-${PV} ghc-pkg-${PV}-orig
-	sed -e "s:${D}::" ghc-pkg-${PV}-orig > ghc-pkg-${PV}
-	rm ghc-${PV}-orig ghci-${PV}-orig ghc-pkg-${PV}-orig
-	chmod a+x ghc-${PV} ghci-${PV} ghc-pkg-${PV}
+	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
+}