Fix bug 282042 completely. Shuffle the sample programs building under check_SCRIPTS, make the .dll use only glib-sharp.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

4 files changed, 139 insertions, 12 deletions

diff --git a/dev-dotnet/evolution-sharp/ChangeLog b/dev-dotnet/evolution-sharp/ChangeLog
index 72265ee772d9..602b2f7eaf9b 100644
--- a/dev-dotnet/evolution-sharp/ChangeLog
+++ b/dev-dotnet/evolution-sharp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/evolution-sharp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.44 2009/08/22 22:43:56 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.45 2009/09/02 20:57:09 loki_val Exp $
+
+  02 Sep 2009; Peter Alfredsen <loki_val@gentoo.org>
+  evolution-sharp-0.20.0.ebuild, evolution-sharp-0.21.1.ebuild,
+  +files/evolution-sharp-0.21.1-gtk-sharp-dropped.patch:
+  Fix bug 282042 completely. Shuffle the sample programs building under
+  check_SCRIPTS, make the .dll use only glib-sharp.
 
 *evolution-sharp-0.21.1 (22 Aug 2009)
 
diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.20.0.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.20.0.ebuild
index 55ebd36f0b22..64931751e404 100644
--- a/dev-dotnet/evolution-sharp/evolution-sharp-0.20.0.ebuild
+++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.20.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.20.0.ebuild,v 1.2 2009/08/22 22:43:56 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.20.0.ebuild,v 1.3 2009/09/02 20:57:09 loki_val Exp $
 
 EAPI=2
 
-inherit mono gnome.org eutils
+inherit mono gnome.org eutils autotools
 
 DESCRIPTION="Mono bindings for Evolution"
 HOMEPAGE="http://www.gnome.org/projects/beagle"
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-#Does not build with <eds-2.24.0 - http://bugzilla.gnome.org/show_bug.cgi?id=563301
-
+# Does not build with <eds-2.24.0
+# http://bugzilla.gnome.org/show_bug.cgi?id=563301
 RDEPEND="
 	|| (
 		=gnome-extra/evolution-data-server-2.26*
@@ -25,17 +25,29 @@ RDEPEND="
 	>=dev-dotnet/glib-sharp-2.12
 	>=dev-lang/mono-2"
 DEPEND="${RDEPEND}
-	>=dev-dotnet/gtk-sharp-2.12
 	userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 	>=dev-dotnet/gtk-sharp-gapi-2.12
 	dev-util/pkgconfig"
 
+src_prepare() {
+	#Workaround for upstream Nazi version requirements.
+	sed -i \
+		-e 's:2.27.4:2.29.0:' \
+		configure.in || die "Sed failed"
+	epatch "${FILESDIR}/${PN}-0.21.1-gtk-sharp-dropped.patch"
+	eautoreconf
+}
+
 src_configure() {
 	econf --disable-static
 }
 
 src_compile() {
-	emake CSC=gmcs || die
+	emake CSC=/usr/bin/gmcs || die
+}
+
+src_test() {
+	emake CSC=/usr/bin/gmcs check||die
 }
 
 src_install() {
diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild
index df6bd4efcaa4..73f7650f73a4 100644
--- a/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild
+++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild,v 1.1 2009/08/22 22:43:56 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild,v 1.2 2009/09/02 20:57:09 loki_val Exp $
 
 EAPI=2
 
-inherit mono gnome.org eutils
+inherit mono gnome.org eutils autotools
 
 DESCRIPTION="Mono bindings for Evolution"
 HOMEPAGE="http://www.gnome.org/projects/beagle"
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+# Does not build with <eds-2.24.0
+# http://bugzilla.gnome.org/show_bug.cgi?id=563301
 RDEPEND="
 	|| (
 		=gnome-extra/evolution-data-server-2.28*
@@ -25,7 +27,6 @@ RDEPEND="
 	>=dev-dotnet/glib-sharp-2.12
 	>=dev-lang/mono-2"
 DEPEND="${RDEPEND}
-	>=dev-dotnet/gtk-sharp-2.12
 	userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 	>=dev-dotnet/gtk-sharp-gapi-2.12
 	dev-util/pkgconfig"
@@ -34,7 +35,9 @@ src_prepare() {
 	#Workaround for upstream Nazi version requirements.
 	sed -i \
 		-e 's:2.27.4:2.29.0:' \
-		configure configure.in || die "Sed failed"
+		configure.in || die "Sed failed"
+	epatch "${FILESDIR}/${PN}-0.21.1-gtk-sharp-dropped.patch"
+	eautoreconf
 }
 
 src_configure() {
@@ -42,7 +45,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake CSC=gmcs || die
+	emake CSC=/usr/bin/gmcs || die
+}
+
+src_test() {
+	emake CSC=/usr/bin/gmcs check||die
 }
 
 src_install() {
diff --git a/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-gtk-sharp-dropped.patch b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-gtk-sharp-dropped.patch
new file mode 100644
index 000000000000..9a4446837bff
--- /dev/null
+++ b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-gtk-sharp-dropped.patch
@@ -0,0 +1,102 @@
+diff -NrU5 evolution-sharp-0.21.1.orig/configure.in evolution-sharp-0.21.1/configure.in
+--- evolution-sharp-0.21.1.orig/configure.in	2009-09-02 19:30:52.000000000 +0200
++++ evolution-sharp-0.21.1/configure.in	2009-09-02 20:45:29.000000000 +0200
+@@ -109,12 +109,21 @@
+ AC_SUBST(CSC)
+ AC_SUBST(GACUTIL)
+ AC_SUBST(LIB_PREFIX)
+ AC_SUBST(LIB_SUFFIX)
+ 
+-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 2.4.0)
++PKG_CHECK_MODULES([GLIB_SHARP],
++	[glib-sharp-2.0 >= 2.4.0])
++AC_SUBST(GLIB_SHARP_LIBS)
++
++PKG_CHECK_MODULES([GTK_SHARP],
++	[gtk-sharp-2.0 >= 2.4.0],
++	[HAVE_GTK_SHARP=yes],
++	[AC_MSG_WARN([You will not be able to compile the "make check" programs])])
+ AC_SUBST(GTK_SHARP_LIBS)
++AM_CONDITIONAL([HAVE_GTK_SHARP],
++	[test x$HAVE_GTK_SHARP = xyes])
+ 
+ AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no)
+ if test "x$GAPI_CODEGEN" = "xno"; then
+ 	AC_MSG_ERROR([You need to install gtk-sharp2-gapi])
+ fi
+diff -NrU5 evolution-sharp-0.21.1.orig/evolution/Makefile.am evolution-sharp-0.21.1/evolution/Makefile.am
+--- evolution-sharp-0.21.1.orig/evolution/Makefile.am	2009-09-02 19:30:52.000000000 +0200
++++ evolution-sharp-0.21.1/evolution/Makefile.am	2009-09-02 22:23:08.000000000 +0200
+@@ -26,11 +26,12 @@
+ endif
+ 
+ API=evolution-api.xml
+ METADATA = Evolution.metadata
+ ASSEMBLY_NAME = evolution-sharp
+-references = $(GTK_SHARP_LIBS)
++references = $(GLIB_SHARP_LIBS)
++check_references = $(GTK_SHARP_LIBS)
+ 
+ TARGET = $(ASSEMBLY)
+ ASSEMBLY = $(ASSEMBLY_NAME).dll
+ gapidir = $(datadir)/gapi-2.0
+ noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
+@@ -90,12 +91,10 @@
+ 	&& touch generated-stamp
+ 
+ $(ASSEMBLY): $(build_sources) generated-stamp evolution-sharp.snk
+ 	$(CSC) -debug -unsafe /out:$(ASSEMBLY) $(CSFLAGS) /target:library $(references) $(build_sources) generated/*.cs
+ 
+-all: $(ASSEMBLY) $(TEST_TARGETS)
+-
+ install-data-local:
+ 	@if test -n '$(TARGET)'; then									\
+ 	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib";		\
+ 	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1;		\
+ 	fi
+@@ -107,33 +106,35 @@
+ 	fi
+ 
+ evolution-sharp.snk: $(top_srcdir)/evolution-sharp.snk
+ 	cp $(top_srcdir)/evolution-sharp.snk .
+ 
++if HAVE_GTK_SHARP
++
+ if USE_EDS_2_24
+-TEST_TARGETS_2_24 = $(TESTCACHE_TARGET)
++TESTCACHE_TARGET = TestCache.exe
++TESTCACHE_CSFILES = $(srcdir)/TestCache.cs
++$(TESTCACHE_TARGET): $(TESTCACHE_CSFILES) $(ASSEMBLY)
++	$(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCACHE_CSFILES) -r:$(ASSEMBLY) $(check_references)
+ endif
+ 
+-TEST_TARGETS = $(TESTCAL_TARGET) $(TESTTASK_TARGET) $(TESTBOOK_TARGET) $(TEST_TARGETS_2_24)
++check_SCRIPTS = $(TESTCAL_TARGET) $(TESTTASK_TARGET) $(TESTBOOK_TARGET) $(TESTCACHE_TARGET)
+ 
+ TESTCAL_TARGET = TestCal.exe
+ TESTCAL_CSFILES = $(srcdir)/TestCal.cs
+ 
+ $(TESTCAL_TARGET): $(TESTCAL_CSFILES) $(ASSEMBLY)
+-	$(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCAL_CSFILES) -r:$(ASSEMBLY) $(references)
+-
+-TESTCACHE_TARGET = TestCache.exe
+-TESTCACHE_CSFILES = $(srcdir)/TestCache.cs
+-$(TESTCACHE_TARGET): $(TESTCACHE_CSFILES) $(ASSEMBLY)
+-	$(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCACHE_CSFILES) -r:$(ASSEMBLY) $(references)
++	$(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCAL_CSFILES) -r:$(ASSEMBLY) $(check_references)
+ 
+ TESTTASK_TARGET = TestTask.exe
+ TESTTASK_CSFILES = $(srcdir)/TestTask.cs
+ 
+ $(TESTTASK_TARGET): $(TESTTASK_CSFILES) $(ASSEMBLY)
+-	$(CSC) -debug -out:$@ $(CSFLAGS) $(TESTTASK_CSFILES) -r:$(ASSEMBLY) $(references)
++	$(CSC) -debug -out:$@ $(CSFLAGS) $(TESTTASK_CSFILES) -r:$(ASSEMBLY) $(check_references)
+ 
+ TESTBOOK_TARGET = TestBook.exe
+ TESTBOOK_CSFILES = $(srcdir)/TestBook.cs
+ 
+ $(TESTBOOK_TARGET): $(TESTBOOK_CSFILES) $(ASSEMBLY)
+-	$(CSC) -debug -out:$@ $(CSFLAGS) $(TESTBOOK_CSFILES) -r:$(ASSEMBLY) $(references)
++	$(CSC) -debug -out:$@ $(CSFLAGS) $(TESTBOOK_CSFILES) -r:$(ASSEMBLY) $(check_references)
++
++endif