Version bump to 0.1 final; drop PEAR dependencies are they are now bundled and possibly incompatible. Drop unconditional apache dependency and adjust/update postinstall instructions accordingly. More complete LICENSE info.

svn path=/experimental/; revision=833

4 files changed, 75 insertions, 42 deletions

diff --git a/mail-client/roundcube/ChangeLog b/mail-client/roundcube/ChangeLog
index d4d6e8f..cf2f829 100644
--- a/mail-client/roundcube/ChangeLog
+++ b/mail-client/roundcube/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for mail-client/roundcube
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Mar 2008; Jakub Moc <jakub@gentoo.org> files/postinstall-en.txt,
+  -roundcube-0.1_rc1.ebuild, -roundcube-0.1_rc2.ebuild, +roundcube-0.1.ebuild:
+  Version bump to 0.1 final; drop PEAR dependencies are they are now bundled
+  and possibly incompatible. Drop unconditional apache dependency and
+  adjust/update postinstall instructions accordingly. More complete
+  LICENSE info.
+
   05 Dec 2007; Jakub Moc <jakub@gentoo.org> roundcube-0.1_rc2.ebuild:
   Fix PHP requirements
 
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 9296b9d..5e8fc0d 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,5 +1,5 @@
-AUX postinstall-en.txt 1641 RMD160 98b641b589e41341cbe1fd264882193ee6746282 SHA1 7717e0253b84e937da9894e9f20710dd1cb5161a SHA256 b86b419050895ad27a68762629acfe9a73487626f1e9d2c657b88b590ab61b22
-DIST roundcubemail-0.1-rc2-dep.tar.gz 761019 RMD160 155a42f9beaa72467c765700891d7212a47c8c96 SHA1 4d32a42c9d0c4515273ce3146fef63648d487d75 SHA256 03bfbc1dce27a58fcbd4090c2f505c43957ecd4b799dbddf7d739b91637e89c4
-EBUILD roundcube-0.1_rc2.ebuild 1728 RMD160 b7c42dd4d8a34f33b7370710c6ea9d5d7566f9cd SHA1 1343b203d27b85ec329cd05c2e0867fc23e5e5fc SHA256 35a108ea916b6fbd61961425c256f033bea6f14e3ee7084c17031924b2204eab
-MISC ChangeLog 915 RMD160 4ba3086457df53c84ce6805e12757fab9a40f361 SHA1 73a305e989f52003da9f5f459ba1b230b0abec9d SHA256 c41b8136e10ba198c3ee20a61308ddb1e749fcb534da386bd211db310731656b
+AUX postinstall-en.txt 2716 RMD160 a3beacb799ebeb39840a6957609ad033b9ea2b7b SHA1 28383ab1ef42ab3a0b557b3c4795d1362c753155 SHA256 5b8fa40c56f44bfb66230927d31e7b9207c53b03662c0867e3190eca77250365
+DIST roundcubemail-0.1.tar.gz 1406854 RMD160 225b3a37c70bcf3b471b7d650233aec30dae2f76 SHA1 8b5b516b41bad98c3bbaf0da0e70b0db82580424 SHA256 ea4f4b23b9a20308cc0b1fef3b7301700c9ce4544189007bc62756e8d5f67051
+EBUILD roundcube-0.1.ebuild 1729 RMD160 c28f3d5a13543349809174ef4b8d313f28a4a039 SHA1 59cc1bdd0017e1d5957c6cb257c83bafd0c8a3a8 SHA256 a4325a05b4cb5fdccbfe613506ebab2cf36c328c3a7d42a7ef08df5f6ff5bc05
+MISC ChangeLog 1296 RMD160 0a4e900dab53bea9b7f878d2a52918005ac512a6 SHA1 099bd3cfd98c3fbc7377fd4ca5921233850ce263 SHA256 1dd26ed4a53d53235672252354f8c43570491cb8c3fb3a7ffade0ff50fb8eb1f
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
diff --git a/mail-client/roundcube/files/postinstall-en.txt b/mail-client/roundcube/files/postinstall-en.txt
index 93cbcbc..192ff54 100644
--- a/mail-client/roundcube/files/postinstall-en.txt
+++ b/mail-client/roundcube/files/postinstall-en.txt
@@ -1,53 +1,82 @@
 0. DATABASE SETUP
 
-* MySQL
--------
-Setting up the mysql database can be done by creating an empty database,
-importing the table layout and granting the proper permissions to the
-roundcube user. Here is an example of that procedure:
+
+* MySQL 4.1.x/5.x
+-----------------
+For MySQL version 4.1 and up, it's recommended to create the database for
+RoundCube with utf-8 charset. Here's an example of the init procedure:
 
 # mysql
-> create database 'roundcubemail';
+> CREATE DATABASE roundcubemail DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
 > GRANT ALL PRIVILEGES ON roundcubemail.* TO roundcube@localhost
-        IDENTIFIED BY 'password';
+    IDENTIFIED BY 'password';
 > quit
-# mysql roundcubemail < ${MY_INSTALLDIR}/SQL/mysql.initial.sql
 
-For MySQL version 4.1 and up, it's recommended to create the database for
-RoundCube with the following command:
-> CREATE DATABASE `roundcube` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+# mysql roundcubemail < ${MY_INSTALLDIR}/SQL/mysql5.initial.sql
+
+* MySQL
+-------
+Setting up the mysql database can be done by creating an empty database,
+importing the table layout and granting the proper permissions to the
+roundcube user. Here is an example of that procedure:
 
 
 * SQLite
 --------
-Here is an example how you can setup the sqlite.db for roundcube:
+Sqlite requires specifically php5 (sqlite in php4 currently doesn't
+work with roundcube), and you need sqlite 2 (preferably 2.8) to setup
+the sqlite db (sqlite 3.x also doesn't work at the moment). Here is
+an example how you can setup the sqlite.db for roundcube:
 
 # sqlite -init SQL/sqlite.initial.sql sqlite.db
 
 Make sure your configuration points to the sqlite.db file and that the
-webserver can write to the file.
-
+webserver can write to the file and the directory containing the file.
 
 * PostgreSQL
 ------------
-To use RoundCube with PostgreSQL support you have to follow the next
-simple steps, which have to be done with the postgres system user (or
+To use RoundCube with PostgreSQL support you have to follow these
+simple steps, which have to be done as the postgres system user (or
 which ever is the database superuser):
 
-$ createuser roundcubemail
-$ createdb -O roundcubemail roundcubemail
+$ createuser roundcube
+$ createdb -O roundcube roundcubemail
 $ psql roundcubemail
 
 roundcubemail =# ALTER USER roundcube WITH PASSWORD 'the_new_password';
-roundcubemail =# \c - roundcubemail
+roundcubemail =# \c - roundcube
 roundcubemail => \i ${MY_INSTALLDIR}/SQL/postgres.initial.sql
 
+All this has been tested with PostgreSQL 8.x and 7.4.x. Older
+versions don't have a -O option for the createdb, so if you are
+using that version you'll have to change ownership of the DB later.
+
+
+1. ROUNDCUBE CONFIGURATION
+
+Modify the files in ${MY_INSTALLDIR}/config/* to suit your local environment
+
+Details about the config parameters can be found in the config files.
+See http://trac.roundcube.net/wiki/Howto_Install for even more guidance.
 
-1. CONFIGURATION
-  Modify the files in ${MY_INSTALLDIR}/config/* to suit your local environment
 
 2. PHP CONFIGURATION
 
   - error_reporting E_ALL & ~E_NOTICE (or lower)
   - file_uploads on (for attachment upload features)
   - memory_limit  (increase as suitable to support large attachments)
+  - session.auto_start needs to be off/0
+
+3. WEBSERVER CONFIGURATION
+
+Access through your webserver to at least the following directories should be denied:
+
+    * /conf
+    * /temp
+    * /logs 
+
+Roundcube uses .htaccess files to protect these directories if you are using Apache;
+be sure to allow override of the Limit directives to get them taken into account.
+
+If you are NOT using Apache, it is your responsibility to take care of the above as
+needed by your webserver.
diff --git a/mail-client/roundcube/roundcube-0.1_rc2.ebuild b/mail-client/roundcube/roundcube-0.1.ebuild
index c5e5554..995f8cb 100644
--- a/mail-client/roundcube/roundcube-0.1_rc2.ebuild
+++ b/mail-client/roundcube/roundcube-0.1.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit webapp depend.php depend.apache
 
-MY_PV=${PV/_/-}-dep
+MY_PN="${PN}mail"
+MY_P="${MY_PN}-${PV}"
 DESCRIPTION="A browser-based multilingual IMAP client using AJAX"
 HOMEPAGE="http://www.roundcube.net"
-SRC_URI="mirror://sourceforge/${PN}mail/${PN}mail-${MY_PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components and utf8.class.php
+LICENSE="GPL-2 BSD PHP-2.02 PHP-3 public-domain"
 KEYWORDS="~amd64 ~x86"
 IUSE="mysql postgres sqlite ssl"
 
-RDEPEND="dev-php/PEAR-Auth_SASL
-	>=dev-php/PEAR-DB-1.7.11
-	>=dev-php/PEAR-Mail_Mime-1.3.1-r1
-	>=dev-php/PEAR-Net_SMTP-1.2.10
-	dev-php/PEAR-Net_Socket"
-
+need_httpd_cgi
 need_php_httpd
-need_apache
 
-S=${WORKDIR}/${PN}mail-${MY_PV}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	local flags="crypt iconv imap pcre unicode"
@@ -54,12 +51,12 @@ src_install () {
 	webapp_src_preinst
 	dodoc CHANGELOG INSTALL README UPGRADING
 
-	cp -R [[:lower:]]* SQL "${D}"/${MY_HTDOCSDIR}
+	cp -R [[:lower:]]* SQL "${D}/${MY_HTDOCSDIR}"
 
-	webapp_serverowned ${MY_HTDOCSDIR}/logs
-	webapp_serverowned ${MY_HTDOCSDIR}/temp
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
 
-	webapp_configfile ${MY_HTDOCSDIR}/config/{db,main}.inc.php
+	webapp_configfile "${MY_HTDOCSDIR}"/config/{db,main}.inc.php
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_postupgrade_txt en UPGRADING
 	webapp_src_install