[gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/, net-p2p/qbittorrent/files/

[Mikle Kolyada]

commit:     794b105782711d2b91da450fc25c83e666864af0
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 30 20:04:11 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 20:04:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794b1057

net-p2p/qbittorrent: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-p2p/qbittorrent/Manifest                       |  1 -
 .../files/qbittorrent-4.0.4-werror.patch           | 24 --------
 net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild       | 66 ----------------------
 net-p2p/qbittorrent/qbittorrent-9999.ebuild        |  3 -
 4 files changed, 94 deletions(-)

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 5e42163e06f..3548714b95f 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,3 +1,2 @@
-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

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 6d02e31f9bc..00000000000
--- 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 0abafb22f1e..00000000000
--- 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-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index cc5d592f00f..2c128403ac6 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 \