summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Kolmodin <kolmodin@gentoo.org>2008-05-04 13:56:19 +0000
committerLennart Kolmodin <kolmodin@gentoo.org>2008-05-04 13:56:19 +0000
commit5b3bd6d2ed258b76c51fe96c67bd0689cce40bb6 (patch)
treec62e9a3be244b3a291c3053b1ad0f7ae778abde8 /dev-haskell
parentalpha/ia64/sparc stable wrt #214816 (diff)
downloadhistorical-5b3bd6d2ed258b76c51fe96c67bd0689cce40bb6.tar.gz
historical-5b3bd6d2ed258b76c51fe96c67bd0689cce40bb6.tar.bz2
historical-5b3bd6d2ed258b76c51fe96c67bd0689cce40bb6.zip
Fix bug #220185 in dev-haskell/gtk2hs-0.9.12.1.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/gtk2hs/ChangeLog7
-rw-r--r--dev-haskell/gtk2hs/Manifest14
-rw-r--r--dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild11
3 files changed, 28 insertions, 4 deletions
diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index ee42c0568b4f..2afd847daa42 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/gtk2hs
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.43 2008/03/17 15:25:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.44 2008/05/04 13:56:19 kolmodin Exp $
+
+ 04 May 2008; Lennart Kolmodin <kolmodin@gentoo.org>
+ gtk2hs-0.9.12.1.ebuild:
+ Add Duncan Coutts' fix when using haddock 0.9.
+ This should close bug #220185.
17 Mar 2008; Raúl Porcel <armin76@gentoo.org> gtk2hs-0.9.11.ebuild,
gtk2hs-0.9.12.ebuild, gtk2hs-0.9.12.1.ebuild:
diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index b2f0608294ec..e6c9a111e8d6 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX gtk2hs-0.9.10-cflags.patch 1233 RMD160 eb5cb160a304cc4f5535be9a218549aaaad7c56c SHA1 68f3d351fa801f77f3ebce853919b604fbb26b18 SHA256 867b3dec0d2d0bea714f85eadcc4825dd1815f021feb53bb070d1f78e330ccef
AUX gtk2hs-0.9.10-ghc622.patch 1440 RMD160 aa50f1a098efbb464993c2824314f79b58131ead SHA1 50522f3ab5ddcac4403953266b486098ae85179e SHA256 48d5b2565eb8a77658f0e6950e021cbf1a0c88ba2810fd8f4ece0c92d4d23b66
AUX gtk2hs-0.9.10-store.patch 678 RMD160 9369b99cfca278e252ea6b5c25ba23bcb53603e8 SHA1 a4d4685b483612bd4ae78af2fac7efcaf5b36310 SHA256 e47de4d759ff4e68ef9d278ddb5d8db77c463a87ac964578fe929db0ba1cf06f
@@ -5,7 +8,14 @@ DIST gtk2hs-0.9.11.tar.gz 980618 RMD160 c745020329fab493752d9055c4c8bca798b5d3e1
DIST gtk2hs-0.9.12.1.tar.gz 1004661 RMD160 cd658027ed91b9550915e686d546e36b1b371c10 SHA1 a85f8568aa072e0c55da5889b2aabff92b8da3ae SHA256 4278078b786202fc64f86881c2b2517bdd589d5248bff2e9b7e6c1ffd2361f84
DIST gtk2hs-0.9.12.tar.gz 997153 RMD160 bfc3ad81be80fdbbf1694493d93ddf863efbf6d8 SHA1 401638c5abfc357b648e4aa4b234874c116a52bb SHA256 b7427fca5d1958a829b2623715a9b16d4b08d67820df0b46ad32e5bd6e1f44d2
EBUILD gtk2hs-0.9.11.ebuild 3089 RMD160 41d3ee491c7fe970fa184c6af26ce0c81ee938ce SHA1 af3969e4330e176abf7945f995d92066bfdca0f7 SHA256 1eaa401700d372838d24c9557c37a9e51ddee6e95e69a2cd6a0bf8f3ccf92e53
-EBUILD gtk2hs-0.9.12.1.ebuild 3110 RMD160 072ebb8348163e7ccf85d4f969eb6bbf882a3cdc SHA1 4310c0abc3e7a3c2392a2b8dfd65d2d649465611 SHA256 bd71212cc0b81367a215f4e422bd0fa609fc8a831f1a8ee1298b4901cc3f26ff
+EBUILD gtk2hs-0.9.12.1.ebuild 3303 RMD160 a8c5b4a7259b832e02af067a1d8affc84ef2b5ef SHA1 f252f3241a8ba4093d8ee57de617d637c596dc9e SHA256 43e59bf1e734c6127de8dbd67e57a376518ec84f67be7eb3e19781c87f356e37
EBUILD gtk2hs-0.9.12.ebuild 3319 RMD160 2dde9fcc69f3c87b2eb36a4197f48ba6ac7ada5d SHA1 2273a1ad3877d7c4e6c90519f3e70a033cd0e116 SHA256 198e5d051699baa27b53075f15220c0c404ca336c5faa603e98bedc18682da5d
-MISC ChangeLog 5966 RMD160 e75dd8e9131d8ceae879125d3dcc836fabef5d31 SHA1 d614024f588b7c1fd42375be5e9c7d80d5d53278 SHA256 f3dd1fcff7043e7700072f5a78781ee4458faed4a1aa9ef4763baad17edb8210
+MISC ChangeLog 6130 RMD160 a5d34e15d6b43cdee75e3d4318b4a207a6432530 SHA1 2ccbd4a08428f489a4e141005cfcdc3dbd2a5281 SHA256 6fc461bcfe664a0a8a70ac91ea70b67980ec5cdfef71ab11d1ac7c9719ec74ba
MISC metadata.xml 223 RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be SHA1 3be3a7139f7e71b712959fb7465f73d1bcb6ba07 SHA256 8c4b3cde4b0d254edca1f695296876df4ac96ca844d68e8152cfc5f6dbe39792
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIHcEa1n/CYbXjntIRAnNqAKCvJEPh4vLWNsSYvva7ljkMVrp3PQCfYNVA
+34XFd22odMAwgdJSJpjq0uo=
+=vWsN
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
index 037040178fcc..15093b270eca 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.6 2008/03/17 15:25:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.7 2008/05/04 13:56:19 kolmodin Exp $
inherit base eutils ghc-package multilib toolchain-funcs versionator
@@ -30,6 +30,15 @@ DEPEND="${RDEPEND}
doc? ( >=dev-haskell/haddock-0.8 )
dev-util/pkgconfig"
+src_unpack() {
+ unpack ${A}
+
+ sed -i -e '\|docs/reference/haddock.js|d' \
+ -e '/$(foreach LETTER,/,+1 d' \
+ -e '\|\tdocs/reference/gtk2hs.haddock| s/\\//' \
+ "${S}/Makefile.in"
+}
+
src_compile() {
econf \
--enable-packager-mode \