Fix for ghc-6.6 and remove unecessary cpphs dep.

(Portage version: 2.1.1-r1)
 (Signed Manifest commit)

3 files changed, 11 insertions, 53 deletions

diff --git a/dev-haskell/uulib/Manifest b/dev-haskell/uulib/Manifest
index ebeded1e5848..0d1876af54de 100644
--- a/dev-haskell/uulib/Manifest
+++ b/dev-haskell/uulib/Manifest
@@ -1,34 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST uulib-0.9.1-src.tar.gz 113155 RMD160 134e84222191434b9361fc748c9767fa06ebd117 SHA256 64e75553bcc6cba55ac0db4f865ae4992eb58b405d82d7c4a6955d27296d9517
 DIST uulib-0.9.2-src.tar.gz 113363 RMD160 a5cccd2e537c81ff163065d2b206e97100767392 SHA1 11f16b5d275d8687bf372c6bd94b77d3d9539f25 SHA256 1de32cbdb494eaa992ad258a32b8aa6fe5dbd9327cd4893c3ad925606d682b35
-EBUILD uulib-0.9.1.ebuild 1076 RMD160 9b22e7d5a4d9ec0930307963687ae779eddf7418 SHA1 69d96bc87362faa3ce2ef0ee682053d394fd7522 SHA256 74f4cfdb5f6f83f18f2501ba10b74245d8afa2f6179b77916e57947172bf73f0
-MD5 7de37feb2e22e18d82c823f9ba280875 uulib-0.9.1.ebuild 1076
-RMD160 9b22e7d5a4d9ec0930307963687ae779eddf7418 uulib-0.9.1.ebuild 1076
-SHA256 74f4cfdb5f6f83f18f2501ba10b74245d8afa2f6179b77916e57947172bf73f0 uulib-0.9.1.ebuild 1076
-EBUILD uulib-0.9.2.ebuild 634 RMD160 c9a44d157d571ff4e4143a5ab963a58892000f14 SHA1 35476067bed778839561172a65677f01bbfc8fec SHA256 45e876c3efce0e8e4946aec2fd0f019fe795e257ede6b106e988bd886c5ad4f2
-MD5 d82a62dae77bee452167125078a31e9c uulib-0.9.2.ebuild 634
-RMD160 c9a44d157d571ff4e4143a5ab963a58892000f14 uulib-0.9.2.ebuild 634
-SHA256 45e876c3efce0e8e4946aec2fd0f019fe795e257ede6b106e988bd886c5ad4f2 uulib-0.9.2.ebuild 634
-MISC ChangeLog 1437 RMD160 ce6ab648f7b3739b4dda9f6ff7f80d5d669cfb0e SHA1 298cf50dc8a68eadf30ce1ba3bc947a68f654429 SHA256 7f34b8edebe9ce76f746698acc37db86d29d7ac919659faf73834ff70f650eab
-MD5 4a9db52e630f34911552871be800a0c7 ChangeLog 1437
-RMD160 ce6ab648f7b3739b4dda9f6ff7f80d5d669cfb0e ChangeLog 1437
-SHA256 7f34b8edebe9ce76f746698acc37db86d29d7ac919659faf73834ff70f650eab ChangeLog 1437
+EBUILD uulib-0.9.2.ebuild 770 RMD160 b6213acbeac8984b9fa08fc1c73376cc8d5bea3c SHA1 c19aaa6fbd900650643a8062923bf7785c55280c SHA256 06e3086900f034ff8c3507c87913d0d272d3fc39895a480facddc138640b26a9
+MD5 f39dd120f5d3f206d795ccef76256cb5 uulib-0.9.2.ebuild 770
+RMD160 b6213acbeac8984b9fa08fc1c73376cc8d5bea3c uulib-0.9.2.ebuild 770
+SHA256 06e3086900f034ff8c3507c87913d0d272d3fc39895a480facddc138640b26a9 uulib-0.9.2.ebuild 770
+MISC ChangeLog 1581 RMD160 96795b12374165b07d1bfa63a642107c910ddb2c SHA1 6aeb1652874ec0cacff2b7c8d51365c84efa7e0a SHA256 f73ba6376cb51ded1492d190f572d7b53b9c5c8d0a3008f9e149ab95e9488439
+MD5 b22420a5de9beb7c8d8a24fe011f2d66 ChangeLog 1581
+RMD160 96795b12374165b07d1bfa63a642107c910ddb2c ChangeLog 1581
+SHA256 f73ba6376cb51ded1492d190f572d7b53b9c5c8d0a3008f9e149ab95e9488439 ChangeLog 1581
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
-MD5 49022110b5f3d3ca9161923409be5858 files/digest-uulib-0.9.1 247
-RMD160 c57246809df01e50dd67e59774d556699643c2f1 files/digest-uulib-0.9.1 247
-SHA256 991b5472f62bdf7e094aeb35eacce079d1b86dbbd341573f5151ead07226664d files/digest-uulib-0.9.1 247
 MD5 fd7e5ee71dfee39f0f72a125cd28f33c files/digest-uulib-0.9.2 247
 RMD160 a91652a08d440ddaff6fcba0564cf32163028279 files/digest-uulib-0.9.2 247
 SHA256 34d2c96897920946114801ebd385b3801c1b50047092948deda68c71f99a0b81 files/digest-uulib-0.9.2 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJHY3WAIrQc5r/yMRArkWAJ9VGVZ1SqZTcA3IJtAUycYoJ8laVACZAffa
-iihAelViTqXyZHCwE1VxJ0g=
-=JGlP
+iD8DBQFFLYHsnUVyUObPUL4RAoeQAKCTMQUr1zUy8nNI7xCzc/C5zVnLGwCgjcDr
+mNghPVlG6G10cul6PB2I108=
+=oc0H
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/uulib/files/digest-uulib-0.9.1 b/dev-haskell/uulib/files/digest-uulib-0.9.1
deleted file mode 100644
index 00068f445281..000000000000
--- a/dev-haskell/uulib/files/digest-uulib-0.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a8f716d0d5a3d4e79002d651aec409ab uulib-0.9.1-src.tar.gz 113155
-RMD160 134e84222191434b9361fc748c9767fa06ebd117 uulib-0.9.1-src.tar.gz 113155
-SHA256 64e75553bcc6cba55ac0db4f865ae4992eb58b405d82d7c4a6955d27296d9517 uulib-0.9.1-src.tar.gz 113155
diff --git a/dev-haskell/uulib/uulib-0.9.1.ebuild b/dev-haskell/uulib/uulib-0.9.1.ebuild
deleted file mode 100644
index dd4ca9f7a621..000000000000
--- a/dev-haskell/uulib/uulib-0.9.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.1.ebuild,v 1.4 2006/03/01 20:04:21 corsair Exp $
-
-CABAL_FEATURES="haddock cpphs lib"
-inherit base haskell-cabal
-
-DESCRIPTION="The Utrecht University parsing, printing and DData libraries"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem"
-SRC_URI="http://abaris.zoo.cs.uu.nl:8080/wiki/pub/HUT/Download/${P}-src.tar.gz"
-LICENSE="LGPL-2.1-UUST"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"	#if possible try testing with ~ppc and ~sparc
-IUSE=""
-
-DEPEND=">=virtual/ghc-6.2.2
-		>=dev-haskell/cpphs-0.9"
-
-src_unpack() {
-	base_src_unpack
-
-	# fixes for cpp that comes with later versions of gcc.
-	# it should really use cpphs instead.
-	sed -i 's:infixl 9 \\\\:infixl 9 \\\\ --not a line continuation:' \
-		"${S}/src/UU/DData/Set.hs"	\
-		"${S}/src/UU/DData/MultiSet.hs" \
-		"${S}/src/UU/DData/IntBag.hs"
-	sed -i 's:infixl 9 !,\\\\:infixl 9 !,\\\\ --not a line continuation:' \
-		"${S}/src/UU/DData/Map.hs"
-}