Merge remote branch 'remotes/remote/master'

5 files changed, 209 insertions, 0 deletions

diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 9a3a8142..e51469b7 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,4 +1,7 @@
+AUX postinstall-en.txt 2513 RMD160 c2a04efcdd4007642221797a10877c2fc57ad874 SHA1 8bc888b2944694bbbadeddfe6f193c3a8a995a87 SHA256 5c1fa9d43f29158521188aae417654f968fb41662c46721b8183728df37eb4c4
 DIST roundcubemail-0.2-beta2.tar.gz 1611313 RMD160 348f59b578ca86b96a1aaf3e395d457a89e9096e SHA1 2f6e17d649111d204c6cc92cdc8fdf6461d5a797 SHA256 35a22dd75c42c54816616633112cae3605e953cd05937e1f6dc71a6837ba75ab
 DIST roundcubemail-0.2-stable.tar.gz 1672535 RMD160 13f252bf334d7fb7f84d3ba92d72ce54c595a4ca SHA1 8abefd7b442e0fa95b72d757091d60979054d624 SHA256 86de36fec5cfc4217d5376fa74e27645d3c414ad18fa8554abc909709f1a9107
+DIST roundcubemail-0.2.2.tar.gz 1703629 RMD160 c813e2bcfc7ba75c23b85ec620f819c1261c1f3f SHA1 ddb2340962bcf3ac24d026a6d97e9bd95cefaa3d SHA256 57df1dfa6b88973f74131adf0262de4fbf5217be3bc6739faeccff77a9dfffa3
+EBUILD roundcube-0.2.2.ebuild 2602 RMD160 4a028040bc3a6d8c6fe7efe30bb0d80a4c40d8d6 SHA1 db9adc1c866c9d4b54f6664c8a8b76d8acf8b4fb SHA256 ef2c22d046a38c39fe2d9a837f13cb4056a65a2f7d7092b3376d508ae502472b
 EBUILD roundcube-0.2.ebuild 2728 RMD160 f0fd44440ecc493a02e0f92c5e774fb66e0cebdd SHA1 de49885916eedc30ce12436d8e99b0e5e248932c SHA256 6f6d83a795a4db1844e71a10f09207d3734b82d8a62d04f8b962fe80fc63b379
 EBUILD roundcube-0.2_beta2.ebuild 2727 RMD160 1ff1cdcd2aef597d2ff48ff1fb9e6a184c504c14 SHA1 9e1e73c33a5d062679c0a9caef0f220eef28ef42 SHA256 54abefa0c5fef72267953558c3f998ec9d050bf1123b03df2ec56c9c9ee59b39
diff --git a/mail-client/roundcube/files/postinstall-en.txt b/mail-client/roundcube/files/postinstall-en.txt
new file mode 100644
index 00000000..d3d8138b
--- /dev/null
+++ b/mail-client/roundcube/files/postinstall-en.txt
@@ -0,0 +1,77 @@
+0. DATABASE SETUP
+
+
+* 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 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+> GRANT ALL PRIVILEGES ON roundcubemail.* TO roundcube@localhost
+    IDENTIFIED BY 'password';
+> quit
+
+# mysql roundcubemail < ${MY_INSTALLDIR}/SQL/mysql5.initial.sql
+
+* SQLite
+--------
+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 and the directory containing the file.
+
+* PostgreSQL
+------------
+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 roundcube
+$ createdb -O roundcube roundcubemail
+$ psql roundcubemail
+
+roundcubemail =# ALTER USER roundcube WITH PASSWORD 'the_new_password';
+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.
+
+
+2. PHP CONFIGURATION
+
+  - error_reporting E_ALL & ~E_NOTICE (or lower)
+  - file_uploads On (for attachment upload features)
+  - session.auto_start Off
+  - magic_quotes_gpc Off
+  - memory_limit  (increase as suitable to support large attachments)
+
+
+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.2.2.ebuild b/mail-client/roundcube/roundcube-0.2.2.ebuild
new file mode 100644
index 00000000..2b9ebaea
--- /dev/null
+++ b/mail-client/roundcube/roundcube-0.2.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.2.1.ebuild,v 1.1 2009/04/13 08:27:00 hollow Exp $
+
+MY_PN="${PN}mail"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils webapp depend.php depend.apache
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="http://roundcube.net"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-2 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ldap mysql postgres sqlite ssl spell"
+
+DEPEND=""
+RDEPEND="dev-php/PEAR-PEAR"
+
+need_httpd_cgi
+need_php_httpd
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	local flags="crypt iconv imap pcre session unicode"
+	use ldap && flags="${flags} ldap"
+	use ssl && flags="${flags} ssl"
+	use spell && flags="${flags} curl spell"
+
+	# check for required PHP features
+	if ! use mysql && ! use postgres && ! use sqlite ; then
+		local dbflags="mysql mysqli postgres sqlite"
+		if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
+			! PHPCHECKNODIE="yes" require_php_with_any_use ${dbflags} ; then
+				die "Re-install ${PHP_PKG} with ${flags} and at least one of ${dbflags} in USE."
+		fi
+	else
+		for db in postgres sqlite ; do
+			use ${db} && flags="${flags} ${db}"
+		done
+		if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
+			( use mysql && ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ) ; then
+				local diemsg="Re-install ${PHP_PKG} with ${flags}"
+				use mysql && diemsg="${diemsg} and at least one of mysql mysqli"
+				die "${diemsg} in USE"
+		fi
+	fi
+
+	# add some warnings about optional functionality
+	if ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
+		ewarn "IMAP quota display will not work correctly without GD support in PHP."
+		ewarn "Recompile PHP with either gd or gd-external in USE if you want this feature."
+		ewarn
+	fi
+
+	webapp_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mv config/db.inc.php{.dist,}
+	mv config/main.inc.php{.dist,}
+}
+
+src_install () {
+	webapp_src_preinst
+	dodoc CHANGELOG INSTALL README UPGRADING
+
+	cp -R [[:lower:]]* SQL "${D}/${MY_HTDOCSDIR}"
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	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
+}
diff --git a/www-apps/zenphoto/Manifest b/www-apps/zenphoto/Manifest
index 30993649..01fe0099 100644
--- a/www-apps/zenphoto/Manifest
+++ b/www-apps/zenphoto/Manifest
@@ -2,7 +2,9 @@ AUX postinstall-en.txt 177 RMD160 6cb9bf7adca2a41c39e11a321a14c1bf2fb76532 SHA1
 AUX postupgrade-en.txt 498 RMD160 f5bc793fe7fe5e2394f6a6150e0eb6191f8dcdd4 SHA1 5fd63c2bf2f0603230a76b579fc49b95367fd1b2 SHA256 dfe4da27be637222a1005bc1276d73325905f5d98591f918ca4b38cf351ded67
 DIST zenphoto-1.1.5.tar.gz 770444 RMD160 be97af59e4204b36a7bca55223efa5d8a7e8b7a4 SHA1 e9fdf5d65e2f1a7afb4c14b16bc92ad53b768b20 SHA256 4848ede68bff4ad05103fd446b9d5240dc23185ea732f07993a42e5f27018954
 DIST zenphoto-1.1.7.tar.gz 1483048 RMD160 3a4908dda27b028f3a5b77b1c94dc48d762a42c7 SHA1 97043e60d2dca0d8098dde2aa2cd4066da28f4e3 SHA256 f6687e0bfa95fac67b24f9c152eb0ee9a286a07da5748f8aaf40593c603cb21d
+DIST zenphoto-1.2.6.tar.gz 4559197 RMD160 8bd61928cc4d19be506bdfe6b85ad08aa54372ea SHA1 31c7f55d0ecf59470a534ff4cb8c521cb0725522 SHA256 99806827b2fd94df78fa132dd49b3a4e7e0a723bcd47c9e2f7aca001abc3e06b
 DIST zenphoto_1.2.5.tar.gz 4331790 RMD160 2fc0bcd5f479755afc4816f58345b160432c8c83 SHA1 219789e171e6e4d6985e5d86a452f16d32bdca28 SHA256 b0bcbe4c2a6942789c65927f61ba7f643fb81b6987666a802fc470ae74efb66d
 EBUILD zenphoto-1.1.5.ebuild 1055 RMD160 f2917831ec08e28242ab486c40c14ee0f1e15179 SHA1 b5b244b393c6ecf734962d4214042bd7baa7a229 SHA256 7d2d50492258c676d1cf7fa47d3bc6c94bf9025a6695fa0ce680370c5f5b592b
 EBUILD zenphoto-1.1.7.ebuild 1076 RMD160 68f270e63b1131a26d5cc73eea857db5d575824c SHA1 a75b7510d1ab545696cf43a10315f60526e10605 SHA256 df825228b5f6a6c3fa9c6b24fcb5fdc99ac05c137bf32721d661ee1aed5f9a27
 EBUILD zenphoto-1.2.5.ebuild 972 RMD160 d0a9a5fb2fa586cd4910256c6e836e2f754a17d8 SHA1 52207d2d0e4bef8c7684c69bc1d49d2a61dffd78 SHA256 fd5b15bb8054d58be777aa9aa3ea7ff9fcc1417348c4a994f48b5088dd9c1fbd
+EBUILD zenphoto-1.2.6.ebuild 972 RMD160 761a71c23ff73641d472936d1ecd166bf25785a5 SHA1 8d8eeeb610a10cb9e4029d64069e8d0ef8c0d68e SHA256 075aa778d6096b15e1f50c12576cb514913640df62b2022ba7d88fa7ccff1e4b
diff --git a/www-apps/zenphoto/zenphoto-1.2.6.ebuild b/www-apps/zenphoto/zenphoto-1.2.6.ebuild
new file mode 100644
index 00000000..45b04823
--- /dev/null
+++ b/www-apps/zenphoto/zenphoto-1.2.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils webapp depend.php depend.apache
+
+DESCRIPTION="A simpler web photo gallery"
+HOMEPAGE="http://www.zenphoto.org/"
+SRC_URI="http://zenphoto.googlecode.com/files/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif"
+
+RDEPEND=">=virtual/mysql-3.23"
+need_httpd_cgi
+need_php_httpd
+
+RESTRICT="nomirror"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	local require="mysql gd"
+	use exif && require="${require} exif"
+	
+	require_php_with_use ${require}
+
+	webapp_pkg_setup
+}
+
+src_install () {
+	webapp_src_preinst
+	dodoc README.html lighttpd_rules.conf example_robots.txt
+
+	cp -R [[:lower:]]* ${D}/${MY_HTDOCSDIR}
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/cache
+	webapp_serverowned "${MY_HTDOCSDIR}"/albums
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+	webapp_src_install
+}