From f5cc70e772ecd65d6a556e0d02dc5c12fc9d3bb3 Mon Sep 17 00:00:00 2001
From: Jauhien Piatlicki <jauhien@gentoo.org>
Date: Sun, 24 Jan 2016 22:45:22 +0100
Subject: net-p2p/qbittorrent: apply changes from 3.3.2 to recent versions

Package-Manager: portage-2.2.26
---
 net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild | 19 +++++++++----------
 net-p2p/qbittorrent/qbittorrent-9999.ebuild  | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'net-p2p')

diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild
index 10b4254df36b..786574f54582 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 0804614e8685..786574f54582 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
 }
-- 
cgit v1.2.3-65-gdbad