gentoo resync : 15.12.2019

3 files changed, 77 insertions, 5 deletions

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 968ed99da77d..02fcf3018927 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,8 +1,10 @@
 DIST qbittorrent-4.1.7.tar.gz 7803389 BLAKE2B 6a8cf01c2bd86b63b629877fd3446db4aedd1591058af24c14dd4b69f0abae7f3ca715190fa0496b1a3ec742d4ee12585dd27e27c1465a1d22a149c2d47608ca SHA512 59fc6dc9696fbcfb9325017dcb5514f866e7f9e9eda9b4487c29c94d445709f1f3fab35f9817b62da75757360239362d77024d708eae48e89dffdde4ed272be4
 DIST qbittorrent-4.1.8.tar.gz 7803739 BLAKE2B ee56e004945025f06b179b08e938c6a3182f252c3bed6990158634ea1fdfd525fd67d105fd7ecdf0217a4bd73d847c5007d1e95f492f4f4e41c32d22dd6b7523 SHA512 8920e98f8db5dd738caab8815cc4a10950c34ba2eaa19b50479bb2ab548f6f297534759d71791caa4c8bfbea92d4b71d223a27fae150e00cc0a262eb3370a1e3
 DIST qbittorrent-4.1.9.1.tar.gz 7804066 BLAKE2B b5fddfdef8773318991ee5a3a818101b46fd0f258c24eebe2a9dde3f9e806544159c373406f609a911b330e32257b3d58a7d81e830ed91cce205182cde16052a SHA512 2a132202762461293ee8e4248bf7d512b3c33ec73670bf4c5c22261be546a69a69775b6c4baacd97a3f9055145cdb4153de17704b6b574b33370f3b454b1def9
+DIST qbittorrent-4.2.0.tar.gz 7797615 BLAKE2B 55c891e9d255c295eb2dc53e3cccaa50ceeae6623ddc016bf5e30fb117b849f35def462bbee598e754a2672e771465b93fa751b047efeb6326e8bc2619a58cb4 SHA512 507e548ea7b5ee25e412bdca6751e3e1b65130f16bbb2c92bd8f80cb86d824bfdcdf40ec49af6a8e111a36d7970430e8b9a6e29a6af1165563c9cb16c4bc2741
 EBUILD qbittorrent-4.1.7.ebuild 1471 BLAKE2B 4425b0c76189dc80766092cfcea3939951918051fe73c14c9b7bc270ce4cdd4cea1bf9d879ca0aa1791d197bd331e4426fdb195eae78d59e0764cbff948d45d5 SHA512 e3660d0920d56b236f0309eeb9af01b4fe83d091687a814970ea33d7c5ed7be242bb1f7996b0cbbbacfd3b3e998250b175c412d0abca05a42b53bf80fc35bada
 EBUILD qbittorrent-4.1.8.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db
 EBUILD qbittorrent-4.1.9.1.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db
-EBUILD qbittorrent-9999.ebuild 1478 BLAKE2B 9328a7905de1ffdd04afb0007414a705bb921283419ecf37020f9cbb842a8d3e2473169cd9e3ac2fc2f3e7e1fe0f104ea7acc6e219a1fdae29cee59d54ac8da5 SHA512 63d83a0918856ee30713ae832aa6ec2431fc77cf8daa2dc2ff53adcf2b7569dfa09ac03c0d23c6e0ce9d70ddbd1c282f71742f4b3f40c1f920fcc8448a396256
+EBUILD qbittorrent-4.2.0.ebuild 1454 BLAKE2B 75fbb4665d379be568ace2bac666e1de1c7c7ce63e1b6b4666bf2bde3ec9af3121eca69e0b59ad8d776af4ff20f14a43c5cca955b329c1fd62c15267b1ea04a0 SHA512 890a73066f960497a8663758a32344bb33c90684780b5d873023262f23c7d680e4bab7917e6cbf182d76d5c215c12a482555072b12ffa26a42e9591adc81b0da
+EBUILD qbittorrent-9999.ebuild 1454 BLAKE2B 75fbb4665d379be568ace2bac666e1de1c7c7ce63e1b6b4666bf2bde3ec9af3121eca69e0b59ad8d776af4ff20f14a43c5cca955b329c1fd62c15267b1ea04a0 SHA512 890a73066f960497a8663758a32344bb33c90684780b5d873023262f23c7d680e4bab7917e6cbf182d76d5c215c12a482555072b12ffa26a42e9591adc81b0da
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.2.0.ebuild b/net-p2p/qbittorrent/qbittorrent-4.2.0.ebuild
new file mode 100644
index 000000000000..22b2a5ad4a47
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.2.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils 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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index ac238de93e5d..22b2a5ad4a47 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome2-utils xdg-utils
 
@@ -39,13 +39,14 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+	dev-qt/linguist-tools:5"
+
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 
 src_configure() {
-	econf --with-qtsingleapplication=system \
+	econf \
 	$(use_enable dbus qt-dbus) \
 	$(use_enable debug) \
 	$(use_enable webui) \