Fix compile failure with python-2.6.

Package-Manager: portage-2.2_rc28_p13311/cvs/Linux i686

4 files changed, 158 insertions, 7 deletions

diff --git a/app-pda/libopensync/ChangeLog b/app-pda/libopensync/ChangeLog
index 98dfc2b6a541..4a9ff02df4f5 100644
--- a/app-pda/libopensync/ChangeLog
+++ b/app-pda/libopensync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/libopensync
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.27 2008/06/15 06:11:14 zmedico Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.28 2009/04/10 18:52:55 zmedico Exp $
+
+*libopensync-0.36-r1 (10 Apr 2009)
+
+  10 Apr 2009; Zac Medico <zmedico@gentoo.org>
+  +files/libopensync-py2.6.patch, +libopensync-0.36-r1.ebuild:
+  Fix compile failure with python-2.6.
 
   15 Jun 2008; Zac Medico <zmedico@gentoo.org> libopensync-0.22.ebuild:
   Bug #226505 - For compatibility with phase execution order in
diff --git a/app-pda/libopensync/Manifest b/app-pda/libopensync/Manifest
index d01cdb17aef4..860025cce243 100644
--- a/app-pda/libopensync/Manifest
+++ b/app-pda/libopensync/Manifest
@@ -2,6 +2,7 @@
 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
 DIST libopensync-0.20.tar.gz 681064 RMD160 3cfaf0a456cd78240a4abb04e0c4c0c7ea35f878 SHA1 88958a9197397eb051e23d14bb710783cb4dd069 SHA256 5da9e72de291e7654fb59bf40b647633f3afb3cde924bd11b80d6ed26c911feb
 DIST libopensync-0.21.tar.bz2 526365 RMD160 7294e0296a9f05e791fe119732eef7a9e54cee66 SHA1 ab717090e8596745f4f1d800b4736042d0f7990c SHA256 1adf93d58ee31b788e7be5327de65503d13d6517b314dc9ea1fa54305e6dd895
 DIST libopensync-0.22.tar.bz2 489978 RMD160 a1e9715d037a7c474b80d609e6c96a24cbb6692f SHA1 47860a8c6621aa89fbff2af2517787747af7cc30 SHA256 3394bae1e3bcfe463d139a367ba5ebe73d968df128c871842dcb4965a725d0dc
@@ -11,14 +12,15 @@ EBUILD libopensync-0.20.ebuild 1248 RMD160 2ec37608c98352530df4f37dd2c1d106ea9f1
 EBUILD libopensync-0.21.ebuild 1258 RMD160 689edd5c9761611e1a93d5a49a598d9b936e5c58 SHA1 94adb7b1a829628937598328a17e6ae4cc6a5cd9 SHA256 bd6699daa2db75f107be9261ba20b74b26bb0f88bae40f178f7e9d6f5a222d10
 EBUILD libopensync-0.22.ebuild 1958 RMD160 2297142ba8c988a9a4adae7a29c33fc1cf423243 SHA1 ec035a9174db1047c2191f46a0533359e46949aa SHA256 72c468efa7e7d84f83077f9e63a55fdbeb9d99633805445d5cf96b6891dd169a
 EBUILD libopensync-0.35.ebuild 1767 RMD160 b7b5cbdabb35d52e710ea7edaaace0f3229a7d25 SHA1 220c8615c124edeea92c7ab11fcdac09a25bfb20 SHA256 30d004cfe9114a50fd4e5899615a23c62dd1036d5732389ff2423346d071ca78
+EBUILD libopensync-0.36-r1.ebuild 2132 RMD160 f3cbcea2edaa480bc5b56c05a21bd360bc821a7d SHA1 c02a7f9ecafee9ce238d3b2a3a22633792e4aa9d SHA256 a8eed3dfee8ada22bc3d3c74404a855853b3cfee43478cfeb26fb024d864619f
 EBUILD libopensync-0.36.ebuild 2046 RMD160 f4d143fd4c60b1a09b40a90844512fc2f4ce41d0 SHA1 5cc9527200114acfea87ac109e5f8e068340ca0b SHA256 49ae5ca6a7d40810496af090dbb7b46452881a0636f39ffe5b01822de09d6902
 EBUILD libopensync-9999.ebuild 1782 RMD160 ac9e94cd91bddc4bef6541402b45adaa6a565b25 SHA1 03afe7d0e3761f499eba336d8ff8d82b290893d8 SHA256 5015e535f5fb8a3ecf7dd002692b45f6eeadf0d471a9e7c70bf701daecdc012e
-MISC ChangeLog 3747 RMD160 f62719e1117dcbe8499ff1824153660b95edcf5a SHA1 f690f9247cf63c2ca7d8f844fc28f7857db6aeda SHA256 97f793dda698f84d294534e5ef8cbff2b374e6bb49c3a497e1668a42fb7aff38
+MISC ChangeLog 3933 RMD160 87ca6dece10bdc5b8848da78d36a12c7db38e489 SHA1 bba781188ebdcd8eb13792914ef2681dc3c778e0 SHA256 a86bcf1b157f5e6a6264541551dab089742152b7d5e1c9aaa62428733a89a989
 MISC metadata.xml 304 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 SHA1 b96c72c417192c099990a616b12a1d2f55a06064 SHA256 7fa8df0f64197f3f6c018ed0d6c4cc4da014fbcc9af2da9b633f71657470236a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkhUsokACgkQ/ejvha5XGaOH4QCfXmjb/1hmhUvlJzsPNLu1/6k/
-yUMAoPIbHMON8ptqJNs9yz9vS7tTmB+O
-=n5a5
+iEYEARECAAYFAknfla4ACgkQ/ejvha5XGaMSnACgr6VE5dUipVtKKsYRhILC2oDY
+omEAoKJUUfyzBjprk85WQB4/f+ed6ywE
+=6Mxy
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libopensync/files/libopensync-py2.6.patch b/app-pda/libopensync/files/libopensync-py2.6.patch
new file mode 100644
index 000000000000..6fdda2c60bed
--- /dev/null
+++ b/app-pda/libopensync/files/libopensync-py2.6.patch
@@ -0,0 +1,65 @@
+--- 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.36-r1.ebuild b/app-pda/libopensync/libopensync-0.36-r1.ebuild
new file mode 100644
index 000000000000..c845f90f1528
--- /dev/null
+++ b/app-pda/libopensync/libopensync-0.36-r1.ebuild
@@ -0,0 +1,78 @@
+# 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.1 2009/04/10 18:52:55 zmedico 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"
+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/cmake-2.4.7
+	>=dev-util/pkgconfig-0.9.0
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack $A
+	cd $PN-$PV
+	epatch "$FILESDIR/libopensync-py2.6.patch"
+}
+
+src_compile() {
+	local mycmakeargs
+	mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON"
+	mycmakeargs="${mycmakeargs} -DOPENSYNC_TRACE=$(use debug && echo ON || echo OFF)"
+	mycmakeargs="${mycmakeargs} -DOPENSYNC_DEBUG_MODULES=$(use debug && echo ON || echo OFF)"
+	mycmakeargs="${mycmakeargs} -DOPENSYNC_PYTHONBINDINGS=$(use python && echo ON || echo OFF)"
+	mycmakeargs="${mycmakeargs} -DBUILD_DOCUMENTATION=$(use doc && echo ON || echo OFF)"
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cd "${WORKDIR}/${PN}_build"
+		doxygen Doxyfile || die "Failed to generate docs."
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	pushd "${WORKDIR}/${PN}_build" > /dev/null
+
+	if ! LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/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 "${WORKDIR}/${PN}_build"
+		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"
+}