dev-haskell/hsql*: removed old

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

4 files changed, 6 insertions, 109 deletions

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