From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- net-im/ricochet/Manifest | 4 ++-- net-im/ricochet/ricochet-1.1.4.ebuild | 15 ++++++++------- net-im/ricochet/ricochet-9999.ebuild | 17 +++++++++-------- 3 files changed, 19 insertions(+), 17 deletions(-) (limited to 'net-im/ricochet') diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest index d2797a948dd2..51a2abac8983 100644 --- a/net-im/ricochet/Manifest +++ b/net-im/ricochet/Manifest @@ -1,4 +1,4 @@ DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1 -EBUILD ricochet-1.1.4.ebuild 1190 BLAKE2B e8b9b1dc7bfb57d74fad09bad7a7e6f97927bf52b7025bba8b9e487f7a08853fe5d60a699cc7cc7213e0d3bb877a2628c3462d38ec3f15d12de71943cee0c24a SHA512 e6fffbdaae86941cfbe89bb9ad70790a558d9a3df6dd7f2f6749013a4a4457626112a0052c790f78ca7f4d621a739ef54b29c306298eec196ab89c6605699325 -EBUILD ricochet-9999.ebuild 1391 BLAKE2B d8242a52a85a56c9bc78c6d4eb98e9a58d78f4b564d362e048c780a515c86e75b18a88a69c841c1448781a24e6cb4b44dba4779210677c598aebb574b21f17ff SHA512 1fe3d74db80e54efbf1847ee5e9697c96474c229a9ac47a2513820b2d895c64ada324c5cb98d83dfdfad922c92251ebbbd5a44a95c8c62e87a082df85cc6f77b +EBUILD ricochet-1.1.4.ebuild 1189 BLAKE2B 3fb8f5b0ebc1f430685ddcbebc45fb147aebe5a6d700c7235081c1751ce3d7c1bee9ed470b12ea841b816e9ebf880003db4d6c7a6ede2e045996bf49e445ba69 SHA512 3f29132f06e5bf9585edf41b8223530fb924719c4329c1ac7978cfe69c759e65ebda4e98d3d198e5d0f8a0bf490aad650ad7708bf9133fa59d9dec53be80443f +EBUILD ricochet-9999.ebuild 1386 BLAKE2B de9f48d1c8f32a1e6da667c1c6ec1ec8d8de17358fa0b8f808bdf6d6c9983e9c2ad17bd3ab2f512c242bad1d415ffb125702455f4336f3b6bb99f852df5a9165 SHA512 07d4cb78a76185e183f0aab83f39d01f0bab8b47f3845816c3ba31ce6cfa5f0c876da95386a9d98f9e42808ed58be8d1a34f965221aff14852a9c9feb2e5d553 MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845 diff --git a/net-im/ricochet/ricochet-1.1.4.ebuild b/net-im/ricochet/ricochet-1.1.4.ebuild index b26be1ac4f28..44bcd7daf218 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 b770332effdf..2caa9d50609c 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 } -- cgit v1.2.3