# HG changeset patch # User Da Risk # Date 1372884539 -7200 # Node ID 5ffae0914566c5f41f0d60842d0ecbe4a475da97 # Parent e54c398cbaa55ac23d4a2b14859972cfa919372c Remove tt-rss diff -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/Manifest --- a/www-apps/tt-rss/Manifest Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -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 tinyrss-update.confd 83 SHA256 904d1aad35fd684b992a8b3fe649a097152cd24396c7cb1d3e1205f4005e0ecc SHA512 612f6084b3c513349250233045f06eca17af3827343d7e0c165bcbbee224a33348845a20ba556beac16651a6a6480776f4d4fb5bdac0dbb6cf6a9ef0a4ef0b3d WHIRLPOOL e6f884c8c25f2c458ac58074b8d84c13ff348f0a4cedb918b70cfca2df8880ce07d68d8e155af58c0439650f67312fd8cf2cefa24a2766f71c16b8528f6af149 -AUX tinyrss-update.initd 534 SHA256 10b4c4d5153e9d52dcefb90c5b9c2366e567e272925358ef50ef011ce0a77f68 SHA512 1fa33eedcc3b264e9360f673ef954ed9d2a3d283ee0763534c9f82d85769f624cce7af00d09cdaee3ddb09a6d5857ac41154f3f95dd3a2f495acdccdb1bf1eb6 WHIRLPOOL 6213e57aac6b446a89b2c9d772a6559bb01651441e44feedb8af845fdc27a4d8a82b586ddc50028db67d3d88a59c5ad7f288565971def94a199989e6bf69c670 -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.4.tar.gz 3155187 SHA256 1fa4b937d094723f9f0eb9cbfe9df2f12f01acbb6beca435555c36ac9ca014ae -DIST tt-rss-1.7.6.tar.gz 2390534 SHA256 74962146b61be3ad5f156fa64b501a703241ce85c4d87a58b2baa1815685d3b2 SHA512 e19e08a9181b8b2ab5da5042850d36bc6d39cf1aef59cefb4354cba5d28b09f3fb27c5eafdfb8c177ba5ae14b2616b49a10cd46049aa63879b108bf271565ca2 WHIRLPOOL 5d46a36bac473578f2d2bced1231634868bb0a0256f46b2bf810d294475e5645cb42515a727d692286de86a25c3550e182cbc4ce07ee91a146e7ecb46b0de683 -EBUILD tt-rss-1.5.4.ebuild 1607 SHA256 e8db5a1c26cfb580d14182fb271612080105c393b88000b6afadfd60a9e8c6b9 SHA512 2518a42feeb7859ce581715647c967364b8ae3454dd964b4e0098c6210250b04601349798244269e0885daa8cbde3bf7cd25478e708257efe78e69cf441ae25a WHIRLPOOL 0aeaa12f6676bc7c3e2108d55d9a230e9c4df510fd66fd6fdc5e8aea78f481ebca7c3df9fddbfd4b1270bcfcb2d81ae98b0e8d45864edbda62dcf05aab07c20f -EBUILD tt-rss-1.7.6.ebuild 2091 SHA256 59ace9063db47ebcbd01e0f1c62a8d2891ab5c306ccd7199eba859a85404092f SHA512 a62da13fdf192c1b70d4ef36c4de5410ee355ddc748e945510a768e4afba953e99df466e633fbaae56e0433ef09e3f1906b358cabf0bbea8b209defdbff49580 WHIRLPOOL 02ae10f6347cb2aaf174adbe78499fbc6ad07943df4a2aa0db857cf65cc6b046094df3f1b9110ee3ecfb5cecac1121f9faa1378a430b3d418d8fb470cbcc5a56 diff -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/files/postinstall-en-with-daemon.txt --- a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -Please read http://tt-rss.org/redmine/wiki/tt-rss/InstallationNotes - -Once you have configured TT-RSS, put the path to this instance into -the INSTANCE_DIRS variable in /etc/conf.d/ttrssd. Make sure that -the ttrssd user can access the path, and then start the update daemon -with - - /etc/init.d/ttrssd start - -to get your feeds updated. Add the daemon to your default runlevel, -so that it gets launched after a system restart: - - rc-update add ttrssd default - - -With the update to 1.7.0 the 'magpie' RSS parser has been removed. -That means TT-RSS will use the 'simplepie' parser. If you have been -using 'magpie' so far, the switch might cause lots of duplicate -articles - it's a one-time thing for each instance. diff -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/files/postinstall-en.txt --- a/www-apps/tt-rss/files/postinstall-en.txt Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -Please read http://tt-rss.org/trac/wiki/InstallationNotes - -With the update to 1.7.0 the 'magpie' RSS parser has been removed. -That means TT-RSS will use the 'simplepie' parser. If you have been -using 'magpie' so far, the switch might cause lots of duplicate -articles - it's a one-time thing for each instance. diff -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/files/tinyrss-update.confd --- a/www-apps/tt-rss/files/tinyrss-update.confd Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -TTRSS_PATH="/var/www/tinyrss.elyzion.net/htdocs" -TTRSS_DAEMON="update_daemon.php" - diff -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/files/tinyrss-update.initd --- a/www-apps/tt-rss/files/tinyrss-update.initd Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -PIDFILE="/var/run/tinyrss.pid" - -depend() { - need net -} - -start() { - ebegin "Starting tinyrss update daemon" - start-stop-daemon --start --make-pidfile --background -c apache --pidfile "$PIDFILE" --chdir "$TTRSS_PATH" --exec /usr/bin/php -- \ - "$TTRSS_PATH/$TTRSS_DAEMON" - eend $? -} - -stop() { - ebegin "Stopping tinyrss update daemon" - start-stop-daemon --quiet --stop --pidfile $PIDFILE - eend $? - -} diff -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/files/ttrssd.confd --- a/www-apps/tt-rss/files/ttrssd.confd Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/files/ttrssd.confd-r1 --- a/www-apps/tt-rss/files/ttrssd.confd-r1 Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +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/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 -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/files/ttrssd.initd --- a/www-apps/tt-rss/files/ttrssd.initd Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/files/ttrssd.initd-r1 --- a/www-apps/tt-rss/files/ttrssd.initd-r1 Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -#!/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 -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/files/ttrssd.logrotated --- a/www-apps/tt-rss/files/ttrssd.logrotated Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -/var/log/ttrssd.log { - daily - missingok - notifempty - postrotate - /etc/init.d/ttrssd restart > /dev/null - endscript -} diff -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/tt-rss-1.5.4.ebuild --- a/www-apps/tt-rss/tt-rss-1.5.4.ebuild Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -# 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 -} diff -r e54c398cbaa5 -r 5ffae0914566 www-apps/tt-rss/tt-rss-1.7.6.ebuild --- a/www-apps/tt-rss/tt-rss-1.7.6.ebuild Wed Jul 03 22:46:38 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +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.7.5.ebuild,v 1.2 2013/03/24 10:23:19 scarabeus 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-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 -}