www-apps/ifolder-server: Bump mono 2.2 patch

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1008 6952d904-891a-0410-993b-d76249ca496b

www-apps/ifolder-server/ChangeLog

@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/simias-1.8-mono22-2.patch, ifolder-server-3.7_pre7021.ebuild:
+  Bump mono 2.2 patch
+
   08 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
   -ifolder-server-3.6.7303.1.ebuild, -ifolder-server-3.6.7303.1-r1.ebuild,
   -ifolder-server-3.6.7303.1-r2.ebuild, ifolder-server-3.6.7303.1-r3.ebuild,

www-apps/ifolder-server/Manifest

@@ -20,6 +20,7 @@ AUX no_write_to_etc_during_install.diff 916 RMD160 9cd1ee64a3006aad139892010b2ba
 AUX setup-files.tar.gz 1104 RMD160 a1e0abc2dc43b168267d1b0c79b450ce7bd66011 SHA1 1f99f09cdcacc8eb859e4e17bd18948f2293a782 SHA256 40a6f1400e59a06cc220193dcfd0dbd1cf8ce629526db9598cc6aeafda06e001
 AUX simias-1.6.use_system_gsoap.patch 2922 RMD160 ec4bb9da8a3a0eab08ac36b4dc9d5c19aa833736 SHA1 fa49d2d34f210919590838c9d302315a304ff037 SHA256 e8432f7883b161c8f68c16f7a99da4ade7eab5b41f8391e7f99b3f92474c74c0
 AUX simias-1.8-mono22-1.patch 7492 RMD160 4a09f05ecee38b52ec7b3f60cc2c6e6e55e15fc1 SHA1 45797cd0f9b72747e4ab72fc02ee301446bb3c4b SHA256 3460a484bb46bf2f121f343e24a16d792c3819d114807714c4198cb10ad023db
+AUX simias-1.8-mono22-2.patch 7676 RMD160 0bef41dfea10ced43fb8b84cc727dd08b7593e30 SHA1 37fe4586026cb98873697a4bb965e55dd17ed7a4 SHA256 ace9c67f7260e68f1f2fe96fa1ee9af1680442e86462d5b271095f3d55c543d9
 AUX simias-1.8-server-setup.diff 1840 RMD160 b5f648fe50ff9cee4a0053eb6929d28362c0707f SHA1 27fb693f52d8d259eedc7867eaec262233bbf897 SHA256 5af21b3c71a507e5def0cbaf0aba0ebaf1be4eadb665bc62eb22c313ebb343e6
 AUX simias-1.8.use_system_gsoap.patch 3026 RMD160 3a63dafb8767b36ff9f99009d1749f07b2b82232 SHA1 3cae95bbab594e84eb41b3dee9e37fc9d1644404 SHA256 4b176aa58b40799c270a91889e22a2a8603e256b9f8415bda665071de7cd5b4e
 AUX simias-Makefile-in-generate.diff 245 RMD160 e98841bdbc05c82565c076000b1a2def2d647a00 SHA1 4c9bb42fbc6eeb078389e554a1ce400a88051e84 SHA256 62621a68f45cf3b7eba1af206d18f245b624c8e52361707648306360f20f3778
@@ -35,6 +36,6 @@ AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde4512
 AUX webaccess-browse.patch 1001 RMD160 6262f046567d6736fb4193913cc4b4d0bb764792 SHA1 e33cb643b63ded940f9029fe7a79d3accf800450 SHA256 8517e52d6ac974de169fafe01705e1f9a6b8834b2f493ef485477398029b2353
 DIST ifolder3-server-3.6.7303.1.tar.gz 19986658 RMD160 703f38b730c0dc59f77b1c55e83bb864008d45cf SHA1 329d128772c09ac7facff6d3b9e23989c8a1b972 SHA256 a047e14b5bf7235c83b0fe706a0bb05f69319887e49b9176b2c373c1e409ba55
 EBUILD ifolder-server-3.6.7303.1-r3.ebuild 4571 RMD160 2012675d768bacc2f49ce26185312a35f2b37a58 SHA1 daedd1558a81b5c82026f854529b551a8e7ac328 SHA256 86da153aa4fd47f9391251e5ac59a718f30ff0d66015f3f4df166165d2a24139
-EBUILD ifolder-server-3.7_pre7021.ebuild 4683 RMD160 f5637430c164ca4318dbe513a7fa9fc7fce8567e SHA1 3909a025e9ac13e5057f7d34da993d2548779c50 SHA256 85ad386936721a4b52d236aaae9ad9b4b4fce50f7fefc2c86481fd6caed25287
+EBUILD ifolder-server-3.7_pre7021.ebuild 4683 RMD160 32765ca02d315b7b75e9b90ec303e1bccdb77009 SHA1 735f8a4f7b22e8c0aa57d537bdb847d605474c3e SHA256 3f06675d83cd6b33a270595b8fbee69761654588d1126861151b8a9d9157c988
-MISC ChangeLog 2012 RMD160 cc4f7e4488542f90e988a32943aec541893ab4db SHA1 e390e8f406e7ecd7c0a9ec9a227b2ac9b8b2630b SHA256 4915746b1c7b7007162b98c3e94841e403d5f9fda900e7b3af21c64ba31d6225
+MISC ChangeLog 2157 RMD160 aa9273a6ab20837a9086361cc9d4aca093fba04f SHA1 a76a1d278ac2d357553ef1a9f08e05677f0f8e21 SHA256 15957a30d07f972227bb2bd76de8cb2393138ae8fb5816a45c4ea67c8015c14c
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

www-apps/ifolder-server/files/simias-1.8-mono22-2.patch

@@ -0,0 +1,161 @@
+Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
+Date: 2009-04-13
+Initial Package Version: 1.8
+Origin: me
+Upstream Status: unkonown
+Description: make it mono 2.2 aware
+ 
+diff -Naur simias.orig/configure.in simias/configure.in
+--- simias.orig/configure.in	2009-04-13 18:27:54.551295916 +0000
++++ simias/configure.in	2009-04-13 18:28:12.308812139 +0000
+@@ -18,8 +18,8 @@
+ case $host_os in
+     linux*)
+         SIMIAS_OS='linux'
+-        AC_CHECK_PROG(CSC, mcs, mcs)
+-        test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH])
++        AC_CHECK_PROG(CSC, gmcs, gmcs)
++        test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
+ 	    PKG_CONFIG_DIR="$LIB64"
+         AC_CHECK_PROG(CSC2, gmcs, gmcs)
+         test -z "$CSC" && AC_MSG_ERROR([no C Sharp .Net 2.0 compiler: gmcs not found in \$PATH])
+@@ -48,7 +48,7 @@
+ AM_CONDITIONAL(WINDOWS, test "$SIMIAS_OS" = "windows")
+ AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
+ AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
+-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
++AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
+ AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
+ 
+ 
+@@ -121,7 +121,7 @@
+     #
+     # Mono-specific configuration
+     #
+-    mcs)
++    gmcs)
+         CSC_EXEFLAG=/target:exe
+         CSC_LIBFLAG=/target:library
+         CSC_WINEXEFLAG=/target:winexe
+diff -Naur simias.orig/src/admin/Makefile.am simias/src/admin/Makefile.am
+--- simias.orig/src/admin/Makefile.am	2009-04-13 18:27:54.546665502 +0000
++++ simias/src/admin/Makefile.am	2009-04-13 18:28:12.308812139 +0000
+@@ -141,7 +141,7 @@
+ all: Novell.iFolderAdmin.dll
+ 
+ iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
+-	wsdl /nologo /out:$@ $<
++	wsdl2 /nologo /out:$@ $<
+ 
+ Novell.iFolderAdmin.dll: $(srcdir)/AssemblyInfo.cs iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES)
+ 	$(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(srcdir)/AssemblyInfo.cs $(iFolderAdmin_CSFILES_CSC) $(LOG4NET_LIBS)
+diff -Naur simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs
+--- simias.orig/src/core/Notifications/Notification.cs	2009-04-13 18:27:54.440185052 +0000
++++ simias/src/core/Notifications/Notification.cs	2009-04-13 18:28:12.311129546 +0000
+@@ -43,6 +43,8 @@
+ using Simias.Service;
+ using Simias.Sync;
+ 
++using Action = Simias.Client.Event.Action;
++
+ namespace Simias.Storage
+ {
+ 	/// <summary>
+diff -Naur simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
+--- simias.orig/src/core/SimiasApp/Makefile.am	2009-04-13 18:27:54.433240653 +0000
++++ simias/src/core/SimiasApp/Makefile.am	2009-04-13 18:28:12.313443530 +0000
+@@ -7,7 +7,8 @@
+ SYSTEM_INSTALLER_LIB =
+ endif
+ 
+-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
++$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
++$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
+ 
+ Simias_CSFILES = $(srcdir)/Simias.cs \
+ 		$(srcdir)/SimiasAppInstallerClass.cs
+@@ -16,7 +17,7 @@
+ Simias_INCLUDES =
+ Simias_RESOURCES = $(srcdir)/App$(ICON_EXT)
+ Simias_FLAGS = $(CSC_EXEFLAG)
+-Simias_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll Mono.WebServer.dll
++Simias_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll Mono.WebServer2.dll
+ Simias_LIBPATH = ../SimiasClient $(MONO_WEBSERVER_PATH)
+ 
+ EXTRA_DIST = App.ico $(Simias_CSFILES) AssemblyInfo.cs.in
+diff -Naur simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
+--- simias.orig/src/core/SimiasClient/Makefile.am	2009-04-13 18:27:54.423986181 +0000
++++ simias/src/core/SimiasClient/Makefile.am	2009-04-13 18:28:12.313443530 +0000
+@@ -34,7 +34,7 @@
+ 	wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
+ endif
+ if LINUX
+-	-wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
++	wsdl2 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
+ endif
+ if DARWIN
+ 	wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
+diff -Naur simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
+--- simias.orig/src/core/Sync/SyncClient.cs	2009-04-13 18:27:54.449444901 +0000
++++ simias/src/core/Sync/SyncClient.cs	2009-04-13 18:30:07.259580369 +0000
+@@ -48,7 +48,7 @@
+ using Simias.Client.Event;
+ using Simias.DomainServices;
+ 
+-
++using Action = Simias.Client.Event.Action;
+ 
+ namespace Simias.Sync
+ {
+diff -Naur simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
+--- simias.orig/src/reports/Proxy/Makefile.am	2009-04-13 18:27:54.507312607 +0000
++++ simias/src/reports/Proxy/Makefile.am	2009-04-13 18:28:12.318074433 +0000
+@@ -28,7 +28,7 @@
+ all: Novell.iFolder.Enterprise.Reports.Proxy.dll
+ 
+ iFolderReportsProxy.cs: ../WebService/iFolderReports.wsdl
+-	wsdl /nologo /out:$@ $<
++	wsdl2 /nologo /out:$@ $<
+ 
+ Novell.iFolder.Enterprise.Reports.Proxy.dll: iFolderReportsProxy.cs $(iFolderReportsProxy_CSFILES) $(iFolderReportsProxy_RESOURCES)
+ 	$(CSC) /out:$@ $(CSCFLAGS) $(iFolderReportsProxy_FLAGS) $(iFolderReportsProxy_LIBS:%=/r:%) $(iFolderReportsProxy_LIBPATH:%=/lib:%) $(iFolderReportsProxy_CSFILES_CSC) /doc:iFolderReportsProxy.doc.xml
+diff -Naur simias.orig/src/utils/usercmd/Makefile.am simias/src/utils/usercmd/Makefile.am
+--- simias.orig/src/utils/usercmd/Makefile.am	2009-04-13 18:27:54.507312607 +0000
++++ simias/src/utils/usercmd/Makefile.am	2009-04-13 18:28:12.320384995 +0000
+@@ -34,7 +34,7 @@
+ all: UserCmd.exe
+ 
+ AdminService.cs: ../../webservices/iFolderAdmin.wsdl
+-	wsdl /nologo /out:$@ $<
++	wsdl2 /nologo /out:$@ $<
+ 
+ UserCmd.exe: $(srcdir)/AssemblyInfo.cs $(UserCmd_CSFILES) $(UserCmd_RESOURCES)
+ 	$(CSC) /out:$@ $(CSCFLAGS) $(UserCmd_FLAGS) $(SIMIAS_LIBS) $(UserCmd_LIBS:%=/r:%) $(UserCmd_LIBPATH:%=/lib:%) $(UserCmd_RESOURCES:%=$(ICON_FLAG)%) $(UserCmd_CSFILES_CSC) $(DOC_FILE_CMD)
+diff -Naur simias.orig/src/webaccess/Makefile.am simias/src/webaccess/Makefile.am
+--- simias.orig/src/webaccess/Makefile.am	2009-04-13 18:27:54.502683660 +0000
++++ simias/src/webaccess/Makefile.am	2009-04-13 18:28:12.320384995 +0000
+@@ -121,7 +121,7 @@
+ all: Novell.iFolderWeb.dll
+ 
+ iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
+-	wsdl /nologo /out:$@ $<
++	wsdl2 /nologo /out:$@ $<
+ 
+ Novell.iFolderWeb.dll: $(srcdir)/AssemblyInfo.cs $(iFolderWeb_CSFILES) $(iFolderWeb_RESOURCES)
+ 	$(CSC) /out:$@ $(CSCFLAGS) $(iFolderWeb_FLAGS) $(iFolderWeb_LIBS:%=/r:%) $(iFolderWeb_RESOURCES:%=/res:%) $(iFolderWeb_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWeb_CSFILES_CSC) /doc:iFolderWeb.doc.xml
+diff -Naur simias.orig/src/webservices/Makefile.am simias/src/webservices/Makefile.am
+--- simias.orig/src/webservices/Makefile.am	2009-04-13 18:27:54.313452717 +0000
++++ simias/src/webservices/Makefile.am	2009-04-13 18:28:12.320384995 +0000
+@@ -101,10 +101,10 @@
+ 	cp ../server/Simias.LdapProvider/Simias.LdapProvider.dll .
+ 
+ iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
+-	wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
++	wsdl2 /nologo /namespace:iFolder.WebService.Web /out:$@ $<
+ 
+ iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl
+-	wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
++	wsdl2 /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
+ 
+ iFolderWebLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe
+ 	$(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderWebLocal http://127.0.0.1:8086/simias10/iFolderWebLocal.asmx $@

www-apps/ifolder-server/ifolder-server-3.7_pre7021.ebuild

@@ -38,7 +38,7 @@ DEVNULL=/dev/null
 src_prepare() {
 	epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
 	epatch "${FILESDIR}"/simias-libtool22-1.patch
-	epatch "${FILESDIR}"/simias-1.8-mono22-1.patch
+	epatch "${FILESDIR}"/simias-1.8-mono22-2.patch
 	epatch "${FILESDIR}"/simias-mononamespace.dpatch
 #	epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch
 #	epatch "${FILESDIR}"/simias-bash.dpatch