New hsshellscript release added. I also blocked hsshellscript-2.2.2 for ghc6.4

Package-Manager: portage-2.0.51.19

5 files changed, 63 insertions, 12 deletions

diff --git a/dev-haskell/hsshellscript/ChangeLog b/dev-haskell/hsshellscript/ChangeLog
index cb5e239e3807..9ffbe982a3e5 100644
--- a/dev-haskell/hsshellscript/ChangeLog
+++ b/dev-haskell/hsshellscript/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/hsshellscript
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/ChangeLog,v 1.5 2005/03/18 15:06:29 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/ChangeLog,v 1.6 2005/04/08 01:33:00 araujo Exp $
+
+*hsshellscript-2.3.0 (07 Apr 2005)
+
+  07 Apr 2005; Luis F. Araujo <araujo@gentoo.org> hsshellscript-2.2.2.ebuild,
+  +hsshellscript-2.3.0.ebuild:
+  New hsshellscript release
 
 *hsshellscript-2.2.2 (18 Mar 2005)
 
diff --git a/dev-haskell/hsshellscript/Manifest b/dev-haskell/hsshellscript/Manifest
index 3a5459dd982d..423b936c99c8 100644
--- a/dev-haskell/hsshellscript/Manifest
+++ b/dev-haskell/hsshellscript/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7047566fac27a009b0c9055b7244d006 ChangeLog 898
+MD5 ccb1cb05bb8d94b568d70b1eb09c231b ChangeLog 1072
 MD5 7d6203f46f91795c95ca6a22ee6dff5a hsshellscript-2.1.0.ebuild 1239
 MD5 3f6e26f4a44d1b5c6ff6380d989e6af6 metadata.xml 222
 MD5 644451fe973c437cf97d3a24a46e07e1 hsshellscript-2.2.0.ebuild 1120
-MD5 01644cea689c96ec8d3aaaee2a41e463 hsshellscript-2.2.2.ebuild 1119
+MD5 342a987a2862d37266ce8637603dd0b1 hsshellscript-2.2.2.ebuild 1073
+MD5 a803e58a525a9589fd00076e531d644a hsshellscript-2.3.0.ebuild 1073
 MD5 29b043a8133ca29f855bd09a4ce05033 files/digest-hsshellscript-2.1.0 71
 MD5 c16f03216f6b47b89224ab176c13aa21 files/digest-hsshellscript-2.2.0 71
 MD5 7ae622841800669416a46ccab3d9a9b0 files/digest-hsshellscript-2.2.2 71
+MD5 e99cbf0bf1d4793de8d69765d43ded70 files/digest-hsshellscript-2.3.0 72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCOu6qBQBy/eDH5uERAmwUAJ9EzJ338Tx1HZfCZJ6sVgoaqw05dgCgsXq+
-M6R1fVEFhkbhXPCEn3VSFmM=
-=6UZA
+iD8DBQFCVd93BQBy/eDH5uERAvPsAKDQXwJF/VP2QsDoCiNtxKFk0wQdHACeLCj5
+PwnXt5vZO3cBzpDOyNDbvgI=
+=Kdjr
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/hsshellscript/files/digest-hsshellscript-2.3.0 b/dev-haskell/hsshellscript/files/digest-hsshellscript-2.3.0
new file mode 100644
index 000000000000..816272c2228d
--- /dev/null
+++ b/dev-haskell/hsshellscript/files/digest-hsshellscript-2.3.0
@@ -0,0 +1 @@
+MD5 437794018c72a080d976682121bad39a hsshellscript-2.3.0.tar.gz 1648240
diff --git a/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild b/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild
index f39a3f1a067d..ad1f347ab971 100644
--- a/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild
+++ b/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild,v 1.1 2005/03/18 15:06:29 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild,v 1.2 2005/04/08 01:33:00 araujo Exp $
 
 inherit base eutils ghc-package
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND=">=virtual/ghc-6.2"
+DEPEND=">=virtual/ghc-6.2
+	!>=virtual/ghc-6.4"
 RDEPEND=""
 
 
@@ -28,11 +29,9 @@ src_compile() {
 }
 
 src_install() {
-	sed -i "s:\${DEST_LIB}:$(ghc-libdir):" \
-		${S}/lib/hsshellscript.pkg
-	sed -i "s:\${DEST_IMPORTS}:$(ghc-libdir)/imports:" \
-		${S}/lib/hsshellscript.pkg
 	ghc-setup-pkg ${S}/lib/hsshellscript.pkg
+	# Fix hsshellscript.pkg library path
+	ghc-fixlibpath "\${DEST_LIB}" "\${DEST_IMPORTS}"
 	make install \
 		DESTDIR="${D}" \
 		DEST_LIB="$(ghc-libdir)" \
diff --git a/dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild b/dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild
new file mode 100644
index 000000000000..fbc0f98b1f24
--- /dev/null
+++ b/dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild,v 1.1 2005/04/08 01:33:00 araujo Exp $
+
+inherit base eutils ghc-package
+
+DESCRIPTION="A Haskell library for UNIX shell scripting tasks"
+HOMEPAGE="http://www.volker-wysk.de/hsshellscript/"
+SRC_URI="http://www.volker-wysk.de/hsshellscript/dist/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=virtual/ghc-6.2
+	!>=virtual/ghc-6.4"
+RDEPEND=""
+
+
+src_unpack() {
+	base_src_unpack
+	cd ${S}
+	sed -i -e "/ghc-pkg/d" Makefile
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	ghc-setup-pkg ${S}/lib/hsshellscript.pkg
+	# Fix hsshellscript.pkg library path
+	ghc-fixlibpath "\${DEST_LIB}" "\${DEST_IMPORTS}"
+	make install \
+		DESTDIR="${D}" \
+		DEST_LIB="$(ghc-libdir)" \
+		DEST_IMPORTS="$(ghc-libdir)/imports" \
+		DEST_DOC="/usr/share/doc/${PF}" \
+		|| die "make failed"
+	ghc-install-pkg
+	ghc-makeghcilib ${D}/$(ghc-libdir)/libhsshellscript.a
+}