Update the gold patch to fix glib-2.32 problems; -lm is always needed for libdocument, not just for the thumbnailer executable. Add missing libICE dependency.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 68 insertions, 25 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index c3d7e20541e5..a68fe0e8cf72 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.251 2012/10/17 05:20:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.252 2012/11/03 06:48:20 tetromino Exp $
+
+  03 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evince-2.32.0-r4.ebuild, files/evince-2.32.0-gold.patch:
+  Update the gold patch to fix glib-2.32 problems; -lm is always needed for
+  libdocument, not just for the thumbnailer executable. Add missing libICE
+  dependency.
 
   17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -evince-2.32.0-r3.ebuild, evince-2.32.0-r4.ebuild, -evince-3.2.1-r1.ebuild,
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 165d3ebc97a5..bf9587933f1f 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -6,7 +6,7 @@ AUX evince-2.32.0-create_thumbnail_frame-null.patch 853 SHA256 3d6472d77e07602cc
 AUX evince-2.32.0-desktop-categories.patch 709 SHA256 d95489555d5b48b4aba28b41265c2cb152dd5d5163e38df3e3b5dfbfbebcab53 SHA512 cfc5e697ed1cedd0ed160a060d9d4497bc58802a1b73ca7e53411489280a1970691f96a70784715c21c248526facf15f4fc473a1800f70f7f792d98ed7c3fc08 WHIRLPOOL 3694d5d937f970b74ad4a45e53ded2ecc5c5a0c3f21818a7730c8f4fd3f12c001c0556157e151d1da617d64edeb9b72eb8f08fadbad4554be580decff5ddb09e
 AUX evince-2.32.0-dvi-CVEs.patch 3386 SHA256 49d1ed8adc734a005d4d8fdc1912bb115d97f734071d64bcae0aae60f2b5626a SHA512 c2a3787e3bb4c680d2ebb999c93e2f2917bcc85aaa3122676e74ab6fe3367cb732752a8aee089fb870a84eab17b8fcff07a647d9680d64029441d30a694dcd2d WHIRLPOOL a2f9ab4cda23b76684d5fbeff38422d3d41eff12553c7f40d1103b993cceede7f3ffe2ab2faf5f63314b75a7fb32abd1f6b294d36ee06194e0f5bab16164b847
 AUX evince-2.32.0-dvi-security.patch 816 SHA256 86e1e3ae2af8471896594b063726d6e7390169c443864b11797b7e3b937caea8 SHA512 060f542f1489de75d14d8aa4fecfbea77764c45b3f1047113795bdbfe21102e8fc3a55ea69d5de706f1c14ff8d89d439f34865b4ca295dcd9fd637c3a687585e WHIRLPOOL f3dc731b0dde43247969dfacbef2b48a42a94ca17fa899b4d342e4c7645c7ca3ce5046962e6af692c2d42dca9217a97eaaffed60f272c014570c32f6810c8448
-AUX evince-2.32.0-gold.patch 445 SHA256 5bfa37ed69f0754b8b9e9475c4f71e8b0a7b3b32925d72fb2e64f6efd69d693c SHA512 18720a1d0e81487832e7b6713d495094c713c922034c6ceb75caa7b8999ee46edc7fdb08f9fbc7382e4ee4f0384789a9e670c306984b881c234bc243e646899b WHIRLPOOL 9518a3a2f41f7ca62642683d584e92f350c9e1189d7b4e51b1bc1849f2505bd932a70d9f8b0831a92f1f8b890f2a9a70176b0d2d6af90fa2562cf47b828873fb
+AUX evince-2.32.0-gold.patch 1839 SHA256 1388fd6de5f76322e305a80d0770c29eba3fd78c9938cdcbea80e1b83c98587a SHA512 43f5abec792bbbfb9164408aea19ed39851921ea3bc2565982463f03d581a677870b30b8eaec0badf23972d8c73d051b40f199099132537ebd21222b791d33db WHIRLPOOL 1a8662df26e3f9508467b34eaf69bbcafa75c5717901b638c2c8e82672877d7e69d220a01723ab09087e090deff5fed715b617bf3d5a4d97f9fbb80aa4b4f01a
 AUX evince-2.32.0-libdocument-segfault.patch 1388 SHA256 e9889a7920a8e6bd16b168333d120dfff1a2a2fcfed559d0d2f3678d9d234e74 SHA512 54f63343c6dea0a50eecdc18a9bf277ee573c23ce8a6f9e6ed6ab65480e088db481f212ada61bb32e41755d6a4821702106ba990475d2a639676ff0a94508138 WHIRLPOOL b851ad96e9b26b9c9e70cd82d51476658c688aba9a24cd9bd279046b03ee3601cd72ed4b56867f53a69933c293b36d3ea696aa33e825624e6e04717a6a2da19e
 AUX evince-2.32.0-libview-crash.patch 1351 SHA256 f549f4b8bfa8078764d3fb11c3b8e3d9e9c7bc59ebc7e96ef9d6e63c35d3d35c SHA512 95645dd2016b7085eee3be234f5fa2d0bd98f95a8e4c130dc8086e2d95bcb779e7378696924bb2dc9aafd4cbff8efcc087a6ed176e1a3af60b1f3f66083b8478 WHIRLPOOL 1de448f247bda8319c0b62621a647fe8a02985e42221c354c2abc8f63c3511038168c780ff3fa7ff83eab33d83567f5f95835d6a7d14d0c18034b97814111475
 AUX evince-2.32.0-pk-fonts.patch 1005 SHA256 a8eba65d0a00fae77d85fec202b60762afa82a71695119a66f24a4ab0974fc82 SHA512 36af3365aade4cfbce8852f83589ea3106b7f73d6d11035718ac0fe401d8060e9c307ff90c80463b6d5385caa453adde1a8d2feab78d1171064fc97df4e6924b WHIRLPOOL 33fe99426593663bcd66fe757a45824ecab40c162b3e29f766d5c533f36ec7a6c52694c5cc9d8d97f3ad81a84b9f0dff0c10cf8a7898da07497d2071ddcdd8cc
@@ -17,18 +17,18 @@ AUX evince-3.4.0-glib-gold.patch 2339 SHA256 c94927998693b7b75092c0a8225079bf646
 AUX gconf-2.m4 1579 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8 SHA512 66a341f1c96634d7fddcb26c99e3ae6d44bb3e97f8d547aa1b03b170f2dad8d19a902fe6a945544b8a5a0e26f054a9d0a3f85380efd04e5dd8262bbcb32c4063 WHIRLPOOL 3509829bdecb1eb23ac21df58769f39f3216052f8cdd3ebd67c543d03e2c2a3d57084637152203b9eb5afc9e77f20401467db3cf3b728dc2c02f87abe072032e
 DIST evince-2.32.0.tar.bz2 2295272 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7 SHA512 b478f3199d017ba77b75e9d0ee9a82469b58087fea18eb30ff17ee8f03189e842299b8f4df412d4bb6d0ee985ed76bcbd8dfb3accc13b824232980f5a10e0a3c WHIRLPOOL de4892107c83601fb59aaf848acb0ab3d977759f0532221023ea5370706471ef8704d3f28df135d20214f7677f1d3328f9e6b0d4f49277983059626b185cf1c2
 DIST evince-3.4.0.tar.xz 6162936 SHA256 02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129 SHA512 638170831a57ec6f64c65baa7e5766561ba5044f6a6e2b0ef86aeee526e07e30a5eef40b655158ad483935b127e00b41d12e4b3dda06f957887953d440c0642c WHIRLPOOL 10ba3bd7d23accb68682af890d62fa8ed63e7874f2f58854e44441d3a4d800eaf3cee930fcf68b6d9bc2d9e22767a8e74308df2511aa5cd70baef47ee0dbae24
-EBUILD evince-2.32.0-r4.ebuild 4302 SHA256 1575f3df1981b55e6ab708e5f373677fc9817a473c2337af8f4e9f6a871704f1 SHA512 2c1b1ac3af8471dee47c486514d4bff7d927a878624069ce9413e223bb0c39bc97e9db2b2a654a92fa33fa0182b733cf3381f5dd573da39e140e540fa31095be WHIRLPOOL 6d8843f7b04528eab8470f90306135a6f74cc7c46e22659a62a620bce25323fcb14bc28593e910ffce252a32d8033f0ab003a94a72d9e6b9a7faf40f134a36e3
+EBUILD evince-2.32.0-r4.ebuild 4319 SHA256 72280788e153673573e57a3784fb44adb42e8f5de65cab3c350a5141743f67eb SHA512 d6e403e1b53046a8918f62034db738cc4017a8283d4af87ee9b37c7c3fa6a001c61d21a63d68b92ad7987f3b7d9623e33427f005bbb31083c839c87335e86389 WHIRLPOOL 787e3eaacd94a983677856dd5bd342013f28454ffffc0905cec7c45f47c93e34a6a6cd397cb1ae40664d7cc162e975cb7c78c54ded083a25076548875785d6f1
 EBUILD evince-3.4.0.ebuild 3368 SHA256 74d3939a33f20c5e488dcd080208647e2232014946d10cfc5c2ea9fbbe6899c5 SHA512 da5ef467585bc4f2f65500a792eea92165a51958043a9a1212e586484a9ad2839a4cf5aeca2e389601bc9cccf42dab42938c33e966b53ba143ffe3fdec1168ac WHIRLPOOL a60fa9b6c87931334df7202f2772c731262032c7f0fdb42716aa1a0b3bff29ea7cef341a26176c94abee43049fe8273f0c3b2eeb8cfda6fe3b2eb10114a7184d
-MISC ChangeLog 38016 SHA256 250f14509d7ba8a5d751c9ebee038c5e5ed704f5705528d02a20b519816a6249 SHA512 715d575266905035473feab06e2362a2a9134b84cdc8056a08f1ded7e0007cfadb1a326fa1e1998940df0599ea3d9a1283b7f18cc14bdcaf636eab4f92266954 WHIRLPOOL 5510b72a88fbf0c5c15f461cb1f12d686cc465f5fbd5e3a3a38d6710ebe90d4183ca6d35d12b8bab3522c6b3c773e2c74df02243da399a65401708d7eaeb95ed
+MISC ChangeLog 38300 SHA256 1e5364a9fac4228cd6e7092e08a175565f39041404cf2609adb10358635d2e38 SHA512 262fedd01265a2242562f7f5d8ce812ce377c51362ec16713e889f5833a3f6182433982ea530da7348ccd60d7094906cc16b9a941a0de024357a0eaf07643049 WHIRLPOOL edb31be185507d1fc0c11b155662afe66c17364569c9d435bbbb3347285bc79a7d7c8c99537f8cf0d6084284cb8a2965c0e1e3cf653f770ca2803fc64e0fe8c3
 MISC metadata.xml 726 SHA256 b3f2b01c3eaa2f5633c1f8600921345db96d269de2e5f21752ba1a5ddcc3c890 SHA512 dcbe57df71e64d20b672583dee3dbccfb8b927335c6781e3f4cf6838ecb7f73f2f5af83d99d59d1c1fec9112618d85bbbbbdd77b4f64ab37d6a0f170e9982a97 WHIRLPOOL 9279856ee5be35f3e0e6063f48a1b7a8d8a5cc0df69c0a0fd04f561bbe716593fe196972c1b20e05cdb7ef75bfa7bb4bab75b0bc03583894cae1a119f9b8016e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQfkAXAAoJEJ0WA1zPCt1hhHsIAJ/rTRIF1L8eV2o8S63ru6XW
-IfwedXPAEedCKK5TI21O5+/wkGQvdMUXX5CD6TeiH1RhzgI5iqLe+Kv9AJcGd5T8
-sXe5ANM8U06jeCtJH3Go1pA9dOJ2HgKme1CAb68i9XEAjou7iH05X6thZ36ktZpn
-OdGLLQaX5Pyw7+ld8lNV0KzrU5MI6mu18Y2bTdLDEzug+WLngObjO2ekNUfDk3YQ
-RTBI8NOWWHER0+yxnlFFzAJlRQ2NX1fP0Yfe7Su09+skzeupIccT3v9dvgHUT9YC
-3w2gm16HNRUPdaHVgyleVDbWnh94HmLnjYFvi94JgrwVW/nzMF36poI1wQFV/GI=
-=ojXc
+iQEcBAEBCAAGBQJQlL41AAoJEJ0WA1zPCt1hZD4H/RTHRCgsLO5hrIy+ozzb1xJb
+zADMTMCnudmKgstu+3M6eIkmx5IYffXuEbeUnRcE5TJzj0gjauOxVgT6Cngma1BZ
+cjQxrgveiWhA3BodGCtYjX2rEGz7RV82iarzmGbec/uuu7mE6n0Ps9ur5X/7BDFc
+ig/60y8upyVbL7FR8p1KPYwTEqdkHBMb+uCZ1I8O5QyJ7GjoUaCEeU+anSvKYhr7
+5MkdtsN2YAyJWUZr5ccJ4bTJshkJo/4RoSvJhUDm1yVBNLmyrtednjCHXWTh9fzh
+XTb8xpTFD3upa+NSZEFC+tPvAS3DFLtWi/7sahN6xoe5sKQl0c/PZnsDTTxLWZw=
+=A0xd
 -----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-2.32.0-r4.ebuild b/app-text/evince/evince-2.32.0-r4.ebuild
index 89d91711fa90..86e4cd44eae0 100644
--- a/app-text/evince/evince-2.32.0-r4.ebuild
+++ b/app-text/evince/evince-2.32.0-r4.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/app-text/evince/evince-2.32.0-r4.ebuild,v 1.14 2012/10/17 05:20:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r4.ebuild,v 1.15 2012/11/03 06:48:20 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -25,6 +25,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2.5:2
 	>=x11-libs/gtk+-2.21.5:2[introspection?]
 	>=x11-libs/libSM-1
+	x11-libs/libICE
 	|| (
 		>=x11-themes/gnome-icon-theme-2.17.1
 		>=x11-themes/hicolor-icon-theme-0.10 )
diff --git a/app-text/evince/files/evince-2.32.0-gold.patch b/app-text/evince/files/evince-2.32.0-gold.patch
index dc846dfa3227..0388e9eef64e 100644
--- a/app-text/evince/files/evince-2.32.0-gold.patch
+++ b/app-text/evince/files/evince-2.32.0-gold.patch
@@ -1,16 +1,52 @@
- thumbnailer/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+From 11b951614a6b6cf567f33b04872b9d663989d2fe Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 3 Nov 2012 02:25:09 -0400
+Subject: [PATCH] build: link libdocument against libm and gmodule, and
+ smclient against libICE
 
-diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
-index 171c00f..b060a97 100644
---- a/thumbnailer/Makefile.am
-+++ b/thumbnailer/Makefile.am
-@@ -26,7 +26,7 @@ endif
+Needed for building with gnu gold
+---
+ configure.ac            | 6 ++++--
+ libdocument/Makefile.am | 1 +
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4bf438d..b5d8e8b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -163,8 +163,10 @@ dnl Check dependencies
+ # SHELL_CFLAGS     for shell implementation.
+ # SHELL_LIBS
+ 
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
+ 
+-PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
++PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-2.0)
+ PKG_CHECK_MODULES(LIBVIEW, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+ PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
+ PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+@@ -221,7 +223,7 @@ if test "$with_smclient" != "no"; then
+   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+ 
+   case "$with_smclient" in
+-    xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;;
++    xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;;
+     *) SMCLIENT_PKGS="" ;;
+   esac
  
- evince_thumbnailer_LDADD = \
- 	$(top_builddir)/libdocument/libevdocument.la	\
--	$(FRONTEND_LIBS)
-+	$(FRONTEND_LIBS) -lm
+diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
+index facf17c..3944fb7 100644
+--- a/libdocument/Makefile.am
++++ b/libdocument/Makefile.am
+@@ -114,6 +114,7 @@ libevdocument_la_LDFLAGS = \
  
- schema_files = \
- 	evince-thumbnailer-dvi.schemas.in  \
+ libevdocument_la_LIBADD = \
+ 	$(LIBDOCUMENT_LIBS)	\
++	$(LIBM)			\
+ 	$(top_builddir)/cut-n-paste/synctex/libsynctex.la
+ 
+ 
+-- 
+1.7.12.4
+