Fix gtk-doc hack, reported by galtgendo.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 28 insertions, 19 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index dfeb5459ce36..3ba41d8bf211 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.721 2014/06/12 15:18:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.722 2014/06/17 18:19:33 mgorny Exp $
+
+*gtk+-2.24.23-r2 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org> +gtk+-2.24.23-r2.ebuild,
+  -gtk+-2.24.23-r1.ebuild:
+  Fix gtk-doc hack, reported by galtgendo.
 
   12 Jun 2014; Michał Górny <mgorny@gentoo.org> gtk+-2.24.23-r1.ebuild:
   Force ${CHOST}-cups-config to obtain proper paths for multilib cups.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index e8da9312749f..8eefca62b1c0 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -20,30 +20,30 @@ DIST gtk+-3.10.8.tar.xz 14187652 SHA256 5fd28b35ab475d521751fa6ae91318bf58f69cd3
 DIST gtk+-3.12.2.tar.xz 15015024 SHA256 61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e WHIRLPOOL 26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
 DIST gtk+-3.4.4.tar.xz 12854476 SHA256 f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7 SHA512 1a16f54a511f85a22f74a8ea82d218efa14ea5a58fc94fca805b0e321bdcea48a5f0a018a6d996c954ee80a51a2a16b68bdb2e3f3ab57c2362f3241c6cfa9a56 WHIRLPOOL eb1d117544aafec4936920a668b684959e89383b5b014512b82be0e99b7e48e3bdf81ceff4202b64179df4aa77453390d85a433d6e913cce8740a6b31701b15a
 EBUILD gtk+-1.2.10-r12.ebuild 2406 SHA256 03e22a0e23e19cc0ad87697527ac186aeb6904b7e007bb0c023196f80765b716 SHA512 fb4a7905b5d6390a9d12bd5b0dd8e1b19744a5620279da1ae8c6962c80db44b9707dc6cd4d3a80cb091b5f4cfeacfeee7f5ebe46d1ecd2a3f720d8ccb73d8be4 WHIRLPOOL f3414b479f126236bef1670a51b46a2c37553f1c37edc912ed121f807926fa2dc87bcc8af1fa079cd12eeb8bc3084a4348948565356621c6a1ec267f40da1235
-EBUILD gtk+-2.24.23-r1.ebuild 8908 SHA256 8344ff0bcb17c8c6713122595630b02153691a178a367cf69f522a91065ef56b SHA512 0eae89264fa06150746117f16eb7dad9ddb6a86fe2e07f4bc1deda736f3099649ec765e7b032a85147276ead5077c3e93d4a913c40b45fc6b8f1c29131abe81f WHIRLPOOL bac28c6d2b59f66b277899a7390e75abbc393b3dda506a87633e1dea3c6edb680a01b433897ba37c899fd09e2ecbc10af83e6bfc285b9db633a4f325d47fc26f
+EBUILD gtk+-2.24.23-r2.ebuild 8992 SHA256 0f405ec957fd0e9941ce2dcca9b8cd4bed68532578c61bff2956a6ea1dbf3188 SHA512 4becfff323491ec2e1dfb25d0de726796535a8d6514afa9a0ecd95feef84d3dbd2ab44069a6eef6a6a484eebec14c0f6f838518c636deb1c4db0806a0fa4dc26 WHIRLPOOL 5eeb4ed02984d5779d08874477ed4c9e73f6bc0d0018ddd1a3e7309217dbc662a6f9ea6d3c134f0ec8eb48512f001b74ac032279608eceb2f79e45a4ddc23416
 EBUILD gtk+-2.24.23.ebuild 7821 SHA256 e96fb4da8b45c90e3ddfaffc15c078e80f485413b6ce031c9fe5122b82096633 SHA512 68492d880062b05e889500a0bef528131b8c33ea312fb5d29587ecf5c9a109998b51c10796533428b0caa384d49250f4abae2ee7fb64c4d569de3f1736f544d5 WHIRLPOOL 4dc248ffea386cb508ce78782becaada1bdc449a325e6b8b9fb155dab2ab9f2b208c1251a41fef330100668677c19fe0766c863ff6c90d9fdff872e161277a6b
 EBUILD gtk+-3.10.8.ebuild 6476 SHA256 538f97ea50eded5aa850c46f2cca1d25f8742700aa0bf69bef2872b06bae83e9 SHA512 69b710dd6ba6f356a6b9f0bb425957b160a39666762d64ffe32839471b7386403dbd9e3f826b2b904b819be7671a256361738b217f2be5afe91d5898be6675cb WHIRLPOOL e0d166bad4fdaec041280aab3f2c77945d584c3919e9a5fdeca0e0c6b2b542ea854983a756dcb21498d447dd7c6f3208dcc99fe62ecddf9a8704990c82ba8cb3
 EBUILD gtk+-3.12.2.ebuild 6511 SHA256 d120d21d768f879991540b2f55f6205b5112e06f73dc8bba96c770893a959d62 SHA512 543e7c90ffdb48e2037927f5829841fc6f23f7dd81be0d50c9d9a2a545d125921e30a28e2ac1cc37b8eec1e3aa80db3c4681bf6c36712b7c8ac939a1bddea0ed WHIRLPOOL 5826fccfcbb9b90473d353d3ff1fe5fad97bf5e1b816bbb3e550352ee8123138ddc8c1ca475c4e4404a7e74b6a55ed20b8ab40f90ba22856b1c90cf998fb971b
 EBUILD gtk+-3.4.4.ebuild 7078 SHA256 5c03753346c92b03ce8876ff2223240855225ac69f8e99ad3d0f594778f4d83c SHA512 2b86d907df0cf1613d4aab3adc4ccbec8960513cd07dcbc41a933587a7cba85d0c7e078158431f5315ec91818f7793d2deed76d4ec643d5df19682193e1b5570 WHIRLPOOL f2196bef499be6eec55554d2dea442f7aa480c13fb590dab010efb6564886bb746b27479265c4ba48a93a0c630e574a37cf319fee228dfda82d333c8e4a3b093
-MISC ChangeLog 14222 SHA256 449c014891a62905288044a79e7b4c62bdeb8d53fe9b01b1d8ef02a14e5ef015 SHA512 59988f306cede94df3207565848aa24614751916782d21cf47815045b293c70958643c68542cfdf962e05beeea8c5f7ad743ec6269067e71c27eb70783069943 WHIRLPOOL 8b4ac251d2ffee0011ea7ab2021290dff0277ca566aae9c51109679515fae163435aa306e5740ee4368b63063ad97461fb8d800fdec64963bc28c2d4aa6df239
+MISC ChangeLog 14400 SHA256 54eadf05a36d8452b8e3a0bcc4980142b8ca37bc1dd6ba9d3c14882a95726f60 SHA512 c426927e6024a3753a782c2ab319d6d221668a6a3f5ab6f730c6fb150d23ffc5f6bfb424a55e34039f92153479bdd9b9c26b95cbf10da82f468c43bee30b09a1 WHIRLPOOL 7aae8536c15b40de7201192356b7af09edbac7c0ccba87b2668f4106c356e2e75f9d2fa46d5632d4435936535a06240095ba055e753089abe46d4f5357a33899
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 848 SHA256 cfb2904b37626135ebeb5e4be0626a51e68d64e211414eefde98b738631d82f0 SHA512 7c0cfa1f2b09ca41911e4f6ccad76becd4f6edf4c5c1a9e3e60eb423b907f08d15c2bfbef378773b9428232d1e7c20bd250eec0b327d073f4de41f815ce92226 WHIRLPOOL 786c7b8987736aaa4fa7b637b84f81e56765f435c77d65aa0afe9409d4bc6c191cf04ad4bab4d7c7b704a2762c828346f1042b408234b38c145abb21df0fbd21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTmcTCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJToIa3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtjsP/3OOvuGrl3OPqJWIYNKO7hEi
-uO8BQJcUfDduy2fvRy0wn6TQsiq70MRxEQov6T/m9OJ1URTRu3MDYMbMySZQat+l
-mkV8xch56Wo/8gfT/e6XPjDWsTsjL0IYAlohSdc7vmR5RIrBjIZGjAzzYPRYONqJ
-D731fcFRFTDUzLMNhdgeg9rM8DOA2Hzjj7iwXrTO1ZiPmU9C+wtapVzmkZxq3bQx
-B/V1A4ZDTSrd5UizRshvxqjk04mMsKdVqPR50j5gDVqsX6aoX/c8cFFxB6UbBvdf
-z6oY0d8CrAC2hIOBsTp4mc+s9V8O/K0k6VrevtUQyHRsQVJCT1h9vHtcyuKDlu1e
-/V1jCbaJG9HDRvE3HJ05kgEhAFiqsX46jLmdFKMpcjUv9vqLOBvcpa5f0XObO8H0
-5ZJ4AaO6TdJfZ+SZ9t5h/a66Cl5I32gtH2T2hsdJkTWKhHoUpTKu3pLZr+0ko29U
-dAjjV3bKQT53noIXXia9+pofho2SJwvUWJ9Rc7bu8ymKh7ddtcDwfAyNUs9uwLI6
-WK0LT+Too5Y60xUwvb9nRYXl5B/XpZIU85KNzgteMw5M907ZH06mqHTLcCSb6yjU
-v/yOQj+mCqa495q0O1E5WBA1eCYZSXEE3pfN4v8j0Fv/q7qet7EwUEb2OKhOi/iI
-/DFUpVUBC2IwhGNHwwCU
-=sJd3
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkyoP/2szmyRrfnJwFsu6nkbskZEJ
+boLL0EvAASIez/rHA9ZwjROGU39kJIdeNBGFr2ZUva7t5DgPG3DY6+txXizGf0fQ
+dHJqCyo7pdjSSieHQUCkLToY2/Qu8Y/Z51Rc7GxWwY4EgQ27mQ2O7lrqcgy8OFCh
+to+ZSnZsxw1qdUlkJYoSX1B9EB98FdR8oYHSeMk7m32lrI/AADZ6MXRjzlo1xNy1
+wgxaHaWMDbnDjdcykgf5zOSKUX3LR6i7KTKIg7kzNsmQd6vsU543CcKAwUuq7rLz
+ok3hVa4VqoJ4NLXQo7wDZB86B45lge/epMTg0bivKcJO1/ASwQ1lW3e45p45dRlK
+v444MU6IPDmh0deHQss9rPCRkAAf+ck1WxVrufF3Rnk2WvD1d3MXcP+StWYTDbUU
+gQEQN9KWuZHZy4wEr3UmVsmyGcqwh1qLvki1/qGmd56wZ0VmF/nCnaiHlJTGQsR5
+N4b5oWgQWncV/AXaJrABfFq9zwzBsEBc4A+okiYbvmneHhuPpvRSOY85q5eYCvB2
+taynpdeFPM8gg6fF+otloCn1LL8J0wWAbxyCIDoSN2Ox7eb0iSXbv0pmaIaTiL6t
+xHcH4lpJSamkUxPklaQuD2HtHmmTur8zyv6GzFFIPHWSVbV65q0n2hDQC9K/o/77
+vAuS8Hht22LWtsFI5eLb
+=33RT
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.23-r2.ebuild
index 3cc37e37fdf5..e94aacc41353 100644
--- a/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild,v 1.2 2014/06/12 15:18:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.23-r2.ebuild,v 1.1 2014/06/17 18:19:33 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -181,7 +181,10 @@ multilib_src_configure() {
 
 	# work-around gtk-doc out-of-source brokedness
 	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
 	fi
 }