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

[Andreas Sturmlechner]

commit:     8e7fdb875b08331f913bffd10d0dd33dc63e6c2c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  6 20:46:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 20:51:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7fdb87

net-p2p/qbittorrent: 3.3.11 version bump

Update HOMEPAGE
metadata.xml: Indentation, upstream remote-id

Gentoo-bug: 607722, 611854

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-p2p/qbittorrent/Manifest                       |  1 +
 .../files/qbittorrent-3.3.11-build.patch           | 50 +++++++++++++++++++
 net-p2p/qbittorrent/metadata.xml                   | 28 +++++------
 net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild      | 57 ++++++++++++++++++++++
 4 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 959151e6ae9..9507220f1d5 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,3 +1,4 @@
 DIST qbittorrent-3.1.12.tar.xz 2465744 SHA256 d5d5b27958297f0b14cf03af8dd24a0d2a990e108c9a7a6159e4a2fbb1111c83 SHA512 af7cbb1a3158cd1fd6c28f17f1dbb62d94c9d192068b5a683b6b0e19e43664f3d312da055c5c19de75b5849c812b7aa9a0c966a7e464c120e0006bb1ea5a6e5a WHIRLPOOL 632fabec4c33104e55c73433028923033e65f37624aba37649e4f6f5593038fa9868e48787db7b1659690456835fc55dc542510d2f60732c66452d3c748508bf
 DIST qbittorrent-3.3.10.tar.xz 2959380 SHA256 2c657ceacdc84033da044a0a9ecba7e0fdb35858324dc097546f989166f1a8d2 SHA512 4f4e7071fa6db75ed2b5fbf5f17d5a9634aa5f2ed9fbcec52e6a0112967f5832e998384c7ff4962b1e00a0f847fa5d39bcdba36f997b5b895c7688e0dd247516 WHIRLPOOL 950b49d7a15aa7cf16dfe2bbfba72959e91f21f85ba589ce85be370b8b21c03fb389d404ed46ad2c802e3a57660094fe644b20df9bc3a0714cb5d9ea965e1b97
+DIST qbittorrent-3.3.11.tar.xz 2986312 SHA256 4892ac5ed4bde2ed325fb67456698e703bb933b9eb1d146598259f4e2154a760 SHA512 1f7d4a40b7f966e710d4cbed721074d53b0478ed1970932dee32b73ea210251cbd3807912e9c9a00371fa41f5c947c59443bbda4925b022fbe88fc23b3f225c5 WHIRLPOOL 5fb2e0456d81b104e5545329a301040c81a18b25798e831ab8f780f8ee19d09c12f5315d5581243e141f7a00eb938ab449927871c70a4bf5e9c2e6dd71d4aca3
 DIST qbittorrent-3.3.7.tar.xz 2884792 SHA256 72dc824a90fadc0825e6be6f1c215e38f976262c7f83b625061d542b2b664c40 SHA512 c33ae47bd78e79197fd499e9541ce20a30c0ee582c6696f72b792a46324a42bffbe2140f6dcb89c05d9366b7332845e108c661c0458e94ca5739cfc71be4dafc WHIRLPOOL 753efd5e30c725d77e241bfc4cee63f089109b4a85bab5224e5445d141605c07bb8873531245d17f577252ae1d90041457848e9290ecb2384d96f2a20bbf6f66

diff --git a/net-p2p/qbittorrent/files/qbittorrent-3.3.11-build.patch b/net-p2p/qbittorrent/files/qbittorrent-3.3.11-build.patch
new file mode 100644
index 00000000000..372fb267630
--- /dev/null
+++ b/net-p2p/qbittorrent/files/qbittorrent-3.3.11-build.patch
@@ -0,0 +1,50 @@
+From b3c973612f5cfcd97d9921330ee606ab9c8cd269 Mon Sep 17 00:00:00 2001
+From: Chocobo1 <Chocobo1@××××××××××××××××××××.com>
+Date: Sat, 4 Mar 2017 15:48:37 +0800
+Subject: [PATCH] =?UTF-8?q?Fix=20compile=20error:=20=E2=80=98escape?=
+ =?UTF-8?q?=E2=80=99=20is=20not=20a=20member=20of=20=E2=80=98Qt=E2=80=99?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/base/utils/string.cpp | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/src/base/utils/string.cpp b/src/base/utils/string.cpp
+index 7d76d9a..6c713b1 100644
+--- a/src/base/utils/string.cpp
++++ b/src/base/utils/string.cpp
+@@ -34,6 +34,7 @@
+ #include <QByteArray>
+ #include <QtGlobal>
+ #include <QLocale>
++
+ #ifdef QBT_USES_QT5
+ #include <QCollator>
+ #endif
+@@ -217,6 +218,23 @@ QString Utils::String::toHtmlEscaped(const QString &str)
+ #ifdef QBT_USES_QT5
+     return str.toHtmlEscaped();
+ #else
+-    return Qt::escape(str);
++    // code from Qt
++    QString rich;
++    const int len = str.length();
++    rich.reserve(int(len * 1.1));
++    for (int i = 0; i < len; ++i) {
++        if (str.at(i) == QLatin1Char('<'))
++            rich += QLatin1String("&lt;");
++        else if (str.at(i) == QLatin1Char('>'))
++            rich += QLatin1String("&gt;");
++        else if (str.at(i) == QLatin1Char('&'))
++            rich += QLatin1String("&amp;");
++        else if (str.at(i) == QLatin1Char('"'))
++            rich += QLatin1String("&quot;");
++        else
++            rich += str.at(i);
++    }
++    rich.squeeze();
++    return rich;
+ #endif
+ }

diff --git a/net-p2p/qbittorrent/metadata.xml b/net-p2p/qbittorrent/metadata.xml
index 5901c3cdacc..b8639b7c10e 100644
--- a/net-p2p/qbittorrent/metadata.xml
+++ b/net-p2p/qbittorrent/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@g.o</email>
-    <name>Markos Chandras</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>qt@g.o</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <use>
-    <flag name="webui">Enable the Web UI</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">qbittorrent</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>hwoarang@g.o</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@g.o</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="webui">Enable the Web UI</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">qbittorrent/qBittorrent</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild
new file mode 100644
index 00000000000..1221fe2d7a4
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-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/rb_libtorrent-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}-build.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT5=ON
+		-DSYSTEM_QTSINGLEAPPLICATION=ON
+		-DDBUS=$(usex dbus)
+		-DGUI=$(usex X)
+		-DWEBUI=$(usex webui)
+	)
+	cmake-utils_src_configure
+}