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

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

5 files changed, 54 insertions, 29 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/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 404b58be4a22..d713f9559af4 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,27 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX eiskaltdcpp-2.2.7-boost-1.50.patch 686 SHA256 a70bf4b74d7ce33e67b3ecad89c72533cb00b3bb1fce3e04cd8eaee39458ee03 SHA512 65c812cdcfcac8834f4d83a07ebde019c2c54d33f64eaecd0c6f21862516655acce8c2a68dafde330d87d8cbf4b7b9170237151e65dac50d67f9bfd569bd8248 WHIRLPOOL 9b4797579db10d8b6f4d57c03b96e1ee2cbbb364b87270e440f7fb50f3d2e428dfca2ff39d1aea3299c493d834911d1002dc4abfeb5ab149dd66322bee9e649e
 DIST eiskaltdcpp-2.2.7.tar.xz 2195324 SHA256 23f7855cccace4a6f1c90774033417838aab6771c6b5b10c7362bfbd670de8ad SHA512 1947db1023b974919fbba2b91472dafa43ffb6634de1df6e1ae110802f7298ae606b145be72a777f7044874709d7856d88572da03097d0251272f3facda16366 WHIRLPOOL 7403682c6f49689dd037a3939c9459faa73cfe96b97ae725a5c367c5bbbba71a0c69a18a691aeca6ac9d15add7e6d6db37d7be86f4cd1aa553be8e3eb510cc06
-EBUILD eiskaltdcpp-2.2.7.ebuild 3868 SHA256 b156c3c2779193da55245dde6b5b280f69f7f7a14202d4dd45358ef950783cbf SHA512 b5f8a7433fc57ebb628e7c260ecb735ed5b427a067acb0a06e824b2b608298541c9ab346625873cd198825d33106ba9c362fc95349f2ee61650ce695fefe9ba3 WHIRLPOOL 1fbd1ba59813e6391384bd2948a5e2ce93eb5d3932270d9ba3d80ace963ce7cf1b5c8f251c11c82e79138fc814fb1d1fee9a04d6bef78d250a61405c4b5b2941
-EBUILD eiskaltdcpp-9999.ebuild 3845 SHA256 f65f3cee455ad7c4781a88a08c2d0ab56e720d29e074aa3710c3581c1f3b07d5 SHA512 8d5af1793bdf95731900a3fd4c3c416d253eef98f21cfb36ca5ff3ed2755e5e2546b34de21cc27d5740ba67b0621fafaba81fa143947a3c50be73b8d2ea2eda2 WHIRLPOOL 2609a8f43d0a0f6ac538f3b1308fce94902f63b5c1e03f63b112c492b5391d62f217c6d3fef18291d79114018c89e02394a93c63d074f78efa5780e24169e7c2
-MISC ChangeLog 7953 SHA256 653e1722ec4bd060d37247f78a5ff44c43d2f31ff47c6a37c67e3944c22faa4b SHA512 1fac5f690770bf24a7031feed5e974bc775c2be6a31b83f65cb7a725e3b53e0d35203227c6c9dbefd4bf0bc2fcb3f181f48dc7eb1dda8a5ac8e9fc052e8d25f7 WHIRLPOOL b606ffcc81edcaaa7c54b16165ab9ea3f604951bac8286fa654117e4971b4de55896f8fa7a6d44fadc6b163dbe88ea31f26fc7bb2cb5236d3aced3321e296430
+EBUILD eiskaltdcpp-2.2.7.ebuild 3916 SHA256 e577cf395984e64b9af237cd945f5792149366167e0a08d0b4bf7c9074cc103f SHA512 1c21d0fe560fa684cf9bb5c64616040a80312936f23416bcd57daa425ba2ce395ff8ac714757ccba428bec7bd0c3cd1176fd9afb8a508d3239caebe22f634336 WHIRLPOOL f611c0cfabe2fe301312177a53b24a0ed582b243bb8a70a3469401fa0d93bbaaff786e9f1810e5fe256baaea01e0221e56eb44895df953ee615a34dd956ee36d
+EBUILD eiskaltdcpp-9999.ebuild 3757 SHA256 3927a724fe09b2777bd83ef9efe52a5bad70fee9355d122292f2db829c778af0 SHA512 74bd6b6d4a60513849862f2128e19534db1ee5ab8aaa41f5f401e83b45c113436f3c54279035b07b2ecb2f1bae99026adf8f932baeb3c02f91093782a3766daa WHIRLPOOL d71ff06ebde805d12d46040e185b6bc4fec08fe190e26dcdd9d187465a623fa7303b540983b46eb3a1adf09a8a2d74e4ce3748bc7a47e2233606ba645598e1f9
+MISC ChangeLog 8217 SHA256 597c22eddc20e88c4c8ab45c925a7a01e8489f84905b5f5ceee58ff67bdb46ea SHA512 a33f4d2b8795a53532f29512c66304a13ce90282965997f0eb593a9e9e064f3e3cc0787eb01e6a40553d43e03cae1eccf549ce8f07f6ac0bb8da787af62e2aee WHIRLPOOL 477a485252a1f29801c582825cf92fa096f4f4e8ad0a75430e4f884c02efe6e291ddd52bc09289fe32f323f8519044c53156bd9f8be9af846140e8a863aca687
 MISC metadata.xml 1223 SHA256 e527d1648dd4a2356e6ef85b36478ab71b968590d3386fbb4c62271e5e27a762 SHA512 08542dca921b5567305569286848b7ee5204ddf672ff134cfc3a2bb46ad7165ddfa7c4e7ed00a83f45e080678198d06277d5cd62579bae9e32d4f71557c28457 WHIRLPOOL 9349d5710f05b279835e7d3a135cb391ad92cb477fa33297809269d7ae79a5bcb097fcb81e56aaeb120796bea602d10f173250cfe20f4a19a265d721ad513e22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMoaOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88eREP/AwOelcUp8nBenh0/4rAj+HZ
-L2IMwlFV0U6qj7BkJnd4toYtOA+fjoVVhsra3UfvIwg6duG56BCev8Ifop7LMCCw
-wVZwfNgpS/NjcOEE8SUAQM3j/ck2ssHD/EiiBYqXgoz8S+KShyYNFtCG+Pby7skJ
-n7BgHh9BR2NGqdh3fBGDCVoBGq2aewopy9HPBmJTGg2AJd3q7QTIueCiwCxeAlaX
-ofW9wQNydDxml3ckBiBMbTtDSJDaZjRDTs0W6iygbEMYghcuf9lOP/FnhRhfRvwJ
-DA7de18hPRndBUOrSlGjDz/t/w7ozL9e76OJm7bYoQ9cqp0Ga8WoU9ZYmxmJ6vNY
-5x0abq1Pn4hFH+siqS3lTpaSB0uXo+tuDgCZS+9QqZJfdxT8UXNljtEaynQcyGU0
-ZK+0cXaKa3Rftdghw9PyvmohIzLUZD97Cq2I8TS+BDhnIZ1/DznW2LydN2uEUb2K
-EA45LCvKMGUqUxYPcITqwy8rcX0hFzYryERfAkV7fDI2per7HV8V6QkHpKVv5gSD
-/sjhqnMYxr+DldBArL92IWD9twe09Ux/gDS/xP79NKzdUVR6hZhsuHLQhxPTeDfV
-Db18BqHTX+MjCn+LdZTDA/nB+WGkTnuDFHx/udpK6SPHAf0HKTOBE+/5RJxABV8n
-zfAsY8XkXZuB9r4vj828
-=Ayq6
+iQEcBAEBCAAGBQJRPjARAAoJEAmJmMX429rehb0IAIcTmt2pPhjZNf+sQPwFo1eR
+83mnmsME4GJmPfGKjKtLUXwpZRpgc7znLgcZv2L4ZcKBQTpuJj+TPcAyfbXKqRCI
+AQMWe5xYGvM4VVrPfASVkXBUNK/W6Hn+Jcy7twCyLGRCFbd6B/GCbJOgvH7x6DwJ
+nilf7QIFCqj1H0Knjdf6m80KgM4K6d2UxLHIJggvpuEGYk5eW3T2ndRhQ+83In5T
+frzeBM0x+hlevdjiICfhB7wudqY5b+/Q1MON1XeXzamQ2FNnjTKnu1VSPayJTmYV
+/vbvYu93hn/mRbKI/2HYa6yfNm10vFiqNH8qh1AaMMyzBRgNnWGU+DPIF6SMGlU=
+=fefu
 -----END PGP SIGNATURE-----
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
+