Version bump to 1.7.8 wrt bug#464558 fixing also subdir ownership issues. Patch provided by Patrick Nagel.

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

6 files changed, 20 insertions, 146 deletions

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 47327f520c20..9ded153b1435 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -3,33 +3,29 @@ 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.initd-r1 1999 SHA256 063b461047901a34d594fb2ce7a32ae2fbf57f4c26595fc8a97e777a4da69131 SHA512 39bf6100cb1f4389c2c609d5ab8a4c460e55a990d573467aca643d39c006a113488a6ad309028f367163dd2ff1e89a66c23b335de111e7c312aaf34fa68e58ad WHIRLPOOL 74ca2508738a0311f0bcda8d988fef8b7ec87181a1248c4a995faf5f3e8a09256b71752dab028b09fb4fb651d9c87baf2e43216a412ae60beaf6ef1462810cf0
 AUX ttrssd.logrotated 118 SHA256 51bfd5dc544d7fdbe90d2fea9874a0d6558d5533a1186c6fa2f797bea89342da SHA512 e56085ea83ec1f1c80edf253e315b7197f884972f6dea439958cdcf217c44592a9eac75cc96494136aaa5a8e1eae6304527ef2d144ba797716ca58ff16641019 WHIRLPOOL a5a841f269bd5b7597ff6aa51d6d7ca7c38b12f887a785670c304b4414d236a8b90c3ac8707f255425e1f4888ad8fa0bb2d199522cab947c4a74d6ba1577e7f6
-DIST tt-rss-1.6.2.tar.gz 2078889 SHA256 d4935787a59cebc81d1958e573485875d3a81178d3eef5edb9609d2276e78d07 SHA512 5a0da580b67f8fafd88589b782652425534a006221d35b207a5b42f2e8f450a283572373b8b72f5c5031e4bd00005c8cc7e2cd7a2f1210d96a2486896fa50375 WHIRLPOOL 3339c8e0fe21829e12c46b3d599ffaa2d2306b24465f50c740d1d41274d98879297d6e555c3634fe6ea3c477be3033289404abadc66d1de5eb5e7391813f5d2a
-DIST tt-rss-1.7.5.tar.gz 3485455 SHA256 ea85e0cd1760b7f4f5d4080da70352f56e1f8d958175af3e3fc9f392aa60806f SHA512 07fc9eae6965fb19133c214cc8b3aacaf6742197415a9fd030f1c1720bbefce102d8089ac0d823a24bf631afe74347f0d69a1ca67ff7bc89edc57d1c30635d1f WHIRLPOOL ba33381c3b21d374074932330b97b12b854432642ce2af57c97b4c64cfa0cbe91b05980815af57577086b7b54b92594292a9e6e437c669ab32fdad07c0abb464
 DIST tt-rss-1.7.6.tar.gz 2390534 SHA256 74962146b61be3ad5f156fa64b501a703241ce85c4d87a58b2baa1815685d3b2 SHA512 e19e08a9181b8b2ab5da5042850d36bc6d39cf1aef59cefb4354cba5d28b09f3fb27c5eafdfb8c177ba5ae14b2616b49a10cd46049aa63879b108bf271565ca2 WHIRLPOOL 5d46a36bac473578f2d2bced1231634868bb0a0256f46b2bf810d294475e5645cb42515a727d692286de86a25c3550e182cbc4ce07ee91a146e7ecb46b0de683
-EBUILD tt-rss-1.6.2.ebuild 2138 SHA256 42583f01ae3432d3879df9c552b10bb47edc8c74154c0c977ef5319ac45b6c78 SHA512 d277b3d38891fd28c3c658dc46b9a322547ef8d05d87aab7bf3115a5555e89645d11328257f8e3f5693a4fdfc1aef1f0ac097d5f6d2c4003ceca88fb8cb19984 WHIRLPOOL 00fad70dba15cec06dd7f8e2701d456ad442216847354f88d50d557bcbce0adbbcafdb88d72eee46ec59dead7f1c1ec7e118da3389c47d0e5d4eebae9953e1ce
-EBUILD tt-rss-1.7.5.ebuild 2091 SHA256 59ace9063db47ebcbd01e0f1c62a8d2891ab5c306ccd7199eba859a85404092f SHA512 a62da13fdf192c1b70d4ef36c4de5410ee355ddc748e945510a768e4afba953e99df466e633fbaae56e0433ef09e3f1906b358cabf0bbea8b209defdbff49580 WHIRLPOOL 02ae10f6347cb2aaf174adbe78499fbc6ad07943df4a2aa0db857cf65cc6b046094df3f1b9110ee3ecfb5cecac1121f9faa1378a430b3d418d8fb470cbcc5a56
+DIST tt-rss-1.7.8.tar.gz 2391937 SHA256 5e5a6d82a112eb48259b733207c18a718c338038c33ec8ffc87895d57e05f3cb SHA512 d18579128c337f7ecd2265b90e876de3eaa541291b7bdaf1244ada28438029cefeb1bfd8045d3de2b8d100e09185f89af04e1d9dbafd1f5e1e89a641ce783662 WHIRLPOOL f66423e12cb968b07b3c9bf15f2da8e06e054c1a3798260e2d0aee4d3f042996a86b52f65717a4ceaebeffc2b14109fafd9c05a08ffb7440a2f785d9a446465c
 EBUILD tt-rss-1.7.6.ebuild 2091 SHA256 774fdda2d346af25a6f2d03ca1bde1fcd97893243f326c319591d92c9256d917 SHA512 979d2a2e18772ebfd8425f23abe46576a6f0a0869f27f61019caad34504b625afb9d28b58125849d6721361c3c96bc242172c68d0fbeb33698e1c5e0c342e1d0 WHIRLPOOL dad0522b1afdec82807b78620d5c73d515141fc382fb976b8a895a21fc4387ffbaa851abf2396a4a59789f2b2ccefce01b6bd85ab811823f915db400176979b6
+EBUILD tt-rss-1.7.8.ebuild 2049 SHA256 5d4fd08fa53ab2d87790701b085242220a12a4e350c07f6e79f5a77c624557fa SHA512 c805ab2a4434fabeb26c4b37b2dddfe540f20cb659296e84e10d4b2aea7f0c5bdd2f98e08163f34e35212203536a72ee7b3ba9d20e258bfc81503eb5a7d2c31f WHIRLPOOL c62b904176dc30b8c9117ffb86db6179f98ed6fb4c574a5522c4d700ca09f987b84a535d1ceb7d698a7087ed069ab837a51e017d8a9d7a44a66077b81d2b0db2
 MISC ChangeLog 4371 SHA256 d21f2c27ced3c93e06c374fd4acb94c51745c65129595a66314cfffab0fe8c02 SHA512 b3efa390d3f376324528cb9060a5735594e85444f3be81b41fdd06023ee24de2e009af82263aee8ec894c88b3d87c3ae49a4e7698eb12116474ac774ad0bb79c WHIRLPOOL a7cd42ca59390f4facf2a184e678005a2480a2b715374176c59edd62ecf77c666d4e0803a6d838c1930aee55bdd5d9c199c166701cf06f58f697e72d99604130
 MISC metadata.xml 414 SHA256 9017ba1e6e9991e9040af06cba80332850189d166362fbaec333fddb7c6038d7 SHA512 41088ea19b4ffda9e5540f3a824018e52faa0da91f724f2d61a3f7d341d4735d1e60f890433d1a8c3ae9a1e7739a1b53098cb0c700e668a7ac314d6360bf6dcc WHIRLPOOL 10291383206b356f07bb852fe5ca71724dd20f0ea57d5de841a1b7fb72477811adea6dbc806f5c28342605647f10a7d5de6ebf71aacb36f2c7cbd3880a7bac67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRW+aiAAoJEOSiRoyO7jvo924P/2ohk0bnsuFw/P29OHPPpqpW
-pZtChcUpSN4T6e64MCLdnXV/yTb5o4zHtZ+e84yVSJPV8wnUN/dMdEQEfoIhsK0F
-EGYVXcI3KLIG2nPnqgmNR64tukLdnRk2N2wlDsU5KgyiWVzEDL72iiWqMLbW8KOY
-+12Td562B7LoyPSJ7MXqakh1UlOewFJn3SSkFR4l/s7HAK5JSeOxwpp4LG9/Cjlf
-ZXFnwKTCIGMiU6bk5U+PXHPh4MbFhxRJZBlNHZwp4QP8RD8rcF9rhIGi9XlQ20Ud
-2JsJtOCAzKatKWkgMECqQCiwTYfsQinhBSKUP8GRxpNQpW4NlJ85U/lXAq/rWP6O
-c4GQAiHEwbn39le8LdDuiyVaVUG2BR5j3pR2Q0Rmn9Dmo4nVXavPN/1LOHHy2JVF
-WFgoX0zCCdT1juZEa0+Wg7PTaNrU6gRAB/eNbgGP3LSdh+iAaDopd26cieZ+U2/4
-fHxmrpPumGdlN5mAxeVrdIkSS74pocnHExXD30HBWysqu2KQ5Lfy980WdNZK3rAE
-AchNJ109qT3QB+hDLuH+PxmX2LnpsUynuUIMa7gxFupP58SGlcS3o8aNO0KDnXPe
-6QGlLkEOug03LGbkuISrtNWF6VT1A8liGqfoj72p6HR+2jIYIPZIdd7uuMsyPjA7
-/Z6wPDnkVCAei8dJC+y7
-=lNyW
+iQIcBAEBCAAGBQJRX9GFAAoJEOSiRoyO7jvoeoUP/3Ja1bVpmzHiQ1rm2wjW1Kil
+oG2kUOJcdHE278qyoRmUjCjU/IWu/euORTPMUSbuGXiWu1gao8933lobkMFfEueD
+4xNfsDNUy3GjjMU2xqF/pZEOrz3E3U4SKj8m6W+uavZK62L5a2DfVsBKF5Bxw2fK
+ICCKw0APJlE5dObwb9NJCL+r9AvvvUhyNc/anCBcEZu7K9vsL5XcCHRsQJD0jvtP
+nJo0Yw5gtvQhyRApQgLjpYeQgsxfXuPF7kOWHOtglDUabDawvbwnmUTVEqadMg7P
+YBPaMLH8Dd/x5Ugq/YDOCEvnhNo4be02jAtEaG6EeSVyLG0tPtviRzqHASqMVIhv
+Fg5iBAAnB5m4bz18zlzvtzWgkrioySD8BA39YhZ3/YtJXm6IGCJDM1enLd1RJMC2
+/fqkY2SIl6wb42zXa+Peo5hkQ30CH6h5UNoJHmB+G1rSsLsAxHogGOcl036Kt/sl
+cMPFxvp4gl3kqLWM2izEmJSs506Moo9a9X/d06AnXr6+ViAMi6jlXkDyWoGnciWm
+EFdB/6LAL6IXRXCR958LHiyk8rTNhhCbU0pJCdg5UiF7evq90CdzIArsgUqLg3UG
+TPfZ4350qcE7rrEp9ZHDSv99gLLx5DNmMw4B4evM+gW4Ju7GQpWgh1C5qcFDSO76
+wMF47bJ9qWiKVEIzHMpN
+=bp54
 -----END PGP SIGNATURE-----
diff --git a/www-apps/tt-rss/files/ttrssd.confd b/www-apps/tt-rss/files/ttrssd.confd
deleted file mode 100644
index 20e11660a1d3..000000000000
--- a/www-apps/tt-rss/files/ttrssd.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# List paths to your TT-RSS instances to start their update daemons
-# Example: INSTANCE_DIRS="/some/webhost/htdocs/tt-rss /some/otherwebhost/htdocs/newsreader"
-INSTANCE_DIRS=""
diff --git a/www-apps/tt-rss/files/ttrssd.initd b/www-apps/tt-rss/files/ttrssd.initd
deleted file mode 100644
index bc7fea847f98..000000000000
--- a/www-apps/tt-rss/files/ttrssd.initd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/runscript
-
-LOGFILE=/var/log/ttrssd.log
-
-depend() {
-	need logger net
-}
-
-start () {
-	ebegin "Starting TT-RSS update daemon(s)"
-	[ -z "${INSTANCE_DIRS}" ] && { echo "No instance directories specified in /etc/conf.d/ttrssd."; exit 1; }
-
-	# Make sure the log file can be written to
-	touch ${LOGFILE} && chown ttrssd ${LOGFILE}
-
-	for INSTANCE_DIR in ${INSTANCE_DIRS}; do
-		[ -f "${INSTANCE_DIR}/update_daemon2.php" ] || continue
-		einfo "  ${INSTANCE_DIR}"
-
-		# Since I have no idea how I could do this during the webapp-config installation,
-		# lets do it during start up...
-		for DIR in cache cache/htmlpurifier cache/magpie cache/simplepie cache/images cache/export lock feed-icons; do
-			[ -d "${INSTANCE_DIR}/${DIR}" ] && chgrp ttrssd "${INSTANCE_DIR}/${DIR}"
-			[ -d "${INSTANCE_DIR}/${DIR}" ] && chmod g+w "${INSTANCE_DIR}/${DIR}"
-		done
-
-		# Finally run the PHP script
-		start-stop-daemon --start -u ttrssd:ttrssd -b \
-		                  -1 /var/log/ttrssd.log -2 /var/log/ttrssd.log \
-		                  -x /usr/bin/php "${INSTANCE_DIR}/update_daemon2.php"
-	done
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping TT-RSS update daemon(s)"
-	for INSTANCE_DIR in ${INSTANCE_DIRS}; do
-		[ -f "${INSTANCE_DIR}/update_daemon2.php" ] || continue
-		einfo "  ${INSTANCE_DIR}"
-		start-stop-daemon --stop -x /usr/bin/php \
-			"${INSTANCE_DIR}/update_daemon2.php" && \
-			rm -f ${INSTANCE_DIR}/lock/*.lock
-	done
-	eend $?
-}
diff --git a/www-apps/tt-rss/files/ttrssd.initd-r1 b/www-apps/tt-rss/files/ttrssd.initd-r1
index 4038362165ed..c2b23b0a55d4 100644
--- a/www-apps/tt-rss/files/ttrssd.initd-r1
+++ b/www-apps/tt-rss/files/ttrssd.initd-r1
@@ -1,7 +1,7 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/files/ttrssd.initd-r1,v 1.2 2013/04/06 07:40:52 scarabeus Exp $
 
 depend() {
 	need logger net
@@ -11,7 +11,7 @@ depend() {
 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"
+INSTANCE_FOLDERS="cache lock feed-icons"
 
 checkconfig() {
 	local instance dir
diff --git a/www-apps/tt-rss/tt-rss-1.6.2.ebuild b/www-apps/tt-rss/tt-rss-1.6.2.ebuild
deleted file mode 100644
index 32da31774e43..000000000000
--- a/www-apps/tt-rss/tt-rss-1.6.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.6.2.ebuild,v 1.2 2013/03/09 10:15:17 hwoarang Exp $
-
-EAPI="2"
-
-inherit eutils 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 ~x86"
-IUSE="daemon mysql postgres"
-
-DEPEND=" daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] )
-	!daemon? ( dev-lang/php[mysql?,postgres?,curl] )"
-RDEPEND="${DEPEND}"
-
-need_httpd_cgi
-need_php_httpd
-use daemon && need_php_cli
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	use mysql && require_php_with_use mysql
-	use postgres && require_php_with_use postgres
-
-	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 -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"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "/${MY_HTDOCSDIR}"
-	doins -r * || die "Could not copy the files to ${MY_HTDOCSDIR}."
-	keepdir "/${MY_HTDOCSDIR}"/feed-icons
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ttrssd.logrotated ttrssd || die "Installing ttrssd logrotate config failed."
-
-	for DIR in cache cache/magpie cache/simplepie cache/images cache/export lock feed-icons; do
-		webapp_serverowned "${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 ttrssd
-		newconfd "${FILESDIR}"/ttrssd.confd ttrssd
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	fi
-
-	webapp_src_install
-}
diff --git a/www-apps/tt-rss/tt-rss-1.7.5.ebuild b/www-apps/tt-rss/tt-rss-1.7.8.ebuild
index f34b7b938f75..cf9cb65d1ef8 100644
--- a/www-apps/tt-rss/tt-rss-1.7.5.ebuild
+++ b/www-apps/tt-rss/tt-rss-1.7.8.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2013/03/24 10:23:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.7.8.ebuild,v 1.1 2013/04/06 07:40:52 scarabeus Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@ src_install() {
 	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
+	for DIR in cache lock feed-icons; do
 			webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}"
 	done