Drop old.

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

6 files changed, 7 insertions, 183 deletions

diff --git a/dev-haskell/cabal-install/ChangeLog b/dev-haskell/cabal-install/ChangeLog
index 612f3264bdc7..ac1f5eaa0fc2 100644
--- a/dev-haskell/cabal-install/ChangeLog
+++ b/dev-haskell/cabal-install/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/cabal-install
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/ChangeLog,v 1.21 2014/10/21 22:28:24 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/ChangeLog,v 1.22 2014/10/21 22:30:15 slyfox Exp $
+
+  21 Oct 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  -cabal-install-0.10.2-r2.ebuild, -cabal-install-0.14.0.ebuild,
+  -cabal-install-1.16.0.2.ebuild, -files/cabal-install-0.10-ghc-7.2.patch,
+  -files/cabal-install-0.8-nopref.patch:
+  Drop old.
 
 *cabal-install-1.18.0.3-r1 (21 Oct 2014)
 
diff --git a/dev-haskell/cabal-install/cabal-install-0.10.2-r2.ebuild b/dev-haskell/cabal-install/cabal-install-0.10.2-r2.ebuild
deleted file mode 100644
index a164df73f27d..000000000000
--- a/dev-haskell/cabal-install/cabal-install-0.10.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/cabal-install-0.10.2-r2.ebuild,v 1.5 2014/07/25 09:16:27 slyfox Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal bash-completion-r1 eutils
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-IUSE="+noprefs"
-
-RDEPEND=">=dev-haskell/cabal-1.10.1
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/http-4000.0.2 <dev-haskell/http-4000.3
-		dev-haskell/network
-		>=dev-haskell/random-1 <dev-haskell/random-1.1
-		=dev-haskell/zlib-0.5*"
-
-src_prepare() {
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-0.8-nopref.patch
-	fi
-	epatch "${FILESDIR}/${PN}"-0.10-ghc-7.2.patch
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	newbashcomp "${S}/bash-completion/cabal" ${PN}
-}
diff --git a/dev-haskell/cabal-install/cabal-install-0.14.0.ebuild b/dev-haskell/cabal-install/cabal-install-0.14.0.ebuild
deleted file mode 100644
index 3cc5b721a812..000000000000
--- a/dev-haskell/cabal-install/cabal-install-0.14.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/cabal-install-0.14.0.ebuild,v 1.4 2014/07/25 09:16:27 slyfox Exp $
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal bash-completion-r1 eutils
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-IUSE="+noprefs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.14.0 <dev-haskell/cabal-1.15
-		>=dev-haskell/http-4000.0.2 <dev-haskell/http-4001
-		>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
-		>=dev-haskell/network-1 <dev-haskell/network-3
-		>=dev-haskell/random-1 <dev-haskell/random-1.1
-		>=dev-haskell/zlib-0.4 <dev-haskell/zlib-0.6
-		>=dev-lang/ghc-6.10.1"
-
-src_prepare() {
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	fi
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	newbashcomp "${S}/bash-completion/cabal" ${PN}
-}
diff --git a/dev-haskell/cabal-install/cabal-install-1.16.0.2.ebuild b/dev-haskell/cabal-install/cabal-install-1.16.0.2.ebuild
deleted file mode 100644
index 0ed571a4c1d6..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.16.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/cabal-install-1.16.0.2.ebuild,v 1.3 2014/07/25 09:16:27 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal bash-completion-r1 eutils
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-IUSE="+noprefs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.16.0
-		<dev-haskell/cabal-1.18
-		>=dev-haskell/http-4000.0.2
-		<dev-haskell/http-4001
-		>=dev-haskell/mtl-2.0
-		<dev-haskell/mtl-3
-		>=dev-haskell/network-1
-		<dev-haskell/network-3
-		>=dev-haskell/random-1
-		<dev-haskell/random-1.1
-		>=dev-haskell/zlib-0.4
-		<dev-haskell/zlib-0.6
-		>=dev-lang/ghc-6.10.4"
-src_prepare() {
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	fi
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	newbashcomp "${S}/bash-completion/cabal" ${PN}
-}
diff --git a/dev-haskell/cabal-install/files/cabal-install-0.10-ghc-7.2.patch b/dev-haskell/cabal-install/files/cabal-install-0.10-ghc-7.2.patch
deleted file mode 100644
index c1bdf9f3574f..000000000000
--- a/dev-haskell/cabal-install/files/cabal-install-0.10-ghc-7.2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/cabal-install.cabal b/cabal-install.cabal
-index e570d60..7bfd8f6 100644
---- a/cabal-install.cabal
-+++ b/cabal-install.cabal
-@@ -93,10 +93,10 @@ Executable cabal
-         Paths_cabal_install
- 
-     build-depends: base     >= 2        && < 5,
--                   Cabal    >= 1.10.1   && < 1.11,
-+                   Cabal    >= 1.10.1   && < 1.13,
-                    filepath >= 1.0      && < 1.3,
-                    network  >= 1        && < 3,
--                   HTTP     >= 4000.0.2 && < 4001,
-+                   HTTP     >= 4000.0.2 && < 4003,
-                    zlib     >= 0.4      && < 0.6,
-                    time     >= 1.1      && < 1.3
- 
-@@ -104,9 +104,9 @@ Executable cabal
-       build-depends: base < 3
-     else
-       build-depends: base       >= 3,
--                     process    >= 1   && < 1.1,
-+                     process    >= 1   && < 1.2,
-                      directory  >= 1   && < 1.2,
--                     pretty     >= 1   && < 1.1,
-+                     pretty     >= 1   && < 1.2,
-                      random     >= 1   && < 1.1,
-                      containers >= 0.1 && < 0.5,
-                      array      >= 0.1 && < 0.4,
-@@ -121,5 +121,5 @@ Executable cabal
-       build-depends: Win32 >= 2 && < 3
-       cpp-options: -DWIN32
-     else
--      build-depends: unix >= 1.0 && < 2.5
-+      build-depends: unix >= 1.0 && < 2.6
-     extensions: CPP
diff --git a/dev-haskell/cabal-install/files/cabal-install-0.8-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.8-nopref.patch
deleted file mode 100644
index 40ede8a71da3..000000000000
--- a/dev-haskell/cabal-install/files/cabal-install-0.8-nopref.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rN -u old-cabal-install-0.8/Distribution/Client/IndexUtils.hs new-cabal-install-0.8/Distribution/Client/IndexUtils.hs
---- old-cabal-install-0.8/Distribution/Client/IndexUtils.hs	2010-06-14 22:16:58.249000098 +0300
-+++ new-cabal-install-0.8/Distribution/Client/IndexUtils.hs	2010-06-14 22:16:58.292000097 +0300
-@@ -168,10 +168,15 @@
- 
-     extractPrefs :: Tar.Entry -> Maybe [Dependency]
-     extractPrefs entry = case Tar.entryContent entry of
-+    {-
-+     -- get rid of hackage's preferred-versions
-+     -- I'd like to have bleeding-edge packages in system and I don't fear of
-+     -- broken packages with improper depends
-       Tar.NormalFile content _
-          | takeFileName (Tar.entryPath entry) == "preferred-versions"
-         -> Just . parsePreferredVersions
-          . BS.Char8.unpack $ content
-+    -}
-       _ -> Nothing
- 
-     handleNotFound action = catch action $ \e -> if isDoesNotExistError e