Pin telepathy-qt dep to 0.8.x (bug 411111). Add runtime dep on app-crypt/qca-ossl with USE=oscar (bug 411709).

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 27 insertions, 20 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/Manifest b/net-im/qutim/Manifest
index db3996636e95..3bd8589eb316 100644
--- a/net-im/qutim/Manifest
+++ b/net-im/qutim/Manifest
@@ -8,23 +8,23 @@ DIST qutim-0.2.0.tar.bz2 2536041 RMD160 59ab7bb364c0cb15deba96cc0c50471a3902f96c
 DIST qutim-0.3.0.tar.bz2 11947764 RMD160 f807c9d499a7d03f75a6ca2d6685850ed0705b92 SHA1 a1cb1e06db96a3dc96a98ba22c7fa9d096907371 SHA256 33f55f9ec6f91fa0eeb16b40b56d17bc7989c40e745e8c345811f82faf9ccb40
 EBUILD qutim-0.2.0-r3.ebuild 2890 RMD160 9c2e3375b2358d488e1c26ae1088482177cfea5e SHA1 3d6f17c90fb7e1124d9e87c5f42b4854338f61a1 SHA256 6ba6316aea2bf0341e64a0fa6f146c5e1d1cf51d5ca09f2061c0a77358e4a516
 EBUILD qutim-0.2.0-r4.ebuild 2919 RMD160 8d441c5d0f674a43454b79786ef6f61d2e05fa8f SHA1 bc66cc29826eaa2c8037eba276f0af8dc4ae2a58 SHA256 58d908372904124798d79f864c91e357625f0bf831e87f3ae1c26ff9f53f3252
-EBUILD qutim-0.3.0.ebuild 3356 RMD160 2bba07d68537080f999b51f746a010faac5b0679 SHA1 7bd3dc2d33786e626613a12735e68bb4c92540a5 SHA256 3f8383d67245599f2ed4e3820f8504d457224fb87de0ec70f37ebd7768d0d5cf
-MISC ChangeLog 2673 RMD160 5b28ad362d31b7457eccdb994672a118fa18f682 SHA1 03887b6afbb1d46410d27d4f372d4737283f3802 SHA256 c6a65bda312cb06af3cb6e943e3ebefe3ba6163bfd9f8a882e50e3837f5e159f
+EBUILD qutim-0.3.0.ebuild 3417 RMD160 aa8e58ad0f6b0935beae6875a31e32cf532faea3 SHA1 627994ca139869f0180c65385f9011be8ceba617 SHA256 8ad693e0d68424d907757ab18986182b612672fc17f9455b95ce03f010e91636
+MISC ChangeLog 2860 RMD160 211590504b63b1a5de0c4f6dcd9e06c4df1b3400 SHA1 3f2fdfea5567c8810b631a6fdbc9041872b95b5c SHA256 cf93e9b745a49e5dd9a78da9b6885e6e39a48ae9a95103b3a931fef8d12fba63
 MISC metadata.xml 1517 RMD160 a87a12f666a0adaa14eab7dbc62024cda6b0354e SHA1 c3647c381fd4b2580190a14c0569469d485dd3ea SHA256 a0a1f1c19cb913dbb8d3a812e2b42e668f7d14098afdcd4ecbe8d1bed5adadef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPg2IJAAoJENXLsxwXqFxyzY8P/RiOwcIlJSg8vFsw1P5bhYm/
-o7Yt57jzEL13QBs1gblJASaE3Zf1HkGqcz3BixtDWFoSI4l4d3SR0b64jkHT8/DG
-kVykJDps8KYhTH38HHUU0TqMR5FUSyalF48/ZYfTIQjgcpAJllFVlpv+/Fhwx8G6
-eA7IrMxHo07scUWWRwRUDVeTdjH8D9/rL9EuYmCKQQVKfSYglRZFOIDz2j8onNcw
-telJAxmQmpivyHS2VOCPGiDxYJ7s0w+0ByfTc/tYxmsZf/P6xycfDAxAcpMoYRSJ
-bJO5zMc0y4MsIF20z5F+WjOInRyHhuDY22Ji/6Nka0hkYQlg+W34CAtngmv21frP
-/ocjX0E18s8HZXH4GsOww949xwejj08+t5swOQBiqcKcF69ahPJoeKFYH7148mfD
-4BW+QMUfyKKE76K/fvgUzGvzSWSF8gSuJSJ9BiFT9ZLjfhHkkzFH3Fz52halz+Od
-KvfzMWBxtboX30r2lc8l5WJje2TpgUuq7Fyj4I+2iQW5Km9RGTSvi9a6xjtAH1e+
-7cnnIMRFqw8xzeETGd84TD7gBCBVgoTFNoG1KMlymAOrofgAQRbAppx6VwKoO7Mx
-cSZpJGKHDBovX9IBcYoAvW7CFepnuPiXKjC/OLP6WIu3+K1W+ZtnsooQvrZjoZ4+
-jj5YUA5fK4KZkfl9Tw9W
-=3pxX
+iQIcBAEBCgAGBQJPhwRGAAoJENXLsxwXqFxyuh8QAJft7h0O8JE/x8262n7VgeE4
+92SkPzouI/2yQeRpD5HRyqgWHzZvNpgw3f2uFxNJhQ3ruiMzT++/aa53jjwuV9aA
+R8soiSb4xjmzlPsTlKfzp4ijGSA5VkqdcJf6n+oEr3vIPqskSadJCDDbm/xQv5kg
+pt2knwMiQPExMM8AkpzKnNSq6vA8HK1s4n+W3i3aIMGnsgZcNoMiDsQwNzBHQGm3
+rcIMeOznNWvxNU/+M55/YSIomF3omjuBp6GqxTYrmU2Gcn3y4P9vFuRqK222wgAe
+L8knLpXcr/RCNce/I5LqgdTv+S5cRwuErzF5aUdA1ku9s0l2oAGKor+cpLUoqbNk
+8r+p71QjGyqHozJ+JyZd6dXBweYUHWMhPh5BM8uSiOh6pPyTW+RosNA9wYQOsMW5
+cZffTUTzstUaWJGWsgCUndBj3uRjHBaSCc60AA1cZyqa5kJz4MRRcHY1quvK0QWa
+Z22v0nt20+Re2Pmf3fr04n0hGCSYMQBzsyrwUOkQtXMTM9ZCeXk8MVUvZo+WgPFn
+jv6umdUCPV72zQGWyoshhcQuBc/vponMmnXIRMBEJkpn3aAFOTkmiUlsQbRP4eSF
+jCkUegWGzfFnYBOeFqUJkNWS03XESsqal7dcXJ9CYg6j+/laGr5A/H4WdTXS+hH0
+MhhkS6iei3deQsA9C5MF
+=KIpl
 -----END PGP SIGNATURE-----
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"