Version bump, bug #278256. Remove test restrictions since they pass fine now. Fix build issues in live ebuild, bug #274005. Restore doc useflag functionality, bug #266320. Always enable obex with bluetooth, bug #285040.

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

5 files changed, 101 insertions, 43 deletions

diff --git a/app-pda/libsyncml/ChangeLog b/app-pda/libsyncml/ChangeLog
index d9318099e530..8f442167ac37 100644
--- a/app-pda/libsyncml/ChangeLog
+++ b/app-pda/libsyncml/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-pda/libsyncml
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.17 2009/11/07 23:45:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.18 2009/11/15 21:14:28 eva Exp $
+
+*libsyncml-0.5.4 (15 Nov 2009)
+
+  15 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  libsyncml-0.5.2-r1.ebuild, +libsyncml-0.5.4.ebuild, libsyncml-9999.ebuild:
+  Version bump, bug #278256. Remove test restrictions since they pass fine now.
+    * Fix build issues in live ebuild, bug #274005.
+    * Restore doc useflag functionality, bug #266320.
+    * Always enable obex with bluetooth, bug #285040.
 
   07 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -libsyncml-0.4.6-r1.ebuild, -libsyncml-0.5.2.ebuild:
diff --git a/app-pda/libsyncml/Manifest b/app-pda/libsyncml/Manifest
index 45f8919af48d..2b526b1e6764 100644
--- a/app-pda/libsyncml/Manifest
+++ b/app-pda/libsyncml/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 DIST libsyncml-0.5.2.tar.bz2 274369 RMD160 f1c983426f576090ce87485e5c695080069f1f04 SHA1 34e0b28e698be0d01f40e3fe7c0c37dd79904dbe SHA256 898505d57b7a93790e8b7554978873bcf77e5e7e8f03d28ecf8967a4c6ab75e2
-EBUILD libsyncml-0.5.2-r1.ebuild 1625 RMD160 c601d6b2c40f58bb513ac13de014426ba8a1ee4c SHA1 85fc38ec8f45d427c2c43d0ee47b167bfec34cc0 SHA256 cb7ce0705dce40826c53c27be9e6502bcfee66ef218ac8006d1a097d96a10178
-EBUILD libsyncml-9999.ebuild 2039 RMD160 78cec5ca560d62451d57609bfd43401ccfabe589 SHA1 899926d61984a5960e6b2cafa67dd240ce0128a8 SHA256 2fb4f0599e7cb9202c723630d99dc2bd95443d8cb317a38f355e48fbae88b9a6
-MISC ChangeLog 3093 RMD160 0d20f4b2e4b35dfef216e0e8244ca6cff7240da0 SHA1 435a473844e91bea7e699dcd7f80afa2181e0a8a SHA256 bad35c0b8a0b8ed92a5a1cc21c101e7fe37008fab064e9872d2b43f0fd045f64
+DIST libsyncml-0.5.4.tar.bz2 289488 RMD160 249bd42df78e961e11b3a96713fb63ab74898780 SHA1 1e79d5d65557b5cf40bfa5a10442800ce2fbe7a7 SHA256 5ee4c48923ae78489fd13a4329d6a86bcb020bb777f9bc1b35d152f197b748ff
+EBUILD libsyncml-0.5.2-r1.ebuild 1692 RMD160 b5adece11f5b5aa73f558a2adb3acf276c7574d0 SHA1 a280e08a96431bdd7fedc97445b68765c6cd37ee SHA256 b88c372a906898bf2c7bd041c75978bb5c31400c9538919e0c1a4b69b4ec496a
+EBUILD libsyncml-0.5.4.ebuild 1540 RMD160 73ca3c112c07c5960df794bf6642b2c518964a49 SHA1 dcf7a59199ff060e2568c2d0ed1dc9fb14253c43 SHA256 5abb09cc0dfd4a93b0e13c0a4f9c2ea0f6ea1a6d721fd1d8001882fb0662d983
+EBUILD libsyncml-9999.ebuild 1569 RMD160 e4c840b3cad3d4ddb426e33816e644a2d283e146 SHA1 ead824dba7171110e04566d753709e98af939a62 SHA256 d0ece05d66884b2b7152350931421516f2991ae6b6ff165a14560b07a208e4ea
+MISC ChangeLog 3497 RMD160 5b84204f5f977ea86979a875529edce3e7b92986 SHA1 57f6b316b2c23f4ffd8e59a20f7199f424f1b9e5 SHA256 54b7a6064bfbbb3d3b2515da2f0f90f36a5bca77fe7e2c17fada541c6d1668c4
 MISC metadata.xml 364 RMD160 408b0b30de7d795baa419ced6e65315501ce6fdd SHA1 aa168c9eb3f715e5c07d77322a312da061d0b0d0 SHA256 790d641de2c481d0df4d90df39d003ab8c28806d0300b7833c2f1cb22b3242b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkr2BoMACgkQ1fmVwcYIWAaW+gCeJ24i3vDsbswPRKgTiqKRL/en
-rOIAoKUO8gHSPvmxjNoXI1+lil58tNfD
-=uxRv
+iEYEARECAAYFAksAbzoACgkQ1fmVwcYIWAaZBwCgmEd1lMhVmWxf2DHReIQjnaWE
+GjkAn2ely4BCVI2ciQlxVRZ2tlxcHi+I
+=yhL/
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libsyncml/libsyncml-0.5.2-r1.ebuild b/app-pda/libsyncml/libsyncml-0.5.2-r1.ebuild
index eada88661f2e..9007e83a3e9e 100644
--- a/app-pda/libsyncml/libsyncml-0.5.2-r1.ebuild
+++ b/app-pda/libsyncml/libsyncml-0.5.2-r1.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/libsyncml/libsyncml-0.5.2-r1.ebuild,v 1.1 2009/09/27 23:32:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.2-r1.ebuild,v 1.2 2009/11/15 21:14:28 eva Exp $
 
 EAPI="2"
 
-inherit eutils cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="Implementation of the SyncML protocol"
 HOMEPAGE="http://libsyncml.opensync.org/"
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="bluetooth debug doc http +obex"
 
+# libsoup:2.2 is forced off to avoid automagic
 RDEPEND=">=dev-libs/glib-2.0
 	>=dev-libs/libwbxml-0.9.2
 	dev-libs/libxml2
@@ -45,12 +46,13 @@ pkg_setup() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	local mycmakeargs="
+		-DHAVE_LIBSOUP22=OFF
 		$(cmake-utils_use_enable http HTTP)
 		$(cmake-utils_use_enable obex OBEX)
 		$(cmake-utils_use_enable bluetooth BLUETOOTH)
 		$(cmake-utils_use_enable debug TRACE)"
 
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 }
diff --git a/app-pda/libsyncml/libsyncml-0.5.4.ebuild b/app-pda/libsyncml/libsyncml-0.5.4.ebuild
new file mode 100644
index 000000000000..b120d917ed9f
--- /dev/null
+++ b/app-pda/libsyncml/libsyncml-0.5.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild,v 1.1 2009/11/15 21:14:28 eva Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="Implementation of the SyncML protocol"
+HOMEPAGE="http://libsyncml.opensync.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="debug doc http +obex test"
+
+# bluetooth and obex merged because bluetooth support in obex backend is
+# automagic, bug #285040
+# libsoup:2.2 is forced off to avoid automagic
+RDEPEND=">=dev-libs/glib-2.12
+	>=dev-libs/libwbxml-0.10
+	dev-libs/libxml2
+	http? ( net-libs/libsoup:2.4 )
+	obex? (
+		net-wireless/bluez
+		>=dev-libs/openobex-1.1[bluetooth] )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-libs/check-0.9.7 )"
+
+pkg_setup() {
+	if ! use obex && ! use http; then
+		eerror "${CATEGORY}/${P} without support for obex nor http is unusable."
+		eerror "Please enable \"obex\" or/and \"http\" USE flags."
+		die "Please enable \"obex\" or/and \"http\" USE flags."
+	fi
+
+	DOCS="AUTHORS CODING ChangeLog RELEASE"
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DHAVE_LIBSOUP22=OFF
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use_enable debug TRACE)
+		$(cmake-utils_use_enable http HTTP)
+		$(cmake-utils_use_enable obex OBEX)
+		$(cmake-utils_use_enable obex BLUETOOTH)
+		$(cmake-utils_use_enable test UNIT_TEST)"
+
+	cmake-utils_src_configure
+}
diff --git a/app-pda/libsyncml/libsyncml-9999.ebuild b/app-pda/libsyncml/libsyncml-9999.ebuild
index 3cf919615d9b..9fcbb934a7bd 100644
--- a/app-pda/libsyncml/libsyncml-9999.ebuild
+++ b/app-pda/libsyncml/libsyncml-9999.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/libsyncml/libsyncml-9999.ebuild,v 1.5 2009/09/27 23:32:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild,v 1.6 2009/11/15 21:14:28 eva Exp $
 
-EAPI="1"
+EAPI="2"
 
-inherit eutils subversion cmake-utils
+inherit cmake-utils subversion
 
 DESCRIPTION="Implementation of the SyncML protocol"
 HOMEPAGE="http://libsyncml.opensync.org/"
@@ -12,23 +12,25 @@ SRC_URI=""
 
 ESVN_REPO_URI="http://svn.opensync.org/libsyncml/trunk"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="bluetooth +debug doc http +obex"
+IUSE="+debug doc http +obex test"
 
-RDEPEND=">=dev-libs/glib-2.0
-	>=dev-libs/libwbxml-0.9.2
+# bluetooth and obex merged because bluetooth support in obex backend is
+# automagic, bug #285040
+# libsoup:2.2 is forced off to avoid automagic
+RDEPEND=">=dev-libs/glib-2.12
+	>=dev-libs/libwbxml-0.10
 	dev-libs/libxml2
 	http? ( net-libs/libsoup:2.4 )
-	obex? ( >=dev-libs/openobex-1.1 )
-	bluetooth? ( net-wireless/bluez-libs )"
+	obex? (
+		net-wireless/bluez
+		>=dev-libs/openobex-1.1[bluetooth] )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# Some of the tests are broken
-RESTRICT="test"
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-libs/check-0.9.7 )"
 
 pkg_setup() {
 	if ! use obex && ! use http; then
@@ -37,29 +39,18 @@ pkg_setup() {
 		die "Please enable \"obex\" or/and \"http\" USE flags."
 	fi
 
-	if use bluetooth; then
-		if use obex && ! built_with_use dev-libs/openobex bluetooth; then
-			eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
-			eerror "and \"obex\" USE flags, but dev-libs/openobex was built without"
-			eerror "the \"bluetooth\" USE flag."
-			eerror "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-			die "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-		elif ! use obex; then
-			eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
-			eerror "USE flag, but you didn't enable the \"obex\" flag, which is"
-			eerror "needed for bluetooth support."
-			eerror "Please enable \"obex\" USE flag."
-			die "Please enable \"obex\" USE flag."
-		fi
-	fi
+	DOCS="AUTHORS CODING ChangeLog RELEASE"
 }
 
-src_compile() {
+src_configure() {
 	local mycmakeargs="
+		-DHAVE_LIBSOUP22=OFF
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use_enable debug TRACE)
 		$(cmake-utils_use_enable http HTTP)
 		$(cmake-utils_use_enable obex OBEX)
-		$(cmake-utils_use_enable bluetooth BLUETOOTH)
-		$(cmake-utils_use_enable debug TRACE)"
+		$(cmake-utils_use_enable obex BLUETOOTH)
+		$(cmake-utils_use_enable test UNIT_TEST)"
 
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 }