Version bump (bug #522750).

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 49 insertions, 10 deletions

diff --git a/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch b/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch
index 473fb248cf1c..c7f69ffb0d59 100644
--- a/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch
@@ -1,7 +1,5 @@
-Index: obexftp-0.23/swig/ruby/Makefile.am
-===================================================================
---- obexftp-0.23.orig/swig/ruby/Makefile.am
-+++ obexftp-0.23/swig/ruby/Makefile.am
+--- a/swig/ruby/Makefile.am
++++ b/swig/ruby/Makefile.am
 @@ -12,7 +12,7 @@ Makefile.ruby: extconf.rb
  	PREFIX=$(prefix) $(RUBY) $< --with-obexftp-include=$(top_srcdir)
  
diff --git a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
index b805bc6250f0..caf0611ff071 100644
--- a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
@@ -1,6 +1,5 @@
-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
+--- a/obexftp/client.c
++++ b/obexftp/client.c
 @@ -51,8 +51,6 @@
  
  #ifdef HAVE_BLUETOOTH
@@ -10,9 +9,8 @@ diff -Nru obexftp-0.23.orig/obexftp/client.c obexftp-0.23/obexftp/client.c
  #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
+--- a/apps/obexftp.c
++++ b/apps/obexftp.c
 @@ -29,6 +29,8 @@
  
  #include <sys/types.h>
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-config.patch b/app-mobilephone/obexftp/files/obexftp-0.24-config.patch
new file mode 100644
index 000000000000..f923a4b0ed2c
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-config.patch
@@ -0,0 +1,11 @@
+--- a/apps/obexftp.c
++++ b/apps/obexftp.c
+@@ -43,8 +43,6 @@
+ 
+ #include <common.h>
+ 
+-#include <config.h>
+-
+ #ifdef HAVE_SYS_TIMES_H
+ #include <sys/times.h>
+ #endif
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch b/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
new file mode 100644
index 000000000000..ff72fff17e7c
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,11 +52,13 @@
+ #
+ # some code is only included if bluetooth is available
+ #
++if ( ENABLE_BLUETOOTH )
+ find_package ( Bluetooth )
+ if ( Bluetooth_FOUND )
+   include_directories ( ${Bluetooth_INCLUDE_DIRS} )
+   add_definitions ( -DHAVE_BLUETOOTH -DHAVE_SDP )
+ endif ( Bluetooth_FOUND )
++endif ( ENABLE_BLUETOOTH )
+ 
+ add_subdirectory ( bfb )
+ add_subdirectory ( multicobex )
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch b/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
new file mode 100644
index 000000000000..24cc46050ab4
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
@@ -0,0 +1,16 @@
+--- a/swig/python/CMakeLists.txt
++++ b/swig/python/CMakeLists.txt
+@@ -40,11 +40,13 @@
+   OUTPUT_VARIABLE PYTHON_PREFIX
+ )
+ file ( TO_CMAKE_PATH "${PYTHON_PREFIX}" PYTHON_PREFIX )
++if ( NOT PYTHON_SITE_DIR )
+ execute_process (
+   COMMAND ${PYTHON_EXECUTABLE} -c
+   	"import site, sys; sys.stdout.write(site.getsitepackages()[-1])"
+   OUTPUT_VARIABLE PYTHON_SITE_DIR
+ )
++endif ( PYTHON_SITE_DIR )
+ file ( TO_CMAKE_PATH "${PYTHON_SITE_DIR}" PYTHON_SITE_DIR )
+ string ( REGEX REPLACE "^${PYTHON_PREFIX}/" ""
+   PYTHON_SITE_DIR "${PYTHON_SITE_DIR}"