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

Package-Manager: portage-2.1.4.4

6 files changed, 13 insertions, 78 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/Manifest b/dev-haskell/gtk2hs/Manifest
index e6c9a111e8d6..f02b79b44b52 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,21 +1,18 @@
 -----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
 DIST gtk2hs-0.9.11.tar.gz 980618 RMD160 c745020329fab493752d9055c4c8bca798b5d3e1 SHA1 6150312809e99ca3bcfc9f1f851d48a5253022ce SHA256 5da4c1fd7f0b66834e2aaf919d243928f63c15411e6289b2f31dfafb50848691
 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 3303 RMD160 a8c5b4a7259b832e02af067a1d8affc84ef2b5ef SHA1 f252f3241a8ba4093d8ee57de617d637c596dc9e SHA256 43e59bf1e734c6127de8dbd67e57a376518ec84f67be7eb3e19781c87f356e37
-EBUILD gtk2hs-0.9.12.ebuild 3319 RMD160 2dde9fcc69f3c87b2eb36a4197f48ba6ac7ada5d SHA1 2273a1ad3877d7c4e6c90519f3e70a033cd0e116 SHA256 198e5d051699baa27b53075f15220c0c404ca336c5faa603e98bedc18682da5d
-MISC ChangeLog 6130 RMD160 a5d34e15d6b43cdee75e3d4318b4a207a6432530 SHA1 2ccbd4a08428f489a4e141005cfcdc3dbd2a5281 SHA256 6fc461bcfe664a0a8a70ac91ea70b67980ec5cdfef71ab11d1ac7c9719ec74ba
+EBUILD gtk2hs-0.9.12.ebuild 3318 RMD160 b976422f03d4dfe0578d3f8c617d77effe43fdac SHA1 013116e0793370659627a88e5d775e4ed24d0db1 SHA256 35aefe3ee83f21f65b738b46abcca839c1efb04b456f70cded0dd55b34ab7a8a
+MISC ChangeLog 6367 RMD160 2735e6e9ed0b2f6f73ed5889bea480cf7c70808f SHA1 5b64999146ee66e9afe7a72715d4678f0b41e4f2 SHA256 841d29113d9bcc8afc752cbdbc2b85fdf4f7e312bda84d26c66c201de4e5d53f
 MISC metadata.xml 223 RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be SHA1 3be3a7139f7e71b712959fb7465f73d1bcb6ba07 SHA256 8c4b3cde4b0d254edca1f695296876df4ac96ca844d68e8152cfc5f6dbe39792
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIHcEa1n/CYbXjntIRAnNqAKCvJEPh4vLWNsSYvva7ljkMVrp3PQCfYNVA
-34XFd22odMAwgdJSJpjq0uo=
-=vWsN
+iD8DBQFIHcRK1n/CYbXjntIRAnVQAKCmmlJ6fXel/FpW5kMsmoeaRIl0CQCdGdVj
+ILJjkGGVLMw7W9ebhyC3QbU=
+=GUEe
 -----END PGP SIGNATURE-----
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)/' \