* [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: ChangeLog haddock-2.4.1.ebuild
@ 2009-07-23 20:15 Lennart Kolmodin (kolmodin)
0 siblings, 0 replies; 4+ messages in thread
From: Lennart Kolmodin (kolmodin) @ 2009-07-23 20:15 UTC (permalink / raw
To: gentoo-commits
kolmodin 09/07/23 20:15:07
Modified: ChangeLog
Added: haddock-2.4.1.ebuild
Log:
Version bump dev-haskell/haddock.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.62 dev-haskell/haddock/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.61&r2=1.62
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog 23 Jul 2009 06:21:39 -0000 1.61
+++ ChangeLog 23 Jul 2009 20:15:07 -0000 1.62
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/haddock
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.61 2009/07/23 06:21:39 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.62 2009/07/23 20:15:07 kolmodin Exp $
+
+*haddock-2.4.1 (23 Jul 2009)
+
+ 23 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> +haddock-2.4.1.ebuild:
+ Version bump.
23 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.2.ebuild:
Relax deps, haddock works with dev-lang/ghc-6.10.4 too.
1.1 dev-haskell/haddock/haddock-2.4.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.1&content-type=text/plain
Index: haddock-2.4.1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.1 2009/07/23 20:15:07 kolmodin Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
inherit haskell-cabal autotools
GHCPATHS_PN="ghc-paths"
GHCPATHS_PV="0.1.0.5"
GHCPATHS_P="${GHCPATHS_PN}-${GHCPATHS_PV}"
DESCRIPTION="A documentation-generation tool for Haskell libraries"
HOMEPAGE="http://www.haskell.org/haddock/"
SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz
http://hackage.haskell.org/packages/archive/${GHCPATHS_PN}/${GHCPATHS_PV}/${GHCPATHS_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
IUSE="doc"
# we bundle the dep on ghc-paths to reduce the dependencies on this critical
# package. ghc-paths would like to be compiled with USE=doc, which pulls in
# haddock, which requires ghc-paths, which pulls in haddock...
RDEPEND=">=dev-lang/ghc-6.8.2"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.2
dev-haskell/filepath
doc? ( ~app-text/docbook-xml-dtd-4.2
app-text/docbook-xsl-stylesheets
>=dev-libs/libxslt-1.1.2 )"
src_unpack() {
unpack ${A}
# use ghc-paths directly, not as a library
sed -e "s|build-depends: ghc-paths|hs-source-dirs: ../${GHCPATHS_P}|" \
-e "s|Simple|Custom|" \
-i "${S}/${PN}.cabal"
# ghc-paths has a custom Setup.hs, haddock has the default Setup.lhs.
# we use a somewhat modified ghc-paths Setup.hs that works better for our
# purposes.
rm "${S}/Setup.lhs"
cp "${FILESDIR}/${PN}-2.4.2-Setup.hs" "${S}/Setup.hs"
# -O2 is not needed and just prolongs compile time
# missing module in other-modules declaration
sed -e "s/-O2//" \
-e 's/other-modules:/other-modules:\n Haddock.DocName/' \
-e 's/other-modules:/other-modules:\n Haddock.GHC.Utils/' \
-i "${S}/${PN}.cabal"
if use doc; then
cd "${S}/doc"
eautoreconf
fi
}
src_compile () {
cabal_src_compile
if use doc; then
cd "${S}/doc"
./configure --prefix="${D}/usr/" \
|| die 'error configuring documentation.'
emake html || die 'error building documentation.'
fi
}
src_install () {
cabal_src_install
if use doc; then
dohtml -r "${S}/doc/haddock/"*
fi
dodoc CHANGES README
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: ChangeLog haddock-2.4.1.ebuild
@ 2009-07-28 18:51 Lennart Kolmodin (kolmodin)
0 siblings, 0 replies; 4+ messages in thread
From: Lennart Kolmodin (kolmodin) @ 2009-07-28 18:51 UTC (permalink / raw
To: gentoo-commits
kolmodin 09/07/28 18:51:02
Modified: ChangeLog haddock-2.4.1.ebuild
Log:
Remove dep from dev-haskell/haddock, dev-haskell/filepath.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.63 dev-haskell/haddock/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.62&r2=1.63
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog 23 Jul 2009 20:15:07 -0000 1.62
+++ ChangeLog 28 Jul 2009 18:51:01 -0000 1.63
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/haddock
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.62 2009/07/23 20:15:07 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.63 2009/07/28 18:51:01 kolmodin Exp $
+
+ 28 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild:
+ Don't depend on dev-haskell/filepath to avoid circular dependency.
+ dev-haskell/filepath is included in >=ghc-6.8.2 anyway, so we use it from
+ core. See comments in ebuild.
*haddock-2.4.1 (23 Jul 2009)
1.3 dev-haskell/haddock/haddock-2.4.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?r1=1.2&r2=1.3
Index: haddock-2.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- haddock-2.4.1.ebuild 24 Jul 2009 15:07:56 -0000 1.2
+++ haddock-2.4.1.ebuild 28 Jul 2009 18:51:02 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.3 2009/07/28 18:51:02 kolmodin Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
@@ -20,6 +20,12 @@
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
IUSE="doc"
+# haddock-2.4.1 also deps on the upgradeable package dev-haskell/filepath.
+# however, it's included in >=ghc-6.8.2, so we use the core package without
+# stating the dependency in DEPEND.
+# ghc-6.8.2 has filepath-1.1.0.0
+# ghc-6.10.4 has filepath-1.1.0.2
+
# we bundle the dep on ghc-paths to reduce the dependencies on this critical
# package. ghc-paths would like to be compiled with USE=doc, which pulls in
# haddock, which requires ghc-paths, which pulls in haddock...
@@ -27,7 +33,6 @@
RDEPEND=">=dev-lang/ghc-6.8.2"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.2
- dev-haskell/filepath
doc? ( ~app-text/docbook-xml-dtd-4.2
app-text/docbook-xsl-stylesheets
>=dev-libs/libxslt-1.1.2 )"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: ChangeLog haddock-2.4.1.ebuild
@ 2009-07-29 17:31 Lennart Kolmodin (kolmodin)
0 siblings, 0 replies; 4+ messages in thread
From: Lennart Kolmodin (kolmodin) @ 2009-07-29 17:31 UTC (permalink / raw
To: gentoo-commits
kolmodin 09/07/29 17:31:30
Modified: ChangeLog haddock-2.4.1.ebuild
Log:
Make cabal dep to dev-haskell/haddock more strict
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.64 dev-haskell/haddock/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.63&r2=1.64
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog 28 Jul 2009 18:51:01 -0000 1.63
+++ ChangeLog 29 Jul 2009 17:31:30 -0000 1.64
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/haddock
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.63 2009/07/28 18:51:01 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.64 2009/07/29 17:31:30 kolmodin Exp $
+
+ 29 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild:
+ Update cabal dependency due to bundled ghc-paths, ghc-paths needs
+ >=cabal-1.6.
28 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild:
Don't depend on dev-haskell/filepath to avoid circular dependency.
1.4 dev-haskell/haddock/haddock-2.4.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?r1=1.3&r2=1.4
Index: haddock-2.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- haddock-2.4.1.ebuild 28 Jul 2009 18:51:02 -0000 1.3
+++ haddock-2.4.1.ebuild 29 Jul 2009 17:31:30 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.3 2009/07/28 18:51:02 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.4 2009/07/29 17:31:30 kolmodin Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
@@ -29,10 +29,11 @@
# we bundle the dep on ghc-paths to reduce the dependencies on this critical
# package. ghc-paths would like to be compiled with USE=doc, which pulls in
# haddock, which requires ghc-paths, which pulls in haddock...
+# bundling ghc-paths forces us to depend on >=cabal-1.6 rather than >=cabal-1.2
RDEPEND=">=dev-lang/ghc-6.8.2"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
+ >=dev-haskell/cabal-1.6
doc? ( ~app-text/docbook-xml-dtd-4.2
app-text/docbook-xsl-stylesheets
>=dev-libs/libxslt-1.1.2 )"
@@ -82,3 +83,4 @@
fi
dodoc CHANGES README
}
+
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: ChangeLog haddock-2.4.1.ebuild
@ 2009-08-30 9:12 Lennart Kolmodin (kolmodin)
0 siblings, 0 replies; 4+ messages in thread
From: Lennart Kolmodin (kolmodin) @ 2009-08-30 9:12 UTC (permalink / raw
To: gentoo-commits
kolmodin 09/08/30 09:12:54
Modified: ChangeLog haddock-2.4.1.ebuild
Log:
Add ~ppc keyword now that we have ghc 6.8.2 for that arch.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.65 dev-haskell/haddock/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.64&r2=1.65
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog 29 Jul 2009 17:31:30 -0000 1.64
+++ ChangeLog 30 Aug 2009 09:12:54 -0000 1.65
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/haddock
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.64 2009/07/29 17:31:30 kolmodin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.65 2009/08/30 09:12:54 kolmodin Exp $
+
+ 30 Aug 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild:
+ Add ~ppc now that we have ghc 6.8.2 for that arch.
29 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild:
Update cabal dependency due to bundled ghc-paths, ghc-paths needs
1.6 dev-haskell/haddock/haddock-2.4.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?r1=1.5&r2=1.6
Index: haddock-2.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- haddock-2.4.1.ebuild 29 Jul 2009 22:22:23 -0000 1.5
+++ haddock-2.4.1.ebuild 30 Aug 2009 09:12:54 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.5 2009/07/29 22:22:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.6 2009/08/30 09:12:54 kolmodin Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
@@ -17,7 +17,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
IUSE="doc"
# haddock-2.4.1 also deps on the upgradeable package dev-haskell/filepath.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-08-30 4:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-23 20:15 [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: ChangeLog haddock-2.4.1.ebuild Lennart Kolmodin (kolmodin)
-- strict thread matches above, loose matches on Subject: below --
2009-07-28 18:51 Lennart Kolmodin (kolmodin)
2009-07-29 17:31 Lennart Kolmodin (kolmodin)
2009-08-30 9:12 Lennart Kolmodin (kolmodin)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox