[gentoo-commits] repo/gentoo:master commit in: net-news/rssguard/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     04163fb434f6fcf0fcd00746f8dc10b18a7ab62c
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Oct 30 06:21:20 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 06:21:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04163fb4

net-news/rssguard: add 4.0.4, drop 4.0.3

* Drop REPLACING_VERSIONS warning (to be replaced by a news item)

* Drop MPL-2.0 license (no occurences in the source code)

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-news/rssguard/Manifest                                    |  2 +-
 .../rssguard/{rssguard-4.0.3.ebuild => rssguard-4.0.4.ebuild} | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index e176bc34ad1..e45d6f14dd1 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,2 +1,2 @@
 DIST rssguard-3.9.2.tar.gz 13607587 BLAKE2B 45b3dd406e64bb13a19580255971b0d5eb1fd90d70d8559c736366af7792e7fc0627ee254dce79936ce6a179399271958b7795279a359306e345ec086081fc37 SHA512 30d2524f4ca42d903a047fe39de925268a1aac65192a8b1089b6ec0ec0a9dfef09c535fe391f750149063c06e3275b2632cc2ea2c24ded178760070abcea4958
-DIST rssguard-4.0.3.tar.gz 14427592 BLAKE2B d01969e10eddd837d9e6541e573e6a5bd353eed8cc78508591340ffc354de877b392b79c80f4df725d06be84363412615fa941cc0895fddfd6c9b2e9751bdda9 SHA512 831b99d0b320338bf497ad1ca67120c5b2ee806c61fc1b82b08debc1904222757c3bf3aa068ea7e37bee93be061d444204e6982d2fb0ece2f26f8b4004f7132e
+DIST rssguard-4.0.4.tar.gz 14433147 BLAKE2B 6453d16cb440117c335d6773e675399ae4bee2d9226a2e920ffd1e10cc2d5025fc4c302357974352fad41f637aa33c3b66af2444d969f5e934d7432a16b7cb24 SHA512 8c69ec372a54e7e1ad4ff15476d2387fc84cd9d29c5031f9e5c18dcdf833781c54417101f252d23868eedc91262a9ac6446eb09104f5707b08fa92342d565481

diff --git a/net-news/rssguard/rssguard-4.0.3.ebuild b/net-news/rssguard/rssguard-4.0.4.ebuild
similarity index 74%
rename from net-news/rssguard/rssguard-4.0.3.ebuild
rename to net-news/rssguard/rssguard-4.0.4.ebuild
index 8f40201072b..9fbe9cc1ee9 100644
--- a/net-news/rssguard/rssguard-4.0.3.ebuild
+++ b/net-news/rssguard/rssguard-4.0.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Simple (yet powerful) feed reader"
 HOMEPAGE="https://github.com/martinrotter/rssguard"
 SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT MPL-2.0"
+LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug webengine"
@@ -31,15 +31,6 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md resources/docs/Documentation.md )
 
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 4.0; then
-		ewarn "RSS Guard 4.x is NOT backwards compatible with 3.x line."
-		ewarn "You have to either export your feeds in OPML format or"
-		ewarn "manually update your database.db file to 4.x.x format:"
-		ewarn "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#migrating-user-data-from-392-to-4xx"
-	fi
-}
-
 src_prepare() {
 	default
 	sed -e 's:$$PREFIX/lib:$$PREFIX/'$(get_libdir)':' -i pri/install.pri || die