Drop old.

(Portage version: 2.2.0_alpha177_p3/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

4 files changed, 5 insertions, 110 deletions

diff --git a/dev-haskell/curl/ChangeLog b/dev-haskell/curl/ChangeLog
index 9f80521828ce..3957c3801856 100644
--- a/dev-haskell/curl/ChangeLog
+++ b/dev-haskell/curl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/curl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/curl/ChangeLog,v 1.12 2013/03/25 20:43:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/curl/ChangeLog,v 1.13 2013/06/18 21:25:55 slyfox Exp $
+
+  18 Jun 2013; Sergei Trofimovich <slyfox@gentoo.org> -curl-1.3.5.ebuild,
+  -curl-1.3.7.ebuild, -files/curl-1.3.5-ghc-7.patch:
+  Drop old.
 
   25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> curl-1.3.8.ebuild:
   Stable for x86, wrt bug #456488
diff --git a/dev-haskell/curl/curl-1.3.5.ebuild b/dev-haskell/curl/curl-1.3.5.ebuild
deleted file mode 100644
index 41d6002813b3..000000000000
--- a/dev-haskell/curl/curl-1.3.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/curl/curl-1.3.5.ebuild,v 1.5 2012/09/12 14:52:41 qnikst Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit base haskell-cabal
-
-DESCRIPTION="Haskell binding to libcurl"
-HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/curl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.6.1
-		>=dev-haskell/cabal-1.2
-		net-misc/curl"
-
-PATCHES=("${FILESDIR}"/${PN}-1.3.5-ghc-7.patch)
diff --git a/dev-haskell/curl/curl-1.3.7.ebuild b/dev-haskell/curl/curl-1.3.7.ebuild
deleted file mode 100644
index 206fa789ed5a..000000000000
--- a/dev-haskell/curl/curl-1.3.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/curl/curl-1.3.7.ebuild,v 1.5 2012/09/12 14:52:41 qnikst Exp $
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell binding to libcurl"
-HOMEPAGE="http://hackage.haskell.org/package/curl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2
-		net-misc/curl"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/curl/files/curl-1.3.5-ghc-7.patch b/dev-haskell/curl/files/curl-1.3.5-ghc-7.patch
deleted file mode 100644
index c1f5d08af277..000000000000
--- a/dev-haskell/curl/files/curl-1.3.5-ghc-7.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=397565
--fvia-C is deprecated (and broken on ghc-6.12 + binutils-22.1)
-diff --git a/Network/Curl/Code.hs b/Network/Curl/Code.hs
-index ffb2531..0949438 100644
---- a/Network/Curl/Code.hs
-+++ b/Network/Curl/Code.hs
-@@ -1,5 +1,5 @@
- {-# LANGUAGE ForeignFunctionInterface #-}
--{-# OPTIONS -fvia-C -#include "curl/curl.h" #-}
-+{-# OPTIONS -#include "curl/curl.h" #-}
- --------------------------------------------------------------------
- -- |
- -- Module    : Network.Curl.Code
-diff --git a/Network/Curl/Easy.hs b/Network/Curl/Easy.hs
-index 46fe480..c2d2bc5 100644
---- a/Network/Curl/Easy.hs
-+++ b/Network/Curl/Easy.hs
-@@ -1,5 +1,5 @@
- {-# LANGUAGE ForeignFunctionInterface #-}
--{-# OPTIONS -fvia-C -#include "curl/curl.h" #-}
-+{-# OPTIONS -#include "curl/curl.h" #-}
- --------------------------------------------------------------------
- -- |
- -- Module    : Network.Curl.Easy
-diff --git a/Network/Curl/Info.hs b/Network/Curl/Info.hs
-index 2f31808..4a69938 100644
---- a/Network/Curl/Info.hs
-+++ b/Network/Curl/Info.hs
-@@ -1,5 +1,5 @@
- {-# LANGUAGE ForeignFunctionInterface #-}
--{-# OPTIONS -fvia-C -#include "curl/curl.h" #-}
-+{-# OPTIONS -#include "curl/curl.h" #-}
- --------------------------------------------------------------------
- -- |
- -- Module    : Network.Curl.Info
-diff --git a/Network/Curl/Post.hs b/Network/Curl/Post.hs
-index 0822fbb..c51c8aa 100644
---- a/Network/Curl/Post.hs
-+++ b/Network/Curl/Post.hs
-@@ -1,5 +1,5 @@
- {-# LANGUAGE ForeignFunctionInterface #-}
--{-# OPTIONS -fvia-C -#include "curl/curl.h" #-}
-+{-# OPTIONS -#include "curl/curl.h" #-}
- --------------------------------------------------------------------
- -- |
- -- Module    : Network.Curl.Post
-diff --git a/curl.cabal b/curl.cabal
-index 491161d..330ff18 100644
---- a/curl.cabal
-+++ b/curl.cabal
-@@ -37,11 +37,11 @@ library
-   c-sources: curlc.c
-   Extra-libraries: curl
-   Extensions:      CPP, ForeignFunctionInterface
--  Ghc-options:     -Wall -fvia-C
-+  Ghc-options:     -Wall
- 
-   Build-Depends: base
-   if flag(new-base)
--    Build-depends: base >= 3 && < 4, containers
-+    Build-depends: base >= 3 && < 5, containers
-   else
-     Build-depends: base < 3
-