diff options
| -rw-r--r-- | app-pda/libopensync/ChangeLog | 10 | ||||
| -rw-r--r-- | app-pda/libopensync/files/libopensync-py2.6.patch | 65 | ||||
| -rw-r--r-- | app-pda/libopensync/libopensync-0.36-r1.ebuild | 78 |
3 files changed, 151 insertions, 2 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/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" +} |