--- a/www-apps/tt-rss/Manifest	Sat Mar 19 20:33:49 2011 +0100
+++ b/www-apps/tt-rss/Manifest	Fri May 20 21:51:36 2011 +0200
@@ -5,9 +5,10 @@
 DIST tt-rss-1.4.3.1.tar.gz 1235590 RMD160 63fc17fbf06ccc31a45af5a437dc5b001a4d3b9f SHA1 636cb8b6572b6774c229c4f01d3210dbe0fc95da SHA256 ccba032387c44edccb198b346063665aec9eaa3d152d9f8a435c7bd2083599ca
 DIST tt-rss-1.5.0.tar.gz 2630759 RMD160 e7d108ff3337add5a42e89b9d56ba14b48d37e43 SHA1 4ce3c3b2495dfdf5ce627afed2d831f3cc99754a SHA256 5034f4c26c741ac417587170b3b2fd39454a46a70f59e0a6ee8f598001bb335f
 DIST tt-rss-1.5.1.tar.gz 2640773 RMD160 c38ac94cdaa06592abef8178d14a8abd6c6c4d57 SHA1 2276243be5c1088337933f8b1567709eba380219 SHA256 825b522f5dc850274e192b71e72bc635fe16e4740b3007d6943aa39ca5a0a7ee
+DIST tt-rss-1.5.4.tar.gz 3155187 RMD160 531b9894751600a1c742002b1000d55ace350b4a SHA1 3a5eb7a875e1deead8923ac2e4e27c29c43c890a SHA256 1fa4b937d094723f9f0eb9cbfe9df2f12f01acbb6beca435555c36ac9ca014ae
 EBUILD tt-rss-1.4.2.ebuild 1399 RMD160 665bf10e70af63177d7e07d3360478f2792b5bd1 SHA1 3ac6aa6c6c6069194a0dbb6a0a89b80b9ee67a4c SHA256 3e7451144d4ec536b118b6fd9dab978faf22a9428ee498ad9617ddcebd87d85f
 EBUILD tt-rss-1.4.3.1.ebuild 1399 RMD160 665bf10e70af63177d7e07d3360478f2792b5bd1 SHA1 3ac6aa6c6c6069194a0dbb6a0a89b80b9ee67a4c SHA256 3e7451144d4ec536b118b6fd9dab978faf22a9428ee498ad9617ddcebd87d85f
 EBUILD tt-rss-1.5.0.ebuild 1431 RMD160 3cb389221cb32b16fd3f78e471216221289aee76 SHA1 4ece2d25835f854e155390242033a1f37b8826cc SHA256 1b999eaeb569f48239fb1f5e60396361d3eb93759a9b66b9ea1c79427cdeff45
+EBUILD tt-rss-1.5.1-r1.ebuild 1563 RMD160 f5471cf2b6b23a05713ba3c11bfb7c2b90cf9a26 SHA1 43fe450f0e3f9c566fefa2764dd55dac6bdb60ad SHA256 4bd8aeb53b95bb5bdbe06f939d24f0c56ca5b9d474989e46fd659779b55561e2
 EBUILD tt-rss-1.5.1.ebuild 1431 RMD160 3cb389221cb32b16fd3f78e471216221289aee76 SHA1 4ece2d25835f854e155390242033a1f37b8826cc SHA256 1b999eaeb569f48239fb1f5e60396361d3eb93759a9b66b9ea1c79427cdeff45
-EBUILD tt-rss-1.5.1-r1.ebuild 1563 RMD160 f5471cf2b6b23a05713ba3c11bfb7c2b90cf9a26 SHA1 43fe450f0e3f9c566fefa2764dd55dac6bdb60ad SHA256 4bd8aeb53b95bb5bdbe06f939d24f0c56ca5b9d474989e46fd659779b55561e2
-MISC config.php 7357 RMD160 1a5b2f87beb92c47119e00736feb529060ed0186 SHA1 d66c59663a8340f1a6bfee9cf8f9b167281241ce SHA256 bfb64c648a21a58f01971f65a24b4e8c314b2a3914452870828c0e9a944f76a4
+EBUILD tt-rss-1.5.4.ebuild 1607 RMD160 00c7a74ea69e61a67ca4020f0305f51c5bce0e41 SHA1 4a6888323b51a3b082bd687d8257ef62e329a341 SHA256 e8db5a1c26cfb580d14182fb271612080105c393b88000b6afadfd60a9e8c6b9

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/tt-rss/tt-rss-1.5.4.ebuild	Fri May 20 21:51:36 2011 +0200
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit webapp depend.php depend.apache
+
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="http://tt-rss.org/"
+SRC_URI="http://tt-rss.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="mysql postgres"
+
+DEPEND="dev-lang/php[mysql?,postgres?,json]"
+RDEPEND="${DEPEND}"
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+	require_php_with_use json
+	use mysql && require_php_with_use mysql
+	use postgres && require_php_with_use postgres
+}
+
+src_prepare() {
+	# Customize config.php so that the right 'DB_TYPE' is already set (according to the USE flag)
+	einfo "Customizing config.php..."
+	mv config.php{-dist,} || die "Could not rename config.php-dist to config.php."
+	if use mysql && ! use postgres; then
+		sed -e "/define('DB_TYPE',/{s:pgsql:mysql:}" -i config.php || die "sed failed"
+	fi
+	sed -e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" -i config.php \
+		|| die "sed failed"
+	# fix bug on feeds icons
+	mv icons icon
+	sed -e "/define('ICONS_\(DIR\|URL\)',/{s:icons:icon:}" -i config.php || die "sed failed"
+
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "/${MY_HTDOCSDIR}"
+	doins -r * || die "Could not copy the files to ${MY_HTDOCSDIR}."
+	keepdir "/${MY_HTDOCSDIR}"/icon
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/icon
+	webapp_serverowned "${MY_HTDOCSDIR}"/cache/*
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}