| 1 |
slyfox 15/08/01 16:07:28 |
| 2 |
|
| 3 |
Modified: hdbc-2.4.0.1.ebuild hdbc-2.4.0.0.ebuild |
| 4 |
hdbc-2.3.1.2.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Port to ghc-7.10/time-1.5. |
| 7 |
|
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-haskell/hdbc/hdbc-2.4.0.1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild?rev=1.2&view=markup |
| 14 |
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 |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: hdbc-2.4.0.1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- hdbc-2.4.0.1.ebuild 3 Apr 2015 23:52:02 -0000 1.1 |
| 24 |
+++ hdbc-2.4.0.1.ebuild 1 Aug 2015 16:07:28 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.2 dev-haskell/hdbc/hdbc-2.4.0.0.ebuild |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild?rev=1.2&view=markup |
| 39 |
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 |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild?r1=1.1&r2=1.2 |
| 41 |
|
| 42 |
Index: hdbc-2.4.0.0.ebuild |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.4.0.0.ebuild,v |
| 45 |
retrieving revision 1.1 |
| 46 |
retrieving revision 1.2 |
| 47 |
diff -u -r1.1 -r1.2 |
| 48 |
--- hdbc-2.4.0.0.ebuild 3 Jul 2014 12:03:08 -0000 1.1 |
| 49 |
+++ hdbc-2.4.0.0.ebuild 1 Aug 2015 16:07:28 -0000 1.2 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
-# Copyright 1999-2014 Gentoo Foundation |
| 52 |
+# Copyright 1999-2015 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $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 $ |
| 55 |
+# $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 $ |
| 56 |
|
| 57 |
EAPI=5 |
| 58 |
|
| 59 |
@@ -8,7 +8,7 @@ |
| 60 |
#hackport: flags: buildtests:test |
| 61 |
|
| 62 |
CABAL_FEATURES="bin lib profile haddock hoogle hscolour" |
| 63 |
-inherit haskell-cabal |
| 64 |
+inherit base haskell-cabal |
| 65 |
|
| 66 |
MY_PN="HDBC" |
| 67 |
MY_P="${MY_PN}-${PV}" |
| 68 |
@@ -21,6 +21,7 @@ |
| 69 |
SLOT="2/${PV}" |
| 70 |
KEYWORDS="~amd64 ~x86" |
| 71 |
IUSE="test" |
| 72 |
+RESTRICT="test" # Tests do not compile with time 1.5 |
| 73 |
|
| 74 |
RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?] |
| 75 |
dev-haskell/mtl:=[profile?] |
| 76 |
@@ -37,6 +38,15 @@ |
| 77 |
|
| 78 |
S="${WORKDIR}/${MY_P}" |
| 79 |
|
| 80 |
+PATCHES=("${FILESDIR}/${PN}-2.4.0.0-ghc-7.10-1.patch" |
| 81 |
+ "${FILESDIR}/${PN}-2.4.0.0-ghc-7.10-2.patch") |
| 82 |
+ |
| 83 |
+src_prepare() { |
| 84 |
+ base_src_prepare |
| 85 |
+ cabal_chdeps \ |
| 86 |
+ 'time>=1.1.3 && <=1.5' 'time>=1.1.3 && <=1.6' |
| 87 |
+} |
| 88 |
+ |
| 89 |
src_configure() { |
| 90 |
haskell-cabal_src_configure \ |
| 91 |
$(cabal_flag test buildtests) |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
1.3 dev-haskell/hdbc/hdbc-2.3.1.2.ebuild |
| 96 |
|
| 97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild?rev=1.3&view=markup |
| 98 |
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 |
| 99 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild?r1=1.2&r2=1.3 |
| 100 |
|
| 101 |
Index: hdbc-2.3.1.2.ebuild |
| 102 |
=================================================================== |
| 103 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild,v |
| 104 |
retrieving revision 1.2 |
| 105 |
retrieving revision 1.3 |
| 106 |
diff -u -r1.2 -r1.3 |
| 107 |
--- hdbc-2.3.1.2.ebuild 5 May 2015 20:54:59 -0000 1.2 |
| 108 |
+++ hdbc-2.3.1.2.ebuild 1 Aug 2015 16:07:28 -0000 1.3 |
| 109 |
@@ -1,6 +1,6 @@ |
| 110 |
# Copyright 1999-2015 Gentoo Foundation |
| 111 |
# Distributed under the terms of the GNU General Public License v2 |
| 112 |
-# $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 $ |
| 113 |
+# $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 $ |
| 114 |
|
| 115 |
EAPI=5 |
| 116 |
|
| 117 |
@@ -21,7 +21,7 @@ |
| 118 |
KEYWORDS="~amd64 ~x86" |
| 119 |
IUSE="mysql odbc postgres sqlite test" |
| 120 |
|
| 121 |
-RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?] |
| 122 |
+RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?] <dev-haskell/convertible-1.1.0.0:=[profile?] |
| 123 |
dev-haskell/mtl:=[profile?] |
| 124 |
dev-haskell/text:=[profile?] |
| 125 |
dev-haskell/utf8-string:=[profile?] |
| 126 |
|
| 127 |
|
| 128 |
|
| 129 |
1.23 dev-haskell/hdbc/ChangeLog |
| 130 |
|
| 131 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/ChangeLog?rev=1.23&view=markup |
| 132 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/ChangeLog?rev=1.23&content-type=text/plain |
| 133 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hdbc/ChangeLog?r1=1.22&r2=1.23 |
| 134 |
|
| 135 |
Index: ChangeLog |
| 136 |
=================================================================== |
| 137 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v |
| 138 |
retrieving revision 1.22 |
| 139 |
retrieving revision 1.23 |
| 140 |
diff -u -r1.22 -r1.23 |
| 141 |
--- ChangeLog 6 Jun 2015 11:12:46 -0000 1.22 |
| 142 |
+++ ChangeLog 1 Aug 2015 16:07:28 -0000 1.23 |
| 143 |
@@ -1,6 +1,11 @@ |
| 144 |
# ChangeLog for dev-haskell/hdbc |
| 145 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 146 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.22 2015/06/06 11:12:46 jlec Exp $ |
| 147 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.23 2015/08/01 16:07:28 slyfox Exp $ |
| 148 |
+ |
| 149 |
+ 01 Aug 2015; Sergei Trofimovich <slyfox@g.o> |
| 150 |
+ +files/hdbc-2.4.0.0-ghc-7.10-1.patch, +files/hdbc-2.4.0.0-ghc-7.10-2.patch, |
| 151 |
+ hdbc-2.3.1.2.ebuild, hdbc-2.4.0.0.ebuild, hdbc-2.4.0.1.ebuild: |
| 152 |
+ Port to ghc-7.10/time-1.5. |
| 153 |
|
| 154 |
06 Jun 2015; Justin Lecher <jlec@g.o> metadata.xml: |
| 155 |
Add github to remote-id in metadata.xml |
Archives