Fix building with system jreen (part of bug 411111).

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

4 files changed, 36 insertions, 17 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 309dceab7aad..be96d0cee615 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.14 2012/04/06 19:53:57 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.15 2012/04/09 22:26:02 pesa Exp $
+
+  09 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/qutim-0.3.0-fix-linking-with-system-jreen.patch, qutim-0.3.0.ebuild:
+  Fix building with system jreen (part of bug 411111).
 
 *qutim-0.3.0 (06 Apr 2012)
 
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
index 55f739bb7511..db3996636e95 100644
--- a/net-im/qutim/Manifest
+++ b/net-im/qutim/Manifest
@@ -3,27 +3,28 @@ Hash: SHA512
 
 AUX fix_insecure_rpath.patch 1129 RMD160 e7c10a11ac11ec90eba6d25b6b84f0f4701f5ae1 SHA1 ac79bf92d96437273379db12bb928bd9cee5408d SHA256 cf74d7e20071d398f617faff7e7470b221f599cc0677ddb676ea57bc58a5d4ad
 AUX qutim-0.2.0-gold.patch 178 RMD160 85144ae8b7173ee7fe4680c278cd322a60dafaf8 SHA1 dec2f5a5bc028c96a56c26b61665f36568941007 SHA256 1fa929958b466b8f469f42479bb9b9a9203fb3d3b84f09eea2cd8e3e2cdedb66
+AUX qutim-0.3.0-fix-linking-with-system-jreen.patch 319 RMD160 e2e8970ce19231e762ea531102d1da5d5ede2993 SHA1 220c657fde4717a763327564e942be6babae685c SHA256 52a39550878a31e4362e0b15fadd426cd9a883c76d0728ca7fcf8383e3a9ba6b
 DIST qutim-0.2.0.tar.bz2 2536041 RMD160 59ab7bb364c0cb15deba96cc0c50471a3902f96c SHA1 b21399950252a100bd99840f6d6dc8093eaeb082 SHA256 272fba12d2fea5a550a504a3fb75ea5852e2fd086f0873079433d6361cfbc232
 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 3287 RMD160 505b96c56470207b839d2c42b6a4caf6eb855abf SHA1 b30a593fd053a5b0b99207bee422ada5981549d5 SHA256 60e30a059a6758bd73b322d4941440bc8e2ef483814ba9c893a6a0d2746e5c87
-MISC ChangeLog 2489 RMD160 7edaec59cb313630792339b2630b3524d9155afe SHA1 ad856fc56b4a497c3302ffc7096ef3852c32f6fa SHA256 955dadca571476bb17ec2c9f45d8a399d4cb60f2a2f9f1360d83cd49310ed34c
+EBUILD qutim-0.3.0.ebuild 3356 RMD160 2bba07d68537080f999b51f746a010faac5b0679 SHA1 7bd3dc2d33786e626613a12735e68bb4c92540a5 SHA256 3f8383d67245599f2ed4e3820f8504d457224fb87de0ec70f37ebd7768d0d5cf
+MISC ChangeLog 2673 RMD160 5b28ad362d31b7457eccdb994672a118fa18f682 SHA1 03887b6afbb1d46410d27d4f372d4737283f3802 SHA256 c6a65bda312cb06af3cb6e943e3ebefe3ba6163bfd9f8a882e50e3837f5e159f
 MISC metadata.xml 1517 RMD160 a87a12f666a0adaa14eab7dbc62024cda6b0354e SHA1 c3647c381fd4b2580190a14c0569469d485dd3ea SHA256 a0a1f1c19cb913dbb8d3a812e2b42e668f7d14098afdcd4ecbe8d1bed5adadef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPf0ncAAoJENXLsxwXqFxyl3gP/RrVCk98qznBtmhpx9QqxVvC
-W9qpNwgRHDhhw+VgbSAKJc8tvnJcGwXGblH+IGF/ZvPSgzj+CBdjwIQTa5cKM/tx
-JS8BltLVXacCGrxNFITPLEFGogo7drMdxa1RP4vEMShg9Ors1VYmq9lOioHkHr3G
-MOZGHQF8MBwmAtzu6Ete06Y6kibURuBWDr97hgNxq28As8uxm/NrvwN3ZtCIbNs7
-zjtHPTzfpuAklw5dNBuusgI9XtJN7yozfxPJrddOahCuYe6KUlGvFDT8Q726LhLk
-TcBETXHJL8w9pVDpUMDf5drOEr9nHWa3Gs8na4eHxqIZvlV7oNCgpktvOkQcNrU7
-1ZCCV5lbVjIaeybDwqpke+PDB+7A3WLVeN61IVe5RYfANY5YRFiT9EJ5qMjjGpvd
-A6/Zw22d8KbLJJRXhYgYB7hsFWUURE2PdkuIkutvbzxeezkYVcniULNUKx80FqS0
-nVvOfKUQDhw58oCynbNyq+H+Cq1ofQGSZ8bAc3r849DeDkDImqsMEq6Qxz1p6ZjI
-ygyagReoDAhB5yObubS0xW9DKV0kgY+2CJILf3qJei1+EVrg0njfxZ10AHuEx97M
-g1LyqrTpkQTYqXve1yJXnz6lCQt4NW3tyx+ylSXeOvIQLWKsIYgE+rYEeJVI7Tz7
-dAxfF1oG75dcrd/j1BXX
-=zxJu
+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
 -----END PGP SIGNATURE-----
diff --git a/net-im/qutim/files/qutim-0.3.0-fix-linking-with-system-jreen.patch b/net-im/qutim/files/qutim-0.3.0-fix-linking-with-system-jreen.patch
new file mode 100644
index 000000000000..89b082ecdfa0
--- /dev/null
+++ b/net-im/qutim/files/qutim-0.3.0-fix-linking-with-system-jreen.patch
@@ -0,0 +1,10 @@
+--- protocols/jabber/CMakeLists.txt
++++ protocols/jabber/CMakeLists.txt
+@@ -6,6 +6,7 @@
+ 	if( SYSTEM_JREEN )
+ 		find_package( PkgConfig )
+ 		pkg_check_modules( JREEN REQUIRED libjreen )
++		link_directories( ${JREEN_LIBRARY_DIRS} )
+ 	else()
+ 		ADD_SUBDIRECTORY(jreen)
+ 		LIST(APPEND INCLUDE_DIRS "${JREEN_INCLUDE_DIRS}")
\ No newline at end of file
diff --git a/net-im/qutim/qutim-0.3.0.ebuild b/net-im/qutim/qutim-0.3.0.ebuild
index b325d66f1035..95f21d5ea91e 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.1 2012/04/06 19:53:57 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.0.ebuild,v 1.2 2012/04/09 22:26:02 pesa Exp $
 
 EAPI=4
 
@@ -65,6 +65,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-linking-with-system-jreen.patch"
+)
+
 src_prepare() {
 	base_src_prepare