summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2014-11-17 00:24:43 +0000
committerDavide Pesavento <pesa@gentoo.org>2014-11-17 00:24:43 +0000
commit36d50b8be68da1364ba3c8d06f71e9b3100a5ad3 (patch)
treeade94302542c3b80a51d9d5cfbd64c01f7ff3dcf /eclass
parentReplace fixlocalpod with perl_delete_localpod (diff)
downloadhistorical-36d50b8be68da1364ba3c8d06f71e9b3100a5ad3.tar.gz
historical-36d50b8be68da1364ba3c8d06f71e9b3100a5ad3.tar.bz2
historical-36d50b8be68da1364ba3c8d06f71e9b3100a5ad3.zip
Add blocker on emul-linux-x86-qtlibs wrt bug 529370.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/qt4-build-multilib.eclass3
2 files changed, 6 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index fce318c3073d..59b4f1112c73 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1423 2014/11/16 20:22:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1424 2014/11/17 00:24:43 pesa Exp $
+
+ 17 Nov 2014; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Add blocker on emul-linux-x86-qtlibs wrt bug 529370.
16 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
Make calling perlinfo trigger a real warning
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 709857157148..c8459245f1f4 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.1 2014/11/13 01:45:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.2 2014/11/17 00:24:43 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -52,6 +52,7 @@ DEPEND="
"
RDEPEND="
dev-qt/qtchooser
+ abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
"