Use bundled qtsingleapplication for -X

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

4 files changed, 13 insertions, 32 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 2e2994cdffbc..695a7ef1a64f 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,10 @@
 # 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.220 2013/11/22 22:27:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.221 2013/11/24 10:08:09 hwoarang Exp $
+
+  24 Nov 2013; Markos Chandras <hwoarang@gentoo.org> qbittorrent-3.1.3.ebuild,
+  qbittorrent-9999.ebuild:
+  Use bundled qtsingleapplication for -X
 
 *qbittorrent-3.1.3 (22 Nov 2013)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 12f77578e101..62a0f5e770c8 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,32 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.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.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
+EBUILD qbittorrent-3.1.3.ebuild 1462 SHA256 b28ee9cae624b8966d7e62e3e291e7816f8d8d2cab652c5744aed0c6707e51a6 SHA512 06c6e8696e894ca008dcd9d067d97c35aba2886c8919f53c7ad36b7d2b9550aebf109b58a0fef1a03fafe8e3546946d9b4d0f94e8405aaacdbb70cb89bd64fe6 WHIRLPOOL 6b7eeb6ab755756093ada6d8821d05a07093fed4a297249ba3cc7b7f37ad1ee44655ffd7070cfb870a431ffdc61dcc6436bb64ff390d0df24db9915a16af588d
+EBUILD qbittorrent-9999.ebuild 1454 SHA256 befd0a8f214dca3678ecfb7a79d6105be0dd267e84a643916cd9b8977ac4fe6d SHA512 c74ca5fb718d8d4000a8e18fe86e7b54c06593ea148d9cf87f57f969f32d18aabc12dea28137b6e7d6882c722735667c508c66e426069c2514834f1c4a205ae5 WHIRLPOOL 3373d2c35f8e0f4bf69d9bdf54337aeeeb5d73d1786eb3ddf201f88977731dcdec31520db27ced50cef889e845206c92060944d51cddd3fb29120b4e74619dbf
+MISC ChangeLog 37354 SHA256 ba88b7226b850668163c08d7bf95b6b1d2366bc60a8216b9a1ffb0e80ab80010 SHA512 a60c8679116ed05a69f57b7dd86e4b0d5a275c6d2040f01f7f79f760a96668bb23ad0749fa3f6c1d8b4c25aa20d85eeaf1e96e4ea012e9343d7ce45d1c0fd507 WHIRLPOOL 80490245ea4d41db0cc472ae0dfbe7adc862435aee08e2b666bc31acbe05e7bad2043acdb8585df1d8e9bf259b2ba73e1ab3c7c079ca348f4077a161cf1aebb4
 MISC metadata.xml 374 SHA256 2108fb37a2cb5860e8afe2b4a4995daa1f3a261e44519682a4367732cf6cee71 SHA512 608b2a2760bbedc27bf313610852179f5aed2783147d177cab83d2c70d7e902745e84b908af4de0f7c2ebd2a368387e6491ef2a96c2c4c47e1e9caaa8e2e88f6 WHIRLPOOL 52b94dacfbb52f2dffd0f9cbc6d11cd77378547599b39ed7bfdb9de0187ee500da168527540117d6083e885ebe470c51e5b0942cdb3025e6e7eec60bd2ec92bc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQJ8BAEBCABmBQJSj9pqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-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.3.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.3.ebuild
index f5079ca04489..fa90d9c87ce1 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.1.3.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.3.ebuild,v 1.1 2013/11/22 22:27:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.3.ebuild,v 1.2 2013/11/24 10:08:09 hwoarang Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,9 +20,8 @@ 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 )
+	X? ( dev-qt/qtgui:4 dev-qt/qtsingleapplication )
 	dbus? ( dev-qt/qtdbus:4 )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 2d2804e203b6..b63ef51b1f7c 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.12 2013/11/22 22:27:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.13 2013/11/24 10:08:09 hwoarang Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -22,9 +22,9 @@ 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
-	X? ( dev-qt/qtgui:4 )
+	X? ( dev-qt/qtgui:4 dev-qt/qtsingleapplication )
+
 	dbus? ( dev-qt/qtdbus:4 )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"