From a528ff4973e51823512ffc30e5395c0c741d01df Mon Sep 17 00:00:00 2001 From: Nikos Chantziaras Date: Mon, 21 Jan 2019 22:02:29 +0200 Subject: net-p2p/qbittorrent: dep on libtorrent-rasterbar-1.1 and revbump-move Build fails with libtorrent-rasterbar-1.2. Closes: https://bugs.gentoo.org/675976 Package-Manager: Portage-2.3.57, Repoman-2.3.12 Signed-off-by: Nikos Chantziaras Signed-off-by: Mikle Kolyada --- net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild | 69 +++++++++++++++++++++++++ net-p2p/qbittorrent/qbittorrent-4.1.4.ebuild | 69 ------------------------- net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild | 69 +++++++++++++++++++++++++ net-p2p/qbittorrent/qbittorrent-4.1.5.ebuild | 69 ------------------------- net-p2p/qbittorrent/qbittorrent-9999.ebuild | 4 +- 5 files changed, 140 insertions(+), 140 deletions(-) create mode 100644 net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild delete mode 100644 net-p2p/qbittorrent/qbittorrent-4.1.4.ebuild create mode 100644 net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild delete mode 100644 net-p2p/qbittorrent/qbittorrent-4.1.5.ebuild diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild new file mode 100644 index 000000000000..e294819ff929 --- /dev/null +++ b/net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild @@ -0,0 +1,69 @@ +# 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.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.4.ebuild deleted file mode 100644 index f990644fdeca..000000000000 --- a/net-p2p/qbittorrent/qbittorrent-4.1.4.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2018 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.0.6: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.5-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild new file mode 100644 index 000000000000..5023499c1558 --- /dev/null +++ b/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild @@ -0,0 +1,69 @@ +# 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.5.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.5.ebuild deleted file mode 100644 index 970763d76f69..000000000000 --- a/net-p2p/qbittorrent/qbittorrent-4.1.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2018 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.0.6: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-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild index 2c128403ac6f..30188ae78c36 100644 --- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,7 +29,7 @@ RDEPEND=" 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= + =net-libs/libtorrent-rasterbar-1.1*:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( -- cgit v1.2.3