diff options
| author |   Aaron W. Swenson <titanofold@gentoo.org> | 2014-11-26 14:49:57 +0000 |
|---|---|---|
| committer | Aaron W. Swenson <titanofold@gentoo.org> | 2014-11-26 14:49:57 +0000 |
| commit | 90d02115af161c26f102da715e7a51409e4ebf3c (patch) | |
| tree | 558cb057309bdeb42b21b690c55ea35e73791614 /app-office | |
| parent | Drop old (diff) | |
| download | gentoo-2-90d02115af161c26f102da715e7a51409e4ebf3c.tar.gz gentoo-2-90d02115af161c26f102da715e7a51409e4ebf3c.tar.bz2 gentoo-2-90d02115af161c26f102da715e7a51409e4ebf3c.zip | |
Allow either dev-qt/qtphonon or media-libs/phonon to satisfy a
dependency. Fixes b.g.o bug 530102.
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/odeskteam/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/odeskteam/odeskteam-3.12.9.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app-office/odeskteam/ChangeLog b/app-office/odeskteam/ChangeLog index 319be286019a..aea22e327a38 100644 --- a/app-office/odeskteam/ChangeLog +++ b/app-office/odeskteam/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/odeskteam # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/ChangeLog,v 1.13 2014/11/04 12:43:07 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/ChangeLog,v 1.14 2014/11/26 14:49:57 titanofold Exp $ + + 26 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> + odeskteam-3.12.9.ebuild: + Allow either dev-qt/qtphonon or media-libs/phonon to satisfy a + dependency. Fixes b.g.o bug 530102. *odeskteam-3.12.9 (04 Nov 2014) diff --git a/app-office/odeskteam/odeskteam-3.12.9.ebuild b/app-office/odeskteam/odeskteam-3.12.9.ebuild index 893afa29a1cd..09b7bd510edb 100644 --- a/app-office/odeskteam/odeskteam-3.12.9.ebuild +++ b/app-office/odeskteam/odeskteam-3.12.9.ebuild @@ -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/app-office/odeskteam/odeskteam-3.12.9.ebuild,v 1.1 2014/11/04 12:43:07 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/odeskteam-3.12.9.ebuild,v 1.2 2014/11/26 14:49:57 titanofold Exp $ EAPI=5 @@ -22,6 +22,7 @@ KEYWORDS="~amd64 ~x86" S=${WORKDIR} RDEPEND=" +|| ( dev-qt/qtphonon:4 media-libs/phonon ) >=dev-libs/glib-2 app-arch/bzip2 dev-libs/libxml2 @@ -30,7 +31,6 @@ dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 -dev-qt/qtphonon:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 |