Update live ebuild. Implement Qt5 support (bug #515692).

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

4 files changed, 67 insertions, 35 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 05234148eb7e..327d9a9b2475 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/qbittorrent
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.237 2014/12/05 17:16:42 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.238 2015/02/17 19:15:20 yngwin Exp $
+
+  17 Feb 2015; Ben de Groot <yngwin@gentoo.org> metadata.xml,
+  qbittorrent-9999.ebuild:
+  Update live ebuild. Implement Qt5 support (bug #515692).
 
 *qbittorrent-3.0.11-r2 (05 Dec 2014)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 5176d0b47bec..5e5ce712efed 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -9,25 +9,25 @@ EBUILD qbittorrent-3.0.11-r2.ebuild 1389 SHA256 5506cd6671f64a76c9607c0666bd22ee
 EBUILD qbittorrent-3.1.10.ebuild 1385 SHA256 bba621ea73aa3f0e77b16a76f0be70fd32af6a70b5d52d58dd9dd2f157844b76 SHA512 e9faf6137a094f9f3e7aad0cd5c4c50bfb65ffc4af1fcb139fee3c88fae6287d2ec55bdea84c3b78c8c5b3d0d6793e9d995ebe583dfc5716c49aaea52ef85024 WHIRLPOOL cefdf55e6c8f92523d0c19ab86a01ba6c3a1088fc83d20d43bc7d20c8a99c20c3fecccd78dea998a93f62f0c2930a424c019a520eb86e92b46e12295297064fd
 EBUILD qbittorrent-3.1.11.ebuild 1389 SHA256 1e69e49c577bc5f7876ffb12a32fb5209b2dd6ebe72a794836a4159fc07da04c SHA512 3b4047eb50cc6e4d04991a3d41a2972e2631cfcc41871e060b8d4a7ec37efaa3eb7a4dc121977171c7d01854efdf8658ee8ce5e97351eaa25bb4bd817fc01734 WHIRLPOOL e047b00cac18823bc9299b14037c23f470642ac6b9f05d8111b4180e0eb4526271e91bb096877d16382380bb8454475d670b6ca73a75cb90a2137fe32303b586
 EBUILD qbittorrent-3.1.9.2-r1.ebuild 1384 SHA256 336b58f75737aba3a033a8104ad33306d470f520681edc813fa86a8e0214b30d SHA512 832ecabb72c9897edde89d9a1b0c1bc0be909f73e78317a1abbf2cd15408a0d0d52ec44fd2b9c0757b7e96b625486c7532e39d500b26650e9774f3eb574a33bf WHIRLPOOL c4b316a159956b7c0e6942e0d348a75014f815fc7ece85abe475c54f79ea6f4aa26edc79dc06e8d861ff8e5e7c3f02d2cea05af1d9d429b550c6bd4f063ce1b2
-EBUILD qbittorrent-9999.ebuild 1347 SHA256 49902da3a06e7fd6d2938391dc87965a67503952292aa269bb554eb6b87357cb SHA512 459ce27551ac6af9d176ba1c3483759da26cbee2adb4999ccbeca3f2e4aca1b02c10efe1fda97aaa2fbc45432904def5698b581be3b58e32eab8ea9cbb855e7e WHIRLPOOL aedc0e718502edc5f99288a277255eca50e3e1cbc6874b7abef3794fc28d9566037d7cb03c9d631173cc2bd74b5153f97746161d2de32942042858d6193ec5c2
-MISC ChangeLog 40112 SHA256 ec4c10cc26aeb191331e9234434d0c8bb80cf597254107a0a67f554299c43b5e SHA512 70d35cbfce336b630830d6a969899b627467118f2f14e4147d26bcaffb000df3bc1ffc6a5d98ea32299a669372059c42c76ced7a1ac35f0fc13148954828a11c WHIRLPOOL e2b5b749151f2d7065dc3659fec0947ddf0493dc4d74242cae7728948a78f255fab3c24066d4d224f045199b6b8c76f587abcb374de57be29d3cfb910ba772a2
-MISC metadata.xml 283 SHA256 a349c8453e8047015457bb702e39fffe881e124fd413e0528db95dec76b6ecbc SHA512 8dd153afe35d294ec712e149df180d12d6a807615f21692b1ef7b40e6dce454e5fd54073e25f7a372a967834f6ef9e62017ba10e881b326dfbf2b4f07a1426c7 WHIRLPOOL 943b3f74e434a5086e73fe13883dc729ef64e1d55036efbacf0d5a8912b0963b012d483f301eb430b22c800a7c450230ee2ae1c77aa7bc91fe0535e9e85abdd0
+EBUILD qbittorrent-9999.ebuild 1868 SHA256 d17f716271d016b8ffad02d9cda1c77939f8c5311c04f107db0b26248b6dd0d8 SHA512 948f885c6002ce674929ec2f6314f6e785f2c7c23619636f0f228881f01353107d1d7aaa392fad1423415f13980012491f398bc203d76f60bc315c63127e896d WHIRLPOOL 953dcf7e79ed3a7717035e2e9e9bc3702880ecc1132d7c17b3519187b8941d7d973fd0bed6257ef145bb4cda2be34421b363485e547aae19144f8127b7665534
+MISC ChangeLog 40259 SHA256 0cdf57734228753ce9d28f4d2bb2ad7cab72e68503b2ea24b3f52312751e9729 SHA512 5b9db567f194413e2e3cdc5cba8548b0d69722aa0c62ef53b5b6da2b673ef01adaee9d11e05655d265123ba6b1fc246a8c142504f25d2cde9ed00631a2c15691 WHIRLPOOL 7607521bfca60e9fb5dd7ee018678b1a8a749fe52785e85caf29dd54dbe65f5e3081f1215add3fda36889cc4dce977895398b692868040b7967697ea0c98a17f
+MISC metadata.xml 348 SHA256 3a0d424ab15e8392fd443578d49a005886fba9632fe2d09e5fad9cb40c83630a SHA512 a568b179952435992fb1f92511faefb64c7fbfd5d58d6e8b4a9490198b95348f0bfcaa586ac3a71bffca7ed9b48985e9b8aa7e286dc09f02959060453ff7647c WHIRLPOOL 00453c981d5aab5460eb075a6982aeead8b5bc39c53584fe766dd56cf0d3337d1b3384a43900e871b619fd463eee842aad5515d7950c3ae0e87eddd64d19b323
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUgeh/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88sAkP/2IzePB2d3OwG1+5bVwqSGAE
-XOUQJB47RL+LOf8l9b2f2EmXEY9S2QPR2pmJva1ob0YOVVFczf5h2PFDvf6ickFJ
-bynO+BuebF09h23qWq2kMybNm/gyvySxlkExaqA1BhJgWPJPDVUAjVUubE7cYt/q
-DmvonuCXEMfPUdPcfz6hZVNdht3Jdu36PRsfp4TaqU+Mmj7jZz7iCsTpfWUNw8Te
-uYBn6BrqO0fBw8SSGz1Wpu8kwgUgkzMpBLySB5L3ju3s9wZ1yeutPsmmZoyBP1ZW
-L5fQ4+J9bs5gb+NOMiAiuCg/LlfAuQbBqyxTZZkghMS71DH6ftyeZiExuUpw9/r7
-6C23VEzT25pPp9O53/mm/bKdHnj0L7zjrIJNWYvkKgqbv0eo8eaBOfJDsmuFD4J6
-1UJlsmGkNEk8kHk2EjgyqWpGHhXG27SC+YK9hsROadnB0iiaJ7temLA8o0FzJsIy
-YfTlsJNxODpz9yZEekTtwsZBRZGGV03rZxwm0SHrlDpDl5wp2xSINFC9apIwqsCL
-nd4bajG6av6lQ4WH0Yg8kPrLIq3FYn+yKzbF6XYREsGLVa67NWWwWoecYFW7kWvW
-Iz5VMPh219mYobAu3/wk/aN/au4hBNNBcYkvNak52yTtuFTuxLO7vImLHqaWCWK0
-/1Zzwai6oHZpR4KxiZmU
-=aEFV
+iQJ8BAEBCABmBQJU45NOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFObVYQAKCMftBXaq50v7mVwifU2K21
+WySxFqTWRAqXdSV1LbmZMpdb/55lIQrPG0sGyIJ23FcSjbgMsp0H5Ia66v8H5i33
+IT9d/EaPBKO5wvyZnC2xS8UNpbhcxFJgu/Vm6QpemOV+H04wwhos8J4T79siBemE
+527bbs1XiUe7tNxKI51kIG6LlNW1pPWMBimZx/mOUDnQVMheNFjRT0k0xSNrQtFs
+QiEL1ipAP1vxToGPPgj6VU7kAkhEpU0NBd4/bPyDUoCPrdFgxpHR/+vdUlhYV/7Q
+fGivicOUlZhH/fXbycCSe+oq7jcYRb7OEBbto+EbhgcD9w1X3m9+OzVnbzSc9Bie
+3w0tu34CMGnRRZauLWx3B6kvzTgIW0L/eRqBP8yrsJNPqfXEmckOHX573Rduz25G
+bS3Chej0CPDhbmkShNa00fJrJ4FBZQmUCNAfKWy0fGBUDDoDJEpnMkCBfa+HM9z2
+o796zqHtgkAyToXBkU452iJrAN/tdZm9MTxVJwg8zpl/I3+NS7xcgBEpHfFynvjn
+9UT2Mje9sYad54+lCuDQyMKb9/cpnpIE08Z9aTvc6hfvwQr83/f2JV2AMk55M48r
+2AOuw3l083c/kxLpTBZRbBJcyrihiKlrKfe94ZKMhxQZbzdIkUDO+HUruZAcIhIc
+5D98VlwMstgTLs76ofw8
+=EzAp
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/metadata.xml b/net-p2p/qbittorrent/metadata.xml
index 9eec7fece0f5..0c56b695e958 100644
--- a/net-p2p/qbittorrent/metadata.xml
+++ b/net-p2p/qbittorrent/metadata.xml
@@ -7,4 +7,7 @@
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+  <use>
+    <flag name='webui'>Enable the Web UI</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 998208764009..892e8ba5aa18 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,30 +1,48 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.18 2014/10/19 00:23:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.19 2015/02/17 19:15:20 yngwin Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
-inherit python-r1 qt4-r2 git-r3
+inherit python-r1 qmake-utils
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/"
-EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+MY_P=${P/_}
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-
-IUSE="dbus debug geoip +X"
+IUSE="+dbus debug geoip +qt4 qt5 webui +X"
+REQUIRED_USE="^^ ( qt4 qt5 )
+	dbus? ( X )
+	geoip? ( X )"
 
 # geoip and python are runtime deps only (see INSTALL file)
 CDEPEND="
 	dev-libs/boost:=
-	dev-qt/qtcore:4
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?,qt4?,qt5?]
 	>=net-libs/rb_libtorrent-0.16.17
-	dbus? ( dev-qt/qtdbus:4 )
-	X? ( dev-qt/qtgui:4 )
+	sys-libs/zlib
+	qt4? ( dev-qt/qtcore:4
+		dbus? ( dev-qt/qtdbus:4 )
+		X? ( dev-qt/qtgui:4 )
+		)
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtxml:5
+		dbus? ( dev-qt/qtdbus:5 )
+		X? ( dev-qt/qtgui:4
+			dev-qt/qtwidgets:5 )
+		)
 "
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
@@ -34,6 +52,7 @@ RDEPEND="${CDEPEND}
 	geoip? ( dev-libs/geoip )
 "
 
+S=${WORKDIR}/${MY_P}
 DOCS=(AUTHORS Changelog README.md TODO)
 
 src_configure() {
@@ -41,15 +60,21 @@ src_configure() {
 	local myconf=(
 		./configure
 		--prefix="${EPREFIX}/usr"
-		--with-libboost-inc="${EPREFIX}/usr/include/boost"
 		--with-qtsingleapplication=system
 		$(use dbus  || echo --disable-qt-dbus)
 		$(use debug && echo --enable-debug)
 		$(use geoip || echo --disable-geoip-database)
+		$(use qt5   && echo --with-qt5)
+		$(use webui || echo --disable-webui)
 		$(use X     || echo --disable-gui)
 	)
 
 	echo "${myconf[@]}"
 	"${myconf[@]}" || die "configure failed"
-	eqmake4
+	use qt4 && eqmake4
+	use qt5 && eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
 }