Fix underlinking failure (bug #497106, thanks to d_dart).

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

4 files changed, 32 insertions, 10 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 2a25a24f0dea..b679a0a8456d 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/yelp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.306 2013/12/24 17:15:46 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.307 2014/01/05 07:21:33 tetromino Exp $
+
+  05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  yelp-2.30.2-r200.ebuild, +files/yelp-2.30.2-gthread.patch:
+  Fix underlinking failure (bug #497106, thanks to d_dart).
 
 *yelp-3.10.1 (24 Dec 2013)
 
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index fe4bdbd84eeb..2558af53547b 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX yelp-2.30.2-freeze-move.patch 3504 SHA256 8c0c6bd3b730de1a372ecc74373bc7ac1607ed668f48764250fd3c9e36998806 SHA512 2b6053d9ff56702f1e614d73fcfafa5914e8f59be2836293de3236597ca2732a0e351e9fb3755c7abad980b9d63482725036fa7db6c2a9c47d80829e27f8474e WHIRLPOOL d93757309f0b8e73639e455ad8e3dd10ff72440d11a30f244d0b31c2008c84d2f984b2058f648e1202075f7feea3db4f81fc6f497d499d2ed25dfcfde3285f4d
+AUX yelp-2.30.2-gthread.patch 284 SHA256 9a18650c9eff2cf0fc739cdba32ca10d5538bceaddaf9381d5b16a34eb0b0405 SHA512 546f7b34c6f60cd19dedb7903a551d551e9bdf6b0c8f81804b2dfd449bac0fe1cffa9b2d5a02e5eb3e3771297bd658121eb99d77862c18a3e5d850676e9e4e92 WHIRLPOOL 0a110d9dcd37774f83ba37af978c640aaae02a526be5dad86f22159733bd049de05fbfce070b0d9120c8d62b20e1f1c31c818802c703227ac8cbc5e80e8acf3d
 AUX yelp-2.30.2-print-crash.patch 1528 SHA256 e09129d48fae34be923be82e3c880c14ff6ad79112c1fbc8760b431caf501dd3 SHA512 ce63308e5df9586e0032c126fb715358fd4c51ae2a5436079d78e468092e8b0359e6abeb17a53424831e6be0eccc23dc0c283bfa5d7bc348c554e4b0ea46eb03 WHIRLPOOL 1aaee93c1f483d43a17c2ca3cb96e0ced40a534772da056f651d106a2a8e8bafc5ce71b8cb2164a230add94ac96c773f9efa7c0f44771648d33be382f11b6706
 AUX yelp-2.30.2-uri-handler.patch 860 SHA256 91e05fc3c5eb36c12e28cd7d2c058baf7395105f56826e1012a50e0b7882af65 SHA512 dd3afdcee7a021fda22da6a1e41c9092321eb7f013010fb0f8c479d37108fef985296d65365d15a304f0f90b4dd2c471d1b8c4818ca4b205a88aa0239d3eb51f WHIRLPOOL 141fae63bb5e66342c236a3357933c9fc5de5d8f25ef8b4527acbc4fb185b6e9611f2b7c085bdd20bb910c87403f7f3dddf182499c6e98d817a7f86158b1eeaf
 AUX yelp-2.30.2-xz-support.patch 6328 SHA256 b32e6c4169c4c7d5b0498605d4aa4de1817cd5655cbc70b88db04aff3fdf8aa6 SHA512 c4e03d53eabc9f9e0e20f07828cee51a5830799e48d02f20dbbbce68c373ca605913709fffa914d545e2070a1a0ff1697530877d69a38ade5cd7e2bf2fb05507 WHIRLPOOL b8ab124c1a9ddcd7fa9437d7128e81f8e86bb57e4d02c634dc99a98f2ed708262dab57f5cba9a140111d7ce53114b31dd5421d395439ab536b3f69f53e04e3c2
@@ -9,15 +10,19 @@ AUX yelp-3.0.3-man-compatibility.patch 4226 SHA256 9b76f13236170ccbfa24060a18bdf
 DIST yelp-2.30.2+webkit.tar.xz 739928 SHA256 00d84338e3975174a5735deb39e2b4b49816cbedae8130ccba64abc72ae85cd5 SHA512 711baba2243916f11c4d4e24e1013dcf87f89a411c88dc0c2151ba67213ac720f71a5f17d1a6037b8978b372a95d1902d753e03ac0936fd90bce7dcb6f7da53a WHIRLPOOL 6b3736922b20c5a057c153010883d40eede244729f8f83fb480d8c1fafb8a631b93edc507de341fc59913e28a0af9f048cb3b0f591fa3ac4cf15a76bebaf70dd
 DIST yelp-3.10.1.tar.xz 1406220 SHA256 17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816 SHA512 299434d8b1d2c89905a2feee26781f32a1c128e39f7513c1c754cf71b703c9d25fbae4027bcc8b8d4543080834a3c3d7d216780443e0bad3cde543e3c04ff32f WHIRLPOOL cdf5e0b1baa4a71f6342f5e18314363050b984c421df3cd0da5059bc7dc6b9d565c8d1acd431815b9fe7113b472701ff211487318f412821414c29c6ec6c36ec
 DIST yelp-3.8.1.tar.xz 1425460 SHA256 73b3941316194dea8ea7d1d2b1f6612424c5d80ee1871ef627455893ad15606e SHA512 d9bf1cc6fdc500a674e7e56faafcabf7dc89b8051d647749abae254e5d295845cbd147c417d9b634355336244ed1afd4b41e6d76d5f1e853a1c95c58710ac95c WHIRLPOOL 0de23c9648917b325d02f7b6a530f2bc0e6609142f9c5d6e8b6bad2dff7f7a3cc03670e0068329a7cdb957c16edeaf427dbaf6470390e2a54b4028a8b1dc3784
-EBUILD yelp-2.30.2-r200.ebuild 1687 SHA256 0016760e7c3b47608e8d3ad74dcaa4c711b5ce8c4958a679ef4a78a9cb4deb4a SHA512 ab0d6edb620783e8b8ad4a898c3e933b606099a50b426c606b561a1a4f17d28ddcc21c6e10389fd722855db057c52d13e5cf6395ed83d5961b2b94da791f79bc WHIRLPOOL 049a2cad38b88d1c6d274ef7a5fe4046e7b04ddb88aada6b98aec733a1fec9deab327d696a625ca4d8b5aadfd0c4d6683598f47d497fe5681ff0074e4706847b
+EBUILD yelp-2.30.2-r200.ebuild 1724 SHA256 409af68702930cd22db3bf03624090aa17c435c9d72260a62774bbbb4847d09c SHA512 185ce58c6cc8b3e8d722c95114bbba7277602ba0dfee37b306375018bed01f4badb4ca1894f881be9b91d535c87aee016e5103a3d914da6c51536eb6d34f2507 WHIRLPOOL 3a093d36764cfba8768e5535d922b9c18ba755b7f3215888867127e73ffb55646fefeea19534b7cda013ada47e820c9f7ce68b29548ef127db1aa7f60995b6d1
 EBUILD yelp-3.10.1.ebuild 1349 SHA256 a411a1972af3d56e8a46699bb9ef63ead3ba6044bae7f9f34ff492cdf4183c22 SHA512 3bfa8c0c68a71070f1390bf402a631360cf61f383ad10fa512915c95de9ca6025eafebd150a1da7ab7d84a19349b7c345e81b1b73bc30f5c10ae253fc3e79ad6 WHIRLPOOL 054e29aa871264b30c6ff397f24387d8b4e74ffee3375ebb23ea8cc8cf7759520d2e8e79909fa9dc63c2567fd6b589c6090ad92528ece8c74ca536e46874655a
 EBUILD yelp-3.8.1.ebuild 1346 SHA256 da0746b30142823825bba8edc96cc936c73151a9edbe4ec547a0172ba19ce6a7 SHA512 67634d01c3cae88d60f44e97441d8079641b56a1561f39e4cdef67fa52ecdb0a7da5e702b3cf0c0b3e8abe2747210711d0fbc9a78f126b9f15c59ea670767904 WHIRLPOOL 7a6c2e151bf628f473a59c1a277b5ba720c717f8868aaf301c67b37acd4c8e6f90309485a2e19da7f369ebda68bed925bc750fea6b1cc98b59fc1b66c39b0f92
-MISC ChangeLog 39819 SHA256 487f6e1320ead7773c0205fd2e398d6ed9323d32699f61e53b6f1d79700eb049 SHA512 0c5fd41418b44779dcd9a0565b2361976e5d88d78add0fcd2e35c38bab1881621860b892bbaa0afba01e7b2f536bae359dcf6b258f88eca13185a07774454988 WHIRLPOOL a5d9c29582d0e4f00b3a0a7fe96be3ccea9fd1381686960a38aba37ffc9cddd5708b5ea1ea79e51852f5ce5a7fb23e1d7acc8f0f1c1ecb44ef5c5bad77f76516
+MISC ChangeLog 40004 SHA256 36327e502a6a522dca639bf7f162d892aa6c5b489dbad4ebbea99cd69416c82c SHA512 1ab2ab07913e3df6b1f0a574df835542cb742701740357861f6affee221831670b705490aada6306630a697bc0e01cf0d731c9a0311a2c778695491027520e19 WHIRLPOOL 1a4d1fc3877a7e795f16b77715810e9213e5e312e76d56ccbac5acd2835cf720b373c24a5dd985181f53111a3689254c8c4d7f38620c001d705725e04f332279
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK5wUMACgkQCaWpQKGI+9Q0MgCfZ2m3paISncMnrBPy8Awa7CR8
-1KUAn2rC4L12NECW9NJdeXv0Wc65C+Vf
-=qkWd
+iQEcBAEBCAAGBQJSyQf+AAoJEJ0WA1zPCt1hQBwH/0Gn6L0d2YYcOm70vm8AVB9U
+bhFIuCAmd/4w/JIT/zNZz4uNHQg5lLUKJLo0E/fwcCqcr9sEznRnuc9NoB+eFqKc
+Xbk625s4Kn6a91FQn7vyFKORdiuW4EH8YeOJcTy44EJe2m19jFHDltSU6rvexh4P
+/JpxfbqucrgxW53ylAxgE4SUW4qkx85Z6RpIPqihMw6xfceIyfQlO26nsX7/rIgL
+NpyshOwEVLUjKSvCmKja6Nk+WhVkgLEY91l7rlcYatZIM2BEoiV3OpgyTVToKala
+cc3thOBEjGDb8F9IuMYCOTQHkIiefbkQIk8WF3n3cDNGF1ukB3WPdhjYEWTPDgU=
+=3U5e
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-gthread.patch b/gnome-extra/yelp/files/yelp-2.30.2-gthread.patch
new file mode 100644
index 000000000000..bd84d7795ff2
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.30.2-gthread.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.in b/configure.in
+index 9b5fd48..6c2fd89 100644
+--- a/configure.in
++++ b/configure.in
+@@ -68,6 +68,7 @@ AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
+ PKG_CHECK_MODULES(YELP,
+ [
+ 	gio-2.0
++	gthread-2.0
+ 	gconf-2.0
+ 	gnome-doc-utils >= 0.19.1
+ 	gtk+-unix-print-2.0
diff --git a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild b/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
index 8bf6950d7ab8..0208d90c42e4 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r200.ebuild,v 1.10 2012/12/19 02:12:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r200.ebuild,v 1.11 2014/01/05 07:21:33 tetromino Exp $
 
 # git clone git://git.gnome.org/yelp
 # cd yelp
@@ -56,7 +56,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-uri-handler.patch \
 		"${FILESDIR}"/${P}-print-crash.patch \
 		"${FILESDIR}"/${P}-freeze-move.patch \
-		"${FILESDIR}"/${P}-xz-support.patch
+		"${FILESDIR}"/${P}-xz-support.patch \
+		"${FILESDIR}"/${P}-gthread.patch
 
 	sed -i -e '/CFLAGS/s:-pedantic -ansi::' configure.in || die #196621