[gentoo-commits] repo/gentoo:master commit in: net-im/ricochet/

[Andreas Sturmlechner]

commit:     fe5389275a22171e813d9549e678d57419372eca
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 11:23:41 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 14:29:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe538927

net-im/ricochet: EAPI-7 bump, use xdg-utils.eclass

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-im/ricochet/ricochet-1.1.4.ebuild | 15 ++++++++-------
 net-im/ricochet/ricochet-9999.ebuild  | 17 +++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/net-im/ricochet/ricochet-1.1.4.ebuild 
b/net-im/ricochet/ricochet-1.1.4.ebuild
index b26be1ac4f2..44bcd7daf21 100644
--- a/net-im/ricochet/ricochet-1.1.4.ebuild
+++ b/net-im/ricochet/ricochet-1.1.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils qmake-utils
+inherit qmake-utils xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/ricochet-im/ricochet";
 else
@@ -31,7 +31,8 @@ RDEPEND="
        dev-qt/qtquickcontrols:5
        dev-qt/qtwidgets:5
        net-vpn/tor"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
        dev-qt/linguist-tools:5
        virtual/pkgconfig"
 
@@ -48,9 +49,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }
 
 pkg_postrm() {
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }

diff --git a/net-im/ricochet/ricochet-9999.ebuild 
b/net-im/ricochet/ricochet-9999.ebuild
index b770332effd..2caa9d50609 100644
--- a/net-im/ricochet/ricochet-9999.ebuild
+++ b/net-im/ricochet/ricochet-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils qmake-utils
+inherit qmake-utils xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/ricochet-im/ricochet";
 else
@@ -31,12 +31,13 @@ RDEPEND="
        dev-qt/qtquickcontrols:5
        dev-qt/qtwidgets:5
        net-vpn/tor"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
        dev-qt/linguist-tools:5
        virtual/pkgconfig"
 
 src_prepare() {
-       eapply_user
+       default
 
        # workaround bug https://github.com/ricochet-im/ricochet/issues/582
        cp contrib/usr.bin.ricochet-apparmor contrib/usr.bin.ricochet
@@ -56,9 +57,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }
 
 pkg_postrm() {
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }