gentoo resync : 25.08.2020

5 files changed, 6 insertions, 57 deletions

diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest
index 9f1d8852cc98..89d55bedd221 100644
--- a/x11-misc/birdtray/Manifest
+++ b/x11-misc/birdtray/Manifest
@@ -1,8 +1,5 @@
-AUX birdtray-1.7.0-desktop_file_deprecated_category.patch 263 BLAKE2B 9a456d55e242112726f00bcf87041720b9ee56097c50d71e4bf3f318f49a8ad78224954c7eff764d31cd3ba520fb8c895984776a27a3f1b354837e77382cf023 SHA512 186cd5a80d5d2f32c82708f48d137a06aad506fd44bb6b188ec80cd6041e68bfbd33a16f123b79d67bb977836b2815893e221cc60a3e35388e34c3a45abecfe5
 AUX birdtray-1.8.1_qt515.patch 569 BLAKE2B 9575631ce63a01ead03240779f88ef2ea32e7a7467716cc185d01dcc698c6349d47a11d8b8926434926d52cb1d9166e3ac542861c50f1814dcdf8dcdf1e569e0 SHA512 7d0fd09166ad242beecc0319e639016701493605d85363070247ec558c218e5b8736778aa1f821c33ac0be9083a2ad01f7ec4a572fd21dee40363ce0eb041645
-DIST birdtray-1.7.0.tar.gz 398153 BLAKE2B 87e583ab55b828213f5da97a61c3fc710b381b46ab688f02b6d1c4d01a2577451375d7366f0406cf685f1366497204e985de7905b1635161e252c11b9456da61 SHA512 3c2940a3a0e405d3fce1cd0411437ffa56f76c458e42ea059de1bd3fca802621643be39c1a0df3fc3fb0deac2aa53f7631c4bee191efd4b48e591dd05b30a6ab
 DIST birdtray-1.8.1.tar.gz 767821 BLAKE2B 343fb902381396df2a9d49b619a6eaea620447276ee1c6261b8bb9667ea40d945da37522e1ddeac529d032549f3ca3288d6b780ff95b6adbc98a1dbea8fdeb10 SHA512 464bdaf1820cecb0bb9b41721389f24ce447c65e25f857998c4de5d3fb2aa53f03223938974e9bbdbfd4d719fb6aaecdf8a27c6e2ab7075b451bc8e73d8f07e7
-EBUILD birdtray-1.7.0-r1.ebuild 862 BLAKE2B 21c440df982cf6ed61053fc37571c2fa960a29a9d638c88b5bcde64fb3b13ace13035af186db2da7dd0f52871cbd6e97033dda8ea3118f38744177fa8db1a36a SHA512 1516790487053f202f379551554b9cccf96b1c2eb6d84037e60dabd1384df817f7c07a7acfebdbdfc070aa8795c43938a3ca098f9419f12a7ab2770cad91d9af
-EBUILD birdtray-1.8.1.ebuild 784 BLAKE2B 727c0d72b465fba168061ca5996f2bd160de992938d4ea2aa910fd6fb0eb5551cb733649bfc3785f77ced8cf0745ef22462bba896be592ddb8f8af0038838866 SHA512 e6b0ed12114660c95f89e06a149f438fe1412828ab5b89d17ba4316bb39cad67fe66918108025d46cf4f05f5e23a3806d8bdb9fee19e5875be2b7692678b5759
-EBUILD birdtray-9999.ebuild 739 BLAKE2B 5e86f0dda25dc8ba671cf1fea88f8defac4c051c7ae05004fbfe78950ddfe4131f0929bd7a7ed82731adcb48c225a56ad597306815ac6e9be3bac22a3779f86f SHA512 309b5a63ba487d1e0cfd52032c4395600120ca42bc4f599d77f81c6709b2fbe2ab0744e9bb658e85ff18fa086505e189acf3b0f2c7c117fddc9bf1ad54f352d7
+EBUILD birdtray-1.8.1.ebuild 834 BLAKE2B 3cf6afb885dd5a09a5255b6257f5a1fc1cda46a9d619490e69378e8eecd3880d5144d9106261507f0d7021f2af2a6d52005c8564e13343212399692ad9fb4b8c SHA512 f5dde7029b6a8ba5ca53515425505dc764eef09a1f80c1481125878252da8f6e370b6621fe0d48680146d4be338b3cb419a4eb793952ec6cf289c4fdfa79630b
+EBUILD birdtray-9999.ebuild 789 BLAKE2B 0bb40f99fedf9a15336fa68cae93dc7bad8b4cc47dede8c56c586b8a62df4b170bc947e21c3fd5c0ef01f21fee7f308d77b73af4923c0e0cf409f0e0d984596f SHA512 e344fd36ac52a6673d356d186fceb10f1d0213a6ab88914554c35f86b63f38d4c989c9fc1e5bd3ce54f4d08008ae358a346b738fc1e139f089193905b309a180
 MISC metadata.xml 449 BLAKE2B 1ab261352fabefe2d9c47dfe96681579a5291dd41fbe49df4571a0184c2429680c576bfbc270bb27bf1700b60a7019faf7b87e94fd06a5eaf2f4e8595dc13ca2 SHA512 8504f728cf157d2493e622a8091bae108fbb24cba21f2c00d3bab79f778afa485ba08c225f5964dbe7e586693fefc24721b023a51439fe1a1ffb22e5bdec5f16
diff --git a/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild b/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
deleted file mode 100644
index 39890d9c3e53..000000000000
--- a/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A new mail system tray notification icon for Thunderbird"
-HOMEPAGE="https://github.com/gyunaev/birdtray"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git"
-else
-	SRC_URI="https://github.com/gyunaev/${PN}/archive/RELEASE_${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-RELEASE_${PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="dev-db/sqlite:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-desktop_file_deprecated_category.patch
-)
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/birdtray/birdtray-1.8.1.ebuild b/x11-misc/birdtray/birdtray-1.8.1.ebuild
index bb684e4e0580..a527d5b67e10 100644
--- a/x11-misc/birdtray/birdtray-1.8.1.ebuild
+++ b/x11-misc/birdtray/birdtray-1.8.1.ebuild
@@ -23,11 +23,13 @@ RDEPEND="dev-db/sqlite:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libX11"
 
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 PATCHES=(
 	"${FILESDIR}"/${P}_qt515.patch
diff --git a/x11-misc/birdtray/birdtray-9999.ebuild b/x11-misc/birdtray/birdtray-9999.ebuild
index 4820733d2bcb..92d300f4bfb9 100644
--- a/x11-misc/birdtray/birdtray-9999.ebuild
+++ b/x11-misc/birdtray/birdtray-9999.ebuild
@@ -23,11 +23,13 @@ RDEPEND="dev-db/sqlite:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libX11"
 
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 pkg_postinst() {
 	xdg_icon_cache_update
diff --git a/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch b/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
deleted file mode 100644
index 104b24bf8de9..000000000000
--- a/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/res/com.ulduzsoft.Birdtray.desktop
-+++ b/src/res/com.ulduzsoft.Birdtray.desktop
-@@ -28,5 +28,5 @@
- X-MultipleArgs=false
- Type=Application
- Icon=com.ulduzsoft.Birdtray
--Categories=Application;Network;Email;
-+Categories=Network;Email;
- StartupNotify=true