summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2014-06-05 08:22:25 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2014-06-05 08:22:25 +0000
commiteb0f930e685b4a2cb99a297e21f024ab29b3ccfe (patch)
treec453ed199ea00f385dbabb326c4981d7b8ffc5cf /dev-haskell
parentsci-chemistry/ccpn: Todays python patches (diff)
downloadgentoo-2-eb0f930e685b4a2cb99a297e21f024ab29b3ccfe.tar.gz
gentoo-2-eb0f930e685b4a2cb99a297e21f024ab29b3ccfe.tar.bz2
gentoo-2-eb0f930e685b4a2cb99a297e21f024ab29b3ccfe.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/gtk/ChangeLog5
-rw-r--r--dev-haskell/gtk/gtk-0.12.4-r1.ebuild15
2 files changed, 5 insertions, 15 deletions
diff --git a/dev-haskell/gtk/ChangeLog b/dev-haskell/gtk/ChangeLog
index 43f1a86e61d2..afbe4a8c5313 100644
--- a/dev-haskell/gtk/ChangeLog
+++ b/dev-haskell/gtk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/gtk
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/ChangeLog,v 1.20 2014/05/20 13:51:57 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/ChangeLog,v 1.21 2014/06/05 08:22:25 slyfox Exp $
+
+ 05 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> gtk-0.12.4-r1.ebuild:
+ Use unmodified 'gtk2hsTypeGen' (bug #512474 by Paweł Hajdan, Jr.).
*gtk-0.12.5.7.2 (20 May 2014)
diff --git a/dev-haskell/gtk/gtk-0.12.4-r1.ebuild b/dev-haskell/gtk/gtk-0.12.4-r1.ebuild
index b218fa32d030..8131d535589c 100644
--- a/dev-haskell/gtk/gtk-0.12.4-r1.ebuild
+++ b/dev-haskell/gtk/gtk-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/gtk/gtk-0.12.4-r1.ebuild,v 1.7 2014/02/02 11:13:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.4-r1.ebuild,v 1.8 2014/06/05 08:22:25 slyfox Exp $
EAPI=5
@@ -39,19 +39,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}@" \
- -e "s@gtk2hsTypeGen@gtk2hsTypeGen${GTK_MAJ_VER}@" \
- -e "s@gtk2hsHookGenerator@gtk2hsHookGenerator${GTK_MAJ_VER}@" \
- -i "${S}/${PN}.cabal" \
- || die "Could not change ${PN}.cabal for GTK+ slot 0"
-}
-
src_configure() {
# Upstream has this enabled, so we might as well force it enabled to be sure.
cabal_src_configure \