summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJauhien Piatlicki <jauhien@gentoo.org>2016-01-24 22:45:22 +0100
committerJauhien Piatlicki <jauhien@gentoo.org>2016-01-24 23:26:05 +0100
commitf5cc70e772ecd65d6a556e0d02dc5c12fc9d3bb3 (patch)
tree909bd4e3836e8651c145bd31bad8c24ce5a86a7f
parentMerge remote-tracking branch 'RobinDX/qbit' (diff)
downloadgentoo-f5cc70e772ecd65d6a556e0d02dc5c12fc9d3bb3.tar.gz
gentoo-f5cc70e772ecd65d6a556e0d02dc5c12fc9d3bb3.tar.bz2
gentoo-f5cc70e772ecd65d6a556e0d02dc5c12fc9d3bb3.zip
net-p2p/qbittorrent: apply changes from 3.3.2 to recent versions
Package-Manager: portage-2.2.26
-rw-r--r--net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild19
-rw-r--r--net-p2p/qbittorrent/qbittorrent-9999.ebuild20
2 files changed, 19 insertions, 20 deletions
diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild
index 10b4254df36..786574f5458 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild
@@ -3,9 +3,9 @@
# $Id$
EAPI=5
-
PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-inherit eutils python-r1 qt4-r2
+
+inherit eutils python-r1 qt4-r2 flag-o-matic
DESCRIPTION="BitTorrent client in C++ and Qt"
HOMEPAGE="http://www.qbittorrent.org/"
@@ -21,7 +21,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="+dbus debug qt4 qt5 webui +X"
+IUSE="+dbus debug qt4 +qt5 webui +X"
REQUIRED_USE="
^^ ( qt4 qt5 )
dbus? ( X )
@@ -63,6 +63,9 @@ src_prepare() {
}
src_configure() {
+ # See bug 569062
+ append-cppflags "-DBOOST_NO_CXX11_REF_QUALIFIERS"
+
# Custom configure script, econf fails
local myconf=(
./configure
@@ -75,12 +78,8 @@ src_configure() {
$(use X || echo --disable-gui)
)
+ echo "${myconf[@]}"
"${myconf[@]}" || die "configure failed"
-
- if use qt4 ;then
- eqmake4
- elif use qt5 ;then
- eqmake5
- fi
+ use qt4 && eqmake4
+ use qt5 && eqmake5
}
-
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 0804614e868..786574f5458 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-
PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
-inherit eutils python-r1 qt4-r2
+
+inherit eutils python-r1 qt4-r2 flag-o-matic
DESCRIPTION="BitTorrent client in C++ and Qt"
HOMEPAGE="http://www.qbittorrent.org/"
@@ -21,7 +21,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="+dbus debug qt4 qt5 webui +X"
+IUSE="+dbus debug qt4 +qt5 webui +X"
REQUIRED_USE="
^^ ( qt4 qt5 )
dbus? ( X )
@@ -63,6 +63,9 @@ src_prepare() {
}
src_configure() {
+ # See bug 569062
+ append-cppflags "-DBOOST_NO_CXX11_REF_QUALIFIERS"
+
# Custom configure script, econf fails
local myconf=(
./configure
@@ -75,11 +78,8 @@ src_configure() {
$(use X || echo --disable-gui)
)
+ echo "${myconf[@]}"
"${myconf[@]}" || die "configure failed"
-
- if use qt4 ;then
- eqmake4
- elif use qt5 ;then
- eqmake5
- fi
+ use qt4 && eqmake4
+ use qt5 && eqmake5
}