Fix building with libxml2-2.9.0 caused by an API change as announced on

https://mail.gnome.org/archives/xml/2012-August/msg00005.html
Fixes bug 448236. Thanks to Harris Landgarten for investigating the issue
and for submitting the patch.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

4 files changed, 101 insertions, 3 deletions

diff --git a/dev-libs/gdome2/ChangeLog b/dev-libs/gdome2/ChangeLog
index fb2f074460c8..417f4700f06a 100644
--- a/dev-libs/gdome2/ChangeLog
+++ b/dev-libs/gdome2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/gdome2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/ChangeLog,v 1.41 2012/05/10 15:49:36 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/ChangeLog,v 1.42 2013/01/02 02:59:39 jmbsvicetto Exp $
+
+*gdome2-0.8.1-r4 (02 Jan 2013)
+
+  02 Jan 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/gdome2-0.8.1-libxml2.patch, +gdome2-0.8.1-r4.ebuild:
+  Fix building with libxml2-2.9.0 caused by an API change as announced on
+  https://mail.gnome.org/archives/xml/2012-August/msg00005.html Fixes bug
+  448236. Thanks to Harris Landgarten for investigating the issue and for
+  submitting the patch.
 
   10 May 2012; Agostino Sarubbo <ago@gentoo.org> -gdome2-0.8.1-r2.ebuild:
   Remove old
diff --git a/dev-libs/gdome2/Manifest b/dev-libs/gdome2/Manifest
index e5c2e1a720b5..a6ec0c39d746 100644
--- a/dev-libs/gdome2/Manifest
+++ b/dev-libs/gdome2/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gdome2-0.8.1-docs-destdir.patch 276 SHA256 acfa17bc85299f8395ca8ed571cfb335eeac44224948c873880ed54e58d7b75c SHA512 825fb5f6f7a2ae9cf62371c2fd8af7019ac1546f7f84b58ddfc4f6d9df5a8b19fe183aa3f00af25715da3ea9748864c082598d04619720c92da1b74415069f8b WHIRLPOOL ea6633b93463e9fa08d836e305fb53b4ed103359b94e91a9cb3f2f1739e53dfe9d24412beddcc966b56f26247774d820f98b788fe085edc6002dfb6a4a3848ee
 AUX gdome2-0.8.1-gdome2-config.patch 417 SHA256 003d85ee32f236b6f68ae6606862decd995ecd32a94b1c496d0fcd8934d3390b SHA512 9900830273a472dbdbc7ad20484736489b547789047c3669d4749b78c513af4cb692b7c5cf31acfa194eeaad1ead7eb3652f4be5c167911083fd53e55f06849d WHIRLPOOL 383d98ee554fc5397c06b795d5db738721c340fed9945b5d15ee13b03cf3e268e48b3bc770cb10d2d85dff341ddaea1c6405a2d01787b2deb13c21ff3df86c57
+AUX gdome2-0.8.1-libxml2.patch 728 SHA256 9c7c1bf3ad05bc25b0a4b65971b37206cf02ee40e87cbd3df382a15f2d9913b1 SHA512 5e3bbd2cbdec34457874bd42def4974930d1d2e3db5092f74fc96b419a7db822aed823d313aee2f95546e97caaa0edb4a17eefc701d9e167973cb6761d31afae WHIRLPOOL 3456ae3e63e2832ef4fdb9805c8a1384623d7a7100471331694693fb8d1ee1e16e8caeb4a37e3e3c57c88ad07bb1524a68b8606cfe1b68a2931b4bb27be1cc34
 DIST gdome2-0.8.1.tar.gz 518965 SHA256 f4bb80a2ef8e5fd9397ab8aa36d059d0b32e98c4bcf185c7952a7e3874d1d543 SHA512 40d9cb9ade2db3c7a196ac30cf8d9f5b48da4990250c14a53db53280ee76870b9247e973e2f2da523807faed3333d7c0f854f9546860ffbda251c12f6d404da7 WHIRLPOOL 0c541ca41b01866a88936dfa795def83ed3ee3c65546af353cd863b2948624cd9cf394f7b95a267a54f5eeee436b1ff09c2fb1fb12167897f0e2d68f85df4036
 EBUILD gdome2-0.8.1-r3.ebuild 1131 SHA256 9da96619bed33c1ed32d03effc1b28bc6f93681ce3c74d6c66a938a7756e4a78 SHA512 f1a5a033b72b40bb30c31d2cc22a564b7360d716dd3ebb76cce65c3019e48fb819287eb2a2c9676723e2f0d02a3bce62fa3b77bc4c3625dcba1a65985846bfd5 WHIRLPOOL 0ff1e27f65bc4bd4e278213ab6e69516dc37e0b22d76dd2a235fa2764260b8cb344ab7bdc2973e34b880816b121e8f00c4a057d02365dec118ef81881cbc4021
-MISC ChangeLog 5044 SHA256 1696ba56d1bd75ffc05331f02ea10013a8f9b95c8b5e05e86f4ea679a2466b6f SHA512 1e19b8a6bf2d78ef9dce1ec471a94a6f6f11f7774ca9b2e7b90929e7db2d70fb3faa59e26b0dc4bc3d5e74ed4cb102a04f80a1c64d4dc8c29fabbbb01586dcea WHIRLPOOL 0eea6698472af9a7d5680e8eb9b0327d224fb01e336bdbfdb04a8a783c7a1be2e0857d6c43ef836442d6f78df99d2b6b032fa1b648cd81eef2097fcbdb35e9a3
+EBUILD gdome2-0.8.1-r4.ebuild 1230 SHA256 37b9fa24f4f03e9653367bdbc66217470cd2e40eb26b48eff4af6641931ebb05 SHA512 202f18857713a007db9b88951eb59a2832cf7dbc1c072c179c2ed21e95987e8b467179ae303269e65493a96a30baf70b8a4cabdabfd6f40fcb19bba70aae651e WHIRLPOOL 3843366399da3ec48a8d4bd6bead5d08a936ebf8d4cb575f722338830c67e6b6833a07d60be97a5398b739626b6491bd771dcbe4d04c1a5f9d596c175f5557f3
+MISC ChangeLog 5460 SHA256 696fb9899e8a52c881a53407785c6df9291b880a775ea91db99ea57caf26dd90 SHA512 260aaba587d516b62a74a746f9609973eac7e3b0fe5af826a57cda88573e3eacd40ce5293c657c42825ed77a295a47d0a570a42ec63be882cde8636c27bf1972 WHIRLPOOL 9a3e09ea8279227053949ba346aad49b1a48ce8c6e503e521eb7fba81b185650f64edee76b4cec1d973fb19d9da0a5e0f939df00d78e88ed9c2bcaa2929989e3
 MISC metadata.xml 268 SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb SHA512 8e365ead118785104bc7576a48a106346ef24f5b709349f8ca3d5fb9107a248d0f172e6898fb4ba4b2b7f84e6c8c7960578a2919e1a3692664cb808b16e6b2b2 WHIRLPOOL 255e754b42ff038b07a48321ced9fe6f8acdc99bb85873807b3e902517a1764dabc7152e5ca9ad4d83ab5dc9d3a611f79e6c066121be77aed3cad1b0f3587b73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ46JPAAoJEC8ZTXQF1qEP2t8QAIfD9m29wTOjcQg+5gYT26LL
+R+RW0ZNEimc9ygqAn4LBIkldNmgA2J5wZdCCkU1eIrhmzFORvjPcD2uf38fgTI9z
+a2hytGLcpXMj2ryNDtv5kSuvUBzpzQH47oI3Rtjtdw/ID1ArxsphpZuwl7qy+Yii
+xfqPYO29Bl3PlHKOPbyZjNA2PlFaGpx3mXsOMHIEoUsE3b2cJGfxOL67FdNa2jCd
+G/h/iWGd/OnA0Rlog/c0845SnbTKGQSDadVNXZf0QX1zO99wDryRcCuYHR8FLy8w
+L3no65zu8C/KBSpGrJv7s+2Sbf6SdWzWaiATkV3wp2aJMuDi7UreA33fzwhCmcOM
+28QW1sWqkl+jReqhLAauvVEhF+6snQRP4WrD8VO7rBgw8nq37wpzGJJR/2Rr8UFH
+PDmNZJ07kwwxHlhXe5YrYRAjErE/kdO7BKx4ZS4mhy3LA7bWrJC53w3VBwCJYek0
+AK1pgFQmU8ftyBdMTsk4dqxPcnP0ljT/81VEBC/Mo4PITBy3OMTFvcpfsVh2jmBz
+WK/l1ehaJdWP/Uct7hr2Nde0/5TP/LiH0CknwZ8uQxpRzVQBfy03BZ3pME0QwNnA
+i1cNKURgsm68ft5z9ddYhydTSmxwlDeG0IBVZzbyJM8bHeVL97TKBV3DhfwMX8R4
+YbdG36Fiqk85idid8yGq
+=92EW
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/gdome2/files/gdome2-0.8.1-libxml2.patch b/dev-libs/gdome2/files/gdome2-0.8.1-libxml2.patch
new file mode 100644
index 000000000000..bf493bc224ac
--- /dev/null
+++ b/dev-libs/gdome2/files/gdome2-0.8.1-libxml2.patch
@@ -0,0 +1,18 @@
+Patch by Harris Landgarten.
+
+The patch was submitted on bug 448236, following the announcement on
+https://mail.gnome.org/archives/xml/2012-August/msg00005.html
+--- libgdome/gdomecore/gdome-xml-documentt.c.orig	2003-07-13 06:47:54.000000000 -0400
++++ libgdome/gdomecore/gdome-xml-documentt.c	2012-12-23 08:57:23.000000000 -0500
+@@ -342,7 +342,11 @@
+ 	}
+ 	xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL);
+ 	xmlOutputBufferFlush(out_buff);
++#if LIBXML_VERSION < 20900
+ 	ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use);
++#else
++	ret = g_strndup (xmlBufContent(out_buff->buffer), xmlBufUse(out_buff->buffer));
++#endif
+ 	(void)xmlOutputBufferClose(out_buff);
+ 
+ 	return gdome_xml_str_mkref_own (ret);
diff --git a/dev-libs/gdome2/gdome2-0.8.1-r4.ebuild b/dev-libs/gdome2/gdome2-0.8.1-r4.ebuild
new file mode 100644
index 000000000000..82c22a19b658
--- /dev/null
+++ b/dev-libs/gdome2/gdome2-0.8.1-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/gdome2-0.8.1-r4.ebuild,v 1.1 2013/01/02 02:59:39 jmbsvicetto Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The DOM C library for the GNOME project"
+HOMEPAGE="http://gdome2.cs.unibo.it/"
+SRC_URI="http://gdome2.cs.unibo.it/tarball/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/glib-2.2.0
+	>=dev-libs/libxml2-2.4.26"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-static"
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README*"
+}
+
+src_prepare() {
+	# Fix broken GLIB_CONFIG in configure.in, see #114542
+	epatch "${FILESDIR}/${P}-gdome2-config.patch"
+
+	# make docs honor DESTDIR
+	epatch "${FILESDIR}/${P}-docs-destdir.patch"
+
+	# Fix build with libxml2-2.9.0 - bug 448236
+	epatch "${FILESDIR}/${P}-libxml2.patch"
+
+	# prevent gtk-fixxref from running (will cause sandbox violation)
+	sed -i -e 's:gtkdoc-fixxref:#gtkdoc-fixxref:' gtk-doc/Makefile* || die
+
+	eautoconf
+
+	gnome2_src_prepare
+}