Added b2evolution-1.10.3 and 2.4.0_rc2 in response to request #203367.

(Portage version: 2.1.4_rc7)

6 files changed, 138 insertions, 11 deletions

diff --git a/www-apps/b2evolution/ChangeLog b/www-apps/b2evolution/ChangeLog
index 021fdf5fe525..cce86d84b2a9 100644
--- a/www-apps/b2evolution/ChangeLog
+++ b/www-apps/b2evolution/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/b2evolution
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.26 2007/08/15 20:03:23 wrobel Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.27 2008/02/15 11:38:29 wrobel Exp $
+
+*b2evolution-2.4.0_rc2 (15 Feb 2008)
+*b2evolution-1.10.3 (15 Feb 2008)
+
+  15 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org> files/postinstall-en.txt,
+  +files/postupgrade-en.txt, metadata.xml, +b2evolution-1.10.3.ebuild,
+  +b2evolution-2.4.0_rc2.ebuild:
+  Added b2evolution-1.10.3 and 2.4.0_rc2 in response to request #203367.
 
   15 Aug 2007; <wrobel@gentoo.org> -b2evolution-0.9.1.ebuild:
   Removed vulnerable b2evolution-0.9.1 (see #162171).
diff --git a/www-apps/b2evolution/b2evolution-1.10.3.ebuild b/www-apps/b2evolution/b2evolution-1.10.3.ebuild
new file mode 100644
index 000000000000..50efb9328288
--- /dev/null
+++ b/www-apps/b2evolution/b2evolution-1.10.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.3.ebuild,v 1.1 2008/02/15 11:38:29 wrobel Exp $
+
+inherit webapp eutils depend.php
+
+MY_EXT="2007-11-01"
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multilingual multiuser multi-blog engine"
+HOMEPAGE="http://www.b2evolution.net"
+SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+need_php
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]]; then
+		require_php_with_use expat tokenizer mysql
+	else
+		require_php_with_use xml tokenizer mysql
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	einfo "Installing main files"
+	cp -r blogs/* "${D}"${MY_HTDOCSDIR}
+	einfo "Done"
+
+	dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \
+		doc/upgradefrom_mt.html
+
+	# Identify the configuration files that this app uses
+	webapp_serverowned ${MY_HTDOCSDIR}
+	webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php
+	webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild b/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild
new file mode 100644
index 000000000000..fdbb7af5e326
--- /dev/null
+++ b/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild,v 1.1 2008/02/15 11:38:29 wrobel Exp $
+
+inherit webapp eutils depend.php
+
+MY_EXT="2008-01-23"
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multilingual multiuser multi-blog engine"
+HOMEPAGE="http://www.b2evolution.net"
+SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+need_php
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [[ ${PHP_VERSION} == "4" ]]; then
+		require_php_with_use expat tokenizer mysql
+	else
+		require_php_with_use xml tokenizer mysql
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	einfo "Installing main files"
+	cp -r blogs/* "${D}"${MY_HTDOCSDIR}
+	einfo "Done"
+
+	dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \
+		doc/upgradefrom_mt.html
+
+	# Identify the configuration files that this app uses
+	webapp_serverowned ${MY_HTDOCSDIR}
+	webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php
+	webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/b2evolution/files/postinstall-en.txt b/www-apps/b2evolution/files/postinstall-en.txt
index 0efe6a1a8208..9361877c2608 100644
--- a/www-apps/b2evolution/files/postinstall-en.txt
+++ b/www-apps/b2evolution/files/postinstall-en.txt
@@ -1,7 +1,17 @@
-Please read the docs before installing or upgrading.
+You will need to provide a database for your b2evolution installation.
 
-For initial installations, you need to go to the "install" page, which can be found at (for example:)
-http://localhost/b2evolution/install/
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
 
-Note that b2evolutions suggested upgrade procedure involves saving your customisations, wiping the directory, and 
-installing the newer version.
+http://www.gentoo.org/doc/en/mysql-howto.xml
+
+Once you have a database ready all you need to do is to go to this 
+location
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install
+
+and provide the credentials required for the database access.
+
+Note the administrator password b2evolution will provide and after
+logging in with these credentials you can start to use the application.
diff --git a/www-apps/b2evolution/files/postupgrade-en.txt b/www-apps/b2evolution/files/postupgrade-en.txt
new file mode 100644
index 000000000000..9e01eaba38c7
--- /dev/null
+++ b/www-apps/b2evolution/files/postupgrade-en.txt
@@ -0,0 +1,6 @@
+Please go to this location
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install/index.php
+
+and select "Upgrade from a previous version of b2evolution" after 
+providing the credentials required for the database acces.
diff --git a/www-apps/b2evolution/metadata.xml b/www-apps/b2evolution/metadata.xml
index c6a37f4a3be4..e125fba8f543 100644
--- a/www-apps/b2evolution/metadata.xml
+++ b/www-apps/b2evolution/metadata.xml
@@ -2,9 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>web-apps</herd>
-<maintainer>
-	<email>dsd@gentoo.org</email>
-	<name>Daniel Drake</name>
-</maintainer>
 </pkgmetadata>