bump to 1.9, license update, fix init script (477708)

Package-Manager: portage-2.2.3/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC!

4 files changed, 176 insertions, 15 deletions

diff --git a/www-apps/tt-rss/ChangeLog b/www-apps/tt-rss/ChangeLog
index 6e3622b3c237..da03fdbec8bf 100644
--- a/www-apps/tt-rss/ChangeLog
+++ b/www-apps/tt-rss/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2013/08/08 13:41:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.27 2013/09/12 06:44:24 tomka Exp $
+
+*tt-rss-1.9 (12 Sep 2013)
+
+  12 Sep 2013; Thomas Kahle <tomka@gentoo.org> +files/ttrssd.initd-r2,
+  +tt-rss-1.9.ebuild:
+  bump to 1.9, license update, fix init script (477708)
 
   08 Aug 2013; Markos Chandras <hwoarang@gentoo.org>
   files/postinstall-en-with-daemon.txt, files/postinstall-en.txt:
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 2d8ad26e58be..a2c36f4d27c8 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -5,30 +5,23 @@ AUX postinstall-en-with-daemon.txt 717 SHA256 293295489050c5dc772630d591cbcbb682
 AUX postinstall-en.txt 330 SHA256 21e5793a75517fbc66787954c9ee3c47d57d913407dcb5db331fd7e4d4525b43 SHA512 13affa8082e89c108dcc96257c1f4cddfdbf795514d7f81dab38ec21415ab87c4c908aa55cd475b295afba6707c40b76ed3be81c8897aef88cbd509c6c45bf4f WHIRLPOOL 6412e30a3e5a18d8ef690c2b3ef49e175d7c660a459170d404d8fca2560275f6aa95e838bf865acf9993d6d9fce5607d96d1b9b93dda94f1e9ee2056053505df
 AUX ttrssd.confd-r1 653 SHA256 0ac166b3531731d070e14874d0a26de10adadf6f8014dd705434eddabc3d78d7 SHA512 1b744753eacb44353440a5e3ee2cca2b817ff76d5cb9a87cf0e190f3e67bc8940ce17541139cefeeab12563f5956255ff3153b919730f125cb84a37c460ff5fd WHIRLPOOL 0717f59424b5054ec7739ccdce540f3b9ddedcce8b4b63e396dbc1eab8fb77099d8a76c3c11370b2a359047ef90886cc1132c4185f03714f6b00dec63b94762a
 AUX ttrssd.initd-r1 2010 SHA256 ad11896f9cafa7b95697c48772c6edce7b4521a7c5db83a90e2a8f75861c871a SHA512 00cb141e55c3e7ea06bf7efcf7a5be84084bfa71318d1cae1eb55df50f692431202fb5778e31d45c593540dad786979a8ab7349a34406d44956d817a6ac9ee06 WHIRLPOOL 47ada7ba997260391bcf3fec219001dd768bdb45f36eab46dfbdea0dc8031622455bab65d3a98a265f6afe9a40fdf303b3a33d707794f50f396cb6e1596c0140
+AUX ttrssd.initd-r2 2360 SHA256 817b631b4ade7749e201062d97ef9570ae3b2317854f1792b7e72f8d3dd41bf8 SHA512 4ab56fd1b6b62b7bed302eb33bc9abaa60fc861016a2d8a5fa56cc14fe2fcc4b8e9d40df7530e955e0b87a6e90ad0da4a6e7f169bec4c1e62414dbc4b3e32178 WHIRLPOOL d564a53894ba4b0dce64d746708383a1b05770177edbc992eeca54bc728dcaf4190b7412e2b8c12304882dd2a1215938587eb2a421b683afee09f7c38de3fde7
 AUX ttrssd.logrotated 118 SHA256 51bfd5dc544d7fdbe90d2fea9874a0d6558d5533a1186c6fa2f797bea89342da SHA512 e56085ea83ec1f1c80edf253e315b7197f884972f6dea439958cdcf217c44592a9eac75cc96494136aaa5a8e1eae6304527ef2d144ba797716ca58ff16641019 WHIRLPOOL a5a841f269bd5b7597ff6aa51d6d7ca7c38b12f887a785670c304b4414d236a8b90c3ac8707f255425e1f4888ad8fa0bb2d199522cab947c4a74d6ba1577e7f6
 DIST tt-rss-1.7.8.tar.gz 2391937 SHA256 5e5a6d82a112eb48259b733207c18a718c338038c33ec8ffc87895d57e05f3cb SHA512 d18579128c337f7ecd2265b90e876de3eaa541291b7bdaf1244ada28438029cefeb1bfd8045d3de2b8d100e09185f89af04e1d9dbafd1f5e1e89a641ce783662 WHIRLPOOL f66423e12cb968b07b3c9bf15f2da8e06e054c1a3798260e2d0aee4d3f042996a86b52f65717a4ceaebeffc2b14109fafd9c05a08ffb7440a2f785d9a446465c
 DIST tt-rss-1.7.9.tar.gz 2321780 SHA256 972f0f8a1033f076093ad6ff6480a0c32166bddeec217c5176da19afd021e3ff SHA512 383e1542aa3c8e5387223ee321a0957c4597e9e9d9814017014b8647efecf350f483530165ecdb5268d35747a8f78a2f006108b3fe298a3de6f9cf423633927f WHIRLPOOL 37c1cec972cbe20f1ef376bbb8df1befa8f620f2e02214d5c75cdb28cd2bbf90ae148aaeca1e1802e25d53157feaa8cebbf9773bc752f39b16e4dbdfb9862b15
 DIST tt-rss-1.8.tar.gz 2339850 SHA256 5b12380938f1d465218d2c30e3996eccfae71e9e920d63c960a1e0e66b42738a SHA512 75fb5e78c78894e64990bc29c573ee4bdf8c8d0d2a9d35c5ee199148e21f6b6a15d907b9a78ddb55d9173a5bdd8e00ff0868ca4aa357535a5a5795c70c0bb205 WHIRLPOOL 7a2ec9461f6e603a45205629167773bb0e860a6d81ab40e11d418700d82c2ac0fdbe9681596b87a1cb3255cb19f0051bc92e2122981f79c8a45ea473c59aae10
+DIST tt-rss-1.9.tar.gz 2410978 SHA256 f2eb2141b09510b996bb88f129d184a455d6f1fc7fe1f3241811760a6323f455 SHA512 17f1326467c3fcc40504b95fca7bad9861d8de4823f416cffdd0a9c1428fc174dcb8882e3d619e5069760d45519be4064bb829fb3fa9f9b1dfb8d85174eef5ff WHIRLPOOL 83d8b7b61a5ff54a1b31f37b90a7050845600af58e7fcdbe407d5187c2216b3967633cd5b0ec4ae5dd76b3c002f556bc41dcf58dba94fb9a8cd2467ce3fe0cbe
 DIST ttrss-1.7.9-patches.tar.xz 22528 SHA256 ead35720dc4de6978a8f2d1c8572e00941d2bf969446e76b33ac10ee8f63341e SHA512 9c09012a7a9d1fba7c1465ca308d3ddc753f0b9192b05c1fa0afb9f5a0c68558f7f4d8a768b6386fa5a0e3855b388559255176c297a3b808eca66ced04658c10 WHIRLPOOL 2b45c901aed4b5c745ac5b5766f862ed4bc8f3e135a9e287dec1f5fcb5df629d86cd14744d065b6970da2b5514955238169bca87645945cbe653827b430ce09c
 EBUILD tt-rss-1.7.8.ebuild 2049 SHA256 5d4fd08fa53ab2d87790701b085242220a12a4e350c07f6e79f5a77c624557fa SHA512 c805ab2a4434fabeb26c4b37b2dddfe540f20cb659296e84e10d4b2aea7f0c5bdd2f98e08163f34e35212203536a72ee7b3ba9d20e258bfc81503eb5a7d2c31f WHIRLPOOL c62b904176dc30b8c9117ffb86db6179f98ed6fb4c574a5522c4d700ca09f987b84a535d1ceb7d698a7087ed069ab837a51e017d8a9d7a44a66077b81d2b0db2
 EBUILD tt-rss-1.7.9-r1.ebuild 2242 SHA256 b0ddca35c494decab732d9d165890d1fc8597e3b09d1c6763fcd7eda67565542 SHA512 12e36e9b251ad3d2761dd14e085f1ecc7a1ad283ffbd42897f6ace8d37d2c0a90e5b52aed37ab0369331e9fcf3898988227439bc7a7707c0db4958a967574411 WHIRLPOOL 75322fe8da2c1cc11c85ff81d8b1cb1eabe9bf6b37c7b919e8f08d5086975a6ce0942c9ae0a3d31e26ccb8f76204412c3748540e0ba91b40d6de9d8248b05b0c
 EBUILD tt-rss-1.8.ebuild 1993 SHA256 c9abbb1e08bf583e37c33219bf3b63720c22dd9ed32d7713c90bf519030ba437 SHA512 13958433b71fcd6890888c0f0f1048f214138c1329ff311822ae785b26701ab45a994d5552dfc460881a29c8122f085f3cb338c92cd6a98b0f1ec3c485ce06f9 WHIRLPOOL 339a809acad5d88bc199dd0876dfacdc3b7b4bce60c09de727816ee6d663ccba219e1960af435b3b36b30e34b9eb052a3cdf9b02186c6d35221578e843199f6a
-MISC ChangeLog 5012 SHA256 50f021004b1c6804b28fa3c18b070232aa15ef1d9e60bb86b31bffd7a83a4afb SHA512 c927d203d5dc4534c603067827917dae4a9cadac6847e9214f1390793012b81bec39f608f8321ca78ec89c2cd560706dd330c0a99ef485fd084c7e527ad91513 WHIRLPOOL 4d1dff319e5ba273b516e749cda25b0d22401b4bfe4f33b160702d0fb1d6f589fa18c1fb7c8155476597a75912f3b95d51daba69efcec35574eaf962cc0d506d
+EBUILD tt-rss-1.9.ebuild 1989 SHA256 a307afc660fa79591c3a459c0a2cc8d5c44bf30e9d0380e353d753c6f4299de8 SHA512 8a28e55c282dddabef43421b63294a926a5104eeb0b3c74da4c026c6194c38707517e5c55b130d5c8198aba43e4c04faa542a002c90811f45f794b295bce07eb WHIRLPOOL 504aa163573cd8a1c8873240abe9eca2473928dde2e302e7a7805b741d8e4cf41864f0bd3c6fd6ac4719b64f5f3777dd9e305b9fedb7a56e03d1562ddf8a64a3
+MISC ChangeLog 5186 SHA256 e80d95790edce329e434a513e9664c8117f21b8dced6af013e5ae09cf44fb869 SHA512 53cf9f2cf3ac9c6c30647d17c0bb6f18d1d2d09f60d87fd94a34561ccd1bcddf6f5d95c05c6ac07ff7db17d29ece04a92cd717025b58474138d87583ee16ca5d WHIRLPOOL fcd442af483cfc366a9dddcab720015b95167b5080dcc561997e9095c2cfde439cb2aec7ee08c8b966617459de0c7200ee1c1621b88d0f5268ca6fcef61751b6
 MISC metadata.xml 414 SHA256 9017ba1e6e9991e9040af06cba80332850189d166362fbaec333fddb7c6038d7 SHA512 41088ea19b4ffda9e5540f3a824018e52faa0da91f724f2d61a3f7d341d4735d1e60f890433d1a8c3ae9a1e7739a1b53098cb0c700e668a7ac314d6360bf6dcc WHIRLPOOL 10291383206b356f07bb852fe5ca71724dd20f0ea57d5de841a1b7fb72477811adea6dbc806f5c28342605647f10a7d5de6ebf71aacb36f2c7cbd3880a7bac67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSA6ALAAoJEPqDWhW0r/LCrMgP/1XnGcm3N0+PxM7yMr2yUa1H
-wkTYbi0G8MOgcukc1qSC1rQyC1UcPTIGGm+FSEhDQCRqxAxC1ERIxZY06JcXEuVz
-M9eYsWu4DbCkwAB13qVmnS9RzyJl4D1eGeHfbfO075U+CdzaeWGHQK34wF62/hEy
-jfGLpALnj/enoJeB8c+aQ4AdxbsK+h26v3Bsjrklgl9EHui/ra6tmIBrpQxS0kYs
-FV6j+Gm1v9D/QQkvkEbDAdAjpKGftFpZD0+098LaoXzgulcU+WS2wdocCYiNdt7i
-b2Ur1QHMlfKuxV1thcyc87bqVbqKI/VDr+I44PT45mbPkWXmC2/r6V5sLa19YutA
-qqff+bH4vpmOeXMr6fxqz4KfPbnxiDIXo9sDZ/0stvXP4JMJkNXTLlLE876VyVa3
-/2PLpg+uZDgr6K6BQDJrD6CXdyXho4aTsCIVyBaUNCGIVcLIpYGKLNrIZcTkI5oW
-5/wM+9sU9+xn9qza3aRS+nfTv9w4SoF9Ttu4Uqaq/DRH5ijivBSMGdWEZ8YQssIi
-CwL2z5kTyn/jzKpNNIivDTtlSFZpxjQVEOvDLVQAcdZ+OLl0lFBSas6iEEppNd1R
-u3es0gCrc19/I6Udrj3vL+JoiNulHKkZCi+F616lA1kmJuqc5BvsG/jHFfe3mbBT
-1sVULY/mNEjmEow5hdBv
-=habG
+iF4EAREIAAYFAlIxYuQACgkQid6yGVZcMrxglwEAmiCSoNroad4pm6sQZKbBNPT4
+S+qu8LsOlbEtvnSGK4oBANGt5PIlJW/qdQpz7CtUuldZczCT/6om5bVfZW3Z15ry
+=ChTm
 -----END PGP SIGNATURE-----
diff --git a/www-apps/tt-rss/files/ttrssd.initd-r2 b/www-apps/tt-rss/files/ttrssd.initd-r2
new file mode 100644
index 000000000000..6464b2987261
--- /dev/null
+++ b/www-apps/tt-rss/files/ttrssd.initd-r2
@@ -0,0 +1,83 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 lock feed-icons"
+BASE_PID="/run/ttrssd"
+
+checkconfig() {
+	local instance instancepidname 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
+
+	mkdir -p "${BASE_PID}"
+
+	# check instances for errors
+	for instance in ${INSTANCE_DIRS}; do
+		instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g')
+
+		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
+				chown -R "apache:${TTRSSD_GROUP}" "${instance}/${dir}" || return 1
+				chmod -R g+w "${instance}/${dir}" || return 1
+			fi
+		done
+	done
+}
+
+start () {
+	local instance instancepidname
+
+	checkconfig || return 1
+
+	for instance in ${INSTANCE_DIRS}; do
+		instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g')
+		mypid="${BASE_PID}/${instancepidname}"
+		ebegin "Starting TT-RSS update daemon in \"${instance}\""
+		start-stop-daemon --start --user "${TTRSSD_USER}":"${TTRSSD_GROUP}" --background \
+			--stdout "${LOGFILE}" --stderr "${LOGFILE}" \
+			--make-pidfile --pidfile "${mypid}" \
+			--exec /usr/bin/php -- -f "${instance}/update_daemon2.php"
+		eend $?
+	done
+}
+
+stop() {
+	local instance instancepidname
+
+	for instance in ${INSTANCE_DIRS}; do
+		instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g')
+		mypid="${BASE_PID}/${instancepidname}"
+		ebegin "Stopping TT-RSS update daemon in \"${instance}\""
+		start-stop-daemon --stop \
+			--pidfile "${mypid}" \
+			--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.9.ebuild b/www-apps/tt-rss/tt-rss-1.9.ebuild
new file mode 100644
index 000000000000..61adbc25cd12
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-1.9.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.9.ebuild,v 1.1 2013/09/12 06:44:24 tomka Exp $
+
+EAPI=5
+
+inherit user 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-3"
+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 *
+	keepdir "/${MY_HTDOCSDIR}"/feed-icons
+
+	for DIR in cache 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-r2 ttrssd
+			newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
+			insinto /etc/logrotate.d/
+			newins "${FILESDIR}"/ttrssd.logrotated ttrssd
+	else
+			webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	fi
+
+	webapp_src_install
+}