gentoo Easter resync : 12.04.2020

4 files changed, 81 insertions, 10 deletions

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 229ec59d3bd7..3b307cb785eb 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,4 +1,6 @@
 DIST qbittorrent-4.2.1.tar.gz 7824636 BLAKE2B 06aa493b4e59f8e064955c604846cd4e4d404988819aa4f0b7a555cd3d8c74f42d4b40b581bc5c2360e5b75f0ce33f77882051360453176a9540d03d4d5de82d SHA512 345c702a49d284fe28b45e52719a79195a784ba07339ea49c340d10d387482d3ba59335b2e41616de97e3813531e808c41239e597ef4b710fcebceb0c837483c
-EBUILD qbittorrent-4.2.1.ebuild 1452 BLAKE2B 72f0e7e3868f2b3ef02ad0ed32853fe00d5a578c75a09fb757ea1ee347bd4b42ffb04efb0fd80599672c4a0ece708ed4697cfff0002fc82a9a07e96e8435cf78 SHA512 aa63a6e96b2266506efb622db789151cd56f49244eb8ba2b8e92b3b7455fb73cc98abe094325a8876f6a36eaae1c9463bb42f737bba223e8226c6418c4113ff6
-EBUILD qbittorrent-9999.ebuild 1454 BLAKE2B 75fbb4665d379be568ace2bac666e1de1c7c7ce63e1b6b4666bf2bde3ec9af3121eca69e0b59ad8d776af4ff20f14a43c5cca955b329c1fd62c15267b1ea04a0 SHA512 890a73066f960497a8663758a32344bb33c90684780b5d873023262f23c7d680e4bab7917e6cbf182d76d5c215c12a482555072b12ffa26a42e9591adc81b0da
+DIST qbittorrent-4.2.3.tar.gz 7932722 BLAKE2B d16aa81ce683578eea5186a505a5f33da457ef672261520f0fe3af11008d516d7fce8de31e31190c380c9cc3e24d7acce053dbff952f7bb937a610416f23129e SHA512 766cff294b5e2aae99073e9894c683b68af6e7abdd1eae660e444593664f65918132b9fbd7b40843143f2559b4124145e2d08478c2b87b0b6df1ef574e17f763
+EBUILD qbittorrent-4.2.1.ebuild 1433 BLAKE2B ee6acccad072a08419d38c1b71ae9f538a741a9404ecaaaf9d898c27366576a333f85f54a449d9b6c6c3459e63b8f1c3a067d44bd8f03c662e69a3cdb489cb96 SHA512 d60e293956da684fda7abce234e7ed568b067e83cd975d3e48188d6fd74969df1658992dfe9be9063d7c76af6ce2cc117bf7b41b17061b684fb03fc8d0d28433
+EBUILD qbittorrent-4.2.3.ebuild 1435 BLAKE2B c66c8c832cca9c7d4edce15b8a708347246abbb97163e8b3ddf2eda854bea5fc63982037e3e8b374b0aeb4ce8aa75ca13438d9295b1b30b472e8d7af15933281 SHA512 f660e2ffe5615022930f0e056d7aa9f26ae3df7bd5da925d9f32e1e14b2bdc92c67e533f922646667acf75494ba3c6dbf10dfc457235a7523edf6642ae743cf2
+EBUILD qbittorrent-9999.ebuild 1433 BLAKE2B ee6acccad072a08419d38c1b71ae9f538a741a9404ecaaaf9d898c27366576a333f85f54a449d9b6c6c3459e63b8f1c3a067d44bd8f03c662e69a3cdb489cb96 SHA512 d60e293956da684fda7abce234e7ed568b067e83cd975d3e48188d6fd74969df1658992dfe9be9063d7c76af6ce2cc117bf7b41b17061b684fb03fc8d0d28433
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild
index 91e0d2f3769d..7813f67cbfa8 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome2-utils xdg-utils
+inherit xdg-utils
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="https://www.qbittorrent.org
@@ -59,11 +59,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/net-p2p/qbittorrent/qbittorrent-4.2.3.ebuild b/net-p2p/qbittorrent/qbittorrent-4.2.3.ebuild
new file mode 100644
index 000000000000..3244261dacce
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.2.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S="${WORKDIR}/qBittorrent-release-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug webui +X"
+REQUIRED_USE="dbus? ( X )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62.0-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
+	dev-qt/qtxml:5
+	>=net-libs/libtorrent-rasterbar-1.2.0:0=
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	X? (
+		dev-libs/geoip
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+src_configure() {
+	econf \
+	$(use_enable dbus qt-dbus) \
+	$(use_enable debug) \
+	$(use_enable webui) \
+	$(use_enable X gui)
+}
+
+src_install() {
+	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 22b2a5ad4a47..7813f67cbfa8 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit gnome2-utils xdg-utils
+inherit xdg-utils
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="https://www.qbittorrent.org
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
 else
 	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S="${WORKDIR}/qBittorrent-release-${PV}"
 fi
 
@@ -59,11 +59,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }