From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E4C4A58973 for ; Sun, 24 Jan 2016 22:25:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78407E0888; Sun, 24 Jan 2016 22:25:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 07EF7E0888 for ; Sun, 24 Jan 2016 22:25:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07DB53408F0 for ; Sun, 24 Jan 2016 22:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A893C1068 for ; Sun, 24 Jan 2016 22:25:06 +0000 (UTC) From: "Jauhien Piatlicki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jauhien Piatlicki" Message-ID: <1453674365.f5cc70e772ecd65d6a556e0d02dc5c12fc9d3bb3.jauhien@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild net-p2p/qbittorrent/qbittorrent-9999.ebuild X-VCS-Directories: net-p2p/qbittorrent/ X-VCS-Committer: jauhien X-VCS-Committer-Name: Jauhien Piatlicki X-VCS-Revision: f5cc70e772ecd65d6a556e0d02dc5c12fc9d3bb3 X-VCS-Branch: master Date: Sun, 24 Jan 2016 22:25:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d62e1635-23bc-4241-806a-38f6f7ce60b6 X-Archives-Hash: c4b9df0a3adec67dcb1e35303065714f commit: f5cc70e772ecd65d6a556e0d02dc5c12fc9d3bb3 Author: Jauhien Piatlicki gentoo org> AuthorDate: Sun Jan 24 21:45:22 2016 +0000 Commit: Jauhien Piatlicki gentoo org> CommitDate: Sun Jan 24 22:26:05 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5cc70e7 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(-) diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.3.ebuild index 10b4254..786574f 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 0804614..786574f 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 }