4 files changed, 9 insertions, 85 deletions
diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index 1978a545bbd1..4fe32d5efa33 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.64 2011/06/05 13:24:17 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.65 2011/07/30 17:28:11 slyfox Exp $
+
+  30 Jul 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/cabal-1.1.3-ghc622.patch, -files/cabal-1.1.4-make.patch:
+  Removed stale patches.
 
   05 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org> -cabal-1.1.3-r1.ebuild,
   -cabal-1.1.4.ebuild, -cabal-1.1.6.1.ebuild, -cabal-1.1.6.2.ebuild,
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 3e0c5cfa61aa..ae1dab35b554 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX cabal-1.1.3-ghc622.patch 678 RMD160 ed7decfd967a12476ad83892015767a37c5ce5ae SHA1 138db22abd979e08f4ff02060a30bc63d575a257 SHA256 d3524545844724687cf3377708d8cc381c06dbe71e618af884bac86361ea5479
-AUX cabal-1.1.4-make.patch 1972 RMD160 390e17aab566eadb0acda9777b6e2d36cc3bcef5 SHA1 e21972cf75fe5eabf24ea9864845228898bee0b5 SHA256 cee8833ac195f6da00bcdfdac0afe1805b44a4568b8f202f6e5f1cf591618d84
 DIST Cabal-1.8.0.6.tar.gz 227268 RMD160 8e19935f46c0b175e1d90d3d10110fb4036fa669 SHA1 f2c0ce80e08b61165051f9937f2ffcb06c3a620b SHA256 8f34b102990931ed7a0296dc235622000b69e4a8a74810e258e8c00b16da472b
 EBUILD cabal-1.8.0.6-r1.ebuild 1346 RMD160 4459497d5f30a11be7fc7fe2acc04830a52580f7 SHA1 5b5c325ca740cb9b4bd59666f48a9647c5b56194 SHA256 728b622180355204f5ef89278997434fb501d2ab72a1ea6d49f433227203a116
-MISC ChangeLog 8811 RMD160 3239b309792b5b0f738fa52fa5acc79726d5833e SHA1 1f3e168edee373a0967a1e106c9fa7f0bc8b6d92 SHA256 3e6342af24ad131f31e632baddce1157359eabda7d3618227f71398e5d4668f5
+MISC ChangeLog 8957 RMD160 87a533fe34b59a8b7725fe767bdc18781fa83248 SHA1 00987009598d9abdc69d07d7e1f3137f78add02c SHA256 4f69489f96f67c601d2e18ae4c990d907912808ab5fe33cbf97485ce3e470aa6
 MISC metadata.xml 231 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b SHA1 b77d396c72fd66ec7c09ae8de996a5ba50d9e482 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3rhEMACgkQcaHudmEf86oD5ACeJV+Snpw0a2GXoJJTD0Cwjlq3
-s+IAn3yyoJaFHySc90s06rzT70aDbjl7
-=SBk5
+iEYEARECAAYFAk40P/wACgkQcaHudmEf86rfJACfRn0pXUG2BY2/TkxZlxrUp6gO
+pHsAnA+qzTtBqRP+Y+XaSLnvqetqzvk0
+=YE5x
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal/files/cabal-1.1.3-ghc622.patch b/dev-haskell/cabal/files/cabal-1.1.3-ghc622.patch
deleted file mode 100644
index dc2b146f5b0e..000000000000
--- a/dev-haskell/cabal/files/cabal-1.1.3-ghc622.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urwpN cabal-1.1.3.orig/Distribution/Simple/GHCPackageConfig.hs cabal-1.1.3/Distribution/Simple/GHCPackageConfig.hs
---- cabal-1.1.3.orig/Distribution/Simple/GHCPackageConfig.hs	2006-02-21 13:12:48.000000000 +0000
-+++ cabal-1.1.3/Distribution/Simple/GHCPackageConfig.hs	2006-02-21 13:16:30.000000000 +0000
-@@ -81,7 +81,7 @@ mkGHCPackageConfig :: PackageDescription
- mkGHCPackageConfig pkg_descr lbi
-   = defaultGHCPackageConfig {
- 	name	        = pkg_name,
--	auto	        = False,
-+	auto		= True,
- 	import_dirs     = [mkLibDir pkg_descr lbi Nothing],
- 	library_dirs    = (mkLibDir pkg_descr lbi Nothing : 
- 			   maybe [] (extraLibDirs . libBuildInfo) (library pkg_descr)),
diff --git a/dev-haskell/cabal/files/cabal-1.1.4-make.patch b/dev-haskell/cabal/files/cabal-1.1.4-make.patch
deleted file mode 100644
index 5dc61c72bc32..000000000000
--- a/dev-haskell/cabal/files/cabal-1.1.4-make.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: cabal-1.1.4/Makefile
-===================================================================
---- cabal-1.1.4.orig/Makefile
-+++ cabal-1.1.4/Makefile
-@@ -67,7 +67,7 @@ haddock: setup
- 	./setup haddock
- 
- clean-doc:
--	cd doc && make clean
-+	cd doc && $(MAKE) clean
- 
- doc: haddock
- 	docbook2html doc/Cabal.xml --output doc/users-guide
-@@ -86,11 +86,11 @@ clean-cabal:
- 
- clean-hunit:
- 	-rm -f hunit-stamp hunitInstall-stamp
--	cd tests/HUnit-1.0 && make clean
-+	cd tests/HUnit-1.0 && $(MAKE) clean
- 
- clean-test:
--	cd tests/A && make clean
--	cd tests/wash2hs && make clean
-+	cd tests/A && $(MAKE) clean
-+	cd tests/wash2hs && $(MAKE) clean
- 
- remove: remove-cabal remove-hunit
- remove-cabal:
-@@ -104,7 +104,7 @@ remove-hunit:
- 
- hunit: hunit-stamp
- hunit-stamp:
--	cd tests/HUnit-1.0 && make && ./setup configure --prefix=$(PREF) && ./setup build
-+	cd tests/HUnit-1.0 && $(MAKE) && ./setup configure --prefix=$(PREF) && ./setup build
- 	touch $@
- 
- hunitInstall: hunitInstall-stamp
-@@ -119,14 +119,14 @@ moduleTest:
- 	$(HC) $(GHCFLAGS) $(ISPOSIX) -DDEBUG -odir dist/debug -hidir dist/debug -idist/debug/:src:tests/HUnit-1.0/src tests/ModuleTest.hs -o moduleTest 
- 
- tests: moduleTest clean
--	cd tests/A && make clean
--	cd tests/HUnit-1.0 && make clean
--	cd tests/A && make
--	cd tests/HUnit-1.0 && make
-+	cd tests/A && $(MAKE) clean
-+	cd tests/HUnit-1.0 && $(MAKE) clean
-+	cd tests/A && $(MAKE)
-+	cd tests/HUnit-1.0 && $(MAKE)
- 
- check:
- 	rm -f moduleTest
--	make moduleTest
-+	$(MAKE) moduleTest
- 	./moduleTest
- 
- # distribution...
-@@ -170,7 +170,7 @@ dist: haddock $(CABALBALL)
- 	mv $(CABALBALL) $(TMPDISTLOC)
- 	cd $(TMPDISTLOC) && tar -zxvf $(CABALBALL) && mv Cabal cabal
- 	#mkdir $(TMPDISTLOC)/cabal/doc
--	make doc
-+	$(MAKE) doc
- 	cp -r dist/doc/html $(TMPDISTLOC)/cabal/doc/API
- 	cp -r doc/users-guide $(TMPDISTLOC)/cabal/doc/users-guide
- 	cd ~/usr/doc/haskell/haskell-report/packages && docbook2html -o /tmp/pkg-spec-html pkg-spec.sgml && docbook2pdf pkg-spec.sgml -o /tmp