gentoo resync : 25.11.2020

3 files changed, 3 insertions, 29 deletions

diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest
index 89d55bedd221..4301f741b7b0 100644
--- a/x11-misc/birdtray/Manifest
+++ b/x11-misc/birdtray/Manifest
@@ -1,5 +1,4 @@
-AUX birdtray-1.8.1_qt515.patch 569 BLAKE2B 9575631ce63a01ead03240779f88ef2ea32e7a7467716cc185d01dcc698c6349d47a11d8b8926434926d52cb1d9166e3ac542861c50f1814dcdf8dcdf1e569e0 SHA512 7d0fd09166ad242beecc0319e639016701493605d85363070247ec558c218e5b8736778aa1f821c33ac0be9083a2ad01f7ec4a572fd21dee40363ce0eb041645
-DIST birdtray-1.8.1.tar.gz 767821 BLAKE2B 343fb902381396df2a9d49b619a6eaea620447276ee1c6261b8bb9667ea40d945da37522e1ddeac529d032549f3ca3288d6b780ff95b6adbc98a1dbea8fdeb10 SHA512 464bdaf1820cecb0bb9b41721389f24ce447c65e25f857998c4de5d3fb2aa53f03223938974e9bbdbfd4d719fb6aaecdf8a27c6e2ab7075b451bc8e73d8f07e7
-EBUILD birdtray-1.8.1.ebuild 834 BLAKE2B 3cf6afb885dd5a09a5255b6257f5a1fc1cda46a9d619490e69378e8eecd3880d5144d9106261507f0d7021f2af2a6d52005c8564e13343212399692ad9fb4b8c SHA512 f5dde7029b6a8ba5ca53515425505dc764eef09a1f80c1481125878252da8f6e370b6621fe0d48680146d4be338b3cb419a4eb793952ec6cf289c4fdfa79630b
+DIST birdtray-1.9.0.tar.gz 810297 BLAKE2B acc6593116fa735311f62405406192ad43e8af6481eac1d09298f846f5fab9a0dff575caefe9490d0a183c464fab763515e20e5725649fe4a800e575f712067b SHA512 898bfcebc7ba4b738e3ab41539c4de48871ebccf431bb1b12464e7f2956bad95af6158742c64ec5923d63889e777c98c75db31121d926e26f3dfe1b34d9f8b4a
+EBUILD birdtray-1.9.0.ebuild 790 BLAKE2B 5dfb0512d83d8b6bd7d46411595ea1172d0157882ae6a0fb62c3c58acccf9c0918fc70d9227387024dbbe4a1ec017756e49953c656bdd9d2c7b2b70c9380ce62 SHA512 298c47b478985275c3fa38e935a5c7629469ee85f98b8884fd65f26e402ea27c91fbf1d1f85227bd6d598f78b31f99bc69ac35ba2dc06716787403e785f574b2
 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.8.1.ebuild b/x11-misc/birdtray/birdtray-1.9.0.ebuild
index a527d5b67e10..cd9cdf2f737d 100644
--- a/x11-misc/birdtray/birdtray-1.8.1.ebuild
+++ b/x11-misc/birdtray/birdtray-1.9.0.ebuild
@@ -12,7 +12,7 @@ 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/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/gyunaev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -31,10 +31,6 @@ RDEPEND="dev-db/sqlite:=
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-PATCHES=(
-	"${FILESDIR}"/${P}_qt515.patch
-)
-
 pkg_postinst() {
 	xdg_icon_cache_update
 }
diff --git a/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch b/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch
deleted file mode 100644
index a7384f02a6d8..000000000000
--- a/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 38b333b5ff9318ae136d719c5fdd4c790c294833 Mon Sep 17 00:00:00 2001
-From: George Yunaev <gyunaev@ulduzsoft.com>
-Date: Sun, 31 May 2020 13:36:14 -0700
-Subject: [PATCH] Fixed compilation on Qt 5.15 - fixes #375
-
----
- src/trayicon.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/trayicon.cpp b/src/trayicon.cpp
-index 210c5da..72d80d2 100644
---- a/src/trayicon.cpp
-+++ b/src/trayicon.cpp
-@@ -3,6 +3,7 @@
- #include <QPainter>
- #include <QProcess>
- #include <QMessageBox>
-+#include <QPainterPath>
- #include <QtNetwork/QNetworkSession>
- 
- #include "trayicon.h"