diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2014-06-05 08:15:26 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2014-06-05 08:15:26 +0000 |
| commit | 05005c4716cee36eda8135fe3bd5eb607155939a (patch) | |
| tree | 562c29c5e6fd649386f9252fd7e8f5b9f423534b /dev-haskell | |
| parent | Bump (diff) | |
| download | gentoo-2-05005c4716cee36eda8135fe3bd5eb607155939a.tar.gz gentoo-2-05005c4716cee36eda8135fe3bd5eb607155939a.tar.bz2 gentoo-2-05005c4716cee36eda8135fe3bd5eb607155939a.zip | |
Use unmodified 'gtk2hsTypeGen' (bug #512474 by Paweł Hajdan, Jr.).
(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/cairo/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/cairo/cairo-0.12.4-r1.ebuild | 13 |
2 files changed, 5 insertions, 13 deletions
diff --git a/dev-haskell/cairo/ChangeLog b/dev-haskell/cairo/ChangeLog index a3c7014e2c2e..8db574099b17 100644 --- a/dev-haskell/cairo/ChangeLog +++ b/dev-haskell/cairo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/cairo # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/ChangeLog,v 1.24 2014/05/20 13:29:01 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/ChangeLog,v 1.25 2014/06/05 08:15:26 slyfox Exp $ + + 05 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> cairo-0.12.4-r1.ebuild: + Use unmodified 'gtk2hsTypeGen' (bug #512474 by Paweł Hajdan, Jr.). *cairo-0.12.5.3 (20 May 2014) diff --git a/dev-haskell/cairo/cairo-0.12.4-r1.ebuild b/dev-haskell/cairo/cairo-0.12.4-r1.ebuild index 1d6a4ed02478..7dd7738031af 100644 --- a/dev-haskell/cairo/cairo-0.12.4-r1.ebuild +++ b/dev-haskell/cairo/cairo-0.12.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4-r1.ebuild,v 1.7 2014/02/02 11:13:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4-r1.ebuild,v 1.8 2014/06/05 08:15:26 slyfox Exp $ EAPI=5 @@ -29,17 +29,6 @@ DEPEND="${RDEPEND} >=dev-haskell/gtk2hs-buildtools-0.12.4:0= virtual/pkgconfig" -src_prepare() { - sed -e "s@gtk2hsTypeGen@gtk2hsTypeGen${GTK_MAJ_VER}@" \ - -e "s@gtk2hsHookGenerator@gtk2hsHookGenerator${GTK_MAJ_VER}@" \ - -e "s@gtk2hsC2hs@gtk2hsC2hs${GTK_MAJ_VER}@" \ - -i "${S}/Gtk2HsSetup.hs" \ - || die "Could not change Gtk2HsSetup.hs for GTK+ slot 0" - sed -e "s@gtk2hsC2hs@gtk2hsC2hs${GTK_MAJ_VER}@" \ - -i "${S}/${PN}.cabal" \ - || die "Could not change ${PN}.cabal for GTK+ slot 0" -} - src_configure() { # x11-libs/cairo seems to build pdf and ps by default cabal_src_configure \ |