Fix compilation with >=boost-1.50, switch unconditiannaly to gtk+:3 in 9999, bug #425372. Thanks to Nikoli.

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

4 files changed, 43 insertions, 11 deletions

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index 6788ade76e1b..8ad21e22c284 100644
--- a/net-p2p/eiskaltdcpp/ChangeLog
+++ b/net-p2p/eiskaltdcpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/eiskaltdcpp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.47 2013/03/02 23:09:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.48 2013/03/11 19:26:35 maksbotan Exp $
+
+  11 Mar 2013; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/eiskaltdcpp-2.2.7-boost-1.50.patch, eiskaltdcpp-2.2.7.ebuild,
+  eiskaltdcpp-9999.ebuild:
+  Fix compilation with >=boost-1.50, switch unconditiannaly to gtk+:3 in 9999,
+  bug #425372. Thanks to Nikoli.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> eiskaltdcpp-2.2.7.ebuild,
   eiskaltdcpp-9999.ebuild:
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild
index e14760e86fcb..952a317be213 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.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-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild,v 1.6 2013/03/02 23:09:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild,v 1.7 2013/03/11 19:26:35 maksbotan Exp $
 
 EAPI="4"
 
@@ -44,6 +44,7 @@ fi
 
 RDEPEND="
 	app-arch/bzip2
+	>=dev-libs/boost-1.38
 	>=dev-libs/openssl-0.9.8
 	sys-apps/attr
 	sys-devel/gettext
@@ -83,11 +84,12 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.34.1
 	virtual/pkgconfig
 "
 DOCS="AUTHORS ChangeLog.txt"
 
+PATCHES=( "${FILESDIR}"/${P}-boost-1.50.patch )
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		[[ $(gcc-major-version) -lt 4 ]] || \
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 6fb7aa6f0de5..3c35515472df 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.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-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.32 2013/03/02 23:09:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.33 2013/03/11 19:26:35 maksbotan Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://eiskaltdc.googlecode.com/"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-IUSE="cli daemon dbus +dht +emoticons examples -gnome -gtk -gtk3 idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"
+IUSE="cli daemon dbus +dht +emoticons examples -gnome -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"
 for x in ${LANGS}; do
 	IUSE="${IUSE} linguas_${x}"
 done
@@ -24,7 +24,6 @@ REQUIRED_USE="
 	emoticons? ( || ( gtk qt4 ) )
 	dbus? ( qt4 )
 	gnome? ( gtk )
-	gtk3? ( gtk )
 	javascript? ( qt4 )
 	json? ( !xmlrpc )
 	libcanberra? ( !gnome gtk )
@@ -44,6 +43,7 @@ fi
 
 RDEPEND="
 	app-arch/bzip2
+	>=dev-libs/boost-1.38
 	>=dev-libs/openssl-0.9.8
 	sys-apps/attr
 	sys-devel/gettext
@@ -64,8 +64,7 @@ RDEPEND="
 	daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )
 	gtk? (
 		x11-libs/pango
-		gtk3? ( x11-libs/gtk+:3 )
-		!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+		x11-libs/gtk+:3
 		>=dev-libs/glib-2.24:2
 		x11-themes/hicolor-icon-theme
 		gnome? ( gnome-base/libgnome )
@@ -83,7 +82,6 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.34.1
 	virtual/pkgconfig
 "
 DOCS="AUTHORS ChangeLog.txt"
@@ -107,6 +105,7 @@ src_configure() {
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-Dlinguas="${langs}"
 		-DLOCAL_MINIUPNP=OFF
+		-DUSE_GTK=OFF
 		"$(use cli && cmake-utils_use json USE_CLI_JSONRPC)"
 		"$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)"
 		"$(cmake-utils_use daemon NO_UI_DAEMON)"
@@ -117,8 +116,7 @@ src_configure() {
 		"$(cmake-utils_use emoticons WITH_EMOTICONS)"
 		"$(cmake-utils_use examples WITH_EXAMPLES)"
 		"$(cmake-utils_use gnome USE_LIBGNOME2)"
-		"$(cmake-utils_use gtk USE_GTK)"
-		"$(cmake-utils_use gtk3 USE_GTK3)"
+		"$(cmake-utils_use gtk USE_GTK3)"
 		"$(cmake-utils_use idn USE_IDNA)"
 		"$(cmake-utils_use javascript USE_JS)"
 		"$(cmake-utils_use libcanberra LIBCANBERRA)"
diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.7-boost-1.50.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.7-boost-1.50.patch
new file mode 100644
index 000000000000..845931d834d1
--- /dev/null
+++ b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.7-boost-1.50.patch
@@ -0,0 +1,26 @@
+From ea7723f851b0570994f3f047c37639a8b343e616 Mon Sep 17 00:00:00 2001
+From: Boris Pek <tehnick-8@yandex.ru>
+Date: Fri, 7 Dec 2012 19:54:47 +0200
+Subject: [PATCH] Fix build with Boost >= 1.50.
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 928323b..161bb94 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -170,6 +170,9 @@ else (LOCAL_BOOST)
+     if (Boost_VERSION VERSION_LESS 104200)
+         add_definitions(-DTIMER_OLD_BOOST)
+     endif()
++    if (Boost_VERSION VERSION_GREATER 105000)
++        find_package(Boost COMPONENTS system REQUIRED)
++    endif()
+ endif(LOCAL_BOOST)
+ 
+ if (LIB_INSTALL_DIR)
+-- 
+1.8.1.5
+