Version bump. Remove old. Bug #457964. Thanks to Patrick <mail@patrick-nagel.net>

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)

8 files changed, 95 insertions, 230 deletions

diff --git a/www-apps/tt-rss/ChangeLog b/www-apps/tt-rss/ChangeLog
index eab4b9f95b79..8884090b3687 100644
--- a/www-apps/tt-rss/ChangeLog
+++ b/www-apps/tt-rss/ChangeLog
@@ -1,6 +1,15 @@
 # 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.12 2013/02/06 19:55:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.13 2013/02/17 20:36:49 hwoarang Exp $
+
+*tt-rss-1.7.0 (17 Feb 2013)
+
+  17 Feb 2013; Markos Chandras <hwoarang@gentoo.org> +tt-rss-1.7.0.ebuild,
+  -tt-rss-1.5.7.ebuild, -tt-rss-1.5.8.1.ebuild, -tt-rss-1.5.9.ebuild,
+  files/postinstall-en-with-daemon.txt, files/postinstall-en.txt,
+  files/ttrssd.initd:
+  Version bump. Remove old. Bug #457964. Thanks to Patrick <mail@patrick-
+  nagel.net>
 
 *tt-rss-1.6.2 (06 Feb 2013)
 
diff --git a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt b/www-apps/tt-rss/files/postinstall-en-with-daemon.txt
index 34476f671f4e..afd4c1d38a4d 100644
--- a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt
+++ b/www-apps/tt-rss/files/postinstall-en-with-daemon.txt
@@ -13,6 +13,7 @@ so that it gets launched after a system restart:
   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 --git a/www-apps/tt-rss/files/postinstall-en.txt b/www-apps/tt-rss/files/postinstall-en.txt
index 77423cae900d..7664fbf446c8 100644
--- a/www-apps/tt-rss/files/postinstall-en.txt
+++ b/www-apps/tt-rss/files/postinstall-en.txt
@@ -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 --git a/www-apps/tt-rss/files/ttrssd.initd b/www-apps/tt-rss/files/ttrssd.initd
index 701ee5710039..bc7fea847f98 100644
--- a/www-apps/tt-rss/files/ttrssd.initd
+++ b/www-apps/tt-rss/files/ttrssd.initd
@@ -37,7 +37,9 @@ stop() {
 	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 --git a/www-apps/tt-rss/tt-rss-1.5.7.ebuild b/www-apps/tt-rss/tt-rss-1.5.7.ebuild
deleted file mode 100644
index 1a7ac143990c..000000000000
--- a/www-apps/tt-rss/tt-rss-1.5.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 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.5.7.ebuild,v 1.2 2011/12/04 22:23:17 mr_bones_ 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="dev-lang/php[mysql?,postgres?]"
-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
-		require_php_with_use pcntl
-		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/htmlpurifier cache/magpie cache/simplepie 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.5.8.1.ebuild b/www-apps/tt-rss/tt-rss-1.5.8.1.ebuild
deleted file mode 100644
index aee7e109606f..000000000000
--- a/www-apps/tt-rss/tt-rss-1.5.8.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 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.5.8.1.ebuild,v 1.1 2011/12/30 09:19:39 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="dev-lang/php[mysql?,postgres?]"
-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
-		require_php_with_use pcntl
-		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/htmlpurifier cache/magpie cache/simplepie 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.5.9.ebuild b/www-apps/tt-rss/tt-rss-1.5.9.ebuild
deleted file mode 100644
index a61ea7050478..000000000000
--- a/www-apps/tt-rss/tt-rss-1.5.9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 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.5.9.ebuild,v 1.1 2012/02/03 22:37:28 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/htmlpurifier 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.0.ebuild b/www-apps/tt-rss/tt-rss-1.7.0.ebuild
new file mode 100644
index 000000000000..2c738b79117b
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-1.7.0.ebuild
@@ -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.7.0.ebuild,v 1.1 2013/02/17 20:36:49 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
+}