diff options
author | Pacho Ramos <pacho@gentoo.org> | 2014-04-25 19:12:18 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2014-04-25 19:12:18 +0000 |
commit | a33d8d9d7e0b1f6311b2fb06261246ef0b41dd64 (patch) | |
tree | 4b714afe7b584ba090771728c33fbcbbd84a2a6c | |
parent | Version bumps by Afrever. (diff) | |
download | historical-a33d8d9d7e0b1f6311b2fb06261246ef0b41dd64.tar.gz historical-a33d8d9d7e0b1f6311b2fb06261246ef0b41dd64.tar.bz2 historical-a33d8d9d7e0b1f6311b2fb06261246ef0b41dd64.zip |
drop old
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
-rw-r--r-- | dev-libs/glib/ChangeLog | 12 | ||||
-rw-r--r-- | dev-libs/glib/Manifest | 33 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch | 99 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch | 247 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.32.4-bashcomp.patch | 27 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch | 62 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.34.3-automake-1.13.patch | 23 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch | 62 | ||||
-rw-r--r-- | dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch | 112 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.32.4-r1.ebuild | 238 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.34.3-r1.ebuild | 243 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.36.4-r1.ebuild | 273 |
12 files changed, 15 insertions, 1416 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index dbc57ce9fa17..655b08b832d5 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.606 2014/04/21 10:28:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.607 2014/04/25 19:12:17 pacho Exp $ + + 25 Apr 2014; Pacho Ramos <pacho@gentoo.org> + -files/glib-2.31.x-external-gdbus-codegen.patch, + -files/glib-2.32.4-CVE-2012-3524.patch, -files/glib-2.32.4-bashcomp.patch, + -files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch, + -files/glib-2.34.3-automake-1.13.patch, + -files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch, + -files/glib-2.35.x-external-gdbus-codegen.patch, -glib-2.32.4-r1.ebuild, + -glib-2.34.3-r1.ebuild, -glib-2.36.4-r1.ebuild: + drop old 21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> glib-2.38.2-r1.ebuild: Stable for arm, wrt bug #507568 diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 04aa812843c7..564f8a09ef06 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -7,48 +7,23 @@ AUX glib-1.2.10-configure-LANG.patch 1464 SHA256 32377819896297caf9628f382c7bba0 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 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 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 2199 SHA256 4195ca98519b842520d9b11d7cd01f1f6f6ed1843735e2fb50c217fc6c33fe43 SHA512 77284716ff8f4f7482765cc5724e325169fd49b205e19cad19e755a4cceeb57037bdd78fcde6265586770b95fd9481afc69d797a4a521401a2704f4eab644d47 WHIRLPOOL 9941b5aa7f1fdb1fa6cdf39f4f94a52bfd6093f55f31a6466ecc0996eaa22901ac26cff42fdd64af9dac13004fe47d054991cc27e6450ab4b6810e0f421157f4 AUX glib-2.37.x-external-gdbus-codegen.patch 4573 SHA256 7094ff73cef6add5bf1727f2d01f6f45ac6ae82d725a47b83d0280064d006ee2 SHA512 dc8e0460c549a5d65cc9ba575d0f1eb2bd7a487d382970922e454ceb4efe46a096da82abfe5ba50bf37f56e1c24570ed391a5474f22f9f97d678baad003893ed WHIRLPOOL 86f0da69db6c0c9c8f22869155ce679c75db755c78bd7add7401e7e73c454fd9704dcb0a050b67d99a4bbbb161c26325ff120ef0bb7d76341ebc528015169b20 AUX glib-2.38.2-configure.patch 985 SHA256 4a3d9bf2b84f966ad2792ed7a356cf9e4f23e95efbe950bd6d5df544d45fff97 SHA512 ebdcc5775b4ada3f464a791ac0bffe0cd7a4441c9f21af327c9a99638157bbb8d72bb01aa70190c4e757481c5832763a0b569b7de6f452b4a2d05ea5b4a3e63d WHIRLPOOL 99d02f68ad97dbeb9de6dfdef5a76b19b94da9ff66ace3657bd772fdc181067c19225926ff5bd0bc7006a4abc5b4ed3a5523769fb8e488bed74b1cacbeab9448 AUX glib-2.38.2-sigaction.patch 707 SHA256 72476721ee93a0587a89b48f35944d8b1e317bc240ef79363f82ad7ed71c2e55 SHA512 f97c30585c06a6a4d937ee8f27574d60580893e29372a282d1310f6702a7b003233c64e2d56d2ae91af53eee6465d9acb68b76027ec9428f1615bd7c25af45db WHIRLPOOL 5a478f80558bca17508e6d2b342e2204bb419818c7382f17e2c01ba6e0addc9190fc12a7817c728e35b3f7c304575551d43a529b0aa3e2fa2432b823d69f6467 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 8398 SHA256 17c312a7ec9a61ed1720ae5bfc5bbd77e285a3f35c4555ec30780b95390a66ed SHA512 43fe5cf6a579939be32d31fecb3389813bdd3cf2773e414c1d8f368c130ede4da9558cec40051fafb31eea514359267f0182db0211ca91fa55db4c1aa9905162 WHIRLPOOL 68f54986ce2328c599ad298364c0af710cab188854ffce68b3a01f9a0087049e208437a33c2f254488df0f7a3b03f4e5266f45af970ee5aab2783617549cf000 -EBUILD glib-2.36.4-r1.ebuild 9867 SHA256 4127b4d88348932a795d17429db6f9de0d361a9ab19cf1bc54f67162b79bd379 SHA512 63f46a199e0c394729027ffd2fa00e0febd22ad69471a36a4fe4eae9e2457b3da13827e73a315ff406e59ad6051e1d48becd94b66c3d291fc11196feb678fe7c WHIRLPOOL 04d8112891f9f5836b606f32ece3c9b3e799a1a87b770e821527d957efe031c9b55c16b41f48a8ad3f939693a188ceedc3323292d7bcf0b6e22a151820d7d4a4 EBUILD glib-2.38.2-r1.ebuild 9861 SHA256 af45a7fe07818085a00ea1928fa63928f12607443953d73cc9402c84f357d99d SHA512 afaacec3dca8ca254cf16dce0ffcb5c5f94f2dce129ae3b2199eea3ddb646a04b2e19bf1ecdb83f2ea34350f767eb07b192c816ed630840223818ddc98a8ba63 WHIRLPOOL 8c51f2e66a8f6070656f3c70e06b92e321b9f1af9900831c8a96eea9eadee5cb4141b7360f439e72408cb7b725fc41813fe6e4436951271d89d4f43b6fe610fd -MISC ChangeLog 84965 SHA256 a01914ea66a93725f31e05dc493ff860f9661247657adec2b363e2b6b670b56c SHA512 368dfd7b69146cfcc235af112130758e69efd26b1126ae112bf543cddec7f69fd934a9d62fd2cc8beb9054eff4dfc1017133e5fde1b93e140dfcbd9692dd190e WHIRLPOOL 04a90a6a2829bc09e29ce34371eb3063baa95b1f93116f8e14da36e32f1a2f28a469c434aeebadd7747013a4c3de35d3817de83ca5521870203c7114e1ca2c3b +MISC ChangeLog 85440 SHA256 2de8d09ca87a06117f6eeb59081e65ed14fa25bb183ea61de6330506d6090975 SHA512 12e9ab65cf79336f6c81d07773882ba6d0ed44fab5875a8d832185580e3fe3f91f64d69242b5d35028f25bef5c1c1b81b94a935a0cfe4f9ecb43c3b3be203d82 WHIRLPOOL 8f91fc81298a450983bdffd7a93eecfba4529f159b2e50489d9ebfe3a4ce7f1ccb2b43e9f82a8eb36e471dcef2e41236800157a75393ebc0242429373d4c2ae6 MISC metadata.xml 479 SHA256 1a41cb4f56511674a423efd444f7c6999b5d316f9058d2eb67a032a522738ffb SHA512 f30f9e937d43dd4fb148dc7ab1554b5c58ddf4211bc06cfc65e92ff9843a84f0b05fa130fcd130744ad6e3579fb5b82a7f31950dd8ccc317f58388023cb6fe50 WHIRLPOOL 92888cd8e3a839860cb20c60ad1ee2871ea9efdf54d5751d6b5f677faf10e721333c3d68b1b5c4af212854f9ecd9e31970832eaa05f30276987bcadacaf5f637 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJTVPLhAAoJELp701BxlEWf7k4QAKVDaHwiz5VT5Yj2Xz5XInXH -eUti3Of+61BTwcFJqA01AWDqaiGRTXqMiesE0q74iQC5l9OCO0wMaAa3iPb5yzrD -KMYenxnt+bAz5PwlmB6ncT4f1s5DK9icpv/RptWEQA872qSegnkQ/K6NtwP/M5Bx -QidhqctFaq5D8KRWz2HdJXnqAdONHZDr2zSYO5BNjWdPJB2/KqAMG427n4Djumgt -xdmHnqWlWwlM7ykKq3XVtBzb8U9J65ZM/L+G3Io9cbkHsQzhAL2IVEDw4m9JyRqZ -VyFnN5YUO3MHR18lVU63eHoMVV7xpXKKJnHqDLp5Dr2PSlXuDxQc9MANDQU6tqMI -/eMNLYx/hAQGF1SdiOJmmpFwHjthHmRQRhhdyANAfR9cSv4HX9CnqfGn+Vk+QtOc -5c1BMmmGYXjov7bSsmnRKsQEoD8Il5+EQjWMlgpMiU6BG0Uv8bUb5YWSJ0mQPLHi -JTwqN2trzeY12nnRRn/JZBphfDu3CliSvoQsd/2jevN2fq8M486QudbvC0vmNUAG -XawnoqZBgYK6Yc9U2v+e/YCDwQCoRbv3tHCDePZYqlqLukFgJliK8eFmL36eSfE+ -sgyByujz4LIP8hrNbd+qq0G7JAqS2OcxE5UewXvhJBicCs2WnNSWlHEnhOZkh9et -DgPYgepHeiPZgVqJSZTd -=dD0+ +iEYEAREIAAYFAlNas5IACgkQCaWpQKGI+9TExgCfZtuKS3htpJ/BE67GueusTH3/ +LR0AoIGaGf/Vo1Sn+7hF94Uy8vkt5E7Y +=pToP -----END PGP SIGNATURE----- diff --git a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch deleted file mode 100644 index df1378eb12c6..000000000000 --- a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 732f04b55f59b8107a7fbe317317edb5f184ea8f Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Fri, 3 Feb 2012 09:08:28 +0200 -Subject: [PATCH] Split out gdbus codegen - ---- - configure.ac | 4 +--- - 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, 7 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4cf04a1..0bb18c8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -356,7 +356,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 *********************** -@@ -3525,8 +3525,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/xdgmime/Makefile - gio/inotify/Makefile - gio/fen/Makefile -diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am -index 535aa26..5027dd5 100644 ---- a/docs/reference/gio/Makefile.am -+++ b/docs/reference/gio/Makefile.am -@@ -144,8 +144,7 @@ man_MANS = \ - glib-compile-resources.1 \ - gsettings.1 \ - gresource.1 \ -- gdbus.1 \ -- gdbus-codegen.1 -+ gdbus.1 - - if ENABLE_MAN - -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 67eeae6..277931b 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 += xdgmime -diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index e987fd1..66af8cf 100644 ---- a/gio/tests/Makefile.am -+++ b/gio/tests/Makefile.am -@@ -275,10 +275,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses - 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/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am -index 9861d0e..9ca6eb9 100644 ---- a/gio/tests/gdbus-object-manager-example/Makefile.am -+++ b/gio/tests/gdbus-object-manager-example/Makefile.am -@@ -21,10 +21,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.7.8.4 - diff --git a/dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch b/dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch deleted file mode 100644 index 92e6c8125e5b..000000000000 --- a/dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch +++ /dev/null @@ -1,247 +0,0 @@ -From 4c2928a54482913cf236bff0e66650a8f47e17ea Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Wed, 22 Aug 2012 18:26:11 +0000 -Subject: CVE-2012-3524: Hardening for being run in a setuid environment - -Some programs attempt to use libglib (or even libgio) when setuid. -For a long time, GTK+ simply aborted if launched in this -configuration, but we never had a real policy for GLib. - -I'm not sure whether we should advertise such support. However, given -that there are real-world programs that do this currently, we can make -them safer with not too much effort. - -Better to fix a problem caused by an interaction between two -components in *both* places if possible. - -This patch adds a private function g_check_setuid() which is used to -first ensure we don't run an external dbus-launch binary if -DBUS_SESSION_BUS_ADDRESS isn't set. - -Second, we also ensure the local VFS is used in this case. The -gdaemonvfs extension point will end up talking to the session bus -which is typically undesirable in a setuid context. - -Implementing g_check_setuid() is interesting - whether or not we're -running in a privilege-escalated path is operating system specific. -Note that GTK+'s code to check euid versus uid worked historically on -Unix, more modern systems have filesystem capabilities and SELinux -domain transitions, neither of which are captured by the uid -comparison. - -On Linux/glibc, the way this works is that the kernel sets an -AT_SECURE flag in the ELF auxiliary vector, and glibc looks for it on -startup. If found, then glibc sets a public-but-undocumented -__libc_enable_secure variable which we can use. Unfortunately, while -it *previously* worked to check this variable, a combination of newer -binutils and RPM break it: -http://www.openwall.com/lists/owl-dev/2012/08/14/1 - -So for now on Linux/glibc, we fall back to the historical Unix version -until we get glibc fixed. - -On some BSD variants, there is a issetugid() function. On other Unix -variants, we fall back to what GTK+ has been doing. - -Reported-By: Sebastian Krahmer <krahmer@suse.de> -Signed-off-by: Colin Walters <walters@verbum.org> ---- -diff --git a/configure.ac b/configure.ac -index 584df1d..67ea1a9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -583,9 +583,20 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], - # Checks for library functions. - AC_FUNC_VPRINTF - AC_FUNC_ALLOCA --AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2) -+AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2 issetugid) - AC_CHECK_FUNCS(atexit on_exit timegm gmtime_r) - -+AC_CACHE_CHECK([for __libc_enable_secure], glib_cv_have_libc_enable_secure, -+ [AC_TRY_LINK([#include <unistd.h> -+ extern int __libc_enable_secure;], -+ [return __libc_enable_secure;], -+ glib_cv_have_libc_enable_secure=yes, -+ glib_cv_have_libc_enable_secure=no)]) -+AS_IF([test x$glib_cv_have_libc_enable_secure = xyes], [ -+ AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 1, -+ [Define if you have the __libc_enable_secure variable (GNU libc, eglibc)]) -+]) -+ - AC_CHECK_SIZEOF(char) - AC_CHECK_SIZEOF(short) - AC_CHECK_SIZEOF(long) -@@ -984,7 +995,7 @@ AC_MSG_RESULT(unsigned $glib_size_type) - - # Check for some functions - AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk memmem) --AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid) -+AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid) - AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat) - # Check for high-resolution sleep functions - AC_CHECK_FUNCS(splice) -diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c -index 4aa13b9..96b6343 100644 ---- a/gio/gdbusaddress.c -+++ b/gio/gdbusaddress.c -@@ -37,6 +37,7 @@ - #include "giostream.h" - #include "gasyncresult.h" - #include "gsimpleasyncresult.h" -+#include "glib-private.h" - #include "gdbusprivate.h" - #include "giomodule-priv.h" - #include "gdbusdaemon.h" -@@ -1023,6 +1024,14 @@ get_session_address_dbus_launch (GError **error) - restore_dbus_verbose = FALSE; - old_dbus_verbose = NULL; - -+ /* Don't run binaries as root if we're setuid. */ -+ if (GLIB_PRIVATE_CALL (g_check_setuid) ()) -+ { -+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, -+ _("Cannot spawn a message bus when setuid")); -+ goto out; -+ } -+ - machine_id = _g_dbus_get_machine_id (error); - if (machine_id == NULL) - { -diff --git a/gio/gvfs.c b/gio/gvfs.c -index dda8afb..9afbcec 100644 ---- a/gio/gvfs.c -+++ b/gio/gvfs.c -@@ -23,6 +23,7 @@ - #include "config.h" - #include <string.h> - #include "gvfs.h" -+#include "glib-private.h" - #include "glocalvfs.h" - #include "gresourcefile.h" - #include "giomodule-priv.h" -@@ -191,6 +192,8 @@ g_vfs_parse_name (GVfs *vfs, - GVfs * - g_vfs_get_default (void) - { -+ if (GLIB_PRIVATE_CALL (g_check_setuid) ()) -+ return g_vfs_get_local (); - return _g_io_module_get_default (G_VFS_EXTENSION_POINT_NAME, - "GIO_USE_VFS", - (GIOModuleVerifyFunc)g_vfs_is_active); -diff --git a/glib/genviron.c b/glib/genviron.c -index 59a8bbe..9525cf0 100644 ---- a/glib/genviron.c -+++ b/glib/genviron.c -@@ -40,6 +40,7 @@ - #include <windows.h> - #endif - -+#include "glib-private.h" - #include "gmem.h" - #include "gmessages.h" - #include "gstrfuncs.h" -diff --git a/glib/glib-private.c b/glib/glib-private.c -index 3946e77..3506782 100644 ---- a/glib/glib-private.c -+++ b/glib/glib-private.c -@@ -38,7 +38,9 @@ glib__private__ (void) - g_wakeup_signal, - g_wakeup_acknowledge, - -- g_get_worker_context -+ g_get_worker_context, -+ -+ g_check_setuid - }; - - return &table; -diff --git a/glib/glib-private.h b/glib/glib-private.h -index fde0be8..87da6f3 100644 ---- a/glib/glib-private.h -+++ b/glib/glib-private.h -@@ -25,6 +25,8 @@ - - G_GNUC_INTERNAL - GMainContext * g_get_worker_context (void); -+G_GNUC_INTERNAL -+gboolean g_check_setuid (void); - - #define GLIB_PRIVATE_CALL(symbol) (glib__private__()->symbol) - -@@ -40,6 +42,8 @@ typedef struct { - /* See gmain.c */ - GMainContext * (* g_get_worker_context) (void); - /* Add other private functions here, initialize them in glib-private.c */ -+ -+ gboolean (* g_check_setuid) (void); - } GLibPrivateVTable; - - GLibPrivateVTable *glib__private__ (void); -diff --git a/glib/gutils.c b/glib/gutils.c -index 38b5e44..f8a38d1 100644 ---- a/glib/gutils.c -+++ b/glib/gutils.c -@@ -2409,3 +2409,60 @@ g_get_tmp_dir (void) - } - - #endif -+ -+/* Private API: -+ * -+ * Returns %TRUE if the current process was executed as setuid (or an -+ * equivalent __libc_enable_secure is available). See: -+ * http://osdir.com/ml/linux.lfs.hardened/2007-04/msg00032.html -+ */ -+gboolean -+g_check_setuid (void) -+{ -+ /* TODO: get __libc_enable_secure exported from glibc. -+ * See http://www.openwall.com/lists/owl-dev/2012/08/14/1 -+ */ -+#if 0 && defined(HAVE_LIBC_ENABLE_SECURE) -+ { -+ /* See glibc/include/unistd.h */ -+ extern int __libc_enable_secure; -+ return __libc_enable_secure; -+ } -+#elif defined(HAVE_ISSETUGID) -+ /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */ -+ return issetugid (); -+#elif defined(G_OS_UNIX) -+ uid_t ruid, euid, suid; /* Real, effective and saved user ID's */ -+ gid_t rgid, egid, sgid; /* Real, effective and saved group ID's */ -+ -+ static gsize check_setuid_initialised; -+ static gboolean is_setuid; -+ -+ if (g_once_init_enter (&check_setuid_initialised)) -+ { -+#ifdef HAVE_GETRESUID -+ /* These aren't in the header files, so we prototype them here. -+ */ -+ int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); -+ int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); -+ -+ if (getresuid (&ruid, &euid, &suid) != 0 || -+ getresgid (&rgid, &egid, &sgid) != 0) -+#endif /* HAVE_GETRESUID */ -+ { -+ suid = ruid = getuid (); -+ sgid = rgid = getgid (); -+ euid = geteuid (); -+ egid = getegid (); -+ } -+ -+ is_setuid = (ruid != euid || ruid != suid || -+ rgid != egid || rgid != sgid); -+ -+ g_once_init_leave (&check_setuid_initialised, 1); -+ } -+ return is_setuid; -+#else -+ return FALSE; -+#endif -+} --- -cgit v0.9.0.2 diff --git a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch b/dev-libs/glib/files/glib-2.32.4-bashcomp.patch deleted file mode 100644 index 33abffcf7d6c..000000000000 --- a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6d032421b4871105e1f37bb75a5ec7b012f19f61 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Sun, 15 Jul 2012 22:30:07 -0400 -Subject: [PATCH] gio: use /usr/share/bash-completion for bashcomp - -In Gentoo, we use /usr/share/bash-completion, not -/usr/share/bash-completion/completions. ---- - gio/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 704367c..bee9dc6 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -715,7 +715,7 @@ gdbus_LDADD = libgio-2.0.la \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la - --completiondir = $(datadir)/bash-completion/completions -+completiondir = $(datadir)/bash-completion - completion_DATA = \ - completion/gdbus \ - completion/gsettings \ --- -1.7.8.6 - 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 deleted file mode 100644 index aff75cbeff58..000000000000 --- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch +++ /dev/null @@ -1,62 +0,0 @@ -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.3-automake-1.13.patch b/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch deleted file mode 100644 index 5f4e7b6bbd32..000000000000 --- a/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch +++ /dev/null @@ -1,23 +0,0 @@ -Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36 - -diff --git a/configure.ac b/configure.ac -index a3567b3..3e3d697 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,7 +56,7 @@ m4_define([glib_debug_default], - AC_INIT(glib, [glib_version], - [http://bugzilla.gnome.org/enter_bug.cgi?product=glib]) - --AC_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_SRCDIR([glib/glib.h]) - AC_CONFIG_MACRO_DIR([m4macros]) - -@@ -291,7 +291,6 @@ AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) - AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) - AC_LANG_RESTORE - --AM_PROG_CC_STDC - AM_PROG_CC_C_O - AC_PROG_INSTALL - diff --git a/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch deleted file mode 100644 index c7c3f3364f4f..000000000000 --- a/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 86bc94d3783ba53a944451f4eba4c78130eeef3b 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 file changed, 9 insertions(+) - -diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c -index 737770e..d528c6b 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); -+#if 0 - g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external); - g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1); -+#endif - - ret = g_test_run(); - --- -1.8.3.2 - diff --git a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch deleted file mode 100644 index a7fb01986e1d..000000000000 --- a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 4a74adf19d7e46aef7c9ede87ffb0264193311dc Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Thu, 28 Feb 2013 08:28:01 +0200 -Subject: [PATCH] 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 f734b7c..8076e7f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -374,14 +374,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 *********************** -@@ -3697,7 +3697,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 99606d3..067cd50 100644 ---- a/docs/reference/gio/Makefile.am -+++ b/docs/reference/gio/Makefile.am -@@ -152,8 +152,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 94d7f59..c07d00d 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 += xdgmime -diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index c8a4090..feece02 100644 ---- a/gio/tests/Makefile.am -+++ b/gio/tests/Makefile.am -@@ -212,10 +212,8 @@ gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h - gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c - - 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/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am -index 6875210..264c3c1 100644 ---- a/gio/tests/gdbus-object-manager-example/Makefile.am -+++ b/gio/tests/gdbus-object-manager-example/Makefile.am -@@ -21,10 +21,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.1.2 - diff --git a/dev-libs/glib/glib-2.32.4-r1.ebuild b/dev-libs/glib/glib-2.32.4-r1.ebuild deleted file mode 100644 index 01ccaa69d5a1..000000000000 --- a/dev-libs/glib/glib-2.32.4-r1.ebuild +++ /dev/null @@ -1,238 +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.32.4-r1.ebuild,v 1.15 2013/08/14 04:19:30 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 linux-info - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="http://www.gtk.org/" -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+" -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" - -RDEPEND="virtual/libiconv - virtual/libffi - sys-libs/zlib - || ( - >=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 ) - 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 - - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - linux-info_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2012-3524.patch - - mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die - - # Fix gmodule issues on fbsd; bug #184301 - epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch - - 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 - # 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 - 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.31.x-external-gdbus-codegen.patch" - - # bashcomp goes in /usr/share/bash-completion - epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch" - - # AS_IF fixes from 2.33.x, needed for cross-compiling, bug #434770 - epatch ../AS_IF-patches/*.patch - - # https://bugzilla.gnome.org/show_bug.cgi?id=679306 - epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" - - # build failure with automake-1.13; fixed upstream in 2.36 - epatch "${FILESDIR}/${PN}-2.34.3-automake-1.13.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 && ! $(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 - - # 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) \ - --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 - - # 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 - export LC_TIME=C # bug #411967 - - # 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.3-r1.ebuild b/dev-libs/glib/glib-2.34.3-r1.ebuild deleted file mode 100644 index 9c4f4b4659a8..000000000000 --- a/dev-libs/glib/glib-2.34.3-r1.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3-r1.ebuild,v 1.7 2014/01/18 04:39:44 vapier 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 - -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" - -RDEPEND="virtual/libiconv - virtual/libffi - sys-libs/zlib - || ( - >=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 ) - fam? ( virtual/fam ) - utils? ( - ${PYTHON_DEPS} - >=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 - systemtap? ( >=dev-util/systemtap-1.3 ) - test? ( - sys-devel/gdb - ${PYTHON_DEPS} - >=dev-util/gdbus-codegen-${PV} - >=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 - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - 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 - - # 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 - fi - - # gdbus-codegen is a separate package - epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.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 - - # 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.3-testsuite-skip-gdbus-auth-tests.patch" - - # build failure with automake-1.13; fixed upstream in 2.36 - epatch "${FILESDIR}/${PN}-2.34.3-automake-1.13.patch" - - epatch_user - - # 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 - 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 && ! $(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 - - # 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" - - 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) \ - $(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 \ - --with-xml-catalog="${EPREFIX}/etc/xml/catalog" -} - -src_install() { - default - - 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/" - - dodoc AUTHORS ChangeLog* NEWS* README - - # Completely useless with or without USE static-libs, people need to use - # pkg-config - prune_libtool_files --modules -} - -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 "${S}"/tests/.libs/assert-msg-test \ - || die "Hardened adjustment failed" - fi - - # Need X for dbus-launch session X11 initialization - Xemake check -} - -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" - 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.36.4-r1.ebuild b/dev-libs/glib/glib-2.36.4-r1.ebuild deleted file mode 100644 index d0152090bb11..000000000000 --- a/dev-libs/glib/glib-2.36.4-r1.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.4-r1.ebuild,v 1.12 2014/02/22 14:37:00 hattya 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 arm64 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 - - # #488500 gets autogenerated, but get distributed with Linux-only header - rm "${S}"/gio/gnetworking.h || 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 - - # 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.35.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 croscompile 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) \ - $(use_enable test modular-tests) \ - --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 -} |