Version bump, drop old

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

12 files changed, 79 insertions, 814 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 713d6f1cd5a5..86a2f85219a7 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.555 2013/04/07 17:33:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.556 2013/04/23 19:02:39 pacho Exp $
+
+*glib-2.36.1 (23 Apr 2013)
+
+  23 Apr 2013; Pacho Ramos <pacho@gentoo.org> +glib-2.36.1.ebuild,
+  -files/glib-2.10.3-ia64-atomic-ops.patch,
+  -files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch,
+  -files/glib-2.30.1-external-gdbus-codegen.patch,
+  -files/glib-2.30.1-homedir-env.patch, -files/glib-2.30.2-machine-id.patch,
+  -files/glib-2.30.2-missing-decls.patch,
+  -files/glib-2.30.3-assert-test-failure.patch,
+  -files/glib-2.30.3-closure-64bit-be.patch, -glib-2.30.3.ebuild,
+  -glib-2.34.2.ebuild:
+  Version bump, drop old
 
   07 Apr 2013; Gilles Dartiguelongue <eva@gentoo.org> glib-2.36.0.ebuild:
   Switch to python-r1, bug #458788. Do not install gtester-report man page with
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index f0e053da19dc..b0f30d3b966c 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,15 +5,7 @@ AUX glib-1.2.10-automake.patch 827 SHA256 db6d22caf4054c09467b50b6d85566eec7479a
 AUX glib-1.2.10-configure-LANG.patch 1464 SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4 SHA512 a83e3d51775ee696dd4f862eef9d973e62bb157562c4ba5d6e25708f4140af35e4473b92e61541c0efea175223b64575fd23e08f666980ad8063ba1acb19b002 WHIRLPOOL a46a8f5e3574feeba640262823705584da98f3bfbb4699378a746d66290edf65804add1f59ec244c04d78492dcb2b4a7a9981ab9633ec0b3b373fd105b5175f6
 AUX glib-1.2.10-gcc34-fix.patch 2008 SHA256 848620bc200c2a42d726744fe6c36e20a396624e82b0c742b726dd72287e6cdd SHA512 2f8bec2a10828c57da507d73a308ffec6b1069cdd7704e3128aeabe9f031952c71c900062de782bd464bec101bbf925586f88336bb0f8ac05dda00b1a269158a WHIRLPOOL 602ce9ff26da42417be8f8c03e2cad33e31a3a8fea0b1392fb95253fb7c3f8424b28a2c910cd532b1932a37c9b334d0150d273c43d1389bd7107c897b3923c9a
 AUX glib-1.2.10-m4.patch 225 SHA256 c470b3ecc3b8fd6a2d52df816a1c4ccb3ad2d6048e37894f415c8ea9c7925b68 SHA512 b754a680cff0fdbaade899152e597cfc4351cbbf6adf931a5f4f856823e1e6e68b54aa5f318f33476d497a8ae39b0d2dbb2a32792aec1727d196a014315cac12 WHIRLPOOL fbd2fd7b06a7fd0617f1b0ea4746d59a68977a9133e7eb37a64fad5f825e58b64a42c920f2435b61deeb075fe6e5401a361b30d3cdd175007f5ab5f2453b182b
-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.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
-AUX glib-2.30.2-missing-decls.patch 940 SHA256 028943a9f0684ed99e3cbac0631a0c3670d386c6f4234d90a84ebbe0fc851388 SHA512 cfdc67a3a377c18696f16338258beefeb2f5f6f3d858fa28019cf1490f726c4aaae1f1630787a9e8565cdfc6f34214edc94ea8393521b6315f51e28f073cae00 WHIRLPOOL cd8214bb61d0bed237fee741142ed589f189fe83eb8fa464291648d961284a811b4f1bc6c64109465b01a5ff86af90241943f19bef858d534708aa615e42a019
-AUX glib-2.30.3-assert-test-failure.patch 752 SHA256 2c7473f49b2ef928714af3e514f80b558af4737e2422a3a3e7e71e3ee07bde17 SHA512 8b5aa95b084ff9e11e5eb12148ca1aa36dca2b5bc0620ac68f3c8e1478337910c204a56262d8ede8c3bad328a5765f2648691ebc12b800918043909752c99956 WHIRLPOOL 1c6cdb524bd0d1d6927359f81aa4a0bd77a74d677f0ec4ceac3f8afad2e3dccf613d7be12820e0ad329cc33eb78429f7a1e5d3b3fc6dc5526b278bf6cf93c52f
-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-CVE-2012-3524.patch 8294 SHA256 feaafc740a8f7623056171e595613f86fc6e01caef604541be89ff92f312cd69 SHA512 7afd7ea3c1ff871debb7424f6b152ced1686236dc04c7271caa78f904afa0b17817448ef7365954c6dc524f1b8cd53e2a748323c490276d87e7e1ec28a851e39 WHIRLPOOL b941904a5a8f058d71e39b12729828ebbf0f26feec72ada8a1e3b223fe6b3cbd6f6c95a3cbe256b6bc5b501f451eac1724116dcc17c7b8fae65e8e0f11617b0d
 AUX glib-2.32.4-bashcomp.patch 843 SHA256 262a3689dc030712eea1349ee96cbf21123b0329c78629e2e80cd9917ac415fb SHA512 6e9f5678ccc7ea4317eba53294151d4a2e14f0aac9f2891ff6a8ba4679758386d6e5853c79f0f9fe828b83771da2498c52c69c7a329847e9fb2fd36acceb6f43 WHIRLPOOL 87d57428ef8626ab9f207e6a7df896748912c717fdc8aef3ebf1de73b72899fd5adfd97800ec4ce2fd38528f16267778a26492f79a85dd42f99734e1fa299ffb
@@ -22,25 +14,23 @@ AUX glib-2.34.0-testsuite-skip-thread4.patch 1312 SHA256 65ed09251a66b096df38431
 AUX glib-2.35.x-external-gdbus-codegen.patch 4567 SHA256 b8b699317836af2673a428b39bf4077ee9c99ee81bcda4d06a05f608b474b11c SHA512 ad1bf670e8fa25c18cd94a9add7b1ae0bf4a3d696bfdc89708d1a1edb8ba923b702bd98be9eb2b439ca1efbe9f2d123f18119b859c8080a6638d61a8f16525de WHIRLPOOL c2faa0d89d5bfb2372865cfe1d43679d7721b55091aa680dea9a686e40d006522d37d66ce3b7a4214af2940c012d6bd4ec3644508ed88887ec06bb85abcde893
 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.3.tar.xz 5642448 SHA256 e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27 SHA512 9f212b2c94c8c76ed619a1a97515ffc4c71dd39a982852cc9db600ca3034be1fb646d657dd39831f2fe80a81972400b977ea59fa81923dfe646158c9f1ab8843 WHIRLPOOL 145e20955b0ce2b44e05833bd508ac03a0399fc4d4c1c551c6a05809e6922cd57c37c5b32ebbe80f7ba0a21660059d7cb4837fa233de37af6c12cd0bc3a7afeb
 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.2.tar.xz 6367740 SHA256 2d99a8309cdd0c584bd5386a49265fb19ac64575fe108fd901d6f26c8d73c708 SHA512 986a064968bd6681e8166704c7caa8e467a99ba24b035874fbd21e1374a56f24fc78325ab5776e60ffe6f5555e9104fcc89ddf2e3d3c9ec31906cbaaf1f7a827 WHIRLPOOL 81556274b0ab62ba1bc4846f857566971f3fca305ab75ca4163a5071505d7223d24743c629cc53383ffb329ba401721abcb7ade57d42bf9c2ef4debb23b16660
 DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 SHA512 2382e09159da2ef47384a3e52622f139577af69d6aba86ea1636f2b6b23b9f6bf89967f29394fd7f93d0528e2c58ae015864aa58a3e3e4f504c7a268b2ef4a75 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
 DIST glib-2.36.0.tar.xz 6508276 SHA256 455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227 SHA512 86402c22b3df419112aab82bfe2c2a598992c6eadf941375b6f4f1840f9004491fafcbd95dc372262cddb29064abba54c640b1dbf281ff75c0ea209683876530 WHIRLPOOL 9db755e0a6070a63b78ebc71b6c54279faeffec57f9392c329fdbd105bfe5f74caff134c0aef7c93a542eed71e0465f7c1a42c4277ad7a8d42cf837fdc1f434c
+DIST glib-2.36.1.tar.xz 6524408 SHA256 7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24 SHA512 e738ef537fc8b05f535a42a46c3e5cf8d7c9c3aed788adea1bfd924e6031e6f3e8366850a3a1a0ea2c2a4c5e54f08eacf6cccbf32fb8a361b62a6caf9c4b7852 WHIRLPOOL 05298f71ff63b458ddc7e67c7ce0ab800109068c6bb2b0bff5ccfd76d8ed29cb5568d8a2953b71947bb0385033c3564467f9adfa377fc65c27eb765f71f71ef3
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
 EBUILD glib-1.2.10-r5.ebuild 1782 SHA256 1ac935da2188aa1ed04e5db79d8637f519fdfa9d9a64dd8a978cbf31bb056486 SHA512 6d9f9839be66df0f343f4dd39c6f88524e8acc45c747ef0ce7507c24296d0550c8b1c13efa396a6a65f31033d62f064cbc0fc7c7b8b28b2eabe22387b611fa15 WHIRLPOOL b5967b8704e5ce04f41a03bb108ccaffa628f02add1b67803e8b0a531d7f345b9a0c458388da90262a53e76fd96dae7a82cab391fc5e6404c6b2ff7d43164f54
-EBUILD glib-2.30.3.ebuild 8710 SHA256 054b34dc568b5a63abc412a574d7c0697a70aa80485b8618524abefc95137063 SHA512 735f200eb3d8a7c9029c453367715cad3b70621fcf3b4810505559eceec0fb707a39c5941d9cc23efcda260b27a0d6b1e13d04db884f04970aa7184f16ae2893 WHIRLPOOL 6e7997f204856004fea4e5707352d253296e7aba469c8172031b027c95a8300409ba4ce30bba3e96b4fa1689fd36a86384f4bed23d11674e7f82488c9413e30c
 EBUILD glib-2.32.4-r1.ebuild 8167 SHA256 441ad904bbc1c2c1f8b489b71340201e159ded985637782673b21d0f46ecdb08 SHA512 9abe19daf097d270aa39e05b73c095f3bf505c786e0a1c69924ebc69a583d5690f1d8292ba1aeb051c7a249d47372d33c0196ff8bf4b472eb15eb8231049d573 WHIRLPOOL 0fc1cb8c94f37c3165f2a5b0192d7aadcf2b000ae0a8e35734ea1dbf6077b5a6fc8a3b2477a2b16201ab1f182809d3b60aa16f7ef4dea23d37d4bad19243287e
-EBUILD glib-2.34.2.ebuild 8264 SHA256 6461d2cc4ac2c90d8ead212e919053fcc3d057f4daad1ff9149e569c09491a98 SHA512 16409c353ef4df6c79142f6f0b89932d36a1b76627709ec528660d47ab54c6f94db71b2fbd19eddabfabdef35394a6ab9b51aaf802a760e7aaac09ea79b5d26a WHIRLPOOL 7a4963ba6b44fb1e18f8437700a53b0d40436c93045192ee60b0b49ba7f1d04cd5ea484c8104598182382e48af2577cffd00e7908beb2ed3e1663e7bab14a7a9
 EBUILD glib-2.34.3.ebuild 8443 SHA256 d41140889ea89dfcd563ffa4a794cc140664ffcac27d2fc2f93d5af2371b0dc5 SHA512 3a6e2b6fc0d020b876ab30452d41444ab5adcfe14011dda2eaf91bef5da53026fb41633b637603ef0d3b52cb0324a7824b155aecd821f2c682a720a2e394260b WHIRLPOOL 199ebc15e676471aaaf193e9f6f8c7587e65961b67999bdf619007a1e72997100273c1381ef1f2a3030f5756017c1101712b62c13ab55ff0815270c6e771adb9
 EBUILD glib-2.36.0.ebuild 8360 SHA256 daabc480ec8f536efa265643b8c3340fa6ce12f30bd800c85d3abf094833d0ea SHA512 5da13a2005614b7ea73add590739cf7412ed04bbf1e077125f99a5c171e9250ee742eb2c75b2ea86c8b8a1e90448c99414a21fe2852887a282243f7b525e8923 WHIRLPOOL 35b4ca1789588ed6217e2a9a6284e8499da5a02e9e87673dc3e668e004b72fafb22a46a7a73f41d1de8ad02f3b6131b7a36783eed363318c6c29fc8e93d9a820
-MISC ChangeLog 76214 SHA256 7c24c5dac74dd1c58f9b31e0280c8f26f1e8bbb6ec3a284682b76a139a53c6ea SHA512 41c0bd109d25f1ecfb70b835746db7810b44f4a1d5cd4785250f075e6b894805a2894d299fc0e85fa32f656514c272513bce52ec2a7721cb67b401c15099c962 WHIRLPOOL 6971ab45a1be5a4e134074dbc2e956b91ff2948fc5c01108f993fe99227680ed6d3880961fd80964ecebe389d7fd1c0c3a36dbea74c62df0347264b5e9ac65eb
+EBUILD glib-2.36.1.ebuild 8904 SHA256 7db1b7613ea8c9e2cf8183b5c2d19084fc5ae820a9c176ce4e3515c5372193de SHA512 38ab00d5f5c9fb8ea2f1a0aa6b270ebd2bd2690fc96b11b2e049fe1b10e0827eb6d50f8f1b97068f1e01bd43a50712e6b61dfc1db3eff61cd0e9d646a1284654 WHIRLPOOL 40793736f6855f58fdce90201232d561a5bea9acf981c55a04c241de67cef894b26fd44d1bdcb5a08de1054cc40cc9328b4e58a06f3d4850d7b7b69cb6358ec4
+MISC ChangeLog 76761 SHA256 6cb27c2679b64cae6e61f46679145334396f3a1f0fe472acad4806c6b29f6384 SHA512 73c2e48caccebed3e0baa0c8cc872c2b6b45e7d288df098cf08ad03446f8a49b86c3a16a4e87226b93bea310e7e63491e4c1c50961c553c3489f1ea45925232c WHIRLPOOL 713af823929d09b52c5a77954818d7c5a3074dc10c220cc71a6fe7eede162711747f5ed34f5ec8674def0fb799ad3ba117803c80fae56406bb57f1eae8619141
 MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb SHA512 b1083fad61b609c0f01421745147cf7bbf3964d5d8fa95e5f0db7e38443a4038404103abf87cba9ce6809683f089fe71f8b080ce464964befff336db7e8c1d2f WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFhrc0ACgkQ1fmVwcYIWAanZQCgrrdRukkDH92B3DqXghT9DVnd
-wF4An15j7N0+RYl9tDKnr/1XtNa2600U
-=45rW
+iEYEAREIAAYFAlF22tEACgkQCaWpQKGI+9RgSACdGrHWImskk1nD2zQF4dpo1wG6
+I/MAnRHtlAs68bXECW/S7PFwofOqClCu
+=gL5C
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
deleted file mode 100644
index 0859e3310a17..000000000000
--- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From Debian, this one is needed for gcc < 4.1...
-
---- glib-2.10.0/glib/gatomic.c	2006-02-24 14:02:51.000000000 +0000
-+++ glib-2.10.0/glib/gatomic.c	2006-03-06 18:12:06.000000000 +0000
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- 			       gint           val)
- {
--  return __sync_fetch_and_add (atomic, val);
-+  return __sync_fetch_and_add_si (atomic, val);
- }
-  
- void
- g_atomic_int_add (volatile gint *atomic, 
- 		  gint val)
- {
--  __sync_fetch_and_add (atomic, val);
-+  __sync_fetch_and_add_si (atomic, val);
- }
- 
- gboolean
-@@ -429,7 +429,7 @@
- 				   gint           oldval, 
- 				   gint           newval)
- {
--  return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+  return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
- 
- gboolean
-@@ -437,7 +437,7 @@
- 				       gpointer           oldval, 
- 				       gpointer           newval)
- {
--  return __sync_bool_compare_and_swap ((long *)atomic, 
-+  return __sync_bool_compare_and_swap_di ((long *)atomic, 
- 				       (long)oldval, (long)newval);
- }
- 
diff --git a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch b/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
deleted file mode 100644
index cabe56f567d0..000000000000
--- a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Temporary workaround for gio tests failure when ran without FEATURES=userpriv
-until upstream bug #552912 is fixed
-
---- gio/tests/live-g-file.c.orig	2008-09-25 05:44:12.848556034 +0300
-+++ gio/tests/live-g-file.c	2008-09-25 06:12:34.248726237 +0300
-@@ -769,11 +769,14 @@
- 	      if (posix_compat)
- 		{
- 		  /*  target directory is not accessible (no execute flag)  */
-+#if 0
-+/* Fails when ran as root */
- 		  do_copy_move (root, item, TEST_DIR_NO_ACCESS,
- 				TEST_NO_ACCESS);
- 		  /*  target directory is readonly  */
- 		  do_copy_move (root, item, TEST_DIR_NO_WRITE,
- 				TEST_NO_ACCESS);
-+#endif
- 		}
- 	    }
- 	}
diff --git a/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
deleted file mode 100644
index 916b291d2060..000000000000
--- a/dev-libs/glib/files/glib-2.30.1-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Use an external gdbus-codegen package
-
---- configure.ac
-+++ configure.ac
-@@ -367,7 +367,7 @@
- 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 ***********************
-@@ -3857,8 +3857,6 @@
- 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
---- docs/reference/gio/Makefile.am
-+++ docs/reference/gio/Makefile.am
-@@ -138,8 +138,7 @@
- 	gio-querymodules.1	\
- 	glib-compile-schemas.1	\
- 	gsettings.1		\
--	gdbus.1			\
--	gdbus-codegen.1
-+	gdbus.1
- 
- if ENABLE_MAN
- 
---- gio/Makefile.am
-+++ gio/Makefile.am
-@@ -2,7 +2,7 @@
- 
- NULL =
- 
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
- 
- if OS_UNIX
- SUBDIRS += libasyncns xdgmime
---- gio/tests/gdbus-object-manager-example/Makefile.am
-+++ gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -21,10 +21,8 @@
- 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml 	\
- 	$(NULL)
- 
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- 		--c-namespace Example \
- 		--c-generate-object-manager \
---- gio/tests/Makefile.am
-+++ gio/tests/Makefile.am
-@@ -266,10 +266,8 @@
- gdbus_close_pending_LDADD = $(progs_ldadd)
- 
- if OS_UNIX
--gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.project. \
- 		--generate-c-code gdbus-test-codegen-generated \
- 		--c-generate-object-manager \
diff --git a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch b/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
deleted file mode 100644
index 30d44997c591..000000000000
--- a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Handle the G_HOME environment variable to override the passwd entry
- This will allow to fix various kinds of build failures due to restricted
- build environments.
-Author: Josselin Mouette <joss@debian.org>
-Origin: vendor
-
---- a/docs/reference/glib/running.sgml
-+++ b/docs/reference/glib/running.sgml
-@@ -213,6 +213,22 @@
-   </para>
- </formalpara>
- 
-+<formalpara id="G_HOME">
-+  <title><envar>G_HOME</envar></title>
-+
-+  <para>
-+    For various reasons, GLib applications ignore the <envar>HOME</envar>
-+    environment variable on Unix systems and will use the user directory
-+    as specified by the <filename>passwd</filename> entry, which is more
-+    reliable.
-+  </para>
-+  <para>
-+    The <envar>G_HOME</envar> environment variable will override any
-+    other setting for the home directory. It is not meant for daily usage,
-+    but it is useful in testing or building environments.
-+  </para>
-+</formalpara>
-+
- </refsect2>
- 
- <refsect2 id="setlocale">
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -1626,11 +1626,14 @@
-     }
- #endif	/* !G_OS_WIN32 */
-   
-+  g_home_dir = g_strdup (g_getenv ("G_HOME"));
-+  
- #ifdef G_OS_WIN32
-   /* We check $HOME first for Win32, though it is a last resort for Unix
-    * where we prefer the results of getpwuid().
-    */
--  g_home_dir = g_strdup (g_getenv ("HOME"));
-+  if (!g_home_dir)
-+    g_home_dir = g_strdup (g_getenv ("HOME"));
- 
-   /* Only believe HOME if it is an absolute path and exists */
-   if (g_home_dir)
-@@ -1926,6 +1929,11 @@
-  *      homedir = g_get_home_dir (<!-- -->);
-  * ]|
-  *
-+ * However, to allow changing this value for testing and development
-+ * purposes, the value of the <envar>G_HOME</envar> environment 
-+ * variable, if set, will override the <filename>passwd</filename>
-+ * entry.
-+ *
-  * Returns: the current user's home directory
-  */
- G_CONST_RETURN gchar*
diff --git a/dev-libs/glib/files/glib-2.30.2-machine-id.patch b/dev-libs/glib/files/glib-2.30.2-machine-id.patch
deleted file mode 100644
index 863b3b448630..000000000000
--- a/dev-libs/glib/files/glib-2.30.2-machine-id.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1c9eceaccb6e6c4339cd6951cf53fbd60ae80b8b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 14 Nov 2011 01:43:22 -0500
-Subject: [PATCH] _g_dbus_get_machine_id(): check /etc/machine-id too
-
-machine-id can be in /etc or in /var/lib/dbus.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663928
----
- gio/gdbusprivate.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index 55ac883..68c3ddf 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -1985,7 +1985,11 @@ _g_dbus_get_machine_id (GError **error)
-   gchar *ret;
-   /* TODO: use PACKAGE_LOCALSTATEDIR ? */
-   ret = NULL;
--  if (!g_file_get_contents ("/var/lib/dbus/machine-id",
-+  if (!g_file_get_contents ("/etc/machine-id",
-+                            &ret,
-+                            NULL,
-+                            NULL) &&
-+      !g_file_get_contents ("/var/lib/dbus/machine-id",
-                             &ret,
-                             NULL,
-                             error))
--- 
-1.7.8.rc1
-
diff --git a/dev-libs/glib/files/glib-2.30.2-missing-decls.patch b/dev-libs/glib/files/glib-2.30.2-missing-decls.patch
deleted file mode 100644
index 3641f8850408..000000000000
--- a/dev-libs/glib/files/glib-2.30.2-missing-decls.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix from upstream for building with C++ compilers:
-https://bugzilla.gnome.org/show_bug.cgi?id=663880
-
-From 5d9f05eef147f17d71e38c9fba2e3f622c9ed21b Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 12 Nov 2011 10:26:31 -0500
-Subject: [PATCH] glib-unix.h: Add G_BEGIN/END_DECLS
-
-The omission was pointed out in bug 663880.
----
- glib/glib-unix.h |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/glib/glib-unix.h b/glib/glib-unix.h
-index 9642b5c..7be37f0 100644
---- a/glib/glib-unix.h
-+++ b/glib/glib-unix.h
-@@ -38,6 +38,8 @@
- #error "This header may only be used on UNIX"
- #endif
- 
-+G_BEGIN_DECLS
-+
- /**
-  * G_UNIX_ERROR:
-  *
-@@ -77,4 +79,6 @@ guint    g_unix_signal_add         (gint        signum,
-                                     GSourceFunc handler,
-                                     gpointer    user_data);
- 
--#endif
-+G_END_DECLS
-+
-+#endif  /* __G_UNIX_H__ */
--- 
-1.7.7.1
diff --git a/dev-libs/glib/files/glib-2.30.3-assert-test-failure.patch b/dev-libs/glib/files/glib-2.30.3-assert-test-failure.patch
deleted file mode 100644
index 20a12c43ff9c..000000000000
--- a/dev-libs/glib/files/glib-2.30.3-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 "set print elements 0" --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.30.3-closure-64bit-be.patch b/dev-libs/glib/files/glib-2.30.3-closure-64bit-be.patch
deleted file mode 100644
index 9ec9f1aa1775..000000000000
--- a/dev-libs/glib/files/glib-2.30.3-closure-64bit-be.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 0782edcb44110c8a3ba921258eb8d4e452f2470e Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Fri, 23 Sep 2011 12:32:23 -0500
-Subject: [PATCH] closure: fix handling of ENUMs and integral return types on
- 64-bit BE platforms
-
-enums are stored in v_long but need to be marshalled as signed
-integers.  On platforms where int is 32 bits, taking the
-address of v_long resulted in the wrong 32 bits being marshalled.
-So we need to stuff the enum's int-sized value to a temporary
-int-sized variable and marshall that instead.
-
-Second, on return, libffi actually returns a pointer to a value
-that's sized according to platform conventions, not according to
-what the caller requested.  ie if ffi_type_sint was requested, the
-value can still be a 64-bit sign-extended long on a 64-bit
-architecture like PPC64, thus the caller cannot simply cast
-the return value as a pointer to the desired type, but must cast
-as a pointer to an integral type and then cast to the desired
-type to remove any sign extension complications.
-
-For more information on how to correctly handle libffi return
-values, see the following bug, specifically comment 35:
-
-https://bugzilla.redhat.com/show_bug.cgi?id=736489
-
-"For 64-bit ABIs that extend integral returns types to 64-bits, libffi always
-returns full 64-bit values that you can truncate in the calling code.   It's
-just the way it is has always been.  Please don't change libffi.  I'll document
-this clearly for the next version (perhaps there is a mention of this, I
-haven't looked yet).
-
-The same is true for returning 8-bit values, for instance, on 32-bit systems.
-All ABIs extend those results to the full 32-bits so you need to provide a
-properly aligned buffer that's big enough to hold the result."
-
-https://bugzilla.gnome.org/show_bug.cgi?id=659881
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to glib-2.30.x]
----
- gobject/gclosure.c |   76 ++++++++++++++++++++++++++++++++++++++++-----------
- 1 files changed, 59 insertions(+), 17 deletions(-)
-
-diff --git a/gobject/gclosure.c b/gobject/gclosure.c
-index 5fd928b..fc4f99a 100644
---- a/gobject/gclosure.c
-+++ b/gobject/gclosure.c
-@@ -944,21 +944,42 @@ g_signal_type_cclosure_new (GType    itype,
- 
- #include <ffi.h>
- static ffi_type *
--value_to_ffi_type (const GValue *gvalue, gpointer *value)
-+value_to_ffi_type (const GValue *gvalue,
-+                   gpointer *value,
-+                   gint *enum_tmpval,
-+                   gboolean *tmpval_used)
- {
-   ffi_type *rettype = NULL;
-   GType type = g_type_fundamental (G_VALUE_TYPE (gvalue));
-   g_assert (type != G_TYPE_INVALID);
- 
-+  if (enum_tmpval)
-+    {
-+      g_assert (tmpval_used != NULL);
-+      *tmpval_used = FALSE;
-+    }
-+
-   switch (type)
-     {
-     case G_TYPE_BOOLEAN:
-     case G_TYPE_CHAR:
-     case G_TYPE_INT:
--    case G_TYPE_ENUM:
-       rettype = &ffi_type_sint;
-       *value = (gpointer)&(gvalue->data[0].v_int);
-       break;
-+    case G_TYPE_ENUM:
-+      /* enums are stored in v_long even though they are integers, which makes
-+       * marshalling through libffi somewhat complicated.  They need to be
-+       * marshalled as signed ints, but we need to use a temporary int sized
-+       * value to pass to libffi otherwise it'll pull the wrong value on
-+       * BE machines with 32-bit integers when treating v_long as 32-bit int.
-+       */
-+      g_assert (enum_tmpval != NULL);
-+      rettype = &ffi_type_sint;
-+      *enum_tmpval = g_value_get_enum (gvalue);
-+      *value = enum_tmpval;
-+      *tmpval_used = TRUE;
-+      break;
-     case G_TYPE_UCHAR:
-     case G_TYPE_UINT:
-     case G_TYPE_FLAGS:
-@@ -1011,10 +1032,12 @@ value_to_ffi_type (const GValue *gvalue, gpointer *value)
- static void
- value_from_ffi_type (GValue *gvalue, gpointer *value)
- {
-+  ffi_arg *int_val = value;
-+
-   switch (g_type_fundamental (G_VALUE_TYPE (gvalue)))
-     {
-     case G_TYPE_INT:
--      g_value_set_int (gvalue, *(gint*)value);
-+      g_value_set_int (gvalue, (gint) *int_val);
-       break;
-     case G_TYPE_FLOAT:
-       g_value_set_float (gvalue, *(gfloat*)value);
-@@ -1023,43 +1046,43 @@ value_from_ffi_type (GValue *gvalue, gpointer *value)
-       g_value_set_double (gvalue, *(gdouble*)value);
-       break;
-     case G_TYPE_BOOLEAN:
--      g_value_set_boolean (gvalue, *(gboolean*)value);
-+      g_value_set_boolean (gvalue, (gboolean) *int_val);
-       break;
-     case G_TYPE_STRING:
-       g_value_set_string (gvalue, *(gchar**)value);
-       break;
-     case G_TYPE_CHAR:
--      g_value_set_char (gvalue, *(gchar*)value);
-+      g_value_set_char (gvalue, (gchar) *int_val);
-       break;
-     case G_TYPE_UCHAR:
--      g_value_set_uchar (gvalue, *(guchar*)value);
-+      g_value_set_uchar (gvalue, (guchar) *int_val);
-       break;
-     case G_TYPE_UINT:
--      g_value_set_uint (gvalue, *(guint*)value);
-+      g_value_set_uint (gvalue, (guint) *int_val);
-       break;
-     case G_TYPE_POINTER:
-       g_value_set_pointer (gvalue, *(gpointer*)value);
-       break;
-     case G_TYPE_LONG:
--      g_value_set_long (gvalue, *(glong*)value);
-+      g_value_set_long (gvalue, (glong) *int_val);
-       break;
-     case G_TYPE_ULONG:
--      g_value_set_ulong (gvalue, *(gulong*)value);
-+      g_value_set_ulong (gvalue, (gulong) *int_val);
-       break;
-     case G_TYPE_INT64:
--      g_value_set_int64 (gvalue, *(gint64*)value);
-+      g_value_set_int64 (gvalue, (gint64) *int_val);
-       break;
-     case G_TYPE_UINT64:
--      g_value_set_uint64 (gvalue, *(guint64*)value);
-+      g_value_set_uint64 (gvalue, (guint64) *int_val);
-       break;
-     case G_TYPE_BOXED:
-       g_value_set_boxed (gvalue, *(gpointer*)value);
-       break;
-     case G_TYPE_ENUM:
--      g_value_set_enum (gvalue, *(gint*)value);
-+      g_value_set_enum (gvalue, (gint) *int_val);
-       break;
-     case G_TYPE_FLAGS:
--      g_value_set_flags (gvalue, *(guint*)value);
-+      g_value_set_flags (gvalue, (guint) *int_val);
-       break;
-     case G_TYPE_PARAM:
-       g_value_set_param (gvalue, *(gpointer*)value);
-@@ -1108,10 +1131,13 @@ g_cclosure_marshal_generic (GClosure     *closure,
-   int i;
-   ffi_cif cif;
-   GCClosure *cc = (GCClosure*) closure;
-+  gint *enum_tmpval;
-+  gboolean tmpval_used = FALSE;
- 
-+  enum_tmpval = g_alloca (sizeof (gint));
-   if (return_gvalue && G_VALUE_TYPE (return_gvalue))
-     {
--      rtype = value_to_ffi_type (return_gvalue, &rvalue);
-+      rtype = value_to_ffi_type (return_gvalue, &rvalue, enum_tmpval, &tmpval_used);
-     }
-   else
-     {
-@@ -1124,22 +1150,38 @@ g_cclosure_marshal_generic (GClosure     *closure,
-   atypes = g_alloca (sizeof (ffi_type *) * n_args);
-   args =  g_alloca (sizeof (gpointer) * n_args);
- 
-+  if (tmpval_used)
-+    enum_tmpval = g_alloca (sizeof (gint));
-+
-   if (G_CCLOSURE_SWAP_DATA (closure))
-     {
-       atypes[n_args-1] = value_to_ffi_type (param_values + 0,
--                                            &args[n_args-1]);
-+                                            &args[n_args-1],
-+                                            enum_tmpval,
-+                                            &tmpval_used);
-       atypes[0] = &ffi_type_pointer;
-       args[0] = &closure->data;
-     }
-   else
-     {
--      atypes[0] = value_to_ffi_type (param_values + 0, &args[0]);
-+      atypes[0] = value_to_ffi_type (param_values + 0,
-+                                     &args[0],
-+                                     enum_tmpval,
-+                                     &tmpval_used);
-       atypes[n_args-1] = &ffi_type_pointer;
-       args[n_args-1] = &closure->data;
-     }
- 
-   for (i = 1; i < n_args - 1; i++)
--    atypes[i] = value_to_ffi_type (param_values + i, &args[i]);
-+    {
-+      if (tmpval_used)
-+        enum_tmpval = g_alloca (sizeof (gint));
-+
-+      atypes[i] = value_to_ffi_type (param_values + i,
-+                                     &args[i],
-+                                     enum_tmpval,
-+                                     &tmpval_used);
-+    }
- 
-   if (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, n_args, rtype, atypes) != FFI_OK)
-     return;
--- 
-1.7.8.5
-
diff --git a/dev-libs/glib/glib-2.30.3.ebuild b/dev-libs/glib/glib-2.30.3.ebuild
deleted file mode 100644
index bc0ad9016f0e..000000000000
--- a/dev-libs/glib/glib-2.30.3.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2013 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.15 2013/02/19 00:08:33 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 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
-	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
-
-	# Fix from upstream for building with C++ compilers.
-	epatch "${FILESDIR}/${PN}-2.30.2-missing-decls.patch"
-
-	# 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.30.3-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"
-
-	if ! use test; 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"
-
-	# Fix from glib-2.31 for ppc64
-	epatch "${FILESDIR}/${PN}-2.30.3-closure-64bit-be.patch"
-
-	epatch_user
-
-	# disable pyc compiling
-	use test && python_clean_py-compile_files
-
-	# 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 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.34.2.ebuild b/dev-libs/glib/glib-2.36.1.ebuild
index 3b9661093ae1..24fca1e6f22f 100644
--- a/dev-libs/glib/glib-2.34.2.ebuild
+++ b/dev-libs/glib/glib-2.36.1.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.2.ebuild,v 1.2 2013/02/19 00:08:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.1.ebuild,v 1.1 2013/04/23 19:02:39 pacho Exp $
 
-EAPI="4"
-PYTHON_DEPEND="utils? 2"
+EAPI="5"
+PYTHON_COMPAT=( python2_{5,6,7} )
 # 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 linux-info
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs virtualx linux-info
 
 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 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
-RDEPEND="virtual/libiconv
+RDEPEND="
+	virtual/libiconv
 	virtual/libffi
 	sys-libs/zlib
 	|| (
@@ -26,7 +25,10 @@ RDEPEND="virtual/libiconv
 		>=dev-libs/libelf-0.8.12 )
 	xattr? ( sys-apps/attr )
 	fam? ( virtual/fam )
-	utils? ( >=dev-util/gdbus-codegen-${PV} )"
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-libs/libxslt-1.0
@@ -35,31 +37,29 @@ DEPEND="${RDEPEND}
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
 		sys-devel/gdb
-		=dev-lang/python-2*
-		>=dev-util/gdbus-codegen-${PV}
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
 		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2"
+	!<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
-
 	if use kernel_linux ; then
 		CONFIG_CHECK="~INOTIFY_USER"
+		if use test; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+			export IPV6_DISABLED="yes"
+		fi
 		linux-info_pkg_setup
 	fi
 }
 
 src_prepare() {
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
 	# Fix gmodule issues on fbsd; bug #184301
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
 
@@ -68,7 +68,7 @@ src_prepare() {
 		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
 			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
 
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
 		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."
@@ -78,6 +78,13 @@ src_prepare() {
 			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
 		fi
 
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.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:3' ; then
 			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
@@ -92,29 +99,39 @@ src_prepare() {
 			# needed to prevent gdbus-threading from asserting
 			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
 		fi
+
+		# Some tests need ipv6, upstream bug #667468
+		if [[ -n "${IPV6_DISABLED}" ]]; then
+			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
+		fi
+
+		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
+		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
+
+		# thread test fails, upstream bug #679306
+		epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
 	fi
 
 	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
+	epatch "${FILESDIR}/${PN}-2.35.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"
+	# leave python shebang alone
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
 
 	epatch_user
 
-	# disable pyc compiling
-	use test && python_clean_py-compile_files
-
 	# 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
+	eautoreconf
 
+	# FIXME: Really needed when running eautoreconf before? bug#????
 	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
 
 	epunt_cxx
@@ -141,17 +158,6 @@ src_configure() {
 	# -- compnerd (3/27/06)
 	use debug && myconf="--enable-debug"
 
-	if use test; then
-		myconf="${myconf} --enable-modular-tests"
-	else
-		if [[ ${PV} = 9999 ]] && use doc; then
-			# need to build tests if USE=doc for bug #387385
-			myconf="${myconf} --enable-modular-tests"
-		else
-			myconf="${myconf} --disable-modular-tests"
-		fi
-	fi
-
 	# Always use internal libpcre, bug #254659
 	econf ${myconf} \
 		$(use_enable xattr) \
@@ -160,19 +166,21 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable systemtap dtrace) \
 		$(use_enable systemtap systemtap) \
+		$(use_enable test modular-tests) \
 		--enable-man \
 		--with-pcre=internal \
-		--with-threads=posix
+		--with-threads=posix \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
 }
 
 src_install() {
-	local f
+	emake install DESTDIR="${D}"
 
-	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
-	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
-
-	if ! use utils; then
+	if use utils ; then
+		python_replicate_script "${ED}"/usr/bin/gtester-report
+	else
 		rm "${ED}usr/bin/gtester-report"
+		rm "${ED}usr/share/man/man1/gtester-report.1"
 	fi
 
 	# Do not install charset.alias even if generated, leave it to libiconv
@@ -185,7 +193,7 @@ src_install() {
 
 	# Completely useless with or without USE static-libs, people need to use
 	# pkg-config
-	find "${D}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --modules
 }
 
 src_test() {
@@ -197,6 +205,7 @@ src_test() {
 	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
 	unset GSETTINGS_BACKEND # bug 352451
 	export LC_TIME=C # bug #411967
+	python_export_best
 
 	# Related test is a bit nitpicking
 	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
@@ -217,6 +226,7 @@ pkg_preinst() {
 	# * The user has gobject-introspection
 	# * Has glib already installed
 	# * Previous version was different from new version
+	# TODO: add a subslotted virtual to trigger this automatically
 	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"
@@ -225,6 +235,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
+	# TODO: add a subslotted virtual to trigger this automatically
 	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"