[gentoo-commits] repo/gentoo:master commit in: www-apps/tt-rss/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     5ef6ecc9f0d8c046fd0b66f6e371400f251ac17a
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 21:39:41 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 21:40:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef6ecc9

www-apps/tt-rss: Bump snapshot to 20200922, GLEP 81

Bug: https://bugs.gentoo.org/744157
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 www-apps/tt-rss/Manifest                           |  1 +
 ...-rss-99999999.ebuild => tt-rss-20200922.ebuild} | 58 +++++++++++-----------
 www-apps/tt-rss/tt-rss-99999999.ebuild             | 48 ++++++++++--------
 3 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 3e143ce47d7..ed0d52cf953 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,2 +1,3 @@
 DIST tt-rss-20180105.tar.gz 3070929 BLAKE2B 2370104c70f5381d690a29b216269c749bf1f7c6b925eb9499b741e5df3e686d95fce430a144946fd915414481280b67e6d0c881edcdd13aee0fa344dc0bec3f SHA512 86ceec3646629ad7fd3fde2f3c3237e48ad96bd08b46e73c34c76507d9b17613ea309e1bd5e6e85a0d9eb96029e54b54e5ee367c56aab31be3dcec9169c5ada5
 DIST tt-rss-20190523.tar.gz 3336985 BLAKE2B 9f37c676b6ca263b09685ae66c4183b4b1fed2e37c2fb361aeeb15f877916967ebdb272fb60ce554c8a7596f74de7713ca2ff6c70bf1ae8a669da2bd702607e9 SHA512 22fbed0199503ecf3728ed4c2e199bbd9fc617b83ec3a09d80352512460ab9cf46abfe840143e62c747743975d2e5b9c9ce0bfb8498b8c6187ae567552a49213
+DIST tt-rss-20200922.tar.gz 3406007 BLAKE2B 7058253fbbba1c121d11eace8a3ef024b7ef83b05fd8b10b0ba0d017fa75d16b970e2c95c13091f760b21bcf092f609d81a5649de03672b0394113412f90beb0 SHA512 90387d07af76bc90bfb2e740dcfa0b2e13ed9af679a6c9258edd053511277bc36fca8edd4b3862c3f1957fa65a827b161abf3ed7fa603d4b84514fd456947a47

diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-20200922.ebuild
similarity index 65%
copy from www-apps/tt-rss/tt-rss-99999999.ebuild
copy to www-apps/tt-rss/tt-rss-20200922.ebuild
index 1f6d41d337b..1c58510d1d9 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-20200922.ebuild
@@ -1,43 +1,50 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit git-r3 prefix user webapp
+inherit prefix webapp
 
 DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
 HOMEPAGE="https://tt-rss.org/"
-EGIT_REPO_URI="https://git.tt-rss.org/git/${PN}.git"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz" # Upstream git frontend blocks wget?
 LICENSE="GPL-3"
-SLOT="${PV}" # Single live slot.
-IUSE="+acl daemon +mysqli postgres"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
-
-DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
-
-RDEPEND="${DEPEND}
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
-	virtual/httpd-php:*"
-
-DEPEND="!vhosts? ( ${DEPEND} )"
+PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml"
+
+DEPEND="
+	daemon? ( acl? ( sys-apps/acl ) )
+"
+
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-user/ttrssd
+		acct-group/ttrssd
+		dev-lang/php:*[${PHP_USE},cli,pcntl]
+	)
+	!daemon? (
+		dev-lang/php:*[${PHP_USE}]
+	)
+	virtual/httpd-php:*
+"
+
+DEPEND="
+	!vhosts? ( ${DEPEND} )
+"
 
 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
-}
+S="${WORKDIR}/${PN}"
 
 src_configure() {
 	hprefixify config.php-dist
 
 	sed -i -r \
 		-e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql or pgsql:" \
+		-e "/'CHECK_FOR_UPDATES'/s/true/false/" \
 		config.php-dist || die
 }
 
@@ -76,12 +83,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "You need to merge config.php-dist into config.php manually when upgrading."
-
-	if use vhosts && [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "The live ebuild does not automatically upgrade your installations so"
-		elog "don't forget to do so manually."
-	fi
-
 	webapp_pkg_postinst
 }

diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index 1f6d41d337b..9a62a5c6ac7 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -1,38 +1,42 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit git-r3 prefix user webapp
+inherit git-r3 prefix webapp
 
 DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
 HOMEPAGE="https://tt-rss.org/"
-EGIT_REPO_URI="https://git.tt-rss.org/git/${PN}.git"
+EGIT_REPO_URI="https://git.tt-rss.org/fox/${PN}.git"
 LICENSE="GPL-3"
 SLOT="${PV}" # Single live slot.
-IUSE="+acl daemon +mysqli postgres"
+IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
-
-DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
-
-RDEPEND="${DEPEND}
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
-	virtual/httpd-php:*"
-
-DEPEND="!vhosts? ( ${DEPEND} )"
+PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml"
+
+DEPEND="
+	daemon? ( acl? ( sys-apps/acl ) )
+"
+
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-user/ttrssd
+		acct-group/ttrssd
+		dev-lang/php:*[${PHP_USE},cli,pcntl]
+	)
+	!daemon? (
+		dev-lang/php:*[${PHP_USE}]
+	)
+	virtual/httpd-php:*
+"
+
+DEPEND="
+	!vhosts? ( ${DEPEND} )
+"
 
 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_configure() {
 	hprefixify config.php-dist