11 files changed, 108 insertions, 681 deletions
diff --git a/gnustep-apps/sogo/ChangeLog b/gnustep-apps/sogo/ChangeLog
index 3e24cca..ffd9e0b 100644
--- a/gnustep-apps/sogo/ChangeLog
+++ b/gnustep-apps/sogo/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for gnustep-apps/sogo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sogo-2.1.1b (04 Feb 2014)
+
+  04 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org> -sogo-1.1.0-r1.ebuild,
+  -sogo-1.2.0.ebuild, -sogo-1.2.1.ebuild, +sogo-2.1.1b.ebuild,
+  -sogo-9999.ebuild, files/sogod.confd, files/sogod.initd,
+  -files/sogod.initd.1, metadata.xml:
+  Major bump with rewritten ebuild
+
   09 Mar 2010; Bernard Cafarelli <voyageur@gentoo.org> sogo-9999.ebuild:
   monotone was moved to dev-vcs
 
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 8bd0830..e44f5e2 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,12 +1,6 @@
-AUX sogod.confd 3033 RMD160 6f3de22c18324cde833ae805ca6b997f47f65be3 SHA1 fbb45d9a42f18baeb37f31f062f682aa3d9a83a6 SHA256 4bc4617ed7af02251b81ea11bb4152e7b95561c0d3d36e3f14c0f5bfb61a790f
-AUX sogod.initd 1763 RMD160 9b68d4650cf5aacab5e9896193e1d8a18613458e SHA1 c852e81ded69911c359ac5a551414afc119b26b2 SHA256 3f1a6764a7c2ae47080e916fadfcb2139e0a237d3ee8cd1257a5e024a090ee59
-AUX sogod.initd.1 1743 RMD160 76bbc10b05012859c4ec6b1cddd2c33a19f0c549 SHA1 c424aa09b1baf437d2f6b087688f4fa486ee7136 SHA256 f21c6fe81da61c5dc6859daeb4d79f06edd16458895352216c66f45a4be27211
-DIST SOGo-1.1.0.tar.gz 3613661 RMD160 b6fd66c0825f34e3fbc12d23c9b8c144a5b9cd65 SHA1 0e19f79fd764e9deba14a6346636b7ee86832014 SHA256 950e1a954d8905e187e09336893c50b3c7a16de42ada5c50932766974d5e7a13
-DIST SOGo-1.2.0.tar.gz 3248620 RMD160 8f4f820b4e06b15c38f7d5bf6efefabe456c6234 SHA1 dc405039921f39440107b6454994cf1080a54488 SHA256 a6aee2d2bfbf61839926d60a62673619f6f9247a79b823b171595dd676f23e5f
-DIST SOGo-1.2.1.tar.gz 3300816 RMD160 71d626497abf50128da4ca45ea2303843e9178fc SHA1 6d2714c1dff1e59be1cbdaba220c90c0e5028e5b SHA256 222450c0d97251fef8d30234c36810b0c529b8550f35c4c707f6444e06d2bde9
-EBUILD sogo-1.1.0-r1.ebuild 4622 RMD160 fd2ebec0b08f961365f9a41af6012a6123144296 SHA1 c2fd21238b9cb529342442d062ae69bd7f17ecc4 SHA256 f3cfd8c1b15fce2249ec887be5326dad9f218581300519dfbd9a3cd6879712a5
-EBUILD sogo-1.2.0.ebuild 4622 RMD160 fd2ebec0b08f961365f9a41af6012a6123144296 SHA1 c2fd21238b9cb529342442d062ae69bd7f17ecc4 SHA256 f3cfd8c1b15fce2249ec887be5326dad9f218581300519dfbd9a3cd6879712a5
-EBUILD sogo-1.2.1.ebuild 4622 RMD160 fd2ebec0b08f961365f9a41af6012a6123144296 SHA1 c2fd21238b9cb529342442d062ae69bd7f17ecc4 SHA256 f3cfd8c1b15fce2249ec887be5326dad9f218581300519dfbd9a3cd6879712a5
-EBUILD sogo-9999.ebuild 6006 RMD160 a76f1f51a3ea1e1d4c0b50e7d2a9d2e178a14f31 SHA1 fd6b6719aa55af38f479a8ed2334c8c6ea3a6e64 SHA256 75edb29d43a9e197b291b00e67badfc395bc3cccb3b65a5925da4ec1dbce481b
-MISC ChangeLog 935 RMD160 ca2e5480c51765a027aecda12a14d8cb580d894e SHA1 f27ca46be2438b7e290967528ecb8e3d1c22bd11 SHA256 04c85f103e88edb837b97adb3718d793359f50c27705b2203354b0f76a1b49b5
-MISC metadata.xml 793 RMD160 e5e134c336e1294210a98e7ecdf2182b3548eedb SHA1 e168a20cbcf7834b5f9bdd68b5e85b6202f72c35 SHA256 a48efb3457db158cb5420394060ae92c2d3b232a4f01e804e903b1154f80560b
+AUX sogod.confd 117 SHA256 a556b2501155ebb9e2bd57fe8b32011ebca67530b4908d1cb0f87473ba80803a SHA512 d93bde8c500bf8452d5f32efc35ec12f436afc498d7cc6ac1f55769f8696c9b41cc5edec829a19ea01b24c0d3a2c7901fc797cb04ced371bc8e0c3e6e243f15b WHIRLPOOL 189dc32b8fa8f7ef2dbdec29515423ce4771ea18f1b3d539a85bb5e9b7148e26b2d37fd089ccccd4646793eaded6a01d43f2674fc98bd9537bc7b72053ec1355
+AUX sogod.initd 694 SHA256 c61cb4c1df38d162ec0c1cf06d7607d7eb1cc1345d531eadb69601a2f9736028 SHA512 8e1512eb47878809df2deb2e8748c6e8ba67fbc751f13d4e6b9eb19c164ea4d0907e28abf8ca61ac8111d92e3cbd61f16368d265e55ba183c6bf7140dc7db486 WHIRLPOOL dc1f6e19f7cfa85a131af23f967cb18fc5c6ea933824fe2f0010a4e344344b168bd438d349f094dfa2dfbbb7a0606f4a82fa94782ebad0808b752ceff42471b8
+DIST SOGo-2.1.1b.tar.gz 5846822 SHA256 ec90ace24a20bbc2ba049fdfb224fa9ed49e461559b87035609305a9451bb3de SHA512 9e9d9bcf7bc9d8a626479b25010dcac8ea44d6e6785f697da480f5595ad8bf90652ab561977c79ef59afda7e515b79b5522f86f4513547765aa2f27843c76a0f WHIRLPOOL 7dfb4eac69300cd76240323ca95883bec02f28a592f6d5bc0ccfcd8e12ebe86bd36bad1e17567caa61290f19d85eb4239196c960ae1495c4115c8582b466c4d6
+EBUILD sogo-2.1.1b.ebuild 1654 SHA256 ad8fb28db023f853a6bb33a4ee58c9a31e065321f914119fb6abc827be15a9ec SHA512 d485fcc50761ca7188be8fc38764779df93af06a606274b1ebaeed40f7ede469d3f21711fdd75b89f121288fbb3d00512d8e80715d5a221039d603ab6e0f2afd WHIRLPOOL 001728bfa335293eebc0438ffa78fe3b1c479b91fd219be7852e0ec36740172522e8f250eaaf7efcd071e116eddd71b72594d5d11a5af5727163053f72f84b1d
+MISC ChangeLog 1237 SHA256 c421b1a148701d1443fbb99309d5dc3f1029e5ce7cc3f0121df28050acabcc1d SHA512 a9a558bf53886230ad4ee742bd22a903f8f78939f1f09f11056ffb5473c738ef19641d0c6f4b16ba0636eab7f6261c6f192481509e8ca052b0e16d800b1256cd WHIRLPOOL 02e52b074e9786b174a4145778c3a5f9285a0b897e7747f30b831144a251b567866a52c141edc93fd80bec5ac529f47703a58f31461a4e4795c333650b0fcf7c
+MISC metadata.xml 693 SHA256 d1322d6e93af0ad7673b6afb5c174e28b6a136f37147608a215c40d16f66782c SHA512 d7ae27144c9128e80c43c91a24ce93039d85e60c249e03b27e862543622b2f87941c1f840b13e63e4efa9f3dd3124432f847459e9a4d93a8ea885672337d5bad WHIRLPOOL baef07409968607dee6e3a5071e3b6ae12d6f4179439143e8c6b9d1cdb721b6ce08a7023d8e2b7d646977409cd0e0feca65c35b6a30c5ec52edf910dfd5db63c
diff --git a/gnustep-apps/sogo/files/sogod.confd b/gnustep-apps/sogo/files/sogod.confd
index 324c6e0..906a697 100644
--- a/gnustep-apps/sogo/files/sogod.confd
+++ b/gnustep-apps/sogo/files/sogod.confd
@@ -1,57 +1,6 @@
 # /etc/conf.d/sogod: config file for /etc/init.d/sogod
 
-# Options for SOGo
-SOGOD_OPTS=""
+SOGOD_WORKERS=3
 
-# Enable all or a subset of the options below to run
-# SOGo with additional debug options
-###
-#SOGOD_OPTS="${SOGOD_OPTS} -DAVParserDebugProp YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SOGoDebugLeaks YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SOGoDebugRequests YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SOGoUIxDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoClassRegistryDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoDebugKeyLookup YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoDebugProductLoading YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoDebugProductRegistry YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoDebugRequestClassification YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoDebugTraversal YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoOFSDebugAuthLookup YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoOFSDebugFactory YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoOFSDebugNegotiate YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoOFSDebugPlistObject YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoOFSDebugRestore YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoOFSResourceManagerDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoOFSWebMethodDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoObjCClassDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoObjectDAVDispatcherDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoObjectDataSourceDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoObjectMethodDispatcherDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoObjectRequestHandlerDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoObjectSOAPDispatcherDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoObjectXmlRpcDispatcherDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoPageInvocationDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoProductResourceManagerDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoRendererDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoSecurityManagerDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugActions YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugComponentAwake YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugComponentDefinition YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugComponentLookup YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugCursor YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugHttpTransaction YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugKeyPathAssociation YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugResourceLookup YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugStaticLinkProcessing YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugTakeValues YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebugZipResponse YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WODebuggingEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WOPageRequestHandlerDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WOResourceURLAssociationDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WOSimpleHTTPParserDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WOSimpleHTTPParserHeavyDebugEnabled YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WOxComponentElemBuilderDebugEnabled YES"
-# Additional useful things for debugging
-#SOGOD_OPTS="${SOGOD_OPTS} -SoLogSecurityDeclarations YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -SoRedirectToDefaultMethods YES"
-#SOGOD_OPTS="${SOGOD_OPTS} -WOIsRedirectionEnabled YES"
+# Additional options for SOGo
+SOGOD_OPTS=""
diff --git a/gnustep-apps/sogo/files/sogod.initd b/gnustep-apps/sogo/files/sogod.initd
index c370ba4..2575d92 100644
--- a/gnustep-apps/sogo/files/sogod.initd
+++ b/gnustep-apps/sogo/files/sogod.initd
@@ -1,74 +1,33 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-sogod_bin=""
-sogod_port=""
+SOGOD_PID=/run/sogo/sogod.pid
 
 depend() {
 	need net
-	after pg_autovacuum postgresql mysql
+	after postgresql mysql
 	after slapd
 	after mta
 	after memcached
 }
 
-checkconfig() {
-	if [ -f "/etc/GNUstep/GNUstep.conf" ]; then
-		source /etc/GNUstep/GNUstep.conf
-	else
-		eerror "Can't find /etc/GNUstep/GNUstep.conf"
-		return 1
-	fi
-	if [ -x "${HOME}/${GNUSTEP_USER_DIR_ADMIN_TOOLS}/sogod" ]; then
-		sogod_bin="${HOME}/${GNUSTEP_USER_DIR_ADMIN_TOOLS}/sogod"
-	elif [ -x "${GNUSTEP_LOCAL_ADMIN_TOOLS}/sogod" ]; then
-		sogod_bin="${GNUSTEP_LOCAL_ADMIN_TOOLS}/sogod"
-	elif [ -x "${GNUSTEP_SYSTEM_ADMIN_TOOLS}/sogod" ]; then
-		sogod_bin="${GNUSTEP_SYSTEM_ADMIN_TOOLS}/sogod"
-	elif [ -x "${GNUSTEP_NETWORK_ADMIN_TOOLS}/sogod" ]; then
-		sogod_bin="${GNUSTEP_SYSTEM_ADMIN_TOOLS}/sogod"
-	else
-		eerror "Can't find sogod"
-		return 1
-	fi
-	if [ -f "${GNUSTEP_MAKEFILES}/GNUstep.sh" ]; then
-		source "${GNUSTEP_MAKEFILES}/GNUstep.sh"
-	else
-		eerror "Can't find ${GNUSTEP_MAKEFILES}/GNUstep.sh"
-		return 1
-	fi
-	sogod_port="$(defaults -u sogo read sogod WOPort 2>/dev/null)"
-	if [ "${?}" -eq 0 ]; then
-		sogod_port="${sogod_port##* }"
-		if [ "$((${sogod_port}+1-1))" != "${sogod_port}" ]; then
-			sogod_port="20000"
-		fi
-	else
-		sogod_port="20000"
-	fi
-	touch /var/log/sogod.log
-	chown sogo /var/log/sogod.log
-}
-
 start() {
-	checkconfig || return 1
+	checkpath -q -d -m 0755 -o sogo:sogo $(dirname "${SOGOD_PID}")
 	ebegin "Starting SOGo service"
-	start-stop-daemon \
-		--start \
-		--exec ${sogod_bin} \
-		--chuid sogo \
-		--make-pidfile \
-		--background \
-		--pidfile /var/run/sogod.pid \
-		-- -WOPort ${sogod_port}
+	start-stop-daemon --start --quiet \
+		--user sogo --exec /usr/sbin/sogod \
+		--	-WOWorkersCount ${SOGOD_WORKERS} \
+			-WOLogFile /var/log/sogo/sogod.log \
+			-WOPidFile "${SOGOD_PID}" \
+			"${SOGOD_OPTS}"
 	eend ${?}
 }
 
 stop() {
 	ebegin "Stopping SOGo service"
 	start-stop-daemon --stop \
-		--pidfile /var/run/sogod.pid
+		--pidfile "${SOGOD_PID}"
 	eend ${?}
 }
diff --git a/gnustep-apps/sogo/files/sogod.initd.1 b/gnustep-apps/sogo/files/sogod.initd.1
deleted file mode 100644
index 8e5b397..0000000
--- a/gnustep-apps/sogo/files/sogod.initd.1
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-sogod_bin=""
-sogod_port=""
-
-depend() {
-	need net
-	after pg_autovacuum postgresql mysql
-	after slapd
-	after mta
-	after memcached
-}
-
-checkconfig() {
-	if [ -f "/etc/GNUstep/GNUstep.conf" ]; then
-		source /etc/GNUstep/GNUstep.conf
-	else
-		eerror "Can't find /etc/GNUstep/GNUstep.conf"
-		return 1
-	fi
-	if [ -x "${HOME}/${GNUSTEP_USER_DIR_ADMIN_TOOLS}/sogod" ]; then
-		sogod_bin="${HOME}/${GNUSTEP_USER_DIR_ADMIN_TOOLS}/sogod"
-	elif [ -x "${GNUSTEP_LOCAL_ADMIN_TOOLS}/sogod" ]; then
-		sogod_bin="${GNUSTEP_LOCAL_ADMIN_TOOLS}/sogod"
-	elif [ -x "${GNUSTEP_SYSTEM_ADMIN_TOOLS}/sogod" ]; then
-		sogod_bin="${GNUSTEP_SYSTEM_ADMIN_TOOLS}/sogod"
-	elif [ -x "${GNUSTEP_NETWORK_ADMIN_TOOLS}/sogod" ]; then
-		sogod_bin="${GNUSTEP_SYSTEM_ADMIN_TOOLS}/sogod"
-	else
-		eerror "Can't find sogod"
-		return 1
-	fi
-	if [ -f "${GNUSTEP_MAKEFILES}/GNUstep.sh" ]; then
-		source "${GNUSTEP_MAKEFILES}/GNUstep.sh"
-	else
-		eerror "Can't find ${GNUSTEP_MAKEFILES}/GNUstep.sh"
-		return 1
-	fi
-	sogod_port="$(defaults -u sogo read sogod WOPort 2>/dev/null)"
-	if [ "${?}" -eq 0 ]; then
-		sogod_port="${sogod_port##* }"
-		if [ "$((${sogod_port}+1-1))" != "${sogod_port}" ]; then
-			sogod_port="20000"
-		fi
-	else
-		sogod_port="20000"
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting SOGo service"
-	start-stop-daemon \
-		--start \
-		--exec ${sogod_bin} \
-		--chuid sogo \
-		-- ${SOGOD_OPTS} \
-			-WOPort ${sogod_port} \
-			-WOLogFile /var/log/sogo/sogod.log \
-			-WOPidFile /var/run/sogod/sogod.pid
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping SOGo service"
-	start-stop-daemon --stop \
-		--pidfile /var/run/sogod/sogod.pid
-	eend ${?}
-}
diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
index d71e2ce..f95f3ef 100644
--- a/gnustep-apps/sogo/metadata.xml
+++ b/gnustep-apps/sogo/metadata.xml
@@ -7,7 +7,4 @@
 SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV, CardDAV and GroupDAV.
 
 SOGo is the missing component of your infrastructure; it sits in the middle of your servers to offer your users an uniform and complete interface to access their information. It has been deployed in production environments where thousands of users are involved.</longdescription>
-	<use>
-		<flag name="logrotate">Use <pkg>app-admin/logrotate</pkg> for rotating logs</flag>
-	</use>
 </pkgmetadata>
diff --git a/gnustep-apps/sogo/sogo-1.1.0-r1.ebuild b/gnustep-apps/sogo/sogo-1.1.0-r1.ebuild
deleted file mode 100644
index 681c422..0000000
--- a/gnustep-apps/sogo/sogo-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit gnustep-base flag-o-matic
-
-MY_PN="SOGo"
-MY_PV="${PV/_/}"
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://sogo.opengroupware.org/"
-SRC_URI="http://www.scalableogo.org/files/downloads/${MY_PN}/Sources/${MY_PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="postgres mysql logrotate"
-DEPEND="gnustep-libs/sope[ldap,mysql?,postgres?]
-	!mysql? ( !postgres? ( virtual/postgresql-base ) )
-	dev-libs/libmemcached
-	net-nds/openldap"
-RDEPEND="${DEPEND}
-	logrotate? ( app-admin/logrotate )"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-pkg_setup() {
-	gnustep-base_pkg_setup
-	local myLDFLAGS="$(gnustep-config --variable=LDFLAGS 2>/dev/null)"
-	if [ -n "${myLDFLAGS}" ] && (echo "${myLDFLAGS}" | grep -q "\-\-a\(dd\|s\)\-needed" 2>/dev/null); then
-		ewarn
-		ewarn "You seem to have compiled GNUstep with custom LDFLAGS:"
-		for foo in $(gnustep-config --variable=LDFLAGS); do
-			ewarn "  "${foo}
-		done
-		ewarn
-		ewarn "SOGo is very sensitive regarding custom LDFLAGS. Especially with:"
-		ewarn "  --add-needed"
-		ewarn "  --as-needed"
-		ewarn
-		ewarn "If your SOGo install does not work as expected then please re-emerge SOGo,"
-		ewarn "SOPE and your GNUstep (base and make) without any LDFLAGS before filing bugs."
-		ewarn
-	fi
-	append-ldflags -Wl,--no-as-needed
-}
-
-src_configure() {
-	egnustep_env
-	./configure \
-		$(use_enable debug) \
-		$(use_enable debug strip) \
-		$(use_enable ldap ldap-config) \
-			|| die "configure failed"
-}
-
-src_test() {
-	# SOGo tends to break horribly if gnustep-make is build with LDFLAGS such as
-	# -Wl,--add-needed or -Wl,--as-needed. So we check here some vital binaries.
-	# Check if Appointments.SOGo, Contacts.SOGo, Mailer.SOGo is correctly build/linked
-	local myAppointmentsLDD=$(ldd -d "${S}"/SoObjects/Appointments/Appointments.SOGo/Appointments 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	local myContactsLDD=$(ldd -d "${S}"/SoObjects/Contacts/Contacts.SOGo/Contacts 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	local myMailerLDD=$(ldd -d "${S}"/SoObjects/Mailer/Mailer.SOGo/Mailer 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	if [ -z "${myAppointmentsLDD}" -o -z "${myContactsLDD}" -o -z "${myMailerLDD}" -o "${myAppointmentsLDD}" != "13" -o "${myContactsLDD}" != "13" -o "${myMailerLDD}" != "13" ]; then
-		ewarn
-		ewarn "This SOGo installtion is not correctly build. Probably you are using"
-		ewarn "LDFLAGS to build SOGo that are not correctly handled in SOGo or you"
-		ewarn "have emerged gnustep-base/gnustep-make with LDFLAGS which are"
-		ewarn "preventing SOGo to link the needed libraries into it's own binaries."
-		ewarn "Please remerge gnustep-base/gnustep-make and/or SOGo with empty LDFLAGS."
-		ewarn
-		die "SOGo build is not complete (Appointments.SOGo, Contacts.SOGo, Mailer.SOGo)"
-	fi
-	# We could do the same for AdministrationUI.SOGo, CommonUI.SOGo, ContactsUI.SOGo,
-	# MailPartViewers.SOGo, MailerUI.SOGo, MainUI.SOGo, SOGoElements.wox and SchedulerUI.SOGo
-	# but if Appointments.SOGo, Contacts.SOGo and Mailer.SOGo are build correctly then the
-	# chance that the others are build/linked correctly is pretty high. So we don't test again.
-}
-
-src_install() {
-	gnustep-base_src_install
-	newinitd "${FILESDIR}"/sogod.initd sogod \
-		|| die "Init script installation failed"
-	if use logrotate; then
-		insopts -m644 -o root -g root
-		insinto /etc/logrotate.d
-		newins Scripts/logrotate SOGo || die "Failed to install logrotate.d file"
-	fi
-	newdoc Apache/SOGo.conf SOGo-Apache.conf
-}
-
-pkg_preinst() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-	elog
-	elog "Now follow the steps from the SOGo documentation:"
-	elog "http://www.inverse.ca/contributions/sogo/documentation.html#c803"
-	elog "The sogo user home directory is /var/lib/sogo"
-	elog
-	elog "Then you can start/stop sogo with /etc/init.d/sogod"
-	elog
-	elog "If you plan to use SOGo with Apache then please have a look at the"
-	elog "'SOGo-Apache.conf' included in the documentation directory of this"
-	elog "SOGo installation and don't forget to add '-D PROXY' to your"
-	elog "APACHE2_OPTS."
-	elog
-}
diff --git a/gnustep-apps/sogo/sogo-1.2.0.ebuild b/gnustep-apps/sogo/sogo-1.2.0.ebuild
deleted file mode 100644
index 681c422..0000000
--- a/gnustep-apps/sogo/sogo-1.2.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit gnustep-base flag-o-matic
-
-MY_PN="SOGo"
-MY_PV="${PV/_/}"
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://sogo.opengroupware.org/"
-SRC_URI="http://www.scalableogo.org/files/downloads/${MY_PN}/Sources/${MY_PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="postgres mysql logrotate"
-DEPEND="gnustep-libs/sope[ldap,mysql?,postgres?]
-	!mysql? ( !postgres? ( virtual/postgresql-base ) )
-	dev-libs/libmemcached
-	net-nds/openldap"
-RDEPEND="${DEPEND}
-	logrotate? ( app-admin/logrotate )"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-pkg_setup() {
-	gnustep-base_pkg_setup
-	local myLDFLAGS="$(gnustep-config --variable=LDFLAGS 2>/dev/null)"
-	if [ -n "${myLDFLAGS}" ] && (echo "${myLDFLAGS}" | grep -q "\-\-a\(dd\|s\)\-needed" 2>/dev/null); then
-		ewarn
-		ewarn "You seem to have compiled GNUstep with custom LDFLAGS:"
-		for foo in $(gnustep-config --variable=LDFLAGS); do
-			ewarn "  "${foo}
-		done
-		ewarn
-		ewarn "SOGo is very sensitive regarding custom LDFLAGS. Especially with:"
-		ewarn "  --add-needed"
-		ewarn "  --as-needed"
-		ewarn
-		ewarn "If your SOGo install does not work as expected then please re-emerge SOGo,"
-		ewarn "SOPE and your GNUstep (base and make) without any LDFLAGS before filing bugs."
-		ewarn
-	fi
-	append-ldflags -Wl,--no-as-needed
-}
-
-src_configure() {
-	egnustep_env
-	./configure \
-		$(use_enable debug) \
-		$(use_enable debug strip) \
-		$(use_enable ldap ldap-config) \
-			|| die "configure failed"
-}
-
-src_test() {
-	# SOGo tends to break horribly if gnustep-make is build with LDFLAGS such as
-	# -Wl,--add-needed or -Wl,--as-needed. So we check here some vital binaries.
-	# Check if Appointments.SOGo, Contacts.SOGo, Mailer.SOGo is correctly build/linked
-	local myAppointmentsLDD=$(ldd -d "${S}"/SoObjects/Appointments/Appointments.SOGo/Appointments 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	local myContactsLDD=$(ldd -d "${S}"/SoObjects/Contacts/Contacts.SOGo/Contacts 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	local myMailerLDD=$(ldd -d "${S}"/SoObjects/Mailer/Mailer.SOGo/Mailer 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	if [ -z "${myAppointmentsLDD}" -o -z "${myContactsLDD}" -o -z "${myMailerLDD}" -o "${myAppointmentsLDD}" != "13" -o "${myContactsLDD}" != "13" -o "${myMailerLDD}" != "13" ]; then
-		ewarn
-		ewarn "This SOGo installtion is not correctly build. Probably you are using"
-		ewarn "LDFLAGS to build SOGo that are not correctly handled in SOGo or you"
-		ewarn "have emerged gnustep-base/gnustep-make with LDFLAGS which are"
-		ewarn "preventing SOGo to link the needed libraries into it's own binaries."
-		ewarn "Please remerge gnustep-base/gnustep-make and/or SOGo with empty LDFLAGS."
-		ewarn
-		die "SOGo build is not complete (Appointments.SOGo, Contacts.SOGo, Mailer.SOGo)"
-	fi
-	# We could do the same for AdministrationUI.SOGo, CommonUI.SOGo, ContactsUI.SOGo,
-	# MailPartViewers.SOGo, MailerUI.SOGo, MainUI.SOGo, SOGoElements.wox and SchedulerUI.SOGo
-	# but if Appointments.SOGo, Contacts.SOGo and Mailer.SOGo are build correctly then the
-	# chance that the others are build/linked correctly is pretty high. So we don't test again.
-}
-
-src_install() {
-	gnustep-base_src_install
-	newinitd "${FILESDIR}"/sogod.initd sogod \
-		|| die "Init script installation failed"
-	if use logrotate; then
-		insopts -m644 -o root -g root
-		insinto /etc/logrotate.d
-		newins Scripts/logrotate SOGo || die "Failed to install logrotate.d file"
-	fi
-	newdoc Apache/SOGo.conf SOGo-Apache.conf
-}
-
-pkg_preinst() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-	elog
-	elog "Now follow the steps from the SOGo documentation:"
-	elog "http://www.inverse.ca/contributions/sogo/documentation.html#c803"
-	elog "The sogo user home directory is /var/lib/sogo"
-	elog
-	elog "Then you can start/stop sogo with /etc/init.d/sogod"
-	elog
-	elog "If you plan to use SOGo with Apache then please have a look at the"
-	elog "'SOGo-Apache.conf' included in the documentation directory of this"
-	elog "SOGo installation and don't forget to add '-D PROXY' to your"
-	elog "APACHE2_OPTS."
-	elog
-}
diff --git a/gnustep-apps/sogo/sogo-1.2.1.ebuild b/gnustep-apps/sogo/sogo-1.2.1.ebuild
deleted file mode 100644
index 681c422..0000000
--- a/gnustep-apps/sogo/sogo-1.2.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit gnustep-base flag-o-matic
-
-MY_PN="SOGo"
-MY_PV="${PV/_/}"
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://sogo.opengroupware.org/"
-SRC_URI="http://www.scalableogo.org/files/downloads/${MY_PN}/Sources/${MY_PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="postgres mysql logrotate"
-DEPEND="gnustep-libs/sope[ldap,mysql?,postgres?]
-	!mysql? ( !postgres? ( virtual/postgresql-base ) )
-	dev-libs/libmemcached
-	net-nds/openldap"
-RDEPEND="${DEPEND}
-	logrotate? ( app-admin/logrotate )"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-pkg_setup() {
-	gnustep-base_pkg_setup
-	local myLDFLAGS="$(gnustep-config --variable=LDFLAGS 2>/dev/null)"
-	if [ -n "${myLDFLAGS}" ] && (echo "${myLDFLAGS}" | grep -q "\-\-a\(dd\|s\)\-needed" 2>/dev/null); then
-		ewarn
-		ewarn "You seem to have compiled GNUstep with custom LDFLAGS:"
-		for foo in $(gnustep-config --variable=LDFLAGS); do
-			ewarn "  "${foo}
-		done
-		ewarn
-		ewarn "SOGo is very sensitive regarding custom LDFLAGS. Especially with:"
-		ewarn "  --add-needed"
-		ewarn "  --as-needed"
-		ewarn
-		ewarn "If your SOGo install does not work as expected then please re-emerge SOGo,"
-		ewarn "SOPE and your GNUstep (base and make) without any LDFLAGS before filing bugs."
-		ewarn
-	fi
-	append-ldflags -Wl,--no-as-needed
-}
-
-src_configure() {
-	egnustep_env
-	./configure \
-		$(use_enable debug) \
-		$(use_enable debug strip) \
-		$(use_enable ldap ldap-config) \
-			|| die "configure failed"
-}
-
-src_test() {
-	# SOGo tends to break horribly if gnustep-make is build with LDFLAGS such as
-	# -Wl,--add-needed or -Wl,--as-needed. So we check here some vital binaries.
-	# Check if Appointments.SOGo, Contacts.SOGo, Mailer.SOGo is correctly build/linked
-	local myAppointmentsLDD=$(ldd -d "${S}"/SoObjects/Appointments/Appointments.SOGo/Appointments 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	local myContactsLDD=$(ldd -d "${S}"/SoObjects/Contacts/Contacts.SOGo/Contacts 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	local myMailerLDD=$(ldd -d "${S}"/SoObjects/Mailer/Mailer.SOGo/Mailer 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	if [ -z "${myAppointmentsLDD}" -o -z "${myContactsLDD}" -o -z "${myMailerLDD}" -o "${myAppointmentsLDD}" != "13" -o "${myContactsLDD}" != "13" -o "${myMailerLDD}" != "13" ]; then
-		ewarn
-		ewarn "This SOGo installtion is not correctly build. Probably you are using"
-		ewarn "LDFLAGS to build SOGo that are not correctly handled in SOGo or you"
-		ewarn "have emerged gnustep-base/gnustep-make with LDFLAGS which are"
-		ewarn "preventing SOGo to link the needed libraries into it's own binaries."
-		ewarn "Please remerge gnustep-base/gnustep-make and/or SOGo with empty LDFLAGS."
-		ewarn
-		die "SOGo build is not complete (Appointments.SOGo, Contacts.SOGo, Mailer.SOGo)"
-	fi
-	# We could do the same for AdministrationUI.SOGo, CommonUI.SOGo, ContactsUI.SOGo,
-	# MailPartViewers.SOGo, MailerUI.SOGo, MainUI.SOGo, SOGoElements.wox and SchedulerUI.SOGo
-	# but if Appointments.SOGo, Contacts.SOGo and Mailer.SOGo are build correctly then the
-	# chance that the others are build/linked correctly is pretty high. So we don't test again.
-}
-
-src_install() {
-	gnustep-base_src_install
-	newinitd "${FILESDIR}"/sogod.initd sogod \
-		|| die "Init script installation failed"
-	if use logrotate; then
-		insopts -m644 -o root -g root
-		insinto /etc/logrotate.d
-		newins Scripts/logrotate SOGo || die "Failed to install logrotate.d file"
-	fi
-	newdoc Apache/SOGo.conf SOGo-Apache.conf
-}
-
-pkg_preinst() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-	elog
-	elog "Now follow the steps from the SOGo documentation:"
-	elog "http://www.inverse.ca/contributions/sogo/documentation.html#c803"
-	elog "The sogo user home directory is /var/lib/sogo"
-	elog
-	elog "Then you can start/stop sogo with /etc/init.d/sogod"
-	elog
-	elog "If you plan to use SOGo with Apache then please have a look at the"
-	elog "'SOGo-Apache.conf' included in the documentation directory of this"
-	elog "SOGo installation and don't forget to add '-D PROXY' to your"
-	elog "APACHE2_OPTS."
-	elog
-}
diff --git a/gnustep-apps/sogo/sogo-2.1.1b.ebuild b/gnustep-apps/sogo/sogo-2.1.1b.ebuild
new file mode 100644
index 0000000..cc55f69
--- /dev/null
+++ b/gnustep-apps/sogo/sogo-2.1.1b.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit gnustep-2 user
+
+MY_PN="SOGo"
+
+DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
+HOMEPAGE="http://www.sogo.nu"
+SRC_URI="http://www.sogo.nu/files/downloads/${MY_PN}/Sources/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="postgres mysql"
+
+DEPEND="dev-libs/libmemcached
+	dev-libs/openssl
+	gnustep-libs/sope[mysql?,postgres?]
+	net-nds/openldap"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+pkg_setup() {
+	enewuser sogo -1 /bin/bash /var/lib/sogo
+}
+
+src_prepare() {
+	gnustep-base_src_prepare
+	sed -e "s/validateArgs$//" -i configure \
+		|| die "GNUstep.conf sed failed"
+}
+
+src_configure() {
+	egnustep_env
+
+	./configure \
+		$(use_enable debug) \
+		$(use_enable debug strip) \
+		--with-ssl=ssl \
+		--prefix=/usr \
+		|| die "configure failed"
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	newconfd "${FILESDIR}"/sogod.confd sogod
+	newinitd "${FILESDIR}"/sogod.initd sogod
+
+	insinto /etc/logrotate.d
+	newins Scripts/logrotate sogo
+	newdoc Apache/SOGo.conf SOGo-Apache.conf
+
+	insinto /etc/sogo
+	doins Scripts/sogo.conf
+
+	insinto /etc/cron.d
+	newins Scripts/sogo.cron sogo
+	keepdir /var/log/sogo
+
+	fowners sogo:sogo /var/log/sogo
+	fowners -R root:sogo /etc/sogo
+}
+
+pkg_postinst() {
+	gnustep-base_pkg_postinst
+	elog "SOGo documentation is available online at:"
+	elog "http://www.sogo.nu/downloads/documentation.html"
+	elog
+	elog "Apache sample configuration file is available in:"
+	elog "/usr/share/doc/${PF}"
+}
diff --git a/gnustep-apps/sogo/sogo-9999.ebuild b/gnustep-apps/sogo/sogo-9999.ebuild
deleted file mode 100644
index 90287ce..0000000
--- a/gnustep-apps/sogo/sogo-9999.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit gnustep-base flag-o-matic
-
-MY_PN="SOGo"
-MY_PV="${PV/_/}"
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://sogo.opengroupware.org/"
-SRC_URI=""
-KEYWORDS=""
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="postgres mysql logrotate"
-DEPEND="gnustep-libs/sope[ldap,mysql?,postgres?]
-	!mysql? ( !postgres? ( virtual/postgresql-base ) )
-	dev-vcs/monotone
-	dev-libs/libmemcached
-	net-nds/openldap"
-RDEPEND="${DEPEND}
-	logrotate? ( app-admin/logrotate )"
-
-S=${WORKDIR}/${MY_PN}
-
-pkg_setup() {
-	gnustep-base_pkg_setup
-	local myLDFLAGS="$(gnustep-config --variable=LDFLAGS 2>/dev/null)"
-	if [ -n "${myLDFLAGS}" ] && (echo "${myLDFLAGS}" | grep -q "\-\-a\(dd\|s\)\-needed" 2>/dev/null); then
-		ewarn
-		ewarn "You seem to have compiled GNUstep with custom LDFLAGS:"
-		for foo in $(gnustep-config --variable=LDFLAGS); do
-			ewarn "  "${foo}
-		done
-		ewarn
-		ewarn "SOGo is very sensitive regarding custom LDFLAGS. Especially with:"
-		ewarn "  --add-needed"
-		ewarn "  --as-needed"
-		ewarn
-		ewarn "If your SOGo install does not work as expected then please re-emerge SOGo,"
-		ewarn "SOPE and your GNUstep (base and make) without any LDFLAGS before filing bugs."
-		ewarn
-	fi
-	append-ldflags -Wl,--no-as-needed
-}
-
-src_unpack() {
-	EMTN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/mtn-src"
-	addwrite "${EMTN_STORE_DIR}"
-	if [ ! -d "${EMTN_STORE_DIR}" ]; then
-		mkdir -p "${EMTN_STORE_DIR}" || die "Can't mkdir ${EMTN_STORE_DIR}."
-	fi
-	cd "${EMTN_STORE_DIR}" || die "Can't chdir to ${EMTN_STORE_DIR}"
-
-	if [ ! -f "db.mtn" ]; then
-		mtn db init --db=./db.mtn || die "Failed to initialize Monotone database"
-	fi
-
-	# Pull Inverse's SOGo Monotone repository
-	mtn --db=./db.mtn pull inverse.ca ca.inverse.sogo || die "Failed to pull Monotone repository"
-	if [ ! -d "SOGo" ]; then
-		mtn --db=./db.mtn checkout --branch ca.inverse.sogo SOGo || die "Failed to checkout SOGo branch"
-	else
-		cd SOGo
-		mtn update
-	fi
-
-	# Pull SOGo Connector, SOGo Integrator and Lightning (Inverse Edition)
-	#mtn --db=./db.mtn pull inverse.ca ca.inverse.sogo-connector
-	#mtn --db=./db.mtn checkout --branch ca.inverse.sogo-connector
-	#mtn --db=./db.mtn pull inverse.ca ca.inverse.sogo-integrator
-	#mtn --db=./db.mtn checkout --branch ca.inverse.sogo-integrator
-	#mtn --db=./db.mtn pull inverse.ca ca.inverse.calendar
-	#mtn --db=./db.mtn checkout --branch ca.inverse.calendar
-
-	mkdir -p "${S}"
-	cd "${EMTN_STORE_DIR}"/SOGo
-	rsync -rlpgo --exclude=".mtn-ignore" . "${S}" || die "Can't export to ${S}"
-
-	cd "${S}"
-	gnustep-base_src_prepare
-}
-
-src_configure() {
-	egnustep_env
-	./configure \
-		$(use_enable debug) \
-		$(use_enable debug strip) \
-		$(use_enable ldap ldap-config) \
-			|| die "configure failed"
-}
-
-src_test() {
-	# SOGo tends to break horribly if gnustep-make is build with LDFLAGS such as
-	# -Wl,--add-needed or -Wl,--as-needed. So we check here some vital binaries.
-	# Check if Appointments.SOGo, Contacts.SOGo, Mailer.SOGo is correctly build/linked
-	local myAppointmentsLDD=$(ldd -d "${S}"/SoObjects/Appointments/Appointments.SOGo/Appointments 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	local myContactsLDD=$(ldd -d "${S}"/SoObjects/Contacts/Contacts.SOGo/Contacts 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	local myMailerLDD=$(ldd -d "${S}"/SoObjects/Mailer/Mailer.SOGo/Mailer 2>&1 | grep "lib\(OGoContentStore\|NG\(Cards\|ObjWeb\|Mime\|Streams\|Extensions\)\|SOGo\|GDL\(Access\|ContentStore\)\|EOControl\|DOM\|SaxObjC\|XmlRpc\)\.so\." | wc -l)
-	if [ -z "${myAppointmentsLDD}" -o -z "${myContactsLDD}" -o -z "${myMailerLDD}" -o "${myAppointmentsLDD}" != "13" -o "${myContactsLDD}" != "13" -o "${myMailerLDD}" != "13" ]; then
-		ewarn
-		ewarn "This SOGo installtion is not correctly build. Probably you are using"
-		ewarn "LDFLAGS to build SOGo that are not correctly handled in SOGo or you"
-		ewarn "have emerged gnustep-base/gnustep-make with LDFLAGS which are"
-		ewarn "preventing SOGo to link the needed libraries into it's own binaries."
-		ewarn "Please remerge gnustep-base/gnustep-make and/or SOGo with empty LDFLAGS."
-		ewarn
-		die "SOGo build is not complete (Appointments.SOGo, Contacts.SOGo, Mailer.SOGo)"
-	fi
-	# We could do the same for AdministrationUI.SOGo, CommonUI.SOGo, ContactsUI.SOGo,
-	# MailPartViewers.SOGo, MailerUI.SOGo, MainUI.SOGo, SOGoElements.wox and SchedulerUI.SOGo
-	# but if Appointments.SOGo, Contacts.SOGo and Mailer.SOGo are build correctly then the
-	# chance that the others are build/linked correctly is pretty high. So we don't test again.
-}
-
-src_install() {
-	gnustep-base_src_install
-	newinitd "${FILESDIR}"/sogod.initd.1 sogod \
-		|| die "init.d script installation failed"
-	newconfd "${FILESDIR}"/sogod.confd sogod \
-		|| die "conf.d script installation failed"
-	diropts -m 0770 -o sogo -g root
-	dodir /var/log/sogo
-	dodir /var/run/sogod
-	if use logrotate; then
-		insopts -m644 -o root -g root
-		insinto /etc/logrotate.d
-		newins Scripts/logrotate SOGo || die "Failed to install logrotate.d file"
-	fi
-	newdoc Apache/SOGo.conf SOGo-Apache.conf
-}
-
-pkg_preinst() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-	elog
-	elog "Now follow the steps from the SOGo documentation:"
-	elog "http://www.inverse.ca/contributions/sogo/documentation.html#c803"
-	elog "The sogo user home directory is /var/lib/sogo"
-	elog
-	elog "Then you can start/stop sogo with /etc/init.d/sogod"
-	elog
-	elog "If you plan to use SOGo with Apache then please have a look at the"
-	elog "'SOGo-Apache.conf' included in the documentation directory of this"
-	elog "SOGo installation and don't forget to add '-D PROXY' to your"
-	elog "APACHE2_OPTS."
-	elog
-}