Fix glib-2.32 building, bug #412091 by Balint SZENTE.

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

4 files changed, 39 insertions, 8 deletions

diff --git a/x11-plugins/pidgin-encryption/ChangeLog b/x11-plugins/pidgin-encryption/ChangeLog
index bd6c266691f4..e0ac86e80946 100644
--- a/x11-plugins/pidgin-encryption/ChangeLog
+++ b/x11-plugins/pidgin-encryption/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/pidgin-encryption
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/ChangeLog,v 1.23 2011/06/30 12:57:01 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/ChangeLog,v 1.24 2012/04/19 09:43:38 pacho Exp $
+
+  19 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/pidgin-encryption-3.1-glib2.32.patch, pidgin-encryption-3.1.ebuild:
+  Fix glib-2.32 building, bug #412091 by Balint SZENTE.
 
   30 Jun 2011; Peter Volkov <pva@gentoo.org> pidgin-encryption-3.1.ebuild:
   Depend on net-im/pidgin[gtk], bug #373049 thank Piotr Szymaniak.
diff --git a/x11-plugins/pidgin-encryption/Manifest b/x11-plugins/pidgin-encryption/Manifest
index b7515b4bacdc..7f2714262177 100644
--- a/x11-plugins/pidgin-encryption/Manifest
+++ b/x11-plugins/pidgin-encryption/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pidgin-encryption-3.0-crash.patch 670 RMD160 73df3bbfa0314d5dae25c596d95f42be6d401551 SHA1 b7c49065bd912a924d5fe348dd65da7282af6df6 SHA256 11ea6c33931d9c1e7a4923f974e4e465a8bf5e33bfe2dee08d517f8112dad5a5
+AUX pidgin-encryption-3.1-glib2.32.patch 381 RMD160 584b77020fc1481b8396e5f60833b9f0b415acef SHA1 2a51714ee5e6ebde7a555716901eb2ff209a22d1 SHA256 58ea7be36d64ea4533fcf3c743b0939667f5b9addb6a709a0edf9a9754b656fa
 DIST pidgin-encryption-3.0.tar.gz 586394 RMD160 6eff777961785057c976e72b84e7cd83c7e189c9 SHA1 bccad1c4ac0bec12e6837324f543ea60530d0761 SHA256 ae754eb1a43d8d2341083187d6f9e2f396b5b521f87a62060369a55516896594
 DIST pidgin-encryption-3.1.tar.gz 604129 RMD160 b539075adf90b9edf8a204c2669661aa525cfc7b SHA1 cfbf86840eeaabd246abad62b721b7dded4a18ba SHA256 940cdafdce59ece60193626ed04ebf94e2671df184b88c9ff1792e9e0f99cdab
 EBUILD pidgin-encryption-3.0-r1.ebuild 901 RMD160 b0333912d8015cf4ea2ffc923d587556709d86ba SHA1 b1f17ed6aa39c13ee7d4060bbefc13095abf111f SHA256 dc4cf97ea827ba6a56acfd2da91db4e71bf8dc0eb6a6f792c107e72bb49ba98d
-EBUILD pidgin-encryption-3.1.ebuild 840 RMD160 d7c811a710df96a7b8c4552333a10306ef0c8be9 SHA1 80c2a94b2d20200f8567105ac63c33b9a268b48f SHA256 d26e4b41f20e82afda37270306053ebc97cd4a1900b14b015844c63993d7f4fd
-MISC ChangeLog 3207 RMD160 74363b43fbeec3a29c275be6e7d9eff2557530e3 SHA1 3f92b20899e8899950ab5ba53b12aabac724c05c SHA256 85f254dbaec753ae6bc25637e96ec79b6844a4116ee0a7fcc1a45abed6662c73
+EBUILD pidgin-encryption-3.1.ebuild 879 RMD160 43f9d4b49f2720a8201bb3926db1c880a2da8e40 SHA1 3009c97f80ab929011ab279ac272c9438d0e0778 SHA256 b82cdf44feacb3b57922f58f8d23d5d498597ea744786b91e9ed22a8d3a38f57
+MISC ChangeLog 3389 RMD160 59a069570566df7a514cb3b15fc36ec8163246bd SHA1 66d933745630ada02bfa99092e41393bf2599250 SHA256 180b4aa6e73215343b3013d3416ec082acd4c56fd2a189488bc1fdb9861bdfb2
 MISC metadata.xml 290 RMD160 0bfd24135e7a2517e8afa7ca0fa6a3cf690014d8 SHA1 d9a15f69c18eba328f14c5792d9f846e550f1d57 SHA256 45df283c73b0d7557d18dd23b21007113493fe9d98955865a33576b9bd6d4ebe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk+P3k8ACgkQCaWpQKGI+9QKrwCfe1xy6txeVyjWZS46LxyCa/a8
+mOgAn2kCzYDpai7aGVM+eBkSLIkV8qTa
+=w9MC
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.1-glib2.32.patch b/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.1-glib2.32.patch
new file mode 100644
index 000000000000..1262056bd27c
--- /dev/null
+++ b/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.1-glib2.32.patch
@@ -0,0 +1,12 @@
+diff -urN pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c
+--- pidgin-encryption-3.1.orig/rsa_nss.c	2010-04-26 04:53:46.000000000 +0300
++++ pidgin-encryption-3.1/rsa_nss.c	2012-04-15 13:16:21.438852032 +0300
+@@ -24,7 +24,7 @@
+ #include <debug.h>
+ #include <gtkdialogs.h>
+ 
+-#include "glib/gmain.h"
++#include <glib.h>
+ 
+ #include <string.h>
+ #include <assert.h>
diff --git a/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild b/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild
index 68ca44493b93..a054d826b344 100644
--- a/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild
+++ b/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild,v 1.9 2011/06/30 12:57:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild,v 1.10 2012/04/19 09:43:38 pacho Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit flag-o-matic eutils
 
@@ -22,6 +22,10 @@ RDEPEND="net-im/pidgin[gtk]
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-glib2.32.patch"
+}
+
 src_configure() {
 	strip-flags
 	replace-flags -O? -O2
@@ -29,6 +33,6 @@ src_configure() {
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "Install failed"
+	emake install DESTDIR="${D}"
 	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
 }