Add an ebuild for version 2.12.6, masked togethe with Mono 2 for now. The new version features working parallel make, and an USE flag to turn on/off glade-sharp, merging back the separate dev-dotnet/glade-sharp package. The glade USE flag is turned on by default since most software will want it together with gtk-sharp.

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

6 files changed, 257 insertions, 2 deletions

diff --git a/dev-dotnet/gtk-sharp/ChangeLog b/dev-dotnet/gtk-sharp/ChangeLog
index 5cdf2f2669d9..4d20013f4f3b 100644
--- a/dev-dotnet/gtk-sharp/ChangeLog
+++ b/dev-dotnet/gtk-sharp/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-dotnet/gtk-sharp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.80 2008/01/13 04:19:53 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.81 2008/11/19 23:29:44 flameeyes Exp $
+
+*gtk-sharp-2.12.6 (19 Nov 2008)
+
+  19 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/gtk-sharp-2.12.0-noautomagic.patch,
+  +files/gtk-sharp-2.12.0-parallelmake.patch,
+  +files/gtk-sharp-2.12.0-respect-choices.patch, metadata.xml,
+  +gtk-sharp-2.12.6.ebuild:
+  Add an ebuild for version 2.12.6, masked togethe with Mono 2 for now. The
+  new version features working parallel make, and an USE flag to turn on/off
+  glade-sharp, merging back the separate dev-dotnet/glade-sharp package. The
+  glade USE flag is turned on by default since most software will want it
+  together with gtk-sharp.
 
   13 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
   gtk-sharp-1.0.10.ebuild, gtk-sharp-2.8.2.ebuild, gtk-sharp-2.10.0.ebuild:
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
new file mode 100644
index 000000000000..0799d7814cee
--- /dev/null
+++ b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch
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
new file mode 100644
index 000000000000..e9195c89bfc3
--- /dev/null
+++ b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-parallelmake.patch
@@ -0,0 +1,66 @@
+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.0-respect-choices.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-respect-choices.patch
new file mode 100644
index 000000000000..ef752c46c413
--- /dev/null
+++ b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-respect-choices.patch
@@ -0,0 +1,112 @@
+Index: gtk-sharp-2.12.0/configure.in
+===================================================================
+--- gtk-sharp-2.12.0.orig/configure.in
++++ gtk-sharp-2.12.0/configure.in
+@@ -114,7 +114,7 @@ if test "x$AL" = "xno" ; then
+ fi
+ 
+ if test "x$has_mono" = "xtrue"; then
+-GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(prefix)/lib'
++GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /root $(DESTDIR)$(libdir)'
+ GENERATED_SOURCES=generated/*.cs
+ AC_PATH_PROG(RUNTIME, mono, no)
+ 
+Index: gtk-sharp-2.12.0/doc/Makefile.am
+===================================================================
+--- gtk-sharp-2.12.0.orig/doc/Makefile.am
++++ gtk-sharp-2.12.0/doc/Makefile.am
+@@ -20,7 +20,7 @@ UPDATE_ASSEMBLIES = $(addprefix -assembl
+ UPDATER = $(MONODOCER) -path:en -pretty $(UPDATE_ASSEMBLIES)
+ 
+ if ENABLE_MONODOC
+-SOURCESDIR=$(prefix)/lib/monodoc/sources
++SOURCESDIR=$(libdir)/monodoc/sources
+ TARGETS=gtk-sharp-docs.zip gtk-sharp-docs.tree gtk-sharp-docs.source
+ else
+ SOURCESDIR=$(datadir)
+Index: gtk-sharp-2.12.0/generator/Makefile.am
+===================================================================
+--- gtk-sharp-2.12.0.orig/generator/Makefile.am
++++ gtk-sharp-2.12.0/generator/Makefile.am
+@@ -1,4 +1,4 @@
+-assemblydir = $(prefix)/lib/gtk-sharp-2.0
++assemblydir = $(libdir)/gtk-sharp-2.0
+ assembly_DATA = gapi_codegen.exe
+ bin_SCRIPTS = gapi2-codegen
+ CLEANFILES = gapi_codegen.exe
+Index: gtk-sharp-2.12.0/parser/Makefile.am
+===================================================================
+--- gtk-sharp-2.12.0.orig/parser/Makefile.am
++++ gtk-sharp-2.12.0/parser/Makefile.am
+@@ -1,4 +1,4 @@
+-assemblydir = $(prefix)/lib/gtk-sharp-2.0
++assemblydir = $(libdir)/gtk-sharp-2.0
+ pkgconfigdir = $(libdir)/pkgconfig
+ assembly_DATA = gapi-fixup.exe gapi-parser.exe
+ pkgconfig_DATA = gapi-2.0.pc
+Index: gtk-sharp-2.12.0/glade/glade-sharp-2.0.pc.in
+===================================================================
+--- gtk-sharp-2.12.0.orig/glade/glade-sharp-2.0.pc.in
++++ gtk-sharp-2.12.0/glade/glade-sharp-2.0.pc.in
+@@ -1,6 +1,6 @@
+-prefix=${pcfiledir}/../..
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
+ gapidir=${prefix}/share/gapi-2.0
+ 
+ 
+Index: gtk-sharp-2.12.0/glib/glib-sharp-2.0.pc.in
+===================================================================
+--- gtk-sharp-2.12.0.orig/glib/glib-sharp-2.0.pc.in
++++ gtk-sharp-2.12.0/glib/glib-sharp-2.0.pc.in
+@@ -1,6 +1,6 @@
+-prefix=${pcfiledir}/../..
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
+ gapidir=${prefix}/share/gapi-2.0
+ 
+ 
+Index: gtk-sharp-2.12.0/gtkdotnet/gtk-dotnet-2.0.pc.in
+===================================================================
+--- gtk-sharp-2.12.0.orig/gtkdotnet/gtk-dotnet-2.0.pc.in
++++ gtk-sharp-2.12.0/gtkdotnet/gtk-dotnet-2.0.pc.in
+@@ -1,6 +1,6 @@
+-prefix=${pcfiledir}/../..
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
+ 
+ 
+ Name: Gtk.DotNet
+Index: gtk-sharp-2.12.0/gtk/gtk-sharp-2.0.pc.in
+===================================================================
+--- gtk-sharp-2.12.0.orig/gtk/gtk-sharp-2.0.pc.in
++++ gtk-sharp-2.12.0/gtk/gtk-sharp-2.0.pc.in
+@@ -1,6 +1,6 @@
+-prefix=${pcfiledir}/../..
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
+ gapidir=${prefix}/share/gapi-2.0
+ 
+ 
+Index: gtk-sharp-2.12.0/parser/gapi-2.0.pc.in
+===================================================================
+--- gtk-sharp-2.12.0.orig/parser/gapi-2.0.pc.in
++++ gtk-sharp-2.12.0/parser/gapi-2.0.pc.in
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ 
+ 
+ Name: GAPI
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild
new file mode 100644
index 000000000000..760233453cbc
--- /dev/null
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 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.6.ebuild,v 1.1 2008/11/19 23:29:44 flameeyes Exp $
+
+EAPI="1"
+
+inherit eutils mono autotools
+
+DESCRIPTION="Gtk# is a C# language binding for the GTK2 toolkit and GNOME libraries"
+HOMEPAGE="http://gtk-sharp.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/${PN}/${PV%.*}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="doc +glade"
+
+RDEPEND=">=dev-lang/mono-1.1.9
+		glade? ( >=gnome-base/libglade-2.3.6 )
+		 >=x11-libs/gtk+-2.12
+		!<dev-dotnet/glade-sharp-9999"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.19
+		doc? ( >=dev-util/monodoc-1.1.8 )"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Upstream bug #421063
+	epatch "${FILESDIR}/${PN}-2.12.0-parallelmake.patch"
+	# Upstream bug #443174
+	epatch "${FILESDIR}/${PN}-2.12.0-respect-choices.patch"
+	# Upstream bug #443180
+	epatch "${FILESDIR}/${PN}-2.12.0-noautomagic.patch"
+
+	# Upsteram bug #443175
+	sed -i -e ':^CFLAGS=:d' "${S}/configure.in"
+
+	# disable building of samples (#16015)
+	sed -i -e "s:sample::" Makefile.am
+
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable glade) || die "configure failed"
+	LANG=C emake || die
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	dodoc README* ChangeLog
+}
diff --git a/dev-dotnet/gtk-sharp/metadata.xml b/dev-dotnet/gtk-sharp/metadata.xml
index bf098967764e..6ea0d7971334 100644
--- a/dev-dotnet/gtk-sharp/metadata.xml
+++ b/dev-dotnet/gtk-sharp/metadata.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dotnet</herd>
+  <use>
+    <flag name="glade">
+      Build the C#/Mono bindings for libglade (Glade#). This flag
+      replaces the separate <pkg>dev-dotnet/glade-sharp</pkg> package
+      that was available up to version 2.10.0. If a package require
+      Glade# make sure to use a USE-based dependency from EAPI 2.
+    </flag>
+  </use>
 </pkgmetadata>