Version bump. Removed old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

6 files changed, 44 insertions, 112 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 4e70ffe2284b..b2cb281ea347 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/licq
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.127 2013/09/28 15:03:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.128 2013/11/04 11:42:28 polynomial-c Exp $
+
+*licq-1.8.1 (04 Nov 2013)
+
+  04 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> -licq-1.8.0-r1.ebuild,
+  licq-1.8.0-r2.ebuild, +licq-1.8.1.ebuild, -files/licq-1.8.0-doxygen.patch,
+  -files/licq-1.8.0-socks5.patch:
+  Version bump. Removed old.
 
 *licq-1.8.0-r2 (28 Sep 2013)
 
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 27948a11a084..aaaa45b9d5e9 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -3,31 +3,33 @@ Hash: SHA256
 
 AUX licq-1.3.8-hebrew.patch 2092 SHA256 64b6cceed8cdf7142e692b26ca68df37b9ebda38801c2a014310735447331715 SHA512 17758ef783cab1db6b1f676c73acdd904969359b139900135191ff2434d92aafba0a4bc9d7c487e2fddb757b140a706880c4d43a181ec19ffc786b6bd741a7ff WHIRLPOOL b8bc0f9a411ece1c3f316f00647f4614a657d33fbee39f430ff186bcf70dacdfcbd2a207eb1b4c2a6559fb9ebe6463127d01db71e57238e1339ea07f472c0299
 AUX licq-1.3.8-memory_leak.patch 267 SHA256 a079b61345444ba20e3c8388259fab0e607e03562327f556ffe2037c9a92b92e SHA512 3997609ea9456771ff0578d9a9ad6955d47ce0fc3172aca9c242e275bd8818e27d32511b8aee9b150427b9f9ece1d76b2fe8f0b5a7596c4df819ecf9300d6838 WHIRLPOOL 05c83ab82a5b8c2246eb0dd064f2af815436f1123992319f0f7ee01ad4aa0830cc39fe3313e62ea42e574919e2b024be3060343eccb6f43b1fe9b27bf554ca96
-AUX licq-1.8.0-doxygen.patch 1405 SHA256 efbf714c197bd836c3516ef3a1ce788e43818cd96347c4b7c2fa4aa281dfce55 SHA512 6d9cc92067da4c97ae7b2937d754c8fd03582e022d770e8f2faaaea4242fbe096de1f5a2256320006a7e663a2b02205011fa15034e3b530c3a2b987c311be88f WHIRLPOOL 609f496126346d7b5a9b7d752d903e7b8492a5b73343a0e7704a8024a16e1b963d29c66ee8f4257d23d7543e1bad2d46dfbc99fe2bf61e80763031433452f8ab
-AUX licq-1.8.0-socks5.patch 1041 SHA256 19357cd92eb942d37bb90645ec9ddd21b562ff7269e4b0bb86a536d61cf5b190 SHA512 2ffbde4d3f8948bbca13ee4d088a788e53e23e9392b1862bfa9f52bf501358cb872fcd82aada4c09b1b976aafc26457c7c976835fc55e80ec3481b59f0c0768b WHIRLPOOL ee0ccab74ecde313bd7ef7bd78c45dddc941671c41343420c1aee4daa85c0d1f85a06ed728905dbdf84afeaf07c1da1f1a09f642232cb90622120e69d33c0cb0
 DIST licq-1.3.8.tar.bz2 4500623 SHA256 fb65cd5447f2771def5cffda113d68b25ee6ed6fe0ebce84638da79e2869ebc6
 DIST licq-1.3.9.tar.bz2 4507409 SHA256 67c300a3b7045a1d6f182f4824a9c6815f9b71db1816885fc83bf9937fffd056
+DIST licq-1.8.0-doxygen.patch 1405 SHA256 efbf714c197bd836c3516ef3a1ce788e43818cd96347c4b7c2fa4aa281dfce55 SHA512 6d9cc92067da4c97ae7b2937d754c8fd03582e022d770e8f2faaaea4242fbe096de1f5a2256320006a7e663a2b02205011fa15034e3b530c3a2b987c311be88f WHIRLPOOL 609f496126346d7b5a9b7d752d903e7b8492a5b73343a0e7704a8024a16e1b963d29c66ee8f4257d23d7543e1bad2d46dfbc99fe2bf61e80763031433452f8ab
+DIST licq-1.8.0-socks5.patch 1041 SHA256 19357cd92eb942d37bb90645ec9ddd21b562ff7269e4b0bb86a536d61cf5b190 SHA512 2ffbde4d3f8948bbca13ee4d088a788e53e23e9392b1862bfa9f52bf501358cb872fcd82aada4c09b1b976aafc26457c7c976835fc55e80ec3481b59f0c0768b WHIRLPOOL ee0ccab74ecde313bd7ef7bd78c45dddc941671c41343420c1aee4daa85c0d1f85a06ed728905dbdf84afeaf07c1da1f1a09f642232cb90622120e69d33c0cb0
 DIST licq-1.8.0.tar.bz2 2252723 SHA256 e30de74b92928bbf0724a2c6f45931cbb4bd90d8d9b1d4ddd002cfa01867da1f SHA512 641da33241011b7b2657d666c412a12745d63a3feac598cd08f73dc31cfd55709e0d6e2e968ff7462ea012da179b5a7dfc3b15a5234f80f90dbf5b28ae0273dd WHIRLPOOL 7bfa1c5092b09d2a5a9d801fd2e78b754de7b9182e695aa3a3c51f306c6c8a3a9149b2ce56e900c9dd41e27ef44476c9439c89b57090271259e6eeb1176d10ef
+DIST licq-1.8.1-qt4-gui_build_fix.patch 926 SHA256 5f580c369b9746c65128d7877a12e08d41898c929019fd0a5a71a30215644e52 SHA512 75946020671adaf02788ecd50b2141cb6bf8df3a8b42876383796557f0547a7aa3b08adcc1f4866273fee48e50d630a121133a7efabd954f00b6b33b803c1613 WHIRLPOOL 3fa9699e68fc85ca00de68882105e34cad61c6207c21e05c902fa1caf9864cf24e9f81a61e0d2550bea8228003e247d471668bbd2b30451d07a64a891ef3ba71
+DIST licq-1.8.1.tar.bz2 2260546 SHA256 338dcd83b6eea5b6b5770babd9b171d33aaea8c57c39e827b9e5ada50fb63ca9 SHA512 bc7a4631b0c7091d5a8477f1ca79848512ce5624b23c95894ad9be91b8c6a72dc4311f3431d08e668ae9094f80f2d8abf3e13f9e1ecd55c2b3a404fe8efb5e72 WHIRLPOOL 30ef4d7680cdd913797ad50db7c6a68aefa9ca82013a7e0c74d4787884c0f75ef8843e6c059cbc3db7c809372d83286ebffc60ff54b2a40b2dbb5f25e7fc0ccb
 EBUILD licq-1.3.8-r1.ebuild 2122 SHA256 403c4f9049e926177886bd4d92001d25ad4c7e0553b587e703d2349855753071 SHA512 51a20708d3b046c4f0560cac00b38d05c2d580e4bd302ac3313df47c18f9c066e375533d8cf92ad09642372d9e0ff392fcb97ca213eeb8f38605e4eea090faf1 WHIRLPOOL 5a802053852cd702a2c2ac7e31b90b041c3f5dd9dea7d4217d457f95fbb24f3bd5b612a5ebb39ba433e69374330f8be148d4117dc82495648f4b75d574434adb
 EBUILD licq-1.3.9.ebuild 2025 SHA256 b9d009998927831813295c081a582dafca30753a9bc030cfb2e9b2c2a3bb3cbe SHA512 6fc917b363ee5407c562b0a78950060f457c4f78f8f730de15ffe3dedb16fb651b624fd99a37350ea1a26c9d9229581a7b6032d8d53398ac0076ed449cba5aac WHIRLPOOL f4b5e9927856baf9328851dc9a7e677b8ab7af95aa63be44bb8e9192f7f9edf4f5559cb04e70cddeb67185511b002dd2dcf16893d9f98aefe9f71471af32bc03
-EBUILD licq-1.8.0-r1.ebuild 1853 SHA256 ae50e3365db49c048c365964e5e71a00d3c2aadc0f15453b85dc9ed6ae760a57 SHA512 3cec7a5face7d4e203176482acd7aef0d8d835da2464f4d7ce627f651317000b4d7fde4627398e3ce7c4f00223538264808c1b8fd671d11c2fed42a2e7ebbeaa WHIRLPOOL a21aa56500730dc5e40da662f19d14584fd0ee11831d93aea9ce52309dfe9d64dd6b9eff8784bbaf05d73ca4efdb09d3e21179b5cadf82a0bfa729c6d1b27876
-EBUILD licq-1.8.0-r2.ebuild 1919 SHA256 dedc1d8d1944f66d63f41374df9eedbade60b6800d5eab8d568cea84e88a8b8e SHA512 96fc48ae26dff0cf99425b7bab56e31b5f43a166394a47840bf34ac1dd06d2c3c9d2858854f4435dbc3411bba75e6357f59cc75109bd1f37f7368d5c0efe06c8 WHIRLPOOL 10406e6616439cb80447eef971a9a665f260bd385f113a7b675eca1f8abbc35dc6d8c50ac7d84d436584e7673061f7d8f2aff72a07dba0c3f8aa34a8bd5e5bfd
-MISC ChangeLog 19767 SHA256 fa9a66457e2c9cffebd9f1cd8d1a835d40fbe12e15aaccb7271f09469af6a627 SHA512 fd10c2c907ccbd3c215193b89d88aceae96c0a4fb6096c5d9864c50ba0cd9d2aefed99701caa18d65a89a2f2c30804af7c4a487a959b3430e1eaa8c9d8f3c10f WHIRLPOOL bb1f237c466f892655cb34506ce19d28c2a1bca3863bcf3c34601a0b934cb37bf7be34085cdc99fa7384b301546c73c3ee2d660dca004bf0a59cbaf0cc9dafbc
+EBUILD licq-1.8.0-r2.ebuild 2138 SHA256 febc97b5f8ae8fd7c583b2799254e079b819681af08ed4df0f374f77e670358c SHA512 101ef2df03ca2f00edcd4d99b773ebb5f015fd76305cca4172834aa5fae23ca6c41c649d11437f58a83322b7caba0181e83e6864c290a4dfc621cc0f8360bec3 WHIRLPOOL bdb8f3b53074815c59d4841b403cce5877336186b49eff2f12390b9f71272f81f152fd5b338c9a0f94130b131e6aac8cc10f8f04fbf4885a3df910de49d49e37
+EBUILD licq-1.8.1.ebuild 2069 SHA256 adb40275cce08d7b77e3de1fc699e0401b2dcb3cce7bb6c1c5920a4eaeb244d8 SHA512 f4fca9b7ce610de5dcba2c374e765222fce7619f55408ad522b4a534a73c395b53c86ee09108e46de8f41f41ec2f47eef0465303349736fcf3290dd3f86f0575 WHIRLPOOL 011fb3510fb2216e3d78057515f805482cd75114e1929b49126305d253a25e2135b466008b58a448db5081fe19511e5188f78f83c018d55e41cbd47ffbed6e10
+MISC ChangeLog 20012 SHA256 ae188658eab8b739b0f99c339e90a41d4713e54690933354492d215118462239 SHA512 c51f0cde105de1de4338304183f64b56cfef3a034ebb7f3408e14950383259dd0e0576b13170ada910e2717c898d36dd3b5d7a0a3187daaad3a4b3b8403c320c WHIRLPOOL 92c6ad7dd9acd805fab2355b3b4bfe758fbe3b3bca9c6b2bd77997967711de458d319a5b477dcfa3ce51f807678f956a99310d0fb389d30d2518c0c0186c0e30
 MISC metadata.xml 437 SHA256 dabaa61872d7fb7a4b93762eb00251024c7b941f2faf3cbc354722393f8beccd SHA512 07d2740800c20a73285fccee9eba58e7e6d052013d1f6c2adbc7fe369889ed25adb9e339013f347f8adcd3f4a8d798feef2d41854abc6a7a84d441bb57f22dff WHIRLPOOL 98abae1612f5d02a83b605fa8b536541024c58431b4fe243a40a405f9d9cdfa100ea490a88efd91be267de507dd93106a8e8b06798ef1d0c454f753e5f1e6567
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSRu/IAAoJEPiazRVxLXTFSTkQAJdrcjmue44SRI0gjeB/okBV
-T7zkzwSie0mkCBCi30PfHyI32uAq/cnWAb+8rDK8elM9SP1MVgJcHEsaVH9qRt5s
-DJw024qWmqY2QjLgc7Wo/S6ptmc7eGVQChrXeKidLB3whgUXqHOX+CrI0e2f5zxM
-Y2AHilZSR7mj97KZ5JoxPgGwmG2eeTpfcGJtX5RmO8Z0wP4aES2LbDQWHfX2YBEe
-ioGma+TOgKwUbXykq2dmpwxtr+1WcvqXIjDFnGp7LW2qDYTWLmTisocEM5Au1Dru
-tDiDpApdyLKamFicd74g8pF61eT0LCLA1z5Hg78EftlJTMEvceMmTCP3iH+x9tXK
-Q7zog9k/zM5bG00fUugfVK9iR8AConk+WTnCvaKPdfTlI1pKZ6h64HmSCE7gUXnH
-icjRDKJ3oSoA5uWM07p6LMFkcIPhS3/bEiPWBZM93qwcJIC+ZlCOgKxtWzp4tvIY
-/i8uhafgWHVOBDwDr6SDlR0r7h94PMzxFJjr8C/7Dl6qL+xcd+F9pFprItYxSrlD
-vVoRPHbyKwHuQden08Aiwh1wPBuXu02wLHYWTvHZvnbvkFi6mmDCUZWywzTY7Rfg
-zFwwdfEGg8P4d52A42pTmE6hQM4W8lEhKyJZNroYif7LsQNs27wsnTyw6UKp+gQ7
-GnWPXR5yccIisiBkF7R4
-=TxBK
+iQIcBAEBCAAGBQJSd4glAAoJEPiazRVxLXTFvBsP/j90PlrQw83neAjrA/OZsnwr
+vkoBqZjwIHPheyCUL3W4nEmsPRHWUY5eJtZWC1oy5MBxrQAk+2yQhD0YEakpYxhq
+fTejJ6ZqSNWriiAU38ENYSQuImezBSmc/BX1xN/TFt4IzDmMeiuUMkw0sCEfx/Jq
+CdjwJVmaRiAB6TusEOiYnAuCKQM94uO5b99i1+SMu04QmCJtr5sKBG8+ydoWxNcf
+WlghZLfInt/CicRPSITFsAqwSczxq7Zvmz0qPVGDkByDNJybIJcv1uD8T1tfatW1
+EtTz28ql98byUVcz681Y8QZFPFzuKBfxYra2Q0U7JZq0q+HFkeExu1InjKbnVUej
+wZKF44nb8AYaScd72xxOu/4C1gyTfagWMs15QjhXFWS2ubJXtrbNyIBuI/BxuYFO
+jv8j5S29HGkHbnVRJ6IoqCm4yk8Fd/UwTk5BWaFhFe5Ry68GBXKNZdasoT1+ZrEN
+dmxqbhc1wGawF8CI/+J4SvY9p4YesfQbJO2/YX2h5VrxuHR1lybcjr6PAAlympXn
+evT+llyvjvgUSTiXMwLO/71Fhsp4FPRcUaLCmWavg4XLlZpj8dBJQw1P9wElade8
+qGmkW5USOQNM4rpH7I44H7wZ/21243lvdjxQ/2ECnynGpI5HCIEmmwyGHyxCBYQR
+K2Ys3Jr650Sgv0ZgNnWV
+=bLmr
 -----END PGP SIGNATURE-----
diff --git a/net-im/licq/files/licq-1.8.0-doxygen.patch b/net-im/licq/files/licq-1.8.0-doxygen.patch
deleted file mode 100644
index 12117c96a4a7..000000000000
--- a/net-im/licq/files/licq-1.8.0-doxygen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b05d42fda3da5d1b42bd89feb3b49516ce7d85b3 Mon Sep 17 00:00:00 2001
-From: Anders Olofsson <flynd@licq.org>
-Date: Fri, 27 Sep 2013 21:55:54 +0200
-Subject: [PATCH] core: Make Doxygen usage optional
-
-Patch by Ben Kohler to solve Gentoo bug 486126.
----
- licq/CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/licq/CMakeLists.txt b/licq/CMakeLists.txt
-index 9e84538..f90d9d5 100644
---- a/licq/CMakeLists.txt
-+++ b/licq/CMakeLists.txt
-@@ -12,6 +12,7 @@ include(CheckFileOffsetBits)
- 
- # Options
- option(ENABLE_NLS "Enable translation of program messages" ON)
-+option(USE_DOXYGEN "Build docs via doxygen" OFF)
- option(USE_FIFO "Use Licq FIFO" ON)
- option(USE_HEBREW "Include support for hebrew reverse string" OFF)
- option(USE_OPENSSL "Enable secure communication channels" ON)
-@@ -142,7 +143,7 @@ include(cmake/LicqVersion.cmake)
- # Doxygen is option
- find_package(Doxygen)
- 
--if (DOXYGEN_FOUND)
-+if (USE_DOXYGEN)
-   if (NOT DOXYGEN_DOT_FOUND)
-     message(SEND_ERROR "Need the dot program to build documentation")
-   endif (NOT DOXYGEN_DOT_FOUND)
-@@ -158,7 +159,7 @@ if (DOXYGEN_FOUND)
-     DEPENDS ${DOXY_CONFIG}
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-     COMMENT "Generating doxygen documentation" VERBATIM)
--endif (DOXYGEN_FOUND)
-+endif (USE_DOXYGEN)
- 
- # make uninstall (file added to top binary dir to work with build_all)
- configure_file(
--- 
-1.8.4
-
diff --git a/net-im/licq/files/licq-1.8.0-socks5.patch b/net-im/licq/files/licq-1.8.0-socks5.patch
deleted file mode 100644
index 98cdad87aad4..000000000000
--- a/net-im/licq/files/licq-1.8.0-socks5.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6b5f463697739be42948a052a03cc706f06c2150 Mon Sep 17 00:00:00 2001
-From: Anders Olofsson <flynd@licq.org>
-Date: Thu, 19 Sep 2013 20:33:16 +0200
-Subject: [PATCH] core: Workaround defines in socks.h
-
-socks.h defines send to Rsend which also affected the name of
-TCPSocket::send().
-
-Fixes Gentoo bug 484706
----
- licq/src/socket.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/licq/src/socket.cpp b/licq/src/socket.cpp
-index 9d4cb3f..c06c266 100644
---- a/licq/src/socket.cpp
-+++ b/licq/src/socket.cpp
-@@ -49,6 +49,10 @@
- extern "C" {
- #include <socks.h>
- }
-+#define socket_send Rsend
-+#undef send
-+#else
-+#define socket_send send
- #endif // SOCKS5
- 
- #ifdef SOCKS5_OPTLEN
-@@ -477,7 +481,7 @@ bool INetSocket::send(Buffer& buf)
-   char* dataPos = buf.getDataStart();
-   while (bytesLeft > 0)
-   {
--    ssize_t bytesSent = ::send(myDescriptor, dataPos, bytesLeft, 0);
-+    ssize_t bytesSent = ::socket_send(myDescriptor, dataPos, bytesLeft, 0);
-     if (bytesSent < 0)
-     {
-       if (errno == EINTR)
--- 
-1.8.4
-
diff --git a/net-im/licq/licq-1.8.0-r2.ebuild b/net-im/licq/licq-1.8.0-r2.ebuild
index 34df9cb357dd..08218af31fe2 100644
--- a/net-im/licq/licq-1.8.0-r2.ebuild
+++ b/net-im/licq/licq-1.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.8.0-r2.ebuild,v 1.1 2013/09/28 15:03:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.8.0-r2.ebuild,v 1.2 2013/11/04 11:42:28 polynomial-c Exp $
 
 EAPI=5
 
@@ -8,7 +8,9 @@ inherit cmake-utils eutils flag-o-matic
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://github.com/${PN}-im/${PN}/commit/6b5f463697739be42948a052a03cc706f06c2150.patch -> ${P}-socks5.patch
+	https://github.com/${PN}-im/${PN}/commit/b05d42fda3da5d1b42bd89feb3b49516ce7d85b3.patch -> ${P}-doxygen.patch"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -28,8 +30,8 @@ DEPEND="${RDEPEND}
 	dev-libs/boost"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-socks5.patch \
-		"${FILESDIR}"/${P}-doxygen.patch
+	epatch "${DISTDIR}"/${P}-socks5.patch \
+		"${DISTDIR}"/${P}-doxygen.patch
 
 	local licq_plugins="auto-reply icq rms"
 	use msn && licq_plugins+=" msn"
diff --git a/net-im/licq/licq-1.8.0-r1.ebuild b/net-im/licq/licq-1.8.1.ebuild
index 2392ae8b3e9f..871f5fb105d5 100644
--- a/net-im/licq/licq-1.8.0-r1.ebuild
+++ b/net-im/licq/licq-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.8.0-r1.ebuild,v 1.2 2013/09/13 13:36:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.8.1.ebuild,v 1.1 2013/11/04 11:42:28 polynomial-c Exp $
 
 EAPI=5
 
@@ -8,7 +8,8 @@ inherit cmake-utils eutils flag-o-matic
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://github.com/${PN}-im/${PN}/commit/f288367c758de16fc013c6f4c9851ca85813eb59.patch -> ${P}-qt4-gui_build_fix.patch"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -23,12 +24,14 @@ RDEPEND=">=app-crypt/gpgme-1
 	xosd? ( x11-libs/xosd )
 	aosd? ( x11-libs/libaosd )"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[dot] )
 	nls? ( sys-devel/gettext )
 	dev-libs/boost"
 
 src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-1.5.1-find-libcdk.patch
+	pushd plugins &>/dev/null || die
+	epatch "${DISTDIR}"/${P}-qt4-gui_build_fix.patch
+	popd &>/dev/null || die
 
 	local licq_plugins="auto-reply icq rms"
 	use msn && licq_plugins+=" msn"
@@ -53,10 +56,11 @@ pkg_setup() {
 src_configure() {
 	local myopts="-DCMAKE_BUILD_TYPE=$(use debug && echo 'Debug' || echo 'Release')"
 	mycmakeargs="$myopts
+		$(cmake-utils_use doc USE_DOXYGEN)
 		$(cmake-utils_use linguas_he USE_HEBREW)
+		$(cmake-utils_use nls ENABLE_NLS)
 		$(cmake-utils_use socks5 USE_SOCKS5)
 		$(cmake-utils_use ssl USE_OPENSSL)
-		$(cmake-utils_use nls ENABLE_NLS)
 		-DUSE_FIFO=ON
 		-DBUILD_PLUGINS=ON"