version bump. 4.0 is still beta, so use 3.7 in production. this is a security update (bug #361221). Also fixes bugs #332525, #285538, #417223.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 107 insertions, 97 deletions

diff --git a/www-apps/groupoffice/ChangeLog b/www-apps/groupoffice/ChangeLog
index 24d9593f0273..c6d1b407cd42 100644
--- a/www-apps/groupoffice/ChangeLog
+++ b/www-apps/groupoffice/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/groupoffice
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/ChangeLog,v 1.25 2008/08/25 15:31:05 armin76 Exp $
+# Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/ChangeLog,v 1.26 2012/06/24 10:06:46 mabi Exp $
+
+*groupoffice-3.7.52 (24 Jun 2012)
+*groupoffice-4.0.47 (24 Jun 2012)
+
+  24 Jun 2012; Matti Bickel <mabi@gentoo.org> +groupoffice-3.7.52.ebuild,
+  +groupoffice-4.0.47.ebuild, -groupoffice-2.15.ebuild,
+  -groupoffice-2.16.8.ebuild:
+  version bump. 4.0 is still beta, so use 3.7 in production. this is a security
+  update (bug #361221). Also fixes bugs #332525, #285538, #417223.
 
   25 Aug 2008; Raúl Porcel <armin76@gentoo.org> groupoffice-2.18.6.ebuild:
   alpha stable wrt #235058
diff --git a/www-apps/groupoffice/groupoffice-2.15.ebuild b/www-apps/groupoffice/groupoffice-2.15.ebuild
deleted file mode 100644
index db029f9e03bf..000000000000
--- a/www-apps/groupoffice/groupoffice-2.15.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.15.ebuild,v 1.6 2008/08/09 21:42:31 hoffie Exp $
-
-inherit eutils webapp depend.php
-
-S=${WORKDIR}/${PN}-com-${PV}
-DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
-HOMEPAGE="http://group-office.sourceforge.net/"
-SRC_URI="mirror://sourceforge/group-office/${PN}-com-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-	elog "PHP needs to be compiled with iconv support"
-	elog "If you are using php-5*, be sure it's compiled with USE=iconv"
-	require_php_with_use imap mysql
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CHANGELOG DEVELOPERS FAQ README README.ldap TODO TRANSLATORS"
-
-	dodoc ${docs} RELEASE LICENSE.PRO
-
-	cp -r . ${D}${MY_HTDOCSDIR}
-	for doc in ${docs}; do
-		rm -f ${D}${MY_HTDOCSDIR}/${doc}
-	done
-
-	touch ${D}${MY_HTDOCSDIR}/config.php
-	dodir ${MY_HOSTROOTDIR}/${P}/userdata ${MY_HTDOCSDIR}/local
-
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned ${MY_HOSTROOTDIR}/${P}/userdata
-	webapp_serverowned ${MY_HTDOCSDIR}/local
-	webapp_configfile ${MY_HTDOCSDIR}/config.php
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall2-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/groupoffice/groupoffice-2.16.8.ebuild b/www-apps/groupoffice/groupoffice-2.16.8.ebuild
deleted file mode 100644
index 7d6e88c16785..000000000000
--- a/www-apps/groupoffice/groupoffice-2.16.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.16.8.ebuild,v 1.4 2008/08/09 21:42:31 hoffie Exp $
-
-inherit eutils webapp depend.php versionator
-
-MY_PV=$(replace_version_separator 2 '-' )
-S=${WORKDIR}/${PN}-com-${MY_PV}
-DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
-HOMEPAGE="http://group-office.sourceforge.net/"
-SRC_URI="mirror://sourceforge/group-office/${PN}-com-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-	elog "PHP needs to be compiled with iconv support"
-	elog "If you are using php-5*, be sure it's compiled with USE=iconv"
-	require_php_with_use imap mysql calendar
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CHANGELOG DEVELOPERS FAQ README README.ldap TODO TRANSLATORS"
-
-	dodoc ${docs} RELEASE LICENSE.*
-
-	cp -r . ${D}${MY_HTDOCSDIR}
-	for doc in ${docs}; do
-		rm -f ${D}${MY_HTDOCSDIR}/${doc}
-	done
-
-	touch ${D}${MY_HTDOCSDIR}/config.php
-	dodir ${MY_HOSTROOTDIR}/${P}/userdata ${MY_HTDOCSDIR}/local
-
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned -R ${MY_HOSTROOTDIR}/${P}/userdata
-	webapp_serverowned ${MY_HTDOCSDIR}/local
-	webapp_configfile ${MY_HTDOCSDIR}/config.php
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall2-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/groupoffice/groupoffice-3.7.52.ebuild b/www-apps/groupoffice/groupoffice-3.7.52.ebuild
new file mode 100644
index 000000000000..c32d8d292029
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-3.7.52.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-3.7.52.ebuild,v 1.1 2012/06/24 10:06:46 mabi Exp $
+
+EAPI=4
+
+inherit webapp
+
+MY_P="${PN}-com-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi
+		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
+
+	dodoc ${docs} RELEASE.TXT LICENSE.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/groupoffice/groupoffice-4.0.47.ebuild b/www-apps/groupoffice/groupoffice-4.0.47.ebuild
new file mode 100644
index 000000000000..25f6e55a4651
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-4.0.47.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-4.0.47.ebuild,v 1.1 2012/06/24 10:06:46 mabi Exp $
+
+EAPI=4
+
+inherit webapp
+
+MY_P="${PN}-com-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi
+		 dev-lang/php[calendar,cli,curl,gd,imap,mysqli,zlib]"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT INSTALL.TXT"
+
+	dodoc ${docs} RELEASE.TXT LICENSE.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt
+	webapp_src_install
+}