Fix glib-2.32 compilation, bug #412727 by Anton Kochkov. Drop old.

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

6 files changed, 36 insertions, 136 deletions

diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 43d919f87f16..152df6dadb8e 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/loudmouth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.105 2012/03/06 22:01:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.106 2012/04/20 18:11:01 pacho Exp $
+
+  20 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/loudmouth-1.4.3-glib-2.32.patch, -loudmouth-1.4.3-r1.ebuild,
+  -loudmouth-1.4.3.ebuild, loudmouth-1.4.3-r2.ebuild:
+  Fix glib-2.32 compilation, bug #412727 by Anton Kochkov. Drop old.
 
   06 Mar 2012; Brent Baude <ranger@gentoo.org> loudmouth-1.4.3-r2.ebuild:
   Marking loudmouth-1.4.3-r2 ppc64 for bug 393169
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 7e67936055e1..ca2a29f6136c 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,15 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX loudmouth-1.4.3-async-fix.patch 971 RMD160 f4287b8c87187e614e646cfa7d111578d505d3d4 SHA1 c7edd56ee0b60524e1cdd3c7d1971e9773024e7e SHA256 3d5bf6f38c0f6bfff1e3f1ac2dc3becac55e48f44760c7296a230658b2f8dd65
 AUX loudmouth-1.4.3-asyncns-system.patch 2597 RMD160 5e93e7e1bd1971f6f2f343d85a7866c7af063811 SHA1 7916119f99f4301413c8771a35db22d4ff3084b6 SHA256 80c853318b7e7111682128361acace88b496fa4b5b360d618762eb8aec1bde09
 AUX loudmouth-1.4.3-drop-stanzas-on-fail.patch 1413 RMD160 b3f2f17ef410507ca04379160bf1aa3c94620def SHA1 6da9ef9e9dd472956ab6ca3335e033bdbcb632a5 SHA256 9bc2a0e7bf84c904f78e5d8ddf06a2c61214bae935ae3e498a690945040394d0
 AUX loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch 794 RMD160 811c552ebce72853133b2dbad5bd7ffc49f13f60 SHA1 c38f70d5b9d4fa66520cab9350e6a8d51efd76df SHA256 d5aadd091a826597e8f9bdbe413de70093f92aa734c7888840f7314de7dae978
 AUX loudmouth-1.4.3-free-before-closed.patch 4536 RMD160 8bdd960b07095b192d5e632dd0c8f61c9a6e3c07 SHA1 bd525c2b0f6bcf891e6338be8726b5e037abc27e SHA256 04330ca3dc6619eed8017eef8604ec10e28e199e0dc02be2943fd48de7d1c568
+AUX loudmouth-1.4.3-glib-2.32.patch 320 RMD160 be12923d39abf91c3de6e0654dc0940744564d56 SHA1 32ca56d9aa8c101d24263db3eb9d705fc23e80ab SHA256 def4b793893dcbd25359dfb39d3757ab3279b56d026aa713a829e477bb351f83
 AUX loudmouth-1.4.3-gnutls28.patch 703 RMD160 efd8db33c1bedc818ae2c6aef5cd94d8c4cebd03 SHA1 18c45db10cd3a4f185b73d84f97d9f75f88a7784 SHA256 6b74102efa1673fd57fbad52682cd002e4676768c5a8eb49c489f5618727b275
 AUX loudmouth-1.4.3-id-tag-in-opening-headers.patch 1144 RMD160 e105e7370efd5c8f6b0f96ec76602ae8fab82a9b SHA1 c9d3038febdc8a286540b9e19718f145ca7773b4 SHA256 02ae7062fa8bd5dc0ce21b973b8f3d25d04740c9dd8952e46d4200bfe393f13f
 AUX loudmouth-1.4.3-invalid-unicode.patch 4085 RMD160 6d775af51d6de94dc60561de77d0a2892d7f4a3c SHA1 2b981b7695bb3f9e68ab603e6cf2c9fcd353f8e2 SHA256 1dd5eb99c8ce01ed98b0c01bb3b5494a84ac9382f0687669755ee40b0ffdbc0e
 AUX loudmouth-1.4.3-silence-chdir.patch 891 RMD160 e7bfa5b21535ed5614f15eb4736c05e1763c7845 SHA1 2d5c41f2d261051f7f310e2a257c3201eb163b13 SHA256 663edc91b0a0e996d665334c132df7f7003033ded5e52e29461601eccc5ffdd0
 DIST loudmouth-1.4.3.tar.bz2 366818 RMD160 59852d085f73d68b3c061b7192a484527843e67d SHA1 55dd0475760f98ff0ba1f5c712c52ab776b432be SHA256 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3
-EBUILD loudmouth-1.4.3-r1.ebuild 1815 RMD160 0a494853ee7a80af90c028be39110635b1e40277 SHA1 5b418f75d605a99240dafd67002b49a53a977438 SHA256 64ab0eafab6f281feea7e74cab6dd7af8bebfe944d1c82e9a509f93a78795ba6
-EBUILD loudmouth-1.4.3-r2.ebuild 2408 RMD160 b339c6acf4a8ecae480bd6e27bfbfe9c40e4b70a SHA1 07520121eaab758ae60006d700657e3130377f8e SHA256 13057624341be0ff02d9dadc6a7c416a369b4e50e8b2875bd9b0c1e2b1682d16
-EBUILD loudmouth-1.4.3.ebuild 1313 RMD160 82c9b348f87251a2202f791fec4c92c50ae6040e SHA1 0d4e6e56287b3c3aad60382855bb56f07e64c675 SHA256 fe7927f9bed15a39daac0c4fbb9efc5f3bfd6dac1826ca2d2d0829a14c108e04
-MISC ChangeLog 14185 RMD160 0539208feae45568231c48718390232ca6c3c09e SHA1 819672fd77b717b7caa629d538690af7800b7a8f SHA256 587c615b519402f8c96049fa13d42db4e8d0c78f73011f6995359ab16361d87f
+EBUILD loudmouth-1.4.3-r2.ebuild 2450 RMD160 291c0a063812c8103ac90fffb1f092826268adef SHA1 c581fca8ad0657e92bd7f47c7870492df0594a5b SHA256 3daaaecdd8ec59c730774a449a1afb8d4adb8b7e1d107711fdc1178f87b53fbb
+MISC ChangeLog 14424 RMD160 ef815200bfa726e94f5dfc2753e07ec16dceec82 SHA1 5e5bf7e330e2133faa06af747b68fe6dfb379263 SHA256 7c880a73243281ba084e5157d5b26ca2d49f0a7a0aee03b0f774ca65f66ba614
 MISC metadata.xml 258 RMD160 85cf4588f19fabaeb6fe13f58c6ae1fb6e51e798 SHA1 bced822ded5aef8c673d7e65f1cdc727fe3711c4 SHA256 0db8d15e4fd277e63ff3200516092f2cc3ab46da07da76e5e7baf37937a734c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk+RproACgkQCaWpQKGI+9QpQgCcDYKr//21xIXtdlss/JBMPktq
+xRoAnjtxo6E8wDrciC/HptTkkMaanSgY
+=Xu0C
+-----END PGP SIGNATURE-----
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-glib-2.32.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-glib-2.32.patch
new file mode 100644
index 000000000000..87fc170c80da
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-glib-2.32.patch
@@ -0,0 +1,13 @@
+Index: loudmouth-1.4.3/loudmouth/lm-error.c
+===================================================================
+--- loudmouth-1.4.3.orig/loudmouth/lm-error.c
++++ loudmouth-1.4.3/loudmouth/lm-error.c
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include <config.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include "lm-error.h"
+ 
+ /**
diff --git a/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
deleted file mode 100644
index 3436e05de5f3..000000000000
--- a/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild,v 1.14 2011/12/05 19:41:27 jer Exp $
-
-inherit autotools gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="https://github.com/engineyard/loudmouth"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-macos"
-
-IUSE="asyncns doc ssl debug test"
-
-# Automagic libidn dependency
-RDEPEND=">=dev-libs/glib-2.4
-	net-dns/libidn
-	ssl? ( >=net-libs/gnutls-1.4.0 )
-	asyncns? ( net-libs/libasyncns )"
-# FIXME:
-#   openssl dropped because of bug #216705
-
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=dev-util/gtk-doc-am-1"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug)"
-
-	if use ssl; then
-		G2CONF="${G2CONF} --with-ssl=gnutls"
-	else
-		G2CONF="${G2CONF} --with-ssl=no"
-	fi
-
-	if use asyncns; then
-		G2CONF="${G2CONF} --with-asyncns=system"
-	else
-		G2CONF="${G2CONF}  --without-asyncns"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Use system libasyncns, bug #236844
-	epatch "${FILESDIR}/${P}-asyncns-system.patch"
-
-	# Fix detection of gnutls-2.8, bug #272027
-	epatch "${FILESDIR}/${P}-gnutls28.patch"
-
-	# Fix digest auth with SRV (or similar)
-	# Upstream: http://loudmouth.lighthouseapp.com/projects/17276-libloudmouth/tickets/44-md5-digest-uri-not-set-correctly-when-using-srv
-	epatch "${FILESDIR}/${P}-fix-sasl-md5-digest-uri.patch"
-
-	# Drop stanzas when failing to convert them to LmMessages
-	# From debian..
-	epatch "${FILESDIR}/${P}-drop-stanzas-on-fail.patch"
-
-	# Don't check for sync dns problems when using asyncns [#33]
-	# From debian..
-	epatch "${FILESDIR}/${P}-async-fix.patch"
-
-	eautoreconf
-}
diff --git a/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild b/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
index b52a706f2e94..938a2eccf3b3 100644
--- a/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild,v 1.8 2012/03/06 22:01:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild,v 1.9 2012/04/20 18:11:01 pacho Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -50,8 +50,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Use system libasyncns, bug #236844
 	epatch "${FILESDIR}/${P}-asyncns-system.patch"
 
@@ -83,5 +81,8 @@ src_prepare() {
 	# Upstream: http://loudmouth.lighthouseapp.com/projects/17276/tickets/61
 	epatch "${FILESDIR}/${P}-invalid-unicode.patch"
 
+	epatch "${FILESDIR}/${P}-glib-2.32.patch"
+
 	eautoreconf
+	gnome2_src_prepare
 }
diff --git a/net-libs/loudmouth/loudmouth-1.4.3.ebuild b/net-libs/loudmouth/loudmouth-1.4.3.ebuild
deleted file mode 100644
index e1a23cc88445..000000000000
--- a/net-libs/loudmouth/loudmouth-1.4.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3.ebuild,v 1.13 2011/12/05 19:41:27 jer Exp $
-
-inherit autotools gnome2
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="https://github.com/engineyard/loudmouth"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-
-IUSE="asyncns doc ssl debug test"
-
-# Automagic libidn dependency
-RDEPEND=">=dev-libs/glib-2.4
-	net-dns/libidn
-	ssl? ( >=net-libs/gnutls-1.4.0 )
-	asyncns? ( net-libs/libasyncns )"
-# FIXME:
-#   openssl dropped because of bug #216705
-
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=dev-util/gtk-doc-am-1"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug)"
-
-	if use ssl; then
-		G2CONF="${G2CONF} --with-ssl=gnutls"
-	else
-		G2CONF="${G2CONF} --with-ssl=no"
-	fi
-
-	if use asyncns; then
-		G2CONF="${G2CONF} --with-asyncns=system"
-	else
-		G2CONF="${G2CONF}  --without-asyncns"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Use system libasyncns, bug #236844
-	epatch "${FILESDIR}/${P}-asyncns-system.patch"
-
-	# Fix detection of gnutls-2.8, bug #272027
-	epatch "${FILESDIR}/${P}-gnutls28.patch"
-
-	eautoreconf
-}