diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2011-08-04 13:04:39 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2011-08-04 13:04:39 +0000 |
commit | 4a01e420411805c625818de235c9169d2d24418f (patch) | |
tree | 2927c200c82f802bf842723b44a5d6aaada879b9 | |
parent | Add ~x86-fbsd keyword (diff) | |
download | gentoo-2-4a01e420411805c625818de235c9169d2d24418f.tar.gz gentoo-2-4a01e420411805c625818de235c9169d2d24418f.tar.bz2 gentoo-2-4a01e420411805c625818de235c9169d2d24418f.zip |
dev-haskell/hsql*: removed old
(Portage version: 2.1.10.10/cvs/Linux x86_64)
-rw-r--r-- | dev-haskell/hsql-mysql/ChangeLog | 6 | ||||
-rw-r--r-- | dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild | 21 | ||||
-rw-r--r-- | dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild | 36 | ||||
-rw-r--r-- | dev-haskell/hsql-odbc/ChangeLog | 5 | ||||
-rw-r--r-- | dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild | 35 | ||||
-rw-r--r-- | dev-haskell/hsql-postgresql/ChangeLog | 7 | ||||
-rw-r--r-- | dev-haskell/hsql-postgresql/files/hsql-postgresql-1.7.3-ghc68.patch | 51 | ||||
-rw-r--r-- | dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild | 23 | ||||
-rw-r--r-- | dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild | 34 | ||||
-rw-r--r-- | dev-haskell/hsql-sqlite/ChangeLog | 5 | ||||
-rw-r--r-- | dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild | 33 | ||||
-rw-r--r-- | dev-haskell/hsql/ChangeLog | 6 | ||||
-rw-r--r-- | dev-haskell/hsql/files/hsql-1.7-sqltext-to-int.patch | 58 | ||||
-rw-r--r-- | dev-haskell/hsql/hsql-1.7.1.ebuild | 30 | ||||
-rw-r--r-- | dev-haskell/hsql/hsql-1.7.ebuild | 46 |
15 files changed, 24 insertions, 372 deletions
diff --git a/dev-haskell/hsql-mysql/ChangeLog b/dev-haskell/hsql-mysql/ChangeLog index 1bba72a46779..8e7ca5426aeb 100644 --- a/dev-haskell/hsql-mysql/ChangeLog +++ b/dev-haskell/hsql-mysql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/hsql-mysql # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.11 2011/08/04 12:44:56 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.12 2011/08/04 13:04:37 slyfox Exp $ + + 04 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> -hsql-mysql-1.7.ebuild, + -hsql-mysql-1.7.1.ebuild: + Removed old. *hsql-mysql-1.8.1 (04 Aug 2011) diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild deleted file mode 100644 index 5805d7dda3c5..000000000000 --- a/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.1.ebuild,v 1.2 2010/07/12 15:47:40 slyfox Exp $ - -CABAL_FEATURES="lib profile haddock" -inherit haskell-cabal - -DESCRIPTION="MySQL driver for HSQL." -HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hsql-mysql" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND=">=dev-lang/ghc-6.6.1 - >=dev-haskell/hsql-$(get_version_component_range 1-2 ${PV}) - >=virtual/mysql-4.0" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6" diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild deleted file mode 100644 index 7819660fc3ad..000000000000 --- a/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild,v 1.9 2010/07/12 15:47:40 slyfox Exp $ - -CABAL_FEATURES="lib haddock" -inherit haskell-cabal versionator - -DESCRIPTION="MySQL driver for HSQL" -HOMEPAGE="http://htoolkit.sourceforge.net/" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND=">=dev-lang/ghc-6.4.1 - ~dev-haskell/hsql-${PV} - >=virtual/mysql-4.0" - -CABAL_CONFIGURE_FLAGS="--constraint=base<4" - -src_unpack() { - unpack ${A} - - cabal-mksetup - sed -i '/cc-options:/d' "${S}/${PN}.cabal" - echo 'extra-libraries: mysqlclient' >> "${S}/${PN}.cabal" - echo 'ld-options: -L/usr/lib/mysql' >> "${S}/${PN}.cabal" - echo 'include-dirs: Database/HSQL /usr/include/mysql' >> "${S}/${PN}.cabal" - - # Add in the extra split-base deps - if version_is_at_least "6.8" "$(ghc-version)"; then - echo "build-depends: old-time" >> "${S}/${PN}.cabal" - fi -} diff --git a/dev-haskell/hsql-odbc/ChangeLog b/dev-haskell/hsql-odbc/ChangeLog index 6e47ae05fd3d..5d75cc8f93de 100644 --- a/dev-haskell/hsql-odbc/ChangeLog +++ b/dev-haskell/hsql-odbc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/hsql-odbc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.10 2011/08/04 12:44:55 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.11 2011/08/04 13:04:39 slyfox Exp $ + + 04 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> -hsql-odbc-1.7.ebuild: + Removed old. *hsql-odbc-1.8.1.1 (04 Aug 2011) diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild deleted file mode 100644 index 4919ed2bd2b1..000000000000 --- a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild,v 1.8 2010/07/12 15:48:39 slyfox Exp $ - -CABAL_FEATURES="lib haddock" -inherit haskell-cabal versionator - -DESCRIPTION="ODBC driver for HSQL" -HOMEPAGE="http://htoolkit.sourceforge.net/" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND=">=dev-lang/ghc-6.4.1 - ~dev-haskell/hsql-${PV} - >=dev-db/unixODBC-2.2" - -CABAL_CONFIGURE_FLAGS="--constraint=base<4" - -src_unpack() { - unpack ${A} - - cabal-mksetup - sed -i -e '/cc-options:/d' "${S}/${PN}.cabal" - echo 'extra-libraries: odbc' >> "${S}/${PN}.cabal" - echo 'include-dirs: Database/HSQL' >> "${S}/${PN}.cabal" - - # Add in the extra split-base deps - if version_is_at_least "6.8" "$(ghc-version)"; then - echo "build-depends: old-time" >> "${S}/${PN}.cabal" - fi -} diff --git a/dev-haskell/hsql-postgresql/ChangeLog b/dev-haskell/hsql-postgresql/ChangeLog index dd719fd1811b..7bdf2ff3a2f8 100644 --- a/dev-haskell/hsql-postgresql/ChangeLog +++ b/dev-haskell/hsql-postgresql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/hsql-postgresql # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.13 2011/08/04 12:44:55 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.14 2011/08/04 13:04:38 slyfox Exp $ + + 04 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> + -hsql-postgresql-1.7.ebuild, -hsql-postgresql-1.7.3.ebuild, + -files/hsql-postgresql-1.7.3-ghc68.patch: + Removed old. *hsql-postgresql-1.8.1 (04 Aug 2011) diff --git a/dev-haskell/hsql-postgresql/files/hsql-postgresql-1.7.3-ghc68.patch b/dev-haskell/hsql-postgresql/files/hsql-postgresql-1.7.3-ghc68.patch deleted file mode 100644 index 9f86a71b0622..000000000000 --- a/dev-haskell/hsql-postgresql/files/hsql-postgresql-1.7.3-ghc68.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -rN -u old-hsql-postgresql-1.7.3/Database/HSQL/PostgreSQL.hsc new-hsql-postgresql-1.7.3/Database/HSQL/PostgreSQL.hsc ---- old-hsql-postgresql-1.7.3/Database/HSQL/PostgreSQL.hsc 2009-07-23 14:10:46.000000000 +0200 -+++ new-hsql-postgresql-1.7.3/Database/HSQL/PostgreSQL.hsc 2009-07-23 14:10:46.000000000 +0200 -@@ -21,7 +21,7 @@ - import Data.Char - import Foreign - import Foreign.C --import Control.OldException (throwDyn, catchDyn, dynExceptions, Exception(..)) -+import Control.Exception (throwDyn, catchDyn, dynExceptions, Exception(..)) - import Control.Monad(when,unless,mplus) - import Control.Concurrent.MVar - import System.Time -diff -rN -u old-hsql-postgresql-1.7.3/Setup.lhs new-hsql-postgresql-1.7.3/Setup.lhs ---- old-hsql-postgresql-1.7.3/Setup.lhs 2009-07-23 14:10:46.000000000 +0200 -+++ new-hsql-postgresql-1.7.3/Setup.lhs 2009-07-23 14:10:46.000000000 +0200 -@@ -16,14 +16,17 @@ - import System.Process(runInteractiveProcess, waitForProcess) - import System.IO(hClose, hGetContents, hPutStr, stderr) - import Control.Monad(when) --import Control.OldException(try) -+ -+import System.Directory(doesFileExist) - - main = defaultMainWithHooks autoconfUserHooks{preConf= preConf - ,postConf= postConf} - where - preConf :: [String] -> ConfigFlags -> IO HookedBuildInfo - preConf args flags = do -- try (removeFile "PostgreSQL.buildinfo") -+ exists <- doesFileExist "PostgreSQL.buildinfo" -+ when exists $ -+ removeFile "PostgreSQL.buildinfo" - return emptyHookedBuildInfo - postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO () - postConf args flags _ localbuildinfo = do -diff -rN -u old-hsql-postgresql-1.7.3/hsql-postgresql.cabal new-hsql-postgresql-1.7.3/hsql-postgresql.cabal ---- old-hsql-postgresql-1.7.3/hsql-postgresql.cabal 2009-07-23 14:10:46.000000000 +0200 -+++ new-hsql-postgresql-1.7.3/hsql-postgresql.cabal 2009-07-23 14:10:46.000000000 +0200 -@@ -7,8 +7,8 @@ - Category: Database - Description: PostgreSQL driver for HSQL. - Exposed-modules: Database.HSQL.PostgreSQL --Build-depends: base >= 4.0.0.0, hsql, old-time -+Build-depends: base < 4 && >=3, hsql, old-time - Maintainer: nick.rudnick@googlemail.com - Extensions: ForeignFunctionInterface, CPP - Build-Type: Custom --Extra-libraries: pq -\ No newline at end of file -+Extra-libraries: pq - diff --git a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild deleted file mode 100644 index d819637904be..000000000000 --- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.3.ebuild,v 1.3 2010/07/12 15:49:30 slyfox Exp $ - -CABAL_FEATURES="lib profile haddock" -inherit base haskell-cabal versionator - -DESCRIPTION="A Haskell Interface to PostgreSQL via the PQ library." -HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hsql-postgresql" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND=">=dev-lang/ghc-6.6.1 - >=dev-haskell/hsql-$(get_version_component_range 1-2 ${PV}) - dev-db/postgresql-base" -DEPEND="${RDEPEND} - dev-haskell/cabal" - -PATCHES=( "${FILESDIR}/${P}-ghc68.patch" ) diff --git a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild deleted file mode 100644 index f457c1c4bfa8..000000000000 --- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild,v 1.10 2010/07/12 15:49:30 slyfox Exp $ - -CABAL_FEATURES="lib haddock" -inherit haskell-cabal versionator - -DESCRIPTION="PostgreSQL driver for HSQL" -HOMEPAGE="http://htoolkit.sourceforge.net/" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND=">=dev-lang/ghc-6.4.1 - ~dev-haskell/hsql-${PV} - dev-db/postgresql-base" - -CABAL_CONFIGURE_FLAGS="--constraint=base<4" - -src_unpack() { - unpack ${A} - - cabal-mksetup - echo >> "${S}/${PN}.cabal" - echo 'include-dirs: /usr/include/postgresql/server' >> "${S}/${PN}.cabal" - - # Add in the extra split-base deps - if version_is_at_least "6.8" "$(ghc-version)"; then - echo "build-depends: old-time" >> "${S}/${PN}.cabal" - fi -} diff --git a/dev-haskell/hsql-sqlite/ChangeLog b/dev-haskell/hsql-sqlite/ChangeLog index ce19e72cbff1..518694d4f9fa 100644 --- a/dev-haskell/hsql-sqlite/ChangeLog +++ b/dev-haskell/hsql-sqlite/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/hsql-sqlite # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.11 2011/08/04 12:44:55 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.12 2011/08/04 13:04:38 slyfox Exp $ + + 04 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> -hsql-sqlite-1.7.ebuild: + Removed old. *hsql-sqlite-1.8.1 (04 Aug 2011) diff --git a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild b/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild deleted file mode 100644 index 092df92beca4..000000000000 --- a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild,v 1.8 2010/07/12 15:50:22 slyfox Exp $ - -CABAL_FEATURES="lib haddock" -inherit haskell-cabal - -MY_PN=hsql-sqlite3 -MY_P=${MY_PN}-${PV} - -DESCRIPTION="SQLite3 driver HSQL" -HOMEPAGE="http://htoolkit.sourceforge.net/" -SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND=">=dev-lang/ghc-6.4.1 - ~dev-haskell/hsql-${PV} - >=dev-db/sqlite-3.0" - -S="${WORKDIR}/${MY_P}" - -CABAL_CONFIGURE_FLAGS="--constraint=base<4" - -src_unpack() { - unpack ${A} - - cabal-mksetup - echo 'extra-libraries: sqlite3' >> "${S}/hsql-sqlite3.cabal" -} diff --git a/dev-haskell/hsql/ChangeLog b/dev-haskell/hsql/ChangeLog index cecb7da7b9a9..4321f0920e0a 100644 --- a/dev-haskell/hsql/ChangeLog +++ b/dev-haskell/hsql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/hsql # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.14 2011/08/04 12:44:56 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.15 2011/08/04 13:04:38 slyfox Exp $ + + 04 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> -hsql-1.7.ebuild, + -hsql-1.7.1.ebuild, -files/hsql-1.7-sqltext-to-int.patch: + Removed old. *hsql-1.8.1 (04 Aug 2011) diff --git a/dev-haskell/hsql/files/hsql-1.7-sqltext-to-int.patch b/dev-haskell/hsql/files/hsql-1.7-sqltext-to-int.patch deleted file mode 100644 index 65effac3c7e6..000000000000 --- a/dev-haskell/hsql/files/hsql-1.7-sqltext-to-int.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: HSQL/Database/HSQL.hsc -=================================================================== -RCS file: /cvsroot/htoolkit/HSQL/HSQL/Database/HSQL.hsc,v -retrieving revision 1.16 -diff -u -r1.16 HSQL.hsc ---- HSQL/Database/HSQL.hsc 9 Jan 2006 14:49:23 -0000 1.16 -+++ HSQL/Database/HSQL.hsc 11 Mar 2006 20:27:45 -0000 -@@ -239,7 +239,8 @@ - sqlType==SqlTinyInt || - sqlType==SqlSmallInt|| - sqlType==SqlBigInt = c_atoi cstr -- | otherwise = throwDyn (SqlBadTypeCast name sqlType) -+ fromSqlCStringLen field cstr cstrLen -+ = defaultFromSqlCStringLen field cstr cstrLen - - fromSqlValue SqlInteger s = Just (read s) - fromSqlValue SqlMedInt s = Just (read s) -@@ -265,7 +266,8 @@ - #else - c_strtoll cstr nullPtr 10 - #endif -- | otherwise = throwDyn (SqlBadTypeCast name sqlType) -+ fromSqlCStringLen field cstr cstrLen -+ = defaultFromSqlCStringLen field cstr cstrLen - - fromSqlValue SqlInteger s = Just (read s) - fromSqlValue SqlMedInt s = Just (read s) -Index: HSQL/Database/HSQL/Types.hs -=================================================================== -RCS file: /cvsroot/htoolkit/HSQL/HSQL/Database/HSQL/Types.hs,v -retrieving revision 1.9 -diff -u -r1.9 Types.hs ---- HSQL/Database/HSQL/Types.hs 9 Jan 2006 14:49:23 -0000 1.9 -+++ HSQL/Database/HSQL/Types.hs 11 Mar 2006 20:27:45 -0000 -@@ -150,13 +150,16 @@ - -- This allows for faster conversion for eq. integral numeric types, etc. - -- Default version uses fromSqlValue. - fromSqlCStringLen :: FieldDef -> CString -> Int -> IO a -- fromSqlCStringLen (name,sqlType,_) cstr cstrLen -- | cstr == nullPtr = throwDyn (SqlFetchNull name) -- | otherwise = do -- str <- peekCStringLen (cstr, cstrLen) -- case fromSqlValue sqlType str of -- Nothing -> throwDyn (SqlBadTypeCast name sqlType) -- Just v -> return v -+ fromSqlCStringLen = defaultFromSqlCStringLen - - fromSqlValue :: SqlType -> String -> Maybe a - toSqlValue :: a -> String -+ -+defaultFromSqlCStringLen :: SqlBind a => FieldDef -> CString -> Int -> IO a -+defaultFromSqlCStringLen (name,sqlType,_) cstr cstrLen -+ | cstr == nullPtr = throwDyn (SqlFetchNull name) -+ | otherwise = do -+ str <- peekCStringLen (cstr, cstrLen) -+ case fromSqlValue sqlType str of -+ Nothing -> throwDyn (SqlBadTypeCast name sqlType) -+ Just v -> return v diff --git a/dev-haskell/hsql/hsql-1.7.1.ebuild b/dev-haskell/hsql/hsql-1.7.1.ebuild deleted file mode 100644 index 5126374bc3b7..000000000000 --- a/dev-haskell/hsql/hsql-1.7.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.1.ebuild,v 1.2 2010/07/12 15:46:39 slyfox Exp $ - -CABAL_FEATURES="lib profile haddock" -inherit haskell-cabal - -DESCRIPTION="Simple library for database access from Haskell." -HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hsql" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND=">=dev-lang/ghc-6.6.1" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6" - -pkg_postinst () { - ghc-package_pkg_postinst - - elog "You will probably want to emerge one or more HSQL backend." - elog "These backends are available:" - elog " hsql-postgresql" - elog " hsql-mysql" - elog " hsql-sqlite" - elog " hsql-odbc" -} diff --git a/dev-haskell/hsql/hsql-1.7.ebuild b/dev-haskell/hsql/hsql-1.7.ebuild deleted file mode 100644 index 05560b63a0e3..000000000000 --- a/dev-haskell/hsql/hsql-1.7.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.ebuild,v 1.12 2010/07/12 15:46:39 slyfox Exp $ - -CABAL_FEATURES="lib haddock" -inherit eutils haskell-cabal versionator - -DESCRIPTION="SQL bindings for Haskell" -HOMEPAGE="http://htoolkit.sourceforge.net/" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND=">=dev-lang/ghc-6.4.1" - -CABAL_CONFIGURE_FLAGS="--constraint=base<4" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}-sqltext-to-int.patch" - - # Add in the extra split-base deps - if version_is_at_least "6.8" "$(ghc-version)"; then - sed -i -e '/build-depends:/a \ - , old-time' \ - -e '/extensions:/a \ - , Rank2Types, DeriveDataTypeable' \ - "${S}/hsql.cabal" - fi -} - -pkg_postinst () { - ghc-package_pkg_postinst - - elog "You will probably want to emerge one or more HSQL backend." - elog "These backends are available:" - elog " hsql-postgresql" - elog " hsql-mysql" - elog " hsql-sqlite" - elog " hsql-odbc" -} |