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

(Portage version: 2.1.10.56/cvs/Linux x86_64)

5 files changed, 23 insertions, 132 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/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
-}