Version bump. Restrict tests in 0.39. Clean up 0.36 due to removed libsyncml-0.4.

(Portage version: 2.2_rc49/cvs/Linux x86_64)

3 files changed, 36 insertions, 32 deletions

diff --git a/app-pda/libopensync-plugin-syncml/ChangeLog b/app-pda/libopensync-plugin-syncml/ChangeLog
index e6cd2a73dd0f..cf84fd347c21 100644
--- a/app-pda/libopensync-plugin-syncml/ChangeLog
+++ b/app-pda/libopensync-plugin-syncml/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-pda/libopensync-plugin-syncml
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-syncml/ChangeLog,v 1.13 2009/09/19 16:11:42 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-syncml/ChangeLog,v 1.14 2009/11/15 22:31:27 eva Exp $
+
+*libopensync-plugin-syncml-0.39 (15 Nov 2009)
+
+  15 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libopensync-plugin-syncml-0.36.ebuild,
+  +libopensync-plugin-syncml-0.39.ebuild,
+  libopensync-plugin-syncml-9999.ebuild:
+  Version bump. Restrict tests in 0.39. Clean up 0.36 due to removed
+  libsyncml-0.4.
 
   19 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
   -libopensync-plugin-syncml-0.21.ebuild,
diff --git a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.36.ebuild b/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.39.ebuild
index c629826ae883..b96218463a69 100644
--- a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.36.ebuild
+++ b/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.39.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.36.ebuild,v 1.3 2009/09/19 16:06:06 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.39.ebuild,v 1.1 2009/11/15 22:31:27 eva Exp $
 
 EAPI="2"
 
-inherit eutils cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="OpenSync SyncML Plugin"
 HOMEPAGE="http://www.opensync.org/"
@@ -15,9 +15,14 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="http +obex"
 
-DEPEND="=app-pda/libopensync-${PV}*
-	~app-pda/libsyncml-0.4.6[obex?,http?]"
-RDEPEND="${DEPEND}"
+RDEPEND="=app-pda/libopensync-${PV}*
+	dev-libs/glib:2
+	dev-libs/libxml2
+	>=app-pda/libsyncml-0.5.0[obex?,http?]"
+DEPEND="${RDEPEND}"
+
+# FIXME: % tests passed, 2 tests failed out of 2
+RESTRICT="test"
 
 pkg_setup() {
 	if ! use obex && ! use http; then
@@ -28,6 +33,8 @@ pkg_setup() {
 }
 
 src_configure() {
+	DOCS="AUTHORS"
+
 	local mycmakeargs="
 		$(cmake-utils_use_enable http HTTP)
 		$(cmake-utils_use_enable obex OBEX)"
diff --git a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-9999.ebuild b/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-9999.ebuild
index 5c9f74d664c9..ffd2e229f51a 100644
--- a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-9999.ebuild
+++ b/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-9999.ebuild
@@ -1,10 +1,10 @@
-# 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-plugin-syncml/libopensync-plugin-syncml-9999.ebuild,v 1.2 2007/12/07 16:34:57 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-9999.ebuild,v 1.3 2009/11/15 22:31:27 eva Exp $
 
-EAPI="1"
+EAPI="2"
 
-inherit eutils cmake-utils subversion
+inherit cmake-utils subversion
 
 DESCRIPTION="OpenSync SyncML Plugin"
 HOMEPAGE="http://www.opensync.org/"
@@ -12,14 +12,16 @@ SRC_URI=""
 
 ESVN_REPO_URI="http://svn.opensync.org/plugins/syncml"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="http +obex"
 
-DEPEND="=app-pda/libopensync-${PV}*
-	>=app-pda/libsyncml-0.4.3"
-RDEPEND="${DEPEND}"
+RDEPEND="=app-pda/libopensync-${PV}*
+	dev-libs/glib:2
+	dev-libs/libxml2
+	>=app-pda/libsyncml-0.5.0[obex?,http?]"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	if ! use obex && ! use http; then
@@ -27,28 +29,14 @@ pkg_setup() {
 		eerror "Please enable \"obex\" or/and \"http\" USE flags."
 		die "Please enable \"obex\" or/and \"http\" USE flags."
 	fi
-
-	if use obex && ! built_with_use app-pda/libsyncml obex; then
-		eerror "You are trying to build ${CATEGORY}/${P} with the \"obex\""
-		eerror "USE flags, but app-pda/libsyncml was built without"
-		eerror "the \"obex\" USE flag."
-		eerror "Please rebuild app-pda/libsyncml with \"obex\" USE flag."
-		die "Please rebuild app-pda/libsyncml with \"obex\" USE flag."
-	fi
-
-	if use http && ! built_with_use app-pda/libsyncml http; then
-		eerror "You are trying to build ${CATEGORY}/${P} with the \"http\""
-		eerror "USE flags, but app-pda/libsyncml was built without"
-		eerror "the \"http\" USE flag."
-		eerror "Please rebuild app-pda/libsyncml with \"http\" USE flag."
-		die "Please rebuild app-pda/libsyncml with \"http\" USE flag."
-	fi
 }
 
-src_compile() {
+src_configure() {
+	DOCS="AUTHORS"
+
 	local mycmakeargs="
 		$(cmake-utils_use_enable http HTTP)
 		$(cmake-utils_use_enable obex OBEX)"
 
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 }