gentoo resync 08.09.2018

5 files changed, 3 insertions, 99 deletions

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 8ed365e8aeef..6cec42307050 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,9 +1,6 @@
-AUX qbittorrent-4.0.4-werror.patch 1073 BLAKE2B c7bab1a78362f41a8a2a26fd853c81206a95f03d52f009ef19bd912921cb05ac0ac3aad9b52d06165539ff819dab98a26d230c40a2d567695d0fc59029dfa894 SHA512 908336510379d927df4e7830ae1038d23cf1000c38f2a367303d5e908224e615289b5e95cee85b87a582a16037940c1cad016ae9e902a2e5d42a0d4e4b58ad03
-DIST qbittorrent-4.0.4.tar.xz 4279752 BLAKE2B 6385040d1179814e3290fb1c7b2d1e0b5782144663d12a067c43a2d8a47d0f0cfc0633c69f183db70eab2591ef100f39b07ea2d5e3cbca3a4d149ccb70e4d838 SHA512 ead0a306242d883673e13f9e6dc5ad83d4624c3d7ffb586aff78c03f7685e89b6a6c8640fff6a1b251565892178d37f4a64d45d0ce18935a212ca39302a28969
 DIST qbittorrent-4.1.1.tar.gz 7464014 BLAKE2B be005fbecd1d2c9ee977fbdc6782bbad9708e3c2c6d46deb5831ae4e7457954cb95ae87850b759e81e87e345ca682acfcd23684b7704c437c4261ebb5bb46f5d SHA512 700c084b97556ba85276b42e46f77d5f7896052ce02ba052cd4b3e6967c8a848c27bcf63a289bf8276b38841bb9a80b9ec16335c3feb30dce0851170f54d101e
 DIST qbittorrent-4.1.2.tar.gz 7697135 BLAKE2B 13e9456fd43395d597156519bdd665db898d462761dc5fe5f92e40994e8d0e214b0a1f9d8d327d44f8deb287c646c7013c17099bca193d85d1a3b2d851ada976 SHA512 25293378693cec875d1b52ea5aca8087a0d31021e6fbb4bd31f05c6979e36a5dc03983f2007a067942e1e119878b94a9e2b9622f324c7592f6630dcfe008b757
-EBUILD qbittorrent-4.0.4.ebuild 1395 BLAKE2B 4a3bf46c8610ec68be4e24322fa1b22069114c6a464187eca877b297cd45e4f2fcf481435f1462c21653a397958033534f333dac9ffca0cac4682cf38ca44c04 SHA512 9f4237f30c38b69ae8271017277c0f8504815a92508d9b3a79bc8bfb0946d15b9d4195837d599a00330a1fe4525d5269ae746a058822b5314d144b2ac3ac83ad
 EBUILD qbittorrent-4.1.1.ebuild 1412 BLAKE2B eb656b35b1bcb058350edc16f8da149f9d0b9a7d37c17774ac6af8a89e0e1812f630df648e653ee167ff3b5a45ee400917381810c235aea58a01007e05ae1c4c SHA512 0a4f96ad100320217ba09d49c9816ff754b03d5916b492dda4aca93e28b7a07b602f1f536e71991f1e7a9189627ba46aad0e46233859dd3134a5e34a3e942ec6
-EBUILD qbittorrent-4.1.2.ebuild 1527 BLAKE2B 8029aa9e510f3ae444d6deb6a071a70ed27f2ee996f1b750b56ef3891570656dd662b935e7100456ea6ff8f4439d55fe96ffb82e7d4ecda16a7828b6deab5a5c SHA512 7603ac17904c1d53c9ff4793804c0073a84266b70a54102ac18d4f02d9dc1b11628566a327f74972308e5e159167465ef0197f6c03b8d83d42508a49bac0a9c1
-EBUILD qbittorrent-9999.ebuild 1610 BLAKE2B b32315bd3911c88cd7787a8ee9d9a44a03d3f968454bf46332fb926f3a1169a45e9216097163f13f43e436cd9f8749da829afdad03217308d51736d1010b64ca SHA512 25cfaa17098bb3519f002302348f3ee13df4861cd98b187ea91bb3d4792e2a62fd242439aa63f7bcf0ea5f7627b1733b1b9bfce77fe2df90d4bf67dfc65d396f
+EBUILD qbittorrent-4.1.2.ebuild 1525 BLAKE2B c039cdde5ac02a21596ee054e6c2418d8c7698b4711bef1a33a0e12db816616c102f628c918c5f82aa2fed8b4633264b28b130ee6948584b9ec9afe1540e5721 SHA512 511bc0b9a61f9733108dd1fe3157b54890c4e1a2a41d2c91c90817593e1e407010e9a96cd71701ba2ba9db53983a27b1b72262b389a5eab44d97075fb689f12c
+EBUILD qbittorrent-9999.ebuild 1481 BLAKE2B e44e1467247dd1e67b9595b354c137f5a0b6d5b7a61c0b00d1f05475dcb2b004d7f79aa76c9fa880bb6dfbe1c421723f76ef58c0bee19aaafa3ad899aeaab839 SHA512 d68658e22cc3e2eea08074f8e5ea45f646997c68c99dd72546f3b5ed14107a229acbfc9f0ff666891a49cfab3643856e31639b73b863b5d01d39e7a67ff70e8b
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.0.4-werror.patch b/net-p2p/qbittorrent/files/qbittorrent-4.0.4-werror.patch
deleted file mode 100644
index 6d02e31f9bcb..000000000000
--- a/net-p2p/qbittorrent/files/qbittorrent-4.0.4-werror.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Bug: https://bugs.gentoo.org/641382
-
---- a/cmake/Modules/MacroQbtCompilerSettings.cmake
-+++ b/cmake/Modules/MacroQbtCompilerSettings.cmake
-@@ -11,16 +11,15 @@
-         #-Wshadow -Wconversion ?
-         set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra"
-             "-Wfloat-equal -Wcast-qual -Wcast-align"
--            "-Wsign-conversion -Winvalid-pch -Werror=return-type -Wno-long-long"
-+            "-Wsign-conversion -Winvalid-pch -Wno-long-long"
- #			-fstack-protector-all
--            "-Werror -Wno-error=deprecated-declarations"
-+            "-Wno-error=deprecated-declarations"
-         )
-         set (_GCC_COMMON_CXX_FLAGS  "-fexceptions -frtti"
-             "-Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel"
-             "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
--            "-Werror=overloaded-virtual"
-     # 		"-Weffc++"
--            "-Werror -Wno-error=cpp"
-+            "-Wno-error=cpp"
-             # we should modify code to make these ones obsolete
-             "-Wno-error=sign-conversion -Wno-error=float-equal"
-         )
diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild
deleted file mode 100644
index 0abafb22f1e4..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils 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
-	MY_P=${P/_}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-	S=${WORKDIR}/${MY_P}
-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.0.6:0=
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		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 )
-PATCHES=( "${FILESDIR}/${PN}-4.0.4-werror.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSTEM_QTSINGLEAPPLICATION=ON
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex X)
-		-DWEBUI=$(usex webui)
-	)
-	cmake-utils_src_configure
-}
-
-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.2.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.2.ebuild
index dba40dca433b..07ff1267c5e7 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.2.ebuild
@@ -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
 
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index cc5d592f00f4..2c128403ac6f 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -43,9 +43,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-#PATCHES=( "${FILESDIR}/${PN}-4.0.4-werror.patch" )
-# they do not ship -Werror for the master branch yet
-# may be changed again.
 
 src_configure() {
 	econf --with-qtsingleapplication=system \