Update live ebuild.

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

3 files changed, 88 insertions, 28 deletions

diff --git a/app-pda/libopensync/ChangeLog b/app-pda/libopensync/ChangeLog
index 53fffaaf5cea..d95654f461fd 100644
--- a/app-pda/libopensync/ChangeLog
+++ b/app-pda/libopensync/ChangeLog
@@ -1,6 +1,9 @@
 # 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.40 2011/02/18 06:21:48 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.41 2011/02/20 03:31:30 dirtyepic Exp $
+
+  20 Feb 2011; Ryan Hill <dirtyepic@gentoo.org> libopensync-9999.ebuild:
+  Update live ebuild.
 
   18 Feb 2011; Ryan Hill <dirtyepic@gentoo.org> libopensync-0.22-r1.ebuild,
   +files/libopensync-0.22-Makefile.patch:
diff --git a/app-pda/libopensync/Manifest b/app-pda/libopensync/Manifest
index 402b8102f4fb..85188b0c12bb 100644
--- a/app-pda/libopensync/Manifest
+++ b/app-pda/libopensync/Manifest
@@ -12,13 +12,13 @@ EBUILD libopensync-0.22-r1.ebuild 2296 RMD160 6d19c0b7600f41935b8626a3102faf1ea3
 EBUILD libopensync-0.22.ebuild 1964 RMD160 bcff66c58e974aef264bb0995edb6f4d47cba465 SHA1 4a0c7af8a6b12d710d37d4e98f1e1a24cc3e4adf SHA256 c87b557e25bbf00f6c6d138625689d2d2206981307fa7efaed8e70c355dc3fac
 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 6876 RMD160 e6ff4da9293824309188e1067295827bd8fb1d58 SHA1 daf926e8e08afd7cbe5d18a97105addc962670c3 SHA256 c366c3aad86693b2d7269407855b2c05a9a29b1a131b78a8061166c55ef4453b
+EBUILD libopensync-9999.ebuild 2981 RMD160 34c59e58a96eb62ec9a49cbd82e3ecda9475ebba SHA1 2545f36f7ae93f229d7ff30bc06afd720603a3b7 SHA256 b63578632d2e1c10e877d5c74349c4d20e3a7e880519d85df677e68698387e01
+MISC ChangeLog 6972 RMD160 0ce61031a464153a19914e812721739317e74920 SHA1 5ccebbb3808a8ac54771085e7dd5094726f09687 SHA256 b3896f20bd4270c6ac77fedd8467129a79245cf408bf8b941c8e4272bc7c6f7e
 MISC metadata.xml 250 RMD160 a93878d09a42447cd57fba806891688212afbd43 SHA1 9425a085c9998e2c0b7783326661ebcbf0858e7c SHA256 be46db170c8eab4c5319615306d2df7bb79fe3c7b3a37c191573846cb24b16b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1eEWEACgkQiqiDRvmkBmKxWgCg5DRnpJwstZ8pq2zEMGmC9veF
-1jUAnjJg8xe5nmHqrPMj/yPMl00/0T6t
-=6pQJ
+iEYEARECAAYFAk1gjHIACgkQiqiDRvmkBmIlogCg770hngu6ODZVZkMg40rNCYiw
+HFgAoJwuqHQ+LAJEBFq9sNq6BYg9rW4+
+=NpKU
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libopensync/libopensync-9999.ebuild b/app-pda/libopensync/libopensync-9999.ebuild
index 8eca1d980e00..c539d76df307 100644
--- a/app-pda/libopensync/libopensync-9999.ebuild
+++ b/app-pda/libopensync/libopensync-9999.ebuild
@@ -1,8 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-9999.ebuild,v 1.6 2009/11/15 22:02:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild,v 1.7 2011/02/20 03:31:30 dirtyepic Exp $
 
-inherit cmake-utils subversion
+EAPI="3"
+
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit cmake-utils subversion python
 
 DESCRIPTION="OpenSync synchronisation framework library"
 HOMEPAGE="http://www.opensync.org/"
@@ -13,33 +18,73 @@ ESVN_REPO_URI="http://svn.opensync.org/trunk"
 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
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.12:2
 	dev-libs/libxml2
-	python? ( >=dev-lang/python-2.2 )"
+	dev-libs/libxslt"
 
 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 )"
+	doc?	( app-doc/doxygen
+			  media-gfx/graphviz )
+	python? ( >=dev-lang/swig-1.3.17 )"
+#	test? ( >=dev-libs/check-0.9.2 )
 
-src_compile() {
-	DOCS="AUTHORS CODING ChangeLog README"
+DOCS="AUTHORS CODING ChangeLog README"
 
-	local mycmakeargs="
-		-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use_enable python WRAPPER)
+# tests don't pass
+RESTRICT="test"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_prepare() {
+	# Use cmake's 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 test OPENSYNC_UNITTESTS)
-	"
+		$(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
+}
 
-	cmake-utils_src_compile
+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 "Failed to generate docs."
+		cmake-utils_src_make DoxygenDoc || die
 	fi
 }
 
@@ -54,11 +99,23 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_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
+	}
 
-	if use doc ; then
+	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 "Failed to install docs."
+		dohtml docs/html/* || die
 	fi
 }