Version bump. Removed old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 23 insertions, 93 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/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"