diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-04-19 14:52:12 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-04-19 14:52:12 +0000 |
| commit | c173bec5787f38e109407ad4505df991d2f817b3 (patch) | |
| tree | e5063701c4d3dc3ee7482a123b5b3d06da9005bb | |
| parent | Mask net-ftp/leechcraft-lcftp and net-p2p/leechcraft-eiskaltdcpp by maintaine... (diff) | |
| download | gentoo-2-c173bec5787f38e109407ad4505df991d2f817b3.tar.gz gentoo-2-c173bec5787f38e109407ad4505df991d2f817b3.tar.bz2 gentoo-2-c173bec5787f38e109407ad4505df991d2f817b3.zip | |
Add appropriate blockers for qt-bearer.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 1f46bb9383ce..01dd43421be9 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.214 2012/04/18 16:52:30 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.215 2012/04/19 14:52:12 pesa Exp $ + + 19 Apr 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Add appropriate blockers for qt-bearer. 18 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin.eclass: removed unneeded path install for /usr/local/share; fix i18n install bug, diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index f4ea2c1f074f..366629ff99df 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.124 2012/04/04 16:37:50 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.125 2012/04/19 14:52:12 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -56,6 +56,8 @@ fi RDEPEND=" !<x11-libs/qt-assistant-${PV} !>x11-libs/qt-assistant-${PV}-r9999 + !<x11-libs/qt-bearer-${PV} + !>x11-libs/qt-bearer-${PV}-r9999 !<x11-libs/qt-core-${PV} !>x11-libs/qt-core-${PV}-r9999 !<x11-libs/qt-dbus-${PV} |