Revision bump, remove broken version.

  - fix dependencies (bug #354407)
  - use CMake native module for FindPythonLibs (bug #276220 with thanks
  to John W Eckhart)
  - support multiabi python (bug #311763) and fix bindings getting built
  with USE="-python"
  - drop test USE flag since tests are still restricted
  - port to EAPI 3

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

4 files changed, 147 insertions, 77 deletions

diff --git a/app-pda/libopensync/ChangeLog b/app-pda/libopensync/ChangeLog
index 7c06739b554e..50e6c2cfccc8 100644
--- a/app-pda/libopensync/ChangeLog
+++ b/app-pda/libopensync/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-pda/libopensync
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.37 2010/09/27 13:07:35 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.38 2011/02/12 03:51:19 dirtyepic Exp $
+
+*libopensync-0.39-r1 (12 Feb 2011)
+
+  12 Feb 2011; Ryan Hill <dirtyepic@gentoo.org> -libopensync-0.39.ebuild,
+  +libopensync-0.39-r1.ebuild:
+  Revision bump, remove broken version.
+    - fix dependencies (bug #354407)
+    - use CMake native module for FindPythonLibs (bug #276220 with thanks
+	  to John W Eckhart)
+    - support multiabi python (bug #311763) and fix bindings getting built
+	  with USE="-python"
+    - drop test USE flag since tests are still restricted
+    - port to EAPI 3
 
   27 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   -libopensync-0.38.ebuild:
diff --git a/app-pda/libopensync/Manifest b/app-pda/libopensync/Manifest
index bea44bdd856d..7136fa3016a3 100644
--- a/app-pda/libopensync/Manifest
+++ b/app-pda/libopensync/Manifest
@@ -8,14 +8,14 @@ DIST libopensync-0.36.tar.bz2 879868 RMD160 8c4f2b6799c2767e53fc51f17ad95fcfb1e0
 DIST libopensync-0.39.tar.bz2 1146955 RMD160 2124c2d65d75811f021437383f3385df9c954328 SHA1 3d97732675aa874da49cca0f8d6de6f004f2a416 SHA256 078f5d1d29774a190679e7e65e587f34cd8b001f07ea8745f31eba3f07edc430
 EBUILD libopensync-0.22.ebuild 1964 RMD160 bcff66c58e974aef264bb0995edb6f4d47cba465 SHA1 4a0c7af8a6b12d710d37d4e98f1e1a24cc3e4adf SHA256 c87b557e25bbf00f6c6d138625689d2d2206981307fa7efaed8e70c355dc3fac
 EBUILD libopensync-0.36-r1.ebuild 1942 RMD160 aeee52ffb5944ed490dc230e2bb1a8b30bb9f9d2 SHA1 54a4486e44f5cf85234d7b0b71d9c395f164d4a5 SHA256 04e860af16b996bb9b3232c746e6a05f8f09b3e28a85ad23420bb1eef708c55d
-EBUILD libopensync-0.39.ebuild 1691 RMD160 7455947d59601483b38dcc248a271d527a33f37b SHA1 ff9f49bedfa2c26b895da130c2c1b45936e37186 SHA256 4d3226195cb8484f26fb6e9d49c4ed768e2a0cbe575e1a36bb6541ef47be8891
+EBUILD libopensync-0.39-r1.ebuild 2921 RMD160 abda57f9095ff2e30f2debfb4f8aaedfba7e2e22 SHA1 278b64cc83c1c86fb59445a06dacc369b533b9c6 SHA256 e6bb2e9bd6cfbee7f0fa20bc1130d070a5c7c361401d7c46d0bbbe26902067e9
 EBUILD libopensync-9999.ebuild 1661 RMD160 90086aa9f146442d8adf3540fce58b90737d1494 SHA1 63132519184093bf8f46aeaacd3facdf5b8d1372 SHA256 1e12077bb4ea873e81afb438b95cb6cd47615f4804f3c77e0b4a1c6a6a3230ef
-MISC ChangeLog 5507 RMD160 e022f8968a20d8aa2ef9c62dab7bb3962fb94931 SHA1 15f404cd07dd1d8eb02496d72426bc676c235280 SHA256 8f100b5c8c65af5a3c2b5dcc4398d67249c1d315ac6a839fb1a2bc5223119255
+MISC ChangeLog 5998 RMD160 b6a733e16055381512b674031da73fa1087a31ea SHA1 d0a3ea8bf1996df099884f4c412a6aa0f43be000 SHA256 c8a291d4523da58255ef3b92006af352efeebedfd0048e6b9da607831f62f2b7
 MISC metadata.xml 304 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 SHA1 b96c72c417192c099990a616b12a1d2f55a06064 SHA256 7fa8df0f64197f3f6c018ed0d6c4cc4da014fbcc9af2da9b633f71657470236a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyglxIACgkQAiZjviIA2XjMTgCfU6Suc9Afwqsvs8V6Ywwyz2YP
-u4IAnjJUNIWHON/LQCUDGponY+cNJqTo
-=qJUI
+iEYEARECAAYFAk1WBSMACgkQiqiDRvmkBmKHlQCgiOazf1bzotB5HRM0DVsi3bzQ
+IbIAnAsEXNBsQFbxHmXorLCTqGBmnKCS
+=tmA/
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libopensync/libopensync-0.39-r1.ebuild b/app-pda/libopensync/libopensync-0.39-r1.ebuild
new file mode 100644
index 000000000000..12468765201b
--- /dev/null
+++ b/app-pda/libopensync/libopensync-0.39-r1.ebuild
@@ -0,0 +1,126 @@
+# 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-0.39-r1.ebuild,v 1.1 2011/02/12 03:51:19 dirtyepic Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit cmake-utils python
+
+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 ~x86-fbsd"
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="doc python" # test
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.12:2
+	dev-libs/libxml2
+	dev-libs/libxslt"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	doc?	( app-doc/doxygen
+			  media-gfx/graphviz )
+	python?	( >=dev-lang/swig-1.3.17 )"
+#	test?	( >=dev-libs/check-0.9.2 )"
+
+# 14% tests passed, 275 tests failed out of 321
+RESTRICT="test"
+
+DOCS="AUTHORS CODING ChangeLog README"
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+#CMAKE_VERBOSE="1"
+
+src_prepare() {
+	# Has hardcoded python versions, use the module shipped with cmake 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_enable python WRAPPER)
+		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
+		$(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
+}
+
+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
+	fi
+}
+
+# TODO - fix
+src_test() {
+	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() {
+	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
+	}
+
+	use python \
+		&& python_execute_function -s do_install \
+		|| do_install
+
+	if use doc; then
+		cd "${CMAKE_BUILD_DIR}"
+		dohtml docs/html/* || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "For >=app-pda/libopensync-0.39 use app-pda/osynctool instead of"
+	einfo "the older app-pda/msynctool."
+}
diff --git a/app-pda/libopensync/libopensync-0.39.ebuild b/app-pda/libopensync/libopensync-0.39.ebuild
deleted file mode 100644
index 7d9343e2a0b5..000000000000
--- a/app-pda/libopensync/libopensync-0.39.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.39.ebuild,v 1.3 2010/05/23 20:38:01 bangert Exp $
-
-inherit cmake-utils
-
-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 ~x86-fbsd"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="doc python test"
-
-# 14% tests passed, 275 tests failed out of 321
-RESTRICT="test"
-
-RDEPEND=">=dev-db/sqlite-3
-	>=dev-libs/glib-2.12
-	dev-libs/libxml2
-	python? ( >=dev-lang/python-2.2 )"
-
-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 )"
-
-src_compile() {
-	DOCS="AUTHORS CODING ChangeLog README"
-
-	local mycmakeargs="
-		-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use_enable python WRAPPER)
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use test OPENSYNC_UNITTESTS)
-	"
-
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cmake-utils_src_make DoxygenDoc || die "Failed to generate docs."
-	fi
-}
-
-src_test() {
-	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 "${CMAKE_BUILD_DIR}"
-		dohtml docs/html/* || die "Failed to install docs."
-	fi
-}
-
-pkg_postinst() {
-	einfo "For >=app-pda/libopensync-0.39 use app-pda/osynctool instead of"
-	einfo "the older app-pda/msynctool."
-}