[patch] 1.7.0 ebuild and changes to other files

tt-rss-1.7.0.patch (text/plain), 4.80 KB, created by Patrick on 2013-02-17 13:47:05 UTC

diff -Nur tt-rss/files/postinstall-en-with-daemon.txt /tmp/tt-rss/files/postinstall-en-with-daemon.txt
--- tt-rss/files/postinstall-en-with-daemon.txt 2011-12-04 10:53:46.000000000 +0000
+++ /tmp/tt-rss/files/postinstall-en-with-daemon.txt    2013-02-17 13:29:51.000000000 +0000
@@ -13,6 +13,7 @@
   rc-update add ttrssd default
 
 
-Note on update from 1.5.6 or earlier: The directory containing the
-feed icons has been renamed from 'icons' to 'feed-icons'. Please
-move your *.ico files over, and then remove the old 'icons' dir.
+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 -Nur tt-rss/files/postinstall-en.txt /tmp/tt-rss/files/postinstall-en.txt
--- tt-rss/files/postinstall-en.txt     2011-12-04 10:53:46.000000000 +0000
+++ /tmp/tt-rss/files/postinstall-en.txt        2013-02-17 13:29:43.000000000 +0000
@@ -1,5 +1,6 @@
 Please read http://tt-rss.org/trac/wiki/InstallationNotes
 
-Note on update from 1.5.6 or earlier: The directory containing the
-feed icons has been renamed from 'icons' to 'feed-icons'. Please
-move your *.ico files over, and then remove the old 'icons' dir.
+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 -Nur tt-rss/files/ttrssd.initd /tmp/tt-rss/files/ttrssd.initd
--- tt-rss/files/ttrssd.initd   2012-02-03 23:01:28.000000000 +0000
+++ /tmp/tt-rss/files/ttrssd.initd      2013-02-17 12:46:00.000000000 +0000
@@ -37,7 +37,8 @@
        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"
+               start-stop-daemon --stop -x /usr/bin/php "${INSTANCE_DIR}/update_daemon2.php" && \
+                 rm -f ${INSTANCE_DIR}/lock/*.lock
        done
        eend $?
 }
diff -Nur tt-rss/tt-rss-1.7.0.ebuild /tmp/tt-rss/tt-rss-1.7.0.ebuild
--- tt-rss/tt-rss-1.7.0.ebuild  1970-01-01 00:00:00.000000000 +0000
+++ /tmp/tt-rss/tt-rss-1.7.0.ebuild     2013-02-17 12:46:00.000000000 +0000
@@ -0,0 +1,74 @@
+# 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.1 2013/02/06 19:55:16 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"
+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/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
+}