Version bump to latest. Add required use to at-least-one db as otherwise the app does not work. Cleanup the initscript/config so it copes with my nginx instance nicely (checkconfig and obeying user/group settings defined by user).

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 194 insertions, 17 deletions

diff --git a/www-apps/tt-rss/ChangeLog b/www-apps/tt-rss/ChangeLog
index db10e1ca2619..2a2c15090a06 100644
--- a/www-apps/tt-rss/ChangeLog
+++ b/www-apps/tt-rss/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/tt-rss
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.18 2013/03/21 18:09:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.19 2013/03/24 10:22:25 scarabeus Exp $
+
+*tt-rss-1.7.5 (24 Mar 2013)
+
+  24 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> +files/ttrssd.confd-r1,
+  +files/ttrssd.initd-r1, +tt-rss-1.7.5.ebuild:
+  Version bump to latest. Add required use to at-least-one db as otherwise the
+  app does not work. Cleanup the initscript/config so it copes with my nginx
+  instance nicely (checkconfig and obeying user/group settings defined by user).
 
   21 Mar 2013; Markos Chandras <hwoarang@gentoo.org> tt-rss-1.7.4.ebuild:
   Add epatch_user per #462578
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index c1a69b7e4c0d..445ed2b1f466 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -4,32 +4,34 @@ Hash: SHA256
 AUX postinstall-en-with-daemon.txt 708 SHA256 582719449b4d5fd93396242131feb8ad30611f0f208da0d13347a69c545f72cb SHA512 8bc6be8201259f61e4ba52f49bf61f0d770d0cc7f134af458989f57ba3729506e3efd0fc744507a0dced3ddab0dc2a28e3d18d19229aa0156349ece03ff6a327 WHIRLPOOL 853d01ed3dd76053a3b534080d214cd4c64b8c1ded5d12f7d704f5e653040633e376f0d80d3a04b4d3fac9f0fe05ec01d36bc6a85e599a3757ec3594888c5da1
 AUX postinstall-en.txt 311 SHA256 826a8370113ba6634be00782a1a82b800cef1ea6d0a510c48eea9b993b4ff64b SHA512 34950c4d2254775a54cdc43be9b312aa4ce8af7230518e64a731384019f0797983a2b0dc76c10cbac1958b47b456d572e70c88494d01b87fe1df1f276db29700 WHIRLPOOL 7fe49f73533fae04875ffe1ff6e0a86cf255128deb962d6064f473eea39cecf51999fffca8b5213acca8db809bdd85a106d65a931d39301a5961a21004db0fc5
 AUX ttrssd.confd 177 SHA256 ea42131c4117622b1fa3695931708a1606d2d3f4c696f346f36510e12d4a6706 SHA512 0a4745d93e92f705cbc12421098f84a2024c90190e3ce3388d1d6fbdcc03112c0adaad2ebdfc97154a27ecc8c1d7a954730aa2acafb67741a5ddd76007722767 WHIRLPOOL 77272205db8778c0f83bb093a45eddb089ea9e1fd9ac5631916b1f47bd4395c83c1d5f53128acfb61d45fcc1a208d04c80df57424a6ac0b984e62bd88794afc9
+AUX ttrssd.confd-r1 653 SHA256 0ac166b3531731d070e14874d0a26de10adadf6f8014dd705434eddabc3d78d7 SHA512 1b744753eacb44353440a5e3ee2cca2b817ff76d5cb9a87cf0e190f3e67bc8940ce17541139cefeeab12563f5956255ff3153b919730f125cb84a37c460ff5fd WHIRLPOOL 0717f59424b5054ec7739ccdce540f3b9ddedcce8b4b63e396dbc1eab8fb77099d8a76c3c11370b2a359047ef90886cc1132c4185f03714f6b00dec63b94762a
 AUX ttrssd.initd 1412 SHA256 c0fa8fd138e480a118a7489b369873e9bea6c6b949d3e638cb3762fc15ee8a10 SHA512 8daa0e14ac34d08c85eac47d4425accdc923618f2e0abb256b3c938b8881af6ed01739415354fa35082e99543b469cf0ce0c0fa861f422ded20ee302356554bc WHIRLPOOL 4b89a39b3db1cf5442e67260b567f7ee5f0d8e628f24ab8b1ab4e07625243c9c2d682944c1eeea9b0cc353c4aacea14f657175f07a72c8ac9c688ee5e7e9c373
+AUX ttrssd.initd-r1 2073 SHA256 37023a603c02039d0966c314ba727cfcab48fd92a816df995e0b812c5384210d SHA512 99d89429829273ff147451542a3238827a940047cc07d2e03c1e7a65b893ceaf019ae906673d3abfe29388a789ab2cdd466e8e139b1aa4221c7a176932cf7862 WHIRLPOOL eeec0fbc443312c8b15d47fb90829da7c4c9e856e8219d7e38f4e0df3a7d59a1829209acdb3891aaf82d82c1b6e02ac975082b04513be0498d15d713baca8bb4
 AUX ttrssd.logrotated 118 SHA256 51bfd5dc544d7fdbe90d2fea9874a0d6558d5533a1186c6fa2f797bea89342da SHA512 e56085ea83ec1f1c80edf253e315b7197f884972f6dea439958cdcf217c44592a9eac75cc96494136aaa5a8e1eae6304527ef2d144ba797716ca58ff16641019 WHIRLPOOL a5a841f269bd5b7597ff6aa51d6d7ca7c38b12f887a785670c304b4414d236a8b90c3ac8707f255425e1f4888ad8fa0bb2d199522cab947c4a74d6ba1577e7f6
 DIST tt-rss-1.5.11.tar.gz 2755392 SHA256 3a3edbfe59b08ea57d322bdeeb06be1970226c854691542753dc12f0fc9e876e SHA512 b4dc70ddb61c45e5b1299ee33ce674b2f2ca2c5af3f7b38a8f623cf31620ef60ef57adc78802904c4232cc8bf446eeee9950eee6c8941a15fd1362f0fbaf515b WHIRLPOOL 860ffa81b7a587978c617b431f9aa4af08b3e873d5ccd8d8afb1ee051e24abd7900e0c8da124fd1a9974e06c512346a76ab2d3e2b18ac7e7d8265b0c125cbbae
 DIST tt-rss-1.6.2.tar.gz 2078889 SHA256 d4935787a59cebc81d1958e573485875d3a81178d3eef5edb9609d2276e78d07 SHA512 5a0da580b67f8fafd88589b782652425534a006221d35b207a5b42f2e8f450a283572373b8b72f5c5031e4bd00005c8cc7e2cd7a2f1210d96a2486896fa50375 WHIRLPOOL 3339c8e0fe21829e12c46b3d599ffaa2d2306b24465f50c740d1d41274d98879297d6e555c3634fe6ea3c477be3033289404abadc66d1de5eb5e7391813f5d2a
 DIST tt-rss-1.7.4.tar.gz 2086920 SHA256 42763195bdde275a96115400fddb9f164b35318bad480a60e77a92e2418fe950 SHA512 5e7b19c9a8e76799788e22cd78d7d515cfeae0f62ea9bfd4ec7d101df922a0911c7e4b1fa8c0118605c987f4617332ff01b4d7560c91647d8b5fd2ebbdede94e WHIRLPOOL d32f57782666af705d724c34b21ad439dee90358a642f2d990c6c414b4b1514431a37066d68b639d10f1888153783a280a52e9c6e6a6b24c929f3df05531ebbe
+DIST tt-rss-1.7.5.tar.gz 3485455 SHA256 ea85e0cd1760b7f4f5d4080da70352f56e1f8d958175af3e3fc9f392aa60806f SHA512 07fc9eae6965fb19133c214cc8b3aacaf6742197415a9fd030f1c1720bbefce102d8089ac0d823a24bf631afe74347f0d69a1ca67ff7bc89edc57d1c30635d1f WHIRLPOOL ba33381c3b21d374074932330b97b12b854432642ce2af57c97b4c64cfa0cbe91b05980815af57577086b7b54b92594292a9e6e437c669ab32fdad07c0abb464
 EBUILD tt-rss-1.5.11.ebuild 2158 SHA256 f126a16439a1adc7cdb33cba148fe139dda09f56dcc38cb10ed4f802194c1b41 SHA512 a83c87afd94fdc7839d7ec804f94a418ec01e53f6b53a38f219a056ce59d8438b26359d4f8bc9ffa28ac17b820be101fc30ea9f893cfed69f1b3de81aee7262e WHIRLPOOL 2852ee9b0a560095397fa1abcd448f664336836cdb0930953c6733a52bbe8a58c3cd790e6919bdd0848e3c8519b7dfa43eaf48adc28bfa0a64035a9157ce88a6
 EBUILD tt-rss-1.6.2.ebuild 2138 SHA256 42583f01ae3432d3879df9c552b10bb47edc8c74154c0c977ef5319ac45b6c78 SHA512 d277b3d38891fd28c3c658dc46b9a322547ef8d05d87aab7bf3115a5555e89645d11328257f8e3f5693a4fdfc1aef1f0ac097d5f6d2c4003ceca88fb8cb19984 WHIRLPOOL 00fad70dba15cec06dd7f8e2701d456ad442216847354f88d50d557bcbce0adbbcafdb88d72eee46ec59dead7f1c1ec7e118da3389c47d0e5d4eebae9953e1ce
 EBUILD tt-rss-1.7.4.ebuild 2161 SHA256 745b7ba5ec7eafe47c289ec6850bd4aa24c7581b3a413f0256b17c3fc9738f48 SHA512 3ae8670a17ce205a18df8bcdfeb51e309589c8737f2ef52a1141068ce8bd5b757b2763f18257143b432c74fbee6e15126d0c0c4f723c5d127d97a76ead106be9 WHIRLPOOL dfd669eb0c801f8788c1ae89be76cccc9925eeca4bc5c72773748c39546a5f6c58ffdafd4c5209ce06b95cd5449878b79a4282d52e905501fae260d097e6ae94
-MISC ChangeLog 3599 SHA256 7f1e1df840b8388bb06822c6b75134d20deb3240e7e22aac7bc371e58766e0df SHA512 c5b65157f010c56b7abb4bde40abfa074144a75096066d511cb1a0a7c4362b25c39a410619e9faff1f4051fefc0630aed9221a833e6ab00197b996744d470386 WHIRLPOOL c801370e99fe8942c6334eb19a02ab2499e51a1fab319f2d6289ac67afb83b11d009aebd397fc11e96090c4948a9e3008b0157966e357dc6a174f4b5ca4297b1
+EBUILD tt-rss-1.7.5.ebuild 2086 SHA256 d53cb8084a9145798450274991b8f1d562b56415f9bb5a001d4ad53a5da51a87 SHA512 e5a083a25b34d32f2549bab6eef06029fb56c5df5afe7796365f279d333b0fcd725819d92965b8cc21e0b6c1b113bcf6a71897f4ad224cbd8a7182477e71077c WHIRLPOOL 81e6484d284603e80bcda453eac23748cb024d8120305f4b88243331a7d49ff0d58bf94a22ebcf0ae3aa76a547f60fb3d326ff2d845af701d70efc5af3a7f245
+MISC ChangeLog 3994 SHA256 e2502390353098fbcf0cf3170ea03e989b69a373e756f03f3995552f799aeb37 SHA512 2f76d53f576870b8598b2480a1ebad789e528aec50f8307912eb8b6a26fc7632f62d53816c42a2ee94199e1cc9c5d8cf4ef27990e89798ffef53718f3d516af0 WHIRLPOOL f0a6b03610049b99943dee4c83ca98c552985843d304437abb05f3943797e5bf9629efcbf5c4957ed09910a6753acd7117710b5e916ced6548e6b922c0e3ac22
 MISC metadata.xml 414 SHA256 9017ba1e6e9991e9040af06cba80332850189d166362fbaec333fddb7c6038d7 SHA512 41088ea19b4ffda9e5540f3a824018e52faa0da91f724f2d61a3f7d341d4735d1e60f890433d1a8c3ae9a1e7739a1b53098cb0c700e668a7ac314d6360bf6dcc WHIRLPOOL 10291383206b356f07bb852fe5ca71724dd20f0ea57d5de841a1b7fb72477811adea6dbc806f5c28342605647f10a7d5de6ebf71aacb36f2c7cbd3880a7bac67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRS0zlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88THwP/iOFd3RCoaw1dPIroJTd9th2
-7hxuNViH1acXajUCNfq8ZirIgvoOKP0LW5wsaDnbvDZR3IyqSG4qdSzcmyIoQxBN
-qjLmISj8II9w2SPfudelJv0aoBEcNnTYI8ss+w3k9/hMuRHYoeCHDqT8zeG7SaKx
-Wp2QVlfW7d56yWH+65t4fhuIl9gS1HmGzWuOqHtsXa41gV7iaDth0ZSWhl6JzFyS
-KBvhPU7ATwfkjiv5LxkjWrwT9v8CiIP3R816KBFM5HsICGiwUhepDZ2LZF7ws67N
-Jr5Fc0EHnZQJXCUqY9EnZRNOGbGThqDQu5vBJNmSB3Mkfp1ghk7jADD+iTxsuDhQ
-oqY1zUWWyZO4c/zZjeqiWgGPoY0MaxMUt1/4FnwA4SmI2tNnUo9ExRdonWWeiu08
-JOviKTMqQPH148cXHnZOokUdld+7ew61SDe2AXEVO1qe3/hUxCCgPTW+TdUGprIs
-KUfuuzftACLiCvg7Lh4NBdvif1rf0BEVAbr4wf2MDvfx3XjeXBoG5xOr2NmqtNNO
-pvDaBHbT/jclJT2L5NI61/8ParqIsviA8+t6C3xOO5FhynprXRhhKzFySGr6X71H
-xQDL3swUlgol7fpnRVzcU/c2N1SPVPAC+gfnM1mZ3DOLlHt7kmEOPb9Qm3arZ1fA
-wlmtb9NbbSlaAmLsSOHx
-=7Dgs
+iQIcBAEBCAAGBQJRTtPiAAoJEOSiRoyO7jvokuEP+gN+4r15cEXwVL5hMOQN+MpW
+rWHgtYpv7H0UNT9+F4AARPwiQkelELFKkAK54CMjZ1GkDoND4qiSbMnwC3gU2KCK
+F5SfUIfOzQoYibXmaP+vGdC/KGBSrCN43s8WhHfujwoLIO5SbgBRq/bu6sLAaijC
+kiOC9m815DeJxTHxmel4XRoIOo4FtWG8C7fITQ6t3t+td6EnRui4g02GT2or7ayL
+lysMSWyLGqmysygHjip4JgjjIqfKQvEUclphY7QRG3khmrLI2mK6Rivzy6tJTibv
+BoP805PdQc1FzVmqQ8oUIVTcxd/JPMQvo6nsV99hWg02CQWKTlywIdjJVZ0FQQv4
+HyUOhj06tPQc6VOB8FGZKXqdVEGu+xuVP+eN7bJfWyf4zhbMhrRTUG+7WesTWs9X
+7vGiNxCGop+3FobVTN8V8hxFDbnFfD5dbpnB7nNwFzPdnBShzcclOL30SgsZgcvM
+sbWvNmT2Cm2v59EK8/FRtbsFpKmYHcAtphP35UTsKNCUGznLQqjZqfklyZQF0Bui
+mZXKVkQ0BkxRb+Ryf+TWMe8B5ShIdSK/BXu/DxZZQa1H8Vg/ajbreHJNehnD131w
+wciWjDlpSk7VIbTQkKe79nmqAW4dM7TFkoTjnTT3+rKxCdR8g71jhYutMI8J2GBF
+UOVEFnd0I87AlIebojJ0
+=ygZS
 -----END PGP SIGNATURE-----
diff --git a/www-apps/tt-rss/files/ttrssd.confd-r1 b/www-apps/tt-rss/files/ttrssd.confd-r1
new file mode 100644
index 000000000000..68a5603ba130
--- /dev/null
+++ b/www-apps/tt-rss/files/ttrssd.confd-r1
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# # Distributed under the terms of the GNU General Public License v2
+# # $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/files/ttrssd.confd-r1,v 1.1 2013/03/24 10:22:25 scarabeus Exp $
+
+# Path to TT-RSS instances which should have running update daemon.
+# EXAMPLE: INSTANCE_DIRS="/some/webhost/htdocs/tt-rss /some/otherwebhost/htdocs/newsreader"
+INSTANCE_DIRS=""
+
+# Path to log file. Remember to alter logrotate file if you change it here.
+LOGFILE="/var/log/ttrssd.log"
+
+# User and group which run the update daemon.
+# NOTE: you should really avoid running it as root.
+TTRSSD_USER="ttrssd"
+TTRSSD_GROUP="ttrssd"
diff --git a/www-apps/tt-rss/files/ttrssd.initd-r1 b/www-apps/tt-rss/files/ttrssd.initd-r1
new file mode 100644
index 000000000000..4038362165ed
--- /dev/null
+++ b/www-apps/tt-rss/files/ttrssd.initd-r1
@@ -0,0 +1,73 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/files/ttrssd.initd-r1,v 1.1 2013/03/24 10:22:25 scarabeus Exp $
+
+depend() {
+	need logger net
+	after postgres mysql
+}
+
+LOGFILE=${LOGFILE:-"/var/log/ttrssd.log"}
+TTRSSD_USER=${TTRSSD_USER:-"ttrssd"}
+TTRSSD_GROUP=${TTRSSD_GROUP:-"ttrssd"}
+INSTANCE_FOLDERS="cache cache/htmlpurifier cache/magpie cache/simplepie cache/images cache/export lock feed-icons"
+
+checkconfig() {
+	local instance dir
+
+	# check instances
+	if [ -z "${INSTANCE_DIRS}" ]; then
+		eerror "There is no defined instance directory in /etc/conf.d/ttrssd"
+		return 1
+	fi
+
+	# verify log file accessibility
+	if [ ! -e "${LOGFILE}" ]; then
+		touch "${LOGFILE}" || return 1
+	fi
+	chown "${TTRSSD_USER}":"${TTRSSD_GROUP}" "${LOGFILE}" || return 1
+
+	# check instances for errors
+	for instance in ${INSTANCE_DIRS}; do
+		if [ ! -f "${instance}/update_daemon2.php" ]; then
+			eerror "\"${instance}\" does not contain update_daemon2.php script."
+			eerror "Please check your installation or the INSTANCE_DIRS variable."
+			return 1
+		fi
+		
+		# FIXME: This should be done by webapp-config during install
+		for dir in ${INSTANCE_FOLDERS}; do
+			if [ -d "${instance}/${dir}" ]; then
+				chgrp -R "${TTRSSD_GROUP}" "${instance}/${dir}" || return 1
+				chmod -R g+w "${instance}/${dir}" || return 1
+			fi
+		done
+	done
+}
+
+start () {
+	local instance
+
+	checkconfig || return 1
+
+	for instance in ${INSTANCE_DIRS}; do
+		ebegin "Starting TT-RSS update daemon in \"${instance}\""
+		start-stop-daemon --start --user "${TTRSSD_USER}":"${TTRSSD_GROUP}" --background \
+			--stdout "${LOGFILE}" --stderr "${LOGFILE}" \
+			--exec /usr/bin/php -- -f "${instance}/update_daemon2.php"
+		eend $?
+	done
+}
+
+stop() {
+	local instance
+
+	for instance in ${INSTANCE_DIRS}; do
+		ebegin "Stopping TT-RSS update daemon in \"${instance}\""
+		start-stop-daemon --stop \
+			--exec /usr/bin/php -- -f "${instance}/update_daemon2.php"
+		eend $?
+		rm -f ${instance}/lock/*.lock
+	done
+}
diff --git a/www-apps/tt-rss/tt-rss-1.7.5.ebuild b/www-apps/tt-rss/tt-rss-1.7.5.ebuild
new file mode 100644
index 000000000000..900217c07489
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-1.7.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.7.5.ebuild,v 1.1 2013/03/24 10:22:25 scarabeus Exp $
+
+EAPI=5
+
+inherit eutils webapp depend.php depend.apache vcs-snapshot
+
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="http://tt-rss.org/"
+SRC_URI="https://github.com/gothfox/Tiny-Tiny-RSS/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="daemon +mysql postgres"
+
+DEPEND="
+	daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] )
+	!daemon? ( dev-lang/php[mysql?,postgres?,curl] )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use daemon; then
+			enewgroup ttrssd
+			enewuser ttrssd -1 /bin/sh /dev/null ttrssd
+	fi
+}
+
+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 -i \
+				-e "/define('DB_TYPE',/{s:pgsql:mysql:}" \
+				config.php || die
+	fi
+
+	sed -i \
+		-e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" \
+		config.php || die
+
+	# per 462578
+	epatch_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "/${MY_HTDOCSDIR}"
+	doins -r * || die "Could not copy the files to ${MY_HTDOCSDIR}."
+	keepdir "/${MY_HTDOCSDIR}"/feed-icons
+
+	for DIR in cache cache/simplepie cache/images cache/export lock feed-icons; do
+			webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}"
+	done
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	if use daemon; then
+			webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon.txt
+			newinitd "${FILESDIR}"/ttrssd.initd-r1 ttrssd
+			newconfd "${FILESDIR}"/ttrssd.confd-r1 ttrssd
+			insinto /etc/logrotate.d/
+			newins "${FILESDIR}"/ttrssd.logrotated ttrssd
+	else
+			webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	fi
+
+	webapp_src_install
+}