From 2bed70e30a2ed5df1a1397ab747c6862defb7e89 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sun, 19 Jun 2011 05:28:25 +0000 Subject: [PATCH] move zarafa to its own ovelray git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@2932 6952d904-891a-0410-993b-d76249ca496b --- net-misc/ifolder3/Manifest | 2 +- net-misc/ifolder3/ifolder3-3.8.0.10197.1.ebuild | 2 +- net-misc/simias/Manifest | 5 +++-- .../simias/files/simias-1.8.3.9328.1-system_xsp-1.patch | 6 +++--- net-misc/simias/simias-1.8.3.10196.1.ebuild | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/net-misc/ifolder3/Manifest b/net-misc/ifolder3/Manifest index 04022a7..eb26db9 100644 --- a/net-misc/ifolder3/Manifest +++ b/net-misc/ifolder3/Manifest @@ -12,7 +12,7 @@ AUX ifolder-lib_name.dpatch 856 RMD160 1ee4486c9d412e732617a3bc18387f9201931e64 AUX ifolder-mono22-1.patch 2794 RMD160 5fe95bedd74d227831d32f63643c9a9a96bbe9b2 SHA1 27d301c129d9f48dc5b89155df59f1d00fd30aa1 SHA256 495f8f17b895c15d1aa5314f7fb569a4d9d97db7e2bd0a35694dd29f907d6354 DIST ifolder3-3.8.0.10197.1.tar.gz 26576647 RMD160 4ddc411ab9e179395cbe6248b3e2123f83367e39 SHA1 8fe83151c9b9a38eac2a2b4038b3cdc50bfd7669 SHA256 3fb207e559d536d5f0b75d4afa1df0eeda83406f8a04412418482ddd5a4fe942 DIST ifolder3-3.8.0.9328.1.tar.gz 26649101 RMD160 f4022f35a0c6a25d01388afe261a16518c1484c2 SHA1 1ef18a49e1314ac3e93b5f48d81cdcbdac403101 SHA256 c81c204beb601a72aa4e2b0fb3affe272f1530ad79f0ced9d1e798479eab99d8 -EBUILD ifolder3-3.8.0.10197.1.ebuild 2052 RMD160 45849c7662476a6e88f0222f9cefc387289216ec SHA1 64a77bea97a916f17d2c19fa69d4c63217117004 SHA256 c79221d85a1715ff877118071ed59d616355fe1001bb51a318fa83b32e29e69d +EBUILD ifolder3-3.8.0.10197.1.ebuild 2051 RMD160 8f2d9a70f32cdec52eab55ee2c2bfb3a9ef61c20 SHA1 72ea70a2efbad3e3daa3736edde5a1c1ee418b4d SHA256 995aebb730990c90150c5e40adc445a16a21a8805765e59c2bd58b7e33302aec EBUILD ifolder3-3.8.0.9328.1.ebuild 2035 RMD160 888be18ac47850755c2ab56fca9d0b144a953dae SHA1 891594b84692c40083841e13138289e46aa7a63a SHA256 ca7228582763c26d20e20588d19c588f6518be73d86e6edbcb91aff859b6a9ed EBUILD ifolder3-3.8_pre7273.ebuild 1626 RMD160 e5a6491d9755e74c722be53498e738ce26dba6f0 SHA1 a7a153c7dcaaf3ad4f635a2a4138cb0fafa2df61 SHA256 2665e70fcc7c29e3257ad7b3366783728cb3c21edcdcf5f970b4c754cb3c8cd4 MISC ChangeLog 4514 RMD160 6a75897b68cc24f9d8fe35e42e702b905ad6fe73 SHA1 872a9d424c37cd2ec365ed4d87b303e22551818f SHA256 cf1101db837d88d0c7f951c8511ee2781b1f50e4f48dad24a93f5f6a7cbcec93 diff --git a/net-misc/ifolder3/ifolder3-3.8.0.10197.1.ebuild b/net-misc/ifolder3/ifolder3-3.8.0.10197.1.ebuild index 3fe41ae..dcee05c 100644 --- a/net-misc/ifolder3/ifolder3-3.8.0.10197.1.ebuild +++ b/net-misc/ifolder3/ifolder3-3.8.0.10197.1.ebuild @@ -35,7 +35,7 @@ RDEPEND=">=dev-lang/mono-2.2 >=net-misc/simias-1.8" PDEPEND="net-misc/ifolder3-client-plugins" -#S="${WORKDIR}/${PN}" +S="${WORKDIR}/${PN}" src_prepare() { rm -rf dependencies diff --git a/net-misc/simias/Manifest b/net-misc/simias/Manifest index cab3384..e06fa0c 100644 --- a/net-misc/simias/Manifest +++ b/net-misc/simias/Manifest @@ -5,11 +5,12 @@ AUX simias-1.8-use_system_gsoap-2.patch 2431 RMD160 17bbd1ba7db59b2b83f79a4dfb98 AUX simias-1.8-use_system_gsoap-3.patch 886 RMD160 226f311c5d7fcf949532d2ed04eb7a3aa68fbeb8 SHA1 4c52dcd3f952cb9d9c2e7c899afa34c601554adc SHA256 ee0deb841bca51f0cbe2ffbccbde75d7559ba12580208c050ffad9dc7116e3f8 AUX simias-1.8.2-libflaim-1.patch 595 RMD160 a8401c16abb54f2d3651d8bcbab7706b9cff4f1d SHA1 592d9be1e82776fd8c4d78e594d7a0ad5a1ec857 SHA256 5b7744426b5981ea5c009609d504cce543d0936ca76beffa881305ba22703feb AUX simias-1.8.2-libflaim.patch 431 RMD160 8da5a5201f5e38b7a43f9ce608ff2a94b6d3c624 SHA1 65c9e64d93c0250364515de2f6659ea67ae485e6 SHA256 32bdaeb0516301c85d6648f5d3ac343c5c81066fb13d31a6deaa27856955fdc5 -AUX simias-1.8.3.9328.1-system_xsp-1.patch 2256 RMD160 13303b758dcf27bf5b0c3596700c2997df18b022 SHA1 0e86aee0c9d63077c16a8742b65a5cf908070a11 SHA256 a75191361ee845124cef3384b66d5568c07ec88eed46e0b04e436f6bda61cb31 +AUX simias-1.8.3.10196.1-system_xsp_Mono_WebServer2-1.patch 1740 RMD160 1b60337f2be2303d10855b6314fa8e6e4dd14a11 SHA1 810e3f9653e9754f941c7b17f232c9b7ea64cfe4 SHA256 2c09f11c63674fa683e1fc5409002d86fe3decef4bebc78e372686cd0e3c466e +AUX simias-1.8.3.9328.1-system_xsp-1.patch 2262 RMD160 5740fb436dbd90b1f1a9499f4ad5ec228a70e78b SHA1 107307bc119d5d6fc732a9fb95bf7bf7550e91de SHA256 5c0371dc274cf5bfab6f92e43d5d928eeff487da238cd9dc9fdd042b994b2dd9 AUX simias-libflaim_shared-1.patch 749 RMD160 a8c402e4c822cf7961068308e46dbfea4e69ffea SHA1 37aed1ec52275c2d3e3cdfe37e2b122e07781c43 SHA256 9a9918fcaa7a6e528b8f15f9c719b886b51af3264bb89fd59859f0023eb9050f DIST simias-1.8.3.10196.1.tar.gz 27789722 RMD160 96127fb63c77af03e65531a68720e457963b194b SHA1 1e52b64ff9583189c9e4f2043b70dcb3f779e770 SHA256 3d67c45644ca54e082ad34aaf7320ea610baa88024e2a6bb35f6bd12871efe0f DIST simias-1.8.3.9328.1.tar.gz 27784660 RMD160 2dc7cefc1b6e2dba66e8dfa6e3f2495fbfe488c5 SHA1 8518dfa98588ddbf4cbb21be2a7621235cca3794 SHA256 8aca083462c7bf7cb019d6c80c13934dfc8fdbe33363fdb1cc8e1f3b93508c71 -EBUILD simias-1.8.3.10196.1.ebuild 2024 RMD160 00de999b060bff57b8ac0b9b30e5bb95f267ec28 SHA1 e733b7a8fbb9ad4a0048cf31cc6b9df0b68fcf2e SHA256 14bddee72233ecaed340fad601918d9b3bac327119854d5647276d8ac415ccd7 +EBUILD simias-1.8.3.10196.1.ebuild 2101 RMD160 626571f2956a5eefd47212bdef7f612a21989f43 SHA1 336471cd8b4f4d0e6f069927375803583e1e1be0 SHA256 590470481ebd0834d603ef5ac57884ba154af51e5669258924f84443603a72a0 EBUILD simias-1.8.3.9328.1.ebuild 1723 RMD160 17d3b706b42efc5f51f2d76bec69d5f1b54a5244 SHA1 cd2c26da207c6d5af06c7c012902259514caf4a0 SHA256 8974b788637ba470840aaab844a551e68ffc4e95d2e04025a2478d19fab78916 MISC ChangeLog 5126 RMD160 5a96ef50733765cd599f07b26f1ce81f972c792d SHA1 63aa338e7168ec662cb6e25ee359afd3bbe1bf73 SHA256 872f591778030b18a995a4265546f78087e9bb546ee2c1b5f5db317ffad2805b MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-misc/simias/files/simias-1.8.3.9328.1-system_xsp-1.patch b/net-misc/simias/files/simias-1.8.3.9328.1-system_xsp-1.patch index df5abf2..a9d323e 100644 --- a/net-misc/simias/files/simias-1.8.3.9328.1-system_xsp-1.patch +++ b/net-misc/simias/files/simias-1.8.3.9328.1-system_xsp-1.patch @@ -12,7 +12,7 @@ diff -Naur simias-1.8.3.9328.1.orig/configure.in simias-1.8.3.9328.1/configure.i AC_SUBST(LOG4NET_PREFIX) AC_SUBST(LOG4NET_LIBS) -+ PKG_CHECK_MODULES(XSP, xsp >= 2.2) ++ PKG_CHECK_MODULES(XSP, xsp-2 >= 2.2) + AC_SUBST(XSP_PREFIX) + AC_SUBST(XSP_LIBS) + @@ -27,7 +27,7 @@ diff -Naur simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am simias-1.8.3. endif -MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer -+MONO_WEBSERVER_PATH = $(shell pkg-config xsp --variable=assemblies_dir)/ ++MONO_WEBSERVER_PATH = $(shell pkg-config xsp-2 --variable=assemblies_dir)/ Simias_CSFILES = $(srcdir)/Simias.cs \ $(srcdir)/SimiasAppInstallerClass.cs @@ -39,7 +39,7 @@ diff -Naur simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am simias-1.8.3 SimiasWebService_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasClient.dll SimiasLib.dll SimiasWebService_LIBPATH = ../SimiasClient ../SimiasLib.dll $(NOVELL_SECURITY_DIR) -WebServerDir = ../../../external/Mono.WebServer/ -+WebServerDir = $(shell pkg-config xsp --variable=assemblies_dir)/ ++WebServerDir = $(shell pkg-config xsp-2 --variable=assemblies_dir)/ EXTRA_DIST = win.server.web.config mono.server.web.config win.web.config mono.web.config Global.asax Simias.asmx Simias.wsdl $(SimiasWebService_CSFILES) AssemblyInfo.cs.in if MAKE_DOC_FILE diff --git a/net-misc/simias/simias-1.8.3.10196.1.ebuild b/net-misc/simias/simias-1.8.3.10196.1.ebuild index 5131d59..3168e11 100644 --- a/net-misc/simias/simias-1.8.3.10196.1.ebuild +++ b/net-misc/simias/simias-1.8.3.10196.1.ebuild @@ -27,7 +27,7 @@ DEPEND=">=dev-lang/mono-2.4 sys-devel/gcc:4.3 !www-apps/ifolder-server" -#S=${WORKDIR}/${PN} +S=${WORKDIR}/${PN} src_prepare() { rm -rf dependencies @@ -43,6 +43,7 @@ src_prepare() { # epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch # epatch "${FILESDIR}"/WSDLPATCH-1.diff epatch "${FILESDIR}"/simias-1.8.3.9328.1-system_xsp-1.patch + epatch "${FILESDIR}"/simias-1.8.3.10196.1-system_xsp_Mono_WebServer2-1.patch eautoreconf || die "eautoreconf failed" }