dev-haskell/hsql*: removed old

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

4 files changed, 5 insertions, 135 deletions

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"
-}