Remove old version.

Package-Manager: portage-2.1.1-r1

11 files changed, 21 insertions, 321 deletions

diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
index 9388f82b8f45..b0cdc3d954bb 100644
--- a/dev-haskell/cpphs/Manifest
+++ b/dev-haskell/cpphs/Manifest
@@ -1,13 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST cpphs-0.9.tar.gz 40972 RMD160 7799c2031f80a10ab3edde80247db17df3f8f88a SHA1 4922f70e5a21485ff2b801bf18f25582a4c82b3b SHA256 94686afac6fc2f4729808af28be059880a9f76372ca2c772c24798ac14365364
 DIST cpphs-1.1.tar.gz 44099 RMD160 d1cc3484da2b6224623c7e5923702643cf904693 SHA1 dbf2c8c5ce7facb82d47bb70a554b7b0915c731f SHA256 468c47e1d08d1385ec58c0a34a6899a43df4197bd7014df543ae33d8c1798fea
 DIST cpphs-1.2.tar.gz 89417 RMD160 18613eb0bafb580f4611a9deef14d66270ab2ff6 SHA1 b000ba9e54ec0d0a07785bee0a0d965a51a6c250 SHA256 6e2c407ca0a52cce9ee1e487381263627bcfa6f7373dc8162aafafc00b3cdb28
-EBUILD cpphs-0.9.ebuild 711 RMD160 95e9b8e283e358f3001d507c8a39a7b93563bb27 SHA1 11665c9261a37bbdfb3094c52507371a628c8245 SHA256 37982c14e41cc6b2474503ad9f54782f43b6b5fb763baf558ee0ab88f4130c90
-MD5 244890aba58dd16c31bdfffbbf2e7649 cpphs-0.9.ebuild 711
-RMD160 95e9b8e283e358f3001d507c8a39a7b93563bb27 cpphs-0.9.ebuild 711
-SHA256 37982c14e41cc6b2474503ad9f54782f43b6b5fb763baf558ee0ab88f4130c90 cpphs-0.9.ebuild 711
 EBUILD cpphs-1.1.ebuild 627 RMD160 b2f8742df31ebd712a8a9bee37d24e7247d04bf7 SHA1 bc8d0b289a3e98640bec28e7ca077dfdeb225dfe SHA256 4967ceed24b62ba2e1ceeb25bc180015ddecfc2620b776bbcb5c356c6d354366
 MD5 02d3d23b0fabd885905150d92162a809 cpphs-1.1.ebuild 627
 RMD160 b2f8742df31ebd712a8a9bee37d24e7247d04bf7 cpphs-1.1.ebuild 627
@@ -16,17 +11,14 @@ EBUILD cpphs-1.2.ebuild 629 RMD160 860ad2ee39c0a7000abd10e59ba886040af70a16 SHA1
 MD5 2b15e117847f7f29bd4f2d3a85477700 cpphs-1.2.ebuild 629
 RMD160 860ad2ee39c0a7000abd10e59ba886040af70a16 cpphs-1.2.ebuild 629
 SHA256 209f348ecc8d794ea4235fafef22180816197aeab9fc755d4a8bafa2bbeaf071 cpphs-1.2.ebuild 629
-MISC ChangeLog 1953 RMD160 488c3affb7240dd81411c1fd9ad50583cedacb50 SHA1 4d8d94e06f2829da9882ea6680971abfccbb7e87 SHA256 e0ddc39448675a6f76bebfab2bc9ff946abfa83f79abcaedb632cac6f40d4f2a
-MD5 6f76ef9d9b8df17c15f5c4266196a6ca ChangeLog 1953
-RMD160 488c3affb7240dd81411c1fd9ad50583cedacb50 ChangeLog 1953
-SHA256 e0ddc39448675a6f76bebfab2bc9ff946abfa83f79abcaedb632cac6f40d4f2a ChangeLog 1953
+MISC ChangeLog 2045 RMD160 343d0fc9e2bd9c1f5f13bc508a61f61ffba83dcb SHA1 74eb221bb16969362b9b22625b3dc3d4c227f551 SHA256 ee2fa76f5513de8830f4dfd64b6d40bdf4c385b660cd3ef4fac45a614175e104
+MD5 1a8ad1f7437f6c0f4a0e7f4c8fc2a059 ChangeLog 2045
+RMD160 343d0fc9e2bd9c1f5f13bc508a61f61ffba83dcb ChangeLog 2045
+SHA256 ee2fa76f5513de8830f4dfd64b6d40bdf4c385b660cd3ef4fac45a614175e104 ChangeLog 2045
 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 2f5c3d2982d0a0193cab3769c18b281c files/digest-cpphs-0.9 226
-RMD160 9c9fdda390324e2c5dbb696053746b6b5a67e4fd files/digest-cpphs-0.9 226
-SHA256 63b7ed84d73485d375952b7e6701444c637f1ba5a20e2d80dd24e8f459eae599 files/digest-cpphs-0.9 226
 MD5 1cb1cfbb1a14a383dbe1bb7be25281b9 files/digest-cpphs-1.1 226
 RMD160 7ac88b459b36e51610ab2ad04b11471213624042 files/digest-cpphs-1.1 226
 SHA256 11b5b044bf17698cd012a6e9fd572d620dacd595b4b2664e87feebd462c79d56 files/digest-cpphs-1.1 226
@@ -36,7 +28,7 @@ SHA256 870fc6bb28f72d2f903e831e8825039a198e11bc38a5e0b191b07c501658cf1e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLTnCnUVyUObPUL4RApyvAJ9s95owQrf3acHmrS7AHSWPLG+D6wCgjuH5
-YEUDe1tEIaD6IrCGx0emugI=
-=1MTo
+iD8DBQFFLo+vnUVyUObPUL4RApnxAKCCwN/V0RbBVAOv4K9QGdfsoQSDBgCgkrPg
+VNVe0bc/087aqFXbHz8E1Y8=
+=ZE4M
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cpphs/cpphs-0.9.ebuild b/dev-haskell/cpphs/cpphs-0.9.ebuild
deleted file mode 100644
index 4138ad6e5ad8..000000000000
--- a/dev-haskell/cpphs/cpphs-0.9.ebuild
+++ /dev/null
@@ -1,27 +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/cpphs/cpphs-0.9.ebuild,v 1.4 2006/10/11 18:38:06 dcoutts Exp $
-
-inherit eutils ghc-package
-
-DESCRIPTION="A liberalised cpp-a-like preprocessor for Haskell"
-HOMEPAGE="http://www.cs.york.ac.uk/fp/cpphs/"
-SRC_URI="http://www.cs.york.ac.uk/fp/cpphs/${P}.tar.gz"
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
-IUSE=""
-DEPEND=">=virtual/ghc-5.04"
-
-src_compile() {
-	$(ghc-getghc) --make -O cpphs.hs -o cpphs \
-		|| die "ghc --make failed"
-}
-
-src_install() {
-	dobin ${S}/cpphs
-	dodoc README CHANGELOG
-	doman docs/cpphs.1
-	dohtml docs/index.html
-}
diff --git a/dev-haskell/cpphs/files/digest-cpphs-0.9 b/dev-haskell/cpphs/files/digest-cpphs-0.9
deleted file mode 100644
index 1330115c4fad..000000000000
--- a/dev-haskell/cpphs/files/digest-cpphs-0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d40cb6dda342ba66d8ee61f3e6fe09a0 cpphs-0.9.tar.gz 40972
-RMD160 7799c2031f80a10ab3edde80247db17df3f8f88a cpphs-0.9.tar.gz 40972
-SHA256 94686afac6fc2f4729808af28be059880a9f76372ca2c772c24798ac14365364 cpphs-0.9.tar.gz 40972
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index e28e8219f662..4c76d2edf800 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,17 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX haddock-0.6-gcc3.4.patch 1967 RMD160 dc471269e499640c2cc5089fd850cc615ecdac1d SHA1 3e37e4f23d4dc450f1a7f3fc7fe18d24b465f6dd SHA256 6911e8ace7522a3c3ededfd8ac0c0a01863afa312d8a690bd9aa269851546671
-MD5 bd211a7c5442dadeee6975dbb15f2e45 files/haddock-0.6-gcc3.4.patch 1967
-RMD160 dc471269e499640c2cc5089fd850cc615ecdac1d files/haddock-0.6-gcc3.4.patch 1967
-SHA256 6911e8ace7522a3c3ededfd8ac0c0a01863afa312d8a690bd9aa269851546671 files/haddock-0.6-gcc3.4.patch 1967
-DIST haddock-0.6-src.tar.gz 429708 RMD160 4c1b282571713db65a2f6e05c0bdd0a4ac08ad23 SHA1 51c6fcf8b8a4e88e49815d62b23728b3195a96ae SHA256 86d8be59840ec43c149271b2ef745023a70c0f78dc0d66a1d8338b6437a79785
 DIST haddock-0.7-src.tar.gz 424745 RMD160 4cd90829970d576e94cb95276c7777d8d37991f0 SHA1 4f5606cfbc8858ab56a5e929dcaa92aafa483f93 SHA256 c33e80106a42b2400c358cb0f293e2e7979ef5dab2dec8c55c72b7a57a9f6217
 DIST haddock-0.8-src.tar.gz 162872 RMD160 80b7a582ea91fb36b97675d7ea8a027221a28b8e SHA1 e171d4446ac6fcef526cad4c688892fe587fe90e SHA256 d54078dd9dc75aa589cb05fbe1136c1fb41d4a346e30b71de948425ea7c05a55
-EBUILD haddock-0.6-r3.ebuild 2895 RMD160 268e8772355e50aec7a62d4dcc454cad155228e4 SHA1 71b0004492ab45b24a4bc915529b23227e8acac0 SHA256 d539e42529af3c56bb4e3a46bf075f776e47ac023ab4ec1417d4fa77eb42853a
-MD5 c1dc72fd2a7923d460c09e6ff273f5d0 haddock-0.6-r3.ebuild 2895
-RMD160 268e8772355e50aec7a62d4dcc454cad155228e4 haddock-0.6-r3.ebuild 2895
-SHA256 d539e42529af3c56bb4e3a46bf075f776e47ac023ab4ec1417d4fa77eb42853a haddock-0.6-r3.ebuild 2895
 EBUILD haddock-0.7.ebuild 2544 RMD160 509dc42c1a288d734723f18855e8e3835af367d4 SHA1 a9050ee692c2ecc06c438f8e057eef7c41b971df SHA256 3e9185d88bf54536681be0bf59d54cf2e76f4afbc02bdd8c2bf147d25ab7d73d
 MD5 d6a61adf97a2e38e542d9680f2608f2c haddock-0.7.ebuild 2544
 RMD160 509dc42c1a288d734723f18855e8e3835af367d4 haddock-0.7.ebuild 2544
@@ -20,17 +11,14 @@ EBUILD haddock-0.8.ebuild 1112 RMD160 10a2a696d00f1250fa75cf0673d153b592d1d8da S
 MD5 30c9aaeed08c741b09fe0b04fd0d06c2 haddock-0.8.ebuild 1112
 RMD160 10a2a696d00f1250fa75cf0673d153b592d1d8da haddock-0.8.ebuild 1112
 SHA256 44e219723d0b67a3c8bad82145bf01111a8809c04f0d94b94a5950f44b068d08 haddock-0.8.ebuild 1112
-MISC ChangeLog 5533 RMD160 5c1a90890d3e1a9ad82f9b108fd71d755dfcb5e6 SHA1 34a96a471c722c6d042f6ac71f0916a1c1b38a6f SHA256 ea41b9e50809a679415b4d2dc51cd994c40c9eaa0d6c79e8071b3c59d98270ea
-MD5 4b1e8772c58f03773a8a464a45043245 ChangeLog 5533
-RMD160 5c1a90890d3e1a9ad82f9b108fd71d755dfcb5e6 ChangeLog 5533
-SHA256 ea41b9e50809a679415b4d2dc51cd994c40c9eaa0d6c79e8071b3c59d98270ea ChangeLog 5533
+MISC ChangeLog 5665 RMD160 9cbface95fccbd9ecab8f3fcdde0e842224b13fe SHA1 1f878ef7c563cc91d2fdad2b3fdb5ed6f8d45906 SHA256 32a09d7cacfe3008e4a54aeab11d87e0f4c4e4e6f7c9f15fdd50a233943c43c5
+MD5 511de40a30818559edb7d70703336084 ChangeLog 5665
+RMD160 9cbface95fccbd9ecab8f3fcdde0e842224b13fe ChangeLog 5665
+SHA256 32a09d7cacfe3008e4a54aeab11d87e0f4c4e4e6f7c9f15fdd50a233943c43c5 ChangeLog 5665
 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 7b343c047681cf5e9bdf7f3b1a016efa files/digest-haddock-0.6-r3 247
-RMD160 cc41fc8acc668edb5130775a87cd13e77171e494 files/digest-haddock-0.6-r3 247
-SHA256 1cecb412c6c701cfef9901cf074ed311541a290ff979d8793a7bb1025e09e136 files/digest-haddock-0.6-r3 247
 MD5 e386d6d9dde27815e5f6082f1f74d3de files/digest-haddock-0.7 247
 RMD160 9d337c6d5188a416b7c723c1c8a261f2959a2560 files/digest-haddock-0.7 247
 SHA256 21b4d64b16ca5700fb8e0d51fecdbd1f70bd9340edd1094d33a43d907bb385e3 files/digest-haddock-0.7 247
@@ -40,7 +28,7 @@ SHA256 2719fc0c4edbfad95ce14105f3318f40e9b5aad3a0a9f633843dedfd00a0181f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLZbjnUVyUObPUL4RAhgiAJ9pUa0ZA/UbzWsU5/7qREF2qatmAQCfb9DT
-A4DtzYKwD1VvtvPgpeovVV0=
-=LV+u
+iD8DBQFFLo8QnUVyUObPUL4RAlU1AJ4t8DC196WGYtxMRzrEa4vHYB/mVACffYi+
+iI8iJvoi/l4IXJcmkYvfSU4=
+=kCRP
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/files/digest-haddock-0.6-r3 b/dev-haskell/haddock/files/digest-haddock-0.6-r3
deleted file mode 100644
index 1ed94c863348..000000000000
--- a/dev-haskell/haddock/files/digest-haddock-0.6-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6f15d15a3e4352f77f003fb133b1d9b2 haddock-0.6-src.tar.gz 429708
-RMD160 4c1b282571713db65a2f6e05c0bdd0a4ac08ad23 haddock-0.6-src.tar.gz 429708
-SHA256 86d8be59840ec43c149271b2ef745023a70c0f78dc0d66a1d8338b6437a79785 haddock-0.6-src.tar.gz 429708
diff --git a/dev-haskell/haddock/files/haddock-0.6-gcc3.4.patch b/dev-haskell/haddock/files/haddock-0.6-gcc3.4.patch
deleted file mode 100644
index 81de6bb12dfc..000000000000
--- a/dev-haskell/haddock/files/haddock-0.6-gcc3.4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur haddock-0.6.orig/haddock/src/HaddockUtil.hs haddock-0.6/haddock/src/HaddockUtil.hs
---- haddock-0.6.orig/haddock/src/HaddockUtil.hs	2004-10-21 15:00:16.000000000 +0200
-+++ haddock-0.6/haddock/src/HaddockUtil.hs	2004-10-21 15:51:10.211521360 +0200
-@@ -188,12 +188,12 @@
- 
- moduleHeaderRE :: Regex
- moduleHeaderRE = mkRegexWithOpts
--			 "^([ \t\n]*Module[ \t]*:.*\n)?\ 
--			  \([ \t\n]*Copyright[ \t]*:.*\n)?\ 
--			  \([ \t\n]*License[ \t]*:.*\n)?\ 
--			  \[ \t\n]*Maintainer[ \t]*:(.*)\n\ 
--			  \[ \t\n]*Stability[ \t]*:(.*)\n\ 
--			  \[ \t\n]*Portability[ \t]*:([^\n]*)\n"
-+			( "^([ \t\n]*Module[ \t]*:.*\n)?" ++
-+			  "([ \t\n]*Copyright[ \t]*:.*\n)?" ++
-+			  "([ \t\n]*License[ \t]*:.*\n)?" ++
-+			  "[ \t\n]*Maintainer[ \t]*:(.*)\n" ++
-+			  "[ \t\n]*Stability[ \t]*:(.*)\n" ++
-+			  "[ \t\n]*Portability[ \t]*:([^\n]*)\n" )
- 		True -- match "\n" with "."
- 		False -- not case sensitive
- 	-- All fields except the last (Portability) may be multi-line.
-diff -Naur haddock-0.6.orig/haddock/src/HaddockVersion.hs haddock-0.6/haddock/src/HaddockVersion.hs
---- haddock-0.6.orig/haddock/src/HaddockVersion.hs	2004-10-21 15:00:16.000000000 +0200
-+++ haddock-0.6/haddock/src/HaddockVersion.hs	2004-10-21 15:51:13.734985712 +0200
-@@ -14,5 +14,4 @@
- 
- -- The version comes in via CPP from mk/version.mk
- projectVersion :: String
--projectVersion = tail "\ 
--  \ HADDOCK_VERSION"
-+projectVersion = "0.6"
-diff -Naur haddock-0.6.orig/haddock/src/Main.hs haddock-0.6/haddock/src/Main.hs
---- haddock-0.6.orig/haddock/src/Main.hs	2004-10-21 15:00:16.000000000 +0200
-+++ haddock-0.6/haddock/src/Main.hs	2004-10-21 15:51:19.185157160 +0200
-@@ -460,8 +460,8 @@
- 
-   when (not (null name_strings)) $
- 	  tell ["Warning: " ++ show mdl ++ 
--		": the following names could not be resolved:\n\ 
--		\   " ++ concat (map (' ':) name_strings)
-+		": the following names could not be resolved:\n" ++
-+		"   " ++ concat (map (' ':) name_strings)
- 		]
- 
-   return (mdl, Interface { 
diff --git a/dev-haskell/haddock/haddock-0.6-r3.ebuild b/dev-haskell/haddock/haddock-0.6-r3.ebuild
deleted file mode 100644
index 9d117e3078a1..000000000000
--- a/dev-haskell/haddock/haddock-0.6-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.11 2005/09/19 06:50:33 araujo Exp $
-#
-# USE variable summary:
-#   doc    - Build extra documenation from DocBook sources,
-#               in HTML format.
-#   tetex  - Build the above docs as PostScript as well.
-
-
-inherit base eutils ghc-package multilib
-IUSE="doc tetex"
-
-DESCRIPTION="A documentation tool for Haskell"
-SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
-HOMEPAGE="http://www.haskell.org/haddock"
-
-SLOT="0"
-KEYWORDS="x86 ppc ~amd64 sparc"
-LICENSE="as-is"
-
-DEPEND="virtual/ghc
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		~app-text/docbook-sgml-dtd-3.1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		tetex? ( virtual/tetex
-		>=app-text/jadetex-3.12 ) )"
-
-RDEPEND=""
-
-pkg_setup() {
-	if ! has_version virtual/ghc; then
-		eerror "Due to a bug in the portage dependency resolution, emerge"
-		eerror "sometimes tries to merge haddock before a version of ghc"
-		eerror "is available on the system. This is usually triggered when"
-		eerror "you try to bootstrap ghc on a system with USE=\"doc\" using"
-		eerror "the command"
-		eerror
-		eerror "   emerge ghc"
-		eerror
-		eerror "To resolve this problem, proceed in two steps. First, emerge"
-		eerror "haddock (which should first pull in ghc-bin). Second, emerge"
-		eerror "ghc again:"
-		eerror
-		eerror "   emerge haddock"
-		eerror "   emerge ghc"
-		die "portage dependency problem"
-	fi
-}
-
-src_unpack() {
-	base_src_unpack
-	epatch ${FILESDIR}/${P}-gcc3.4.patch
-}
-
-src_compile() {
-	# unset SGML_CATALOG_FILES because documentation installation
-	# breaks otherwise ...
-	SGML_CATALOG_FILES="" econf || die "econf failed"
-
-	if $(ghc-cabal); then
-		echo "SRC_HC_OPTS += -package mtl" >> mk/build.mk
-	fi
-
-	# using -j1 because -j2 behaved strangely on my machine
-	emake -j1 || die "make failed"
-
-	# if documentation has been requested, build documentation ...
-	if use doc; then
-		cd ${S}/haddock/doc
-		emake html \
-			datadir="/usr/share/doc/${PF}" \
-			|| die "emake html failed"
-		if use tetex; then
-			emake ps \
-				datadir="/usr/share/doc/${PF}" \
-				|| die "emake ps failed"
-		fi
-	fi
-}
-
-src_install() {
-	local mydoc
-
-	# the libdir0 setting is needed for amd64, and does not
-	# harm for other arches
-	make install \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/${P}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" \
-		libdir0="${D}/usr/$(get_libdir)" \
-		|| die "make install failed"
-
-	cd ${S}/haddock
-	dodoc CHANGES LICENSE README TODO
-
-	if use doc; then
-		cd ${S}/haddock/doc
-		dohtml -r haddock/* || die "html docs couldn't be installed"
-		dosym haddock.html /usr/share/doc/${PF}/html/index.html
-		if use tetex; then
-			docinto ps
-			dodoc haddock.ps || die "ps docs couldn't be installed"
-		fi
-	fi
-}
diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
index b7da69d6a2e2..5f8a7a6b3045 100644
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -1,42 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX happy-1.14-gcc3.4.patch 1849 RMD160 b7d901844f4bc24c5f224cceb225fdbf4f5796bd SHA1 6285800a442c371f9a450805ffac2305ff5eadf4 SHA256 403955cb6b84a123223685800fbf0f1ab48f3704537706b3d5578741e78eceab
-MD5 ccdd754a8212bb8a0ad2fa759a297250 files/happy-1.14-gcc3.4.patch 1849
-RMD160 b7d901844f4bc24c5f224cceb225fdbf4f5796bd files/happy-1.14-gcc3.4.patch 1849
-SHA256 403955cb6b84a123223685800fbf0f1ab48f3704537706b3d5578741e78eceab files/happy-1.14-gcc3.4.patch 1849
 AUX happy-1.15-ghc66.patch 1347 RMD160 d99f02830dc4af87828d4602e13404394ccae6c8 SHA1 a3b6ef1164ecae7b7f19718194f9e4b00954267e SHA256 06e18354fe372ce7c37a9a10a400e04a4dcb29edc9aed569edc42fc52e1390db
 MD5 6e76bf7c5f9f1b50b0a4992355997e94 files/happy-1.15-ghc66.patch 1347
 RMD160 d99f02830dc4af87828d4602e13404394ccae6c8 files/happy-1.15-ghc66.patch 1347
 SHA256 06e18354fe372ce7c37a9a10a400e04a4dcb29edc9aed569edc42fc52e1390db files/happy-1.15-ghc66.patch 1347
-DIST happy-1.14-src.tar.gz 473967
 DIST happy-1.15-src.tar.gz 510037 RMD160 ade977d45970841c94f1e9dbb52809d9a9aae37c SHA1 11bc945edb03280e8a5825ec1124cb9f84467c2f SHA256 451715306f2e602fa425776b81e22a8bc59a0c9a812fa1ee824c0a9a81767534
-EBUILD happy-1.14.ebuild 716 RMD160 f8ce286a07e3dcef9e0c519439c968aec2fdb173 SHA1 b129a8f84bf579a2e7182c1f569326613d837fb7 SHA256 7ffe70fa8868afd5259214f3eefc6320888d03aa29d21b1c66ec17298a831e22
-MD5 2abcf920e72ad1afe942d318c2b7db45 happy-1.14.ebuild 716
-RMD160 f8ce286a07e3dcef9e0c519439c968aec2fdb173 happy-1.14.ebuild 716
-SHA256 7ffe70fa8868afd5259214f3eefc6320888d03aa29d21b1c66ec17298a831e22 happy-1.14.ebuild 716
 EBUILD happy-1.15.ebuild 1560 RMD160 0c01bf21334d520357ffda5506ddd73c511482c9 SHA1 7af419d58da4ef781ba9f37e2a07c8258c40b2bb SHA256 d84d51a8cc5071a831c6160e961bfbebf76bce3972a25e7968f7f607dc92a2b3
 MD5 de5689a2084a50d29c260dbbdda844bd happy-1.15.ebuild 1560
 RMD160 0c01bf21334d520357ffda5506ddd73c511482c9 happy-1.15.ebuild 1560
 SHA256 d84d51a8cc5071a831c6160e961bfbebf76bce3972a25e7968f7f607dc92a2b3 happy-1.15.ebuild 1560
-MISC ChangeLog 2728 RMD160 f820bb762787d93b1dbb1f6a7779f2a8f69ef916 SHA1 cc38ee89384ad2f00b7d918aa1b5575c0201fc9c SHA256 7e93c3266ca28a9514c0c73a67032075c4b5aff681b78732f6a403a1cb7d8ee8
-MD5 e2671f0e11628e488326db58f5eb2537 ChangeLog 2728
-RMD160 f820bb762787d93b1dbb1f6a7779f2a8f69ef916 ChangeLog 2728
-SHA256 7e93c3266ca28a9514c0c73a67032075c4b5aff681b78732f6a403a1cb7d8ee8 ChangeLog 2728
+MISC ChangeLog 2855 RMD160 79fb29e1c28bfa6ae6591384d7afe44ca3984216 SHA1 91196fb7f539452a0a14428adeb01e57f55f4db3 SHA256 c76b676da056ce30ce436e0cdc3e7d5bbdcda9af0b69687f7e8afa571609f3d7
+MD5 ae0071925925bcdbeaab2fdd6d74acef ChangeLog 2855
+RMD160 79fb29e1c28bfa6ae6591384d7afe44ca3984216 ChangeLog 2855
+SHA256 c76b676da056ce30ce436e0cdc3e7d5bbdcda9af0b69687f7e8afa571609f3d7 ChangeLog 2855
 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 e4734e57e0ebad5144da11376e6aed02 files/digest-happy-1.14 66
-RMD160 54e27a98f049966aa899237a24ce7036f0145e98 files/digest-happy-1.14 66
-SHA256 3020cbc3c6cdf8b501c6c384fa408fa7594ef802596cf8d0d24f53ed6250a45d files/digest-happy-1.14 66
 MD5 341201daf72e94c7e89d0976c81713e4 files/digest-happy-1.15 244
 RMD160 962552c8438be8bb3afcc7577ca01ff8aed0adc0 files/digest-happy-1.15 244
 SHA256 94355ae4af5f39cf7c316a503ab51a37b6e3d9e631c1f5950b2c8cb4697f96d0 files/digest-happy-1.15 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLThQnUVyUObPUL4RAueoAJ9KjvsNphZRCB+66Uzhp1MVCzeOggCdHDGt
-cJcPxkM2xB+fVMI8vSzDvmc=
-=8zfD
+iD8DBQFFLo53nUVyUObPUL4RAnosAJwJw/UQWIJXVVhuVw/C0VmmyIkSZACfZFKX
+/LoavGOlX4E+jizDmajYgN4=
+=iC08
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/happy/files/digest-happy-1.14 b/dev-haskell/happy/files/digest-happy-1.14
deleted file mode 100644
index b71d8616161f..000000000000
--- a/dev-haskell/happy/files/digest-happy-1.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 501b5b63533b2e2838de18085e8c4492 happy-1.14-src.tar.gz 473967
diff --git a/dev-haskell/happy/files/happy-1.14-gcc3.4.patch b/dev-haskell/happy/files/happy-1.14-gcc3.4.patch
deleted file mode 100644
index 0dd915cb77f3..000000000000
--- a/dev-haskell/happy/files/happy-1.14-gcc3.4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur happy-1.14.orig/happy/src/Main.lhs happy-1.14/happy/src/Main.lhs
---- happy-1.14.orig/happy/src/Main.lhs	2004-10-21 17:03:27.923088968 +0200
-+++ happy-1.14/happy/src/Main.lhs	2004-10-21 17:03:55.192943320 +0200
-@@ -417,20 +417,11 @@
- 
- CPP is turned on for -fglasogw-exts, so we can use conditional compilation:
- 
--> import_glaexts = "#if __GLASGOW_HASKELL__ >= 503\n\ 
--> 		   \import GHC.Exts\n\ 
-->		   \#else\n\ 
-->		   \import GlaExts\n\ 
-->		   \#endif\n"
--
--> import_debug = "#if __GLASGOW_HASKELL__ >= 503\n\ 
--> 		   \import System.IO\n\ 
--> 		   \import System.IO.Unsafe\n\ 
--> 		   \import Debug.Trace\n\ 
-->		   \#else\n\ 
-->		   \import IO\n\ 
-->		   \import IOExts\n\ 
-->		   \#endif\n"
-+> import_glaexts = 
-+>   "#if __GLASGOW_HASKELL__ >= 503\nimport GHC.Exts\n#else\nimport GlaExts\n#endif\n"
-+
-+> import_debug = 
-+>   "#if __GLASGOW_HASKELL__ >= 503\nimport System.IO\nimport System.IO.Unsafe\nimport Debug.Trace\n#else\nimport IO\nimport IOExts\n#endif\n"
- 
- ------------------------------------------------------------------------------
- Extract various command-line options.
-@@ -468,8 +459,8 @@
- >	= if OptUseCoercions `elem` cli 
- >	     then if OptGhcTarget `elem` cli
- >			then return True
-->			else dieHappy "-c/--coerce may only be used \ 
-->				      \in conjunction with -g/--ghc\n"
-+>			else dieHappy 
-+>                              "-c/--coerce may only be used in conjunction with -g/--ghc\n"
- >	     else return False
- 
- > getGhc cli = return (OptGhcTarget `elem` cli)
-diff -Naur happy-1.14.orig/happy/src/Version.hs happy-1.14/happy/src/Version.hs
---- happy-1.14.orig/happy/src/Version.hs	2004-10-21 17:03:27.929088056 +0200
-+++ happy-1.14/happy/src/Version.hs	2004-10-21 17:03:44.131624896 +0200
-@@ -1,4 +1,3 @@
- module Version (version) where
- 
--version = tail "\ 
--  \ HAPPY_VERSION"
-+version = "1.14"
diff --git a/dev-haskell/happy/happy-1.14.ebuild b/dev-haskell/happy/happy-1.14.ebuild
deleted file mode 100644
index 57644c0e20ba..000000000000
--- a/dev-haskell/happy/happy-1.14.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/happy/happy-1.14.ebuild,v 1.8 2006/08/26 20:41:12 wormo Exp $
-
-inherit base eutils
-
-DESCRIPTION="A yacc-like parser generator for Haskell"
-HOMEPAGE="http://haskell.org/happy/"
-SRC_URI="http://haskell.cs.yale.edu/happy/dist/${PV}/${P}-src.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/ghc
-	!>=virtual/ghc-6.4"
-RDEPEND=""
-
-src_unpack() {
-	base_src_unpack
-	epatch "${FILESDIR}/${P}-gcc3.4.patch"
-}
-
-src_compile() {
-	econf || die "configure failed"
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	einstall || die "installation failed"
-}