* [gentoo-commits] gentoo-x86 commit in dev-haskell/hsql-mysql: hsql-mysql-1.7.ebuild ChangeLog
@ 2007-10-31 13:04 Duncan Coutts (dcoutts)
0 siblings, 0 replies; 2+ messages in thread
From: Duncan Coutts (dcoutts) @ 2007-10-31 13:04 UTC (permalink / raw
To: gentoo-commits
dcoutts 07/10/31 13:04:00
Modified: hsql-mysql-1.7.ebuild ChangeLog
Log:
Drop virtual/ghc in favour of dev-lang/ghc
(Portage version: 2.1.3.16)
Revision Changes Path
1.7 dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild?r1=1.6&r2=1.7
Index: hsql-mysql-1.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hsql-mysql-1.7.ebuild 23 Nov 2006 15:44:46 -0000 1.6
+++ hsql-mysql-1.7.ebuild 31 Oct 2007 13:03:59 -0000 1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.6 2006/11/23 15:44:46 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild,v 1.7 2007/10/31 13:03:59 dcoutts Exp $
CABAL_FEATURES="lib haddock"
inherit base haskell-cabal
@@ -14,7 +14,7 @@
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hsql-${PV}
>=virtual/mysql-4.0"
1.7 dev-haskell/hsql-mysql/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog?r1=1.6&r2=1.7
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 23 Nov 2006 15:44:46 -0000 1.6
+++ ChangeLog 31 Oct 2007 13:03:59 -0000 1.7
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/hsql-mysql
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.6 2006/11/23 15:44:46 vivo Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.7 2007/10/31 13:03:59 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-mysql-1.7.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
23 Nov 2006; Francesco Riosa <vivo@gentoo.org> hsql-mysql-1.7.ebuild:
dev-db/mysql => virtual/mysql
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-haskell/hsql-mysql: hsql-mysql-1.7.ebuild ChangeLog
@ 2007-12-13 5:42 Duncan Coutts (dcoutts)
0 siblings, 0 replies; 2+ messages in thread
From: Duncan Coutts (dcoutts) @ 2007-12-13 5:42 UTC (permalink / raw
To: gentoo-commits
dcoutts 07/12/13 05:42:21
Modified: hsql-mysql-1.7.ebuild ChangeLog
Log:
Updates for upward compatability with cabal-1.2 and ghc-6.8
(Portage version: 2.1.3.19)
Revision Changes Path
1.8 dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild?r1=1.7&r2=1.8
Index: hsql-mysql-1.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hsql-mysql-1.7.ebuild 31 Oct 2007 13:03:59 -0000 1.7
+++ hsql-mysql-1.7.ebuild 13 Dec 2007 05:42:21 -0000 1.8
@@ -1,13 +1,13 @@
# Copyright 1999-2007 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.7 2007/10/31 13:03:59 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild,v 1.8 2007/12/13 05:42:21 dcoutts Exp $
CABAL_FEATURES="lib haddock"
-inherit base haskell-cabal
+inherit haskell-cabal versionator
DESCRIPTION="MySQL driver for HSQL"
HOMEPAGE="http://htoolkit.sourceforge.net/"
-SRC_URI="mirror://gentoo/HSQL-${PV}.tar.gz"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
@@ -18,16 +18,17 @@
~dev-haskell/hsql-${PV}
>=virtual/mysql-4.0"
-S="${WORKDIR}/HSQL/MySQL"
-
src_unpack() {
- base_src_unpack
-
- echo '> import Distribution.Simple' > "${S}/Setup.lhs"
- echo '> main = defaultMain' >> "${S}/Setup.lhs"
+ unpack "${A}"
- sed -i '/cc-options:/d' "${S}/MySQL.cabal"
- echo 'extra-libraries: mysqlclient' >> "${S}/MySQL.cabal"
- echo 'ld-options: -L/usr/lib/mysql' >> "${S}/MySQL.cabal"
- echo 'include-dirs: Database/HSQL /usr/include/mysql' >> "${S}/MySQL.cabal"
+ 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
}
1.8 dev-haskell/hsql-mysql/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog?r1=1.7&r2=1.8
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog 31 Oct 2007 13:03:59 -0000 1.7
+++ ChangeLog 13 Dec 2007 05:42:21 -0000 1.8
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/hsql-mysql
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.7 2007/10/31 13:03:59 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.8 2007/12/13 05:42:21 dcoutts Exp $
+
+ 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-mysql-1.7.ebuild:
+ Updates for upward compatability with cabal-1.2 and ghc-6.8
31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-mysql-1.7.ebuild:
Drop virtual/ghc in favour of dev-lang/ghc
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-12-13 5:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-31 13:04 [gentoo-commits] gentoo-x86 commit in dev-haskell/hsql-mysql: hsql-mysql-1.7.ebuild ChangeLog Duncan Coutts (dcoutts)
-- strict thread matches above, loose matches on Subject: below --
2007-12-13 5:42 Duncan Coutts (dcoutts)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox