Attachment #341740 for bug #425372

Lines 44-49 Link Here

(-)net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild (-1 / +3 lines)
44		44
45	RDEPEND="	45	RDEPEND="
46	app-arch/bzip2	46	app-arch/bzip2
		47	>=dev-libs/boost-1.38
47	>=dev-libs/openssl-0.9.8	48	>=dev-libs/openssl-0.9.8
48	sys-apps/attr	49	sys-apps/attr
49	sys-devel/gettext	50	sys-devel/gettext
Lines 83-93 Link Here
83	)	84	)
84	"	85	"
85	DEPEND="${RDEPEND}	86	DEPEND="${RDEPEND}
86	>=dev-libs/boost-1.34.1
87	virtual/pkgconfig	87	virtual/pkgconfig
88	"	88	"
89	DOCS="AUTHORS ChangeLog.txt"	89	DOCS="AUTHORS ChangeLog.txt"
90		90
		91	PATCHES=( "${FILESDIR}"/${P}-boost-1.50.patch )
		92
91	pkg_pretend() {	93	pkg_pretend() {
92	if [[ ${MERGE_TYPE} != binary ]]; then	94	if [[ ${MERGE_TYPE} != binary ]]; then
93	[[ $(gcc-major-version) -lt 4 ]] \|\| \	95	[[ $(gcc-major-version) -lt 4 ]] \|\| \




# 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.31 2012/09/03 13:25:05 kensington Exp $

EAPI="4"



LICENSE="GPL-2 GPL-3"
SLOT="0"
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

	emoticons? ( || ( gtk qt4 ) )
	dbus? ( qt4 )
	gnome? ( gtk )
	gtk3? ( gtk )
	javascript? ( qt4 )
	json? ( !xmlrpc )
	libcanberra? ( !gnome gtk )


RDEPEND="
	app-arch/bzip2
	>=dev-libs/boost-1.38
	>=dev-libs/openssl-0.9.8
	sys-apps/attr
	sys-devel/gettext

	daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )
	gtk? (
		x11-libs/pango
		x11-libs/gtk+:3
		!gtk3? ( >=x11-libs/gtk+-2.24:2 )
		>=dev-libs/glib-2.24:2
		x11-themes/hicolor-icon-theme
		gnome? ( gnome-base/libgnome )

	)
"
DEPEND="${RDEPEND}
	>=dev-libs/boost-1.34.1
	virtual/pkgconfig
"
DOCS="AUTHORS ChangeLog.txt"

		-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)"

		"$(cmake-utils_use emoticons WITH_EMOTICONS)"
		"$(cmake-utils_use examples WITH_EXAMPLES)"
		"$(cmake-utils_use gnome USE_LIBGNOME2)"
		"$(cmake-utils_use gtk USE_GTK3)"
		"$(cmake-utils_use gtk3 USE_GTK3)"
		"$(cmake-utils_use idn USE_IDNA)"
		"$(cmake-utils_use javascript USE_JS)"
		"$(cmake-utils_use libcanberra LIBCANBERRA)"




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


Return to bug 425372

Lines 1-6 Link Here

(-)net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild (-8 / +6 lines)
1	# Copyright 1999-2013 Gentoo Foundation	1	# Copyright 1999-2013 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.32 2013/03/02 23:09:03 hwoarang Exp $	3	# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.31 2012/09/03 13:25:05 kensington Exp $
4		4
5	EAPI="4"	5	EAPI="4"
6		6
Lines 14-20 Link Here
14		14
15	LICENSE="GPL-2 GPL-3"	15	LICENSE="GPL-2 GPL-3"
16	SLOT="0"	16	SLOT="0"
17	IUSE="cli daemon dbus +dht +emoticons examples -gnome -gtk -gtk3 idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"	17	IUSE="cli daemon dbus +dht +emoticons examples -gnome -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"
18	for x in ${LANGS}; do	18	for x in ${LANGS}; do
19	IUSE="${IUSE} linguas_${x}"	19	IUSE="${IUSE} linguas_${x}"
20	done	20	done
Lines 24-30 Link Here
24	emoticons? ( \|\| ( gtk qt4 ) )	24	emoticons? ( \|\| ( gtk qt4 ) )
25	dbus? ( qt4 )	25	dbus? ( qt4 )
26	gnome? ( gtk )	26	gnome? ( gtk )
27	gtk3? ( gtk )
28	javascript? ( qt4 )	27	javascript? ( qt4 )
29	json? ( !xmlrpc )	28	json? ( !xmlrpc )
30	libcanberra? ( !gnome gtk )	29	libcanberra? ( !gnome gtk )
Lines 44-49 Link Here
44		43
45	RDEPEND="	44	RDEPEND="
46	app-arch/bzip2	45	app-arch/bzip2
		46	>=dev-libs/boost-1.38
47	>=dev-libs/openssl-0.9.8	47	>=dev-libs/openssl-0.9.8
48	sys-apps/attr	48	sys-apps/attr
49	sys-devel/gettext	49	sys-devel/gettext
Lines 64-71 Link Here
64	daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )	64	daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )
65	gtk? (	65	gtk? (
66	x11-libs/pango	66	x11-libs/pango
67	gtk3? ( x11-libs/gtk+:3 )	67	x11-libs/gtk+:3
68	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
69	>=dev-libs/glib-2.24:2	68	>=dev-libs/glib-2.24:2
70	x11-themes/hicolor-icon-theme	69	x11-themes/hicolor-icon-theme
71	gnome? ( gnome-base/libgnome )	70	gnome? ( gnome-base/libgnome )
Lines 83-89 Link Here
83	)	82	)
84	"	83	"
85	DEPEND="${RDEPEND}	84	DEPEND="${RDEPEND}
86	>=dev-libs/boost-1.34.1
87	virtual/pkgconfig	85	virtual/pkgconfig
88	"	86	"
89	DOCS="AUTHORS ChangeLog.txt"	87	DOCS="AUTHORS ChangeLog.txt"
Lines 107-112 Link Here
107	-DLIB_INSTALL_DIR="$(get_libdir)"	105	-DLIB_INSTALL_DIR="$(get_libdir)"
108	-Dlinguas="${langs}"	106	-Dlinguas="${langs}"
109	-DLOCAL_MINIUPNP=OFF	107	-DLOCAL_MINIUPNP=OFF
		108	-DUSE_GTK=OFF
110	"$(use cli && cmake-utils_use json USE_CLI_JSONRPC)"	109	"$(use cli && cmake-utils_use json USE_CLI_JSONRPC)"
111	"$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)"	110	"$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)"
112	"$(cmake-utils_use daemon NO_UI_DAEMON)"	111	"$(cmake-utils_use daemon NO_UI_DAEMON)"
Lines 117-124 Link Here
117	"$(cmake-utils_use emoticons WITH_EMOTICONS)"	116	"$(cmake-utils_use emoticons WITH_EMOTICONS)"
118	"$(cmake-utils_use examples WITH_EXAMPLES)"	117	"$(cmake-utils_use examples WITH_EXAMPLES)"
119	"$(cmake-utils_use gnome USE_LIBGNOME2)"	118	"$(cmake-utils_use gnome USE_LIBGNOME2)"
120	"$(cmake-utils_use gtk USE_GTK)"	119	"$(cmake-utils_use gtk USE_GTK3)"
121	"$(cmake-utils_use gtk3 USE_GTK3)"
122	"$(cmake-utils_use idn USE_IDNA)"	120	"$(cmake-utils_use idn USE_IDNA)"
123	"$(cmake-utils_use javascript USE_JS)"	121	"$(cmake-utils_use javascript USE_JS)"
124	"$(cmake-utils_use libcanberra LIBCANBERRA)"	122	"$(cmake-utils_use libcanberra LIBCANBERRA)"

Line 0 Link Here

(-)net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.7-boost-1.50.patch (+26 lines)
	1	From ea7723f851b0570994f3f047c37639a8b343e616 Mon Sep 17 00:00:00 2001
	2	From: Boris Pek <tehnick-8@yandex.ru>
	3	Date: Fri, 7 Dec 2012 19:54:47 +0200
	4	Subject: [PATCH] Fix build with Boost >= 1.50.
	5
	6	---
	7	CMakeLists.txt \| 3 +++
	8	1 file changed, 3 insertions(+)
	9
	10	diff --git a/CMakeLists.txt b/CMakeLists.txt
	11	index 928323b..161bb94 100644
	12	--- a/CMakeLists.txt
	13	+++ b/CMakeLists.txt
	14	@@ -170,6 +170,9 @@ else (LOCAL_BOOST)
	15	if (Boost_VERSION VERSION_LESS 104200)
	16	add_definitions(-DTIMER_OLD_BOOST)
	17	endif()
	18	+ if (Boost_VERSION VERSION_GREATER 105000)
	19	+ find_package(Boost COMPONENTS system REQUIRED)
	20	+ endif()
	21	endif(LOCAL_BOOST)
	22
	23	if (LIB_INSTALL_DIR)
	24	--
	25	1.8.1.5
	26