Add a patch to fix custom CellRenderer classes. Remove old unused files.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

7 files changed, 73 insertions, 137 deletions

diff --git a/dev-dotnet/gtk-sharp/ChangeLog b/dev-dotnet/gtk-sharp/ChangeLog
index 7210e02232cd..ec299a01bd6c 100644
--- a/dev-dotnet/gtk-sharp/ChangeLog
+++ b/dev-dotnet/gtk-sharp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-dotnet/gtk-sharp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.100 2009/09/27 16:26:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.101 2009/10/18 13:52:56 flameeyes Exp $
+
+*gtk-sharp-2.12.9-r1 (18 Oct 2009)
+
+  18 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/gtk-sharp-2.12.0-doc-parallelmake.patch,
+  -files/gtk-sharp-2.12.0-noautomagic.patch,
+  -files/gtk-sharp-2.12.0-parallelmake.patch, +gtk-sharp-2.12.9-r1.ebuild,
+  +files/gtk-sharp-2.12.9-cellrenderer.patch:
+  Add a patch to fix custom CellRenderer classes. Remove old unused files.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> gtk-sharp-2.12.9.ebuild:
   ppc stable #283739
diff --git a/dev-dotnet/gtk-sharp/Manifest b/dev-dotnet/gtk-sharp/Manifest
index 97bee5479fd4..c9243db67f26 100644
--- a/dev-dotnet/gtk-sharp/Manifest
+++ b/dev-dotnet/gtk-sharp/Manifest
@@ -1,10 +1,19 @@
-AUX gtk-sharp-2.12.0-doc-parallelmake.patch 495 RMD160 c8eaba7fa0b60a400f8a3497fb144ac8e8e7c095 SHA1 9a7ce34d53b8c9031234de43c8e4d7b37adad583 SHA256 7a23fe2862662b300a403a4c51dabf4434de81469e0ba4dd24ae63a294109543
-AUX gtk-sharp-2.12.0-noautomagic.patch 1670 RMD160 f9a3429dc0609c54ae2f14eff6496decd01eee65 SHA1 28766ea1413ec35d2153c47ef32feaaac24e4e3a SHA256 0788a38da0f8195865c3f1192f562da40e15aca2c62f5c32c31565c724984251
-AUX gtk-sharp-2.12.0-parallelmake.patch 3331 RMD160 e7e76fdff7140d8d7b86a8f090e809423a4e2f53 SHA1 227bf898cf23fd70dcc83389a660ceea39842995 SHA256 b91519acbe57beff4d6cc0f8a1face8f024470daab3512fab87c5c2c95a15744
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gtk-sharp-2.12.9-cellrenderer.patch 2510 RMD160 c0f86adef280bb5cb2aee159b31f2dea072c70bd SHA1 8e95ed6e36d4b0c661f2a9efd7d492824a1c322e SHA256 f8df90e87f7b5bf3dcc206bafbe9a6b4b16892ebd30ff128278da61b9bf0e32d
 DIST gtk-sharp-2.12.7.patch.bz2 1069 RMD160 762ae1d1404e33081d5368575010e989849b8c05 SHA1 70feaeddf3806bd5009a440672db78b2788ed8a2 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8
 DIST gtk-sharp-2.12.8.tar.bz2 1605876 RMD160 d287020b230e637869f4fe830961724bd44f7b01 SHA1 3c97abd67e92738e7960f9e0e5f2410e8ff4912b SHA256 b2edc4bb213c1a0fc40dede222116686f04c4ba9196f80c5d1532d5ee2128020
 DIST gtk-sharp-2.12.9.tar.bz2 1606047 RMD160 3cc5b9041e4abddc62f4f329cfff2bd1c9232463 SHA1 a218d10ade40cb84155c570b94f09a76ed79f0d9 SHA256 d580bd03246b7885de8d4271ea736eb0925153a08a396d6b382c8193a0ed7beb
 EBUILD gtk-sharp-2.12.8.ebuild 332 RMD160 cb81bf6b96e6f40f5e18a70a4a7e89d6078b04ad SHA1 34945dfa9ae0e23b1f70868500a8438dbfb01feb SHA256 ebfd21c37be90f964808cb1a2d899865e5363a6d492790e30e0dd763844b4600
+EBUILD gtk-sharp-2.12.9-r1.ebuild 443 RMD160 e2b766b5fc1b4e14c480be5d5d8eecc4dd5024f2 SHA1 c2e73a1987f6e77a5a59f58de2634ab93526215d SHA256 f4082a72d5f82233fc77b29b5d761aa2ad719f7106532eba39db7497a41896cb
 EBUILD gtk-sharp-2.12.9.ebuild 332 RMD160 241d7f6e6986896d54682560dca253eac0f50423 SHA1 6abd80409c2303931d2f12857a3940ff1dbb2f9a SHA256 663a6f96c50f25c8a45832dad7916d2a90d87b1e6543cdc08fd13e2ba7bdcaaf
-MISC ChangeLog 21023 RMD160 2aabce2f1f3e29fee47ebbea097d56f254c70b49 SHA1 7b0518cf82238317a0c1449a1ed77542181812ab SHA256 36060b44d05ae9cae03709f5f45b34df4b1ffbc4535c63d659b3bacaf7911bc6
+MISC ChangeLog 21410 RMD160 5338810880d1a272da384717fb7cd0981aa6e092 SHA1 f14780b7ace47b6b80d57143539203ad91373d11 SHA256 b52abcc738056200156a0d342598f0f1df596d91567356300a82d4e8b497481d
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkrbHcgACgkQAiZjviIA2Xi8yACeN7zxhkNaW0rd+wjcu1VsnDmG
+loEAniRGoMS+GVKDRB3DZytirYD/hVpl
+=RRSM
+-----END PGP SIGNATURE-----
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch
deleted file mode 100644
index 3046e55f64ed..000000000000
--- a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: doc/Makefile.am
-===================================================================
---- doc/Makefile.am	(revision 118618)
-+++ doc/Makefile.am	(working copy)
-@@ -32,7 +32,9 @@
- 
- assemble: gtk-sharp-docs.zip gtk-sharp-docs.tree
- 
--gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
-+gtk-sharp-docs.tree: gtk-sharp-docs.zip
-+
-+gtk-sharp-docs.zip: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
- 	$(MDASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs
- 
- get-assemblies:
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch
deleted file mode 100644
index 852662e3ab39..000000000000
--- a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -NrU5 gtk-sharp-2.12.6.orig/configure.in gtk-sharp-2.12.6/configure.in
---- gtk-sharp-2.12.6.orig/configure.in	2008-11-24 22:24:07.000000000 +0100
-+++ gtk-sharp-2.12.6/configure.in	2008-11-24 22:35:25.000000000 +0100
-@@ -184,24 +184,38 @@
- 
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
-+AC_ARG_ENABLE(glade,
-+	AS_HELP_STRING([--disable-glade], [Don't build glade-sharp]),,
-+	[enable_glade=yes])
-+
- GLADE_REQUIRED_VERSION=2.3.6
--PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no)
--AC_SUBST(GLADE_CFLAGS)
--AC_SUBST(GLADE_LIBS)
-+if test "x$enable_glade" = "xyes"; then
-+	PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no)
-+	AC_SUBST(GLADE_CFLAGS)
-+	AC_SUBST(GLADE_LIBS)
-+fi
-+
-+AC_ARG_ENABLE(monodoc,
-+	AS_HELP_STRING([--disable-monodoc], [Don't build monodocuments]),,
-+	[enable_monodoc=yes])
- 
- AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
- AC_PATH_PROG(MONODOCER, monodocer, no)
--if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
--  enable_monodoc=no
--  doc_sources_dir=
--else
--  enable_monodoc=yes
--  doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
-+
-+if test "x$enable_monodoc" = "xyes"; then
-+	if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
-+		enable_monodoc=no
-+		doc_sources_dir=
-+	else
-+		enable_monodoc=yes
-+		doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
-+	fi
- fi
-+
- AC_SUBST(MDASSEMBLER)
- AC_SUBST(MONODOCER)
- 
- AM_CONDITIONAL(ENABLE_MONO_CAIRO, test "x$enable_mono_cairo" = "xyes")
- AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes")
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-parallelmake.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-parallelmake.patch
deleted file mode 100644
index e9195c89bfc3..000000000000
--- a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-parallelmake.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: gtk-sharp-2.12.0/glib/Makefile.am
-===================================================================
---- gtk-sharp-2.12.0.orig/glib/Makefile.am
-+++ gtk-sharp-2.12.0/glib/Makefile.am
-@@ -98,12 +98,11 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.
- 	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
- 	$(GAPI_CDECL_INSERT)
- 
--$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
--	@for i in $(POLICY_VERSIONS); do	\
--	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
--	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
--	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
--	done
-+policy.%.config: $(top_builddir)/policy.config
-+	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
-+
-+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
-+	$(AL) -link:policy.$*.config -out:$@ -keyfile:gtk-sharp.snk
- 
- install-data-local:
- 	@if test -n '$(TARGET)'; then							\
-Index: gtk-sharp-2.12.0/gtkdotnet/Makefile.am
-===================================================================
---- gtk-sharp-2.12.0.orig/gtkdotnet/Makefile.am
-+++ gtk-sharp-2.12.0/gtkdotnet/Makefile.am
-@@ -46,12 +46,11 @@ $(ASSEMBLY): $(build_sources) $(referenc
- 	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources)
- 	$(GAPI_CDECL_INSERT)
- 
--$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
--	@for i in $(POLICY_VERSIONS); do	\
--	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
--	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
--	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
--	done
-+policy.%.config: $(top_builddir)/policy.config
-+	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
-+
-+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
-+	$(AL) -link:policy.$*.config -out:$@ -keyfile:gtk-sharp.snk
- 
- install-data-local:
- 	@if test -n '$(TARGET)'; then							\
-Index: gtk-sharp-2.12.0/Makefile.include
-===================================================================
---- gtk-sharp-2.12.0.orig/Makefile.include
-+++ gtk-sharp-2.12.0/Makefile.include
-@@ -46,12 +46,11 @@ $(SNK): $(top_srcdir)/$(SNK)
- AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
- 	cp $(top_builddir)/AssemblyInfo.cs .
- 
--$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config $(SNK)
--	@for i in $(POLICY_VERSIONS); do	\
--	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
--	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
--	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:$(SNK);	\
--	done
-+policy.%.config: $(top_builddir)/policy.config
-+	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
-+
-+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK)
-+	$(AL) -link:policy.$*.config -out:$@ -keyfile:$(SNK)
- 
- build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
- build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.9-cellrenderer.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.9-cellrenderer.patch
new file mode 100644
index 000000000000..43f0cf1696f1
--- /dev/null
+++ b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.9-cellrenderer.patch
@@ -0,0 +1,32 @@
+Index: gtk-sharp-2.12.9/gtk/CellRenderer.custom
+===================================================================
+--- gtk-sharp-2.12.9.orig/gtk/CellRenderer.custom
++++ gtk-sharp-2.12.9/gtk/CellRenderer.custom
+@@ -80,7 +80,7 @@
+ 		}
+ 
+ 		[DllImport("gtksharpglue-2")]
+-		static extern void gtksharp_cellrenderer_base_render (IntPtr handle, IntPtr window, IntPtr widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
++		static extern void gtksharp_cellrenderer_base_render (IntPtr handle, IntPtr window, IntPtr widget, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
+ 
+ 		[DllImport("gtksharpglue-2")]
+ 		static extern void gtksharp_cellrenderer_override_render (IntPtr gtype, RenderDelegate cb);
+@@ -112,15 +112,15 @@
+ 		[GLib.DefaultSignalHandler (Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideRender")]
+ 		protected virtual void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
+ 		{
+-			gtksharp_cellrenderer_base_render (Handle, window.Handle, widget.Handle, background_area, cell_area, expose_area, flags);
++			gtksharp_cellrenderer_base_render (Handle, window.Handle, widget.Handle, ref background_area, ref cell_area, ref expose_area, flags);
+ 		}
+ 
+ 		[DllImport("gtksharpglue-2")]
+-		static extern void gtksharp_cellrenderer_invoke_render (IntPtr gtype, IntPtr handle, IntPtr window, IntPtr widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
++		static extern void gtksharp_cellrenderer_invoke_render (IntPtr gtype, IntPtr handle, IntPtr window, IntPtr widget, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
+ 
+ 		internal static void InternalRender (GLib.GType gtype, Gtk.CellRenderer cell, Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
+ 		{
+-			gtksharp_cellrenderer_invoke_render (gtype.Val, cell.Handle, window.Handle, widget.Handle, background_area, cell_area, expose_area, flags);
++			gtksharp_cellrenderer_invoke_render (gtype.Val, cell.Handle, window.Handle, widget.Handle, ref background_area, ref cell_area, ref expose_area, flags);
+ 		}
+ 
+ 		[DllImport("gtksharpglue-2")]
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.9-r1.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.9-r1.ebuild
new file mode 100644
index 000000000000..b03fe95c8df9
--- /dev/null
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.9-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.12.9-r1.ebuild,v 1.1 2009/10/18 13:52:56 flameeyes Exp $
+
+EAPI="2"
+
+inherit gtk-sharp-module eutils
+
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cellrenderer.patch
+	gtk-sharp-module_src_prepare
+}