add new version, drop old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xEAD50D64D8D3571A!)

3 files changed, 65 insertions, 67 deletions

diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index e2c09782bb86..412b03a7011a 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.99 2014/03/23 17:18:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.100 2014/03/24 07:16:47 qnikst Exp $
+
+*cabal-1.18.1.3 (24 Mar 2014)
+
+  24 Mar 2014; Alexander Vershilov <qnikst@gentoo.org> +cabal-1.18.1.3.ebuild,
+  -cabal-1.18.0.ebuild:
+  add new version, drop old
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> cabal-1.18.1.2.ebuild:
   Stable for sparc, wrt bug #495370
diff --git a/dev-haskell/cabal/cabal-1.18.0.ebuild b/dev-haskell/cabal/cabal-1.18.0.ebuild
deleted file mode 100644
index 12d46f426d9e..000000000000
--- a/dev-haskell/cabal/cabal-1.18.0.ebuild
+++ /dev/null
@@ -1,66 +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/cabal/cabal-1.18.0.ebuild,v 1.1 2013/09/09 20:10:58 slyfox Exp $
-
-EAPI=5
-
-CABAL_FEATURES="bootstrap lib profile test-suite"
-inherit eutils haskell-cabal versionator
-
-if [[ ${PV} == *9999* ]]; then
-	LIVE_EBUILD=yes
-	inherit git-2
-fi
-
-MY_PN=Cabal
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-EGIT_REPO_URI="git://github.com/haskell/cabal.git"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="doc"
-
-if [[ -n ${LIVE_EBUILD} ]]; then
-	# Cabal's subdir
-	EGIT_SOURCEDIR=${S}
-	S="${S}"/${MY_PN}
-else
-	SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-RDEPEND=">=dev-lang/ghc-6:="
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/extensible-exceptions
-			dev-haskell/hunit
-			>=dev-haskell/quickcheck-2.1.0.1
-			dev-haskell/regex-posix
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			>=dev-haskell/test-framework-quickcheck2-0.2.12
-		)"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
new file mode 100644
index 000000000000..4d278f0a1786
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.18.1.3.ebuild,v 1.1 2014/03/24 07:16:47 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.9999
+
+CABAL_FEATURES="lib profile test-suite"
+inherit haskell-cabal
+
+MY_PN="Cabal"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.12.1:="
+DEPEND="${RDEPEND}
+	test? ( dev-haskell/extensible-exceptions
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.1.0.1
+		dev-haskell/regex-posix
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014*"
+
+src_prepare() {
+	if [[ -n ${LIVE_EBUILD} ]]; then
+		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
+	fi
+}
+
+src_configure() {
+	cabal-is-dummy-lib && return
+
+	einfo "Bootstrapping Cabal..."
+	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
+		-o setup || die "compiling Setup.hs failed"
+	cabal-configure
+}
+
+src_compile() {
+	cabal-is-dummy-lib && return
+
+	cabal-build
+}