Fix compilation with boost-1.50, bug #429568. Add geoip use to 9999. Thanks to 0xd34df00d

Package-Manager: portage-2.1.11.4/cvs/Linux x86_64

5 files changed, 70 insertions, 16 deletions

diff --git a/net-p2p/leechcraft-bittorrent/ChangeLog b/net-p2p/leechcraft-bittorrent/ChangeLog
index 519a3eec581e..96f197467035 100644
--- a/net-p2p/leechcraft-bittorrent/ChangeLog
+++ b/net-p2p/leechcraft-bittorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/leechcraft-bittorrent
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-bittorrent/ChangeLog,v 1.15 2012/07/19 20:12:03 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-bittorrent/ChangeLog,v 1.16 2012/08/04 09:06:13 maksbotan Exp $
+
+  04 Aug 2012; Maxim Koltsov <maksbotan@gentoo.org> +files/boost-1.50.patch,
+  leechcraft-bittorrent-0.5.75.ebuild, leechcraft-bittorrent-9999.ebuild:
+  Fix compilation with boost-1.50, bug #429568. Add geoip use to 9999. Thanks to
+  0xd34df00d
 
 *leechcraft-bittorrent-0.5.75 (19 Jul 2012)
 
diff --git a/net-p2p/leechcraft-bittorrent/Manifest b/net-p2p/leechcraft-bittorrent/Manifest
index e213e8dc2e0f..d3aee3d4bd7c 100644
--- a/net-p2p/leechcraft-bittorrent/Manifest
+++ b/net-p2p/leechcraft-bittorrent/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX boost-1.50.patch 1350 SHA256 6e33a02a397e1f90b2081dbb7bcb50290358a46e821e42b0538645788d36f374 SHA512 61b86437b3df2a1876792f85d3a8064501b9c740e047cec9dbf05e1e8edb68ca9915732a1c963ca721ca9dda5480d877234b2e5ee296d625967d8e46baf7dc4b WHIRLPOOL 050685b62814ec4ed7ffdc1a0294c9208cc70362b38a8bdea7da682d43c4f7df3163f30b40dd740eed2c8679910723178ea664257cb11057eeeecd94eb4cad4e
 DIST leechcraft-0.5.70.tar.xz 4793076 SHA256 f9b6ff57005a4883042256b699451382ae5d3325e43f44097fbde3fdd77b859f SHA512 e3e5141c7f4b2061fc4e185c21a74f1674c1fa8219cec465d3401f90e6f9cd6a54df1dda40a8575e17e3278842586778e9f091f807c9e06dd4b3dd1544fbc837 WHIRLPOOL 52deb1476462c85119882851892e57af4f08e972e652a0de70b6a794beb3550a45626397664d49b523d7916649e84523f46dc5d54d20846c151d4491289fa642
 DIST leechcraft-0.5.75.tar.xz 4849324 SHA256 18c0b98be7738ae87e131850529e9c7c35e511b7d40e456f4f200b7d4ef1e887 SHA512 7668a5b6d01eebdb763608c03709aebeffca75c6207ec4b6f743116544ef12396bbf3ca02c49561fd4be0e01a56c527345d9daf42d6595d0948db8651b5380c7 WHIRLPOOL 83b0626d100c3c46f82737a39ef2ec431a59f9df92e8d4d32f2fbd013fa58e8747fa8f2fa9ed95a2932af1c938734c5160cd71291c3996d7256cd8ad67743ddd
 EBUILD leechcraft-bittorrent-0.5.70.ebuild 507 SHA256 8cad56f28de30b2902c98e57d26b3fb773ddc5c534d826bbc40b875999a0955b SHA512 7755049afa835f7bf5478dbd08c3fcb339056ef33ae66884518412cd670418405ca45d852d5a28a6a89d41cfa05a8d4a49cc1bceab5adb4831617963d6499b61 WHIRLPOOL 1dd4818dabd1bec69f79872bb62e68bd098e9dd75fdaf43e9c2855f901203c6cc30990e345daac3b9ae6c148de81cc2c66d94b3d6487995ed8999b5cbf3af894
-EBUILD leechcraft-bittorrent-0.5.75.ebuild 514 SHA256 ce5681f0df4abcc4969fd0e3a7875c976068e921e93fa785a527c05753a64158 SHA512 dd037b3b436babb63f7ed6bf0b9a6eb6ae2c2cd7e35ca7e0c14b784e22a364773fb0369080ea510c453289b6dc8cb7b554f908effdc5385a5464415837866c5d WHIRLPOOL f678a25abab6aa6303eb5d8228e945b6ce443e2bc32d0cdd2ecfcdfb5f992d686e18a84ade163cf4d26a7ad762ac8260d5ac940e0807edbd0deadc0c48e0718c
-EBUILD leechcraft-bittorrent-9999.ebuild 501 SHA256 2468c6defd73f1ab152842b98e555262b1d6a80536f786199f735b19e6253af2 SHA512 e46bcd77e932ab477ed66a186da6653f3f320e62171933d1a90b00e0995c0af7589f8c49c5d9abac07bf5420c31d3c4673dd042bd824a9490c72683fa71cd609 WHIRLPOOL 28fba2d92844cdb450160d9856f04c28ef6120eb1a96744d2a6974c878a79dabc0f51364f139ddb7f23b56b52345d0919d7e4a040bbbd2acb90f5ace0fb93163
-MISC ChangeLog 3346 SHA256 961783c228d153b883a96b3a500f9bc7d97cbb9b5b74235c571a28fcb8374b45 SHA512 439ab45e3b3661c7e63f8bf9bd68119070b3a083e0741038f6b8c3fa49d48d5b5ddadc73a1ef0bcd91f21d81b2eb3ff5cf7d8cc40ae8b2a1ff83fa5c6796cd47 WHIRLPOOL 27a3587479f967654d63bd67c4f32eee05d5f19c2315d3e947924e87be12caf5637f60b64a0f076392fca6911f7c4a3a146626071f0324a188d7178a23d849c8
+EBUILD leechcraft-bittorrent-0.5.75.ebuild 556 SHA256 a1fb937bcfbcf69c80c7302ef7b76c8d038a00ad9591d7855d4326b17e6aedb9 SHA512 f45b74103731b355eb34abd9ba1cddbb0a0d8f057eafaba0803fc8ae47c66dfbd93a8e4864c811d6292c4a1836a03e755e945360bf068e0c0c77049bd01b417c WHIRLPOOL 814c7fc6ce33f1891c80be819cbcfd2ac089d058ca3ff65aeaccb768647de459890a66543eb3f4df9903716c98227cac9ae7464e7bd3e23add1e48fe3bb577c2
+EBUILD leechcraft-bittorrent-9999.ebuild 657 SHA256 c24a333c6c50bbb6ef5e1e921faef48f18c8fa6b13a55cd50f43681d7c8d4ff8 SHA512 e2a97c34222db2a42e3f7ea35e7e0c77481ed6203707ea66f407f3be995aea7bc0078ec2f792e0b6d4b2be177d5cdf714510c6e2077f1fcaa6c78f232ffadf6b WHIRLPOOL 9e32c531ca05aa5f1e336202c3cdbc983cd2702cac3fc01a80e9f1b8080872416fb003a2fdfa2b01da08f3b825c0a0600f87330e736a123b97a394ecef39bab2
+MISC ChangeLog 3592 SHA256 b95ad6c0cfe6ae49568f98d98635224dafd87b9672e06e4090a98127966c5a9d SHA512 b82139402218a8bcbf90c8e5d6b899058a946d976b3b7bb11df133f557a195979380eede1c27cd6e12dba5ac83cc59f9809b1689c01f9b0e966e9b7b1c70b587 WHIRLPOOL 2fc9253a02858993b38d9d5e03a970afffe1f1e17f6dff4685bd7c78099770a6dfbc3250b7ce10edf8033ebb292a1c476eb548675d99e885854b3c996d7efaab
 MISC metadata.xml 164 SHA256 d3d50c47cc72568dcc457fe11ddfc6849ba6572bc2d581aad1deac910ee1d488 SHA512 ce478accd06c9c530d86b3ca8abaf3680428a7ab07ed8bb5b78e60c7e3240c3be349993f73e2ef904642efec5cd9c8abb7196675b46723103290ef9ab5d1cc10 WHIRLPOOL 4c2d59059bc69ff27c720b093f582968e2778d23875e0f7d3edba0ec6634e1b50e7403974c4a32638eeaae4d7baf45ca163e5e80f5bd692590b7d075882d51f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQCGolAAoJEAmJmMX429relA4H/1Of6a6Q4A61Gvy45xJmd4v2
-6Z7UUH6ehmUBz4h7W1X52orA85TOpd4NCNiZi/l9q/ZcAcN/XxQE8l7xpShBxxfH
-v+6ykSwAY94IbZCR3H0OHuWXgv+fo5zKcntr880s013+etRTg4LeysAZiCK9Yws8
-d3NC6Mk+9kUgzQet3Fo6mx5UpkEjC0cRxuXItO6WXxlnaLta4f1JX/iwxhEMn/VS
-yuw40/RuuYCZ/2DVEk/+CgF78XGGprUKkUwq37xVfHPJRx0jM/nz7i4RPxwiQYpc
-tHu4BSymPTuhCf/kXp8cm9oHUJPWOVtz57fgsACarwqQ1y4Hrnmkbhx4zx4EPEc=
-=bylJ
+iQEcBAEBAgAGBQJQHOYaAAoJEAmJmMX429reHLMH/iu2BKgwNvsiad9axruS8D4l
+2wpcWw7PuhCXdxUO6H/dhTwGFRC6VP22s/KPyxf85wOS/aadUepmkjUdR/9uNUGI
+Y8E1Qor4ljr88VDqilLpJ8cAM60pbu6eSGfIWB7p4edAEYgAswSTwPDnCvQMQURV
+5p8WImnAwECczUl6V9tEBtxfYFR1JcgPUkk8ZdW3fd/xr0i6ZYxbros/xCrkHQUN
+MtkLja/p0KfPwE5jk2zLVJe4gpQnzXuSYFPxpF1yADXxiHcRNH1XtLRJ8n7Z9MLm
+sg0odBYAB+hHdlr0wzZh8X9edqEHDH3n2xgw7BY2XQU/WszYOK/czaS8YMIcycQ=
+=/z79
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/leechcraft-bittorrent/files/boost-1.50.patch b/net-p2p/leechcraft-bittorrent/files/boost-1.50.patch
new file mode 100644
index 000000000000..2abb31998082
--- /dev/null
+++ b/net-p2p/leechcraft-bittorrent/files/boost-1.50.patch
@@ -0,0 +1,38 @@
+diff --git a/src/plugins/bittorrent/CMakeLists.txt b/src/plugins/bittorrent/CMakeLists.txt
+index de8a2f9..45d26da 100644
+--- a/src/plugins/bittorrent/CMakeLists.txt
++++ b/src/plugins/bittorrent/CMakeLists.txt
+@@ -153,7 +153,6 @@ IF (WIN32)
+ ENDIF (WIN32)
+ #ADD_DEFINITIONS(-DBOOST_DYN_LINK)
+ ADD_DEFINITIONS(-DTORRENT_LINKING_SHARED)
+-ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2) #workaround for building with boost 1.46
+ #ADD_DEFINITIONS(-D_DLL)
+ IF (NOT LC_NO_MOC)
+ 	QT4_WRAP_CPP (MOC_SRCS ${HEADERS})
+diff --git a/src/plugins/bittorrent/torrentmaker.cpp b/src/plugins/bittorrent/torrentmaker.cpp
+index 313a6a5..467c4d8 100644
+--- a/src/plugins/bittorrent/torrentmaker.cpp
++++ b/src/plugins/bittorrent/torrentmaker.cpp
+@@ -40,7 +40,11 @@ namespace LeechCraft
+ 			{
+ 				bool FileFilter (const boost::filesystem::path& filename)
+ 				{
++#if BOOST_FILESYSTEM_VERSION == 2
+ 					if (filename.leaf () [0] == '.')
++#else
++					if (filename.leaf ().string () [0] == '.')
++#endif
+ 						return false;
+ 					QFileInfo fi (QString::fromUtf8 (filename.string ().c_str ()));
+ 					if ((fi.isDir () ||
+@@ -74,7 +78,9 @@ namespace LeechCraft
+ 					return;
+ 				}
+ 
++#if BOOST_FILESYSTEM_VERSION == 2
+ 				boost::filesystem::path::default_name_check (boost::filesystem::no_check);
++#endif
+ 
+ 				libtorrent::file_storage fs;
+ #if LIBTORRENT_VERSION_NUM >= 1600
diff --git a/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-0.5.75.ebuild b/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-0.5.75.ebuild
index b0f8d158ab9c..1d622dce6cbc 100644
--- a/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-0.5.75.ebuild
+++ b/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-0.5.75.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-0.5.75.ebuild,v 1.1 2012/07/19 20:12:03 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-0.5.75.ebuild,v 1.2 2012/08/04 09:06:13 maksbotan Exp $
 
 EAPI="4"
 
@@ -16,3 +16,5 @@ DEPEND="~net-misc/leechcraft-core-${PV}
 		net-libs/rb_libtorrent"
 RDEPEND="${DEPEND}
 		virtual/leechcraft-task-show"
+
+PATCHES=("${FILESDIR}"/boost-1.50.patch)
diff --git a/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-9999.ebuild b/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-9999.ebuild
index dbf53f2704b6..1fd3148441c1 100644
--- a/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-9999.ebuild
+++ b/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-9999.ebuild,v 1.2 2011/12/16 18:48:01 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-bittorrent/leechcraft-bittorrent-9999.ebuild,v 1.3 2012/08/04 09:06:13 maksbotan Exp $
 
 EAPI="4"
 
@@ -10,9 +10,17 @@ DESCRIPTION="Full-featured BitTorrent client plugin for LeechCraft."
 
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
+IUSE="debug geoip"
 
 DEPEND="~net-misc/leechcraft-core-${PV}
 		net-libs/rb_libtorrent"
 RDEPEND="${DEPEND}
-		virtual/leechcraft-task-show"
+		virtual/leechcraft-task-show
+		geoip? ( dev-libs/geoip )"
+
+src_configure(){
+	local mycmakeargs="
+		$(cmake-utils_use_enable geoip BITTORRENT_GEOIP)
+	"
+	cmake-utils_src_configure
+}