Change libsoup to 2.4 slot, bug #280906.

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

4 files changed, 79 insertions, 6 deletions

diff --git a/app-pda/libsyncml/ChangeLog b/app-pda/libsyncml/ChangeLog
index 1faf0a01d51d..86e407c7789b 100644
--- a/app-pda/libsyncml/ChangeLog
+++ b/app-pda/libsyncml/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2009/09/27 00:25:19 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.16 2009/09/27 23:32:06 eva Exp $
+
+*libsyncml-0.5.2-r1 (27 Sep 2009)
+
+  27 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +libsyncml-0.5.2-r1.ebuild, libsyncml-9999.ebuild:
+  Change libsoup to 2.4 slot, bug #280906.
 
   27 Sep 2009; Mart Raudsepp <leio@gentoo.org> -libsyncml-0.4.5.ebuild,
   -libsyncml-0.4.6.ebuild, libsyncml-0.4.6-r1.ebuild:
diff --git a/app-pda/libsyncml/Manifest b/app-pda/libsyncml/Manifest
index 781980d652ca..42a2bfdd671b 100644
--- a/app-pda/libsyncml/Manifest
+++ b/app-pda/libsyncml/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libsyncml-0.4.6.tar.bz2 167876 RMD160 51b04d8a725f28d661ebdb7f5b27d6f3d217f38d SHA1 55c3b4cdb5b213cfd719f7d019e657f53cc38f34 SHA256 818740eb5df3cf7913ab7e7979874ccf403831744c89efa4ebaf74c7e2c090bc
 DIST libsyncml-0.5.2.tar.bz2 274369 RMD160 f1c983426f576090ce87485e5c695080069f1f04 SHA1 34e0b28e698be0d01f40e3fe7c0c37dd79904dbe SHA256 898505d57b7a93790e8b7554978873bcf77e5e7e8f03d28ecf8967a4c6ab75e2
 EBUILD libsyncml-0.4.6-r1.ebuild 2082 RMD160 71897e2a307770a6773519cdb65e5d25299d3cce SHA1 49d534052e70323a00832879e20074a6c37099ca SHA256 210f47046f24f2be09f4e4b69c04288321889e105bd1e7e4332ac24641841430
+EBUILD libsyncml-0.5.2-r1.ebuild 1625 RMD160 c601d6b2c40f58bb513ac13de014426ba8a1ee4c SHA1 85fc38ec8f45d427c2c43d0ee47b167bfec34cc0 SHA256 cb7ce0705dce40826c53c27be9e6502bcfee66ef218ac8006d1a097d96a10178
 EBUILD libsyncml-0.5.2.ebuild 1637 RMD160 ce8d37c5d4ac53f0d20c683cc7422c881eec62d6 SHA1 a10de22df878cf8673260ad3b16822acaad58390 SHA256 b57bc475a34b38407c042476b4be82256ff7111355eccc10c3cb56dc916d925a
-EBUILD libsyncml-9999.ebuild 2049 RMD160 0e4ed9c6281959cd844426e61c952da9cccaac7e SHA1 ee1e39e4ce0f03103a812a3a4361221f8a17aa16 SHA256 91ed5ab3a42a496eca4ba4287a42527ad3d0c57207f4dd8fea919b8585cbcd81
-MISC ChangeLog 2759 RMD160 2414fcbb2b199ffbb2f718c50f89e4cb6a1f0d42 SHA1 08cddda949766936f2abcb7614f3631cda190490 SHA256 4f54124a4f5f65cad786c1235d94309af386ed775ffcf34e6fc695d14e3dfd63
+EBUILD libsyncml-9999.ebuild 2039 RMD160 78cec5ca560d62451d57609bfd43401ccfabe589 SHA1 899926d61984a5960e6b2cafa67dd240ce0128a8 SHA256 2fb4f0599e7cb9202c723630d99dc2bd95443d8cb317a38f355e48fbae88b9a6
+MISC ChangeLog 2944 RMD160 9c5c8951e6993ccae74386153c7d8aab8bef6ed9 SHA1 d3a67cb147610838a40c72eee32985b411195cd0 SHA256 7afea0d856c2f5105bc876f4df90867eb6b9af6dee24fa5cfba96ab5b239267d
 MISC metadata.xml 364 RMD160 408b0b30de7d795baa419ced6e65315501ce6fdd SHA1 aa168c9eb3f715e5c07d77322a312da061d0b0d0 SHA256 790d641de2c481d0df4d90df39d003ab8c28806d0300b7833c2f1cb22b3242b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq/9fwACgkQ1fmVwcYIWAacdQCdF4YcBrduAD5K9gn3n4uuqvqy
+1usAn1P51bYR+B3BLke9sUKnUCWznDiN
+=L+hD
+-----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
new file mode 100644
index 000000000000..eada88661f2e
--- /dev/null
+++ b/app-pda/libsyncml/libsyncml-0.5.2-r1.ebuild
@@ -0,0 +1,56 @@
+# 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 $
+
+EAPI="2"
+
+inherit eutils 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="bluetooth debug doc http +obex"
+
+RDEPEND=">=dev-libs/glib-2.0
+	>=dev-libs/libwbxml-0.9.2
+	dev-libs/libxml2
+	http? ( net-libs/libsoup:2.4 )
+	obex? ( >=dev-libs/openobex-1.1 )
+	bluetooth? ( 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"
+
+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
+
+	if use bluetooth && ! 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
+}
+
+src_compile() {
+	local mycmakeargs="
+		$(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
+}
diff --git a/app-pda/libsyncml/libsyncml-9999.ebuild b/app-pda/libsyncml/libsyncml-9999.ebuild
index 53060873561c..3cf919615d9b 100644
--- a/app-pda/libsyncml/libsyncml-9999.ebuild
+++ b/app-pda/libsyncml/libsyncml-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/libsyncml/libsyncml-9999.ebuild,v 1.4 2008/02/03 23:27:19 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild,v 1.5 2009/09/27 23:32:06 eva Exp $
 
 EAPI="1"
 
@@ -20,7 +20,7 @@ IUSE="bluetooth +debug doc http +obex"
 RDEPEND=">=dev-libs/glib-2.0
 	>=dev-libs/libwbxml-0.9.2
 	dev-libs/libxml2
-	http? ( >=net-libs/libsoup-2.2.91:2.2 )
+	http? ( net-libs/libsoup:2.4 )
 	obex? ( >=dev-libs/openobex-1.1 )
 	bluetooth? ( net-wireless/bluez-libs )"
 DEPEND="${RDEPEND}