Version bump. Notable changes: thumbnails now cached in XDG_CACHE_HOME; more stream classes implement GSeekable/GPollable. Drop old. Remove unused patches. Make license more precise.

Package-Manager: portage-2.2.0_alpha132/cvs/Linux x86_64

15 files changed, 166 insertions, 541 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 3a6093c22119..4860f7729da3 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.532 2012/09/12 04:53:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.533 2012/09/25 11:40:57 tetromino Exp $
+
+*glib-2.34.0 (25 Sep 2012)
+
+  25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/glib-2.24-assert-test-failure.patch,
+  -files/glib-2.25-punt-python-check.patch,
+  -files/glib-2.26.0-disable-locale-sensitive-test.patch,
+  -files/glib-2.26.0-disable-volumemonitor-broken-test.patch,
+  -files/glib-2.26.1-gatomic-header.patch,
+  -files/glib-2.29.18-external-gdbus-codegen.patch, -glib-2.30.2.ebuild,
+  -glib-2.32.3.ebuild, +glib-2.34.0.ebuild,
+  +files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch,
+  +files/glib-2.34.0-testsuite-skip-thread4.patch:
+  Version bump. Notable changes: thumbnails now cached in XDG_CACHE_HOME; more
+  stream classes implement GSeekable/GPollable. Drop old. Remove unused
+  patches. Make license more precise.
 
   12 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.32.4.ebuild:
   Add AS_IF patches from 2.33.x to fix cross-compiling; bug #434770, thanks to
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e1c5c4d889b9..ae1f90e37388 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -8,12 +8,6 @@ AUX glib-1.2.10-m4.patch 225 SHA256 c470b3ecc3b8fd6a2d52df816a1c4ccb3ad2d6048e37
 AUX glib-2.10.3-ia64-atomic-ops.patch 1058 SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8 SHA512 9bbb50dbe113a5e00a4db026b2717a696573844f6be53a4ea2e944b8b4fbe90ba75921503fde52c070986fbce37a7b3ab5fa8abaf702d03faccabb8da2b85dc0 WHIRLPOOL 85a63bdc7876e1fb3988f72487cfb1033007541b8a2eba153069db6649d1323d227de9ce697cb7a265aa2afbf02b3a9e02541cac85bf996ebd653463b559fccd
 AUX glib-2.12.12-fbsd.patch 668 SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d SHA512 8c52dc7af64bedb24389f3567623c7dca60c27fbe87dbb3cb523fd71e08f5a2811ee0a7fe0384177e1b5562bfe1e44073a88c5e84b3cce75664b911f1a5a69da WHIRLPOOL 1a90159aa6ac5f5f5dcb4f7225343af88d43540b802f2588279c60d5f27f51e5411ad29441ad10ad5adb947cf7d73016e93fb02d64203375f851758e680690ab
 AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb SHA512 c6bba3a6278c640679ae783af5726afbaa17778ca8a4cd13efd4f574f33b776e55ef3e4c5e8d2a7a3d0496bf3cce26a27719029aa01b0b8d3f1d667bc8b5d1de WHIRLPOOL 1707097837ccf374654bf40f7142adbfbbd27330cbf4405cbb5250a197da09641c2a5f1c5e468480a869cf8c6bc2162e09700b1e68d87e63710d20dcc2d3c5b6
-AUX glib-2.24-assert-test-failure.patch 724 SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af SHA512 d9757c591b79ff02db12e9f2a58b482b71f0a8c2c1d736b635e4312f73030bea73e3c8debaad9ac8a6f859ec9dd4c18c28f01135cb1fa71092fb2e33101e4137 WHIRLPOOL 7fb76b76c03cdc1266648f81e6762b80fae23a0783fb46754edcde8a41275234c57c808bf31f7b2b3561792279f84c23481aa0b5de30becb86a9e30e388be18c
-AUX glib-2.25-punt-python-check.patch 541 SHA256 eea2b3a2692b93c98ff06b26b784a264391bc61f8434d101c30cb14802234a3e SHA512 1e0128b1fdfbe65d6e60f1bfb8430ce02cd9a410fb88379d263a347cd0be1d483771722fd823e359ca28c3ca7d84c1cafbab65de330c0ce63c605727938c6ade WHIRLPOOL 35b13f9af8e8495347965828668c535de9f58023b90ceac274dd13edd74c6f247b6224916e4b48751478448702dfcbbfd5fd71dfb00a98f47969fcceea4a3d30
-AUX glib-2.26.0-disable-locale-sensitive-test.patch 1256 SHA256 f0db01f4198ca3688ece382819d320f39d6b722381e28611df59c880f4d18e02 SHA512 f96a41158e5f8337a6274171b248d41a695aa4a138f985d55def499178ecc93e244e3edc3563db517b1de9038e86eeb51f11b5f5c602c975326853c88725fdae WHIRLPOOL 9c40c10cd2af65c82f3bb668420777121b0b16bda9c4520453d2953390dc031a5d389e1cda11807bf2a32f9338c2069943dfb67ea26a1131fd317b82bcdfb8b5
-AUX glib-2.26.0-disable-volumemonitor-broken-test.patch 1181 SHA256 aa3075f22a9125551fbce6909645fb6b5c5b74282e6fed2ee1d06853b15437d3 SHA512 61ca679b5e2399f9ca88ac3fdf992b52ced53aab2393cf2b39962d0edfdace60cfe2960f1776dd27512eb71a0737d98c9710805fc9153bd0027f0963f37d38c1 WHIRLPOOL 4e09ce94c8a915f5cf4c3043dfe9735591c06ab73d274c2bc7151e29660d048b4b5e641c205a91f4d26a72eadb0c8981e00f335ec5cc395327cb9d38e1e9374e
-AUX glib-2.26.1-gatomic-header.patch 269 SHA256 81046ce8bdb7b1c863aba9cb457443e92b792807b304d0ee8e7dfd2b6fb7b122 SHA512 2c0ce1f704fdfe66324efc84d4e9c4a1c0190890116e4725758ce7308b403297b2d18a341c92d571fe7e3fe19430707826eebd6af1828e164847ce7f922a5037 WHIRLPOOL 192f5718f02d86f008bf43667f504a1be16a88ae1bd7bdbe4da60ef44bfe49679c54c05f83e074d669dfc4ee19566737c8ce596705f4e45e57b12e4124eb67d0
-AUX glib-2.29.18-external-gdbus-codegen.patch 3099 SHA256 4ddd01367518b22c000732c1ad27a2ff8c24cb7876874b2aecd2ebf8361dfd0b SHA512 0892db57700cf2bf394e3c69e55b2e9b4dde6c7c8368e4fe2d6044bb6f5cbdff16d3034f08696334c8fa99fc351abe9e12846ca218a16d8890fd88f8c050ed91 WHIRLPOOL d6274d58a8f956ded07a9f31ee723ec5f2371f0ace72f91fbe9c1fe677b9aede455f88d2e371e00884168702ca419b59aea405f636701907b22e51fe73367e5e
 AUX glib-2.30.1-external-gdbus-codegen.patch 2293 SHA256 45daf662034806d2858f1b2b43185e6891e9d395acd3bbfb7a81a15541b49078 SHA512 2c84b00f39448ec6a9053d033da7921660350209445cb8b0ac262368e8f784bea6a6c7bcd3dd31a4ad4ca6723468d806a0e0ba2faeed18dd64e46ebde3881b21 WHIRLPOOL 549b49e13cff35120fb56424c5530e5ffbb07dfaa1d8458cd2ff8d58c6c59bc433314b2a511d5ec681528971f9f1f6ebeac1bd42f578cbb76b50f460e6b0245b
 AUX glib-2.30.1-homedir-env.patch 1849 SHA256 4f0e149703a9aadc4fb568b9fa00419b9848b345b19d3cc9e1a2bd67985ea25b SHA512 2957df95ac0d927f9d18369396c71debc5d20a3c867dcde8c2254da401e7db25bed4889a15e5d46ddcea64fdefb4d33de6840c67ab9e7967fb1188bc4d702d83 WHIRLPOOL 726029ae6f42ee3b5cdb66ad21b734ac879414827d455e6ded02d2f7eb6d3ca337f4043871efc48fed6ee353d2805339c317895ad7d8b06c667d217281ecdbae
 AUX glib-2.30.2-machine-id.patch 1077 SHA256 c8341c9025bfaa728cb69ad6ee47040aba2309046050dbb357def72cf90413f4 SHA512 b599d66a2ef88da72bd1106e54a8c175972dc8c53bf79dc900ca4df5534cb4aa4fba9d628a565f40ab34c3131afac2cd12be48517e3655acb217606e46195a7e WHIRLPOOL 7601dc934c1985d31fc53a868903b919d66ea1cc67fb57c867d2a6a1f31f05655192d178145d8c5fd4c10d31a846041288f32c3b9d3edd7d3a74309b48c2b12a
@@ -22,29 +16,29 @@ AUX glib-2.30.3-assert-test-failure.patch 752 SHA256 2c7473f49b2ef928714af3e514f
 AUX glib-2.30.3-closure-64bit-be.patch 8029 SHA256 15b0fc9e64411678321f00fd31e3622d1267f9b0c1a55b6b568a2f09e8b0f23f SHA512 0e194029c417245c64c5f67c935730fa7ef53c852ca74d99835a7c56d89fd4d0da566004bfe40c3b07e1d7835e1383947abdb4a5720d56b5c7559aa281b10a91 WHIRLPOOL a222a5b46b8df5c77b165356356172eefda9b3914c868a701f61a49361c7891d1ea10b76e17086205ead936b07dcdd13551a18f1a7811d78257759deb7732f00
 AUX glib-2.31.x-external-gdbus-codegen.patch 3504 SHA256 47a0f2f2a99a50042063952994c8538097dee14ea5b2ca39f1c168092c645c6e SHA512 30d8d57bd67047eef5276309734b73eba6026309f3f261f74d0eb96a87e9e8733e44b63e65c765b9ace89ba6b0c8df438785f9aa1a8a297e6da261906a4c11a7 WHIRLPOOL c64cdb643d36df9b20f386aee75f285f3cf17366f2ec3a93370e365a54d72454085cbd3b043ca4fd919115575d46c07a5bf972dee4981aab736bc9da0ca41203
 AUX glib-2.32.4-bashcomp.patch 843 SHA256 262a3689dc030712eea1349ee96cbf21123b0329c78629e2e80cd9917ac415fb SHA512 6e9f5678ccc7ea4317eba53294151d4a2e14f0aac9f2891ff6a8ba4679758386d6e5853c79f0f9fe828b83771da2498c52c69c7a329847e9fb2fd36acceb6f43 WHIRLPOOL 87d57428ef8626ab9f207e6a7df896748912c717fdc8aef3ebf1de73b72899fd5adfd97800ec4ce2fd38528f16267778a26492f79a85dd42f99734e1fa299ffb
+AUX glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch 1784 SHA256 00ff3dd00872158eaf5a9e622d0877b8003c16880af07ceb9fed4d4bdfba69a1 SHA512 1001f6b24033187db50568a24bfaea9cdd0e70721a9cba988f3a64e75725ded31d23fe7d6d7dbb81678632a44770639ee36c6ab7a79bae0fa764a8b467d6e104 WHIRLPOOL 211ad59497093b34c313f22884b0a29a7a9973167e6a56f4737962d590b30ae7fd2dd9b1d9843c6d247cba8ee0d866cb1981a30c363aa19c711d32145a15e345
+AUX glib-2.34.0-testsuite-skip-thread4.patch 1312 SHA256 65ed09251a66b096df38431fde13335038e26c4fa973534af68948757801a3a5 SHA512 d64799f42d269e33295a2aca3728a762508ab06bf8cc20c399ab926095a884a73795fc0b5d3806c16c0f579472d06e945f332df96be0b4307b7d5c289e03591f WHIRLPOOL 8da1696ce6fd7fac83bef9563baf71e2b67b3e194ab3e631d238dc6e0a2d5493dc7a7f3af61bfa64a2023b0554ecaf3c523e7d9edea30e22f3615186e63f14cc
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
 DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
-DIST glib-2.30.2.tar.xz 5818860 SHA256 f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82 SHA512 803f5de2d0c14c1631e59b618880ec32f060c2e475411ad662635f168013f2a5a5e1e38703d6f16894f5435e12268d961bba5bbf955a6e1d8279968f06f192dc WHIRLPOOL 7f3d3d99897c1fc3fbb89ed14a5829a4bf88649ea70fbe7aaab0eef774c20ac7508129ef1558e3a074d36c7e5a913f556ebaac1b2f0eeba9bbddce3fcaed24f3
 DIST glib-2.30.3.tar.xz 5642448 SHA256 e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27 SHA512 9f212b2c94c8c76ed619a1a97515ffc4c71dd39a982852cc9db600ca3034be1fb646d657dd39831f2fe80a81972400b977ea59fa81923dfe646158c9f1ab8843 WHIRLPOOL 145e20955b0ce2b44e05833bd508ac03a0399fc4d4c1c551c6a05809e6922cd57c37c5b32ebbe80f7ba0a21660059d7cb4837fa233de37af6c12cd0bc3a7afeb
-DIST glib-2.32.3.tar.xz 6164984 SHA256 b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d SHA512 e730231f45cff9a1e2041d26bda0eaaf71af27daae054884860e625768a53ca74cf75b30b86a82a12b804820513a12b156e8e023528956dbb8e7cda4aef5f318 WHIRLPOOL 2ac21548bb1b514ef552f0a254618127342ec87e76e1bee71a121cd754fca5b81395b53aef0ad451bc975572970c9b32cbb3560c5f18927341a2fa2bffabeea8
 DIST glib-2.32.4-AS_IF-patches.tar.xz 8584 SHA256 c61a87bbed8b09148f70f2651696430ab262d8ee905ebe2e0e963bb9038c5545 SHA512 cea825c379ea9014014f8a6f3a9fcf228e6b4245c649df4d86f6d86d1d655fd927ef1115fd66521cc48b2929d8cd504a284c7a8fb5ff38dc2b83ac4140655049 WHIRLPOOL e778094ad8ebe6fdc236942c21ee8ce2266712a08672b521f931159dd81d3452fcb8b6556c98c82b60548b1d9703a3ff332d02970a01565b6f5c4bcd02e74b46
 DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 SHA512 bc8b2d6afae7635f940065eca3e854ee171812c7b582d55313db11d28875495dbf41fc0a260347b30f7490daa65ccc377d8a2d60bb3a26d07997606d8e3d989f WHIRLPOOL 35aec94088acff460685c0b1bb2e6fcffadb0f9f0044b93f3fa042ed82dd52efb5e56022575c0ebcfda4230d38edc26a916623f0bfcbfc8e1c6b76a3133d43bc
+DIST glib-2.34.0.tar.xz 6368532 SHA256 f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144 SHA512 b3aa98320b68b6d1aedc5cdbd4e271aa464e933db5741eeda0fb48e950c42c9be5c33166294998be79ea574733d337fc427c89810ea1a3496cfd00ccacd0b703 WHIRLPOOL e8b1f07fc7b9ac86b1a82db827e734c1d3cf5e52be63f9c48e5f00d6dbbc9537005db66025877886e1eb3da0924bcf0065b5e0fcb212f5f16d89ad025bb7059b
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
-EBUILD glib-1.2.10-r5.ebuild 1777 SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36 SHA512 80973aab759863ce192ad816f11b0b9d30d63f6f26cfde662ed4e670f1ca53cdf9bc59f8f3badc376e6a80cf4093efb380d4e2e6562c40304dadfd62f706cd3b WHIRLPOOL bf29e97e6a29c08023d6ce33180338b7435a90ebd70d215bdbb455536438e4d5d8a6b5767023ac1a48872542a0ec6bea490c103d88991cbe6b4d7ba709223473
-EBUILD glib-2.30.2.ebuild 8731 SHA256 8bd0f1f635033df37befa09d87e3cf1be2e7b645ba654d6599d43387322f0875 SHA512 902468c5ae52071351e1240e8cc678038080e75df38fdb63ec3f1841140e114045c0de4437f540e991e164b6868b328a7e235deb0c7414eca81e80a11f320794 WHIRLPOOL c0142a8adb94c7fbb50ad41775829008ed953d1cf97f208759d31e8dc20a6fcd782fdf8d34bad0b18c702e27ef47f1bc65d29cab77e58f03a22438b256b4927d
-EBUILD glib-2.30.3.ebuild 8946 SHA256 713dd8fd4906cd819b770475ee63eaa92e0e240263e8afe0454abc71233ecfaa SHA512 6bef0bd099fae5cdb4941b10905d9def2c4fe03d2849805c21ddcf4d5e2e157a06810e0cd9ddd8ddea5b03704e0f022ae3b0fb09341b70bc74af837fe1b6f3da WHIRLPOOL 9d1854d553fa52da7393653489edfbd2f3edd329e9097b6b39893aa6c94923b410bdec104790af26ef8b0c25d792fece135333ed35401aba06026ecbeadff6fa
-EBUILD glib-2.32.3.ebuild 8373 SHA256 6ef547500d0a800b4336ee0d2beb9fec8b09451dd4dd9801b041a42cff4ee028 SHA512 8b61740a532bfc4d972f0a505d07356491f7ecdc4e3c6d1b2603bf241ef3c60aa1ed535fbc8d3538fc880bf00f1581b0cc4c5d56bda0278ca2b9eb6f9c316092 WHIRLPOOL 305f9b52ffd730ea5437f89e131ae8c04b627e67dd6c733b55fc5eef99f7ce70503c0e712b573f0a225662914d9636e7c6355478aad33c6518eb2874662d9bb9
-EBUILD glib-2.32.4.ebuild 8245 SHA256 b57183b376695bd0cac341e554f0b92a2ec9647340a584331dfdf7f2dc877265 SHA512 bb689aa1aafdca401260b8e107b5cad62a629ab3c012a28f50d30b97f1b35e977555cfe56e0dfa0f893e86ddb699ddede6f1cf31cfd71a3759e798b5244a96ec WHIRLPOOL 7ed779ded4070b33a70e07cc3806b962e32027272cb8943b173eec9cc26e4c89aa19ed3a837dbf1e171f033e46a180cdd804725bde623a8b330e2876f057afb0
-MISC ChangeLog 72415 SHA256 38822353ef20bf33159d1c4b6b6e12d260bf0c235f5d657ce3813167601fb1be SHA512 00c47ab29e6e531adf8278eeac8d674c143caff610afeb677de4f092e3999355eccd65cbd4861da30d60018db0fd22f469d1fa55ef59dd7ee15ea661f86addf3 WHIRLPOOL 7909a828fddb7580bce11f1ba1776f62b53def22a603c6e471e451cdb6adbed8c568d86cdaa35d5470b282ad280858099c9c7b261d62c3747d488b588dc5e910
+EBUILD glib-1.2.10-r5.ebuild 1782 SHA256 1ac935da2188aa1ed04e5db79d8637f519fdfa9d9a64dd8a978cbf31bb056486 SHA512 6d9f9839be66df0f343f4dd39c6f88524e8acc45c747ef0ce7507c24296d0550c8b1c13efa396a6a65f31033d62f064cbc0fc7c7b8b28b2eabe22387b611fa15 WHIRLPOOL b5967b8704e5ce04f41a03bb108ccaffa628f02add1b67803e8b0a531d7f345b9a0c458388da90262a53e76fd96dae7a82cab391fc5e6404c6b2ff7d43164f54
+EBUILD glib-2.30.3.ebuild 8947 SHA256 5adf86b28c2f555619519c2115c971bbc82547066334979c9dcc7acbf0bba05a SHA512 947fd2af003c94fd63aaa164e14fba68e7b00f22f8c4e8eca30a9e3d4158e342d6739b44c7ec5e64f4d1fc901b8ba45b8563e8b5d47771f43b7f932e6d382888 WHIRLPOOL fb97179c951d9c55fb2231e817ac74e0fa28d908b29b1df3d577bfcc2156436799e9dd0c10ff141a2022a7482a45d20c2d9e49844336d434277842d57313cd6d
+EBUILD glib-2.32.4.ebuild 8246 SHA256 966615a2061ad8ce82d9a58462bb8dfbcbcea5fb50e2113f41f0a46dec7b63af SHA512 0b102416d21f9d3b65ffa819796b4b8fab1bf5a3efa9107a8b4536c8ba86e969727b943d4241e8c06571e5ae86b3e3cc47abb763c475c35042b8dc32f918bd08 WHIRLPOOL 3adcb5dcebaefb184acf67e540651fbb0df99af82ccddfd305d2773bc86def846051da5ce0f4a38ca912d02da4a2fa938c03f3a917a2c05d8baf9cedfe4a48e3
+EBUILD glib-2.34.0.ebuild 8212 SHA256 7aaa358e3b5e676495178206aa5e586c7811bb068d69d7b71d17757243b355e0 SHA512 c0ea7e9f993b4890bde6e5feb891157cc4ffac048dce51587736ee1cc88cdfc88245d8fe28652793679a026b64a3bf880e576231636daef0f2e7d95cd0e4e3fc WHIRLPOOL 1c03a5e27b974e6a8267c19a563e46b691aa8e29f3353e5a57b9fa51a6da38527b6e4dea92ece49dce6db051de23a171e836f77d9d853e73a19e38b347432f3c
+MISC ChangeLog 73173 SHA256 616e92e2f8caf8abb34aa892c79aeec9c6f09c582ba0e3fedf5c5d9896425fec SHA512 c1fd65bc174ee0a311f2b69695faa7b1b5eca6231728dbcd1408558428ba1dc0fe7be2f398f53c0c2cbd7490f8fd0cfc6ff08b826f6cc90684bc14a13dd7a571 WHIRLPOOL 0dad98261ebf7b16536b5f142cab59a3d5f0d0c4ac372a384940c62bccf916964e8640a32c14271ae845c5cdc98786994f7f2da64022504d7d1136d3cac20f59
 MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb SHA512 b1083fad61b609c0f01421745147cf7bbf3964d5d8fa95e5f0db7e38443a4038404103abf87cba9ce6809683f089fe71f8b080ce464964befff336db7e8c1d2f WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQUBVbAAoJEJ0WA1zPCt1hDQUH/RTsCSWqul+Az+9kPYWudr8W
-p0rNO9clRD0Tjy2rqUxu8YByolP7rNR1wZXgc4UKEcb9Ak31ODzsre8ctXByRfwi
-E7J8Mj4HhN6SJdHeIzAOsnlZWdJ4WHvQYHj4vY/LtRHWzsWKMhcDPyk9Ph/1ZoPx
-zAlndHqgGeTATFyWWkb6ueTDBtlyMzsuBT7qrK3P3QjEuiHdG6L/5FYf70xEHnR+
-4w6kqKuYzFy/ZZu97LmxLxahBFtKtM2bd94FWDyW02Err7P+p9tjqjvAn0rXPyG0
-mv3sx15KXVzOz4Mzv7fSLL1RBgNAgPgIGTShXcftDSonpQomu5iQBM0YUTwNW3w=
-=zaJS
+iQEcBAEBCAAGBQJQYZhPAAoJEJ0WA1zPCt1hHl8IAL06+GSJCZCGDXnSxA18bYAR
+gR2qbvhjV5lfK6O27uaO9f4UbINtpxyPe5iOIcOvXE3qKAKqUfhsFTFNnMp/hKvY
+OdrI8jdaeikY/4FcR5y/xL1CuAWstDYhMq4Eb1gkgq/ObJKRKtpKyP0JuFUX32x4
+U+NdDC6KsfXlt7YbHa43C/TsSJ62M0xe7L3DqJrC/akyRkL6lW/AjvKH9DrVgavk
+BZCExHEvF7CLh5bjDWw/ynHk/edI482bt+6LhPV0yr0KXF1VKgfTgk0yYZ9jePJX
+sZDbALTId/6OExeNea+6QoyeRZ6Cy2pY4pyI9S0h/9qmFPdjIJIqb+hwxPsPdDM=
+=plEO
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
deleted file mode 100644
index 6d8e74f32500..000000000000
--- a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed
-because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This
-causes gdb to use the system-wide glib instead, and fail on the test.
-
-This patch exports LD_LIBRARY_PATH before running gdb
-
-https://bugzilla.gnome.org/621368
-
----
---- tests/run-assert-msg-test.sh
-+++ tests/run-assert-msg-test.sh
-@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
-        msg_test="lt-$msg_test"
- fi
- echo_v "Running gdb on assert-msg-test"
-+export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH"
- OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
-   fail "failed to run gdb"
- 
diff --git a/dev-libs/glib/files/glib-2.25-punt-python-check.patch b/dev-libs/glib/files/glib-2.25-punt-python-check.patch
deleted file mode 100644
index 077ebf440fcd..000000000000
--- a/dev-libs/glib/files/glib-2.25-punt-python-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove python detection from configure.in, we won't be installing the gdb python
-scripts anymore. They use a redhat-specific gdb module that has not been
-upstreamed yet.
-
-https://bugs.gentoo.org/291328
-https://bugzilla.gnome.org/623552
----
---- configure.ac
-+++ configure.ac
-@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
- fi
- AC_SUBST(PERL_PATH)
- 
--# Need suitable python path for greport
--AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
--
--
- dnl ***********************
- dnl *** Tests for iconv ***
- dnl ***********************
diff --git a/dev-libs/glib/files/glib-2.26.0-disable-locale-sensitive-test.patch b/dev-libs/glib/files/glib-2.26.0-disable-locale-sensitive-test.patch
deleted file mode 100644
index 235d5c73e057..000000000000
--- a/dev-libs/glib/files/glib-2.26.0-disable-locale-sensitive-test.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3a02a86a0a413304843c1cfad359922322486da6 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 6 Oct 2010 23:21:01 +0200
-Subject: [PATCH 1/2] gsettings: disable locale sensitive test.
-
----
- gio/tests/gsettings.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
-index fdadf96..4d19618 100644
---- a/gio/tests/gsettings.c
-+++ b/gio/tests/gsettings.c
-@@ -625,14 +625,14 @@ test_l10n (void)
-   g_free (str);
-   str = NULL;
- 
--  setlocale (LC_MESSAGES, "de_DE");
-+  /*setlocale (LC_MESSAGES, "de_DE");
-   str = g_settings_get_string (settings, "error-message");
-   setlocale (LC_MESSAGES, locale);
- 
-   g_assert_cmpstr (str, ==, "Unbenannt");
-   g_object_unref (settings);
-   g_free (str);
--  str = NULL;
-+  str = NULL;*/
- 
-   g_free (locale);
- }
-@@ -666,14 +666,14 @@ test_l10n_context (void)
-   g_free (str);
-   str = NULL;
- 
--  setlocale (LC_MESSAGES, "de_DE");
-+  /*setlocale (LC_MESSAGES, "de_DE");
-   g_settings_get (settings, "backspace", "s", &str);
-   setlocale (LC_MESSAGES, locale);
- 
-   g_assert_cmpstr (str, ==, "Löschen");
-   g_object_unref (settings);
-   g_free (str);
--  str = NULL;
-+  str = NULL;*/
- 
-   g_free (locale);
- }
--- 
-1.7.3
-
diff --git a/dev-libs/glib/files/glib-2.26.0-disable-volumemonitor-broken-test.patch b/dev-libs/glib/files/glib-2.26.0-disable-volumemonitor-broken-test.patch
deleted file mode 100644
index 34fad9e2d841..000000000000
--- a/dev-libs/glib/files/glib-2.26.0-disable-volumemonitor-broken-test.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8eb4fb83d0933d09bb6ef0ec1511a6b0eb2cee9b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 6 Oct 2010 23:21:22 +0200
-Subject: [PATCH 2/2] volumemonitor: disable failing test
-
----
- gio/tests/volumemonitor.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gio/tests/volumemonitor.c b/gio/tests/volumemonitor.c
-index 54123ec..df19b58 100644
---- a/gio/tests/volumemonitor.c
-+++ b/gio/tests/volumemonitor.c
-@@ -112,7 +112,7 @@ test_connected_drives (void)
-   g_list_free (drives);
- }
- 
--static void
-+/*static void
- test_volumes (void)
- {
-   GList *volumes, *l;
-@@ -131,7 +131,7 @@ test_volumes (void)
- 
-   g_list_foreach (volumes, (GFunc)g_object_unref,  NULL);
-   g_list_free (volumes);
--}
-+}*/
- 
- static void
- test_mounts (void)
-@@ -173,7 +173,7 @@ main (int argc, char *argv[])
-   monitor = g_volume_monitor_get ();
- 
-   g_test_add_func ("/volumemonitor/connected_drives", test_connected_drives);
--  g_test_add_func ("/volumemonitor/volumes", test_volumes);
-+  //g_test_add_func ("/volumemonitor/volumes", test_volumes);
-   g_test_add_func ("/volumemonitor/mounts", test_mounts);
- 
-   ret = g_test_run ();
--- 
-1.7.3
-
diff --git a/dev-libs/glib/files/glib-2.26.1-gatomic-header.patch b/dev-libs/glib/files/glib-2.26.1-gatomic-header.patch
deleted file mode 100644
index f6454d446bbd..000000000000
--- a/dev-libs/glib/files/glib-2.26.1-gatomic-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-glib_gatomic_c,v 1.1 2010/10/10 10:52:04 kili Exp $
---- glib/gatomic.c.orig	Thu Sep 23 17:26:45 2010
-+++ glib/gatomic.c	Sun Oct 10 11:50:01 2010
-@@ -28,6 +28,7 @@
- #endif
- 
- #include "gatomic.h"
-+#include "gthread.h"
- #include "gthreadprivate.h"
- 
- /**
diff --git a/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
deleted file mode 100644
index abec0dd72282..000000000000
--- a/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 89a3234d52451cadb21c322931adb6e8928eb21d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 24 Aug 2011 21:35:59 -0400
-Subject: [PATCH] Use an external gdbus-codegen package
-
----
- configure.ac                                       |    4 +---
- docs/reference/gio/Makefile.am                     |    3 +--
- gio/Makefile.am                                    |    2 +-
- gio/tests/Makefile.am                              |    4 +---
- gio/tests/gdbus-object-manager-example/Makefile.am |    4 +---
- 5 files changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dc23b8b..0bb0c4a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -365,7 +365,7 @@ fi
- AC_SUBST(PERL_PATH)
- 
- # Need suitable python path for greport
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
- 
- 
- dnl ***********************
-@@ -3858,8 +3858,6 @@ gobject/tests/Makefile
- gthread/Makefile
- gthread/tests/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
--gio/gdbus-2.0/codegen/config.py
- gio/xdgmime/Makefile
- gio/inotify/Makefile
- gio/libasyncns/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 9eb0fce..511aec9 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -79,8 +79,7 @@ man_MANS =			\
- 	gio-querymodules.1	\
- 	glib-compile-schemas.1	\
- 	gsettings.1		\
--	gdbus.1			\
--	gdbus-codegen.1
-+	gdbus.1
- 
- if ENABLE_MAN
- 
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 7803bb2..d4a08e5 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
- 
- NULL =
- 
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
- 
- if OS_UNIX
- SUBDIRS += libasyncns xdgmime
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index a85ea4f..8fbe8ec 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -261,9 +261,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
- 
- if OS_UNIX
- gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.project. \
- 		--generate-c-code gdbus-test-codegen-generated \
- 		--c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 5e6eb9a..8b16926 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -22,9 +22,7 @@ GDBUS_GENERATED = 										\
- 	$(NULL)
- 
- $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- 		--c-namespace Example \
- 		--c-generate-object-manager \
--- 
-1.7.6.1
-
diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch
new file mode 100644
index 000000000000..aff75cbeff58
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch
@@ -0,0 +1,62 @@
+From 6e6aa7de746b78bc5fc6d2cad1cac762f6d2205f Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 3 Jul 2012 12:50:44 +0300
+Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1
+ tests
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679308
+---
+ gio/tests/gdbus-auth.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c
+index 737770e..9f42c24 100644
+--- a/gio/tests/gdbus-auth.c
++++ b/gio/tests/gdbus-auth.c
+@@ -89,11 +89,14 @@ auth_client_external (void)
+   auth_client_mechanism ("EXTERNAL");
+ }
+ 
++#if 0
++// https://bugzilla.gnome.org/show_bug.cgi?id=679308
+ static void
+ auth_client_dbus_cookie_sha1 (void)
+ {
+   auth_client_mechanism ("DBUS_COOKIE_SHA1");
+ }
++#endif
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
+@@ -250,11 +253,13 @@ auth_server_external (void)
+   auth_server_mechanism ("EXTERNAL");
+ }
+ 
++#if 0
+ static void
+ auth_server_dbus_cookie_sha1 (void)
+ {
+   auth_server_mechanism ("DBUS_COOKIE_SHA1");
+ }
++#endif
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
+@@ -272,10 +277,14 @@ main (int   argc,
+   session_bus_up ();
+ 
+   g_test_add_func ("/gdbus/auth/client/EXTERNAL",         auth_client_external);
++#if 0
+   g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1);
++#endif
+   g_test_add_func ("/gdbus/auth/server/ANONYMOUS",        auth_server_anonymous);
+   g_test_add_func ("/gdbus/auth/server/EXTERNAL",         auth_server_external);
++#if 0
+   g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1);
++#endif
+ 
+   ret = g_test_run();
+ 
+-- 
+1.7.8.6
+
diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
new file mode 100644
index 000000000000..f409094a9319
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
@@ -0,0 +1,44 @@
+From 8a8112aad6dc98aaaf9767b31e48f5ae8fabd858 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 3 Jul 2012 11:21:56 +0300
+Subject: [PATCH] Gentoo: skip over thread/thread4 test failure
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679306
+---
+ glib/tests/thread.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/glib/tests/thread.c b/glib/tests/thread.c
+index 29b3850..ffe8087 100644
+--- a/glib/tests/thread.c
++++ b/glib/tests/thread.c
+@@ -124,6 +124,8 @@ test_thread3 (void)
+   g_assert_cmpint (GPOINTER_TO_INT(result), ==, 9);
+ }
+ 
++#if 0
++// https://bugzilla.gnome.org/show_bug.cgi?id=679306
+ /* test that thread creation fails as expected,
+  * by setting RLIMIT_NPROC ridiculously low
+  */
+@@ -152,6 +154,7 @@ test_thread4 (void)
+     g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret));
+ #endif
+ }
++#endif
+ 
+ static void
+ test_thread5 (void)
+@@ -195,7 +198,9 @@ main (int argc, char *argv[])
+   g_test_add_func ("/thread/thread1", test_thread1);
+   g_test_add_func ("/thread/thread2", test_thread2);
+   g_test_add_func ("/thread/thread3", test_thread3);
++#if 0
+   g_test_add_func ("/thread/thread4", test_thread4);
++#endif
+   g_test_add_func ("/thread/thread5", test_thread5);
+   g_test_add_func ("/thread/thread6", test_thread6);
+ 
+-- 
+1.7.8.6
+
diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild
index f2335ade2aa2..57b2e37b9a4d 100644
--- a/dev-libs/glib/glib-1.2.10-r5.ebuild
+++ b/dev-libs/glib/glib-1.2.10-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.54 2011/06/05 13:12:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.55 2012/09/25 11:40:57 tetromino Exp $
 
 inherit autotools libtool flag-o-matic eutils portability
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
 	 ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${P}.tar.gz
 	 mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="hardened"
diff --git a/dev-libs/glib/glib-2.30.2.ebuild b/dev-libs/glib/glib-2.30.2.ebuild
deleted file mode 100644
index 962deac199c3..000000000000
--- a/dev-libs/glib/glib-2.30.2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.15 2012/09/11 18:03:21 tetromino Exp $
-
-EAPI="4"
-PYTHON_DEPEND="utils? 2"
-# Avoid runtime dependency on python when USE=test
-
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2"
-SLOT="2"
-IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-
-RDEPEND="virtual/libiconv
-	virtual/libffi
-	sys-libs/zlib
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )
-	utils? ( >=dev-util/gdbus-codegen-${PV} )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.15
-	doc? (
-		>=dev-libs/libxslt-1.0
-		>=dev-util/gdbus-codegen-${PV}
-		>=dev-util/gtk-doc-1.15
-		~app-text/docbook-xml-dtd-4.1.2 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		=dev-lang/python-2*
-		>=dev-util/gdbus-codegen-${PV}
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2"
-PDEPEND="x11-misc/shared-mime-info
-	!<gnome-base/gvfs-1.6.4-r990"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-pkg_setup() {
-	# Needed for gio/tests/gdbus-testserver.py
-	if use test ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# Don't fail gio tests when ran without userpriv, upstream bug 552912
-	# This is only a temporary workaround, remove as soon as possible
-#	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
-	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
-
-	# Do not try to remove files on live filesystem, upstream bug #619274
-	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-		-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-	# need to build tests if USE=doc for bug #387385
-	if ! use test && ! use doc; then
-		# don't waste time building tests
-		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
-	else
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
-	fi
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch"
-
-	# Handle the G_HOME environment variable to override the passwd entry, upstream bug #142568
-	epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch"
-
-	# Fix hardcoded path to machine-id wrt #390143
-	epatch "${FILESDIR}/${PN}-2.30.2-machine-id.patch"
-
-	# disable pyc compiling
-	echo '#!/bin/sh' > py-compile
-
-	# Needed for the punt-python-check patch, disabling timeout test
-	# Also needed to prevent croscompile failures, see bug #267603
-	# Also needed for the no-gdbus-codegen patch
-	AT_M4DIR="${WORKDIR}" eautoreconf
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! has_version virtual/pkgconfig; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# Always use internal libpcre, bug #254659
-	econf ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable doc man) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		--enable-regex \
-		--with-pcre=internal \
-		--with-threads=posix
-}
-
-src_install() {
-	local f
-
-	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
-	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
-
-	if ! use utils; then
-		rm "${ED}usr/bin/gtester-report"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	dodoc AUTHORS ChangeLog* NEWS* README
-
-	insinto /usr/share/bash-completion
-	for f in gdbus gsettings; do
-		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f}
-	done
-	rm -rf "${ED}/etc"
-
-	# Completely useless with or without USE static-libs, people need to use
-	# pkg-config
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-src_test() {
-	gnome2_environment_reset
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check
-}
-
-pkg_preinst() {
-	# Only give the introspection message if:
-	# * The user has gobject-introspection
-	# * Has glib already installed
-	# * Previous version was different from new version
-	if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
-		ewarn "You must rebuild gobject-introspection so that the installed"
-		ewarn "typelibs and girs are regenerated for the new APIs in glib"
-	fi
-}
-
-pkg_postinst() {
-	# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
-	if has_version dev-libs/dbus-glib; then
-		ewarn "If you experience a breakage after updating dev-libs/glib try"
-		ewarn "rebuilding dev-libs/dbus-glib"
-	fi
-
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}
diff --git a/dev-libs/glib/glib-2.30.3.ebuild b/dev-libs/glib/glib-2.30.3.ebuild
index 403170af0502..c0ffe217cd99 100644
--- a/dev-libs/glib/glib-2.30.3.ebuild
+++ b/dev-libs/glib/glib-2.30.3.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/dev-libs/glib/glib-2.30.3.ebuild,v 1.12 2012/09/11 18:03:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.3.ebuild,v 1.13 2012/09/25 11:40:57 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/"
 SRC_URI="${SRC_URI}
 	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
diff --git a/dev-libs/glib/glib-2.32.4.ebuild b/dev-libs/glib/glib-2.32.4.ebuild
index 06b9b89ca186..ce20cecfc18b 100644
--- a/dev-libs/glib/glib-2.32.4.ebuild
+++ b/dev-libs/glib/glib-2.32.4.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/dev-libs/glib/glib-2.32.4.ebuild,v 1.4 2012/09/12 04:53:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4.ebuild,v 1.5 2012/09/25 11:40:57 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -14,7 +14,7 @@ SRC_URI="${SRC_URI}
 	http://dev.gentoo.org/~tetromino/distfiles/glib/${P}-AS_IF-patches.tar.xz
 	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/dev-libs/glib/glib-2.32.3.ebuild b/dev-libs/glib/glib-2.34.0.ebuild
index f398869292ee..d667bae83edf 100644
--- a/dev-libs/glib/glib-2.32.3.ebuild
+++ b/dev-libs/glib/glib-2.34.0.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/dev-libs/glib/glib-2.32.3.ebuild,v 1.3 2012/09/11 18:03:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.0.ebuild,v 1.1 2012/09/25 11:40:57 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/"
 SRC_URI="${SRC_URI}
 	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -23,18 +23,18 @@ RDEPEND="virtual/libiconv
 	sys-libs/zlib
 	|| (
 		>=dev-libs/elfutils-0.142
-		>=dev-libs/libelf-0.8.11 )
+		>=dev-libs/libelf-0.8.12 )
 	xattr? ( sys-apps/attr )
 	fam? ( virtual/fam )
 	utils? ( >=dev-util/gdbus-codegen-${PV} )"
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-libs/libxslt-1.0
 	>=sys-devel/gettext-0.11
 	>=dev-util/gtk-doc-am-1.15
 	doc? (
-		>=dev-libs/libxslt-1.0
 		>=dev-util/gdbus-codegen-${PV}
-		>=dev-util/gtk-doc-1.15
-		~app-text/docbook-xml-dtd-4.1.2 )
+		>=dev-util/gtk-doc-1.15 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
 		sys-devel/gdb
@@ -49,7 +49,7 @@ PDEPEND="x11-misc/shared-mime-info
 
 pkg_setup() {
 	# Needed for gio/tests/gdbus-testserver.py
-	if use test ; then
+	if use test; then
 		python_set_active_version 2
 		python_pkg_setup
 	fi
@@ -63,23 +63,10 @@ pkg_setup() {
 src_prepare() {
 	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
 
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
 	# Fix gmodule issues on fbsd; bug #184301
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
 
-	# need to build tests if USE=doc for bug #387385
-	if ! use test && ! use doc; then
-		# don't waste time building tests
-		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
-	else
+	if use test; then
 		# Do not try to remove files on live filesystem, upstream bug #619274
 		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
 			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
@@ -113,6 +100,14 @@ src_prepare() {
 	# gdbus-codegen is a separate package
 	epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
 
+	# bashcomp goes in /usr/share/bash-completion
+	epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=679306
+	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=679308
+	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-gdbus-auth-tests.patch"
+
 	# disable pyc compiling
 	use test && python_clean_py-compile_files
 
@@ -147,16 +142,21 @@ src_configure() {
 	# -- compnerd (3/27/06)
 	use debug && myconf="--enable-debug"
 
+	# need to build tests if USE=doc for bug #387385
+	if use doc || use test; then
+		myconf="${myconf} --enable-modular-tests"
+	fi
+
 	# Always use internal libpcre, bug #254659
 	econf ${myconf} \
 		$(use_enable xattr) \
-		$(use_enable doc man) \
 		$(use_enable doc gtk-doc) \
 		$(use_enable fam) \
 		$(use_enable selinux) \
 		$(use_enable static-libs static) \
 		$(use_enable systemtap dtrace) \
 		$(use_enable systemtap systemtap) \
+		--enable-man \
 		--with-pcre=internal \
 		--with-threads=posix
 }
@@ -179,12 +179,6 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog* NEWS* README
 
-	insinto /usr/share/bash-completion
-	for f in gdbus gsettings; do
-		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f}
-	done
-	rm -rf "${ED}/etc"
-
 	# Completely useless with or without USE static-libs, people need to use
 	# pkg-config
 	find "${D}" -name '*.la' -exec rm -f {} +