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

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

10 files changed, 332 insertions, 166 deletions

diff --git a/app-pda/libopensync/ChangeLog b/app-pda/libopensync/ChangeLog
index 50e6c2cfccc8..609e8d679ece 100644
--- a/app-pda/libopensync/ChangeLog
+++ b/app-pda/libopensync/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-pda/libopensync
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.38 2011/02/12 03:51:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.39 2011/02/14 20:14:23 dirtyepic Exp $
+
+*libopensync-0.36-r2 (14 Feb 2011)
+*libopensync-0.22-r1 (14 Feb 2011)
+
+  14 Feb 2011; Ryan Hill <dirtyepic@gentoo.org> +libopensync-0.22-r1.ebuild,
+  -files/libopensync-py2.6.patch, +files/libopensync-0.22-pythonpath.patch,
+  +files/libopensync-0.22-swig-typeerror.patch, -libopensync-0.36-r1.ebuild,
+  +libopensync-0.36-r2.ebuild, libopensync-0.39-r1.ebuild, metadata.xml:
+  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
 
 *libopensync-0.39-r1 (12 Feb 2011)
 
diff --git a/app-pda/libopensync/Manifest b/app-pda/libopensync/Manifest
index 7136fa3016a3..40de8a484942 100644
--- a/app-pda/libopensync/Manifest
+++ b/app-pda/libopensync/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA1
 
 AUX libopensync-0.22-fbsd.patch 981 RMD160 32336ef24c3f7c093db6fe550061cba3a2d9baad SHA1 4408b9c05a649e0be8a96505dcaefd4ce52df2f5 SHA256 49089d7e784a5c0f7f2566880db6d266162c1661e35308d6077ea68a23ba78a6
-AUX libopensync-py2.6.patch 2498 RMD160 b2049c3df05d52a6f16f3e5885ce32cbfb672779 SHA1 bbf8fb0a018a58cac588c202864d10803b59d0d1 SHA256 cfe5ad3152288a6bbcd8f1d37c129d51cb8065ff784b830cec91fdccaeec5c83
+AUX libopensync-0.22-pythonpath.patch 3311 RMD160 877bd34982a6093c8380b3d4b68f4274609588e0 SHA1 e45b439644877273d4fd88613b3e2a29246e83aa SHA256 a9a8c9870ff27b83df75ff522a17788585b9066d6424a9363c0db0dfff30b702
+AUX libopensync-0.22-swig-typeerror.patch 416 RMD160 d568fdceb7482707a71f83367d18e6c219f11731 SHA1 fbc3422bb56aefd9655961fc98a93fcfeeb3468f SHA256 25aba2f0956b21aab451a5bf471ceb41dda5d2ba2a0ed535a2ecd0ca8ab98f50
 DIST libopensync-0.22.tar.bz2 489978 RMD160 a1e9715d037a7c474b80d609e6c96a24cbb6692f SHA1 47860a8c6621aa89fbff2af2517787747af7cc30 SHA256 3394bae1e3bcfe463d139a367ba5ebe73d968df128c871842dcb4965a725d0dc
 DIST libopensync-0.36.tar.bz2 879868 RMD160 8c4f2b6799c2767e53fc51f17ad95fcfb1e09c70 SHA1 df85159b376427953048134c60872e2bd260a245 SHA256 c686d27f0818e2d8cc6277ba123c74d7210e70fa2b320c5a828eaaedd598e908
 DIST libopensync-0.39.tar.bz2 1146955 RMD160 2124c2d65d75811f021437383f3385df9c954328 SHA1 3d97732675aa874da49cca0f8d6de6f004f2a416 SHA256 078f5d1d29774a190679e7e65e587f34cd8b001f07ea8745f31eba3f07edc430
+EBUILD libopensync-0.22-r1.ebuild 2073 RMD160 a35cc186a9489d3df60eab7e850689a1c17ca226 SHA1 3069f0ac225cbda59a6d203ad0e682e36929cc21 SHA256 a478c01857763f8dd166b58da63a4ebf52487db1df72d24c87a5ba03aed888a1
 EBUILD libopensync-0.22.ebuild 1964 RMD160 bcff66c58e974aef264bb0995edb6f4d47cba465 SHA1 4a0c7af8a6b12d710d37d4e98f1e1a24cc3e4adf SHA256 c87b557e25bbf00f6c6d138625689d2d2206981307fa7efaed8e70c355dc3fac
-EBUILD libopensync-0.36-r1.ebuild 1942 RMD160 aeee52ffb5944ed490dc230e2bb1a8b30bb9f9d2 SHA1 54a4486e44f5cf85234d7b0b71d9c395f164d4a5 SHA256 04e860af16b996bb9b3232c746e6a05f8f09b3e28a85ad23420bb1eef708c55d
-EBUILD libopensync-0.39-r1.ebuild 2921 RMD160 abda57f9095ff2e30f2debfb4f8aaedfba7e2e22 SHA1 278b64cc83c1c86fb59445a06dacc369b533b9c6 SHA256 e6bb2e9bd6cfbee7f0fa20bc1130d070a5c7c361401d7c46d0bbbe26902067e9
+EBUILD libopensync-0.36-r2.ebuild 3015 RMD160 374ea5616f5496ef060593e9a04cbb069382654d SHA1 05d163effe471f78f76e2087e7608e1a70ed4a84 SHA256 8a66105ad4b89ffb9ccf6585228889313567371537f7dfc066371ca53206da63
+EBUILD libopensync-0.39-r1.ebuild 3020 RMD160 16c6357c789316fb534053b47abeee74d94445a2 SHA1 57f21b97a6642d6b8242adb3f8e8e146cf872b85 SHA256 e6f8537656ae6e0f70086b6bb095c88a365187d219dff3e5686fbb2c059c28d6
 EBUILD libopensync-9999.ebuild 1661 RMD160 90086aa9f146442d8adf3540fce58b90737d1494 SHA1 63132519184093bf8f46aeaacd3facdf5b8d1372 SHA256 1e12077bb4ea873e81afb438b95cb6cd47615f4804f3c77e0b4a1c6a6a3230ef
-MISC ChangeLog 5998 RMD160 b6a733e16055381512b674031da73fa1087a31ea SHA1 d0a3ea8bf1996df099884f4c412a6aa0f43be000 SHA256 c8a291d4523da58255ef3b92006af352efeebedfd0048e6b9da607831f62f2b7
-MISC metadata.xml 304 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 SHA1 b96c72c417192c099990a616b12a1d2f55a06064 SHA256 7fa8df0f64197f3f6c018ed0d6c4cc4da014fbcc9af2da9b633f71657470236a
+MISC ChangeLog 6680 RMD160 105439aef2a8257a28f3a141c03caa5cecf4904e SHA1 0d2f96694bed439d4f3ac1e80afc8b872d64f25d SHA256 8010f755bdfff1743799e4dba68ffe44e212b1c06eb710dfdedd830f2eea259a
+MISC metadata.xml 250 RMD160 a93878d09a42447cd57fba806891688212afbd43 SHA1 9425a085c9998e2c0b7783326661ebcbf0858e7c SHA256 be46db170c8eab4c5319615306d2df7bb79fe3c7b3a37c191573846cb24b16b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1WBSMACgkQiqiDRvmkBmKHlQCgiOazf1bzotB5HRM0DVsi3bzQ
-IbIAnAsEXNBsQFbxHmXorLCTqGBmnKCS
-=tmA/
+iEYEARECAAYFAk1ZjoMACgkQiqiDRvmkBmIEMACg8B2Cr6Y1s8AmOLH5EaLuMmlq
+f98AoL40rbFOICcsFOf/WYt/q5IUzrKW
+=aXx9
 -----END PGP SIGNATURE-----
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
diff --git a/app-pda/libopensync/libopensync-0.22-r1.ebuild b/app-pda/libopensync/libopensync-0.22-r1.ebuild
new file mode 100644
index 000000000000..4897c74423ce
--- /dev/null
+++ b/app-pda/libopensync/libopensync-0.22-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.22-r1.ebuild,v 1.1 2011/02/14 20:14:23 dirtyepic Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit autotools eutils python
+
+DESCRIPTION="OpenSync synchronisation framework library"
+HOMEPAGE="http://www.opensync.org/"
+SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="debug doc python"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libxml2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	doc?	( app-doc/doxygen )
+	python?	( >=dev-lang/swig-1.3.17 )"
+#   test?   ( >=dev-libs/check-0.9.2 )"
+
+# Tests don't pass
+RESTRICT="test"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fbsd.patch
+	epatch "${FILESDIR}"/${P}-pythonpath.patch
+	epatch "${FILESDIR}"/${P}-swig-typeerror.patch
+	eautoreconf # for pythonpath
+	find "${S}" -name Makefile.in -print0 | xargs -0 sed -i -e 's: -Werror::'
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	do_configure() {
+		econf \
+			--enable-engine \
+			--enable-tools \
+			$(use_enable python) \
+			$(use_enable debug) \
+			$(use_enable debug tracing)
+			#$(use_enable test unit-tests)
+	}
+
+	use python && python_execute_function -s do_configure
+	do_configure # do even when USE=python to generate Doxyfile in ${S}
+}
+
+src_compile() {
+	use python \
+		&& python_execute_function -d -s \
+		|| default
+
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	do_install() {
+		emake DESTDIR="${D}" install || die
+	}
+
+	use python \
+		&& python_execute_function -s do_install \
+		|| do_install
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+	dodoc AUTHORS NEWS README TODO
+
+	if use doc; then
+		dohtml docs/html/* || die
+	fi
+}
+
+pkg_postinst() {
+	elog "Enabling the 'debug' useflag is required for bug reports."
+	elog "Also see: http://www.opensync.org/wiki/tracing"
+}
diff --git a/app-pda/libopensync/libopensync-0.36-r1.ebuild b/app-pda/libopensync/libopensync-0.36-r1.ebuild
deleted file mode 100644
index e677485500af..000000000000
--- a/app-pda/libopensync/libopensync-0.36-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36-r1.ebuild,v 1.5 2009/07/05 19:38:19 aballier Exp $
-
-inherit cmake-utils eutils
-
-DESCRIPTION="OpenSync synchronisation framework library"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc python"
-
-# Tests don't pass
-#>=dev-libs/check-0.9.2
-#mycmakeargs="${mycmakeargs} -DOPENSYNC_UNITTESTS=ON"
-RESTRICT="test"
-
-RDEPEND=">=dev-db/sqlite-3
-	>=dev-libs/glib-2
-	dev-libs/libxml2
-	python? ( >=dev-lang/python-2.2 )"
-
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.17 )
-	>=dev-util/pkgconfig-0.9.0
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "$FILESDIR/libopensync-py2.6.patch"
-}
-
-src_compile() {
-	local mycmakeargs
-	mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use debug OPENSYNC_TRACE)
-		$(cmake-utils_use debug OPENSYNC_DEBUG_MODULES)
-		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
-		$(cmake-utils_use_build doc DOCUMENTATION)
-	"
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cd "${CMAKE_BUILD_DIR}"
-		doxygen Doxyfile || die "Failed to generate docs."
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
-	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then
-		die "Make test failed. See above for details."
-	fi
-
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		cd "${CMAKE_BUILD_DIR}"
-		dohtml docs/html/* || die "Failed to install docs."
-	fi
-}
-
-pkg_postinst() {
-	elog "Building with 'debug' useflag is highly encouraged"
-	elog "and requiered for bug reports."
-	elog "Also see http://www.opensync.org/wiki/tracing"
-}
diff --git a/app-pda/libopensync/libopensync-0.36-r2.ebuild b/app-pda/libopensync/libopensync-0.36-r2.ebuild
new file mode 100644
index 000000000000..b5084d84aae0
--- /dev/null
+++ b/app-pda/libopensync/libopensync-0.36-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36-r2.ebuild,v 1.1 2011/02/14 20:14:23 dirtyepic Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit cmake-utils python
+
+DESCRIPTION="OpenSync synchronisation framework library"
+HOMEPAGE="http://www.opensync.org/"
+SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="debug doc python" # test
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/libxslt"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	doc?	( app-doc/doxygen
+			  media-gfx/graphviz )
+	python?	( >=dev-lang/swig-1.3.17 )"
+#	test?	( >=dev-libs/check-0.9.2 )"
+
+DOCS="AUTHORS CODING README"
+
+# Tests don't pass
+RESTRICT="test"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_prepare() {
+	# Has hardcoded python versions, use the module shipped with cmake instead
+	# bug #276220
+	rm "${S}"/cmake/modules/FindPythonLibs.cmake
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use_enable python WRAPPER)
+		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
+		$(cmake-utils_use debug OPENSYNC_DEBUG_MODULES)
+		$(cmake-utils_use debug OPENSYNC_TRACE)"
+#		$(cmake-utils_use test OPENSYNC_UNITTESTS)"
+
+	do_configure() {
+		if use python; then
+			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
+			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
+			# since we're using cmake's FindPythonLibs PYTHON_VERSION is
+			# not defined
+			sed -i -e "s:\${PYTHON_VERSION}:${PYTHON_ABI}:g" \
+				"${CMAKE_BUILD_DIR}"/wrapper/CMakeLists.txt
+		fi
+		cmake-utils_src_configure || die
+	}
+
+	use python \
+		&& python_execute_function -s do_configure \
+		|| do_configure
+}
+
+src_compile() {
+	do_compile() {
+		if use python; then
+			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
+			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
+		fi
+		cmake-utils_src_compile || die
+	}
+
+	use python \
+		&& python_execute_function -s do_compile \
+		|| do_compile
+
+	if use doc ; then
+		cmake-utils_src_make DoxygenDoc || die
+	fi
+}
+
+# TODO - fix
+src_test() {
+	pushd "${CMAKE_BUILD_DIR}" > /dev/null
+
+	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then
+		die "Make test failed. See above for details."
+	fi
+
+	popd > /dev/null
+}
+
+src_install() {
+	do_install() {
+		if use python; then
+			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
+			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
+		fi
+		cmake-utils_src_install || die
+	}
+
+	use python \
+		&& python_execute_function -s do_install \
+		|| do_install
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+
+	if use doc; then
+		cd "${CMAKE_BUILD_DIR}"
+		dohtml docs/html/* || die
+	fi
+}
+
+pkg_postinst() {
+	elog "Enabling the 'debug' useflag is required for bug reports."
+	elog "Also see: http://www.opensync.org/wiki/tracing"
+}
diff --git a/app-pda/libopensync/libopensync-0.39-r1.ebuild b/app-pda/libopensync/libopensync-0.39-r1.ebuild
index 12468765201b..700f11b6551b 100644
--- a/app-pda/libopensync/libopensync-0.39-r1.ebuild
+++ b/app-pda/libopensync/libopensync-0.39-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.39-r1.ebuild,v 1.1 2011/02/12 03:51:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.39-r1.ebuild,v 1.2 2011/02/14 20:14:23 dirtyepic Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="doc python" # test
+IUSE="debug doc python" # test
 
 RDEPEND="dev-db/sqlite:3
 	>=dev-libs/glib-2.12:2
@@ -30,15 +30,12 @@ DEPEND="${RDEPEND}
 	python?	( >=dev-lang/swig-1.3.17 )"
 #	test?	( >=dev-libs/check-0.9.2 )"
 
-# 14% tests passed, 275 tests failed out of 321
-RESTRICT="test"
-
 DOCS="AUTHORS CODING ChangeLog README"
 
+# Tests don't pass
+RESTRICT="test"
 RESTRICT_PYTHON_ABIS="3.*"
 
-#CMAKE_VERBOSE="1"
-
 src_prepare() {
 	# Has hardcoded python versions, use the module shipped with cmake instead
 	# bug #276220
@@ -53,7 +50,9 @@ src_configure() {
 		$(cmake-utils_use_build doc DOCUMENTATION)
 		$(cmake-utils_use_enable python WRAPPER)
 		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
-		$(cmake-utils_use test OPENSYNC_UNITTESTS)"
+		$(cmake-utils_use debug OPENSYNC_DEBUG_MODULES)
+		$(cmake-utils_use debug OPENSYNC_TRACE)"
+#		$(cmake-utils_use test OPENSYNC_UNITTESTS)"
 
 	do_configure() {
 		if use python; then
@@ -114,6 +113,8 @@ src_install() {
 		&& python_execute_function -s do_install \
 		|| do_install
 
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+
 	if use doc; then
 		cd "${CMAKE_BUILD_DIR}"
 		dohtml docs/html/* || die
@@ -121,6 +122,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "For >=app-pda/libopensync-0.39 use app-pda/osynctool instead of"
-	einfo "the older app-pda/msynctool."
+	elog "For >=app-pda/libopensync-0.39 use app-pda/osynctool instead of"
+	elog "the older app-pda/msynctool."
 }
diff --git a/app-pda/libopensync/metadata.xml b/app-pda/libopensync/metadata.xml
index 0d934d06b5d0..e2225770f162 100644
--- a/app-pda/libopensync/metadata.xml
+++ b/app-pda/libopensync/metadata.xml
@@ -3,10 +3,8 @@
 <pkgmetadata>
 	<herd>pda</herd>
 	<maintainer>
-		<email>peper@gentoo.org</email>
-		<name>Piotr Jaroszyński</name>
+		<email>dirtyepic@gentoo.org</email>
+		<name>Ryan Hill</name>
 	</maintainer>
-	<longdescription lang="en">
-	</longdescription>
 </pkgmetadata>