net-misc/simias: Bump correct mono2 config

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

net-misc/simias/ChangeLog

@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
+  files/simias-mono22-1.patch, +files/eval_gacd_mono_webserver_true.diff,
+  +files/simias-bash.dpatch, +files/simias-etc_use_destdir.dpatch,
+  +files/simias-mononamespace.dpatch, +simias-1.6.7303.1-r3.ebuild:
+  Bump correct mono2 config
+
   27 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
   files/simias-mono22-1.patch:
   fix mono 2.0 connectionManagement

net-misc/simias/Manifest

@@ -1,14 +1,19 @@
 AUX configure.in-xsp-check-by-dl9pf-version3.diff 3030 RMD160 2ffd1183ae56b2b9389bb5fc366ae4f2b74006f9 SHA1 9e5c6e5eb9e38f7c131d0a8aac49e3cebff89093 SHA256 f241ff570abf445a1839b7dbb28b097010524a91e9a361336f25f8b2207eb738
+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-Makefile-in-generate.diff 245 RMD160 e98841bdbc05c82565c076000b1a2def2d647a00 SHA1 4c9bb42fbc6eeb078389e554a1ce400a88051e84 SHA256 62621a68f45cf3b7eba1af206d18f245b624c8e52361707648306360f20f3778
+AUX simias-bash.dpatch 4540 RMD160 35a754408252415667aa13bc46f78a94842e83c1 SHA1 12df994febdddcd5f06fb6b9437ff9ed828eceb4 SHA256 44a142f060bdfb4dd276e81e878822998819516e37cd30f7a255be98ba446d3b
+AUX simias-etc_use_destdir.dpatch 1570 RMD160 50dd9de5b9ca0f45735bdc2d166e6020b1d0d4a3 SHA1 0b5128209c1d5546e399e4bac773d4c7a4fa9760 SHA256 53611a9778cac46e249694198a95b07ba6e9a514b0551c361900894282e728c1
 AUX simias-libflaim_shared-1.patch 749 RMD160 a8c402e4c822cf7961068308e46dbfea4e69ffea SHA1 37aed1ec52275c2d3e3cdfe37e2b122e07781c43 SHA256 9a9918fcaa7a6e528b8f15f9c719b886b51af3264bb89fd59859f0023eb9050f
 AUX simias-libtool22-1.patch 498 RMD160 3c6c621765382c3bbf66877217aef55301e6c337 SHA1 04affadf85f3f731b530acdc54659e83c08b0942 SHA256 156f539e59b62592a2e83902b063f7b941940bb93294eb2bd8d99146302d888b
-AUX simias-mono22-1.patch 8635 RMD160 c499fc17833a226ac0624ab677e8574256d7c9fa SHA1 73637c865a0e59e99727988645be37a940b59137 SHA256 e54e0fb5af95c5f97cb664333efff6cc03dbc21354aab49ff26ceace68ef020f
+AUX simias-mono22-1.patch 9708 RMD160 527169ab20c88847a8604ba6b5c6d79063fb1392 SHA1 9f371158b24d3e9098f88f6986ebb745dbd0a9bc SHA256 5d1e8a078407ab8953de8487de6e33432cdb1e530c34ab51dc374e2727f4f45a
+AUX simias-mononamespace.dpatch 738 RMD160 57d65758f50a5f2efa1fa097cf899024f28ccd12 SHA1 8a3449fb7bfd7518cbd8050cc6cdeab59c4e8464 SHA256 d88f6096b603410d6235442d95b295d257ebd902203cbaf74e62a663efc2418c
 AUX simias-recovery_agent-fix-1.patch 682 RMD160 f4faf06f1f00d660f31bfc18951dcdb9cc7c1f72 SHA1 3a5a9844bbbba6c5596826acf3905e19567ab08c SHA256 f4e1d4f58c9ae4eefbad75345d47a592399bc7f14f44dff5357266080fa6934c
 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-r1.ebuild 1091 RMD160 173b14a0b6474dc395d851c0b9751a234b06cc7a SHA1 401cd732e5a09b56c3b38e4601eae9d3f4e092eb SHA256 69ba2dea093db3f7730b7d42e0a4d47246ecbf98cbddfa64caadd6b3a20af8b3
 EBUILD simias-1.6.7303.1-r2.ebuild 1147 RMD160 81a0772ae821dc260bb881ea05f6f22837d42744 SHA1 2b0a326f4c27ef93dc17d25fa2f34cda1b752f8a SHA256 170f18db08c0f839a2782b934121bec5d98d455171f77d2a994a12df6b7d24a2
+EBUILD simias-1.6.7303.1-r3.ebuild 1290 RMD160 da53ddfd16176a35d3f583a36a4cc82c6aa377ff SHA1 196ccf5dcd40e4c709feb80fce82d0b92860c5dd SHA256 cad3291b0a4e4fab8d4df60fbc287136429954886ce18088166d9f7641e3253c
 EBUILD simias-1.6.7303.1.ebuild 1112 RMD160 8365e168ccc0b0d4c7ca79e817a260b6b82f2951 SHA1 d0acae886aba342082063935f1ac06df0da61fbf SHA256 f90e8de280424a1ce92ba032455fed06634429ff88a5ed58349b06cd1972efdb
-MISC ChangeLog 1530 RMD160 ec9d3ac68fa7c52ba609dfa0f08c57a67ba65a29 SHA1 2e367ab3a012ca6a78f6404ab5731ca49ac2d60d SHA256 778ff861ed1cbe75cf2e9b07b1a015de3b43721daa051b0131f6f40e5d31527c
+MISC ChangeLog 1819 RMD160 834f2ceba927edd26de7ed47ee0071b53e91113e SHA1 3fd852174d33bcd6522b8545d4098ffa6b139ec8 SHA256 9488ef7c7ffab76cbdef1f88bf795a9020378c1ec4bea8e7dc06e567f705a8d9
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

net-misc/simias/files/eval_gacd_mono_webserver_true.diff

@@ -0,0 +1,14 @@
+Index: src/core/SimiasApp/Makefile.am
+===================================================================
+--- src/core/SimiasApp/Makefile.am	(Revision 6873)
++++ src/core/SimiasApp/Makefile.am	(Arbeitskopie)
+@@ -7,7 +7,8 @@
+ SYSTEM_INSTALLER_LIB =
+ endif
+ 
+-MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
++$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
++$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
+ 
+ Simias_CSFILES = $(srcdir)/AssemblyInfo.cs \
+ 		$(srcdir)/Simias.cs \

net-misc/simias/files/simias-bash.dpatch

@@ -0,0 +1,97 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 004_bash.dpatch by  <fabbione@gordian.int.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad simias-3.6~/src/client/simias.in simias-3.6/src/client/simias.in
+--- simias-3.6~/src/client/simias.in	2006-04-12 23:37:31.000000000 +0200
++++ simias-3.6/src/client/simias.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #######################################################################
+ #
+ #  $RCSfile$
+diff -urNad simias-3.6~/src/reports/Client/ifolder-reports-generate.in simias-3.6/src/reports/Client/ifolder-reports-generate.in
+--- simias-3.6~/src/reports/Client/ifolder-reports-generate.in	2006-03-28 23:22:11.000000000 +0200
++++ simias-3.6/src/reports/Client/ifolder-reports-generate.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #######################################################################
+ #
+ #  $RCSfile: ifolder-reports-generate.in,v $
+diff -urNad simias-3.6~/src/server/setup/ifolder-admin-setup.in simias-3.6/src/server/setup/ifolder-admin-setup.in
+--- simias-3.6~/src/server/setup/ifolder-admin-setup.in	2007-08-10 06:26:59.000000000 +0200
++++ simias-3.6/src/server/setup/ifolder-admin-setup.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ #****************************************************************************
+ #
+diff -urNad simias-3.6~/src/server/setup/ifolder-web-setup.in simias-3.6/src/server/setup/ifolder-web-setup.in
+--- simias-3.6~/src/server/setup/ifolder-web-setup.in	2007-08-10 06:26:59.000000000 +0200
++++ simias-3.6/src/server/setup/ifolder-web-setup.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #****************************************************************************
+ #
+ # Copyright (c) 2007 Novell, Inc.
+diff -urNad simias-3.6~/src/server/setup/simias-server-setup.in simias-3.6/src/server/setup/simias-server-setup.in
+--- simias-3.6~/src/server/setup/simias-server-setup.in	2007-08-10 06:26:59.000000000 +0200
++++ simias-3.6/src/server/setup/simias-server-setup.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #****************************************************************************
+ #
+ # Copyright (c) 2007 Novell, Inc.
+diff -urNad simias-3.6~/src/server/simias-server.in simias-3.6/src/server/simias-server.in
+--- simias-3.6~/src/server/simias-server.in	2006-08-24 22:51:26.000000000 +0200
++++ simias-3.6/src/server/simias-server.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #######################################################################
+ #
+ #  $RCSfile: simias-server.in,v $
+diff -urNad simias-3.6~/src/utils/usercmd/simias-create-user.in simias-3.6/src/utils/usercmd/simias-create-user.in
+--- simias-3.6~/src/utils/usercmd/simias-create-user.in	2006-03-30 18:42:58.000000000 +0200
++++ simias-3.6/src/utils/usercmd/simias-create-user.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #######################################################################
+ #
+ #  $RCSfile: simias-create-user.in,v $
+diff -urNad simias-3.6~/src/utils/usercmd/simias-delete-user.in simias-3.6/src/utils/usercmd/simias-delete-user.in
+--- simias-3.6~/src/utils/usercmd/simias-delete-user.in	2006-03-30 18:42:58.000000000 +0200
++++ simias-3.6/src/utils/usercmd/simias-delete-user.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #######################################################################
+ #
+ #  $RCSfile: simias-delete-user.in,v $
+diff -urNad simias-3.6~/src/utils/usercmd/simias-user.cmd.in simias-3.6/src/utils/usercmd/simias-user.cmd.in
+--- simias-3.6~/src/utils/usercmd/simias-user.cmd.in	2006-03-30 22:07:32.000000000 +0200
++++ simias-3.6/src/utils/usercmd/simias-user.cmd.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #######################################################################
+ #
+ #  $RCSfile: simias-user.cmd.in,v $
+diff -urNad simias-3.6~/src/utils/usercmd/simias-user.in simias-3.6/src/utils/usercmd/simias-user.in
+--- simias-3.6~/src/utils/usercmd/simias-user.in	2006-03-30 18:42:58.000000000 +0200
++++ simias-3.6/src/utils/usercmd/simias-user.in	2007-10-12 12:16:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #######################################################################
+ #
+ #  $RCSfile: simias-user.in,v $

net-misc/simias/files/simias-etc_use_destdir.dpatch

@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 003_etc_use_destdir.dpatch by  <fabbione@gordian.int.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad simias-3.6~/src/server/setup/Makefile.in simias-3.6/src/server/setup/Makefile.in
+--- simias-3.6~/src/server/setup/Makefile.in	2007-10-12 08:15:45.000000000 +0200
++++ simias-3.6/src/server/setup/Makefile.in	2007-10-12 09:36:52.000000000 +0200
+@@ -680,9 +680,8 @@
+ @WINDOWS_FALSE@	$(INSTALL_PROGRAM) ifolder-web-setup $(DESTDIR)$(bindir)
+ @WINDOWS_FALSE@	$(INSTALL_PROGRAM) ifolder-admin-setup $(DESTDIR)$(bindir)
+ @WINDOWS_FALSE@	$(INSTALL_PROGRAM) utility.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
+-@WINDOWS_FALSE@	$(mkinstalldirs) /etc/ld.so.conf.d
+-@WINDOWS_FALSE@	$(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d
+-@WINDOWS_FALSE@	grep -q "include /etc/ld.so.conf.d/\*.conf" /etc/ld.so.conf || echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf
++@WINDOWS_FALSE@	$(mkinstalldirs) $(DESTDIR)/etc/ld.so.conf.d
++@WINDOWS_FALSE@	$(INSTALL_PROGRAM) novell-ifolder3.conf $(DESTDIR)/etc/ld.so.conf.d
+ 
+ uninstall-local:
+ 	cd $(DESTDIR)$(bindir); rm -f SimiasServerSetup.exe $(DEBUG_FILES)
+@@ -695,7 +694,7 @@
+ 	cd $(DESTDIR)$(bindir); rm -f ifolder-admin-setup ifolder-admin-setup.cmd
+ 	cd $(DESTDIR)$(bindir); rm -f iFolderAdminSetup.exe.config
+ 	cd $(DESTDIR)$(bindir); rm -f utility.exe
+-	cd /etc/ld.so.conf.d; rm -f novell-ifolder3.conf
++	cd $(DESTDIR)/etc/ld.so.conf.d; rm -f novell-ifolder3.conf
+ 
+ installcheck-local: install
+ 

net-misc/simias/files/simias-mono22-1.patch

@@ -194,3 +194,25 @@ diff -uNr simias.orig/src/core/WebService/mono.web.config simias/src/core/WebSer
  <!--
      <mono.aspnet>
          <acceptEncoding>
+diff -uNr simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
+--- simias.orig/src/core/SimiasApp/Makefile.am	2009-02-28 07:42:46.297742303 +0100
++++ simias/src/core/SimiasApp/Makefile.am	2009-02-28 07:47:42.471249900 +0100
+@@ -7,7 +7,8 @@
+ SYSTEM_INSTALLER_LIB =
+ endif
+ 
+-MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
++$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
++$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
+ 
+ Simias_CSFILES = $(srcdir)/AssemblyInfo.cs \
+ 		$(srcdir)/Simias.cs \
+@@ -17,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

net-misc/simias/files/simias-mononamespace.dpatch

@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 002_mononamespace.dpatch by  <fabbione@gordian.int.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad simias-3.6~/configure.in simias-3.6/configure.in
+--- simias-3.6~/configure.in	2007-09-11 16:33:01.000000000 +0200
++++ simias-3.6/configure.in	2007-10-12 09:07:15.000000000 +0200
+@@ -119,7 +119,7 @@
+         CSC_EXEFLAG=/target:exe
+         CSC_LIBFLAG=/target:library
+         CSC_WINEXEFLAG=/target:winexe
+-        CSCFLAGS='/d:MONO /warn:4 /d:TRACE'
++        CSCFLAGS='/d:MONO /d:MONONATIVE /warn:4 /d:TRACE'
+         CSCFLAGS_DEBUG="/debug+ /d:DEBUG"
+         CSCFLAGS_OPTIMIZE="/optimize+"
+         MONO=mono

net-misc/simias/simias-1.6.7303.1-r3.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+WANT_AUTOMAKE=1.9
+inherit eutils mono autotools
+
+DESCRIPTION="Simias SimpleServer"
+HOMEPAGE="http://www.ifolder.com/"
+SRC_URI="http://distfiles.one-gear.com/distfiles/${P}.tar.gz"
+RESTRICT="mirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+DEPEND=">=dev-lang/mono-2.2
+	>=dev-dotnet/xsp-1.2.1
+	>=dev-dotnet/log4net-1.2.9
+	>=dev-db/libflaim-4.9.617
+	>=net-libs/gsoap-2.7.1
+	!www-apps/ifolder-server"
+
+
+
+S=${WORKDIR}/${PN}
+MAKEOPTS="-j1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
+	epatch "${FILESDIR}"/simias-libtool22-1.patch
+	epatch "${FILESDIR}"/simias-mono22-1.patch
+	epatch "${FILESDIR}"/simias-mononamespace.dpatch
+	epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch
+	epatch "${FILESDIR}"/simias-bash.dpatch
+	epatch "${FILESDIR}"/simias_make_gcc43_happy.diff
+	epatch "${FILESDIR}"/simias-libflaim_shared-1.patch
+	epatch "${FILESDIR}"/simias-1.6.use_system_gsoap.patch
+	epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+        econf --with-runasclient || die "configure failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install
+}