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

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

7 files changed, 84 insertions, 65 deletions

diff --git a/app-pda/libopensync/ChangeLog b/app-pda/libopensync/ChangeLog
index 585f1e7b2050..e00cd3c50c7b 100644
--- a/app-pda/libopensync/ChangeLog
+++ b/app-pda/libopensync/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/libopensync
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.31 2009/05/31 20:22:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.32 2009/06/05 11:42:55 scarabeus Exp $
+
+  05 Jun 2009; Tomas Chvatal <scarabeus@gentoo.org> libopensync-0.35.ebuild,
+  libopensync-0.36.ebuild, libopensync-0.36-r1.ebuild,
+  libopensync-0.38.ebuild, libopensync-9999.ebuild:
+  Adjust cmake build system to actualy work. Per bug #269639.
 
   31 May 2009; nixnut <nixnut@gentoo.org> libopensync-0.36-r1.ebuild:
   reverting to ~ppc
diff --git a/app-pda/libopensync/Manifest b/app-pda/libopensync/Manifest
index 052e8e363b77..406075d57002 100644
--- a/app-pda/libopensync/Manifest
+++ b/app-pda/libopensync/Manifest
@@ -9,10 +9,10 @@ DIST libopensync-0.38.tar.bz2 1029341 RMD160 1d0d0bc5c66b919a42cc27fab8aaeea46e8
 EBUILD libopensync-0.20.ebuild 1248 RMD160 2ec37608c98352530df4f37dd2c1d106ea9f1980 SHA1 a7f38aeca185688dfd294d8fa3289297fe8a9360 SHA256 4d640031659c1891d5079ec91167da38cc62315b49e8b529629843864784704d
 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 2131 RMD160 b06f42976da2b3e0807630c0a1a90f5f0a248756 SHA1 99be827dc16f2bbe9fa0d01e183bfd6731d0a215 SHA256 5cf4cc3920c0fc54d6dc4f39fb3c4b09ac0a1b11f0208c3011d240b28445d743
-EBUILD libopensync-0.36.ebuild 2046 RMD160 f4d143fd4c60b1a09b40a90844512fc2f4ce41d0 SHA1 5cc9527200114acfea87ac109e5f8e068340ca0b SHA256 49ae5ca6a7d40810496af090dbb7b46452881a0636f39ffe5b01822de09d6902
-EBUILD libopensync-0.38.ebuild 2129 RMD160 81c68c995c42b9c5be6c45b3e67bc8824357cf92 SHA1 84f6b3616c2694a46a46b15109a5f5b23f6a3bf5 SHA256 79cf25c6e7badc136b16412fd8418e060210ee14d02a046839f337b0fb0f0b0f
-EBUILD libopensync-9999.ebuild 1782 RMD160 ac9e94cd91bddc4bef6541402b45adaa6a565b25 SHA1 03afe7d0e3761f499eba336d8ff8d82b290893d8 SHA256 5015e535f5fb8a3ecf7dd002692b45f6eeadf0d471a9e7c70bf701daecdc012e
-MISC ChangeLog 4255 RMD160 c55c36489f68d31bfd27a60de3629672ee275e48 SHA1 42ed01a81df259d75ca9cbc8e28b65fe835af530 SHA256 42bf2d43c7caeb2ca5b8f674c068192d9db515c462d5ecda766a582d429e8366
+EBUILD libopensync-0.35.ebuild 1577 RMD160 5ca215c8ef3aee973a6a48474be54b9c00146b60 SHA1 e52326c3c68012064822ae65e703507dcb31c4d0 SHA256 5444f140fbdff7e80bfbffb970db0f8221484a6d9612af9db735f70aff9182ec
+EBUILD libopensync-0.36-r1.ebuild 1933 RMD160 0eb9f0604043143dde62de931c648f6d982f1bcb SHA1 7576a81f47e35390173d45eefa02c16f3a931f05 SHA256 3e634e9b31adfb9d61d5f17c83f2ac4b1fdd8d51624c06748c9101713b1d96d4
+EBUILD libopensync-0.36.ebuild 1845 RMD160 a4b7b2d18741dd180565d2e9b1a6dd7c3586d663 SHA1 844078eb28cd3c66c9b991692254772110ace43d SHA256 758639d9bea0ca1613b0ed3e39709c7b4f6a444008d890da3d4b126b809706a9
+EBUILD libopensync-0.38.ebuild 1930 RMD160 edccc063fb08ef40d47183b7d8d898030c2c7356 SHA1 150b7feb8ed4b0ed8a311b5098bc77b2ca22075a SHA256 169f1557c0dac2901330a3f44302de6f68fb60db8a3942a845f21f4b3700f8c1
+EBUILD libopensync-9999.ebuild 1843 RMD160 f3da5102e96c788127828da07cc904df04ea24ac SHA1 ba84cc8838a400a152dc10f5acd0c9346ace2dd8 SHA256 73eb4117f00d553adc964dc05cb150b797516f4a263c0645b80099933d24a739
+MISC ChangeLog 4505 RMD160 a7bf282ac23b4a70f1896aee821d6205a98025b4 SHA1 261f1b11735b8bb56383bbe2110678c2b50dcaf0 SHA256 445fba30c2c343290a8ece34b11c7f29f77b6fc070ca9925a7c1685945e6f375
 MISC metadata.xml 304 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 SHA1 b96c72c417192c099990a616b12a1d2f55a06064 SHA256 7fa8df0f64197f3f6c018ed0d6c4cc4da014fbcc9af2da9b633f71657470236a
diff --git a/app-pda/libopensync/libopensync-0.35.ebuild b/app-pda/libopensync/libopensync-0.35.ebuild
index 58f4d40a537f..e8876eb66293 100644
--- a/app-pda/libopensync/libopensync-0.35.ebuild
+++ b/app-pda/libopensync/libopensync-0.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 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-0.35.ebuild,v 1.2 2007/12/23 02:19:16 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.35.ebuild,v 1.3 2009/06/05 11:42:55 scarabeus Exp $
 
 inherit cmake-utils eutils
 
@@ -24,21 +24,21 @@ RDEPEND=">=dev-db/sqlite-3
 	python? ( >=dev-lang/python-2.2 >=dev-lang/swig-1.3.17 )"
 
 DEPEND="${RDEPEND}
-	>=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
 }
@@ -47,7 +47,7 @@ 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
 }
diff --git a/app-pda/libopensync/libopensync-0.36-r1.ebuild b/app-pda/libopensync/libopensync-0.36-r1.ebuild
index 5e982a40b987..94fffd0d492b 100644
--- a/app-pda/libopensync/libopensync-0.36-r1.ebuild
+++ b/app-pda/libopensync/libopensync-0.36-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2009/05/31 20:22:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36-r1.ebuild,v 1.4 2009/06/05 11:42:55 scarabeus Exp $
 
 inherit cmake-utils eutils
 
@@ -25,27 +25,27 @@ 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_unpack() {
-	unpack $A
-	cd $PN-$PV
+	unpack ${A}
+	cd "${S}"
 	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)"
+	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
 }
@@ -53,9 +53,9 @@ src_compile() {
 src_test() {
 	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 
-	pushd "${WORKDIR}/${PN}_build" > /dev/null
+	pushd "${CMAKE_BUILD_DIR}" > /dev/null
 
-	if ! LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/opensync/" emake -j1 test ; then
+	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then
 		die "Make test failed. See above for details."
 	fi
 
@@ -66,7 +66,7 @@ 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
 }
diff --git a/app-pda/libopensync/libopensync-0.36.ebuild b/app-pda/libopensync/libopensync-0.36.ebuild
index 20a756b1fb43..df21d0c86e0c 100644
--- a/app-pda/libopensync/libopensync-0.36.ebuild
+++ b/app-pda/libopensync/libopensync-0.36.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-0.36.ebuild,v 1.2 2008/04/20 17:07:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36.ebuild,v 1.3 2009/06/05 11:42:55 scarabeus Exp $
 
 inherit cmake-utils eutils
 
@@ -25,21 +25,22 @@ 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
 }
@@ -47,9 +48,9 @@ src_compile() {
 src_test() {
 	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 
-	pushd "${WORKDIR}/${PN}_build" > /dev/null
+	pushd "${CMAKE_BUILD_DIR}" > /dev/null
 
-	if ! LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/opensync/" emake -j1 test ; then
+	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then
 		die "Make test failed. See above for details."
 	fi
 
@@ -60,7 +61,7 @@ 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
 }
diff --git a/app-pda/libopensync/libopensync-0.38.ebuild b/app-pda/libopensync/libopensync-0.38.ebuild
index 60edc597e914..c68f7a7af213 100644
--- a/app-pda/libopensync/libopensync-0.38.ebuild
+++ b/app-pda/libopensync/libopensync-0.38.ebuild
@@ -1,6 +1,6 @@
 # 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.38.ebuild,v 1.1 2009/04/26 20:51:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.38.ebuild,v 1.2 2009/06/05 11:42:55 scarabeus Exp $
 
 inherit cmake-utils eutils
 
@@ -25,27 +25,27 @@ 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_unpack() {
-	unpack $A
-	cd $PN-$PV
+	unpack ${A}
+	cd "${S}"
 	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)"
+	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
 }
@@ -53,9 +53,9 @@ src_compile() {
 src_test() {
 	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 
-	pushd "${WORKDIR}/${PN}_build" > /dev/null
+	pushd "${CMAKE_BUILD_DIR}" > /dev/null
 
-	if ! LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/opensync/" emake -j1 test ; then
+	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then
 		die "Make test failed. See above for details."
 	fi
 
@@ -66,7 +66,7 @@ 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
 }
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
 }