From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:02:04 +0100 Subject: gentoo resync : 28.04.2018 --- net-p2p/qbittorrent/Manifest | 10 +-- .../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 ---------------------- net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild | 2 +- 7 files changed, 2 insertions(+), 287 deletions(-) delete mode 100644 net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch delete mode 100644 net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch delete mode 100644 net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild delete mode 100644 net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild delete mode 100644 net-p2p/qbittorrent/qbittorrent-4.0.3-r1.ebuild (limited to 'net-p2p/qbittorrent') diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 2ecbed72094a..f5af23d8889a 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,13 +1,5 @@ -AUX qbittorrent-3.3.16-cmake.patch 2025 BLAKE2B 926cd32b8e0b2f0c7833ca6d972a8cffe49cc1926fb2383dedd428e7cddc344b57aa9a0af2ae85ba141e4522fdb2391055857d17cf58b81e84c052825c5b9032 SHA512 a9c8fb1c45eb69942230a9ae509a8911f169a8801151fc8ca068d77eaa0f2bf78f19a2f4595a65c4b6b7a4390233b25c7e024f4f9a4b503f687193c6f494c34c -AUX qbittorrent-4.0.1-nowebui.patch 854 BLAKE2B f605f99919c1eb4412f640e867dd12556d7419ef282ecd4e891d6c6668d457f8c06748ae5d6cfbf9f4b0228d1273ec08299a750052c3f2674d6b84707bdbe093 SHA512 c77fb1f23663d44fea334cf74debe5970b10d42c38874914fb2d743bd4aeb7bc6e8a4edb5fb4d6bb73abec4898e81322b263de21532fb2287cd91240afadf7b8 AUX qbittorrent-4.0.4-werror.patch 1073 BLAKE2B c7bab1a78362f41a8a2a26fd853c81206a95f03d52f009ef19bd912921cb05ac0ac3aad9b52d06165539ff819dab98a26d230c40a2d567695d0fc59029dfa894 SHA512 908336510379d927df4e7830ae1038d23cf1000c38f2a367303d5e908224e615289b5e95cee85b87a582a16037940c1cad016ae9e902a2e5d42a0d4e4b58ad03 -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 -EBUILD qbittorrent-3.3.16.ebuild 1427 BLAKE2B 710e1375e511e52b1da0f8466a03b311b510b722b6452fb80525517e6858fbda6f535097a5d1d26fb93c5f74f5de59f8733a10a19fe835c09f2a0f0dd779631d SHA512 c658f61dc584c05ef36b7e13c115448acbb9cdf048c4a3406e2647209eaa97ee3dd0c7a71e4407b7413b9635f72766c17d9f89a3df7ae7d9c468b7107fb313bc -EBUILD qbittorrent-4.0.1.ebuild 1353 BLAKE2B aed8773456f37a72bcbb071d66b8ee308056c7404b8b93e48f05d537fe568a8e8da49279fa15e11684b26a24ab0ddc9def215d4749347759508dac0451bc1a45 SHA512 58c97dbef3ec0faed7c60e1e120ffe0ace7a2aaed2ba4682a44b7ba5c69d50cb17961044823df46a75dab825344883a4e0624d5c05446aa5d83a2c3115e5659e -EBUILD qbittorrent-4.0.3-r1.ebuild 1451 BLAKE2B 1340fc6dffb5c05b05f0774cfa0b0693097a956f4acfef5a44b03fd5c741f41f1151b50d871f681b407922e42ec59e9d3e31b6a26a4954a48df34abe48cb877f SHA512 b0699e2f3ee7894a535a3e3da78c4032e40f7e64a34d99b5ac285db1f1fdca976c6e715bf1878a50ca5cbb7fc723e2a102fa9e77fe0466b2c3c683b08000b5e2 -EBUILD qbittorrent-4.0.4.ebuild 1364 BLAKE2B ee21562083f3c8f44342caecd4d20e6cd0371d4be6f9dfd1e3e8b6962e8a8a39328eb3f2d4abab745791afb2d36b7e36452692f39a62e0433100840522804680 SHA512 08ee86525118858548fb54b56a9d1373a79e8f05518a2ac4c06b1d7ce31061cd2d8c24b33853cb61cc9ca7d22980505ecd5583be2d94e9422d147745e7e7c11d +EBUILD qbittorrent-4.0.4.ebuild 1362 BLAKE2B 075ce19a51f7b1e2c88ae7d02147cb9eecc6dc07dee37f67293b96ff888c72bc7a3ccd38cf0a15264e5fbc9c6fb73f7c66423d4312d4d68e7ca46351b0b20e89 SHA512 b3695c5cd4e4a15211f51237e835c6c1a75b44a61a4b1aa5811f5854d3182b00869061de266bd5ad149fa38d66919150c6919770dd3b65c66d39215be9e4e724 EBUILD qbittorrent-9999.ebuild 1364 BLAKE2B ee21562083f3c8f44342caecd4d20e6cd0371d4be6f9dfd1e3e8b6962e8a8a39328eb3f2d4abab745791afb2d36b7e36452692f39a62e0433100840522804680 SHA512 08ee86525118858548fb54b56a9d1373a79e8f05518a2ac4c06b1d7ce31061cd2d8c24b33853cb61cc9ca7d22980505ecd5583be2d94e9422d147745e7e7c11d MISC metadata.xml 563 BLAKE2B 9d0793b4c9a7b7022c837f0f671895908c647616e1609625273a3f15dbf4bfcd384ffbfe610639235b378068aa08bfa6cd493e051a239d4ead65c4f2d3a2f672 SHA512 23f8dfd139eed877c504f7661e98168c561385930afe5b910bb60040d01b33820f25b8a9f6048001fae462bddc2199532ebd05fefe4937639f4c68e906d59462 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 9f5b82b218ea..000000000000 --- 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 -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 2a7f5dbb47c5..000000000000 --- 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 -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"); - 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 6511503962b7..000000000000 --- 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 a1573cc1deb3..000000000000 --- 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 edf719c91133..000000000000 --- 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 -} diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild index 1f76cf096f6e..5dd7f3076599 100644 --- a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then else MY_P=${P/_} SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~ppc64 x86" S=${WORKDIR}/${MY_P} fi -- cgit v1.2.3