gentoo resync : 18.08.2019

3 files changed, 16 insertions, 86 deletions

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index f00df6fa7c74..6c692bdeb578 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,9 +1,7 @@
 AUX qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch 1177 BLAKE2B e11b201b5852017e17343340ff79b106667117b1271dc1b53d99d4ca44df31f81cbfa5ef8403695a0902e8e2350d499f5e52e2e83e5331a3808d4fc23a7a870f SHA512 65637b31469f2fe5b9a97383adf63f3bdc65d90c759d5d71981ebc8e65ed653b761b3fa5d35dbf407cbff75a97e9442dc799624f957a0a74561098969ed779d8
-DIST qbittorrent-4.1.4.tar.gz 7718217 BLAKE2B 46fc3ad230a74cc2f05bdfe5f53b6b39e0dcd99afff941614345ef1d85492f647080a6111c403f30746b24d1b03e1a6fd196015c7646dc5ab5c73027a8c8c5b8 SHA512 2621a9b6a19609bafd2d99336e5dc4c5f4aef9e5ab6ecebd9c622c759cdcea2a18999c08a70ac32d88fbd65c310749ea2254562152c1d3886285aa7c5c86bf68
-DIST qbittorrent-4.1.5.tar.gz 7719557 BLAKE2B d849227443843684d16ba93e65a64b2d637f1ce41c2f5c3a1ee46db74c7497d0d3cb6b627bfee79ce2e4f2b99ee252287b584542cd47003a1055a43bf0f63cfc SHA512 e090ecc9343ff94874a6d54d487a672dcd44a943da4e2d625b5f7db849c861173c12c870f4d7f0843a60fdffd1fbbd74d05d48223bd3ebf32b7a1ef478c95dec
 DIST qbittorrent-4.1.6.tar.gz 7780676 BLAKE2B fe2572bece5a014d821cf905a13a45f71c63eda661b338a90517a23d257d83f556c1ad1bd064cc2840e9731886d7afaafa36ea50f8c3fe8ff05fc3ec3a12c478 SHA512 14c337257a71a7a6f850bbbbe3effe6f34c299fe71486c1a71160f54ccc7377a5c8e742ca2fd85cf198b2a603fdfee50bdb19b33a10899f86f8499468ca8a735
-EBUILD qbittorrent-4.1.4-r1.ebuild 1520 BLAKE2B 82ff5d353ba5d1d7ee43276bc012051f12b29b6cf60b5c90b248e1e1d3c6d7c56eb30cff6e540e8cc5a953fb4dd74fb8bfa529272cf374b076ce154bc4664a1b SHA512 97ac862854c1cb5a89d311a2b3e1cb4b38544bfe9b4cc1da6f41c3b5ec0a09b50fa07ad359e2b371a6af14fc2b9e0462e621af2b88d61dd77886e6cbf81e2838
-EBUILD qbittorrent-4.1.5-r1.ebuild 1520 BLAKE2B 82ff5d353ba5d1d7ee43276bc012051f12b29b6cf60b5c90b248e1e1d3c6d7c56eb30cff6e540e8cc5a953fb4dd74fb8bfa529272cf374b076ce154bc4664a1b SHA512 97ac862854c1cb5a89d311a2b3e1cb4b38544bfe9b4cc1da6f41c3b5ec0a09b50fa07ad359e2b371a6af14fc2b9e0462e621af2b88d61dd77886e6cbf81e2838
+DIST qbittorrent-4.1.7.tar.gz 7803389 BLAKE2B 6a8cf01c2bd86b63b629877fd3446db4aedd1591058af24c14dd4b69f0abae7f3ca715190fa0496b1a3ec742d4ee12585dd27e27c1465a1d22a149c2d47608ca SHA512 59fc6dc9696fbcfb9325017dcb5514f866e7f9e9eda9b4487c29c94d445709f1f3fab35f9817b62da75757360239362d77024d708eae48e89dffdde4ed272be4
 EBUILD qbittorrent-4.1.6-r1.ebuild 1544 BLAKE2B 3f55264180555674103b3297165b760ddb1e818fbed002526cbc683dd2616bbc84c4e7bf81fb803d6680412f9c4b183638a2039a388664cb636cc2bd02f0463b SHA512 7fd200c4163f71b1a88fd818f9bdb52ecf771d713c6b589bd4958f425a045a50428f5f17212b2a23b7d02e3e1dedaecfbdf434710fbfee4040725bb9f31646c2
+EBUILD qbittorrent-4.1.7.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db
 EBUILD qbittorrent-9999.ebuild 1476 BLAKE2B 17de90559b1830bd74b745589e7fdd9f3b6eb9de191ab0e6083bbafe66143549117ab94bc5dd0fd587c17a3e34f7b7775121c622ec4333e9ec648a41d6cd37fd SHA512 bffb41425575c458fd7db4eba7ec071dbad620cb65c84aab7a18b4b9670587eee33139b12e9a370875857b6f806531ad24ee32b740538e6e94b055ccfc185acd
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild
deleted file mode 100644
index e294819ff929..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop 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.1*: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
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-src_configure() {
-	econf --with-qtsingleapplication=system \
-	$(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
-	domenu dist/unix/qbittorrent.desktop
-	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-4.1.4-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild
index e294819ff929..e4e1c16a3150 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop 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
 
@@ -23,6 +23,10 @@ SLOT="0"
 IUSE="+dbus debug webui +X"
 REQUIRED_USE="dbus? ( X )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 RDEPEND="
 	>=dev-libs/boost-1.62.0-r1:=
 	dev-qt/qtcore:5
@@ -38,32 +42,29 @@ RDEPEND="
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 
 src_configure() {
 	econf --with-qtsingleapplication=system \
-	$(use_enable dbus qt-dbus) \
-	$(use_enable debug) \
-	$(use_enable webui) \
-	$(use_enable X gui)
+		$(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
-	domenu dist/unix/qbittorrent.desktop
 	einstalldocs
 }
 
 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
 }