net-misc/simias: Bump mono 2.2 patch

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

net-misc/simias/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, simias-1.8_pre7021.ebuild:
+  Bump mono 2.2 patch
+
   08 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
   -simias-1.6.7303.1.ebuild, -simias-1.6.7303.1-r1.ebuild,
   -simias-1.6.7303.1-r2.ebuild, simias-1.6.7303.1-r3.ebuild,

net-misc/simias/Manifest

@@ -2,6 +2,7 @@ AUX configure.in-xsp-check-by-dl9pf-version3.diff 3030 RMD160 2ffd1183ae56b2b938
 AUX eval_gacd_mono_webserver_true.diff 534 RMD160 3f73082ec35ae91d2031380bcfa434759476e2b9 SHA1 163fd3c6f98edd85b4b725e3e35877fb0962653a SHA256 c68a20ada4b170b1fb04cf9dbaae6a49074e672cdfdf00cab87922d86fe1ca7e
 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.use_system_gsoap.patch 3026 RMD160 3a63dafb8767b36ff9f99009d1749f07b2b82232 SHA1 3cae95bbab594e84eb41b3dee9e37fc9d1644404 SHA256 4b176aa58b40799c270a91889e22a2a8603e256b9f8415bda665071de7cd5b4e
 AUX simias-Makefile-in-generate.diff 245 RMD160 e98841bdbc05c82565c076000b1a2def2d647a00 SHA1 4c9bb42fbc6eeb078389e554a1ce400a88051e84 SHA256 62621a68f45cf3b7eba1af206d18f245b624c8e52361707648306360f20f3778
 AUX simias-bash.dpatch 4540 RMD160 35a754408252415667aa13bc46f78a94842e83c1 SHA1 12df994febdddcd5f06fb6b9437ff9ed828eceb4 SHA256 44a142f060bdfb4dd276e81e878822998819516e37cd30f7a255be98ba446d3b
@@ -14,6 +15,6 @@ AUX simias-recovery_agent-fix-1.patch 682 RMD160 f4faf06f1f00d660f31bfc18951dcdb
 AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b
 DIST simias-1.6.7303.1.tar.gz 21072448 RMD160 9ced659b4bccf24c84b8a85b15de108da436b1f7 SHA1 6c08b208f6bae9771e6ca2722700f1ba24db32f3 SHA256 894ed8f1e5a00fa0773c105993ba82e62dc7db3ec32d09335d071be80f7feca7
 EBUILD simias-1.6.7303.1-r3.ebuild 1280 RMD160 485e5c8cf0f51faa207f01db636e7366a01db445 SHA1 321ab0e0e7e254deaa9724891bef4a688dbf72c6 SHA256 3a7be8c6b3f893151125a6c98bbb4e56214d0649aa252b019a5b6cd863c65120
-EBUILD simias-1.8_pre7021.ebuild 1379 RMD160 16e6ec2fd12e8e68894d23da3e010ee085fdd4f6 SHA1 0622b61fc2e31432c0e3b0c5fb96b5e36b2254be SHA256 fadca31040bf5b116a67ccb300c9afe4a510f8c571f1616d8f48ebd935ec9c7f
+EBUILD simias-1.8_pre7021.ebuild 1379 RMD160 d7937d09ea4a37163550c6fa14758bb2c6102908 SHA1 48fb51ef9ae771f9a3db3050f96f823ddeaf5034 SHA256 3137e44d678d8aa2af9cbdec55cb7b35ccabe0536b70a6998b2dfeb15e2aaaae
-MISC ChangeLog 2251 RMD160 6fa7c2fc5a1faeac76647e2ae6d588dba596ecb0 SHA1 3772f0d2f6319ee15162c0d21a522a6922f28be5 SHA256 9b4bf262db5d54f7f32024c5af87978853d4abe615ce8b43b1335b9faaec3538
+MISC ChangeLog 2388 RMD160 54cecc0881b8ad6dda1a24215d49827a600bd106 SHA1 e5633f5484c43f610115683e17634f067eefd8ce SHA256 54add0d4ba7b8f92f0ed94cb753134ad34355f73220e22942373497bca60b81e
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

net-misc/simias/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 $@

net-misc/simias/simias-1.8_pre7021.ebuild

@@ -32,7 +32,7 @@ MAKEOPTS="-j1"
 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