Version bump. Bug #492316

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 41 insertions, 80 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index a1ea2a55b0ed..2e2994cdffbc 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.219 2013/11/17 12:23:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.220 2013/11/22 22:27:56 hwoarang Exp $
+
+*qbittorrent-3.1.3 (22 Nov 2013)
+
+  22 Nov 2013; Markos Chandras <hwoarang@gentoo.org> +qbittorrent-3.1.3.ebuild,
+  -qbittorrent-3.1.0.ebuild, -qbittorrent-3.1.2.ebuild, qbittorrent-9999.ebuild:
+  Version bump. Bug #492316
 
 *qbittorrent-3.1.2 (11 Nov 2013)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index aac5010dd390..12f77578e101 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -3,32 +3,30 @@ Hash: SHA256
 
 DIST qbittorrent-2.9.7.tar.gz 3606781 SHA256 d706a8aff16cc6977379f5b25b842194dceef3b20efd0ca949300728c5a6a190 SHA512 bbc29781664432f7ebe42bb386c5cfd5c4eb5784f36620bf86a15a3e66f6cf3fe3a45831a4b552d5b48d5d1613591d208e6732e2a1a44ef269fd33fac9bf9cca WHIRLPOOL 5129c392345a371c18dc8a226e1c98ded5833019e1fd99a131f28e08ef310e3a4874930c8d2750742ff8f4cba0fdb5d9b926226e87b6911830ee67614ad361c1
 DIST qbittorrent-3.0.11.tar.gz 5097233 SHA256 bce32693c265bb330776337da6e88be3e5e50cf218b2fa8c5cd6c515e7158480 SHA512 f0350ae3db9b56d4fde67b538a5599058191300b90ec1a3708aacf68f5353be63c11f9699a84844ee00186aab9963c7daa4f7d1ed862520682be69e9173590a6 WHIRLPOOL a24f23934970420136a9bd6cebeafdda7e283d5c1118c9d85bdac3485afbb43c684dd9f22c85c8dd3e135e08a72d2766de7e345566d8267db11964454452c29b
-DIST qbittorrent-3.1.0.tar.gz 3804445 SHA256 e94b37cc0aea7e22c3ae96f17196ef0eba27e5f3e12c51b9c67fe28b61054274 SHA512 a9d43fb358531a9016c8f9321386d94ca5a94520791e987cafbddf3708d2e630dd581b8cd6e2afd2dfa882dc9826ebaa1d10113e8681c2186c462314a0aa1e4b WHIRLPOOL 307797e81cafa4f8087dacadea2b7e60723380bd7667491029370dd846e43fc854d038b82e0fa3b0cc1a749799cfe4d59f28911dee30f1ff3ac102617b52dee7
-DIST qbittorrent-3.1.2.tar.gz 3883015 SHA256 a72e8ff9e2ccc49653b2fe78fc3e1213ed474c393578f39aa8a3d70cf43e3c8b SHA512 4c9efae5675821e0f51faa62e96959807406844c453d2790c530f3d1467c690b332078091842e5edb0ce5a7570cd9f8a7fe519a445524191fcc48864af6c0f9c WHIRLPOOL e9fcf41bc45a31e52eb061f2a7b6f6f35a846d51045a669cf395fc74ec95cbb8fbf77a153a2ad15e5c47d775a1f8b790a2046b283c017c197c12a65a00c7167d
+DIST qbittorrent-3.1.3.tar.gz 3880133 SHA256 349f206597c559f8d1e9f5948fa66a0dc2d3501a4d542a5b3e34b184a0daf351 SHA512 0ca6638f687ba15dc5cec53dd13331e9eeff95e1296629606d6fd6fa310ec90f8db06fd74353dcd057e0dbb4aac59ef7e23122cb3f84376169dab703408b5a6f WHIRLPOOL d91728aa24b3f7b28729f1ab0d18acda1f15adebce3b962685d4a11ecf5e6e0372a470d2c41863fe560f5fb301180a02d8ca77dae2f07bdfed8cd6d7a87f9d57
 EBUILD qbittorrent-2.9.7.ebuild 1663 SHA256 b9953da29357f7b323545fa855d8e42f21fc0c6c0633cb2603c8fe8f0e5e3c71 SHA512 ca27a551d58af6c2d07540932009a9fb0bd0ed3290e63473638d28ebc7749d6d9dd76e8a9f32c3eaf1c81201cf00f8d8be571a39c456a8630cfa91f2ef946dfb WHIRLPOOL a038a5da617485ef61e1a99f13eb0496d270ddcbd36e244999f34b7641c1ac42e6263ffd4f16344af4cc994e3bd146f043635937dbb9bc69489cd01071b79529
 EBUILD qbittorrent-3.0.11-r1.ebuild 1426 SHA256 7a865918dac899af6170624053c4b3580c2c8283188c08823ce0e4f2bd86fac2 SHA512 a61c20758674c9e8b3530f8513114f05d0a446542ec002148a84f3f00f3b299ba48113be9268ddc6d75b4ea802e424c20d8d58a0174ebd505fae53234b8acdba WHIRLPOOL 68293fb8f3f7d53e5a63c42b5491cc215a5738ccb563271488a8f443c53566db390e4510921e6f19baea944c77f1fb788ec5ad3381686c4d8901989e3c0d8aa9
 EBUILD qbittorrent-3.0.11.ebuild 1355 SHA256 08e55c7c2b6a49463a09b87ca23be3d6c654361c424c69440c42f286b1c931ae SHA512 fa4021fd8cb34a0d1d17073a5b7297c87163f50bc823f44dba542e61d02f7921bd821e4f2ab11a3a7bc51b15eeaf3fc30213d24ff9e8a0fa6c2c586061927a34 WHIRLPOOL 05787a6d916bf6ee4cfc111a97179a3d730bb7cee806d0480ddcd5774501d239551e087ff3e3ab4bf6fbb1475b6ec8678cf514ecd68870ce8eb7871807183f08
-EBUILD qbittorrent-3.1.0.ebuild 1422 SHA256 0354ffe60dc7838b9eb9e821c0f4fa6bf46674c0ca55531b0a1bef5c9e3a4d3d SHA512 5a8e7fff6e0da6c8d60f613b21b2abaff32b7138b2d2ff4e2e460f9c26f0ddad7db1cccfe5284fbdba071dc5d1f35cf0c6da7084511f623ddcbeca3becbd9c99 WHIRLPOOL 7ddb6d6a513a8cf92be512fec53bd83b81ec177967c8190da70a79e4b61955de5d57879fca23c2d699e51079f52b2580dda0d68c5b05695f8fde356b5e093c5d
-EBUILD qbittorrent-3.1.2.ebuild 1422 SHA256 5d5416e6d48e4fd5ddd5227a5577bd9d03f573978eabae4c5bd099609cd9c89e SHA512 cf729e61c0dd9ff0d71ea29f66d6b60eb1e947a05051096d063d654b8cc41c2b7f43090ab125124cda374f8883d8fe8fc69f99ff2587200e1d827c71bbf6046f WHIRLPOOL bbfc7dd923523270a631d67011c9c4477bf1b33435a048321dbb61a6463f0b795d9bb9d97695d8be7742ca55e426d4552136ede813d243ba8c007bf691b9a50f
-EBUILD qbittorrent-9999.ebuild 1375 SHA256 7236bfa816ff0b645d59acdf55a894fdadd555a14b4d24a9d934351d2c53e032 SHA512 dbe1a298cc1e9dd82b43498cb6f4d3a4259e82a563e1ab84a42942dc612fa7ad597f68f858b8ea033d1c584f2620d9a154e8a04a334dcf4cbc50ad46275dbd59 WHIRLPOOL 09b2b17f47113fb7ff587780fb3d5d338091d39f59a441b591dbf493fd2c5bba16840750b5a98a7b0d53d7d87f3f1e51ca2bb9e057f87239c66851eeed88b4e3
-MISC ChangeLog 36982 SHA256 af19a592a095b298dfaabab7f3dc0e47a425c3c7b4f2d7b8be84921d4a39746c SHA512 fd4ee1badc672f693dfd825596023bc2f17f94ec0c9290541684e3d9cd6c45db5a2aef0c094513dce89171311fbd64ddc7fbbdb9ca6b9db678d2146b061468df WHIRLPOOL 76264e4e77d288532c7dbfbcb760f7799809cb363486f448ed72d513f293e8f372883de2bbc29076f6595bfd0e7038549843d7204e491f6abf2cf9d001982cd7
+EBUILD qbittorrent-3.1.3.ebuild 1463 SHA256 2a0cde6951f1ca2424699f47f2048b672c2a10593c616fe66fc135e62e8e12d6 SHA512 4f3e93eaa9d0c47250b598b4f97a8ae0683453d1797cae4aedc42cdb64ec85b38ba3bb82fbd8edf87d766022a1d72c6854f366e3ad23fec14f06dfecb1865e04 WHIRLPOOL 15ba0ff4ab77916c8eaef1f48aead02c1b270e83e8a010bfed4c477483f6e414c21e0d58d5b3b323be83eb7d46343cb7845c25f2e657c98ebb77b448e3fa545b
+EBUILD qbittorrent-9999.ebuild 1454 SHA256 97ee418e580d824b4acd8d91d61c08f959d30121d2ed3ab573da5e43dea528e7 SHA512 277ea3c6dce4c636ca2f066565ef3722620799c3e536a7766927b0970c4922fb634c659734fecbd4ab81220c0514c78bd38aa51431cb0f0ad8107b1481441be0 WHIRLPOOL 031ccb020e67870f05bcc655db2802432b2afd04da3532d7ceaa2d15685cfcb9e0923c8c78414d01f8988cc33ca4670745296ca4de94d97f0b6e81a41d8f9b88
+MISC ChangeLog 37206 SHA256 37b9416694bc7087fb36f221e2a0b76c9a4974bf0dbc733b7731545a2a6ead79 SHA512 dc37dcce8df72c99d14fb08ef777e652ba1cb061f7dc051965f9e3e7bcb8a06384e02a6a622634ad4c95b270ab003111b52211163895d52a4eb127d011c122cc WHIRLPOOL 3f995de5aebb59885183ef56cb3bffb32b659eaa871e4a4e44f451b3baf8511df7f9239cf05c0a069e6c37caac9a9b30d8c7b09f21011ca7f8bd64fd7e8f32e7
 MISC metadata.xml 374 SHA256 2108fb37a2cb5860e8afe2b4a4995daa1f3a261e44519682a4367732cf6cee71 SHA512 608b2a2760bbedc27bf313610852179f5aed2783147d177cab83d2c70d7e902745e84b908af4de0f7c2ebd2a368387e6491ef2a96c2c4c47e1e9caaa8e2e88f6 WHIRLPOOL 52b94dacfbb52f2dffd0f9cbc6d11cd77378547599b39ed7bfdb9de0187ee500da168527540117d6083e885ebe470c51e5b0942cdb3025e6e7eec60bd2ec92bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSiLVcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSj9pqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88LCsP/1D/1YshBJ1iMFs8ED93qMSC
-qn10LAI0NbIC2JaSuKEB5AkaX89Pph+mVnRPS2ws8n1SEyXyxLa5hgijXi31BJQi
-9tbFeVLt2kLGCi+Gw7itHW8ONh2J0i/B9lcZk99njTf7Of4csvRUNekdh0cyzTE8
-8Of1xjkDj5rIuYg6bNnQiludKLzMHT6Qknm7J//TZt4Q5qIlPFXOrRcaA+SEByg5
-a+w3VZHooxT0wUMvwI9vW/7Wy0qM9QWnQvAhuHE7ooMqtrrEUoQdYyZB6P28VH8v
-Bv44b22WM6nWNzwnq/23ARGjl4tkn923L+lKrqOImJrfAZAUEAJh7474sf2FJK9v
-LwXjkrLMZAJa3fiUR1rhbeBEEo9MikedANPtuqMtvWliB9W5Zp4y4zpeUJkywmtC
-8wQwSWpAimECr7GMdQfnChr/5XMz1zmABmGH6hj5U7G0m8QnyG8+YuKgrvoi3mJ2
-rS+OaYs3R9XJQ5dFujW4bchC+L8ssKR1Aqg4b2HIJVS0zgz8WuypFXxt2eMQAzMd
-SlWaaQPFU/IZQRErqvjFKSueLVaL8BIL3ve0JCpbF00DanJLSSgXAEP0G7XvZ6SL
-evjBb1bPHM+mFdlW/2Uxkb5FTtDm+7a37KoLFxwJLRSGgnxT7kCIGnIL74Q7xUNi
-/hXIBhLJBGCA/08j22YC
-=9M7n
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88/UsP/iDEsu2JV2ZqYILj2tha/YhZ
+s9b7oWCaKy7XWXOW2aw3eQqAMMxv4pqwudjZxoyO4B6qTDqlBJqcgEVBjyyhGxSN
+qrHnqkC8nl+QlhznwZngpdIS1TouFlYK3xCU75jb0DpnsVpOZJZ4LIMftmlIavRg
+C05V6BD324jOBUIsdyopKKuArGoBjqD81SuELYQBDgIjgBDAQaSufZg49aw25h6u
+EqEncDg0g2ZjPRx6w/54o5P+E0MDqk3A9JxWIqE5Y+nCv7cGuOEevxC9q6FqI1HL
+2XUreax6H71xpK4y7GvmNXyM/P/miqMkZ8+BDs5xbYcmAEbSZhNjTffkoaDbHACu
+AApyWWPF58axpWmiNvUebqWF5HWcTDMHnV3/6Ahgb5PnQL7R5Jf1Pj1eV/CJv3ov
+gDwyx2tikrF9tNmmrnV5Fthnnxv16D4U5spnqul7YXsSpGmCmSe2SuASiPUMnfJR
+vpsf431Tl0GHEMpVvUnEOxlFh91NoAgpzqm/uU3IPa2JwNMgJRNMUL4nGVGKpeh7
+SQacJgyrv2Mnpny/29QfWQGamD2+98QC3zujjkWoKl9DGn3SFSeQxLbCH/10qu12
+gyAJY0mb9QYCqyvIZNFcUap8HhIQ35gJxRwbmXSP8H4W4ZL/60WNmfPJiy5DDyHe
+rDcwCA+9WqFSCQD9eVNl
+=AlXS
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.2.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.2.ebuild
deleted file mode 100644
index 28dc3776ecc3..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.2.ebuild,v 1.1 2013/11/11 20:32:10 hwoarang Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit python-r1 qt4-r2
-
-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 ~arm ~x86"
-IUSE="dbus +X geoip"
-
-# python-2 is a runtime dep only, for the search engine (see INSTALL file)
-CDEPEND="dev-libs/boost
-	dev-qt/qtcore:4
-	dev-qt/qtsingleapplication
-	>=net-libs/rb_libtorrent-0.16.3
-	X? ( dev-qt/qtgui:4 )
-	dbus? ( dev-qt/qtdbus:4 )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	geoip? ( dev-libs/geoip )"
-
-DOCS="AUTHORS Changelog NEWS README TODO"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Respect LDFLAGS
-	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use X         || myconf+=" --disable-gui"
-	use geoip     || myconf+=" --disable-geoip-database"
-	use dbus 	  || myconf+=" --disable-qt-dbus"
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr \
-		--with-libboost-inc=/usr/include/boost \
-		--with-qtsingleapplication=system \
-		${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.0.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.3.ebuild
index ca10f487cb73..f5079ca04489 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.1.0.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.0.ebuild,v 1.1 2013/10/16 20:07:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.3.ebuild,v 1.1 2013/11/22 22:27:56 hwoarang Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -41,14 +41,19 @@ src_prepare() {
 
 src_configure() {
 	local myconf
-	use X         || myconf+=" --disable-gui"
 	use geoip     || myconf+=" --disable-geoip-database"
 	use dbus 	  || myconf+=" --disable-qt-dbus"
 
+	# 491494 workaround
+	if use X; then
+		myconf+=" --with-qtsingleapplication=system"
+	else
+		myconf+=" --disable-gui"
+	fi
+
 	# econf fails, since this uses qconf
 	./configure --prefix=/usr --qtdir=/usr \
 		--with-libboost-inc=/usr/include/boost \
-		--with-qtsingleapplication=system \
 		${myconf} || die "configure failed"
 	eqmake4
 }
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index c41b592a6779..2d2804e203b6 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.11 2013/10/13 10:35:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.12 2013/11/22 22:27:56 hwoarang Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -42,10 +42,16 @@ src_prepare() {
 
 src_configure() {
 	local myconf
-	use X         || myconf+=" --disable-gui"
 	use geoip     || myconf+=" --disable-geoip-database"
 	use dbus      || myconf+=" --disable-qt-dbus"
 
+	# 491494 workaround
+	if use X; then
+		myconf+=" --with-qtsingleapplication=system"
+	else
+		myconf+=" --disable-gui"
+	fi
+
 	# econf fails, since this uses qconf
 	./configure --prefix=/usr --qtdir=/usr \
 		--with-libboost-inc=/usr/include/boost \