diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-10-19 16:10:42 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-10-19 16:10:42 +0000 |
| commit | db19e2dea0e70bdba46bb4585515c754b6a77123 (patch) | |
| tree | f19b3969201283b739848fb283eac504625d0ab2 /net-im | |
| parent | Also search /bin and /usr/bin for mount/fsck helpers #437230 by Pun. (diff) | |
| download | gentoo-2-db19e2dea0e70bdba46bb4585515c754b6a77123.tar.gz gentoo-2-db19e2dea0e70bdba46bb4585515c754b6a77123.tar.bz2 gentoo-2-db19e2dea0e70bdba46bb4585515c754b6a77123.zip | |
Restrict dependency on >=net-libs/libotr-4.0.0 due to incompatibility.
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/qutim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/qutim/qutim-0.3.1.ebuild | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog index 71be68061d9c..f579a4e4844d 100644 --- a/net-im/qutim/ChangeLog +++ b/net-im/qutim/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/qutim # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.21 2012/05/15 21:57:07 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.22 2012/10/19 16:10:42 kensington Exp $ + + 19 Oct 2012; Michael Palimaka <kensington@gentoo.org> qutim-0.3.1.ebuild: + Restrict dependency on >=net-libs/libotr-4.0.0 due to incompatibility. 15 May 2012; Davide Pesavento <pesa@gentoo.org> -files/fix_insecure_rpath.patch, -files/qutim-0.2.0-gold.patch, @@ -99,4 +102,3 @@ Moved from sunrise overlay. Thanks to Sergey Kondakov <virtuousfox@gmail.com> for the base ebuild. Fixes bug #227627 - diff --git a/net-im/qutim/qutim-0.3.1.ebuild b/net-im/qutim/qutim-0.3.1.ebuild index bf1c21ff6263..f76581de25e3 100644 --- a/net-im/qutim/qutim-0.3.1.ebuild +++ b/net-im/qutim/qutim-0.3.1.ebuild @@ -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/net-im/qutim/qutim-0.3.1.ebuild,v 1.4 2012/05/04 06:22:14 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1.ebuild,v 1.5 2012/10/19 16:10:42 kensington Exp $ EAPI=4 @@ -46,7 +46,10 @@ CDEPEND=" kinetic? ( >=x11-libs/qt-declarative-${QT_PV} ) multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} ) oscar? ( app-crypt/qca:2 ) - otr? ( >=net-libs/libotr-3.2.0 ) + otr? ( + >=net-libs/libotr-3.2.0 + <net-libs/libotr-4.0.0 + ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-${QT_PV} media-libs/phonon ) ) |