Fix building with >=dev-libs/libwbxml-0.11.0 by using #include <wbxml/wbxml.h> instead of #include <wbxml.h> wrt #425738 by Diego Elio Pettenò

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 53 insertions, 33 deletions

diff --git a/app-pda/libsyncml/ChangeLog b/app-pda/libsyncml/ChangeLog
index dfea00ffcbf4..8bfa15b7b4cb 100644
--- a/app-pda/libsyncml/ChangeLog
+++ b/app-pda/libsyncml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/libsyncml
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.20 2012/05/03 20:20:59 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.21 2014/06/22 11:44:01 ssuominen Exp $
+
+  22 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> libsyncml-0.5.4.ebuild,
+  libsyncml-9999.ebuild:
+  Fix building with >=dev-libs/libwbxml-0.11.0 by using #include <wbxml/wbxml.h>
+  instead of #include <wbxml.h> wrt #425738 by Diego Elio Pettenò
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> libsyncml-0.5.4.ebuild,
   libsyncml-9999.ebuild:
@@ -109,4 +114,3 @@
   13 Nov 2006; Piotr Jaroszyński <peper@gentoo.org> +metadata.xml,
   +libsyncml-0.4.2.ebuild:
   New package.
-
diff --git a/app-pda/libsyncml/Manifest b/app-pda/libsyncml/Manifest
index 8ed7dac9494b..5587e68bf20b 100644
--- a/app-pda/libsyncml/Manifest
+++ b/app-pda/libsyncml/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST libsyncml-0.5.4.tar.bz2 289488 SHA256 5ee4c48923ae78489fd13a4329d6a86bcb020bb777f9bc1b35d152f197b748ff SHA512 aed0821d01eaaa3fef69d559820875591d3837b3968be24293fc41924b3599a2810d2b4cc29f82e6f4058a212eae5f71021bd96a046b568e7cb1a036ba8f37aa WHIRLPOOL f036a5bf991ed76fe66c709bcb5ac3cc9f974d91b2b2fcdba3fc21fbab6c7a9b69ce5675c6a65ccc73261e0ec3c732a8c4124a8764e656a288385f9847112fe6
-EBUILD libsyncml-0.5.4.ebuild 1698 SHA256 33be62c8d92895f1ee233fa62bc43f56e035940ad303b60ac2893bea675a1c0d SHA512 c5988dd94a9d77b897e3c9c90ddbf5eeecfa17b16d743166a61a351ebca5c9792fccc8613580e6904adfb4a07aa07d1c315c9104af852421f80a8eb60443fd78 WHIRLPOOL 7c17f320266bfee44c9b2beb466d910e52b597b89e71af5b81e88dc3b9629a2d1f4fc89ed1712a2b55787189b99c2a27a889421ae7443e5010c0f76ef28dbe8c
-EBUILD libsyncml-9999.ebuild 1571 SHA256 913d297a73b980a35868bb47f162aa8ba89db8c847105d72dd448e5186b3715e SHA512 61d81928cb626d36a8c41860664e589af263672f11422650c6c17272f5319f60949b979c3b35fa03e9e4a1ab3fa93ecc5bbc6d3c507f8caccc9c9729064c5f2f WHIRLPOOL 53f71f9f98bfecadde3f8ae867165a1c8d2a9a9b1c75fa8c49e2bcd810d06c48270182f4fd381e012aaecd231db13189ddf466e8e4fc87114142d44da6c5e4a5
-MISC ChangeLog 3802 SHA256 6e0904694ea2e7cd90ff9d95fb64ead707921aa1251b1fc6c503dbed10410f2d SHA512 4660161957f7abaa3401f2804b2c018b87a5c43022df13c2bd6a69381cefe64a944416096845461b4223b760c7ffcdf91628d02b43151383f75399304f2c7db7 WHIRLPOOL 8d27fa9c054c79574e13d1f1747983f97e4f6f8e6515ea23b83096c11ce188509739d9f16ceff4423d21ad18d89fc62440d24534918ed681be39c723c27dc234
+EBUILD libsyncml-0.5.4.ebuild 1655 SHA256 39e2fcb39a71fa0efe46d791011adb9523f32a51e8310a1e434331ae9c08e35a SHA512 9c3e810d142953d9271a7bd13ba9e9dc04bdb361bbc1286fd7ad385c8d850f79d3a107201abb9f50a4ae775ef274be5fec2c85a6a6b26476566bba05a27a3266 WHIRLPOOL 5714a5181ed9568fa1065f7f65e5baad28d581d1e17406d315acbadc5aa44cc3d950c8285d6b3befef7a8ecb9697577ab3e43ca435455ed5aa88a224dc190303
+EBUILD libsyncml-9999.ebuild 1540 SHA256 1aaf2af238ab9046626d97016483c25b66c4e378b067719c0c449ad2a6d66647 SHA512 3cb495a092b30fb27a1ba39dcb59c79a8130c429b836c11634901ea2c06f5b2d9e772e82547e3595c7e128857a92320ede719cc435264d72921311c55a3874e6 WHIRLPOOL 5cc0875a6c1d348562fb497b812886d584e0d4fdcd308a37a0a0cd9709bfc45d88fd2e2de197b61c6eebaa125f58c5fca7526a08fe9ce98dbb895f7449bd67c0
+MISC ChangeLog 4056 SHA256 17dfd054123d17bda9494e7fddf091978ba09a89ff8121fba98043240166b014 SHA512 4bbc786cc64f2a34cd75e10dae9730e458a6c4c2d919e081fac2a57668b61d8976570cc0e217e033c460e2b423a5bf10b6fe5116a02c8ad606587d8602a458aa WHIRLPOOL 6ed4fa84a2a59dfc630fb93eab52a8d264b0489ae70ddadf6df156321d1ada55268f2e1ed83cbbe2aef03e8770062f782704dd70bda95e5dffb658a752a844d6
 MISC metadata.xml 279 SHA256 2f14fb6aa027baf69d9e5c726022c7fa0581b3c086573e76c7072c721f23b4d2 SHA512 8a5ddb6f85975911e27e4c6dfd4038f4d925a715102bd9229cb68135a85cabffa67d4a30130544862a2f5128f60c21a87ce021129cf2993a6e660a21815ccef2 WHIRLPOOL e271221210b6293f0e921bb3b943d06bd351edb38a1d3260e8099e17b2a6f31555ec7687df4d061f2c854ffc1d7d55fb322af0d2f1c0ce3262b446bb3bb93300
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTpsCtAAoJEEdUh39IaPFNuEQH/jF5K1Coj9q9XZepJLPyOK43
+j4BXfC3T+PQm8ec1TEBSCxzepG3Majf73By14HCVLWZbe2ZfSjSwdY2r4lckhtNg
+XaqsTGZ1VIJppBBxuFAjoLcmwVsZTmeXVZqNT6z1DssF7XV80TxOz4xJjzxsSZ41
+79nDnAzMezwN3JP50J/aVUokn5e8SCXoctVCoPbBw/Wj64/SZf5t5ISXKQ9+Vm0I
+z/pebSeQdV3zXvKevVWcF1Ne1njfRm6zsCnYD/SQLmFxElEPKO4D5SfY89z2hFMD
+B71FlHvgnwBhpklqWrQj2NgCy7J/q/91blcCWZajDtmFO3RewQNDj8S5ZyHYdCc=
+=w0Hd
+-----END PGP SIGNATURE-----
diff --git a/app-pda/libsyncml/libsyncml-0.5.4.ebuild b/app-pda/libsyncml/libsyncml-0.5.4.ebuild
index 85b1f36cdbdd..bab756754450 100644
--- a/app-pda/libsyncml/libsyncml-0.5.4.ebuild
+++ b/app-pda/libsyncml/libsyncml-0.5.4.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.3 2012/05/03 20:20:59 jdhore Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild,v 1.4 2014/06/22 11:44:01 ssuominen Exp $
 
+EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="Implementation of the SyncML protocol"
@@ -30,29 +29,31 @@ DEPEND="${RDEPEND}
 	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
+REQUIRED_USE="|| ( http obex )"
+
+DOCS="AUTHORS CODING ChangeLog RELEASE"
 
-	DOCS="AUTHORS CODING ChangeLog RELEASE"
+src_prepare() {
+	# http://bugs.gentoo.org/425738
+	sed -i \
+		-e '/include/s:wbxml.h:wbxml/&:' \
+		libsyncml/parser/sml_wbxml_internals.h tests/mobiles/obex_mobile_ds_client.c || die
 }
 
 src_configure() {
-	local mycmakeargs="
+	local mycmakeargs=(
 		-DHAVE_LIBSOUP22=OFF
 		-DDOC_INSTALL_DIR=/usr/share/doc/${PF}
 		$(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_use_enable test UNIT_TEST)
+	)
 
 	if use http && use obex; then
 		# Doc builds with those previous USE flags only
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_build doc DOCUMENTATION)"
+		mycmakeargs+=( $(cmake-utils_use_build doc DOCUMENTATION) )
 	fi
 
 	cmake-utils_src_configure
diff --git a/app-pda/libsyncml/libsyncml-9999.ebuild b/app-pda/libsyncml/libsyncml-9999.ebuild
index a83bd4b3ee47..d517c1d37bb4 100644
--- a/app-pda/libsyncml/libsyncml-9999.ebuild
+++ b/app-pda/libsyncml/libsyncml-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.7 2012/05/03 20:20:59 jdhore Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild,v 1.8 2014/06/22 11:44:01 ssuominen Exp $
 
+EAPI=5
 inherit cmake-utils subversion
 
 DESCRIPTION="Implementation of the SyncML protocol"
@@ -32,25 +31,27 @@ DEPEND="${RDEPEND}
 	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
+REQUIRED_USE="|| ( http obex )"
+
+DOCS="AUTHORS CODING ChangeLog RELEASE"
 
-	DOCS="AUTHORS CODING ChangeLog RELEASE"
+src_prepare() {
+	# http://bugs.gentoo.org/425738
+	sed -i \
+		-e '/include/s:wbxml.h:wbxml/&:' \
+		libsyncml/parser/sml_wbxml_internals.h tests/mobiles/obex_mobile_ds_client.c || die
 }
 
 src_configure() {
-	local mycmakeargs="
+	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_use_enable test UNIT_TEST)
+	)
 
 	cmake-utils_src_configure
 }