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

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

2024-02-11 Thread James Le Cuirot

commit: acb8aca793e6677bb5837991f7abaddad87e9467
Author: Karl-Johan Karlsson  ferretporn  se>
AuthorDate: Sun Feb 11 21:28:40 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Feb 11 22:36:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb8aca7

www-apps/tt-rss: Mark  as compatible with PHP 8.3

Upstream has recommended PHP 8.3 for two months:
https://git.tt-rss.org/fox/tt-rss.git/commit/?id=7883f024e7f0c2262256be310044c7ceb2ff3247

Signed-off-by: Karl-Johan Karlsson  ferretporn.se>
Closes: https://github.com/gentoo/gentoo/pull/35282
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/tt-rss-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index 672d457b7504..3ea3d6a0a40a 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.2 8.1"
+PHP_SLOTS="8.3 8.2 8.1"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {

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

2023-09-19 Thread James Le Cuirot

commit: c2ba73fefb1545ea50dda68f41d56a3fd7e6457b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Sep 19 07:59:04 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Sep 19 07:59:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ba73fe

www-apps/tt-rss: Add PHP 8.1

8.2 is not stable yet, and 8.1 reportedly works fine.

Closes: https://bugs.gentoo.org/912670
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/tt-rss-20230901.ebuild | 2 +-
 www-apps/tt-rss/tt-rss-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-20230901.ebuild 
b/www-apps/tt-rss/tt-rss-20230901.ebuild
index 284e1f60ac70..34b6d313a90e 100644
--- a/www-apps/tt-rss/tt-rss-20230901.ebuild
+++ b/www-apps/tt-rss/tt-rss-20230901.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.2"
+PHP_SLOTS="8.2 8.1"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index 668d1007ed48..672d457b7504 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -13,7 +13,7 @@ SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.2"
+PHP_SLOTS="8.2 8.1"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {

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

2023-09-17 Thread James Le Cuirot

commit: 291c589208abc5bb0b304c80d1316347747731e5
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Sep 17 21:31:03 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Sep 17 21:32:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291c5892

www-apps/tt-rss: Bump snapshot to 20230901, PHP 8.2, improve permissions

You are now instructed to always add the PHP user the ttrssd group, unless
everything is to run as the web server user. This was necessary before, but my
earlier wording was ambiguous, if not entirely wrong.

The config.php file permissions are now also locked down to secure the database
credentials. It was previously world-readable.

Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/Manifest   |  2 +-
 www-apps/tt-rss/files/permissions-r1   | 23 ++-
 www-apps/tt-rss/files/tt-rss-no-chmod.patch| 44 +-
 www-apps/tt-rss/files/ttrssd.confd-r2  |  9 ++---
 ...-rss-20220218.ebuild => tt-rss-20230901.ebuild} | 14 +++
 www-apps/tt-rss/tt-rss-.ebuild | 16 +---
 6 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index e407e317a278..da200b684ec8 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1 +1 @@
-DIST tt-rss-20220218.tar.gz 9916433 BLAKE2B 
318969b6e5156842079bf68c4ea614e5e60e21d8caa46b1a78f2cef051904da30e5091838f6e10f6f610d8ee39c7922137aeb60b7cd5004cabc1d2cdf65edfa8
 SHA512 
38a81dd737462724bc52ca3915350c175abe548cd566a4f9a5e1d5efda9287d0666e9348e5b13dd20549360501de5b0bfb659292fb650f7a60fdab8b63cf8202
+DIST tt-rss-20230901.tar.xz 5368876 BLAKE2B 
af7dc8c7003f9bd83f656a1596458302eb29b7f27428e38e9cbc7fdeb0b920079622b577e5e578069d8475c265061efeb23648da621ad66263370a748512d49c
 SHA512 
02111c89a3dc8fbf94be38d87fa90770eaaa644672aeeb7c1ece3ac7137c5a4f2f0f4412319bd887305f365fc7da9bfe3f644495a5655e8a351ecdae97a04d35

diff --git a/www-apps/tt-rss/files/permissions-r1 
b/www-apps/tt-rss/files/permissions-r1
index e50b4406646d..0ca420e97beb 100644
--- a/www-apps/tt-rss/files/permissions-r1
+++ b/www-apps/tt-rss/files/permissions-r1
@@ -3,22 +3,27 @@
 cd "${MY_INSTALLDIR}"
 
 if [[ $1 = install ]]; then
+   # Ensure database credentials are secure.
+   [[ -e config.php ]] || touch config.php
+   chown --no-dereference "${VHOST_SERVER_UID}":ttrssd config.php
+   chmod 00440 config.php
+
# We need to lock down cache/ for the operations below to be
# safe. The permissions match the webapp-config defaults but these
# can be changed and existing installations may also differ.
chown root:root cache/
chmod 00755 cache/
 
-   chgrp --no-dereference ttrssd feed-icons/ lock/ cache/*/
-   chmod g+ws feed-icons/ lock/ cache/*/
+   chgrp --no-dereference ttrssd lock/ cache/*/
+   chmod g+ws lock/ cache/*/
 
-   # Files within lock/ are exclusively written by the update daemon.
-   # feed-icons/ and cache/ holds files that are modified in place by both
-   # processes and therefore ACLs are required to ensure that the files
-   # themselves are created as group writable.
-   if ! setfacl --modify d:g::rwX feed-icons/ cache/*/; then
+   # Files within lock/ are exclusively written by the update daemon. 
cache/
+   # subdirectories hold files that are modified in place by both 
processes and
+   # therefore ACLs are required to ensure that the files themselves are
+   # created as group writable.
+   if ! setfacl --modify d:g::rwX cache/*/; then
echo "WARNING: ACLs are not available on this filesystem. 
Either enable them or set TTRSSD_USER to your PHP user in /etc/conf.d/ttrssd to 
avoid permission issues."
-   elif [[ -n $(find feed-icons/ cache/ -type f ! -name ".*" ! -name 
index.html ! \( -group ttrssd -perm -020 \) -print -quit) ]]; then
-   echo "WARNING: Files that are not writable by the ttrssd group 
found within the cache or feed-icons directories. Either delete them or correct 
their permissions."
+   elif [[ -n $(find cache/ -type f ! -name ".*" ! -name index.html ! \( 
-group ttrssd -perm -020 \) -print -quit) ]]; then
+   echo "WARNING: Files that are not writable by the ttrssd group 
found within the cache directory. Either delete them or correct their 
permissions."
fi
 fi

diff --git a/www-apps/tt-rss/files/tt-rss-no-chmod.patch 
b/www-apps/tt-rss/files/tt-rss-no-chmod.patch
index e51e66eaed22..4dd41af4bb12 100644
--- a/www-apps/tt-rss/files/tt-rss-no-chmod.patch
+++ b/www-apps/tt-rss/files/tt-rss-no-chmod.patch
@@ -1,26 +1,18 @@
-These files may be written and then updated by the web interface user or the
-update daemon user, so they need to be group writeable. We enforce this with
-ACLs rather than chmod though.
-
-diff --color -Naur a/classes/pref/feeds.php

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

2022-12-17 Thread James Le Cuirot

commit: b6a7bc08c2d127e24a679bc7531a6aa604171312
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec 17 22:19:08 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec 17 22:19:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a7bc08

www-apps/tt-rss: Drop chmod patch that no longer applies to live version

This no longer seems necessary. I need to retest the permissions around the
latest code, but for now, there's no point keeping a broken patch.

Closes: https://bugs.gentoo.org/886007
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch | 26 --
 www-apps/tt-rss/tt-rss-.ebuild |  4 
 2 files changed, 30 deletions(-)

diff --git a/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch 
b/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch
deleted file mode 100644
index 05de80b127c5..
--- a/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-These files may be written and then updated by the web interface user or the
-update daemon user, so they need to be group writeable. We enforce this with
-ACLs rather than chmod though.
-
-diff -Naur a/classes/pref/feeds.php b/classes/pref/feeds.php
 a/classes/pref/feeds.php   2022-02-18 13:44:03.0 +
-+++ b/classes/pref/feeds.php   2022-02-19 15:37:55.000723992 +
-@@ -490,7 +490,6 @@
-
-   if (file_exists($new_filename)) 
unlink($new_filename);
-   if (rename($tmp_file, $new_filename)) {
--  chmod($new_filename, 0644);
-
-   $feed->set([
-   'favicon_avg_color' => 
null,
-diff -Naur a/classes/rssutils.php b/classes/rssutils.php
 a/classes/rssutils.php 2022-06-20 09:37:43.205998915 +
-+++ b/classes/rssutils.php 2022-06-20 09:38:01.002279039 +
-@@ -1758,7 +1758,6 @@
- 
-   fwrite($fp, $contents);
-   fclose($fp);
--  chmod($icon_file, 0644);
-   clearstatcache();
- 
-   return $icon_file;

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index 28c0a77199a8..a821a1e6edb9 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -50,10 +50,6 @@ DEPEND="
 
 need_httpd_cgi # From webapp.eclass
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-no-chmod-r2.patch
-)
-
 src_install() {
webapp_src_preinst

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

2022-12-09 Thread James Le Cuirot

commit: d3cfbc8c193e0edb410d89676651ab2ed0e4a7d9
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Dec  9 23:36:30 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Dec  9 23:36:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3cfbc8c

www-apps/tt-rss: Keyword 20220218 for ~arm64

Tested and working.

Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/tt-rss-20220218.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/tt-rss/tt-rss-20220218.ebuild 
b/www-apps/tt-rss/tt-rss-20220218.ebuild
index 4c0e5b53bb16..720630a250db 100644
--- a/www-apps/tt-rss/tt-rss-20220218.ebuild
+++ b/www-apps/tt-rss/tt-rss-20220218.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) 
aggregator using A
 HOMEPAGE="https://tt-rss.org/;
 SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz; # Upstream git 
frontend blocks wget?
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"

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

2022-10-08 Thread James Le Cuirot

commit: e3d1f67ff95467c9487973b8aaf315776146b364
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Oct  8 09:51:12 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct  8 09:51:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d1f67f

www-apps/tt-rss: Add PHP 8.1 support to 

Closes: https://github.com/gentoo/gentoo/pull/27693
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/tt-rss-20220218.ebuild | 2 +-
 www-apps/tt-rss/tt-rss-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-20220218.ebuild 
b/www-apps/tt-rss/tt-rss-20220218.ebuild
index 2081b2a81759..4c0e5b53bb16 100644
--- a/www-apps/tt-rss/tt-rss-20220218.ebuild
+++ b/www-apps/tt-rss/tt-rss-20220218.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~mips ~x86"
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.0 7.4 7.3"
+PHP_SLOTS="8.0 7.4"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index 7e27f7a80c80..28c0a77199a8 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -13,7 +13,7 @@ SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.0 7.4"
+PHP_SLOTS="8.1 8.0 7.4"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {

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

2022-08-04 Thread James Le Cuirot

commit: bfac3d343906aa5ba84073792f0dcd51df128ae6
Author: Nicolas PARLANT  parhuet  fr>
AuthorDate: Sat Jul 30 05:52:54 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Aug  4 16:53:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfac3d34

www-apps/tt-rss: PHP 7.3 is no longer supported

According to upstream:
https://git.tt-rss.org/fox/tt-rss.git/commit/?id=4aefbd628e9a0e1eac58523904ad887b0635cda3

Closes: https://github.com/gentoo/gentoo/pull/26665
Signed-off-by: Nicolas PARLANT  parhuet.fr>
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/tt-rss-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index 89e1ba0ce816..7e27f7a80c80 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -13,7 +13,7 @@ SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.0 7.4 7.3"
+PHP_SLOTS="8.0 7.4"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {

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

2022-06-22 Thread James Le Cuirot

commit: 62e7ee4bf96b14a426a9b05738b00f84bbcb979d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jun 22 21:49:50 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jun 22 21:49:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e7ee4b

www-apps/tt-rss: Update no-chmod patch for 

Thanks to ppn for the patch.

Closes: https://bugs.gentoo.org/853139
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch | 26 ++
 www-apps/tt-rss/tt-rss-.ebuild |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch 
b/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch
new file mode 100644
index ..05de80b127c5
--- /dev/null
+++ b/www-apps/tt-rss/files/tt-rss-no-chmod-r2.patch
@@ -0,0 +1,26 @@
+These files may be written and then updated by the web interface user or the
+update daemon user, so they need to be group writeable. We enforce this with
+ACLs rather than chmod though.
+
+diff -Naur a/classes/pref/feeds.php b/classes/pref/feeds.php
+--- a/classes/pref/feeds.php   2022-02-18 13:44:03.0 +
 b/classes/pref/feeds.php   2022-02-19 15:37:55.000723992 +
+@@ -490,7 +490,6 @@
+
+   if (file_exists($new_filename)) 
unlink($new_filename);
+   if (rename($tmp_file, $new_filename)) {
+-  chmod($new_filename, 0644);
+
+   $feed->set([
+   'favicon_avg_color' => 
null,
+diff -Naur a/classes/rssutils.php b/classes/rssutils.php
+--- a/classes/rssutils.php 2022-06-20 09:37:43.205998915 +
 b/classes/rssutils.php 2022-06-20 09:38:01.002279039 +
+@@ -1758,7 +1758,6 @@
+ 
+   fwrite($fp, $contents);
+   fclose($fp);
+-  chmod($icon_file, 0644);
+   clearstatcache();
+ 
+   return $icon_file;

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index e91fad7a3c67..89e1ba0ce816 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -51,7 +51,7 @@ DEPEND="
 need_httpd_cgi # From webapp.eclass
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-no-chmod.patch
+   "${FILESDIR}"/${PN}-no-chmod-r2.patch
 )
 
 src_install() {

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

2022-03-20 Thread James Le Cuirot

commit: 0acc10157e16422a8f125b7d3a2bcea27e17cc14
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Mar 20 23:03:06 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Mar 20 23:03:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0acc1015

www-apps/tt-rss: Drop old 20200922

Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/Manifest   |  1 -
 www-apps/tt-rss/files/permissions  | 25 -
 www-apps/tt-rss/files/ttrssd.initd-r3  | 88 ---
 www-apps/tt-rss/tt-rss-20200922.ebuild | 95 --
 4 files changed, 209 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 5a6f1e2a2113..e407e317a278 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,2 +1 @@
-DIST tt-rss-20200922.tar.gz 3406007 BLAKE2B 
7058253fbbba1c121d11eace8a3ef024b7ef83b05fd8b10b0ba0d017fa75d16b970e2c95c13091f760b21bcf092f609d81a5649de03672b0394113412f90beb0
 SHA512 
90387d07af76bc90bfb2e740dcfa0b2e13ed9af679a6c9258edd053511277bc36fca8edd4b3862c3f1957fa65a827b161abf3ed7fa603d4b84514fd456947a47
 DIST tt-rss-20220218.tar.gz 9916433 BLAKE2B 
318969b6e5156842079bf68c4ea614e5e60e21d8caa46b1a78f2cef051904da30e5091838f6e10f6f610d8ee39c7922137aeb60b7cd5004cabc1d2cdf65edfa8
 SHA512 
38a81dd737462724bc52ca3915350c175abe548cd566a4f9a5e1d5efda9287d0666e9348e5b13dd20549360501de5b0bfb659292fb650f7a60fdab8b63cf8202

diff --git a/www-apps/tt-rss/files/permissions 
b/www-apps/tt-rss/files/permissions
deleted file mode 100644
index a26b87f4e715..
--- a/www-apps/tt-rss/files/permissions
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e
-
-cd "${MY_INSTALLDIR}"
-
-if [[ $1 = install ]]; then
-   # We need to lock down cache/ for the operations below to be
-   # safe. The permissions match the webapp-config defaults but these
-   # can be changed and existing installations may also differ.
-   chown root:root cache/
-   chmod 00755 cache/
-
-   chgrp --no-dereference ttrssd feed-icons/ lock/ cache/*/
-   chmod g+ws feed-icons/ lock/ cache/*/
-
-   # Files within lock/ are exclusively written by the update
-   # daemon. Files within feed-icons/ are always unlinked before
-   # modification. Only cache/ holds files that are modified in place
-   # by both processes and therefore ACLs are required to ensure that
-   # the files themselves are created as group writable.
-   if ! setfacl --modify d:g::rwX cache/*/; then
-   echo "WARNING: ACLs are not available on this filesystem. 
Either enable them or set TTRSSD_USER to your PHP user in /etc/conf.d/ttrssd to 
avoid permission issues."
-   elif [[ -n $(find cache/ -type f ! -name ".*" ! \( -group ttrssd -perm 
-020 \) -print -quit) ]]; then
-   echo "WARNING: Files that are not writable by the ttrssd group 
found within the cache directory. Either delete them or correct their 
permissions."
-   fi
-fi

diff --git a/www-apps/tt-rss/files/ttrssd.initd-r3 
b/www-apps/tt-rss/files/ttrssd.initd-r3
deleted file mode 100644
index a6f3b8a78ef1..
--- a/www-apps/tt-rss/files/ttrssd.initd-r3
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-   need net
-   after postgresql mysql
-}
-
-PID_DIR="/run/ttrssd"
-LOG_DIR=${LOG_DIR:-"/var/log/ttrssd"}
-TTRSSD_USER=${TTRSSD_USER:-"ttrssd"}
-
-setup() {
-   mkdir -p "${PID_DIR}" "${LOG_DIR}" || return 1
-   chown "${TTRSSD_USER}":ttrssd "${LOG_DIR}" || return 1
-}
-
-list_instance_dirs() {
-   if [ -z "${INSTANCE_DIRS}" ]; then
-   cut -d" " -f4 /var/db/webapps/tt-rss/*/installs 2>/dev/null
-   else
-   printf "%s\n" ${INSTANCE_DIRS}
-   fi
-}
-
-instance_dir_to_name() {
-   local name=${1#/}
-   echo ${name//\//--}
-}
-
-start() {
-   setup || return 1
-   local instance_dir instance_name ret=1
-
-   IFS=$'\n'
-   for instance_dir in $(list_instance_dirs); do
-   if [ -d "${instance_dir}" ]; then
-   if [ ! -f "${instance_dir}"/update_daemon2.php ]; then
-   ewarn "TT-RSS instance in ${instance_dir} has 
no update_daemon2.php script"
-   elif [ ! -f "${instance_dir}"/config.php ]; then
-   eerror "TT-RSS instance in ${instance_dir} is 
not configured"
-   else
-   instance_name=$(instance_dir_to_name 
"${instance_dir}")
-   ebegin "Starting TT-RSS update daemon in 
${instance_dir}"
-   start-stop-daemon --start --user 
"${TTRSSD_USER}":ttrssd \
- --background 
--wait 2000 \
-

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

2022-02-19 Thread James Le Cuirot

commit: 6bbd050f9ecc0fadd9fae6eabc7206a6042d397f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 19 15:59:25 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 19 16:00:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbd050f

www-apps/tt-rss: Bump to 20220218, EAPI 8, fix for dash, fix permissions

Thanks to Anna Vyalkova for the dash fix. Note that the configuration syntax has
changed since the last version.

Closes: https://bugs.gentoo.org/833206
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/Manifest   |   1 +
 www-apps/tt-rss/files/permissions-r1   |  24 +
 .../tt-rss/files/postinstall-en-with-daemon-r1.txt |   3 +-
 www-apps/tt-rss/files/postinstall-en.txt   |   3 +-
 www-apps/tt-rss/files/tt-rss-no-chmod.patch|  26 +
 www-apps/tt-rss/files/ttrssd.initd-r4  | 119 +
 www-apps/tt-rss/tt-rss-20200922.ebuild |   5 -
 ...-rss-20200922.ebuild => tt-rss-20220218.ebuild} |  26 ++---
 www-apps/tt-rss/tt-rss-.ebuild |  20 ++--
 9 files changed, 189 insertions(+), 38 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index a650767d6971..5a6f1e2a2113 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1 +1,2 @@
 DIST tt-rss-20200922.tar.gz 3406007 BLAKE2B 
7058253fbbba1c121d11eace8a3ef024b7ef83b05fd8b10b0ba0d017fa75d16b970e2c95c13091f760b21bcf092f609d81a5649de03672b0394113412f90beb0
 SHA512 
90387d07af76bc90bfb2e740dcfa0b2e13ed9af679a6c9258edd053511277bc36fca8edd4b3862c3f1957fa65a827b161abf3ed7fa603d4b84514fd456947a47
+DIST tt-rss-20220218.tar.gz 9916433 BLAKE2B 
318969b6e5156842079bf68c4ea614e5e60e21d8caa46b1a78f2cef051904da30e5091838f6e10f6f610d8ee39c7922137aeb60b7cd5004cabc1d2cdf65edfa8
 SHA512 
38a81dd737462724bc52ca3915350c175abe548cd566a4f9a5e1d5efda9287d0666e9348e5b13dd20549360501de5b0bfb659292fb650f7a60fdab8b63cf8202

diff --git a/www-apps/tt-rss/files/permissions-r1 
b/www-apps/tt-rss/files/permissions-r1
new file mode 100644
index ..e50b4406646d
--- /dev/null
+++ b/www-apps/tt-rss/files/permissions-r1
@@ -0,0 +1,24 @@
+#!/bin/bash -e
+
+cd "${MY_INSTALLDIR}"
+
+if [[ $1 = install ]]; then
+   # We need to lock down cache/ for the operations below to be
+   # safe. The permissions match the webapp-config defaults but these
+   # can be changed and existing installations may also differ.
+   chown root:root cache/
+   chmod 00755 cache/
+
+   chgrp --no-dereference ttrssd feed-icons/ lock/ cache/*/
+   chmod g+ws feed-icons/ lock/ cache/*/
+
+   # Files within lock/ are exclusively written by the update daemon.
+   # feed-icons/ and cache/ holds files that are modified in place by both
+   # processes and therefore ACLs are required to ensure that the files
+   # themselves are created as group writable.
+   if ! setfacl --modify d:g::rwX feed-icons/ cache/*/; then
+   echo "WARNING: ACLs are not available on this filesystem. 
Either enable them or set TTRSSD_USER to your PHP user in /etc/conf.d/ttrssd to 
avoid permission issues."
+   elif [[ -n $(find feed-icons/ cache/ -type f ! -name ".*" ! -name 
index.html ! \( -group ttrssd -perm -020 \) -print -quit) ]]; then
+   echo "WARNING: Files that are not writable by the ttrssd group 
found within the cache or feed-icons directories. Either delete them or correct 
their permissions."
+   fi
+fi

diff --git a/www-apps/tt-rss/files/postinstall-en-with-daemon-r1.txt 
b/www-apps/tt-rss/files/postinstall-en-with-daemon-r1.txt
index 8c72406d76d2..92d1fa315c72 100644
--- a/www-apps/tt-rss/files/postinstall-en-with-daemon-r1.txt
+++ b/www-apps/tt-rss/files/postinstall-en-with-daemon-r1.txt
@@ -1,4 +1,5 @@
-Please read https://tt-rss.org/wiki/InstallationNotes.
+Please read https://tt-rss.org/wiki/GlobalConfig. Note that the configuration
+syntax changed in 2021.
 
 Once you have configured TT-RSS, tweak /etc/conf.d/ttrssd to your
 needs if you have not already done so. If ACLs are unavailable on the

diff --git a/www-apps/tt-rss/files/postinstall-en.txt 
b/www-apps/tt-rss/files/postinstall-en.txt
index 67a16111f3d5..f28a19d991bf 100644
--- a/www-apps/tt-rss/files/postinstall-en.txt
+++ b/www-apps/tt-rss/files/postinstall-en.txt
@@ -1 +1,2 @@
-Please read https://tt-rss.org/wiki/InstallationNotes.
+Please read https://tt-rss.org/wiki/GlobalConfig. Note that the configuration
+syntax changed in 2021.

diff --git a/www-apps/tt-rss/files/tt-rss-no-chmod.patch 
b/www-apps/tt-rss/files/tt-rss-no-chmod.patch
new file mode 100644
index ..e51e66eaed22
--- /dev/null
+++ b/www-apps/tt-rss/files/tt-rss-no-chmod.patch
@@ -0,0 +1,26 @@
+These files may be written and then updated by the web interface user or the
+update daemon user, so they need to be group writeable. We enforce this with
+ACLs rather than chmod though.

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

2022-01-02 Thread Florian Schmaus

commit: b77106239011f1dd741d1b630770bc479f02ffb2
Author: Karl-Johan Karlsson  lysator  liu  se>
AuthorDate: Sun Jan  2 13:14:36 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Jan  2 14:08:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7710623

www-apps/tt-rss: Remove PHP 7.2 support

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Karl-Johan Karlsson  lysator.liu.se>
Closes: https://github.com/gentoo/gentoo/pull/23629
Signed-off-by: Florian Schmaus  gentoo.org>

 www-apps/tt-rss/tt-rss-20200922.ebuild | 4 ++--
 www-apps/tt-rss/tt-rss-.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-20200922.ebuild 
b/www-apps/tt-rss/tt-rss-20200922.ebuild
index 09db5c1f1489..86ea09cce5e4 100644
--- a/www-apps/tt-rss/tt-rss-20200922.ebuild
+++ b/www-apps/tt-rss/tt-rss-20200922.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~mips ~x86"
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="7.4 7.3 7.2"
+PHP_SLOTS="7.4 7.3"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index a563f6dcba25..25e4a31621d6 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -13,7 +13,7 @@ SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.0 7.4 7.3 7.2"
+PHP_SLOTS="8.0 7.4 7.3"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {

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

2022-01-02 Thread Florian Schmaus

commit: dfbfad9e3f40f25d7d2ebac77800d9bba0de6c57
Author: Karl-Johan Karlsson  lysator  liu  se>
AuthorDate: Sun Jan  2 13:13:00 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Jan  2 14:08:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbfad9e

www-apps/tt-rss: Add PHP 8.0 support to live Git ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Karl-Johan Karlsson  lysator.liu.se>
Signed-off-by: Florian Schmaus  gentoo.org>

 www-apps/tt-rss/tt-rss-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index c543f510ec92..a563f6dcba25 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="7.4 7.3 7.2"
+PHP_SLOTS="8.0 7.4 7.3 7.2"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {

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

2021-02-13 Thread James Le Cuirot

commit: ab44f9d8955887d4504d7bc8d437929135368ed8
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 13 13:01:40 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 13 13:01:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab44f9d8

www-apps/tt-rss: PHP 8 is not supported yet

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/tt-rss-20200922.ebuild | 23 ++-
 www-apps/tt-rss/tt-rss-.ebuild | 23 ++-
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-20200922.ebuild 
b/www-apps/tt-rss/tt-rss-20200922.ebuild
index 1c58510d1d9..09db5c1f148 100644
--- a/www-apps/tt-rss/tt-rss-20200922.ebuild
+++ b/www-apps/tt-rss/tt-rss-20200922.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,21 @@ LICENSE="GPL-3"
 KEYWORDS="~amd64 ~arm ~mips ~x86"
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
-PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml"
+
+PHP_SLOTS="7.4 7.3 7.2"
+PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
+
+php_rdepend() {
+   local slot
+   echo "|| ("
+   for slot in ${PHP_SLOTS}; do
+   echo "(
+   virtual/httpd-php:${slot}
+   dev-lang/php:${slot}[$1]
+   )"
+   done
+   echo ")"
+}
 
 DEPEND="
daemon? ( acl? ( sys-apps/acl ) )
@@ -23,12 +37,11 @@ RDEPEND="
daemon? (
acct-user/ttrssd
acct-group/ttrssd
-   dev-lang/php:*[${PHP_USE},cli,pcntl]
+   $(php_rdepend "${PHP_USE},cli,pcntl")
)
!daemon? (
-   dev-lang/php:*[${PHP_USE}]
+   $(php_rdepend "${PHP_USE}")
)
-   virtual/httpd-php:*
 "
 
 DEPEND="

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index 9a62a5c6ac7..c543f510ec9 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,21 @@ LICENSE="GPL-3"
 SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
-PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml"
+
+PHP_SLOTS="7.4 7.3 7.2"
+PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
+
+php_rdepend() {
+   local slot
+   echo "|| ("
+   for slot in ${PHP_SLOTS}; do
+   echo "(
+   virtual/httpd-php:${slot}
+   dev-lang/php:${slot}[$1]
+   )"
+   done
+   echo ")"
+}
 
 DEPEND="
daemon? ( acl? ( sys-apps/acl ) )
@@ -23,12 +37,11 @@ RDEPEND="
daemon? (
acct-user/ttrssd
acct-group/ttrssd
-   dev-lang/php:*[${PHP_USE},cli,pcntl]
+   $(php_rdepend "${PHP_USE},cli,pcntl")
)
!daemon? (
-   dev-lang/php:*[${PHP_USE}]
+   $(php_rdepend "${PHP_USE}")
)
-   virtual/httpd-php:*
 "
 
 DEPEND="

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

2021-01-10 Thread Sam James

commit: f9b30c1889d202e70a95a0bc597965904b66288c
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 10 22:13:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 10 22:27:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b30c18

www-apps/tt-rss: mark ALLARCHES

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 www-apps/tt-rss/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www-apps/tt-rss/metadata.xml b/www-apps/tt-rss/metadata.xml
index 6605b067508..eaeb82f277a 100644
--- a/www-apps/tt-rss/metadata.xml
+++ b/www-apps/tt-rss/metadata.xml
@@ -5,6 +5,7 @@
ch...@gentoo.org
James Le Cuirot

+   

Install additional init scripts for 
automated RSS updates

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

2020-09-23 Thread James Le Cuirot

commit: 5ef6ecc9f0d8c046fd0b66f6e371400f251ac17a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Sep 23 21:39:41 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Sep 23 21:40:58 2020 +
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  gentoo.org>

 www-apps/tt-rss/Manifest   |  1 +
 ...-rss-.ebuild => tt-rss-20200922.ebuild} | 58 +++---
 www-apps/tt-rss/tt-rss-.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-.ebuild 
b/www-apps/tt-rss/tt-rss-20200922.ebuild
similarity index 65%
copy from www-apps/tt-rss/tt-rss-.ebuild
copy to www-apps/tt-rss/tt-rss-20200922.ebuild
index 1f6d41d337b..1c58510d1d9 100644
--- a/www-apps/tt-rss/tt-rss-.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-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index 1f6d41d337b..9a62a5c6ac7 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.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

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

2020-09-23 Thread James Le Cuirot

commit: 25bbfeb39f123d840b57975e6f71c7c73a9e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Sep 23 21:41:53 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Sep 23 21:41:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25bbfeb3

www-apps/tt-rss: Drop old vulnerable versions

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

 www-apps/tt-rss/Manifest   |  2 -
 www-apps/tt-rss/tt-rss-20180105.ebuild | 84 --
 www-apps/tt-rss/tt-rss-20190523.ebuild | 84 --
 3 files changed, 170 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index ed0d52cf953..a650767d697 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,3 +1 @@
-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-20180105.ebuild 
b/www-apps/tt-rss/tt-rss-20180105.ebuild
deleted file mode 100644
index 9affdac7e13..000
--- a/www-apps/tt-rss/tt-rss-20180105.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix user webapp
-
-COMMIT="c30f5e18119d1935e8fe6d422053b127e8f4f1b3"
-DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using 
AJAX"
-HOMEPAGE="https://tt-rss.org/;
-SRC_URI="https://git.tt-rss.org/git/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="+acl daemon +mysqli postgres"
-REQUIRED_USE="|| ( mysqli postgres )"
-
-DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
-
-RDEPEND="${DEPEND}
-   daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,pcntl,pdo] )
-   !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,pdo] )
-   virtual/httpd-php:*"
-
-DEPEND="!vhosts? ( ${DEPEND} )"
-
-need_httpd_cgi # From webapp.eclass
-
-S="${WORKDIR}/${PN}"
-
-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
-
-   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
-}
-
-src_install() {
-   webapp_src_preinst
-
-   insinto "${MY_HTDOCSDIR}"
-   doins -r *
-
-   # When updating, grep the plugins directory for additional CACHE_DIR
-   # instances as they cannot be created later due to permissions.
-   dodir "${MY_HTDOCSDIR}"/cache/starred-images
-
-   local dir
-   for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
-   webapp_serverowned "${dir#${ED}}"
-   done
-
-   if use daemon; then
-   webapp_hook_script "${FILESDIR}"/permissions
-   webapp_postinst_txt en 
"${FILESDIR}"/postinstall-en-with-daemon-r1.txt
-
-   newinitd "${FILESDIR}"/ttrssd.initd-r3 ttrssd
-   newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
-
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}"/ttrssd.logrotated-r1 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-dist into config.php manually when 
upgrading."
-   webapp_pkg_postinst
-}

diff --git a/www-apps/tt-rss/tt-rss-20190523.ebuild 
b/www-apps/tt-rss/tt-rss-20190523.ebuild
deleted file mode 100644
index fbfb5e9a933..000
--- a/www-apps/tt-rss/tt-rss-20190523.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix user webapp
-

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

2019-05-27 Thread James Le Cuirot

commit: 1739782a1da3558caf00d3ddecdc8e8cfb75af14
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon May 27 21:18:19 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon May 27 21:18:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1739782a

www-apps/tt-rss: Version bump to 20190523, EAPI 7

This is just an arbitrary snapshot, it seems to work.

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/Manifest  |  1 +
 ...{tt-rss-.ebuild => tt-rss-20190523.ebuild} | 19 ---
 www-apps/tt-rss/tt-rss-.ebuild|  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

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

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-20190523.ebuild
similarity index 85%
copy from www-apps/tt-rss/tt-rss-.ebuild
copy to www-apps/tt-rss/tt-rss-20190523.ebuild
index 1f943ca2154..fbfb5e9a933 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-20190523.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit git-r3 prefix user webapp
+inherit prefix user webapp
 
+COMMIT="4a2836ea90c4c471029d189a8c9fe5ec10a9521b"
 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://git.tt-rss.org/git/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
 LICENSE="GPL-3"
-SLOT="${PV}" # Single live slot.
+KEYWORDS="~amd64 ~arm ~mips ~x86"
 IUSE="+acl daemon +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
@@ -24,6 +25,8 @@ DEPEND="!vhosts? ( ${DEPEND} )"
 
 need_httpd_cgi # From webapp.eclass
 
+S="${WORKDIR}/${PN}"
+
 pkg_setup() {
webapp_pkg_setup
 
@@ -38,6 +41,7 @@ src_configure() {
 
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 +80,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-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index 1f943ca2154..1f6d41d337b 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit git-r3 prefix user webapp

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

2019-05-26 Thread James Le Cuirot

commit: 28446e089cef6c3e7bf5f0cc89f4ec99d8b352b6
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 26 21:01:20 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 26 21:01:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28446e08

www-apps/tt-rss: intl USE flag on PHP required now

Closes: https://bugs.gentoo.org/686600
Package-Manager: Portage-2.3.67, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 www-apps/tt-rss/tt-rss-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
index b611aa54bd7..1f943ca2154 100644
--- a/www-apps/tt-rss/tt-rss-.ebuild
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,8 +16,8 @@ REQUIRED_USE="|| ( mysqli postgres )"
 DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
 
 RDEPEND="${DEPEND}
-   daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,pcntl,pdo] )
-   !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,pdo] )
+   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} )"

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

2018-02-11 Thread Michał Górny

commit: d8c6e1d3ec95cc1c4e58f19d2aba0f3381b59396
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Feb 11 11:21:14 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 11 11:36:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c6e1d3

www-apps/tt-rss: Remove useless maintainer 

Remove useless/redundant maintainer . It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 www-apps/tt-rss/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www-apps/tt-rss/metadata.xml b/www-apps/tt-rss/metadata.xml
index 388039cd655..6605b067508 100644
--- a/www-apps/tt-rss/metadata.xml
+++ b/www-apps/tt-rss/metadata.xml
@@ -4,7 +4,6 @@

ch...@gentoo.org
James Le Cuirot
-   Maintainer


Install additional init scripts for 
automated RSS updates

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

2018-01-18 Thread James Le Cuirot

commit: 9605ea072743f9a1a27eaf8437de2a41a263bdaf
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jan 18 13:39:08 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 18 13:43:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9605ea07

www-apps/tt-rss: Bump to 20180105, security fix, other fixes

* Addresses unsafe use of recursive chown/chmod in the init script
  whilst also dealing with poor permissions handling that may have led
  to issues in the past.
* Fixes "postgresql" misspelling in the init script.
* Fixes logrotate issue using delaycompress directive.
* Allows options to be passed to the daemon.

Bug: https://bugs.gentoo.org/603518
Closes: https://bugs.gentoo.org/609044
Closes: https://bugs.gentoo.org/620878
Closes: https://bugs.gentoo.org/627048
Closes: https://bugs.gentoo.org/639918
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 www-apps/tt-rss/Manifest   |  1 +
 www-apps/tt-rss/files/permissions  | 25 ++
 .../tt-rss/files/postinstall-en-with-daemon-r1.txt | 14 
 .../tt-rss/files/postinstall-en-with-daemon.txt|  2 +-
 www-apps/tt-rss/files/postinstall-en.txt   |  7 +-
 www-apps/tt-rss/files/ttrssd.confd-r2  | 47 
 www-apps/tt-rss/files/ttrssd.initd-r3  | 88 ++
 www-apps/tt-rss/files/ttrssd.logrotated|  1 +
 .../{ttrssd.logrotated => ttrssd.logrotated-r1}|  3 +-
 www-apps/tt-rss/tt-rss-20180105.ebuild | 84 +
 10 files changed, 264 insertions(+), 8 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index c04edba0436..2c45842b727 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,2 +1,3 @@
 DIST tt-rss-20160527.tar.bz2 2064633 BLAKE2B 
406c2ff551e2ba616a8f4696d7deaf8a3f85e4f86f0b09f57507af7f4657930f11fc0aa9df467af5ad2c56657d95e12b75bae721da4d86480b06bbbc0ab72744
 SHA512 
8d482303868a08f4d65ef252f71f66ec3219d4f67e968a026a0302d29930cd5af45cedea81171db2ff0927497079d3bedd8fd70e4e9904f5d9987a92a6dfcb89
 DIST tt-rss-20160930.tar.bz2 2072888 BLAKE2B 
e6ca0a72730cdf9a1106d7098e6a6bfc9bf35f545a67e9b569552644b23543b4168000afe2e5fbf5a1fd81371e72e570e270a77d5345bca5f22d79c1a86409b0
 SHA512 
d420e7efdf7d17e153ef0aa487a330379afe20fe9e9a6209de40b797d36e425cbcbdf2280eaf5ada8b9bef1ae37146253556ff602bbff22a9a7c311ff525d9e2
+DIST tt-rss-20180105.tar.gz 3070929 BLAKE2B 
2370104c70f5381d690a29b216269c749bf1f7c6b925eb9499b741e5df3e686d95fce430a144946fd915414481280b67e6d0c881edcdd13aee0fa344dc0bec3f
 SHA512 
86ceec3646629ad7fd3fde2f3c3237e48ad96bd08b46e73c34c76507d9b17613ea309e1bd5e6e85a0d9eb96029e54b54e5ee367c56aab31be3dcec9169c5ada5

diff --git a/www-apps/tt-rss/files/permissions 
b/www-apps/tt-rss/files/permissions
new file mode 100644
index 000..a26b87f4e71
--- /dev/null
+++ b/www-apps/tt-rss/files/permissions
@@ -0,0 +1,25 @@
+#!/bin/bash -e
+
+cd "${MY_INSTALLDIR}"
+
+if [[ $1 = install ]]; then
+   # We need to lock down cache/ for the operations below to be
+   # safe. The permissions match the webapp-config defaults but these
+   # can be changed and existing installations may also differ.
+   chown root:root cache/
+   chmod 00755 cache/
+
+   chgrp --no-dereference ttrssd feed-icons/ lock/ cache/*/
+   chmod g+ws feed-icons/ lock/ cache/*/
+
+   # Files within lock/ are exclusively written by the update
+   # daemon. Files within feed-icons/ are always unlinked before
+   # modification. Only cache/ holds files that are modified in place
+   # by both processes and therefore ACLs are required to ensure that
+   # the files themselves are created as group writable.
+   if ! setfacl --modify d:g::rwX cache/*/; then
+   echo "WARNING: ACLs are not available on this filesystem. 
Either enable them or set TTRSSD_USER to your PHP user in /etc/conf.d/ttrssd to 
avoid permission issues."
+   elif [[ -n $(find cache/ -type f ! -name ".*" ! \( -group ttrssd -perm 
-020 \) -print -quit) ]]; then
+   echo "WARNING: Files that are not writable by the ttrssd group 
found within the cache directory. Either delete them or correct their 
permissions."
+   fi
+fi

diff --git a/www-apps/tt-rss/files/postinstall-en-with-daemon-r1.txt 
b/www-apps/tt-rss/files/postinstall-en-with-daemon-r1.txt
new file mode 100644
index 000..8c72406d76d
--- /dev/null
+++ b/www-apps/tt-rss/files/postinstall-en-with-daemon-r1.txt
@@ -0,0 +1,14 @@
+Please read https://tt-rss.org/wiki/InstallationNotes.
+
+Once you have configured TT-RSS, tweak /etc/conf.d/ttrssd to your
+needs if you have not already done so. If ACLs are unavailable on the
+filesystem you have just installed to then you will need to set
+TTRSSD_USER to your PHP user. When everything is ready, (re)start the
+update daemon like so:
+
+  /etc/init.d/ttrssd restart
+
+This will periodically update your feeds in

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

2018-01-18 Thread James Le Cuirot

commit: 0a44f2b78a7d114b0de6cf05f8ae19f4d82bbf74
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jan 18 13:41:26 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 18 13:43:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a44f2b7

www-apps/tt-rss: Drop vulnerable 20160527 and 20160930 versions

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 www-apps/tt-rss/Manifest   |  2 -
 .../tt-rss/files/postinstall-en-with-daemon.txt| 19 -
 www-apps/tt-rss/files/ttrssd.confd-r1  | 14 
 www-apps/tt-rss/files/ttrssd.initd-r2  | 83 
 www-apps/tt-rss/files/ttrssd.logrotated|  9 ---
 www-apps/tt-rss/tt-rss-20160527.ebuild | 88 --
 www-apps/tt-rss/tt-rss-20160930.ebuild | 88 --
 7 files changed, 303 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 2c45842b727..1f555aa5e71 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,3 +1 @@
-DIST tt-rss-20160527.tar.bz2 2064633 BLAKE2B 
406c2ff551e2ba616a8f4696d7deaf8a3f85e4f86f0b09f57507af7f4657930f11fc0aa9df467af5ad2c56657d95e12b75bae721da4d86480b06bbbc0ab72744
 SHA512 
8d482303868a08f4d65ef252f71f66ec3219d4f67e968a026a0302d29930cd5af45cedea81171db2ff0927497079d3bedd8fd70e4e9904f5d9987a92a6dfcb89
-DIST tt-rss-20160930.tar.bz2 2072888 BLAKE2B 
e6ca0a72730cdf9a1106d7098e6a6bfc9bf35f545a67e9b569552644b23543b4168000afe2e5fbf5a1fd81371e72e570e270a77d5345bca5f22d79c1a86409b0
 SHA512 
d420e7efdf7d17e153ef0aa487a330379afe20fe9e9a6209de40b797d36e425cbcbdf2280eaf5ada8b9bef1ae37146253556ff602bbff22a9a7c311ff525d9e2
 DIST tt-rss-20180105.tar.gz 3070929 BLAKE2B 
2370104c70f5381d690a29b216269c749bf1f7c6b925eb9499b741e5df3e686d95fce430a144946fd915414481280b67e6d0c881edcdd13aee0fa344dc0bec3f
 SHA512 
86ceec3646629ad7fd3fde2f3c3237e48ad96bd08b46e73c34c76507d9b17613ea309e1bd5e6e85a0d9eb96029e54b54e5ee367c56aab31be3dcec9169c5ada5

diff --git a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt 
b/www-apps/tt-rss/files/postinstall-en-with-daemon.txt
deleted file mode 100644
index 25545842a38..000
--- a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Please read https://tt-rss.org/wiki/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 --git a/www-apps/tt-rss/files/ttrssd.confd-r1 
b/www-apps/tt-rss/files/ttrssd.confd-r1
deleted file mode 100644
index cf74794e22d..000
--- a/www-apps/tt-rss/files/ttrssd.confd-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# 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 --git a/www-apps/tt-rss/files/ttrssd.initd-r2 
b/www-apps/tt-rss/files/ttrssd.initd-r2
deleted file mode 100644
index d46d5890a1f..000
--- a/www-apps/tt-rss/files/ttrssd.initd-r2
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 lock feed-icons"
-BASE_PID="/run/ttrssd"
-
-checkconfig() {
-   local instance instancepidname 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
-
-   mkdir -p "${BASE_PID}"
-
-   # check instances for errors
-   for instance in

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

2018-01-18 Thread James Le Cuirot

commit: a8702879bddcad4b1113b7d5b9cd78a44b35053e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jan 18 13:42:55 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 18 13:43:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8702879

www-apps/tt-rss: Introduce live  version

There are no longer formal upstream releases so this may suit some
users better.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 www-apps/tt-rss/tt-rss-.ebuild | 87 ++
 1 file changed, 87 insertions(+)

diff --git a/www-apps/tt-rss/tt-rss-.ebuild 
b/www-apps/tt-rss/tt-rss-.ebuild
new file mode 100644
index 000..b611aa54bd7
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3 prefix user 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;
+LICENSE="GPL-3"
+SLOT="${PV}" # Single live slot.
+IUSE="+acl daemon +mysqli postgres"
+REQUIRED_USE="|| ( mysqli postgres )"
+
+DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
+
+RDEPEND="${DEPEND}
+   daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,pcntl,pdo] )
+   !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,pdo] )
+   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
+
+   sed -i -r \
+   -e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql 
or pgsql:" \
+   config.php-dist || die
+}
+
+src_install() {
+   webapp_src_preinst
+
+   insinto "${MY_HTDOCSDIR}"
+   doins -r *
+
+   # When updating, grep the plugins directory for additional CACHE_DIR
+   # instances as they cannot be created later due to permissions.
+   dodir "${MY_HTDOCSDIR}"/cache/starred-images
+
+   local dir
+   for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
+   webapp_serverowned "${dir#${ED}}"
+   done
+
+   if use daemon; then
+   webapp_hook_script "${FILESDIR}"/permissions
+   webapp_postinst_txt en 
"${FILESDIR}"/postinstall-en-with-daemon-r1.txt
+
+   newinitd "${FILESDIR}"/ttrssd.initd-r3 ttrssd
+   newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
+
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}"/ttrssd.logrotated-r1 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-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
+}

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

2017-11-26 Thread David Seifert

commit: eecbdd158e9a95479b9c294b1ac0308163283995
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 26 13:07:57 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 26 23:26:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eecbdd15

www-apps/tt-rss: [QA] Consistent whitespace in metadata.xml

 www-apps/tt-rss/metadata.xml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/www-apps/tt-rss/metadata.xml b/www-apps/tt-rss/metadata.xml
index 4c4d366632e..388039cd655 100644
--- a/www-apps/tt-rss/metadata.xml
+++ b/www-apps/tt-rss/metadata.xml
@@ -1,12 +1,12 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
- ch...@gentoo.org
- James Le Cuirot
- Maintainer
-
-
-   Install additional init scripts for automated RSS 
updates
-
+   
+   ch...@gentoo.org
+   James Le Cuirot
+   Maintainer
+   
+   
+   Install additional init scripts for 
automated RSS updates
+

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

2017-02-25 Thread Ulrich Müller

commit: dd648e8f7197bc3449fc9d8cabc28513d0e904be
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Feb 25 19:55:03 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb 25 19:56:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd648e8f

www-apps/tt-rss: [QA] Fix header.

 www-apps/tt-rss/files/ttrssd.confd-r1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/tt-rss/files/ttrssd.confd-r1 
b/www-apps/tt-rss/files/ttrssd.confd-r1
index 2987c4338f..3516e9c920 100644
--- a/www-apps/tt-rss/files/ttrssd.confd-r1
+++ b/www-apps/tt-rss/files/ttrssd.confd-r1
@@ -1,5 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
-# # Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # Path to TT-RSS instances which should have running update daemon.

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

2017-02-14 Thread David Seifert

commit: 960375d3fa39a1d4e7e26a260ec0f246af407bbe
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Feb 14 19:16:04 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Feb 14 21:39:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960375d3

www-apps/tt-rss: remove unused init file

Closes: https://github.com/gentoo/gentoo/pull/3971

 www-apps/tt-rss/files/ttrssd.initd-r1 | 73 ---
 1 file changed, 73 deletions(-)

diff --git a/www-apps/tt-rss/files/ttrssd.initd-r1 
b/www-apps/tt-rss/files/ttrssd.initd-r1
deleted file mode 100644
index bceb9ffce2..00
--- a/www-apps/tt-rss/files/ttrssd.initd-r1
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 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  --retry 30 \
-   --exec /usr/bin/php -- -f 
"${instance}/update_daemon2.php"
-   eend $?
-   rm -f ${instance}/lock/*.lock
-   done
-}

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

2017-01-07 Thread James Le Cuirot

commit: bf929d061f025997cfe5b703defb4b7598a72d6d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  7 15:56:26 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  7 15:56:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf929d06

www-apps/tt-rss: Take over as maintainer

Package-Manager: portage-2.3.3

 www-apps/tt-rss/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/tt-rss/metadata.xml b/www-apps/tt-rss/metadata.xml
index 5a2d4a7..4c4d366 100644
--- a/www-apps/tt-rss/metadata.xml
+++ b/www-apps/tt-rss/metadata.xml
@@ -2,8 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
 
- to...@gentoo.org
- Thomas Kahle
+ ch...@gentoo.org
+ James Le Cuirot
  Maintainer

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

2016-10-12 Thread Thomas Kahle

commit: ba7b2200112f1aa1381176241cce2147e42f964a
Author: Thomas Kahle  gentoo  org>
AuthorDate: Wed Oct 12 21:10:59 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Wed Oct 12 21:25:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7b2200

www-apps/tt-rss: Fix mysql->mysqli transition

Package-Manager: portage-2.3.0

 www-apps/tt-rss/tt-rss-20160527.ebuild | 2 +-
 www-apps/tt-rss/tt-rss-20160930.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-20160527.ebuild 
b/www-apps/tt-rss/tt-rss-20160527.ebuild
index 8c401c9..8b5964d 100644
--- a/www-apps/tt-rss/tt-rss-20160527.ebuild
+++ b/www-apps/tt-rss/tt-rss-20160527.ebuild
@@ -38,7 +38,7 @@ 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
+   if use mysqli && ! use postgres; then
sed -i \
-e "/define('DB_TYPE',/{s:pgsql:mysql:}" \
config.php-dist || die

diff --git a/www-apps/tt-rss/tt-rss-20160930.ebuild 
b/www-apps/tt-rss/tt-rss-20160930.ebuild
index 8c401c9..8b5964d 100644
--- a/www-apps/tt-rss/tt-rss-20160930.ebuild
+++ b/www-apps/tt-rss/tt-rss-20160930.ebuild
@@ -38,7 +38,7 @@ 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
+   if use mysqli && ! use postgres; then
sed -i \
-e "/define('DB_TYPE',/{s:pgsql:mysql:}" \
config.php-dist || die

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

2016-10-12 Thread Thomas Kahle

commit: 782a4c1b1d2cb5691ff216481bccd23876c9da9a
Author: Thomas Kahle  gentoo  org>
AuthorDate: Wed Oct 12 07:38:19 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Wed Oct 12 07:38:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782a4c1b

www-apps/tt-rss: Switch to mysqli interface

Fixes bug 595760.

Package-Manager: portage-2.3.0

 www-apps/tt-rss/tt-rss-20160527.ebuild | 8 
 www-apps/tt-rss/tt-rss-20160930.ebuild | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/www-apps/tt-rss/tt-rss-20160527.ebuild 
b/www-apps/tt-rss/tt-rss-20160527.ebuild
index 7cfd32c..8c401c9 100644
--- a/www-apps/tt-rss/tt-rss-20160527.ebuild
+++ b/www-apps/tt-rss/tt-rss-20160527.ebuild
@@ -12,16 +12,16 @@ SRC_URI="https://dev.gentoo.org/~tomka/files/${P}.tar.bz2;
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="daemon +mysql postgres"
+IUSE="daemon +mysqli postgres"
 
 DEPEND="
-   daemon? ( dev-lang/php:*[mysql?,postgres?,pcntl,curl] )
-   !daemon? ( dev-lang/php:*[mysql?,postgres?,curl] )
+   daemon? ( dev-lang/php:*[mysqli?,postgres?,pcntl,curl] )
+   !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl] )
virtual/httpd-php:*
 "
 RDEPEND="${DEPEND}"
 
-REQUIRED_USE="|| ( mysql postgres )"
+REQUIRED_USE="|| ( mysqli postgres )"
 
 need_httpd_cgi  # From webapp.eclass
 

diff --git a/www-apps/tt-rss/tt-rss-20160930.ebuild 
b/www-apps/tt-rss/tt-rss-20160930.ebuild
index 7cfd32c..8c401c9 100644
--- a/www-apps/tt-rss/tt-rss-20160930.ebuild
+++ b/www-apps/tt-rss/tt-rss-20160930.ebuild
@@ -12,16 +12,16 @@ SRC_URI="https://dev.gentoo.org/~tomka/files/${P}.tar.bz2;
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="daemon +mysql postgres"
+IUSE="daemon +mysqli postgres"
 
 DEPEND="
-   daemon? ( dev-lang/php:*[mysql?,postgres?,pcntl,curl] )
-   !daemon? ( dev-lang/php:*[mysql?,postgres?,curl] )
+   daemon? ( dev-lang/php:*[mysqli?,postgres?,pcntl,curl] )
+   !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl] )
virtual/httpd-php:*
 "
 RDEPEND="${DEPEND}"
 
-REQUIRED_USE="|| ( mysql postgres )"
+REQUIRED_USE="|| ( mysqli postgres )"
 
 need_httpd_cgi  # From webapp.eclass

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

2016-09-30 Thread Thomas Kahle

commit: 34b36ba27dca91e886e07d29e6bc03d77781c0a0
Author: Thomas Kahle  gentoo  org>
AuthorDate: Fri Sep 30 11:45:39 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Fri Sep 30 11:46:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b36ba2

www-apps/tt-rss: remove old

Package-Manager: portage-2.3.0

 www-apps/tt-rss/Manifest   |  1 -
 www-apps/tt-rss/tt-rss-20160124.ebuild | 89 --
 2 files changed, 90 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 5be60e8..b81fb86 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,3 +1,2 @@
-DIST tt-rss-20160124.tar.bz2 2059978 SHA256 
90706f133db74d86aba3f8488c99ed1c886948a92c64bdb7ecaca3c3129ddf59 SHA512 
d41ae8b2086e1e0ff2d69427fe9ccb8d0710e5acffe3137c408c01fc20cc3fbb30f2d4859624c14ac0ba4429deea91fa57f54b2a56a2e480f0352509610c3a25
 WHIRLPOOL 
09b4c5515c8a19c3cfcd330761fcb9534185df8cb3ef7832c28f0200d15846b031817e72204cf28881101ad2ecc867ad4369f22afef9947b8b82521feb07083b
 DIST tt-rss-20160527.tar.bz2 2064633 SHA256 
fd0beae76848eff39d9413820f9c575baf41283d2635bdb0e37cfc286bcc3a2c SHA512 
8d482303868a08f4d65ef252f71f66ec3219d4f67e968a026a0302d29930cd5af45cedea81171db2ff0927497079d3bedd8fd70e4e9904f5d9987a92a6dfcb89
 WHIRLPOOL 
247ef0bc9d2049936a16340f2a5f26be8eb2d4d072d290d254ebc9666c81456f7d59271813be1ed3963537e6f86cf2b28f4447af8bcc559a64d8f2ce0d7f6952
 DIST tt-rss-20160930.tar.bz2 2072888 SHA256 
5a7ff9d2e71cca0afb534558f4069264433eeaccf5cb02f425f06bbb7870d8db SHA512 
d420e7efdf7d17e153ef0aa487a330379afe20fe9e9a6209de40b797d36e425cbcbdf2280eaf5ada8b9bef1ae37146253556ff602bbff22a9a7c311ff525d9e2
 WHIRLPOOL 
0da0f79cedda6be728f03a0e626cad610576cfad0165ad0e2ddbc54ee0ba778a935be131265874ee0e63cee8fcf620fd275d0588534f9cd5bc4505afe032d663

diff --git a/www-apps/tt-rss/tt-rss-20160124.ebuild 
b/www-apps/tt-rss/tt-rss-20160124.ebuild
deleted file mode 100644
index a8c5261..
--- a/www-apps/tt-rss/tt-rss-20160124.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="https://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
-}

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

2016-09-30 Thread Thomas Kahle

commit: 43bd7a3d2e06ed606c211df580a1bb09c18a916b
Author: Thomas Kahle  gentoo  org>
AuthorDate: Fri Sep 30 11:45:15 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Fri Sep 30 11:45:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43bd7a3d

www-apps/tt-rss: Bump to current git (rolling release)

Package-Manager: portage-2.3.0

 www-apps/tt-rss/Manifest   |  1 +
 www-apps/tt-rss/tt-rss-20160930.ebuild | 89 ++
 2 files changed, 90 insertions(+)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 8e198b5..5be60e8 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,2 +1,3 @@
 DIST tt-rss-20160124.tar.bz2 2059978 SHA256 
90706f133db74d86aba3f8488c99ed1c886948a92c64bdb7ecaca3c3129ddf59 SHA512 
d41ae8b2086e1e0ff2d69427fe9ccb8d0710e5acffe3137c408c01fc20cc3fbb30f2d4859624c14ac0ba4429deea91fa57f54b2a56a2e480f0352509610c3a25
 WHIRLPOOL 
09b4c5515c8a19c3cfcd330761fcb9534185df8cb3ef7832c28f0200d15846b031817e72204cf28881101ad2ecc867ad4369f22afef9947b8b82521feb07083b
 DIST tt-rss-20160527.tar.bz2 2064633 SHA256 
fd0beae76848eff39d9413820f9c575baf41283d2635bdb0e37cfc286bcc3a2c SHA512 
8d482303868a08f4d65ef252f71f66ec3219d4f67e968a026a0302d29930cd5af45cedea81171db2ff0927497079d3bedd8fd70e4e9904f5d9987a92a6dfcb89
 WHIRLPOOL 
247ef0bc9d2049936a16340f2a5f26be8eb2d4d072d290d254ebc9666c81456f7d59271813be1ed3963537e6f86cf2b28f4447af8bcc559a64d8f2ce0d7f6952
+DIST tt-rss-20160930.tar.bz2 2072888 SHA256 
5a7ff9d2e71cca0afb534558f4069264433eeaccf5cb02f425f06bbb7870d8db SHA512 
d420e7efdf7d17e153ef0aa487a330379afe20fe9e9a6209de40b797d36e425cbcbdf2280eaf5ada8b9bef1ae37146253556ff602bbff22a9a7c311ff525d9e2
 WHIRLPOOL 
0da0f79cedda6be728f03a0e626cad610576cfad0165ad0e2ddbc54ee0ba778a935be131265874ee0e63cee8fcf620fd275d0588534f9cd5bc4505afe032d663

diff --git a/www-apps/tt-rss/tt-rss-20160930.ebuild 
b/www-apps/tt-rss/tt-rss-20160930.ebuild
new file mode 100644
index ..7cfd32c
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20160930.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="https://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
+}

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

2016-05-27 Thread Thomas Kahle

commit: 35b80a0118b252bb92253e661ff6451b0c25313e
Author: Thomas Kahle  gentoo  org>
AuthorDate: Fri May 27 11:45:32 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Fri May 27 11:46:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b80a01

www-apps/tt-rss: bump

Package-Manager: portage-2.3.0_rc1

 www-apps/tt-rss/Manifest   |  1 +
 www-apps/tt-rss/tt-rss-20160527.ebuild | 89 ++
 2 files changed, 90 insertions(+)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 82a1688..304245b 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,2 +1,3 @@
 DIST tt-rss-20150924.tar.bz2 2089704 SHA256 
e66521e806014c094181839c9d446fdfbae18a91cf99fccc9e9f6d27f46d SHA512 
b97cf54e4988caac67c5a0985ce7dac9ac2c60f9bedc86d29c83e939082f988cea0de02433b72d9238980e6bb32dea1e10a867ca8cd9ad084f8d7690bf76d3c9
 WHIRLPOOL 
7add018455697283f11471f3ae967bdb48b447d492972b8a92b77b0f034d6ad297c30c49173233f0b54985837ba51799ad1195a482da86939392e6629b6c89c2
 DIST tt-rss-20160124.tar.bz2 2059978 SHA256 
90706f133db74d86aba3f8488c99ed1c886948a92c64bdb7ecaca3c3129ddf59 SHA512 
d41ae8b2086e1e0ff2d69427fe9ccb8d0710e5acffe3137c408c01fc20cc3fbb30f2d4859624c14ac0ba4429deea91fa57f54b2a56a2e480f0352509610c3a25
 WHIRLPOOL 
09b4c5515c8a19c3cfcd330761fcb9534185df8cb3ef7832c28f0200d15846b031817e72204cf28881101ad2ecc867ad4369f22afef9947b8b82521feb07083b
+DIST tt-rss-20160527.tar.bz2 2064633 SHA256 
fd0beae76848eff39d9413820f9c575baf41283d2635bdb0e37cfc286bcc3a2c SHA512 
8d482303868a08f4d65ef252f71f66ec3219d4f67e968a026a0302d29930cd5af45cedea81171db2ff0927497079d3bedd8fd70e4e9904f5d9987a92a6dfcb89
 WHIRLPOOL 
247ef0bc9d2049936a16340f2a5f26be8eb2d4d072d290d254ebc9666c81456f7d59271813be1ed3963537e6f86cf2b28f4447af8bcc559a64d8f2ce0d7f6952

diff --git a/www-apps/tt-rss/tt-rss-20160527.ebuild 
b/www-apps/tt-rss/tt-rss-20160527.ebuild
new file mode 100644
index 000..7cfd32c
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20160527.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="https://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
+}

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

2016-05-27 Thread Thomas Kahle

commit: 5f09d78d3c83fc54f10dea76008a6aa83e2b0ce0
Author: Thomas Kahle  gentoo  org>
AuthorDate: Fri May 27 11:46:08 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Fri May 27 11:46:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f09d78d

www-apps/tt-rss: remove old

Package-Manager: portage-2.3.0_rc1

 www-apps/tt-rss/Manifest   |  1 -
 www-apps/tt-rss/tt-rss-20150924.ebuild | 89 --
 2 files changed, 90 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 304245b..8e198b5 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,3 +1,2 @@
-DIST tt-rss-20150924.tar.bz2 2089704 SHA256 
e66521e806014c094181839c9d446fdfbae18a91cf99fccc9e9f6d27f46d SHA512 
b97cf54e4988caac67c5a0985ce7dac9ac2c60f9bedc86d29c83e939082f988cea0de02433b72d9238980e6bb32dea1e10a867ca8cd9ad084f8d7690bf76d3c9
 WHIRLPOOL 
7add018455697283f11471f3ae967bdb48b447d492972b8a92b77b0f034d6ad297c30c49173233f0b54985837ba51799ad1195a482da86939392e6629b6c89c2
 DIST tt-rss-20160124.tar.bz2 2059978 SHA256 
90706f133db74d86aba3f8488c99ed1c886948a92c64bdb7ecaca3c3129ddf59 SHA512 
d41ae8b2086e1e0ff2d69427fe9ccb8d0710e5acffe3137c408c01fc20cc3fbb30f2d4859624c14ac0ba4429deea91fa57f54b2a56a2e480f0352509610c3a25
 WHIRLPOOL 
09b4c5515c8a19c3cfcd330761fcb9534185df8cb3ef7832c28f0200d15846b031817e72204cf28881101ad2ecc867ad4369f22afef9947b8b82521feb07083b
 DIST tt-rss-20160527.tar.bz2 2064633 SHA256 
fd0beae76848eff39d9413820f9c575baf41283d2635bdb0e37cfc286bcc3a2c SHA512 
8d482303868a08f4d65ef252f71f66ec3219d4f67e968a026a0302d29930cd5af45cedea81171db2ff0927497079d3bedd8fd70e4e9904f5d9987a92a6dfcb89
 WHIRLPOOL 
247ef0bc9d2049936a16340f2a5f26be8eb2d4d072d290d254ebc9666c81456f7d59271813be1ed3963537e6f86cf2b28f4447af8bcc559a64d8f2ce0d7f6952

diff --git a/www-apps/tt-rss/tt-rss-20150924.ebuild 
b/www-apps/tt-rss/tt-rss-20150924.ebuild
deleted file mode 100644
index a8c5261..000
--- a/www-apps/tt-rss/tt-rss-20150924.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="https://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
-}

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

2016-01-24 Thread Thomas Kahle

commit: 29d881827363f2b8f3dddacf55c76d3d6fda1c9e
Author: Thomas Kahle  gentoo  org>
AuthorDate: Sun Jan 24 15:21:07 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Sun Jan 24 15:21:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d88182

www-apps/tt-rss: Remove old

Package-Manager: portage-2.2.26

 www-apps/tt-rss/Manifest   |  1 -
 www-apps/tt-rss/tt-rss-20150624.ebuild | 89 --
 2 files changed, 90 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 3aa83e6..82a1688 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,3 +1,2 @@
-DIST tt-rss-20150624.tar.bz2 2071177 SHA256 
544833ffbdb83497270aa3c3599ad78f58b23bbaf9d492a3b73bd156b806edc7 SHA512 
270f88ae84778cf2a5df1dcda2bdc58a0ed8f4988c124728d4aad29324dc86b1b0245c5b651c738febc9447a5533ca68e2655966409a45651c6df3a08e203c1e
 WHIRLPOOL 
8e30b32beb6eba33e6f87c06900804f6f1f3a11ec0ce4c565e7558577f2bea813e082e7d76acb83f0c0aa5a387ef8266f3fc218def482e9508c492e7df5b3b7a
 DIST tt-rss-20150924.tar.bz2 2089704 SHA256 
e66521e806014c094181839c9d446fdfbae18a91cf99fccc9e9f6d27f46d SHA512 
b97cf54e4988caac67c5a0985ce7dac9ac2c60f9bedc86d29c83e939082f988cea0de02433b72d9238980e6bb32dea1e10a867ca8cd9ad084f8d7690bf76d3c9
 WHIRLPOOL 
7add018455697283f11471f3ae967bdb48b447d492972b8a92b77b0f034d6ad297c30c49173233f0b54985837ba51799ad1195a482da86939392e6629b6c89c2
 DIST tt-rss-20160124.tar.bz2 2059978 SHA256 
90706f133db74d86aba3f8488c99ed1c886948a92c64bdb7ecaca3c3129ddf59 SHA512 
d41ae8b2086e1e0ff2d69427fe9ccb8d0710e5acffe3137c408c01fc20cc3fbb30f2d4859624c14ac0ba4429deea91fa57f54b2a56a2e480f0352509610c3a25
 WHIRLPOOL 
09b4c5515c8a19c3cfcd330761fcb9534185df8cb3ef7832c28f0200d15846b031817e72204cf28881101ad2ecc867ad4369f22afef9947b8b82521feb07083b

diff --git a/www-apps/tt-rss/tt-rss-20150624.ebuild 
b/www-apps/tt-rss/tt-rss-20150624.ebuild
deleted file mode 100644
index a8c5261..000
--- a/www-apps/tt-rss/tt-rss-20150624.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="https://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
-}

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

2016-01-24 Thread Thomas Kahle

commit: 46f8cb18100f1e8329eaf6651867cf7f4129359b
Author: Thomas Kahle  gentoo  org>
AuthorDate: Sun Jan 24 15:20:14 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Sun Jan 24 15:21:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f8cb18

www-apps/tt-rss: Bump to roling release 20160124

Package-Manager: portage-2.2.26

 www-apps/tt-rss/Manifest   |  1 +
 www-apps/tt-rss/tt-rss-20160124.ebuild | 89 ++
 2 files changed, 90 insertions(+)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index b0f59c4..3aa83e6 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,2 +1,3 @@
 DIST tt-rss-20150624.tar.bz2 2071177 SHA256 
544833ffbdb83497270aa3c3599ad78f58b23bbaf9d492a3b73bd156b806edc7 SHA512 
270f88ae84778cf2a5df1dcda2bdc58a0ed8f4988c124728d4aad29324dc86b1b0245c5b651c738febc9447a5533ca68e2655966409a45651c6df3a08e203c1e
 WHIRLPOOL 
8e30b32beb6eba33e6f87c06900804f6f1f3a11ec0ce4c565e7558577f2bea813e082e7d76acb83f0c0aa5a387ef8266f3fc218def482e9508c492e7df5b3b7a
 DIST tt-rss-20150924.tar.bz2 2089704 SHA256 
e66521e806014c094181839c9d446fdfbae18a91cf99fccc9e9f6d27f46d SHA512 
b97cf54e4988caac67c5a0985ce7dac9ac2c60f9bedc86d29c83e939082f988cea0de02433b72d9238980e6bb32dea1e10a867ca8cd9ad084f8d7690bf76d3c9
 WHIRLPOOL 
7add018455697283f11471f3ae967bdb48b447d492972b8a92b77b0f034d6ad297c30c49173233f0b54985837ba51799ad1195a482da86939392e6629b6c89c2
+DIST tt-rss-20160124.tar.bz2 2059978 SHA256 
90706f133db74d86aba3f8488c99ed1c886948a92c64bdb7ecaca3c3129ddf59 SHA512 
d41ae8b2086e1e0ff2d69427fe9ccb8d0710e5acffe3137c408c01fc20cc3fbb30f2d4859624c14ac0ba4429deea91fa57f54b2a56a2e480f0352509610c3a25
 WHIRLPOOL 
09b4c5515c8a19c3cfcd330761fcb9534185df8cb3ef7832c28f0200d15846b031817e72204cf28881101ad2ecc867ad4369f22afef9947b8b82521feb07083b

diff --git a/www-apps/tt-rss/tt-rss-20160124.ebuild 
b/www-apps/tt-rss/tt-rss-20160124.ebuild
new file mode 100644
index 000..a8c5261
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20160124.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="https://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
+}

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

2015-09-24 Thread Thomas Kahle

commit: 88a9c6fb57535c0a6a496072c46494d8e8d44ed3
Author: Thomas Kahle  gentoo  org>
AuthorDate: Thu Sep 24 12:23:28 2015 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Thu Sep 24 12:24:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a9c6fb

www-apps/tt-rss: Bump to new rolling release.

Package-Manager: portage-2.2.20.1

 www-apps/tt-rss/Manifest   |  1 +
 www-apps/tt-rss/tt-rss-20150924.ebuild | 89 ++
 2 files changed, 90 insertions(+)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index ce27bc1..9f14d15 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,2 +1,3 @@
 DIST tt-rss-20150304.tar.bz2 2021676 SHA256 
72ec8863c0697a311c3a7b641ade8be4a0e85674aead50bdf03637d76b4eeac3 SHA512 
6b26e6a4e0c41bd48efa3506b441adec7ef95c80c208784482e77a382ab4473d152f9ef6436c5e398563c76de634b99a1e1b13efeeb82d30659d4ccf21117ff7
 WHIRLPOOL 
799c8df18fb5b10c76ce3eb97be77611c0438be7f9b3cd9d4d85cde2d4951c5690b905b3938b574c1810d0ec81d1c246c62769b199a93c72ec0bb4564e56358f
 DIST tt-rss-20150624.tar.bz2 2071177 SHA256 
544833ffbdb83497270aa3c3599ad78f58b23bbaf9d492a3b73bd156b806edc7 SHA512 
270f88ae84778cf2a5df1dcda2bdc58a0ed8f4988c124728d4aad29324dc86b1b0245c5b651c738febc9447a5533ca68e2655966409a45651c6df3a08e203c1e
 WHIRLPOOL 
8e30b32beb6eba33e6f87c06900804f6f1f3a11ec0ce4c565e7558577f2bea813e082e7d76acb83f0c0aa5a387ef8266f3fc218def482e9508c492e7df5b3b7a
+DIST tt-rss-20150924.tar.bz2 2089704 SHA256 
e66521e806014c094181839c9d446fdfbae18a91cf99fccc9e9f6d27f46d SHA512 
b97cf54e4988caac67c5a0985ce7dac9ac2c60f9bedc86d29c83e939082f988cea0de02433b72d9238980e6bb32dea1e10a867ca8cd9ad084f8d7690bf76d3c9
 WHIRLPOOL 
7add018455697283f11471f3ae967bdb48b447d492972b8a92b77b0f034d6ad297c30c49173233f0b54985837ba51799ad1195a482da86939392e6629b6c89c2

diff --git a/www-apps/tt-rss/tt-rss-20150924.ebuild 
b/www-apps/tt-rss/tt-rss-20150924.ebuild
new file mode 100644
index 000..a8c5261
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20150924.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="https://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
+}

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

2015-09-24 Thread Thomas Kahle

commit: a1f2d71bf4145a75cad9e0c3a8361d84a6b06fe6
Author: Thomas Kahle  gentoo  org>
AuthorDate: Thu Sep 24 12:23:55 2015 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Thu Sep 24 12:24:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f2d71b

www-apps/tt-rss: Remove old.

Package-Manager: portage-2.2.20.1

 www-apps/tt-rss/Manifest   |  1 -
 www-apps/tt-rss/tt-rss-20150304.ebuild | 89 --
 2 files changed, 90 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 9f14d15..b0f59c4 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,3 +1,2 @@
-DIST tt-rss-20150304.tar.bz2 2021676 SHA256 
72ec8863c0697a311c3a7b641ade8be4a0e85674aead50bdf03637d76b4eeac3 SHA512 
6b26e6a4e0c41bd48efa3506b441adec7ef95c80c208784482e77a382ab4473d152f9ef6436c5e398563c76de634b99a1e1b13efeeb82d30659d4ccf21117ff7
 WHIRLPOOL 
799c8df18fb5b10c76ce3eb97be77611c0438be7f9b3cd9d4d85cde2d4951c5690b905b3938b574c1810d0ec81d1c246c62769b199a93c72ec0bb4564e56358f
 DIST tt-rss-20150624.tar.bz2 2071177 SHA256 
544833ffbdb83497270aa3c3599ad78f58b23bbaf9d492a3b73bd156b806edc7 SHA512 
270f88ae84778cf2a5df1dcda2bdc58a0ed8f4988c124728d4aad29324dc86b1b0245c5b651c738febc9447a5533ca68e2655966409a45651c6df3a08e203c1e
 WHIRLPOOL 
8e30b32beb6eba33e6f87c06900804f6f1f3a11ec0ce4c565e7558577f2bea813e082e7d76acb83f0c0aa5a387ef8266f3fc218def482e9508c492e7df5b3b7a
 DIST tt-rss-20150924.tar.bz2 2089704 SHA256 
e66521e806014c094181839c9d446fdfbae18a91cf99fccc9e9f6d27f46d SHA512 
b97cf54e4988caac67c5a0985ce7dac9ac2c60f9bedc86d29c83e939082f988cea0de02433b72d9238980e6bb32dea1e10a867ca8cd9ad084f8d7690bf76d3c9
 WHIRLPOOL 
7add018455697283f11471f3ae967bdb48b447d492972b8a92b77b0f034d6ad297c30c49173233f0b54985837ba51799ad1195a482da86939392e6629b6c89c2

diff --git a/www-apps/tt-rss/tt-rss-20150304.ebuild 
b/www-apps/tt-rss/tt-rss-20150304.ebuild
deleted file mode 100644
index 8d87994..000
--- a/www-apps/tt-rss/tt-rss-20150304.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="https://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
-
-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
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

36 matches

Site Navigation

Mail list logo

Footer information