Bump hdbc-sqlite to 2.3.3.0

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

5 files changed, 187 insertions, 12 deletions

diff --git a/dev-haskell/hdbc-sqlite/ChangeLog b/dev-haskell/hdbc-sqlite/ChangeLog
index 282894b1fc25..541bed7370b3 100644
--- a/dev-haskell/hdbc-sqlite/ChangeLog
+++ b/dev-haskell/hdbc-sqlite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/hdbc-sqlite
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.13 2011/06/12 19:52:57 slyfox Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.14 2012/06/02 05:56:44 gienah Exp $
+
+*hdbc-sqlite-2.3.3.0 (02 Jun 2012)
+
+  02 Jun 2012; Mark Wright <gienah@gentoo.org> +files/TestTime.hs,
+  +hdbc-sqlite-2.3.3.0.ebuild, metadata.xml:
+  Bump hdbc-sqlite to 2.3.3.0
 
 *hdbc-sqlite-2.3.0.0 (12 Jun 2011)
 
diff --git a/dev-haskell/hdbc-sqlite/Manifest b/dev-haskell/hdbc-sqlite/Manifest
index 52c907e5e326..2289ab5dc2d4 100644
--- a/dev-haskell/hdbc-sqlite/Manifest
+++ b/dev-haskell/hdbc-sqlite/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX TestTime.hs 3583 RMD160 ea232d1e1b695ff718658c381d3d6c0c463fcaa8 SHA1 d9e5d81b95a7020b9de58d5f6decbbced3754f53 SHA256 3f6b2e5c5b3198d23bf5af083902613599c641dda97939f13c32b3baa96f3633
 DIST HDBC-sqlite3-2.3.0.0.tar.gz 23842 RMD160 6ceed92bab500b9c2a9fadf7b94964762032439c SHA1 edfbe1ee4c8c64a77bfd0d208749eb1c09f1042f SHA256 12db87d4de729e04b54f56b870b9b78c11aa2e3e8efeb4329d8a343a10a0a732
+DIST HDBC-sqlite3-2.3.3.0.tar.gz 14827 RMD160 0ef0490e1262eeae5c1cc2c7ed30935747287748 SHA1 f08956a26db2e7fc8a36a6368df0ac20358e8fb8 SHA256 22f972fc44e830d0db62313fb870cd9d020f3d8efff2928d4cdb3f66b52de684
 EBUILD hdbc-sqlite-2.3.0.0.ebuild 1316 RMD160 9e7f3922ec3214c7e1574bf303938b97071aaab1 SHA1 4f3924c0f559273f5f1f86c54d1f5c3ef834ebee SHA256 0632a9294b2249570845b281dd518bb7667d4f9732bc3b995494ae5173437d13
-MISC ChangeLog 2295 RMD160 c8f2a06b02ada91dc248da567a77dc17af5288c5 SHA1 ac65addc1cdb9f236ec2f6457cfd1d98080e6b57 SHA256 ec21b592b02e3118dc16d4e465dd1aa4c9c80d1976215cc3cd7b06d2d62e11e5
-MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+EBUILD hdbc-sqlite-2.3.3.0.ebuild 1470 RMD160 028ae389abcb531d8a5eb0fa2ad918ee86217df1 SHA1 10b05a0012fe56a6e247dff1ae3d4fcc8910de44 SHA256 670e3c1797317d1decf5a0ea71bbc0d0ecebaf76e5b6f048143d3e82530f0d7b
+MISC ChangeLog 2474 RMD160 c95eab05481158c762c584e20a012451e94a639b SHA1 08ddf10805df8942ce700b1086bd21249bed559a SHA256 7ef92a60bc013500c7d67b01f8bc38eaa39259c1deecfc9821a6c5cf5004c191
+MISC metadata.xml 355 RMD160 8ca6122c6758600bf63133f61fda702d25a5f031 SHA1 33671ecdba242eb25d07f14ca0a12aeb8f27f7bd SHA256 37d42261d99ad2b20e725e66ab83aa2f2905306ed05e11deab79086ad1a21985
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk31GdUACgkQcaHudmEf86odTACfYHQ8QwVcTg2YFsQzW0yLZcky
-RPQAnj4oJATHvxy2BjIxU4J8uvFSzbs/
-=qQEl
+iF4EAREIAAYFAk/JqyYACgkQoBEVQmGOlx8f9gD/VPwDyBXVRSFs3FBUbHh1i+/Q
+irVLsv7lpf/2YZQfQykA/0s3aNLSr1SDlaRRJ1LKQe9fCqfvkIMV8OdxSWgO+G21
+=VcR9
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/hdbc-sqlite/files/TestTime.hs b/dev-haskell/hdbc-sqlite/files/TestTime.hs
new file mode 100644
index 000000000000..5fd77da61058
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite/files/TestTime.hs
@@ -0,0 +1,100 @@
+module TestTime(tests) where
+import Test.HUnit
+import Database.HDBC
+import TestUtils
+import Control.Exception
+import Data.Time
+import Data.Time.LocalTime
+import Data.Time.Clock.POSIX
+import Data.Maybe
+import Data.Convertible
+import SpecificDB
+import System.Locale(defaultTimeLocale)
+import Database.HDBC.Locale (iso8601DateFormat)
+import qualified System.Time as ST
+
+instance Eq ZonedTime where
+    a == b = zonedTimeToUTC a == zonedTimeToUTC b &&
+             zonedTimeZone a == zonedTimeZone b
+
+testZonedTime :: ZonedTime
+testZonedTime = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat (Just "%T %z"))
+                 "1989-08-01 15:33:01 -0500"
+
+testZonedTimeFrac :: ZonedTime
+testZonedTimeFrac = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat (Just "%T%Q %z"))
+                    "1989-08-01 15:33:01.536 -0500"
+
+
+rowdata t = [[SqlInt32 100, toSql t, SqlNull]]
+
+testDTType inputdata convToSqlValue = dbTestCase $ \dbh ->
+    do run dbh ("CREATE TABLE hdbctesttime (testid INTEGER PRIMARY KEY NOT NULL, \
+                \testvalue " ++ dateTimeTypeOfSqlValue value ++ ")") []
+       finally (testIt dbh) (do commit dbh
+                                run dbh "DROP TABLE hdbctesttime" []
+                                commit dbh
+                            )
+    where testIt dbh =
+              do run dbh "INSERT INTO hdbctesttime (testid, testvalue) VALUES (?, ?)"
+                     [iToSql 5, value]
+                 commit dbh
+                 r <- quickQuery' dbh "SELECT testid, testvalue FROM hdbctesttime" []
+                 case r of
+                   [[testidsv, testvaluesv]] -> 
+                       do assertEqual "testid" (5::Int) (fromSql testidsv)
+                          assertEqual "testvalue" inputdata (fromSql testvaluesv)
+          value = convToSqlValue inputdata
+
+mkTest label inputdata convfunc =
+    TestLabel label (testDTType inputdata convfunc)
+
+tests = TestList $
+    ((TestLabel "Non-frac" $ testIt testZonedTime) :
+     if supportsFracTime then [TestLabel "Frac" $ testIt testZonedTimeFrac] else [])
+
+testIt baseZonedTime = 
+    TestList [mkTest "Day" baseDay toSql,
+              mkTest "TimeOfDay" baseTimeOfDay toSql,
+              mkTest "ZonedTimeOfDay" baseZonedTimeOfDay toSql,
+              mkTest "LocalTime" baseLocalTime toSql,
+              mkTest "ZonedTime" baseZonedTime toSql,
+              mkTest "UTCTime" baseUTCTime toSql,
+              mkTest "DiffTime" baseDiffTime toSql,
+              mkTest "POSIXTime" basePOSIXTime posixToSql,
+              mkTest "ClockTime" baseClockTime toSql,
+              mkTest "CalendarTime" baseCalendarTime toSql,
+              mkTest "TimeDiff" baseTimeDiff toSql
+             ]
+    where 
+      baseDay :: Day
+      baseDay = localDay baseLocalTime
+
+      baseTimeOfDay :: TimeOfDay
+      baseTimeOfDay = localTimeOfDay baseLocalTime
+
+      baseZonedTimeOfDay :: (TimeOfDay, TimeZone)
+      baseZonedTimeOfDay = fromSql (SqlZonedTime baseZonedTime)
+
+      baseLocalTime :: LocalTime
+      baseLocalTime = zonedTimeToLocalTime baseZonedTime
+
+      baseUTCTime :: UTCTime
+      baseUTCTime = convert baseZonedTime
+
+      baseDiffTime :: NominalDiffTime
+      baseDiffTime = basePOSIXTime
+
+      basePOSIXTime :: POSIXTime
+      basePOSIXTime = convert baseZonedTime
+
+      baseTimeDiff :: ST.TimeDiff
+      baseTimeDiff = convert baseDiffTime
+
+      -- No fractional parts for these two
+
+      baseClockTime :: ST.ClockTime
+      baseClockTime = convert testZonedTime
+
+      baseCalendarTime :: ST.CalendarTime
+      baseCalendarTime = convert testZonedTime
diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild
new file mode 100644
index 000000000000..90a88f85fe29
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild,v 1.1 2012/06/02 05:56:44 gienah Exp $
+
+EAPI=4
+
+# ebuild generated by hackport 0.2.18.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sqlite v3 driver for HDBC"
+HOMEPAGE="http://software.complete.org/hdbc-sqlite3"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" # not all files are bundled
+
+RDEPEND=">=dev-haskell/hdbc-2.3.0.0[profile?]
+		dev-haskell/mtl[profile?]
+		dev-haskell/utf8-string[profile?]
+		>=dev-lang/ghc-6.10.1
+		>=dev-db/sqlite-3.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2.3
+		test? ( dev-haskell/convertible
+			dev-haskell/hunit
+			dev-haskell/testpack
+			dev-haskell/time
+		)
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cp "${FILESDIR}/TestTime.hs" "${S}/testsrc"
+}
+
+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-sqlite/metadata.xml b/dev-haskell/hdbc-sqlite/metadata.xml
index 8c66906af531..c8263cd9d3f7 100644
--- a/dev-haskell/hdbc-sqlite/metadata.xml
+++ b/dev-haskell/hdbc-sqlite/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		This is the Sqlite v3 driver for HDBC, the generic
+		database access system for Haskell
+	</longdescription>
 </pkgmetadata>