summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2013-12-30 12:55:47 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2013-12-30 12:55:47 +0000
commit5c7e77606b0e2ded21b5098cb7cba3d63acf22c5 (patch)
tree48051580a4be82a3b68fbfbea8fd38519f463032 /net-p2p/qbittorrent
parentAdd missing dependency on x11-libs/libXt (#496486 by Fabio Rossi) (diff)
downloadgentoo-2-5c7e77606b0e2ded21b5098cb7cba3d63acf22c5.tar.gz
gentoo-2-5c7e77606b0e2ded21b5098cb7cba3d63acf22c5.tar.bz2
gentoo-2-5c7e77606b0e2ded21b5098cb7cba3d63acf22c5.zip
Use system's qtsingleapplication (>=2.6.1_p20130904) to take advantage of the new X use-flag
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Diffstat (limited to 'net-p2p/qbittorrent')
-rw-r--r--net-p2p/qbittorrent/ChangeLog6
-rw-r--r--net-p2p/qbittorrent/qbittorrent-9999.ebuild14
2 files changed, 10 insertions, 10 deletions
diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 695a7ef1a64f..857e34d90be6 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.221 2013/11/24 10:08:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.222 2013/12/30 12:55:47 hwoarang Exp $
+
+ 30 Dec 2013; Markos Chandras <hwoarang@gentoo.org> qbittorrent-9999.ebuild:
+ Use system's qtsingleapplication (>=2.6.1_p20130904) to take advantage of the
+ new X use-flag
24 Nov 2013; Markos Chandras <hwoarang@gentoo.org> qbittorrent-3.1.3.ebuild,
qbittorrent-9999.ebuild:
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index b63ef51b1f7c..f90263b88eaa 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.13 2013/11/24 10:08:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.14 2013/12/30 12:55:47 hwoarang Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -23,7 +23,8 @@ IUSE="dbus +X geoip"
CDEPEND="dev-libs/boost
dev-qt/qtcore:4
net-libs/rb_libtorrent
- X? ( dev-qt/qtgui:4 dev-qt/qtsingleapplication )
+ >=dev-qt/qtsingleapplication-2.6.1_p20130904
+ X? ( dev-qt/qtgui:4 )
dbus? ( dev-qt/qtdbus:4 )"
DEPEND="${CDEPEND}
@@ -44,16 +45,11 @@ src_configure() {
local myconf
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
+ use X || myconf+=" --disable-gui"
# econf fails, since this uses qconf
./configure --prefix=/usr --qtdir=/usr \
+ --with-qtsingleapplication=system \
--with-libboost-inc=/usr/include/boost \
${myconf} || die "configure failed"
eqmake4