summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2012-04-12 16:35:12 +0000
committerDavide Pesavento <pesa@gentoo.org>2012-04-12 16:35:12 +0000
commit901fecc62f4bffcf1e6c18ca95a3e1d47fb6cd90 (patch)
tree1906ebf72312b70bfca722d0d09b7f5b58344573
parentTry to support sys-apps/hwids also in 171-r5 for people who have temporarily ... (diff)
downloadgentoo-2-901fecc62f4bffcf1e6c18ca95a3e1d47fb6cd90.tar.gz
gentoo-2-901fecc62f4bffcf1e6c18ca95a3e1d47fb6cd90.tar.bz2
gentoo-2-901fecc62f4bffcf1e6c18ca95a3e1d47fb6cd90.zip
Pin telepathy-qt dep to 0.8.x (bug 411111). Add runtime dep on app-crypt/qca-ossl with USE=oscar (bug 411709).
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
-rw-r--r--net-im/qutim/ChangeLog6
-rw-r--r--net-im/qutim/qutim-0.3.0.ebuild11
2 files changed, 12 insertions, 5 deletions
diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index be96d0cee615..64d8c2351689 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,10 @@
# 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.15 2012/04/09 22:26:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.16 2012/04/12 16:35:12 pesa Exp $
+
+ 12 Apr 2012; Davide Pesavento <pesa@gentoo.org> qutim-0.3.0.ebuild:
+ Pin telepathy-qt dep to 0.8.x (bug 411111). Add runtime dep on app-crypt/qca-
+ ossl with USE=oscar (bug 411709).
09 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+files/qutim-0.3.0-fix-linking-with-system-jreen.patch, qutim-0.3.0.ebuild:
diff --git a/net-im/qutim/qutim-0.3.0.ebuild b/net-im/qutim/qutim-0.3.0.ebuild
index 95f21d5ea91e..6f987ba75ee1 100644
--- a/net-im/qutim/qutim-0.3.0.ebuild
+++ b/net-im/qutim/qutim-0.3.0.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.0.ebuild,v 1.2 2012/04/09 22:26:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.0.ebuild,v 1.3 2012/04/12 16:35:12 pesa Exp $
EAPI=4
@@ -24,7 +24,7 @@ REQUIRED_USE="
QT_PV="4.7.0:4"
-RDEPEND="
+CDEPEND="
x11-libs/libqxt
>=x11-libs/qt-core-${QT_PV}[ssl?]
>=x11-libs/qt-gui-${QT_PV}
@@ -55,15 +55,18 @@ RDEPEND="
>=x11-libs/qt-opengl-${QT_PV}
)
sdl? ( media-libs/sdl-mixer )
- telepathy? ( net-libs/telepathy-qt )
+ telepathy? ( =net-libs/telepathy-qt-0.8* )
vkontakte? ( >=x11-libs/qt-webkit-${QT_PV} )
webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
xscreensaver? ( x11-libs/libXScrnSaver )
"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
dev-util/pkgconfig
doc? ( app-doc/doxygen )
"
+RDEPEND="${CDEPEND}
+ oscar? ( app-crypt/qca-ossl:2 )
+"
PATCHES=(
"${FILESDIR}/${P}-fix-linking-with-system-jreen.patch"