Restored dlist depend (bug #490286 by Elijah Armageddon El Lazkani), dropped old.

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

4 files changed, 8 insertions, 82 deletions

diff --git a/dev-haskell/aeson/ChangeLog b/dev-haskell/aeson/ChangeLog
index c8b0719c1dfd..7a60419122ec 100644
--- a/dev-haskell/aeson/ChangeLog
+++ b/dev-haskell/aeson/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/aeson
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/ChangeLog,v 1.4 2013/10/19 09:59:32 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/ChangeLog,v 1.5 2013/11/04 07:51:40 slyfox Exp $
+
+  04 Nov 2013; Sergei Trofimovich <slyfox@gentoo.org> -aeson-0.6.1.0.ebuild,
+  -aeson-0.6.2.0-r1.ebuild, aeson-0.6.2.1.ebuild:
+  Restored dlist depend (bug #490286 by  Elijah Armageddon El Lazkani), dropped
+  old.
 
 *aeson-0.6.2.1 (19 Oct 2013)
 
diff --git a/dev-haskell/aeson/aeson-0.6.1.0.ebuild b/dev-haskell/aeson/aeson-0.6.1.0.ebuild
deleted file mode 100644
index fb411da3b691..000000000000
--- a/dev-haskell/aeson/aeson-0.6.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/aeson-0.6.1.0.ebuild,v 1.1 2013/08/25 04:58:59 qnikst Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.8.6.1:=[profile?]
-		>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-		dev-haskell/deepseq:=[profile?]
-		>=dev-haskell/hashable-1.1.2.0:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/syb:=[profile?]
-		=dev-haskell/dlist-0.5*:=[profile?]
-		>=dev-haskell/text-0.11.1.0:=[profile?]
-		>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-		>=dev-haskell/vector-0.7.1:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/quickcheck
-			dev-haskell/test-framework
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/aeson/aeson-0.6.2.0-r1.ebuild b/dev-haskell/aeson/aeson-0.6.2.0-r1.ebuild
deleted file mode 100644
index c43805147dd6..000000000000
--- a/dev-haskell/aeson/aeson-0.6.2.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/aeson-0.6.2.0-r1.ebuild,v 1.1 2013/09/13 09:00:30 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="developer"
-
-RDEPEND=">=dev-haskell/attoparsec-0.8.6.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	dev-haskell/deepseq:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/text-0.11.1.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag developer developer)
-}
diff --git a/dev-haskell/aeson/aeson-0.6.2.1.ebuild b/dev-haskell/aeson/aeson-0.6.2.1.ebuild
index ef0f42a09ea2..f66a65adf804 100644
--- a/dev-haskell/aeson/aeson-0.6.2.1.ebuild
+++ b/dev-haskell/aeson/aeson-0.6.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/aeson-0.6.2.1.ebuild,v 1.1 2013/10/19 09:59:32 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson/aeson-0.6.2.1.ebuild,v 1.2 2013/11/04 07:51:40 slyfox Exp $
 
 EAPI=5
 
@@ -21,6 +21,7 @@ IUSE="developer"
 RDEPEND=">=dev-haskell/attoparsec-0.8.6.1:=[profile?]
 	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
 	dev-haskell/deepseq:=[profile?]
+	>=dev-haskell/dlist-0.2:=[profile?]
 	>=dev-haskell/hashable-1.1.2.0:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	dev-haskell/syb:=[profile?]