tomka 15/06/24 11:07:30 Modified: tt-rss-20150304.ebuild ChangeLog Added: tt-rss-20150624.ebuild Removed: tt-rss-1.15.3.ebuild Log: Remove depend.php (552872), bump, clean up (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)
Revision Changes Path 1.3 www-apps/tt-rss/tt-rss-20150304.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/tt-rss/tt-rss-20150304.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/tt-rss/tt-rss-20150304.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/tt-rss/tt-rss-20150304.ebuild?r1=1.2&r2=1.3 Index: tt-rss-20150304.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-20150304.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tt-rss-20150304.ebuild 23 Mar 2015 13:01:06 -0000 1.2 +++ tt-rss-20150304.ebuild 24 Jun 2015 11:07:30 -0000 1.3 @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-20150304.ebuild,v 1.2 2015/03/23 13:01:06 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-20150304.ebuild,v 1.3 2015/06/24 11:07:30 tomka Exp $ EAPI=5 -inherit user eutils webapp depend.php depend.apache vcs-snapshot +inherit user eutils webapp vcs-snapshot DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX" HOMEPAGE="http://tt-rss.org/"; @@ -15,15 +15,15 @@ IUSE="daemon +mysql postgres" DEPEND=" - daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] ) - !daemon? ( dev-lang/php[mysql?,postgres?,curl] ) + daemon? ( dev-lang/php:*[mysql?,postgres?,pcntl,curl] ) + !daemon? ( dev-lang/php:*[mysql?,postgres?,curl] ) + virtual/httpd-php:* " RDEPEND="${DEPEND}" REQUIRED_USE="|| ( mysql postgres )" need_httpd_cgi -need_php_httpd pkg_setup() { webapp_pkg_setup 1.39 www-apps/tt-rss/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/tt-rss/ChangeLog?rev=1.39&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/tt-rss/ChangeLog?rev=1.39&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/tt-rss/ChangeLog?r1=1.38&r2=1.39 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ChangeLog 23 Mar 2015 13:01:06 -0000 1.38 +++ ChangeLog 24 Jun 2015 11:07:30 -0000 1.39 @@ -1,6 +1,12 @@ # ChangeLog for www-apps/tt-rss # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.38 2015/03/23 13:01:06 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.39 2015/06/24 11:07:30 tomka Exp $ + +*tt-rss-20150624 (24 Jun 2015) + + 24 Jun 2015; Thomas Kahle <to...@gentoo.org> +tt-rss-20150624.ebuild, + -tt-rss-1.15.3.ebuild, tt-rss-20150304.ebuild: + Remove depend.php (552872), bump, clean up 23 Mar 2015; Thomas Kahle <to...@gentoo.org> tt-rss-20150304.ebuild: Call webapp pkg_postinst again (bug 543626) 1.1 www-apps/tt-rss/tt-rss-20150624.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/tt-rss/tt-rss-20150624.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/tt-rss/tt-rss-20150624.ebuild?rev=1.1&content-type=text/plain Index: tt-rss-20150624.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-20150624.ebuild,v 1.1 2015/06/24 11:07:30 tomka Exp $ EAPI=5 inherit user eutils webapp vcs-snapshot DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX" HOMEPAGE="http://tt-rss.org/"; SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.bz2"; LICENSE="GPL-3" KEYWORDS="~amd64 ~mips ~x86" IUSE="daemon +mysql postgres" DEPEND=" daemon? ( dev-lang/php:*[mysql?,postgres?,pcntl,curl] ) !daemon? ( dev-lang/php:*[mysql?,postgres?,curl] ) virtual/httpd-php:* " RDEPEND="${DEPEND}" REQUIRED_USE="|| ( mysql postgres )" need_httpd_cgi # From webapp.eclass 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-dist so that the right 'DB_TYPE' is already set (according to the USE flag) einfo "Customizing config.php-dist..." if use mysql && ! use postgres; then sed -i \ -e "/define('DB_TYPE',/{s:pgsql:mysql:}" \ config.php-dist || die fi sed -i \ -e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" \ config.php-dist || 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 # In the old days we put a config.php directly and tried to # protect it with the following which did not work reliably. # These days we only install the config.php-dist file. # 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-r1 ttrssd insinto /etc/logrotate.d/ newins "${FILESDIR}"/ttrssd.logrotated ttrssd elog "After upgrading, please restart ttrssd" else webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt fi webapp_src_install } pkg_postinst() { elog "You need to merge config.php and config.php-dist manually now." webapp_pkg_postinst }
