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.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

6 files changed, 112 insertions, 102 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/Manifest b/www-apps/groupoffice/Manifest
index 73a1332e250f..66121224c3f5 100644
--- a/www-apps/groupoffice/Manifest
+++ b/www-apps/groupoffice/Manifest
@@ -1,9 +1,9 @@
 AUX postinstall2-en.txt 707 RMD160 610098a7d5bd4010e1023b6717d8996100fd063e SHA1 d02856f438371c5a309dc85df67e29e57a344555 SHA256 8f3f1efcf2d9cca8c63254175cff3566fd4d733b8e630c4d141f28240901309f
-DIST groupoffice-com-2.15.tar.gz 7715962 RMD160 b45792c9df15c0574c71f2ed1c46607449df009e SHA1 2787a23ab6aa35eb7040edb7b48473b1bd14282f SHA256 f965e6a68cf798912325b5c8696517fdc32bde9b986fa2e142159811ea3ecdad
-DIST groupoffice-com-2.16-8.tar.gz 9071328 RMD160 3078675575f5cdd685e31056b6dbe89494516b1d SHA1 129f6727a535ea6720ac832cd5dc61c6beb61414 SHA256 a26a4868dbf2278cf32ec9bd18a494f92929ed5b06ae5054d5383604c5380a08
 DIST groupoffice-com-2.18-stable-6.tar.gz 6543817 RMD160 02602d75779afd95813704dd66e278b8c82aa9b3 SHA1 e330b327d4272a3777a9c009049a3eaedce60dff SHA256 be14325adeb9546f0e93f974e00f744a07e4eee1312b27d25fe27695e4eb52f6
-EBUILD groupoffice-2.15.ebuild 1350 RMD160 da83b0d2721b240cd47ab98318c17fa568c0e224 SHA1 3be3e3cdfb21d253a6852d5e14a78d4a92170fce SHA256 dde700e73dda5e0381d6ca3d245afd148d1113021fc30b93f56bdd7835223ef7
-EBUILD groupoffice-2.16.8.ebuild 1430 RMD160 ac1bca6eec737cea5f6da2553d86393ce74a563c SHA1 819a0ce35ff4edf475d05a17652befa4591a423f SHA256 ee1faadf0202cb99e8756488078ac6de2c8d436dd8ba9c47b1e9073291b3fdf5
+DIST groupoffice-com-3.7.52.tar.gz 12259892 RMD160 9a550f1b6c683ed82525cf7ab1a717a62f7862dd SHA1 caad67f0ba9ccb7c69d56b8d35cb048c8bb5d96f SHA256 af07123e16e9ebeafa4aeeaa7ae3c6dd45bc333ae1588a6c540c5973bb8f64d6
+DIST groupoffice-com-4.0.47.tar.gz 12354456 RMD160 82538bfd6baa64af08142dc50103c995f6c538a8 SHA1 08794dae99eb96dd87123f7795fb0373e3d4b377 SHA256 0a84236d4d2f91d96c5a771a8add945404f3a7eef092dcaac9c2cc013dc6caac
 EBUILD groupoffice-2.18.6.ebuild 1588 RMD160 00fb1f065401d00aa2ea5857deaa453d958f9db4 SHA1 583049ead83bc7c2afd436b9337d2040dd7dfffb SHA256 902cbe386c3520b3ba31ea6d0447ad97e3940e01674c4376ec003a36b2389c96
-MISC ChangeLog 6235 RMD160 552681b3dcb8c35a767b45ca91702a44b3062738 SHA1 fd64f6d23c2415198181caecfda437b0457a14f4 SHA256 b043862db9cfbff05cde331c843d51e04061cc57ec49aba5943d763825891c14
+EBUILD groupoffice-3.7.52.ebuild 1326 RMD160 fc4c5cd5f4fd8c6c0a392ace641120df66258390 SHA1 bff0cf04cd157e2071f143fb9da57848a85d76b5 SHA256 3c49f424f111af1beafc3a29256961f4562956a75f949dbfb9ddd55a00a99f2b
+EBUILD groupoffice-4.0.47.ebuild 1326 RMD160 d2205a7a31db58a220f567a0ebbec72c8c9853a4 SHA1 95558808eb5ae1849d037dc97a23f2bf2ed3eb7f SHA256 9b57065a0906468d3db68daabc69e0924c54ea87a9d8bcd9587360990446ac81
+MISC ChangeLog 6609 RMD160 c2ab00b0ff6f7d2b662ec2ccfef6d0402ac6b520 SHA1 b3300deaaef6621f4c3e47d8c5ed3fabb7f00fc5 SHA256 8fbc803d0c371f5db393820d545bd2767fe2d20feba5d29f3fc3bf18e6f14681
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
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
+}