Version bump.

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

4 files changed, 17 insertions, 111 deletions

diff --git a/dev-haskell/hdbc/ChangeLog b/dev-haskell/hdbc/ChangeLog
index 6d3e296e8b90..88c77eb897fe 100644
--- a/dev-haskell/hdbc/ChangeLog
+++ b/dev-haskell/hdbc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/hdbc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.16 2012/12/06 22:54:56 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.17 2012/12/24 15:30:23 slyfox Exp $
+
+*hdbc-2.3.1.2 (24 Dec 2012)
+
+  24 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> +hdbc-2.3.1.2.ebuild,
+  -files/hdbc-2.2.7.0-fix-fbuildtests.patch, -hdbc-2.2.7.0.ebuild,
+  -hdbc-2.3.1.1.ebuild:
+  Version bump.
 
   06 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> hdbc-2.2.7.0.ebuild,
   hdbc-2.3.1.1.ebuild:
diff --git a/dev-haskell/hdbc/files/hdbc-2.2.7.0-fix-fbuildtests.patch b/dev-haskell/hdbc/files/hdbc-2.2.7.0-fix-fbuildtests.patch
deleted file mode 100644
index e43398c6060b..000000000000
--- a/dev-haskell/hdbc/files/hdbc-2.2.7.0-fix-fbuildtests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c68a1aac64081c14739361c87fd7d8342c5382ee Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 22 May 2011 12:36:02 +0300
-Subject: [PATCH] .cabal: fix depends for 'cabal configure -fbuildtests'
-
-$ cabal configure -fbuildtests
-$ cabal build
-
-Database/HDBC/SqlValue.hs:25:17:
-    Could not find module `Data.Text.Lazy':
-      It is a member of the hidden package `text-0.11.0.6'.
-      Perhaps you need to add `text' to the build-depends in your .cabal file.
-      Use -v to see a list of the files searched for.
-
-Added missing depend for test.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- HDBC.cabal |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/HDBC.cabal b/HDBC.cabal
-index fb7d996..5de5f3e 100644
---- a/HDBC.cabal
-+++ b/HDBC.cabal
-@@ -68,7 +68,7 @@ Executable runtests
-           Build-Depends: time<1.1.3
-       else
-         Build-Depends: base<3
--      Build-Depends: mtl, convertible >= 1.0.9.1, utf8-string
-+      Build-Depends: mtl, convertible >= 1.0.9.1, utf8-string, text
- 
-       -- Hack for cabal-install weirdness.  cabal-install forces base 3,
-       -- though it works fine for Setup.lhs manually.  Fix.
--- 
-1.7.3.4
-
diff --git a/dev-haskell/hdbc/hdbc-2.2.7.0.ebuild b/dev-haskell/hdbc/hdbc-2.2.7.0.ebuild
deleted file mode 100644
index e6320148ff67..000000000000
--- a/dev-haskell/hdbc/hdbc-2.2.7.0.ebuild
+++ /dev/null
@@ -1,64 +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/hdbc/hdbc-2.2.7.0.ebuild,v 1.3 2012/12/06 22:54:56 slyfox Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="bin lib profile haddock hscolour"
-inherit base haskell-cabal versionator
-
-MY_PN="HDBC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="http://software.complete.org/hdbc"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="odbc postgres sqlite3 test"
-
-RDEPEND=">=dev-haskell/convertible-1.0.10.0
-		dev-haskell/mtl
-		dev-haskell/text
-		dev-haskell/utf8-string
-		>=dev-lang/ghc-6.8.2
-	"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/testpack
-		)
-	"
-
-DEPENDV="$(get_version_component_range 1-2)"
-PDEPEND="odbc? ( =dev-haskell/hdbc-odbc-${DEPENDV}* )
-		postgres? ( =dev-haskell/hdbc-postgresql-${DEPENDV}* )
-		sqlite3? ( >=dev-haskell/hdbc-sqlite-${DEPENDV} )"
-
-PATCHES=("${FILESDIR}/${PN}-2.2.7.0-fix-fbuildtests.patch")
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	cabal_src_configure $(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc/hdbc-2.3.1.1.ebuild b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
index 8022f72627bc..0adf98b21942 100644
--- a/dev-haskell/hdbc/hdbc-2.3.1.1.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.1.ebuild,v 1.3 2012/12/06 22:54:56 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild,v 1.1 2012/12/24 15:30:23 slyfox Exp $
 
-EAPI=4
+EAPI=5
 
-# ebuild generated by hackport 0.2.18.9999
+# ebuild generated by hackport 0.3.1.9999
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
 inherit haskell-cabal versionator
@@ -17,15 +17,15 @@ HOMEPAGE="https://github.com/hdbc/hdbc"
 SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="2"
+SLOT="2/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="mysql odbc postgres sqlite3 test"
 
-RDEPEND=">=dev-haskell/convertible-1.0.10.0[profile?]
-		dev-haskell/mtl[profile?]
-		dev-haskell/text[profile?]
-		dev-haskell/utf8-string[profile?]
-		>=dev-lang/ghc-6.8.2"
+RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?]
+		dev-haskell/mtl:=[profile?]
+		dev-haskell/text:=[profile?]
+		dev-haskell/utf8-string:=[profile?]
+		>=dev-lang/ghc-6.12.1:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.8
 		test? ( dev-haskell/hunit