diff --git a/net-misc/simias/Manifest b/net-misc/simias/Manifest
index 822d58f..092f45f 100644
--- a/net-misc/simias/Manifest
+++ b/net-misc/simias/Manifest
@@ -2,13 +2,12 @@ AUX simias-1.8-mono22-3.patch 1371 RMD160 07223bd3ff49b33a61e5460e76e1109e6a9ae5
 AUX simias-1.8-mono22-4.patch 1306 RMD160 5eb17a2661953671ba9b9f142a747bfc47acca92 SHA1 e7181aa25814457a4e85b38667f99b06c239d2cc SHA256 03892c1cba2b23e4f705783e34e7f67bb5a2c7a146bee14280d427c9456e04c2
 AUX simias-1.8-mono22-5.patch 1656 RMD160 67f972fdd6a1dd76cdf91bd2ecd774a17188638a SHA1 5860e11b05d6d9e7ba9b255f74d2248f4f5887e3 SHA256 8c3fcdd8bebae61d3f8146bba336cfdf934ec328d5d96e3c0e603b233a3be748
 AUX simias-1.8-use_system_gsoap-2.patch 2431 RMD160 17bbd1ba7db59b2b83f79a4dfb9801a860c585bc SHA1 eec1afc346bbcce296e8118eae20771315a38636 SHA256 f76e52c10107e62ef71f249d291a82b56fb13a5217c494ea2b48ac6267d2a549
+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-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 1991 RMD160 d94d7e1605767f1ad97a56e34e0ed47db691567d SHA1 a441a577a9803ad32eb74395e73bb225b25e5709 SHA256 33f3881d199911c1911b3fc2a0990b90ede0fb85baea28bcc03ba55cf408ffed
-EBUILD simias-1.8_pre7153.ebuild 1489 RMD160 b1038a341c2b06e9abd9f5be0e43822c3e2ef3f3 SHA1 5143d5b92baa7435c745df5ba41ed68b0363325d SHA256 5cc827f0fc42e593e9a2430dab52859f47d88086ed9f33b57ac337a071e7036f
-EBUILD simias-1.8_pre7161.ebuild 1489 RMD160 b1038a341c2b06e9abd9f5be0e43822c3e2ef3f3 SHA1 5143d5b92baa7435c745df5ba41ed68b0363325d SHA256 5cc827f0fc42e593e9a2430dab52859f47d88086ed9f33b57ac337a071e7036f
-EBUILD simias-1.8_pre7276.ebuild 1489 RMD160 b1038a341c2b06e9abd9f5be0e43822c3e2ef3f3 SHA1 5143d5b92baa7435c745df5ba41ed68b0363325d SHA256 5cc827f0fc42e593e9a2430dab52859f47d88086ed9f33b57ac337a071e7036f
+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/simias-1.8.3.9328.1.ebuild b/net-misc/simias/simias-1.8.3.9328.1.ebuild
index eb5f361..d206e58 100644
--- a/net-misc/simias/simias-1.8.3.9328.1.ebuild
+++ b/net-misc/simias/simias-1.8.3.9328.1.ebuild
@@ -11,7 +11,7 @@ inherit eutils mono autotools
 
 DESCRIPTION="Simias SimpleServer"
 HOMEPAGE="http://www.ifolder.com/"
-SRC_URI="mirror://sourceforge/ifolder3/files/iFolder%20Clients/3.8.0/${P}.tar.gz
+SRC_URI="mirror://sourceforge/ifolder/iFolder%20Clients/3.8.0/${P}.tar.gz
 	http://ftp.disconnected-by-peer.at/ifolder/${P}.tar.gz"
 RESTRICT="mirror"
 
@@ -28,16 +28,6 @@ DEPEND=">=dev-lang/mono-2.4
 
 #S=${WORKDIR}/${PN}
 
-pkg_setup() {
-	if [[ $(gcc-major-version) -eq 4 ]]; then
-		if [[ $(gcc-minor-version) -gt 3 ]]; then
-		eerror "simias requires <gcc-4.4 in order to work correctly"
-		eerror "please compile it switching to gcc-4.3."
-		die "gcc 4.4 cannot build simias"
-		fi
-	fi
-}
-
 src_prepare() {
 	rm -rf dependencies
 #	epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
@@ -46,9 +36,9 @@ src_prepare() {
 #	epatch "${FILESDIR}"/simias-mononamespace.dpatch
 #	epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch
 #	epatch "${FILESDIR}"/simias-bash.dpatch
-	epatch "${FILESDIR}"/simias-1.8.2-libflaim.patch
+	epatch "${FILESDIR}"/simias-1.8.2-libflaim-1.patch
 #	epatch "${FILESDIR}"/simias-libflaim_shared-1.patch
-	epatch "${FILESDIR}"/simias-1.8-use_system_gsoap-2.patch
+	epatch "${FILESDIR}"/simias-1.8-use_system_gsoap-3.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
diff --git a/net-misc/simias/simias-1.8_pre7153.ebuild b/net-misc/simias/simias-1.8_pre7153.ebuild
deleted file mode 100644
index ef0e8fd..0000000
--- a/net-misc/simias/simias-1.8_pre7153.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-WANT_AUTOMAKE=1.9
-ESVN_REPO_URI="https://forgesvn1.novell.com/svn/simias/trunk/@${PV/1.8_pre/}"
-
-inherit eutils mono autotools subversion
-
-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="~amd64 ~arm ~x86"
-
-DEPEND=">=dev-lang/mono-2.4
-	>=dev-dotnet/xsp-2.4
-	>=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}
-
-src_prepare() {
-#	epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
-#	epatch "${FILESDIR}"/simias-libtool22-1.patch
-	epatch "${FILESDIR}"/simias-1.8-mono22-4.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.8-use_system_gsoap-2.patch
-#	epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch
-#	epatch "${FILESDIR}"/WSDLPATCH-1.diff
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	econf --with-runasclient || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 || die "build failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/net-misc/simias/simias-1.8_pre7161.ebuild b/net-misc/simias/simias-1.8_pre7161.ebuild
deleted file mode 100644
index ef0e8fd..0000000
--- a/net-misc/simias/simias-1.8_pre7161.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-WANT_AUTOMAKE=1.9
-ESVN_REPO_URI="https://forgesvn1.novell.com/svn/simias/trunk/@${PV/1.8_pre/}"
-
-inherit eutils mono autotools subversion
-
-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="~amd64 ~arm ~x86"
-
-DEPEND=">=dev-lang/mono-2.4
-	>=dev-dotnet/xsp-2.4
-	>=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}
-
-src_prepare() {
-#	epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
-#	epatch "${FILESDIR}"/simias-libtool22-1.patch
-	epatch "${FILESDIR}"/simias-1.8-mono22-4.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.8-use_system_gsoap-2.patch
-#	epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch
-#	epatch "${FILESDIR}"/WSDLPATCH-1.diff
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	econf --with-runasclient || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 || die "build failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/net-misc/simias/simias-1.8_pre7276.ebuild b/net-misc/simias/simias-1.8_pre7276.ebuild
deleted file mode 100644
index ef0e8fd..0000000
--- a/net-misc/simias/simias-1.8_pre7276.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-WANT_AUTOMAKE=1.9
-ESVN_REPO_URI="https://forgesvn1.novell.com/svn/simias/trunk/@${PV/1.8_pre/}"
-
-inherit eutils mono autotools subversion
-
-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="~amd64 ~arm ~x86"
-
-DEPEND=">=dev-lang/mono-2.4
-	>=dev-dotnet/xsp-2.4
-	>=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}
-
-src_prepare() {
-#	epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
-#	epatch "${FILESDIR}"/simias-libtool22-1.patch
-	epatch "${FILESDIR}"/simias-1.8-mono22-4.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.8-use_system_gsoap-2.patch
-#	epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch
-#	epatch "${FILESDIR}"/WSDLPATCH-1.diff
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	econf --with-runasclient || die "configure failed"
-}
-
-src_compile() {
-	emake -j1 || die "build failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}