From cb5cab82f8536d42d688cc569ef2a6c1c7ee7da5 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 16 Jan 2010 16:07:24 +0000 Subject: [PATCH] net-misc/simias: remove binary dependencies git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1860 6952d904-891a-0410-993b-d76249ca496b --- net-misc/simias/ChangeLog | 4 ++ net-misc/simias/Manifest | 5 ++- .../simias-1.8.3.9328.1-system_xsp-1.patch | 45 +++++++++++++++++++ net-misc/simias/simias-1.8.3.9328.1.ebuild | 2 + 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 net-misc/simias/files/simias-1.8.3.9328.1-system_xsp-1.patch diff --git a/net-misc/simias/ChangeLog b/net-misc/simias/ChangeLog index d5bcee8..26e0a8e 100644 --- a/net-misc/simias/ChangeLog +++ b/net-misc/simias/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Jan 2010; Mario Fetka + simias-1.8.3.9328.1.ebuild, +files/simias-1.8.3.9328.1-system_xsp-1.patch: + remove binary dependencies + 16 Jan 2010; Mario Fetka simias-1.8.3.9328.1.ebuild: add force on mono 2.* diff --git a/net-misc/simias/Manifest b/net-misc/simias/Manifest index c7a631f..9a0b4de 100644 --- a/net-misc/simias/Manifest +++ b/net-misc/simias/Manifest @@ -1,11 +1,12 @@ AUX simias-1.8-mono22-3.patch 1371 RMD160 07223bd3ff49b33a61e5460e76e1109e6a9ae5b4 SHA1 d84821690f1a256b9e3a4db60e6c5674715d657b SHA256 d9d9cc4d2c9b71a9b6febbbea62a7b4acd6e25d768340a28b664b3e4734d3dbe AUX simias-1.8-mono22-4.patch 1306 RMD160 5eb17a2661953671ba9b9f142a747bfc47acca92 SHA1 e7181aa25814457a4e85b38667f99b06c239d2cc SHA256 03892c1cba2b23e4f705783e34e7f67bb5a2c7a146bee14280d427c9456e04c2 AUX simias-1.8-use_system_gsoap-2.patch 2431 RMD160 17bbd1ba7db59b2b83f79a4dfb9801a860c585bc SHA1 eec1afc346bbcce296e8118eae20771315a38636 SHA256 f76e52c10107e62ef71f249d291a82b56fb13a5217c494ea2b48ac6267d2a549 +AUX simias-1.8.3.9328.1-system_xsp-1.patch 2256 RMD160 13303b758dcf27bf5b0c3596700c2997df18b022 SHA1 0e86aee0c9d63077c16a8742b65a5cf908070a11 SHA256 a75191361ee845124cef3384b66d5568c07ec88eed46e0b04e436f6bda61cb31 AUX simias-libflaim_shared-1.patch 749 RMD160 a8c402e4c822cf7961068308e46dbfea4e69ffea SHA1 37aed1ec52275c2d3e3cdfe37e2b122e07781c43 SHA256 9a9918fcaa7a6e528b8f15f9c719b886b51af3264bb89fd59859f0023eb9050f DIST simias-1.8.3.9328.1.tar.gz 27784660 RMD160 2dc7cefc1b6e2dba66e8dfa6e3f2495fbfe488c5 SHA1 8518dfa98588ddbf4cbb21be2a7621235cca3794 SHA256 8aca083462c7bf7cb019d6c80c13934dfc8fdbe33363fdb1cc8e1f3b93508c71 -EBUILD simias-1.8.3.9328.1.ebuild 1633 RMD160 7cd635a2de8567097b3007bbd623e21e56fdc2f6 SHA1 323c2a3ee0a530bfbf9484b3f31819bf7e8615e5 SHA256 ea97016fafaf04c8be197c6a962e5e5f000a7ad642ef3566c551c565192e920d +EBUILD simias-1.8.3.9328.1.ebuild 1715 RMD160 eacc0ffa31eba8aff53c495e410d56cedb17f34e SHA1 f618d9518e6832d978abee6e8f5ea9891cbaff46 SHA256 e2c5055694a16bed0abc9981f4e2a37ae83b424c9fe32cdc4327865aabbf67a6 EBUILD simias-1.8_pre7153.ebuild 1484 RMD160 a2e8a566ad9fd1596e5c71a660d0dcfd75b3c028 SHA1 f76e9255ca88132f1d8b1a10aa201541c67bd265 SHA256 b6cba4e6ce36ac464dedba2ffd980927bd0a41646a702fd2f212e5292ce90da7 EBUILD simias-1.8_pre7161.ebuild 1484 RMD160 a2e8a566ad9fd1596e5c71a660d0dcfd75b3c028 SHA1 f76e9255ca88132f1d8b1a10aa201541c67bd265 SHA256 b6cba4e6ce36ac464dedba2ffd980927bd0a41646a702fd2f212e5292ce90da7 EBUILD simias-1.8_pre7276.ebuild 1484 RMD160 a2e8a566ad9fd1596e5c71a660d0dcfd75b3c028 SHA1 f76e9255ca88132f1d8b1a10aa201541c67bd265 SHA256 b6cba4e6ce36ac464dedba2ffd980927bd0a41646a702fd2f212e5292ce90da7 -MISC ChangeLog 4501 RMD160 a64e1a4cd5182cdb0a49275cfa745f3b69ad8045 SHA1 be43ea68db22b90fd950b74a6f47ca6e8c5f0948 SHA256 c450cc66bb2159268a5f81ee8d93984a025894b15cb076c5c29a71c22ab66e57 +MISC ChangeLog 4659 RMD160 7d45e4a4c04f305fff51e4c70f91a506c7b90630 SHA1 f046e89f6803495bfde45f34b7cfc28f06e4f353 SHA256 3d22157eb84d060df6248b251cadd0de4c06f030b4d7bb34771d3f8f8dca19a2 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 new file mode 100644 index 0000000..df5abf2 --- /dev/null +++ b/net-misc/simias/files/simias-1.8.3.9328.1-system_xsp-1.patch @@ -0,0 +1,45 @@ +Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com) +Date: 2010-01-16 +Initial Package Version: 1.8.3 +Origin: me +Upstream Status: unknown +Description: use system Mono.Webserver.dll instead the provided + +diff -Naur simias-1.8.3.9328.1.orig/configure.in simias-1.8.3.9328.1/configure.in +--- simias-1.8.3.9328.1.orig/configure.in 2010-01-16 10:16:48.502483182 +0000 ++++ simias-1.8.3.9328.1/configure.in 2010-01-16 10:32:33.695379928 +0000 +@@ -226,6 +226,10 @@ + AC_SUBST(LOG4NET_PREFIX) + AC_SUBST(LOG4NET_LIBS) + ++ PKG_CHECK_MODULES(XSP, xsp >= 2.2) ++ AC_SUBST(XSP_PREFIX) ++ AC_SUBST(XSP_LIBS) ++ + PKG_CHECK_MODULES(LIBFLAIM, libflaim >= 4.8.0) + AC_SUBST(LIBFLAIM_PREFIX) + AC_SUBST(LIBFLAIM_LIBS) +diff -Naur simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am simias-1.8.3.9328.1/src/core/SimiasApp/Makefile.am +--- simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am 2010-01-16 10:16:48.556215509 +0000 ++++ simias-1.8.3.9328.1/src/core/SimiasApp/Makefile.am 2010-01-16 10:35:22.899098129 +0000 +@@ -7,7 +7,7 @@ + SYSTEM_INSTALLER_LIB = + endif + +-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer ++MONO_WEBSERVER_PATH = $(shell pkg-config xsp --variable=assemblies_dir)/ + + Simias_CSFILES = $(srcdir)/Simias.cs \ + $(srcdir)/SimiasAppInstallerClass.cs +diff -Naur simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am simias-1.8.3.9328.1/src/core/WebService/Makefile.am +--- simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am 2010-01-16 10:16:48.583078738 +0000 ++++ simias-1.8.3.9328.1/src/core/WebService/Makefile.am 2010-01-16 10:36:27.839193842 +0000 +@@ -8,7 +8,7 @@ + SimiasWebService_FLAGS = $(CSC_LIBFLAG) + 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)/ + 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.9328.1.ebuild b/net-misc/simias/simias-1.8.3.9328.1.ebuild index 26f42bc..bc01607 100644 --- a/net-misc/simias/simias-1.8.3.9328.1.ebuild +++ b/net-misc/simias/simias-1.8.3.9328.1.ebuild @@ -31,6 +31,7 @@ DEPEND=">=dev-lang/mono-2.4 #S=${WORKDIR}/${PN} src_prepare() { + rm -rf dependencies # epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff # epatch "${FILESDIR}"/simias-libtool22-1.patch epatch "${FILESDIR}"/simias-1.8-mono22-4.patch @@ -42,6 +43,7 @@ src_prepare() { epatch "${FILESDIR}"/simias-1.8-use_system_gsoap-2.patch # 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 eautoreconf || die "eautoreconf failed" }