| 1 |
kolmodin 09/07/28 18:51:02 |
| 2 |
|
| 3 |
Modified: ChangeLog haddock-2.4.1.ebuild |
| 4 |
Log: |
| 5 |
Remove dep from dev-haskell/haddock, dev-haskell/filepath. |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.63 dev-haskell/haddock/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.63&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.63&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.62&r2=1.63 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v |
| 18 |
retrieving revision 1.62 |
| 19 |
retrieving revision 1.63 |
| 20 |
diff -u -r1.62 -r1.63 |
| 21 |
--- ChangeLog 23 Jul 2009 20:15:07 -0000 1.62 |
| 22 |
+++ ChangeLog 28 Jul 2009 18:51:01 -0000 1.63 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for dev-haskell/haddock |
| 25 |
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.62 2009/07/23 20:15:07 kolmodin Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.63 2009/07/28 18:51:01 kolmodin Exp $ |
| 28 |
+ |
| 29 |
+ 28 Jul 2009; Lennart Kolmodin <kolmodin@g.o> haddock-2.4.1.ebuild: |
| 30 |
+ Don't depend on dev-haskell/filepath to avoid circular dependency. |
| 31 |
+ dev-haskell/filepath is included in >=ghc-6.8.2 anyway, so we use it from |
| 32 |
+ core. See comments in ebuild. |
| 33 |
|
| 34 |
*haddock-2.4.1 (23 Jul 2009) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 dev-haskell/haddock/haddock-2.4.1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: haddock-2.4.1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- haddock-2.4.1.ebuild 24 Jul 2009 15:07:56 -0000 1.2 |
| 52 |
+++ haddock-2.4.1.ebuild 28 Jul 2009 18:51:02 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
-# Copyright 1999-2008 Gentoo Foundation |
| 55 |
+# Copyright 1999-2009 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.2 2009/07/24 15:07:56 mr_bones_ Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.3 2009/07/28 18:51:02 kolmodin Exp $ |
| 59 |
|
| 60 |
CABAL_FEATURES="bin lib" |
| 61 |
# don't enable profiling as the 'ghc' package is not built with profiling |
| 62 |
@@ -20,6 +20,12 @@ |
| 63 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86" |
| 64 |
IUSE="doc" |
| 65 |
|
| 66 |
+# haddock-2.4.1 also deps on the upgradeable package dev-haskell/filepath. |
| 67 |
+# however, it's included in >=ghc-6.8.2, so we use the core package without |
| 68 |
+# stating the dependency in DEPEND. |
| 69 |
+# ghc-6.8.2 has filepath-1.1.0.0 |
| 70 |
+# ghc-6.10.4 has filepath-1.1.0.2 |
| 71 |
+ |
| 72 |
# we bundle the dep on ghc-paths to reduce the dependencies on this critical |
| 73 |
# package. ghc-paths would like to be compiled with USE=doc, which pulls in |
| 74 |
# haddock, which requires ghc-paths, which pulls in haddock... |
| 75 |
@@ -27,7 +33,6 @@ |
| 76 |
RDEPEND=">=dev-lang/ghc-6.8.2" |
| 77 |
DEPEND="${RDEPEND} |
| 78 |
>=dev-haskell/cabal-1.2 |
| 79 |
- dev-haskell/filepath |
| 80 |
doc? ( ~app-text/docbook-xml-dtd-4.2 |
| 81 |
app-text/docbook-xsl-stylesheets |
| 82 |
>=dev-libs/libxslt-1.1.2 )" |
Archives