1 |
* Drop REPLACING_VERSIONS warning (to be replaced by a news item) |
2 |
|
3 |
* Drop MPL-2.0 license (no occurences in the source code) |
4 |
|
5 |
Signed-off-by: Anna Vyalkova <cyber+gentoo@×××××.in> |
6 |
--- |
7 |
This patch is the same as previous one except it doesn't include a news item. |
8 |
|
9 |
net-news/rssguard/Manifest | 2 +- |
10 |
.../{rssguard-4.0.3.ebuild => rssguard-4.0.4.ebuild} | 11 +---------- |
11 |
2 files changed, 2 insertions(+), 11 deletions(-) |
12 |
rename net-news/rssguard/{rssguard-4.0.3.ebuild => rssguard-4.0.4.ebuild} (74%) |
13 |
|
14 |
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest |
15 |
index e176bc34ad1..e45d6f14dd1 100644 |
16 |
--- a/net-news/rssguard/Manifest |
17 |
+++ b/net-news/rssguard/Manifest |
18 |
@@ -1,2 +1,2 @@ |
19 |
DIST rssguard-3.9.2.tar.gz 13607587 BLAKE2B 45b3dd406e64bb13a19580255971b0d5eb1fd90d70d8559c736366af7792e7fc0627ee254dce79936ce6a179399271958b7795279a359306e345ec086081fc37 SHA512 30d2524f4ca42d903a047fe39de925268a1aac65192a8b1089b6ec0ec0a9dfef09c535fe391f750149063c06e3275b2632cc2ea2c24ded178760070abcea4958 |
20 |
-DIST rssguard-4.0.3.tar.gz 14427592 BLAKE2B d01969e10eddd837d9e6541e573e6a5bd353eed8cc78508591340ffc354de877b392b79c80f4df725d06be84363412615fa941cc0895fddfd6c9b2e9751bdda9 SHA512 831b99d0b320338bf497ad1ca67120c5b2ee806c61fc1b82b08debc1904222757c3bf3aa068ea7e37bee93be061d444204e6982d2fb0ece2f26f8b4004f7132e |
21 |
+DIST rssguard-4.0.4.tar.gz 14433147 BLAKE2B 6453d16cb440117c335d6773e675399ae4bee2d9226a2e920ffd1e10cc2d5025fc4c302357974352fad41f637aa33c3b66af2444d969f5e934d7432a16b7cb24 SHA512 8c69ec372a54e7e1ad4ff15476d2387fc84cd9d29c5031f9e5c18dcdf833781c54417101f252d23868eedc91262a9ac6446eb09104f5707b08fa92342d565481 |
22 |
diff --git a/net-news/rssguard/rssguard-4.0.3.ebuild b/net-news/rssguard/rssguard-4.0.4.ebuild |
23 |
similarity index 74% |
24 |
rename from net-news/rssguard/rssguard-4.0.3.ebuild |
25 |
rename to net-news/rssguard/rssguard-4.0.4.ebuild |
26 |
index 8f40201072b..9fbe9cc1ee9 100644 |
27 |
--- a/net-news/rssguard/rssguard-4.0.3.ebuild |
28 |
+++ b/net-news/rssguard/rssguard-4.0.4.ebuild |
29 |
@@ -1,75 +1,66 @@ |
30 |
# Copyright 1999-2021 Gentoo Authors |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
|
33 |
EAPI=8 |
34 |
|
35 |
inherit flag-o-matic optfeature qmake-utils xdg |
36 |
|
37 |
DESCRIPTION="Simple (yet powerful) feed reader" |
38 |
HOMEPAGE="https://github.com/martinrotter/rssguard" |
39 |
SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
40 |
|
41 |
-LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT MPL-2.0" |
42 |
+LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT" |
43 |
SLOT="0" |
44 |
KEYWORDS="~amd64" |
45 |
IUSE="debug webengine" |
46 |
|
47 |
BDEPEND="dev-qt/linguist-tools:5" |
48 |
DEPEND=" |
49 |
dev-qt/qtcore:5 |
50 |
dev-qt/qtdbus:5 |
51 |
dev-qt/qtdeclarative:5 |
52 |
dev-qt/qtgui:5 |
53 |
dev-qt/qtmultimedia:5 |
54 |
dev-qt/qtnetwork:5[ssl] |
55 |
dev-qt/qtsql:5 |
56 |
dev-qt/qtwidgets:5 |
57 |
dev-qt/qtxml:5 |
58 |
webengine? ( dev-qt/qtwebengine:5[widgets(+)] ) |
59 |
" |
60 |
RDEPEND="${DEPEND}" |
61 |
|
62 |
DOCS=( README.md resources/docs/Documentation.md ) |
63 |
|
64 |
-pkg_pretend() { |
65 |
- if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 4.0; then |
66 |
- ewarn "RSS Guard 4.x is NOT backwards compatible with 3.x line." |
67 |
- ewarn "You have to either export your feeds in OPML format or" |
68 |
- ewarn "manually update your database.db file to 4.x.x format:" |
69 |
- ewarn "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#migrating-user-data-from-392-to-4xx" |
70 |
- fi |
71 |
-} |
72 |
- |
73 |
src_prepare() { |
74 |
default |
75 |
sed -e 's:$$PREFIX/lib:$$PREFIX/'$(get_libdir)':' -i pri/install.pri || die |
76 |
} |
77 |
|
78 |
src_configure() { |
79 |
eqmake5_args=( |
80 |
CONFIG+=$(usex debug debug release) |
81 |
USE_WEBENGINE=$(usex webengine true false) |
82 |
PREFIX="${EPREFIX}"/usr |
83 |
INSTALL_ROOT=. |
84 |
) |
85 |
|
86 |
# https://github.com/martinrotter/rssguard/issues/156 |
87 |
is-flagq "-flto*" && eqmake5_args+=( CONFIG+=ltcg ) |
88 |
|
89 |
eqmake5 "${eqmake5_args[@]}" |
90 |
} |
91 |
|
92 |
src_install() { |
93 |
emake -j1 install INSTALL_ROOT="${D}" |
94 |
einstalldocs |
95 |
} |
96 |
|
97 |
pkg_postinst() { |
98 |
xdg_pkg_postinst |
99 |
|
100 |
if use webengine; then |
101 |
optfeature "ad blocking functionality" net-libs/nodejs[npm] |
102 |
elog "Adblocker module requires additional npm modules to be installed:" |
103 |
elog "npm i -g @cliqz/adblocker tldts-experimental" |
104 |
fi |
105 |
} |
106 |
-- |
107 |
2.33.1 |