Tentative bump to sogo 1.1.0

(works up to login screen, not tested ldap/sql/mail setup)

svn path=/overlay/; revision=423

6 files changed, 15 insertions, 272 deletions

diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index c152723..45407e4 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,8 +1,3 @@
-AUX sogo-foundation_include.patch 296 RMD160 c12185f556ccb3e3c922a9ffe7f1c4f72337aea6 SHA1 3eaabf94cbce392e81a81b74f55b2256712ce168 SHA256 5d230c040c5919acf29c4ddc45306dc38344048eae0fce0580140880a6c6537f
-AUX sogo.initd 472 RMD160 eb2ff469c8ad9795c2ff7f7b53f95d3c7e5a1303 SHA1 67e9a508b08cb2205ddff4044b35f378dc4c8e07 SHA256 eaa3a6c0e2729291ecf6fd1492fc7d33a0494bd920e63a78e1e1997c9314e31f
-DIST SOGo-1.0rc6.1.tar.gz 1304442 RMD160 07cbec5672670ff6355687565470bb4265ba7d36 SHA1 81954756dc641c1d9fee23be312f150dea7a5661 SHA256 80477c1949965fbc30a3d01f72b6aa701d7e1b9e8739d529f39c80edcb56a4e6
-DIST SOGo-1.0rc7.tar.gz 1343834 RMD160 072817988a6061907b424974590f2906a7631583 SHA1 b8ca18de33a958f3c1f78df554d3fe268a2dec86 SHA256 fa47406e410571ff842e0137caf90bb863a07c122b967759fd85665e2a0a3722
-DIST SOGo-1.0rc8.tar.gz 1176621 RMD160 5c3ab6f2af80f3944d83d3fab5e6c5e1d0dd3184 SHA1 b7bf36be263029186a85455941ca525992eee38f SHA256 eeb4ace491142a83b312c62926edf389837d6e0a9fd24b027dbf2e4e24a8c8fb
-EBUILD sogo-1.0_rc6.ebuild 2821 RMD160 d25b408ec4bfd7b5df7a82f467095bf95f1decb6 SHA1 5ad089af3fc8ca3b9a8741629361eee24260b69b SHA256 00c31e5bd13d27da59c6e89f8a5ac0ab9c56a60c18faf3ee4ccfd63c015c22c6
-EBUILD sogo-1.0_rc7.ebuild 2819 RMD160 7569ac90ca0df003ec4dc53cea27cee5e8438119 SHA1 5b61c7549cf79d2ccc702a289ec987f6facc720d SHA256 69cc2c666d6bac8904120a04cee02119ccb8f40eb29c1b298c2faaa7aa6131d0
-EBUILD sogo-1.0_rc8.ebuild 2819 RMD160 7569ac90ca0df003ec4dc53cea27cee5e8438119 SHA1 5b61c7549cf79d2ccc702a289ec987f6facc720d SHA256 69cc2c666d6bac8904120a04cee02119ccb8f40eb29c1b298c2faaa7aa6131d0
+AUX sogo.initd 468 RMD160 64eae15e9f17a267ec024391f5fb59c16c78a4fe SHA1 4b285e65e92bf6eea5b22c30265e67e959841573 SHA256 96f96f331e33904022e825404ac88fe0cdde9c3f05c9573b8140bee7325113b3
+DIST SOGo-1.1.0.tar.gz 3613661 RMD160 b6fd66c0825f34e3fbc12d23c9b8c144a5b9cd65 SHA1 0e19f79fd764e9deba14a6346636b7ee86832014 SHA256 950e1a954d8905e187e09336893c50b3c7a16de42ada5c50932766974d5e7a13
+EBUILD sogo-1.1.0.ebuild 2585 RMD160 b266e6ca93693ba7ef460554a2f9a33967c10cf3 SHA1 40ddc8e291e6283de0425a649c141570f91520b1 SHA256 62779d6b36bfd1272394d1107ff6f287809a83a428294be95c8d5db7ede30880
diff --git a/gnustep-apps/sogo/files/sogo-foundation_include.patch b/gnustep-apps/sogo/files/sogo-foundation_include.patch
deleted file mode 100644
index c12ae10..0000000
--- a/gnustep-apps/sogo/files/sogo-foundation_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- SoObjects/SOGo/SOGoCache.m.orig	2008-07-01 18:15:13.000000000 +0200
-+++ SoObjects/SOGo/SOGoCache.m	2008-07-01 18:15:35.000000000 +0200
-@@ -20,6 +20,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#import <Foundation/Foundation.h>
- #import <Foundation/NSArray.h>
- 
- #import <NGObjWeb/SoObject.h>
diff --git a/gnustep-apps/sogo/files/sogo.initd b/gnustep-apps/sogo/files/sogo.initd
index 17dddf1..766b37f 100644
--- a/gnustep-apps/sogo/files/sogo.initd
+++ b/gnustep-apps/sogo/files/sogo.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -10,7 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting SOGo service"
-	start-stop-daemon --start --exec /usr/GNUstep/System/Tools/Admin/sogod-0.9 \
+	start-stop-daemon --start --exec /usr/GNUstep/System/Tools/Admin/sogod \
 		--chuid sogo -m -b --pidfile /var/run/sope.pid
 	eend $?
 }
diff --git a/gnustep-apps/sogo/sogo-1.0_rc6.ebuild b/gnustep-apps/sogo/sogo-1.0_rc6.ebuild
deleted file mode 100644
index e0c901b..0000000
--- a/gnustep-apps/sogo/sogo-1.0_rc6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit depend.apache gnustep-base
-
-MY_PN="SOGo"
-MY_PV="${PV/_/}.1"
-
-DESCRIPTION="groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://sogo.opengroupware.org/"
-SRC_URI="http://www.inverse.ca/downloads/${MY_PN}/Sources/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="gnustep-libs/sope"
-RDEPEND="${DEPEND}
-	dev-db/postgresql"
-need_apache2
-
-S=${WORKDIR}/${MY_PN}
-
-pkg_setup() {
-	gnustep-base_pkg_setup
-
-	if ! built_with_use gnustep-libs/sope postgres; then
-		eerror "SOGo needs gnustep-libs/sope with USE=postgres enabled"
-		die "gnustep-libs/sope compiled without USE=postgres"
-	fi
-}
-
-
-src_unpack() {
-	gnustep-base_src_unpack
-
-	# Fix for missing include
-	epatch "${FILESDIR}"/${PN}-foundation_include.patch
-}
-
-
-src_compile() {
-	# Do not use standard src_compile, as ./configure is not standard
-	egnustep_env
-	./configure
-	egnustep_make
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	# Apache configuration file
-	dodir "${APACHE_MODULES_CONFDIR}"
-	cat <<EOF >"${D}/${APACHE_MODULES_CONFDIR}"/47_sogo.conf
-<IfDefine SOPE>
-LoadModule ngobjweb_module modules/mod_ngobjweb.so
-
-Alias /sogo.woa/WebServerResources/ \
-	${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/WebServerResources/
-Alias /SOGo.woa/WebServerResources/ \
-	${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/WebServerResources/
-
-AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
-	${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/\$1.SOGo/Resources/\$2
-
-<LocationMatch "^/SOGo*">
-	AddDefaultCharset UTF-8
-	SetHandler ngobjweb-adaptor
-	SetAppPort 20000
-	Allow from 127.0.0.1
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*png">
-	SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*gif">
-	SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*css">
-	SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*js">
-	SetHandler default-handler
-</LocationMatch>
-
-</IfDefine>
-EOF
-
-	# Init script
-	newinitd "${FILESDIR}"/sogo.initd sogo \
-		|| die "Init script installation failed"
-}
-
-pkg_preinst() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-
-	elog "Do not forget to enable the sope module in /etc/apache2/httpd.conf"
-	elog "Now follow the steps from the SOGo documentation:"
-	elog "http://www.inverse.ca/contributions/sogo/documentation.html#c803"
-	elog "The default port configured for sogo is 20000 (from 47_sogo.conf)"
-	elog "The sogo user home directory is /var/lib/sogo"
-	elog ""
-	elog "Then you can start/stop sogo with /etc/init.d/sogo"
-}
diff --git a/gnustep-apps/sogo/sogo-1.0_rc8.ebuild b/gnustep-apps/sogo/sogo-1.0_rc8.ebuild
deleted file mode 100644
index d63ce57..0000000
--- a/gnustep-apps/sogo/sogo-1.0_rc8.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit depend.apache gnustep-base
-
-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.inverse.ca/downloads/${MY_PN}/Sources/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="gnustep-libs/sope"
-RDEPEND="${DEPEND}
-	dev-db/postgresql"
-need_apache2
-
-S=${WORKDIR}/${MY_PN}
-
-pkg_setup() {
-	gnustep-base_pkg_setup
-
-	if ! built_with_use gnustep-libs/sope postgres; then
-		eerror "SOGo needs gnustep-libs/sope with USE=postgres enabled"
-		die "gnustep-libs/sope compiled without USE=postgres"
-	fi
-}
-
-
-src_unpack() {
-	gnustep-base_src_unpack
-
-	# Fix for missing include
-	epatch "${FILESDIR}"/${PN}-foundation_include.patch
-}
-
-
-src_compile() {
-	# Do not use standard src_compile, as ./configure is not standard
-	egnustep_env
-	./configure
-	egnustep_make
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	# Apache configuration file
-	dodir "${APACHE_MODULES_CONFDIR}"
-	cat <<EOF >"${D}/${APACHE_MODULES_CONFDIR}"/47_sogo.conf
-<IfDefine SOPE>
-LoadModule ngobjweb_module modules/mod_ngobjweb.so
-
-Alias /sogo.woa/WebServerResources/ \
-	${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/WebServerResources/
-Alias /SOGo.woa/WebServerResources/ \
-	${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/WebServerResources/
-
-AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
-	${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/\$1.SOGo/Resources/\$2
-
-<LocationMatch "^/SOGo*">
-	AddDefaultCharset UTF-8
-	SetHandler ngobjweb-adaptor
-	SetAppPort 20000
-	Allow from 127.0.0.1
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*png">
-	SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*gif">
-	SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*css">
-	SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*js">
-	SetHandler default-handler
-</LocationMatch>
-
-</IfDefine>
-EOF
-
-	# Init script
-	newinitd "${FILESDIR}"/sogo.initd sogo \
-		|| die "Init script installation failed"
-}
-
-pkg_preinst() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-
-	elog "Do not forget to enable the sope module in /etc/apache2/httpd.conf"
-	elog "Now follow the steps from the SOGo documentation:"
-	elog "http://www.inverse.ca/contributions/sogo/documentation.html#c803"
-	elog "The default port configured for sogo is 20000 (from 47_sogo.conf)"
-	elog "The sogo user home directory is /var/lib/sogo"
-	elog ""
-	elog "Then you can start/stop sogo with /etc/init.d/sogo"
-}
diff --git a/gnustep-apps/sogo/sogo-1.0_rc7.ebuild b/gnustep-apps/sogo/sogo-1.1.0.ebuild
index d63ce57..8827b2a 100644
--- a/gnustep-apps/sogo/sogo-1.0_rc7.ebuild
+++ b/gnustep-apps/sogo/sogo-1.1.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
 inherit depend.apache gnustep-base
 
 MY_PN="SOGo"
@@ -16,36 +17,17 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="gnustep-libs/sope"
+DEPEND="gnustep-libs/sope[postgres]"
 RDEPEND="${DEPEND}
 	dev-db/postgresql"
 need_apache2
 
-S=${WORKDIR}/${MY_PN}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
 
-pkg_setup() {
-	gnustep-base_pkg_setup
-
-	if ! built_with_use gnustep-libs/sope postgres; then
-		eerror "SOGo needs gnustep-libs/sope with USE=postgres enabled"
-		die "gnustep-libs/sope compiled without USE=postgres"
-	fi
-}
-
-
-src_unpack() {
-	gnustep-base_src_unpack
-
-	# Fix for missing include
-	epatch "${FILESDIR}"/${PN}-foundation_include.patch
-}
-
-
-src_compile() {
+src_configure() {
 	# Do not use standard src_compile, as ./configure is not standard
 	egnustep_env
 	./configure
-	egnustep_make
 }
 
 src_install() {
@@ -58,12 +40,14 @@ src_install() {
 LoadModule ngobjweb_module modules/mod_ngobjweb.so
 
 Alias /sogo.woa/WebServerResources/ \
-	${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/WebServerResources/
+	${GNUSTEP_SYSTEM_LIBRARY}/SOGo/WebServerResources/
 Alias /SOGo.woa/WebServerResources/ \
-	${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/WebServerResources/
+	${GNUSTEP_SYSTEM_LIBRARY}/SOGo/WebServerResources/
+Alias /SOGO.woa/WebServerResources/ \
+	${GNUSTEP_SYSTEM_LIBRARY}/SOGo/WebServerResources/
 
 AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
-	${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/\$1.SOGo/Resources/\$2
+	${GNUSTEP_SYSTEM_LIBRARY}/SOGo/\$1.SOGo/Resources/\$2
 
 <LocationMatch "^/SOGo*">
 	AddDefaultCharset UTF-8
@@ -104,7 +88,7 @@ pkg_postinst() {
 	gnustep-base_pkg_postinst
 
 	elog "Do not forget to enable the sope module in /etc/apache2/httpd.conf"
-	elog "Now follow the steps from the SOGo documentation:"
+	elog "Now follow the steps from the SOGo documentation, Configuration section:"
 	elog "http://www.inverse.ca/contributions/sogo/documentation.html#c803"
 	elog "The default port configured for sogo is 20000 (from 47_sogo.conf)"
 	elog "The sogo user home directory is /var/lib/sogo"