Remove unused patches, and fix a repoman minor. dev-haskell/gtk2hs

(Portage version: 2.1.4.4)

5 files changed, 8 insertions, 70 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 2afd847daa42..a301328af258 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.44 2008/05/04 13:56:19 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.45 2008/05/04 14:10:01 kolmodin Exp $
+
+  04 May 2008; Lennart Kolmodin <kolmodin@gentoo.org>
+  -files/gtk2hs-0.9.10-cflags.patch, -files/gtk2hs-0.9.10-ghc622.patch,
+  -files/gtk2hs-0.9.10-store.patch, gtk2hs-0.9.12.ebuild:
+  Remove unused patches, and fix a ebuild.minorsyn.
 
   04 May 2008; Lennart Kolmodin <kolmodin@gentoo.org>
   gtk2hs-0.9.12.1.ebuild:
diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-cflags.patch b/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-cflags.patch
deleted file mode 100644
index 91356788108e..000000000000
--- a/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urwpN gtk2hs-0.9.10.orig/mk/common.mk gtk2hs-0.9.10/mk/common.mk
---- gtk2hs-0.9.10.orig/mk/common.mk	2006-02-13 16:31:33.184111717 +0000
-+++ gtk2hs-0.9.10/mk/common.mk	2006-02-13 17:26:41.972180579 +0000
-@@ -79,6 +79,8 @@ noDeps   := $(strip $(findstring clean,$
- 	$(strip $(HC) -c $< -o $@ $(INCLUDES) \
- 		$(AM_CPPFLAGS) $($(PKG)_CPPFLAGS) $(CPPFLAGS) \
- 		$(addprefix -optc,$(AM_CFLAGS) $($(PKG)_CFLAGS) \
-+				  $(call getVar,$<,CFLAGS) $(CFLAGS)) \
-+		$(addprefix -opta,$(AM_CFLAGS) $($(PKG)_CFLAGS) \
- 				  $(call getVar,$<,CFLAGS) $(CFLAGS)))
- 
- # The cheeky rule for .hi files says that .hi files can be created as
-@@ -106,7 +108,8 @@ noDeps   := $(strip $(findstring clean,$
- 	$(strip $(HSC2HS) $(HSCFLAGS) +RTS $(HSTOOLFLAGS) -RTS \
-         $(addprefix -L-optl,$(AM_LDFLAGS) $(LDFLAGS) $($(PKG)_LIBS)) \
-         $(addprefix -C,	$(filter-out -I%,$(AM_CPPFLAGS) $(CPPFLAGS)) \
--	$(addprefix -optc,$(AM_CFLAGS) $(CFLAGS) $($(PKG)_CFLAGS)))\
-+	$(addprefix -optc,$(AM_CFLAGS) $(CFLAGS) $($(PKG)_CFLAGS)) \
-+	$(addprefix -opta,$(AM_CFLAGS) $(CFLAGS) $($(PKG)_CFLAGS))) \
-         $(filter -I%,$(AM_CPPFLAGS) $(CPPFLAGS)) $($(PKG)_CPPFLAGS)\
- 	-C'-optc-include' -C'-optc$(CONFIG_HEADER)' \
- 	--include $($(PKG)_HEADER) \
diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-ghc622.patch b/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-ghc622.patch
deleted file mode 100644
index 10e9ce8ba527..000000000000
--- a/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-ghc622.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urwpN gtk2hs-0.9.10.orig/configure.ac gtk2hs-0.9.10/configure.ac
---- gtk2hs-0.9.10.orig/configure.ac	2006-02-20 17:30:07.000000000 +0000
-+++ gtk2hs-0.9.10/configure.ac	2006-02-20 17:57:55.000000000 +0000
-@@ -381,7 +381,8 @@ dnl bindings for Haskell. So set the GTK
- dnl appropaiate value to substitute into the gtk package files
- 
- if test "$HAVE_GTK_VERSION_2_8" = "yes" -a "$ENABLE_CAIRO" = "yes"; then
--  GTK_CAIRO_DEPEND=", cairo-${PACKAGE_VERSION}"
-+  GTK_CAIRO_DEPEND=", cairo-${PACKAGE_VERSION}";
-+  GTK_CAIRO_DEPEND_NO_CABAL=",\"cairo\"";
- fi
- 
- dnl The configuration program for GTK is kind of stupid in that it
-@@ -713,6 +714,7 @@ AC_SUBST(GHCPKG_USE_AUTOLIBS)
- AC_SUBST(GHCPKG_BUILD_GHCI_LIB)
- dnl Optional packages
- AC_SUBST(GTK_CAIRO_DEPEND)
-+AC_SUBST(GTK_CAIRO_DEPEND_NO_CABAL)
- dnl Documentation
- AC_SUBST(HADDOCK)
- AC_SUBST(GHC_DOCDIR)
-diff -urwpN gtk2hs-0.9.10.orig/gtk/gtk.pkg.in gtk2hs-0.9.10/gtk/gtk.pkg.in
---- gtk2hs-0.9.10.orig/gtk/gtk.pkg.in	2006-02-20 17:30:07.000000000 +0000
-+++ gtk2hs-0.9.10/gtk/gtk.pkg.in	2006-02-20 17:32:33.000000000 +0000
-@@ -8,7 +8,7 @@ Package {
-      extra_libraries = [@GTK_LIBS_CQ@],
-      include_dirs    = [@GTK_CFLAGS_CQ@],
-      c_includes      = ["gtk/gtk.h"],
--     package_deps    = ["glib" @GTK_CAIRO_DEPEND@],
-+     package_deps    = ["glib" @GTK_CAIRO_DEPEND_NO_CABAL@],
-      extra_ghc_opts  = [],
-      extra_cc_opts   = [],
-      extra_ld_opts   = [@GTK_LIBEXTRA_CQ@]
diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-store.patch b/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-store.patch
deleted file mode 100644
index 38794a89662f..000000000000
--- a/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-store.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urwpN gtk2hs-0.9.10.orig/glib/System/Glib/GValue.chs gtk2hs-0.9.10/glib/System/Glib/GValue.chs
---- gtk2hs-0.9.10.orig/glib/System/Glib/GValue.chs	2005-04-18 22:04:08.000000000 -0400
-+++ gtk2hs-0.9.10/glib/System/Glib/GValue.chs	2006-03-05 14:53:20.000000000 -0400
-@@ -68,7 +68,7 @@ valueGetType (GValue gvPtr) = {# get GVa
- --
- allocaGValue :: (GValue -> IO b) -> IO b
- allocaGValue body =
--  allocaBytes {# sizeof GValue #} $ \gvPtr -> do
-+  allocaBytes ({# sizeof GType #}+ 2* {# sizeof guint64 #}) $ \gvPtr -> do
-   -- The g_type field of the value must be zero or g_value_init will fail.
-   {# set GValue->g_type #} gvPtr (0 :: GType)
-   result <- body (GValue gvPtr)
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
index eb848d3028e4..641be2a0e009 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.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.ebuild,v 1.6 2008/03/17 15:25:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v 1.7 2008/05/04 14:10:01 kolmodin Exp $
 
 inherit base eutils ghc-package multilib toolchain-funcs versionator
 
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 		doc? ( >=dev-haskell/haddock-0.8 )"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 
 	# Fix for recent glib that changes the type of the gtype typedef:
 	sed -i -e 's/(CULong)/(CULong, CUInt)/' \