[gentoo-commits] repo/gentoo:master commit in: net-mail/list-remote-forwards/, net-mail/mailbox-count/, dev-haskell/hdbc/, ...

[gentoo-commits] repo/gentoo:master commit in: net-mail/list-remote-forwards/, net-mail/mailbox-count/, dev-haskell/hdbc/, ...

[Sergei Trofimovich]

commit:     07ecabef92ad21cf9e12af3c1bc97d582d207094
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 18:56:59 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 19:07:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ecabef

dev-haskell/hdbc-sqlite3: move package from dev-haskell/hdbc-sqlite:2

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-haskell/{hdbc-sqlite => hdbc-sqlite3}/Manifest |  0
 .../hdbc-sqlite3-2.3.3.1-r1.ebuild}                | 30 +++++++++++-----------
 .../{hdbc-sqlite => hdbc-sqlite3}/metadata.xml     |  4 +++
 dev-haskell/hdbc/hdbc-2.3.1.2.ebuild               |  2 +-
 .../list-remote-forwards-0.0.1-r1.ebuild           |  2 +-
 .../mailbox-count/mailbox-count-0.0.2-r1.ebuild    |  2 +-
 profiles/updates/4Q-2016                           |  1 +
 7 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/dev-haskell/hdbc-sqlite/Manifest b/dev-haskell/hdbc-sqlite3/Manifest
similarity index 100%
rename from dev-haskell/hdbc-sqlite/Manifest
rename to dev-haskell/hdbc-sqlite3/Manifest

diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
similarity index 66%
rename from dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild
rename to dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
index 3d5d1c9d91f..696da308bff 100644
--- a/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-# ebuild generated by hackport 0.4.6
+# ebuild generated by hackport 0.5.1
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 MY_PN="HDBC-sqlite3"
@@ -16,29 +16,29 @@ HOMEPAGE="https://github.com/hdbc/hdbc-sqlite3"
 SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="2"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="buildtests +splitbase"
 
 RDEPEND=">=dev-db/sqlite-3.0
 	>=dev-haskell/hdbc-2.3.0.0:2=[profile?]
 	dev-haskell/mtl:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-	test? ( dev-haskell/convertible:=[profile?]
+	buildtests? ( dev-haskell/convertible:=[profile?]
 			dev-haskell/hunit:=[profile?]
 			dev-haskell/old-locale:=[profile?]
 			dev-haskell/old-time:=[profile?]
 			dev-haskell/testpack:=[profile?] )
 "
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2.3
+"
 
 S="${WORKDIR}/${MY_P}"
 
-# The test suite doesn't work right now. See
-#
-#   https://github.com/hdbc/hdbc-sqlite3/pull/17
-#
-RESTRICT="test"
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag buildtests buildtests) \
+		$(cabal_flag splitbase splitbase)
+}

diff --git a/dev-haskell/hdbc-sqlite/metadata.xml b/dev-haskell/hdbc-sqlite3/metadata.xml
similarity index 74%
rename from dev-haskell/hdbc-sqlite/metadata.xml
rename to dev-haskell/hdbc-sqlite3/metadata.xml
index 0bcac4dfde2..a6dc7b001d9 100644
--- a/dev-haskell/hdbc-sqlite/metadata.xml
+++ b/dev-haskell/hdbc-sqlite3/metadata.xml
@@ -5,6 +5,10 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="buildtests">Build the executable to run unit tests</flag>
+		<flag name="splitbase">Choose the new smaller, split-up package.</flag>
+	</use>
 	<longdescription>
 		This is the Sqlite v3 driver for HDBC, the generic
 		database access system for Haskell

diff --git a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
index 20bd7eecdef..43595a5a528 100644
--- a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
@@ -37,7 +37,7 @@ DEPENDV="$(get_version_component_range 1-2)"
 PDEPEND="mysql? ( dev-haskell/hdbc-mysql )
 		odbc? ( =dev-haskell/hdbc-odbc-${DEPENDV}* )
 		postgres? ( =dev-haskell/hdbc-postgresql-${DEPENDV}* )
-		sqlite? ( >=dev-haskell/hdbc-sqlite-${DEPENDV} )"
+		sqlite? ( >=dev-haskell/hdbc-sqlite3-${DEPENDV} )"
 
 S="${WORKDIR}/${MY_P}"
 

diff --git a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
index 6118538101f..65c65475d57 100644
--- a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
+++ b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/dns-1.4
 	>=dev-haskell/hdbc-2.4
 	>=dev-haskell/hdbc-postgresql-2.3
-	>=dev-haskell/hdbc-sqlite-2.3
+	>=dev-haskell/hdbc-sqlite3-2.3
 	>=dev-haskell/missingh-1.2
 	>=dev-haskell/tasty-0.8
 	>=dev-haskell/tasty-hunit-0.8

diff --git a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
index a4c8cb579c8..cd5c14db95a 100644
--- a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
+++ b/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/configurator-0.2
 	>=dev-haskell/hdbc-2.4
 	>=dev-haskell/hdbc-postgresql-2.3
-	>=dev-haskell/hdbc-sqlite-2.3
+	>=dev-haskell/hdbc-sqlite3-2.3
 	>=dev-haskell/missingh-1.2
 	>=dev-haskell/tasty-0.8
 	>=dev-haskell/tasty-hunit-0.8

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 4d83e501383..26f30bb4e89 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -58,3 +58,4 @@ move kde-base/katepart kde-apps/katepart
 move kde-base/pykde4 kde-apps/pykde4
 move kde-base/kde-env kde-frameworks/kdelibs-env
 move kde-base/kdelibs kde-frameworks/kdelibs
+move dev-haskell/hdbc-sqlite dev-haskell/hdbc-sqlite3