Gentoo Archives: gentoo-commits

From: Amy Winston <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
Date: Sun, 26 Jun 2016 18:13:42
Message-Id: 1466964653.55c19bd2c8a003d6dab8744ca12d5e6995ba815b.amynka@gentoo
1 commit: 55c19bd2c8a003d6dab8744ca12d5e6995ba815b
2 Author: Chris Mayo <aklhfex <AT> gmail <DOT> com>
3 AuthorDate: Sun Jun 26 11:18:38 2016 +0000
4 Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 26 18:10:53 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c19bd2
7
8 sci-geosciences/merkaartor: Only allow qrcode with Qt4
9
10 Closes: #1748
11
12 sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild | 6 ++++--
13 1 file changed, 4 insertions(+), 2 deletions(-)
14
15 diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
16 index 7e21c51..e512319 100644
17 --- a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
18 +++ b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
19 @@ -17,8 +17,10 @@ SLOT="0"
20 KEYWORDS="~amd64 ~x86"
21 IUSE="debug exif gps libproxy qrcode qt4 qt5"
22
23 -REQUIRED_USE="^^ ( qt4 qt5 )"
24 -
25 +REQUIRED_USE="
26 + ^^ ( qt4 qt5 )
27 + qrcode? ( qt4 )
28 +"
29 RDEPEND="
30 qt4? (
31 dev-qt/qtcore:4