diff options
| -rw-r--r-- | dev-haskell/hsql/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-haskell/hsql/Manifest | 17 | ||||
| -rw-r--r-- | dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch | 13 | ||||
| -rw-r--r-- | dev-haskell/hsql/hsql-1.8.1.ebuild | 12 | ||||
| -rw-r--r-- | dev-haskell/hsql/hsql-1.8.2.ebuild | 34 | ||||
| -rw-r--r-- | dev-haskell/hsql/metadata.xml | 11 |
6 files changed, 79 insertions, 18 deletions
diff --git a/dev-haskell/hsql/ChangeLog b/dev-haskell/hsql/ChangeLog index 4321f0920e0a..2bcf541f175b 100644 --- a/dev-haskell/hsql/ChangeLog +++ b/dev-haskell/hsql/ChangeLog @@ -1,6 +1,12 @@ # 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.15 2011/08/04 13:04:38 slyfox Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.16 2012/04/15 10:02:17 gienah Exp $ + +*hsql-1.8.2 (15 Apr 2012) + + 15 Apr 2012; Mark Wright <gienah@gentoo.org> +files/hsql-1.8.1-ghc-7.4.patch, + +hsql-1.8.2.ebuild, hsql-1.8.1.ebuild, metadata.xml: + Bump hsql to 1.8.2. Patch hsql 1.8.1 to build with ghc 7.4.1. 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: diff --git a/dev-haskell/hsql/Manifest b/dev-haskell/hsql/Manifest index 2dbd73c3e751..90b6e880e601 100644 --- a/dev-haskell/hsql/Manifest +++ b/dev-haskell/hsql/Manifest @@ -1,14 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX hsql-1.8.1-ghc-7.4.patch 403 RMD160 32b575337014dd1f86b4c802cda4784c9a4fa9c3 SHA1 17c1d5fbcedc619f35ac164d53fe256618a6fd23 SHA256 d907542e398198fc433a41d160f7d8d4efdb1acb8fa0d718fa840ccde677a814 DIST hsql-1.8.1.tar.gz 9365 RMD160 58c9b6e037b9fa9e7284ef40ef1d12905fa7fe05 SHA1 f3db65fb048e1e09ad1597a5074042b43419250d SHA256 bff33ef9109a9e27333f239bb999f224192da5a1a91a78a0bf3ba1b514107dc9 -EBUILD hsql-1.8.1.ebuild 922 RMD160 e627c1730116cb496dc839656aa8b359f222bf66 SHA1 7f5226c3b8d496e3323acf2de508cd2a30866894 SHA256 bb3109fb67127b465f26ccf21a92732fd70d55054342686dcf6996592dad962b -MISC ChangeLog 2222 RMD160 44ff7d8edb866d748be0a9cc06725ee7f3eb8b00 SHA1 e6a59f637678414829bb263ea22a78e6a5410f86 SHA256 287faa218766ef7b672847c9b4ed81f49e677cc0814b0945be1398b52e1f881b -MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 +DIST hsql-1.8.2.tar.gz 10568 RMD160 5360d0a168b40815d02900fe2aa9da92e0885e65 SHA1 7531e605af7674db68399d48b58d237b1f7cfdab SHA256 7e2d32eb0d3a1e30ec8fe02ff41b8975298249ccf54ef2e9774260eb05b1a344 +EBUILD hsql-1.8.1.ebuild 976 RMD160 6db2f15adb5ba8b686d96f1c3a65b8c81e38c588 SHA1 6148b37ce1479ee374dc499058a047e8cd80f4e2 SHA256 e5fe3718f8126b33599aa13aec10028ba5da73f3e1d74a02e480e08db0cfae1a +EBUILD hsql-1.8.2.ebuild 914 RMD160 0ee6088b6a7e78d41dc148ffed9827aaceb482e0 SHA1 34323eabd2d983a3be8a2bc9594d24b603395aea SHA256 9ec532cd354d1fd28613171efe5f2517620b62881b8ec668adce65c8ad59b17c +MISC ChangeLog 2449 RMD160 91a9004fe7dacf0ace9a8151ddb94de47a9acb41 SHA1 0e6f75899ea3fd187796e4e356e1fc40e820c8ff SHA256 2a27a5f47f09634c01afc18ebc20f45eea28cde7f6865cfab5c22e1b3cefd227 +MISC metadata.xml 316 RMD160 84aaae74db8856f3113a93b3e00e16fb215e6c7b SHA1 524b82e8d8a9afc280c33c28f689d96f57020cdd SHA256 362c3490983f08fd95d7ab8d096008360c0ecf8608b2afa9c60a16ab382fd966 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk46mbsACgkQcaHudmEf86r1rACfaEljxU/v0g3Urgs0ZYut8Uyf -W3UAnAmpV1RCOKrrhXdmf+M2CKUtYEcN -=QkhR +iF4EAREIAAYFAk+KnLcACgkQoBEVQmGOlx9fSQD/RURUApz9ZVbJ/Wtwyl6vwPGU +SrYlRY3X1Ajq2Fbrja8A/RY0emwkp4NuP6W4n6LLpPx+EjsDMeCc44ZEQHUiyI1B +=Nws7 -----END PGP SIGNATURE----- diff --git a/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch b/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch new file mode 100644 index 000000000000..c8af51d865de --- /dev/null +++ b/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch @@ -0,0 +1,13 @@ +diff --git a/hsql.cabal b/hsql.cabal +index 6595eee..7e198e9 100644 +--- a/hsql.cabal ++++ b/hsql.cabal +@@ -19,7 +19,7 @@ exposed-modules: + Database.HSQL.Types + build-depends: base==4.*, old-time + extensions: CPP, ForeignFunctionInterface, DeriveDataTypeable, RankNTypes, +- ScopedTypeVariables ++ ScopedTypeVariables, FlexibleInstances + build-type: Simple + license-file: LICENSE + cabal-version: >= 1.6 diff --git a/dev-haskell/hsql/hsql-1.8.1.ebuild b/dev-haskell/hsql/hsql-1.8.1.ebuild index ef015b48d68d..e5a42ee5dfce 100644 --- a/dev-haskell/hsql/hsql-1.8.1.ebuild +++ b/dev-haskell/hsql/hsql-1.8.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.8.1.ebuild,v 1.1 2011/08/04 12:44:56 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.8.1.ebuild,v 1.2 2012/04/15 10:02:16 gienah Exp $ # ebuild generated by hackport 0.2.13 -EAPI="3" +EAPI=4 -CABAL_FEATURES="lib profile haddock hscolour" -inherit haskell-cabal +CABAL_FEATURES="lib profile haddock hscolour hoogle" +inherit base haskell-cabal DESCRIPTION="Simple library for database access from Haskell." HOMEPAGE="http://hackage.haskell.org/package/hsql" @@ -22,6 +22,8 @@ RDEPEND=">=dev-lang/ghc-6.10.1" DEPEND="${RDEPEND} >=dev-haskell/cabal-1.6" +PATCHES=("${FILESDIR}"/${P}-ghc-7.4.patch) + pkg_postinst () { ghc-package_pkg_postinst diff --git a/dev-haskell/hsql/hsql-1.8.2.ebuild b/dev-haskell/hsql/hsql-1.8.2.ebuild new file mode 100644 index 000000000000..0e2126320ba0 --- /dev/null +++ b/dev-haskell/hsql/hsql-1.8.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.8.2.ebuild,v 1.1 2012/04/15 10:02:16 gienah Exp $ + +# ebuild generated by hackport 0.2.13 + +EAPI=4 + +CABAL_FEATURES="lib profile haddock hscolour hoogle" +inherit base haskell-cabal + +DESCRIPTION="Database access from Haskell." +HOMEPAGE="http://hackage.haskell.org/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.10.1" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.10" + +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/metadata.xml b/dev-haskell/hsql/metadata.xml index 8c66906af531..99edff7d89fe 100644 --- a/dev-haskell/hsql/metadata.xml +++ b/dev-haskell/hsql/metadata.xml @@ -1,8 +1,11 @@ <?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> + Simple library for database access from Haskell. + </longdescription> </pkgmetadata> |