Mark as ghc-7.8.3 core package (bug #519688 by Juergen Rose, solidus-river and others).

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

4 files changed, 10 insertions, 49 deletions

diff --git a/dev-haskell/xhtml/ChangeLog b/dev-haskell/xhtml/ChangeLog
index aa4a5f54199d..99752dfdc694 100644
--- a/dev-haskell/xhtml/ChangeLog
+++ b/dev-haskell/xhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/xhtml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/ChangeLog,v 1.42 2014/06/28 14:41:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/ChangeLog,v 1.43 2014/08/12 10:07:16 slyfox Exp $
+
+  12 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> -xhtml-3000.2.0.1.ebuild,
+  -xhtml-3000.2.1.ebuild, xhtml-3000.2.1-r1.ebuild:
+  Mark as ghc-7.8.3 core package (bug #519688 by Juergen Rose, solidus-river and
+  others).
 
   28 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> xhtml-3000.2.1-r1.ebuild:
   alpha stable, bug #502704
diff --git a/dev-haskell/xhtml/xhtml-3000.2.0.1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.0.1.ebuild
deleted file mode 100644
index 19081a5c3a76..000000000000
--- a/dev-haskell/xhtml/xhtml-3000.2.0.1.ebuild
+++ /dev/null
@@ -1,24 +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/xhtml/xhtml-3000.2.0.1.ebuild,v 1.10 2013/04/25 18:48:56 ago Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-# haddock-2.9.2 has xhtml as a dep, so disable haddock feature
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="An XHTML combinator library"
-HOMEPAGE="http://hackage.haskell.org/package/xhtml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
index 1849f0969ac5..e7cc9c59103f 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild,v 1.7 2014/06/28 14:41:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild,v 1.8 2014/08/12 10:07:16 slyfox Exp $
 
 EAPI=5
 
@@ -20,4 +20,6 @@ IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6"
+
+CABAL_CORE_LIB_GHC_PV="7.8.3"
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1.ebuild
deleted file mode 100644
index 9117a08ae110..000000000000
--- a/dev-haskell/xhtml/xhtml-3000.2.1.ebuild
+++ /dev/null
@@ -1,22 +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/xhtml/xhtml-3000.2.1.ebuild,v 1.7 2013/09/05 19:23:51 ago Exp $
-
-EAPI="3"
-
-# haddock-2.9.2 has xhtml as a dep, so disable haddock feature
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="An XHTML combinator library"
-HOMEPAGE="https://github.com/haskell/xhtml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"