Fix compile error when bluetooth support is disabled.

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

4 files changed, 66 insertions, 5 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index fb3330ce710f..5d745f06fd00 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/obexftp
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.46 2009/03/06 03:08:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.47 2009/03/22 16:52:59 mrness Exp $
+
+  22 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  +files/obexftp-0.23-gentoo.patch, obexftp-0.23.ebuild:
+  Fix compile error when bluetooth support is disabled.
 
   06 Mar 2009; Jeroen Roovers <jer@gentoo.org> obexftp-0.22.ebuild:
   Stable for HPPA (bug #245455).
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index a16095436f38..10769a6720f6 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -1,14 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX obexftp-0.21-as-needed.patch 1099 RMD160 c27152ca025f46be0ae80ab7e3e0c0d3887ba292 SHA1 dbdacd90962b37f211bd3ea7d08a43d46ad3bfeb SHA256 6a1a897b0b95955719482ba4fb885cafe5d697f6256d4e0199323cf6718420dd
 AUX obexftp-0.21-cobex_write.patch 2292 RMD160 0589e7699bc4ff514f954e4d515465fded71b7ef SHA1 e48bfe29127ad74b199dfc9af103b6e91b0c58f5 SHA256 fd310fe90cf2b4211e394caeacae8d962c08a3233fa0da066b83f6a29144d6d9
 AUX obexftp-0.21-no_iconv.patch 301 RMD160 9b4b20649f2ef5b82f6e3f7e5f30befd490f3465 SHA1 bd81421f199cbfadc1e95268e19eb47976f0cd2c SHA256 cbf9079b3f1877bb19d67e5a4c534a423d6ac90ba640f41f981a7034b0b5093a
 AUX obexftp-0.21-sdp-detection.patch 1014 RMD160 b6271790593b20880eb20ebb1189f5ab7518fffc SHA1 bc78234d3bbf6de325b5c0fe32012b231a889834 SHA256 3026521a51d1fd6d58ca1e0dcabed609f4d69c6c38454cc90152c4397487d5f4
 AUX obexftp-0.22-bluetooth.patch 358 RMD160 ced7b37b03ec8892de48d3e4985140d9ccb851ea SHA1 58bb7121fc70ab43d254462a8499f50e9b3085e7 SHA256 61c11e74b0cbd3f1479e30624428cf5752ddf7d9b7edb90e29fb8ffd59371f80
 AUX obexftp-0.22-ruby-libpath.patch 732 RMD160 eb21a92493018ee1018adcd78856963063146ef4 SHA1 d4d7a15605e878d1b3d08646480e1cc7340e0e89 SHA256 b2aa592666ba882dbd2c389df13a8bb84823c84e4f02dbbfd917e59ab7272c90
+AUX obexftp-0.23-gentoo.patch 1465 RMD160 1fbb3344e78f648f21f33db4262dad259953465b SHA1 2d8504462ce348bf00465c29bf29efaf38b3e744 SHA256 02aceefe77c3c0caa2b9078ef918de3c42d4ffc756a07c8525d0b69fd2a92781
 DIST obexftp-0.21.tar.bz2 353862 RMD160 e9e404b62cc340a55690316f502dc17d5b3334cf SHA1 8a7ba3d982f3e7e80fb2964f69c9dea76e42090f SHA256 bd542c5ccfe4f70c19f4b8a8a16c635b7cf707ed2ba0cc01e2340f81145df259
 DIST obexftp-0.22.tar.bz2 402570 RMD160 a3960fd15cd75cfb7066c565ee9fa90dc7a7c11f SHA1 8753ae1053653b01eb0deee3b7d31c02aca4974d SHA256 09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
 DIST obexftp-0.23.tar.bz2 402552 RMD160 b91e3815524b1a8042435f2f27fdd19b2b2aec26 SHA1 59a1489bedfc9430c4f4e974762fb78de2b048d5 SHA256 44a74ff288d38c0f75354d6bc2efe7d6dec10112eaff2e7b10e292b0d2105b36
 EBUILD obexftp-0.21.ebuild 1689 RMD160 3201f91b7b6be9ed250dc94aef106f13669f9aaf SHA1 aab5d9c006d2ee5947c8f922645e02c015c398a9 SHA256 ba0fd86b9b2ff4c67621775e64e925f1d9bced4786c1bb47fc0c806386ee70cf
 EBUILD obexftp-0.22.ebuild 2191 RMD160 5ed6477147a33e4cf2661fc20d12c34da8b59e85 SHA1 b1e4dbb27622ad3bc26fe3b0cf49e4bf90528548 SHA256 233b8949196e1403760fee04eebcfa90767e6fd6f7647de57adb48a452bfc80d
-EBUILD obexftp-0.23.ebuild 2128 RMD160 60ce92a3625a74913022c5dbc89ac1e54b114171 SHA1 20303dcc38173edd7e701025ed309d506452547e SHA256 b53bf577f58c129efd3488cdb6f444756c3b31241b46dda335e10da687ed41b1
-MISC ChangeLog 10629 RMD160 2174b075b8eb3842ab6147f5365a483bedafbebe SHA1 7bc416babf0358bb651ff8e1df21549e3e3d8792 SHA256 b1c5613b8df3257e378c08306d59a80217e3a2aeeef8fb9d6e133966f1635618
+EBUILD obexftp-0.23.ebuild 2114 RMD160 001bfb18b813d3ef7bb64465408d86c5841ad50a SHA1 046e7ba62d553a5482b40d6932ebdea989c45dc1 SHA256 e27175de2adb07fa4d022db997be7c8bacf16701ce016828c7d18ae61d1c34a5
+MISC ChangeLog 10794 RMD160 c6f5d59875ff77d5ae2320e8b31162f0745779b5 SHA1 8875214b95eaab6d412903abaeb160dd18aeecf0 SHA256 df5fa8eeaf2966a5248237fc4a285b580ff63a2dce1da6f2ab08f4f182f737d3
 MISC metadata.xml 428 RMD160 31e70db3d3d4146f97a6dc88f4f791e2bc056221 SHA1 886a0d425a24cca372bd033f776a5c02c47a830c SHA256 c312e7ae5043005d9a54796f062acfe40148799bd55640faee7e07d34839e38e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknGbPUACgkQts85UDFmaOVYawCdHx6A6R8ysI/ycT9YRHKcfPfO
+J+wAnRnQXaYoJxxEN+wDsFyiFjJ0bk9w
+=Qfia
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
new file mode 100644
index 000000000000..a9a70f79168d
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
@@ -0,0 +1,46 @@
+diff -Nru obexftp-0.23.orig/obexftp/client.c obexftp-0.23/obexftp/client.c
+--- obexftp-0.23.orig/obexftp/client.c	2009-02-17 18:27:48.000000000 +0000
++++ obexftp-0.23/obexftp/client.c	2009-03-22 16:12:05.000000000 +0000
+@@ -51,8 +51,6 @@
+ 
+ #ifdef HAVE_BLUETOOTH
+ #include "bt_kit.h"
+-#else
+-#define ESOCKTNOSUPPORT	WSAESOCKTNOSUPPORT
+ #endif /* HAVE_BLUETOOTH */
+ 
+ #include <openobex/obex.h>
+diff -Nru obexftp-0.23.orig/apps/obexftp.c obexftp-0.23/apps/obexftp.c
+--- obexftp-0.23.orig/apps/obexftp.c	2009-02-17 18:27:48.000000000 +0000
++++ obexftp-0.23/apps/obexftp.c	2009-03-22 16:19:29.000000000 +0000
+@@ -29,6 +29,8 @@
+ 
+ #include <sys/types.h>
+ 
++#include <config.h>
++
+ #ifdef HAVE_SYS_TIMES_H
+ #include <sys/times.h>
+ #endif
+diff -Nru obexftp-0.23.orig/swig/ruby/extconf.rb obexftp-0.23/swig/ruby/extconf.rb
+--- obexftp-0.23.orig/swig/ruby/extconf.rb	2009-02-17 18:27:48.000000000 +0000
++++ obexftp-0.23/swig/ruby/extconf.rb	2009-03-22 16:19:56.000000000 +0000
+@@ -21,10 +21,6 @@
+ end
+ 
+ dir_config('obexftp')
+-if have_library('openobex', 'OBEX_Init') and
+-   find_library('bfb', 'bfb_io_open', '../../bfb/.libs') and
+-   find_library('multicobex', 'cobex_ctrans', '../../multicobex/.libs') and
+-   find_library('obexftp', 'obexftp_open', '../../obexftp/.libs')
+   create_makefile('obexftp')
+ 
+   # hack 2: strip all rpath references
+@@ -33,7 +29,3 @@
+       out.puts line.gsub(/-Wl,-R'[^']*'/, '')
+     end
+   end
+-else
+-  puts 'obex libs not found'
+-end
+-
diff --git a/app-mobilephone/obexftp/obexftp-0.23.ebuild b/app-mobilephone/obexftp/obexftp-0.23.ebuild
index 14fa5716f77a..7c2d54f38638 100644
--- a/app-mobilephone/obexftp/obexftp-0.23.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild,v 1.1 2009/02/28 00:02:28 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild,v 1.2 2009/03/22 16:52:59 mrness Exp $
 
 EAPI="2"
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.22-ruby-libpath.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 src_configure() {