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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     6b25a3cf2aeef995f871c862a41f73d665684a40
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 19:33:38 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 03:29:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b25a3cf

net-p2p/qbittorrent: Drop old

Bug: https://bugs.gentoo.org/653976
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-p2p/qbittorrent/Manifest                       |  3 -
 .../files/qbittorrent-3.3.16-cmake.patch           | 44 --------------
 .../files/qbittorrent-4.0.1-nowebui.patch          | 25 --------
 net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild      | 71 ----------------------
 net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild       | 66 --------------------
 net-p2p/qbittorrent/qbittorrent-4.0.3-r1.ebuild    | 71 ----------------------
 6 files changed, 280 deletions(-)

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index e6dfe68d41d..e7f74c0ceae 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,4 +1 @@
-DIST qbittorrent-3.3.16.tar.xz 2961420 BLAKE2B 3704e6575b1a321e04b0b9c1feee9acaf2e0ab5e0815c2cbb496265c8407c5b27111265e929ea3a516cba20acacc3b954579b5904de3411ae81726f2461dfbe0 SHA512 518ddbf8e657b3549800b5587924a8a34826895183f199b79aac72de81e6b5c009cb3b8d4fbb19151da0d96c21eb1c2f05d6ed061608cc8f589ec6fe62ce8117
-DIST qbittorrent-4.0.1.tar.xz 4256588 BLAKE2B 579e850c34c62f515807a3fb2619740442c275e9de74cd7338a9e2d72340c78a2b7f484a3ee911094cbb3b551d61a927be454466637eac2d2355e84ebec0dbd4 SHA512 76eae32ebe82953e3164a8a292132a33ccc93f5a33ce7e1ce3253f4697939b73d21e1823bada7d3b1fe7401538a7f407ebeb86c281a34e261aec0aa02d7bef80
-DIST qbittorrent-4.0.3.tar.xz 4274292 BLAKE2B c6f6a87d26f01db318ac021a8ab9f8d1ada2f7cb0d2819dfbd41e57ddbcda8a077161c78bcf8210e3571572872c13aa2255973e842c07b6b538d94ac2501c841 SHA512 d439e5428ff43ec9317bfa70b365a912a33fa12eeaad72c6916514e7b04509bf3d2e35ef9c07a36e42e7fc80f4e019f6a299fd2f93df9ec10af4a95257096ecd
 DIST qbittorrent-4.0.4.tar.xz 4279752 BLAKE2B 6385040d1179814e3290fb1c7b2d1e0b5782144663d12a067c43a2d8a47d0f0cfc0633c69f183db70eab2591ef100f39b07ea2d5e3cbca3a4d149ccb70e4d838 SHA512 ead0a306242d883673e13f9e6dc5ad83d4624c3d7ffb586aff78c03f7685e89b6a6c8640fff6a1b251565892178d37f4a64d45d0ce18935a212ca39302a28969

diff --git a/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch b/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch
deleted file mode 100644
index 9f5b82b218e..00000000000
--- a/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0ad52903890fe680307b46f4051bdd91d8aaffd5 Mon Sep 17 00:00:00 2001
-From: Eugene Shalygin <eugene.shalygin@gmail.com>
-Date: Sat, 7 Oct 2017 21:48:52 +0200
-Subject: [PATCH] cmake: do not use Qt5Widgets when locating
- QtSingleApplication. Closes #7551.
-
-This fixes cmake builds with GUI disabled and system
-QtSingleApplication. We rely on Qt5::Core instead of Qt5::Widgets.
----
- cmake/Modules/FindQtSingleApplication.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/Modules/FindQtSingleApplication.cmake b/cmake/Modules/FindQtSingleApplication.cmake
-index eb56607e94..9b526c9839 100644
---- a/cmake/Modules/FindQtSingleApplication.cmake
-+++ b/cmake/Modules/FindQtSingleApplication.cmake
-@@ -30,9 +30,9 @@ IF(QT4_FOUND)
-         NAMES ${QTSINGLEAPPLICATION_NAMES}
-         PATHS ${QT_LIBRARY_DIR}
-     )
--ELSEIF(Qt5Widgets_FOUND)
-+ELSEIF(Qt5Core_FOUND)
-     message(STATUS "Looking for Qt5 single application library")
--    FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-+    FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-         FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions)
- 
-         IF(QTSINGLEAPPLICATION_INCLUDE_DIR)
-@@ -43,12 +43,12 @@ ELSEIF(Qt5Widgets_FOUND)
-     SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-         Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6
-         QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
--    GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
--    GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
-+    GET_TARGET_PROPERTY(_QT5_CORELIBRARY Qt5::Core LOCATION)
-+    GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} PATH)
- 
-     FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-         NAMES ${QTSINGLEAPPLICATION_NAMES}
--        PATHS ${QT5_WIDGETSLIBRARYPATH}
-+        PATHS ${_QT5_CORELIBRARYPATH}
-     )
- ENDIF()
- 

diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch b/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch
deleted file mode 100644
index 2a7f5dbb47c..00000000000
--- a/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From af898e9117b475230e793fa4fd75274145ecf25d Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Wed, 22 Nov 2017 21:29:20 +0100
-Subject: [PATCH] Fix build with --disable-webui
-
-"app/application.cpp:108:7: error: class 'Application' does not have
-any field named 'm_webui'"
----
- src/app/application.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/app/application.cpp b/src/app/application.cpp
-index 3b0d4d78de..b3221efa88 100644
---- a/src/app/application.cpp
-+++ b/src/app/application.cpp
-@@ -105,7 +105,9 @@ Application::Application(const QString &id, int &argc, char **argv)
-     , m_running(false)
-     , m_shutdownAct(ShutdownDialogAction::Exit)
-     , m_commandLineArgs(parseCommandLine(this->arguments()))
-+#ifndef DISABLE_WEBUI
-     , m_webui(nullptr)
-+#endif
- {
-     qRegisterMetaType<Log::Msg>("Log::Msg");
- 

diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
deleted file mode 100644
index 6511503962b..00000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org/"
-
-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/qtconcurrent:5
-	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
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# bug 641010
-	sed -i -e "s/-Werror //" cmake/Modules/MacroQbtCompilerSettings.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSTEM_QTSINGLEAPPLICATION=ON
-		-DDBUS=$(usex dbus)
-		-DGUI=$(usex X)
-		-DWEBUI=$(usex webui)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild
deleted file mode 100644
index a1573cc1deb..00000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 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/"
-
-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
-	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}/${P}-nowebui.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.0.3-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.3-r1.ebuild
deleted file mode 100644
index edf719c9113..00000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,71 +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/"
-
-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 )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# bug 641382
-	sed -i -e "s/-Werror  //" cmake/Modules/MacroQbtCompilerSettings.cmake || die
-}
-
-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
-}