Patched qBittorrent updated.

4 files changed, 140 insertions, 4 deletions

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 5072fdf..fa68675 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,5 +1,7 @@
-AUX qbittorrent_spoof_utorrent.diff 699 RMD160 69a32111f23fcd3d92b95e12d24a3592e35bccc1 SHA1 7d556c52ab9d035a075c4fadf846663b60b2d799 SHA256 50ba37c9d63b1f8e0d839a66e29ce9911eae7728539b46b65a36741af96b763d
-DIST qbittorrent-2.6.4.tar.gz 2833616 RMD160 bda68fcb741baf4d238941c8c278033d3b85a945 SHA1 846f40566095387d4358ff968c7fdd87daab7e78 SHA256 3204942587c2c9aacd35d0deb0059a742716ffdccbcdd1e9fb5ee176989f5e9f
-EBUILD qbittorrent-2.6.4-r1.ebuild 1880 RMD160 c5655de1ece020b08b7deaf75cfbc18a6ff87d00 SHA1 5c1a7c5910100e65fab50e06ddcc15b0f2ae5361 SHA256 7bd64ab81ccb1999ee6e6865eece9242306157809d3fa82bee0e477039d9b2a8
+AUX qbittorrent_spoof_utorrent.diff 699 RMD160 054337dbe10789363bee8f02666df9742ccf49ea SHA1 e01a5236ddf545c0cd29c2f823aad8026c80700c SHA256 5a6fdae54e45e81f9bd3589462e55f36782247f5fbcd1a2d9abb16e850d33517
+DIST qbittorrent-2.6.6.tar.gz 2958946 RMD160 592170f9c439281baf73bbdd1c57c19ba7c02eba SHA1 997672382fbf11750c518d7794449ce75abcd059 SHA256 58452f5ee5670d674cb727395a6a2a83756e09f356a6ede0bf28821067d82c59
+DIST qbittorrent-2.7.0beta1.tar.gz 3042589 RMD160 cca64f31f92b6cd18c1ddb1ab1ec212c6c8b0cff SHA1 bca421030b73a06f210aca14ebe2edf8e6093ccc SHA256 0ca8939953c5b41c68166b557dd877d3bbb2a85db604e257ab61a6e7f6198ac3
+EBUILD qbittorrent-2.6.6-r1.ebuild 1760 RMD160 07c1ede8f02104b47d530f7b1dc30df2696073ea SHA1 80a58d418a0811b5528ee5b58c96c0221697edcf SHA256 99e12d39131c78ea232767c79de870c762bfca7e992b724cf682451a59ad0f65
+EBUILD qbittorrent-2.7.0_beta1-r1.ebuild 1766 RMD160 8f4672189dacda6670ffe2289ecf57dd66cd5aee SHA1 86f636b9e642a79848c3cb51ee94e85394f34d21 SHA256 b265aac223984dcac204fe543017a286a0317f197ea1c2c8f8d8850118f3d9ef
 MISC ChangeLog 23862 RMD160 4eb652afeb05b916805c04f374186b6c58730e28 SHA1 b2b3b24d0bd7cb09fe453b60907483c8fd481321 SHA256 7ff845642eeb8420c876902e0accc2e7526462832ac78e6126bd6ae85f533173
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
diff --git a/net-p2p/qbittorrent/files/qbittorrent_spoof_utorrent.diff b/net-p2p/qbittorrent/files/qbittorrent_spoof_utorrent.diff
index 9607880..370ad3e 100644
--- a/net-p2p/qbittorrent/files/qbittorrent_spoof_utorrent.diff
+++ b/net-p2p/qbittorrent/files/qbittorrent_spoof_utorrent.diff
@@ -14,4 +14,4 @@ diff -U0 -r qbittorrent-2.6.4.orig/src/qtlibtorrent/qbtsession.cpp qbittorrent-2
 +  const QString peer_id = "UT";
 @@ -371 +371 @@
 -  sessionSettings.user_agent = "qBittorrent "VERSION;
-+  sessionSettings.user_agent = "uTorrent/2200(24402)";
++  sessionSettings.user_agent = "uTorrent/2200(24683)";
diff --git a/net-p2p/qbittorrent/qbittorrent-2.6.6-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-2.6.6-r1.ebuild
new file mode 100644
index 0000000..1479de9
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.6.6-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit python confutils qt4-r2 versionator
+
+MY_P="${P/_/}"
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="http://www.qbittorrent.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X geoip libnotify +spoof_utorrent"
+
+# boost version so that we always have thread support
+CDEPEND="net-libs/rb_libtorrent
+	x11-libs/qt-core:4
+	x11-libs/qt-dbus:4
+	X? ( x11-libs/qt-gui:4
+		libnotify? ( x11-libs/qt-gui:4[glib] ) )
+	dev-libs/boost"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	geoip? ( dev-libs/geoip )
+	libnotify? ( x11-libs/libnotify )"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	confutils_use_depend_all libnotify X
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Respect LDFLAGS
+	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
+
+	# Spoof uTorrent if user selects this
+ 	use spoof_utorrent && epatch "${FILESDIR}"/qbittorrent_spoof_utorrent.diff
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	use X         || myconf+=" --disable-gui"
+	use geoip     || myconf+=" --disable-geoip-database"
+	use libnotify || myconf+=" --disable-libnotify"
+
+	# slotted boost detection, bug #309415
+	BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	myconf+=" --with-libboost-inc=/usr/include/boost-${BOOST_VER}"
+
+	# econf fails, since this uses qconf
+	./configure --prefix=/usr --qtdir=/usr ${myconf} || die "configure failed"
+	eqmake4
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-2.7.0_beta1-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-2.7.0_beta1-r1.ebuild
new file mode 100644
index 0000000..4fc2b6f
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.7.0_beta1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit python confutils qt4-r2 versionator
+
+MY_P="${P/_/}"
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="http://www.qbittorrent.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X +spoof_utorrent geoip libnotify"
+
+# boost version so that we always have thread support
+CDEPEND="net-libs/rb_libtorrent
+	x11-libs/qt-core:4
+	x11-libs/qt-dbus:4
+	X? ( x11-libs/qt-gui:4
+		libnotify? ( x11-libs/qt-gui:4[glib] ) )
+	dev-libs/boost"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	geoip? ( dev-libs/geoip )
+	libnotify? ( x11-libs/libnotify )"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	confutils_use_depend_all libnotify X
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Respect LDFLAGS
+	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
+
+	# Spoof uTorrent if user selects this
+        use spoof_utorrent && epatch "${FILESDIR}"/qbittorrent_spoof_utorrent.diff
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	use X         || myconf+=" --disable-gui"
+	use geoip     || myconf+=" --disable-geoip-database"
+	use libnotify || myconf+=" --disable-libnotify"
+
+	# slotted boost detection, bug #309415
+	BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	myconf+=" --with-libboost-inc=/usr/include/boost-${BOOST_VER}"
+
+	# econf fails, since this uses qconf
+	./configure --prefix=/usr --qtdir=/usr ${myconf} || die "configure failed"
+	eqmake4
+}