[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/

[Amy Winston]

commit:     55c19bd2c8a003d6dab8744ca12d5e6995ba815b
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sun Jun 26 11:18:38 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 18:10:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c19bd2

sci-geosciences/merkaartor: Only allow qrcode with Qt4

Closes: #1748

 sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild 
b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
index 7e21c51..e512319 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
@@ -17,8 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug exif gps libproxy qrcode qt4 qt5"
 
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
+REQUIRED_USE="
+       ^^ ( qt4 qt5 )
+       qrcode? ( qt4 )
+"
 RDEPEND="
        qt4? (
                dev-qt/qtcore:4