Revision bumps, remove old.

  - backport all ebuild fixes from 0.39
  - patch 0.22 to find python correctly and add swig version detection for
    versions greater than 1.3.x (bug #328691)
  - fix TypeError in python wrapper (bug #340605)
  - add debug support back to 0.39
  - drop .la files

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

3 files changed, 76 insertions, 65 deletions

diff --git a/app-pda/libopensync/files/libopensync-0.22-pythonpath.patch b/app-pda/libopensync/files/libopensync-0.22-pythonpath.patch
new file mode 100644
index 000000000000..abfb68cbdb33
--- /dev/null
+++ b/app-pda/libopensync/files/libopensync-0.22-pythonpath.patch
@@ -0,0 +1,63 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index 2bf9951..a3b617c 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1008,9 +1008,9 @@ AC_DEFUN([AC_PROG_SWIG],[
+                         if test -z "$available_patch" ; then
+                                 [available_patch=0]
+                         fi
+-                        if test $available_major -ne $required_major \
+-                                -o $available_minor -ne $required_minor \
+-                                -o $available_patch -lt $required_patch ; then
++                        if test $available_major -lt $required_major \
++                                -a $available_minor -lt $required_minor \
++                                -a $available_patch -lt $required_patch ; then
+                                 AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                 SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
+                         else
+@@ -1114,7 +1114,7 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
+ 	AC_MSG_CHECKING([for Python include path])
+ 	python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+ 	for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do
+-		python_path=`find $i -type f -name Python.h -print | sed "1q"`
++		python_path=`find $i -type f -name Python.h -print 2>/dev/null | sed "1q"`
+ 		if test -n "$python_path" ; then
+ 			break
+ 		fi
+@@ -1129,8 +1129,8 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
+ 	# Check for Python library path
+ 	AC_MSG_CHECKING([for Python library path])
+ 	python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+-	for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
+-		python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
++	for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/lib/" ; do
++		python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print 2>/dev/null | sed "1q"`
+ 		if test -n "$python_path" ; then
+ 			break
+ 		fi
+@@ -1142,16 +1142,21 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
+ 	fi
+ 	AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"])
+ 	#
+-	python_site=`echo $python_path | sed "s/config/site-packages/"`
+-	AC_SUBST([PYTHON_SITE_PKG],[$python_site])
++	# site-packages directory
++	#
++	AC_MSG_CHECKING(python site-packages)
++	PYTHON_SITE_PKG=`$PYTHON -c "from distutils.sysconfig import get_python_lib; \
++	            print get_python_lib()"`
++	AC_MSG_RESULT($PYTHON_SITE_PKG)
++	AC_SUBST(PYTHON_SITE_PKG)
+ 	#
+ 	# libraries which must be linked in when embedding
+ 	#
+ 	AC_MSG_CHECKING(python extra libraries)
+ 	PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+                 conf = distutils.sysconfig.get_config_var; \
+-                print conf('LOCALMODLIBS')+' '+conf('LIBS')"
+-	AC_MSG_RESULT($PYTHON_EXTRA_LIBS)`
++                print conf('LOCALMODLIBS')+' '+conf('LIBS')"`
++	AC_MSG_RESULT($PYTHON_EXTRA_LIBS)
+ 	AC_SUBST(PYTHON_EXTRA_LIBS)
+ ])
+ dnl as-ac-expand.m4 0.2.0
diff --git a/app-pda/libopensync/files/libopensync-0.22-swig-typeerror.patch b/app-pda/libopensync/files/libopensync-0.22-swig-typeerror.patch
new file mode 100644
index 000000000000..b1e42f394493
--- /dev/null
+++ b/app-pda/libopensync/files/libopensync-0.22-swig-typeerror.patch
@@ -0,0 +1,13 @@
+diff --git a/wrapper/opensync.i b/wrapper/opensync.i
+index 623c0f4..8131158 100644
+--- a/wrapper/opensync.i
++++ b/wrapper/opensync.i
+@@ -82,7 +82,7 @@ typedef struct {} OSyncHashTable;
+ %extend OSyncChange {
+ 	OSyncChange(PyObject *obj=NULL) {
+ 		OSyncChange *change = NULL;
+-		if (obj)
++		if ((obj) && (obj != Py_None))
+ 			change = (OSyncChange *)PyCObject_AsVoidPtr(obj);
+ 		else
+ 			change = osync_change_new();
diff --git a/app-pda/libopensync/files/libopensync-py2.6.patch b/app-pda/libopensync/files/libopensync-py2.6.patch
deleted file mode 100644
index 6fdda2c60bed..000000000000
--- a/app-pda/libopensync/files/libopensync-py2.6.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- cmake/modules/FindPythonLibs.cmake
-+++ cmake/modules/FindPythonLibs.cmake
-@@ -17,8 +17,10 @@
- 
- IF(WIN32)
-   FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
--    NAMES python25_d python24_d python23_d python22_d python21_d python20_d python
-+    NAMES python26_d python25_d python24_d python23_d python22_d python21_d python20_d python
-     PATHS
-+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs/Debug
-+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs/Debug
-@@ -39,7 +41,8 @@
- ENDIF(WIN32)
- 
- FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION}
--  NAMES python25 python2.5
-+  NAMES python26 python2.6
-+        python25 python2.5
-         python24 python2.4
-         python23 python2.3
-         python22 python2.2
-@@ -49,6 +52,7 @@
-         python15 python1.5
- 
-   PATHS
-+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
-@@ -59,6 +63,7 @@
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
- 
-   PATH_SUFFIXES
-+    python2.6/config
-     python2.5/config
-     python2.4/config
-     python2.3/config
-@@ -77,7 +82,7 @@
- SET(PYTHON_FRAMEWORK_INCLUDES)
- IF(Python_FRAMEWORKS)
-   IF(NOT PYTHON_INCLUDE_PATH)
--    FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-+    FOREACH(version 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-       FOREACH(dir ${Python_FRAMEWORKS})
-         SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
-           ${dir}/Versions/${version}/include/python${version})
-@@ -91,6 +96,7 @@
- 
-   PATHS
-     ${PYTHON_FRAMEWORK_INCLUDES}
-+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/include
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/include
-@@ -102,6 +108,7 @@
- 
-   PATH_SUFFIXES
-     ${PREFERRED_PYTHON_VERSION}
-+    python2.6
-     python2.5
-     python2.4
-     python2.3