Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/tt-rss/
Date: Mon, 27 May 2019 21:19:01
Message-Id: 1558991899.1739782a1da3558caf00d3ddecdc8e8cfb75af14.chewi@gentoo
1 commit: 1739782a1da3558caf00d3ddecdc8e8cfb75af14
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 27 21:18:19 2019 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon May 27 21:18:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1739782a
7
8 www-apps/tt-rss: Version bump to 20190523, EAPI 7
9
10 This is just an arbitrary snapshot, it seems to work.
11
12 Package-Manager: Portage-2.3.67, Repoman-2.3.13
13 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
14
15 www-apps/tt-rss/Manifest | 1 +
16 ...{tt-rss-99999999.ebuild => tt-rss-20190523.ebuild} | 19 ++++++++-----------
17 www-apps/tt-rss/tt-rss-99999999.ebuild | 2 +-
18 3 files changed, 10 insertions(+), 12 deletions(-)
19
20 diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
21 index 1f555aa5e71..3e143ce47d7 100644
22 --- a/www-apps/tt-rss/Manifest
23 +++ b/www-apps/tt-rss/Manifest
24 @@ -1 +1,2 @@
25 DIST tt-rss-20180105.tar.gz 3070929 BLAKE2B 2370104c70f5381d690a29b216269c749bf1f7c6b925eb9499b741e5df3e686d95fce430a144946fd915414481280b67e6d0c881edcdd13aee0fa344dc0bec3f SHA512 86ceec3646629ad7fd3fde2f3c3237e48ad96bd08b46e73c34c76507d9b17613ea309e1bd5e6e85a0d9eb96029e54b54e5ee367c56aab31be3dcec9169c5ada5
26 +DIST tt-rss-20190523.tar.gz 3336985 BLAKE2B 9f37c676b6ca263b09685ae66c4183b4b1fed2e37c2fb361aeeb15f877916967ebdb272fb60ce554c8a7596f74de7713ca2ff6c70bf1ae8a669da2bd702607e9 SHA512 22fbed0199503ecf3728ed4c2e199bbd9fc617b83ec3a09d80352512460ab9cf46abfe840143e62c747743975d2e5b9c9ce0bfb8498b8c6187ae567552a49213
27
28 diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-20190523.ebuild
29 similarity index 85%
30 copy from www-apps/tt-rss/tt-rss-99999999.ebuild
31 copy to www-apps/tt-rss/tt-rss-20190523.ebuild
32 index 1f943ca2154..fbfb5e9a933 100644
33 --- a/www-apps/tt-rss/tt-rss-99999999.ebuild
34 +++ b/www-apps/tt-rss/tt-rss-20190523.ebuild
35 @@ -1,15 +1,16 @@
36 # Copyright 1999-2019 Gentoo Authors
37 # Distributed under the terms of the GNU General Public License v2
38
39 -EAPI=6
40 +EAPI=7
41
42 -inherit git-r3 prefix user webapp
43 +inherit prefix user webapp
44
45 +COMMIT="4a2836ea90c4c471029d189a8c9fe5ec10a9521b"
46 DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
47 HOMEPAGE="https://tt-rss.org/"
48 -EGIT_REPO_URI="https://git.tt-rss.org/git/${PN}.git"
49 +SRC_URI="https://git.tt-rss.org/git/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
50 LICENSE="GPL-3"
51 -SLOT="${PV}" # Single live slot.
52 +KEYWORDS="~amd64 ~arm ~mips ~x86"
53 IUSE="+acl daemon +mysqli postgres"
54 REQUIRED_USE="|| ( mysqli postgres )"
55
56 @@ -24,6 +25,8 @@ DEPEND="!vhosts? ( ${DEPEND} )"
57
58 need_httpd_cgi # From webapp.eclass
59
60 +S="${WORKDIR}/${PN}"
61 +
62 pkg_setup() {
63 webapp_pkg_setup
64
65 @@ -38,6 +41,7 @@ src_configure() {
66
67 sed -i -r \
68 -e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql or pgsql:" \
69 + -e "/'CHECK_FOR_UPDATES'/s/true/false/" \
70 config.php-dist || die
71 }
72
73 @@ -76,12 +80,5 @@ src_install() {
74
75 pkg_postinst() {
76 elog "You need to merge config.php-dist into config.php manually when upgrading."
77 -
78 - if use vhosts && [[ -n ${REPLACING_VERSIONS} ]]; then
79 - elog
80 - elog "The live ebuild does not automatically upgrade your installations so"
81 - elog "don't forget to do so manually."
82 - fi
83 -
84 webapp_pkg_postinst
85 }
86
87 diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
88 index 1f943ca2154..1f6d41d337b 100644
89 --- a/www-apps/tt-rss/tt-rss-99999999.ebuild
90 +++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
91 @@ -1,7 +1,7 @@
92 # Copyright 1999-2019 Gentoo Authors
93 # Distributed under the terms of the GNU General Public License v2
94
95 -EAPI=6
96 +EAPI=7
97
98 inherit git-r3 prefix user webapp