Version bump for Gnome 3.10. Refresh patches with git headers.

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

8 files changed, 432 insertions, 29 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 1259f16b808d..3d172ad6ba38 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,15 @@
 # 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.586 2013/12/22 15:34:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.587 2013/12/23 22:38:07 eva Exp $
+
+*glib-2.38.2 (23 Dec 2013)
+
+  23 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org> +glib-2.38.2.ebuild,
+  files/glib-2.12.12-fbsd.patch,
+  files/glib-2.34.0-testsuite-skip-thread4.patch,
+  files/glib-2.36.4-znodelete.patch,
+  +files/glib-2.37.x-external-gdbus-codegen.patch, metadata.xml:
+  Version bump for Gnome 3.10. Refresh patches with git headers.
 
   22 Dec 2013; Jeroen Roovers <jer@gentoo.org> glib-2.36.4-r1.ebuild:
   Stable for HPPA (bug #478252).
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index d147df4fdfa6..48558a01f077 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -6,34 +6,37 @@ 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.12.12-fbsd.patch 668 SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d SHA512 8c52dc7af64bedb24389f3567623c7dca60c27fbe87dbb3cb523fd71e08f5a2811ee0a7fe0384177e1b5562bfe1e44073a88c5e84b3cce75664b911f1a5a69da WHIRLPOOL 1a90159aa6ac5f5f5dcb4f7225343af88d43540b802f2588279c60d5f27f51e5411ad29441ad10ad5adb947cf7d73016e93fb02d64203375f851758e680690ab
+AUX glib-2.12.12-fbsd.patch 850 SHA256 1af80d3f26d44715bdbf597e5d37f6547dd1adb993852c12db614b579b02f001 SHA512 43a78da1ffbae15d920f58b0c5e987bf8e563f13b6e50668d3b2146472b3ec64938f36daeca88f08edf197134976d1ea328502337fa25e0a1d8a8dc52732d6ad WHIRLPOOL c3936bb66de72ef4efbcaffb42f9a9458b03a01e588398b90f5c3fb338e8376e0092a8068302c84370e3ba3fc7d38bb7af6d056d6b6ae4767b433dc32f2bf16e
 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
 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
+AUX glib-2.34.0-testsuite-skip-thread4.patch 1296 SHA256 91cc22f43c04599826e9e15efffb3a668f73208391b047f321c993e27c3a9dd9 SHA512 e7e12c40d3da03c3420c1d0e161d5583e30a3185300a660408ddf78ffe0bbf2d812eb9180b6e7e013370a880d5f5e020cbdf45bebaa8fa8d74f6f4af8822c5aa WHIRLPOOL 876a1740f520d0e9f4cc26b55a20e6f6b0d979de801edeb8262b53a68130e35c0a968081658ea89ae47e4a9a7e273ee6ef2c74dfe011e103c69cfb9bfc4d6c0f
 AUX glib-2.34.3-automake-1.13.patch 645 SHA256 a8f4bd4bfa03e2d4014af5e3ce899188bd935bfb4917444c2b09f1a493ebfacb SHA512 cfe6b0a99af00837fb78ac6171491a5a98756d84f63a3f1b27e510325d158940437ee65cbb60691bb13e2867fd0bce11ffb2f3274eb88810fa63a8827ec5089a WHIRLPOOL 585cd5ee5cb1a52f62a4db7056f7fe3d6c3886e77870637f25ef52386330e544cf8590a05a72d095cca9ed0bf1bae86e1fae99c886039736b4ba7b06dff15429
 AUX glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch 1764 SHA256 361845ce7dc980642e018713834aa6b143d6c0cea4256bd16c2f79387c8a6bea SHA512 e2ed8bc809bccb19caa8ab1378f22e50d9a262b7c386256f7864e916bc61b51e70e836dd8ecd5ce79a89b2c62fb4cb7ab3026022051aca6b7406b9d2536201f7 WHIRLPOOL b8049eba35e60d2e1b5e0daed244a61892b31dfe9123f7de26ef07b116388147f8d6c0c32cdf496b284df3363bd13e4b9f1b61418a318e49fbb24812d5e0b7fd
 AUX glib-2.35.x-external-gdbus-codegen.patch 4567 SHA256 b8b699317836af2673a428b39bf4077ee9c99ee81bcda4d06a05f608b474b11c SHA512 ad1bf670e8fa25c18cd94a9add7b1ae0bf4a3d696bfdc89708d1a1edb8ba923b702bd98be9eb2b439ca1efbe9f2d123f18119b859c8080a6638d61a8f16525de WHIRLPOOL c2faa0d89d5bfb2372865cfe1d43679d7721b55091aa680dea9a686e40d006522d37d66ce3b7a4214af2940c012d6bd4ec3644508ed88887ec06bb85abcde893
-AUX glib-2.36.4-znodelete.patch 2195 SHA256 30ab1e47fd03d166419e4aa2c452c1c2b436004c0f15808d9c9eb3be9b3f0fae SHA512 2dce550ad8135017601ccf9219b4f92e9f8078acb1bc1d89ded686fdb8f477be4fda059d3c2a76551f2b9e8fd1df4ac7fe807abbf5705d82906f09a9a0c97735 WHIRLPOOL 838acf03bd081aa79fc1154d6455952576e2fb93c78a552463cd104772a42565ed4d141d72104a62e5cc0fa7c29dc13d633f709fdb3ec6b97b0cfe6bb672a5ea
+AUX glib-2.36.4-znodelete.patch 2199 SHA256 4195ca98519b842520d9b11d7cd01f1f6f6ed1843735e2fb50c217fc6c33fe43 SHA512 77284716ff8f4f7482765cc5724e325169fd49b205e19cad19e755a4cceeb57037bdd78fcde6265586770b95fd9481afc69d797a4a521401a2704f4eab644d47 WHIRLPOOL 9941b5aa7f1fdb1fa6cdf39f4f94a52bfd6093f55f31a6466ecc0996eaa22901ac26cff42fdd64af9dac13004fe47d054991cc27e6450ab4b6810e0f421157f4
+AUX glib-2.37.x-external-gdbus-codegen.patch 4573 SHA256 7094ff73cef6add5bf1727f2d01f6f45ac6ae82d725a47b83d0280064d006ee2 SHA512 dc8e0460c549a5d65cc9ba575d0f1eb2bd7a487d382970922e454ceb4efe46a096da82abfe5ba50bf37f56e1c24570ed391a5474f22f9f97d678baad003893ed WHIRLPOOL 86f0da69db6c0c9c8f22869155ce679c75db755c78bd7add7401e7e73c454fd9704dcb0a050b67d99a4bbbb161c26325ff120ef0bb7d76341ebc528015169b20
 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.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.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 SHA512 2382e09159da2ef47384a3e52622f139577af69d6aba86ea1636f2b6b23b9f6bf89967f29394fd7f93d0528e2c58ae015864aa58a3e3e4f504c7a268b2ef4a75 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
 DIST glib-2.36.4.tar.xz 6570720 SHA256 f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e SHA512 ed3b01051695858724d854c4d1c20df19d4c19526538d87c995e41376e3479e5758afccc9550cf7f4d1104bdd4edb8b436a716ab2b95e7bdf198ff3f17749304 WHIRLPOOL 7997c5182c605ded87aac79b75b83a0aaf30dc9eb4a657aed77fe883946e7fe07e2257f3b1b6749ca7d3c921e041067907f8f2f16fae7ebfe99e1adbbeea12b5
+DIST glib-2.38.2.tar.xz 6718296 SHA256 056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734 SHA512 f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0 WHIRLPOOL 4b126073d673f1cda9af4b1bfa0b6621e2cb883dfffe911d264bfc4c317a063579fc764ef94f7fe22b64a6fc8f0ed5f16de1015f1aa265dcaa85ec0d7392fa7b
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e62131e9858d26fb26d8f1699c2029 SHA512 d2c84ba968f81bc851f53fbf1bad01f62de58f16dc49565e341bf7e9396b5f8870501de2027d5b49c5dcd2a8416dca6f530a34491c63ccb26ab94aeafea442ba WHIRLPOOL 1fd9b784429c287fa5dbb4e20db42dd9e1f67cc03ac60c7d47fb751878ed827f2791a2bd6622d84773a4a4607c190a671cef6a6d9b7a61943bf12b7b0e1d6b45
 EBUILD glib-2.32.4-r1.ebuild 8355 SHA256 2c7bed6e3df8f29a6fc03d3c627ac6ddedb62d5624be324063ef3494186d45f4 SHA512 bee7e53b3ad42e5dcc36f75c9a30b7c7bb6e09803064a953982a07d88852ee414987964abfd1acab27dc8b08946c769dc12f8167cbcbf934cc9b66e009286793 WHIRLPOOL cd9bd78ae8d8ed4cb0fbeadc7d1a91937ed056d68b90e4a321412c812ba27edca6c753a87b3fbe8a4d75d4ddd88e66fa8312ca16d88843242ad0365287a6aed6
 EBUILD glib-2.34.3-r1.ebuild 8403 SHA256 ac36dce2d02e99de987a3ef01e330a960d0786907e77f88d00e9744e7db3c32f SHA512 3f9395ad59aae937729abcc741d2e3ba26a837cc51a074ab6a9fc07010644b455d943a5db1f23fb507113cd504ac45f15df8583e5f020764612fcb0071e1ed6d WHIRLPOOL af2401a78366efc5ee6d4a41c23a9740e066e082ef1716b8d57159b1b8a2b0ba5314a5e477da0acfccdabef2cc5a1d7ecaafb1832303c9904562d25fddb0aef8
 EBUILD glib-2.36.4-r1.ebuild 9861 SHA256 366a402fbb65297a72f3f0a936662f2abf87b5cb2cba1ac8d09090fc96bcb7b9 SHA512 231c36d3d4680cca462f287a7dda584c5065736c491bce3ce93074847f3d0254983cf450b7912e740d4329885a61fa90c2ed4f4f579d561781de3d57b2e29707 WHIRLPOOL d490f1a3e253dabbf4b96b83561364562cbf6b63b218825f89f3c9597ca3284839d04390a9f5e3bcf32e8a552be7ea279d6341907d98129d80bbf0f109e72339
-MISC ChangeLog 82297 SHA256 24d38a40c76fdb5fa9da16e436224932642edf41e4c73789102f1f69f7d70b96 SHA512 55b61387acb256a20b39bd70401c02f115d39a93a16a29b760421357221beb25b1e838ac83fe5acb4e3b7e60e92f3a4c53534e661aae34c9f1c220fafb2ccec0 WHIRLPOOL 821afedb5293e0382b14494cce1ce5106536396fb04857ff49c06dc5be21aade7deafa8c3eb4aaef71331825733158286b1ad865f70db90c7106f3bcd58d9d08
-MISC metadata.xml 479 SHA256 1a41cb4f56511674a423efd444f7c6999b5d316f9058d2eb67a032a522738ffb SHA512 f30f9e937d43dd4fb148dc7ab1554b5c58ddf4211bc06cfc65e92ff9843a84f0b05fa130fcd130744ad6e3579fb5b82a7f31950dd8ccc317f58388023cb6fe50 WHIRLPOOL 92888cd8e3a839860cb20c60ad1ee2871ea9efdf54d5751d6b5f677faf10e721333c3d68b1b5c4af212854f9ecd9e31970832eaa05f30276987bcadacaf5f637
+EBUILD glib-2.38.2.ebuild 9719 SHA256 852c4bbc97d41cc09c8f7c8e37e7c978a506f952a1874810dac31cccb34741c1 SHA512 f9ba4869e09dc137c5ae66d495c4cd880574493c7dae6485eec3827e8ba29d24a354a0d7c3fe615fe894e11fb5d66a98729a242c7d5638a1ba56f04dcd6ad9e7 WHIRLPOOL 6d2f9899a6fd28ecd4f2de038b4c8cd3e0b08b9a6bc8899342984bc459ddb846813c5b9b10634958938883175992d0e54f6f82f896b77693887787d398a86151
+MISC ChangeLog 82651 SHA256 f1c07c2d51ba67ac055c175cdc39daebb2ce3c027b6d59b00c05702fcafd85eb SHA512 8de47e83311c8fb38bd6735661327d3be9ffb5f99fb200c4e22cc59ba37e667d89f7e16b2d61320f63373c3bb7eb1f92dc3f5e5bbf0276d38af0a20fb147e87f WHIRLPOOL 83127ea309e0091cae8e5ee9c11d8fc7568ffd0a48be8ad28eabdda643cf118bd201807f03e6dbe1ecbdd733d266a134b5444c4380107a3e0e0642cb773c6025
+MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb SHA512 b1083fad61b609c0f01421745147cf7bbf3964d5d8fa95e5f0db7e38443a4038404103abf87cba9ce6809683f089fe71f8b080ce464964befff336db7e8c1d2f WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK3BpIACgkQVWmRsqeSphP6RACfRdT9/pX4gAESf7DHctKc6yXr
-zBcAnjD3JGHSgv0QEt1LGQXEazHghKn6
-=kiTs
+iEYEAREIAAYFAlK4u1EACgkQ1fmVwcYIWAaxAgCgic1Cx/XNL+IUDI+PF81DgdS/
+I1wAn1bTLlHZIbjYDEUj0Ye+DXYcd7dE
+=94vg
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
index bba632964ede..5aca6950a256 100644
--- a/dev-libs/glib/files/glib-2.12.12-fbsd.patch
+++ b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
@@ -1,7 +1,18 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c
---- glib-2.12.12.orig/gmodule/gmodule-dl.c	2007-05-01 19:12:40.000000000 -0400
-+++ glib-2.12.12/gmodule/gmodule-dl.c	2007-07-05 20:10:51.000000000 -0400
-@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name,
+From deeb71226d4ab465d48805d899ec88eb836a6966 Mon Sep 17 00:00:00 2001
+From: Daniel Gryniewicz <dang@gentoo.org>
+Date: Sun, 24 Nov 2013 19:46:13 +0100
+Subject: [PATCH 1/4] Fix gmodule issue on FreeBSD
+
+Gentoo bug #184301, Gnome bug #107626.
+---
+ gmodule/gmodule-dl.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
+index a606f17..57fc41b 100644
+--- a/gmodule/gmodule-dl.c
++++ b/gmodule/gmodule-dl.c
+@@ -107,6 +107,7 @@ _g_module_open (const gchar *file_name,
  static gpointer
  _g_module_self (void)
  {
@@ -9,7 +20,7 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodul
    gpointer handle;
    
    /* to query symbols from the program itself, special link options
-@@ -117,6 +118,9 @@ _g_module_self (void)
+@@ -122,6 +123,9 @@ _g_module_self (void)
      g_module_set_error (fetch_dlerror (TRUE));
    
    return handle;
@@ -19,3 +30,6 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodul
  }
  
  static void
+-- 
+1.8.3.2
+
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
index f409094a9319..584b56f41c94 100644
--- 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
@@ -1,15 +1,15 @@
-From 8a8112aad6dc98aaaf9767b31e48f5ae8fabd858 Mon Sep 17 00:00:00 2001
+From 4881b5d303512208b55f5bf78b91cd6a85e5034c 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
+Subject: [PATCH 2/4] 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(-)
+ glib/tests/thread.c | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/glib/tests/thread.c b/glib/tests/thread.c
-index 29b3850..ffe8087 100644
+index 539782e..179ec06 100644
 --- a/glib/tests/thread.c
 +++ b/glib/tests/thread.c
 @@ -124,6 +124,8 @@ test_thread3 (void)
@@ -21,7 +21,7 @@ index 29b3850..ffe8087 100644
  /* test that thread creation fails as expected,
   * by setting RLIMIT_NPROC ridiculously low
   */
-@@ -152,6 +154,7 @@ test_thread4 (void)
+@@ -158,6 +160,7 @@ test_thread4 (void)
      g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret));
  #endif
  }
@@ -29,7 +29,7 @@ index 29b3850..ffe8087 100644
  
  static void
  test_thread5 (void)
-@@ -195,7 +198,9 @@ main (int argc, char *argv[])
+@@ -203,7 +206,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);
@@ -40,5 +40,5 @@ index 29b3850..ffe8087 100644
    g_test_add_func ("/thread/thread6", test_thread6);
  
 -- 
-1.7.8.6
+1.8.3.2
 
diff --git a/dev-libs/glib/files/glib-2.36.4-znodelete.patch b/dev-libs/glib/files/glib-2.36.4-znodelete.patch
index e84e76f28b2f..b936fbd8de81 100644
--- a/dev-libs/glib/files/glib-2.36.4-znodelete.patch
+++ b/dev-libs/glib/files/glib-2.36.4-znodelete.patch
@@ -1,7 +1,7 @@
-From 242de638a030e1fb3b467af182d985d7c3bbf185 Mon Sep 17 00:00:00 2001
+From 196ea5ab614e5357da48acf73a373f103e61ee0b Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Mon, 2 Sep 2013 13:59:18 -0400
-Subject: [PATCH] gobject: try to link with -Wl,-z,nodelete
+Subject: [PATCH 4/4] gobject: try to link with -Wl,-z,nodelete
 
 Since the type system does not support reloading its data and assumes
 that libgobject remains loaded for the lifetime of the process, we
@@ -14,10 +14,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=707298
  2 files changed, 25 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 0a63601..dd1045a 100644
+index 907c534..266c45d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3668,6 +3668,30 @@ fi
+@@ -3669,6 +3669,30 @@ fi
  AC_SUBST(GLIB_LINK_FLAGS)
  
  dnl
diff --git a/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
new file mode 100644
index 000000000000..f87c146570a9
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
@@ -0,0 +1,111 @@
+From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Thu, 28 Feb 2013 08:28:01 +0200
+Subject: [PATCH 3/4] Split out gdbus codegen
+
+---
+ configure.ac                                       | 17 ++++++++---------
+ docs/reference/gio/Makefile.am                     |  3 +--
+ gio/Makefile.am                                    |  2 +-
+ gio/tests/Makefile.am                              |  6 ++----
+ gio/tests/gdbus-object-manager-example/Makefile.am |  6 ++----
+ 5 files changed, 14 insertions(+), 20 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 797cb92..907c534 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -378,14 +378,14 @@ AC_SUBST(PERL_PATH)
+ # option to specify python interpreter to use; this just sets $PYTHON, so that
+ # we will fallback to reading $PYTHON if --with-python is not given, and
+ # python.m4 will get the expected input
+-AC_ARG_WITH(python,
+-            AS_HELP_STRING([--with-python=PATH],
+-                           [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
+-            [PYTHON="$withval"], [])
+-if test x"$PYTHON" = xyes; then
+-  AC_MSG_ERROR([--with-python option requires a path or program argument])
+-fi
+-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
++# AC_ARG_WITH(python,
++#             AS_HELP_STRING([--with-python=PATH],
++#                            [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
++#             [PYTHON="$withval"], [])
++# if test x"$PYTHON" = xyes; then
++#   AC_MSG_ERROR([--with-python option requires a path or program argument])
++# fi
++# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
+ 
+ 
+ dnl ***********************
+@@ -3784,7 +3784,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 112626b..8ddcdbc 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -151,8 +151,7 @@ man_MANS +=			\
+ 	glib-compile-resources.1	\
+ 	gsettings.1		\
+ 	gresource.1		\
+-	gdbus.1			\
+-	gdbus-codegen.1
++	gdbus.1
+ 
+ XSLTPROC_FLAGS = \
+         --nonet \
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 717419f..808b5dd 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+ 
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS =
+ 
+ if OS_UNIX
+ SUBDIRS += xdgmime
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 7224124..5c8baaa 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -359,10 +359,8 @@ gmenumodel_SOURCES                       = $(gdbus_sessionbus_sources) gmenumode
+ nodist_gdbus_test_codegen_SOURCES        = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
+ 
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h
+-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/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
+index d6d1412..62ef706 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am
++++ b/gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
+ 	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 \
+-- 
+1.8.3.2
+
diff --git a/dev-libs/glib/glib-2.38.2.ebuild b/dev-libs/glib/glib-2.38.2.ebuild
new file mode 100644
index 000000000000..7c0666d23829
--- /dev/null
+++ b/dev-libs/glib/glib-2.38.2.ebuild
@@ -0,0 +1,269 @@
+# 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.38.2.ebuild,v 1.1 2013/12/23 22:38:07 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+# Avoid runtime dependency on python when USE=test
+
+inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.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 ~arm-linux ~x86-linux"
+
+# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
+RDEPEND="
+	virtual/libiconv[${MULTILIB_USEDEP}]
+	virtual/libffi[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/elfutils-0.142
+		>=dev-libs/libelf-0.8.12
+		>=sys-freebsd/freebsd-lib-9.2_rc1
+		)
+	selinux? ( sys-libs/libselinux )
+	xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	fam? ( virtual/fam[${MULTILIB_USEDEP}] )
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+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
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	test? (
+		sys-devel/gdb
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
+	!<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
+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
+
+DOCS="AUTHORS ChangeLog* NEWS* README"
+
+pkg_setup() {
+	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() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
+	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+
+	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"
+
+		# 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."
+			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
+
+		# 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"
+			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
+
+		# 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
+	fi
+
+	# thread test fails, upstream bug #679306
+	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
+	# gdbus-codegen is a separate package
+	epatch "${FILESDIR}/${PN}-2.37.x-external-gdbus-codegen.patch"
+
+	# do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
+	epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
+
+	# leave python shebang alone
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
+
+	# Gentoo handles completions in a different directory
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+		gio/Makefile.am || die
+
+	# Support compilation in clang until upstream solves this, upstream bug #691608
+	append-flags -Wno-format-nonliteral
+
+	epatch_user
+
+	# Needed for the punt-python-check patch, disabling timeout test
+	# Also needed to prevent cross-compile failures, see bug #267603
+	# Also needed for the no-gdbus-codegen patch
+	eautoreconf
+
+	# FIXME: Really needed when running eautoreconf before? bug#????
+	#[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+
+	epunt_cxx
+}
+
+multilib_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 && ! $(tc-getPKG_CONFIG) --version >& /dev/null; 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
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# 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.
+	use debug && myconf="--enable-debug"
+
+	# Only used by the gresource bin
+	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
+
+	# FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960
+	if multilib_is_native_abi; then
+		myconf="${myconf} $(use_enable selinux)"
+	else
+		myconf="${myconf} --disable-selinux"
+	fi
+
+	# Always use internal libpcre, bug #254659
+	ECONF_SOURCE="${S}" econf ${myconf} \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=internal \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	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
+	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/"
+
+	# Completely useless with or without USE static-libs, people need to use
+	# pkg-config
+	prune_libtool_files --modules
+}
+
+multilib_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
+	export LC_TIME=C # bug #411967
+	python_export_best
+
+	# 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 "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	Xemake check
+}
+
+pkg_postinst() {
+	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/metadata.xml b/dev-libs/glib/metadata.xml
index ae970d332a9a..72243117e22b 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -8,7 +8,4 @@
 	<flag name="utils">Install gtester-report utility to generate test
 		report files for your software.</flag>
   </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
-  </upstream>
 </pkgmetadata>