Adjust cmake build system to actualy work. Per bug #269639.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

1 files changed, 23 insertions, 10 deletions

diff --git a/app-pda/libopensync/libopensync-9999.ebuild b/app-pda/libopensync/libopensync-9999.ebuild
index 9b7f037b4145..1d66b83934fa 100644
--- a/app-pda/libopensync/libopensync-9999.ebuild
+++ b/app-pda/libopensync/libopensync-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-9999.ebuild,v 1.4 2008/04/20 17:07:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild,v 1.5 2009/06/05 11:42:55 scarabeus Exp $
 
 inherit cmake-utils eutils subversion
 
@@ -27,30 +27,43 @@ RDEPEND=">=dev-db/sqlite-3
 
 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_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)"
+	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 "${WORKDIR}/${PN}_build"
+		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 "${WORKDIR}/${PN}_build"
+		cd "${CMAKE_BUILD_DIR}"
 		dohtml docs/html/* || die "Failed to install docs."
 	fi
 }