slyfox 15/08/01 16:07:28
Modified: hdbc-2.4.0.1.ebuild hdbc-2.4.0.0.ebuild
hdbc-2.3.1.2.ebuild ChangeLog
Log:
Port to ghc-7.10/time-1.5.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
611FF3AA)
Revision Changes Path
1.2 dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild?r1=1.1&r2=1.2
Index: hdbc-2.4.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hdbc-2.4.0.1.ebuild 3 Apr 2015 23:52:02 -0000 1.1
+++ hdbc-2.4.0.1.ebuild 1 Aug 2015 16:07:28 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild,v 1.1
2015/04/03 23:52:02 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild,v 1.2
2015/08/01 16:07:28 slyfox Exp $
EAPI=5
1.2 dev-haskell/hdbc/hdbc-2.4.0.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild?r1=1.1&r2=1.2
Index: hdbc-2.4.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hdbc-2.4.0.0.ebuild 3 Jul 2014 12:03:08 -0000 1.1
+++ hdbc-2.4.0.0.ebuild 1 Aug 2015 16:07:28 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild,v 1.1
2014/07/03 12:03:08 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild,v 1.2
2015/08/01 16:07:28 slyfox Exp $
EAPI=5
@@ -8,7 +8,7 @@
#hackport: flags: buildtests:test
CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
MY_PN="HDBC"
MY_P="${MY_PN}-${PV}"
@@ -21,6 +21,7 @@
SLOT="2/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="test" # Tests do not compile with time 1.5
RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
dev-haskell/mtl:=[profile?]
@@ -37,6 +38,15 @@
S="${WORKDIR}/${MY_P}"
+PATCHES=("${FILESDIR}/${PN}-2.4.0.0-ghc-7.10-1.patch"
+ "${FILESDIR}/${PN}-2.4.0.0-ghc-7.10-2.patch")
+
+src_prepare() {
+ base_src_prepare
+ cabal_chdeps \
+ 'time>=1.1.3 && <=1.5' 'time>=1.1.3 && <=1.6'
+}
+
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag test buildtests)
1.3 dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild?r1=1.2&r2=1.3
Index: hdbc-2.3.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hdbc-2.3.1.2.ebuild 5 May 2015 20:54:59 -0000 1.2
+++ hdbc-2.3.1.2.ebuild 1 Aug 2015 16:07:28 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild,v 1.2
2015/05/05 20:54:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild,v 1.3
2015/08/01 16:07:28 slyfox Exp $
EAPI=5
@@ -21,7 +21,7 @@
KEYWORDS="~amd64 ~x86"
IUSE="mysql odbc postgres sqlite test"
-RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?]
+RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?]
<dev-haskell/convertible-1.1.0.0:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/text:=[profile?]
dev-haskell/utf8-string:=[profile?]
1.23 dev-haskell/hdbc/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/ChangeLog?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/ChangeLog?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/ChangeLog?r1=1.22&r2=1.23
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog 6 Jun 2015 11:12:46 -0000 1.22
+++ ChangeLog 1 Aug 2015 16:07:28 -0000 1.23
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/hdbc
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.22
2015/06/06 11:12:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.23
2015/08/01 16:07:28 slyfox Exp $
+
+ 01 Aug 2015; Sergei Trofimovich <[email protected]>
+ +files/hdbc-2.4.0.0-ghc-7.10-1.patch, +files/hdbc-2.4.0.0-ghc-7.10-2.patch,
+ hdbc-2.3.1.2.ebuild, hdbc-2.4.0.0.ebuild, hdbc-2.4.0.1.ebuild:
+ Port to ghc-7.10/time-1.5.
06 Jun 2015; Justin Lecher <[email protected]> metadata.xml:
Add github to remote-id in metadata.xml
