Sync with portage [Sun Apr 28 22:43:11 MSK 2013].

2013-04-28 22:43:14 +04:00 · 2013-04-28 22:43:14 +04:00 · 2b438b0e82
commit 2b438b0e82
parent 39a37ac7cb
9394 changed files with 20865 additions and 21847 deletions
--- a/app-admin/gam-server/ChangeLog
+++ b/app-admin/gam-server/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gam-server
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.23 2012/09/26 11:13:57 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.24 2013/04/28 13:04:13 ssuominen Exp $
+
+  28 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  gam-server-0.1.10-r1.ebuild:
+  Fix automake-1.13 compability wrt #466948 by Alphat-PC

  26 Sep 2012; Samuli Suominen <ssuominen@gentoo.org>
  -gam-server-0.1.10.ebuild:
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@ -9,17 +9,17 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 SHA256 e19ede71d259fbe5888c066354413
 DIST gamin-0.1.10.tar.bz2 452194 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306 WHIRLPOOL 49ca0e192d8f5e28d6ffbb201b98b0f2c736554447b37c50eaa6e76e499ab77d696cf585c96c6a38f94c2589c634e694daf2e4969ffddbbb245b07b8a6e7b2d8
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b WHIRLPOOL 462173a33e8f804b71c6991aa5925a5c9a6ee83f80b13967369c5c45721069e629c052e5daebfc3fb03bbad4d3054b523afb6e430db997581f3ff942f7da3180
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
-EBUILD gam-server-0.1.10-r1.ebuild 2449 SHA256 dea93f28bf220be30e20ba76d1339ff1637399ee5205a6b8de98a3a0fd8db785 SHA512 ecfbd4d7ff3fd91acb5c16b4d457acf567ba2f9a1b837ae75a5d1fec9f129183bea8c740214e1f9b142bc6973cfc15a4428c05c105fb8aab798cef139bf56d50 WHIRLPOOL c44c1adf79736a271e33fbad20fb1cbbbf6df2eb09c6dba49db75221af266c9fe5e993402542a89c15c2df877687714bd662ce1b8e67ecbe8a1553ef5b148c49
-MISC ChangeLog 3867 SHA256 9162d0183b9515c1f70d93ad334e67ffe83a00219cdf13531973837662eae533 SHA512 0c840aee4a5ea2f4b7a06bd576564bbab0651dc3281ccab97dff584cdae0e19c5b09d63626752f35157629928bbf5d6429ff572dca4e02c07cf34bc50be41a66 WHIRLPOOL 5bcd4ce6a7738ca276d7320b90ab5a1232cfb191f7bcb746897dba4ead48cf7e0a016ad7dbdb785dd3a217370c9758822f7d5c1daeabc8856f43515843fc860a
+EBUILD gam-server-0.1.10-r1.ebuild 2577 SHA256 97a76076f990734e3e13f5662cd363e36440676c20713cad4f1bd38a71b093fd SHA512 90ecdb77398a11ab9edf8d5a7c62b71fc61277c723e9d0b7af973d4ca78f76a08c79e64808e1c42f288fef8b1c550c541b0addbb0079897ed8acb4d1ad0253f3 WHIRLPOOL 8e67616ea0e71263eb20dd59b661b9f69cc09de765806c9513a06b24a2e5f8492c2cfcb804b39a85720a032c950609f6950ed05056ad5c8b9478b0b0c45b2e7d
+MISC ChangeLog 4010 SHA256 0c3a4e52f2aecac2a531ea9a75f666e0f774ea1db411eff89752e2cd24e5c61b SHA512 51d6a0e41ab6fc040935b3f7502a145d1c14d575806e3f8cac76ba84fce137bdc7d13a745c240eceef0024be2dcad7696746598d2c5a767c58c68975b549595c WHIRLPOOL 8d1d844e843c57ec11a625f8e6cd426c00db6fbad8cf49fc45cb3c048e6c0b548b04f7534139d5710cb8b954929e62a8cb87b1d3a967a9da16aa6cde866187fd
 MISC metadata.xml 244 SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c SHA512 9f697206cf152d13b2a3e26645959ab3353a34e4158832139689359aad999114afb8ed80e2f82464674f358434a891d74f2e94079c2c57fc7a125d17e735ff71 WHIRLPOOL 47f92e411c189c765f6665e28402aa0411ebe898b306925cf395ed23085738120fb4075682d6c86f5818de5a3d70cfeca2fda163e3eb83764ba0b4d8dce1fb04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQEcBAEBCAAGBQJQYuLUAAoJEEdUh39IaPFNmA4IAJvyGqbmk65UMh8NcGiVZyLE
-GhuZyUQudcwHR0PV4ypa14YteLdZ6WtpqHPiX515nuFtozFKIE8Q8Vn+PQtjJgbL
-Zx5qSA6Ak4e/aT20PEjN1s6YvgXUWRAe7ibkbAv4iAJz4tq/MAPNEu5MwDKVVMtB
-zL7U3VQ+jB2vMkEv09wn7vTQAdz4v6bmvwgzB4n7pHB8MOfFoAx0Mwp9aa2xZLhi
-BeNT92zMgetewT6XgP0Uhdpdi410YY0XZyRFQFV2Uzz0GbkCGtESLzwhGlojS95k
-o0Zm9PZoF5vcnlASOzZlWiKJ0uNfPxcrZz43FbYlW+pl24+VfjqIjr/DEVAvuAc=
-=2S1w
+iQEcBAEBCAAGBQJRfR3vAAoJEEdUh39IaPFNGlsH/2S81L2361R4uNHobt3LI/t/
+4W+bvQYV8UBvO4KE1MYKPqih3BkU6byCxAk6VNUjAR6ZWqK5ZHRl9YwasOOUuZxy
+rLqO3XDOPfIaY71Y27lpA4a/3jZh0RcWi4gCoKYPAavMkqMbu8D3Vugf8dTHRL3W
+GETi/xQ4+TgJ6hK0dMaOaNXmjSioVFmJbDabj5V9oxRq0Flz6rEzRvopUBs7PH6Y
+E6+ApYPGbkd78dEPfAYgFpKQ1VYVZJ1HwyACPyB504OfFhEP/Bk1szk/ucmzQgsZ
+QSq0iwYtiF4UizKYiRstDIfXiUFmg7VCOkLVvwfQArD/NpdW7uL/KRGwOSvSjwc=
+=m6x8
 -----END PGP SIGNATURE-----
--- a/app-admin/gam-server/gam-server-0.1.10-r1.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10-r1.ebuild,v 1.9 2012/09/26 11:12:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10-r1.ebuild,v 1.10 2013/04/28 13:04:13 ssuominen Exp $

 EAPI="3"
 GNOME_ORG_MODULE="gamin"
@ -51,6 +51,11 @@ src_prepare() {
 	# Drop DEPRECATED flags
 	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die

+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.in || die #466948
+
 	# autoconf is required as the user-cflags patch modifies configure.in
 	# however, elibtoolize is also required, so when the above patch is
 	# removed, replace the following call with a call to elibtoolize
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.90 2013/04/18 13:25:14 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.91 2013/04/28 10:20:13 hwoarang Exp $
+
+  28 Apr 2013; Markos Chandras <hwoarang@gentoo.org>
+  files/rsyslog-7.2.5-json-c-pkgconfig.patch:
+  Detect new json-c-0.11. Patch from Thomas D. <whissi@whissi.de>. Fixes bug
+  #467338

 *rsyslog-7.2.7 (18 Apr 2013)

--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -15,7 +15,7 @@ AUX 7-stable/rsyslog-gentoo.conf 2630 SHA256 9b390cfffef39d3b5c6f845c6285e23fddc
 AUX 7-stable/rsyslog.confd 583 SHA256 ff2634927d3208ac2c82d352f0a7dc9fef1d0ee098d18f818d4417ac04516e9c SHA512 d7cdfd5eab63877ca2a4776c24b2810aee600c2590f10b598d9feee08a5fcedd9c33cdd2a8e1f89b869474b66ab22e7f96126a5b52e6e66760f742407ae81301 WHIRLPOOL f53744ca0177d2f52e1f070eed6927afddbd38c9b6f3fe889b4652cd8b3f0dd625abfe434253e73fbdbf7a14169c7ace5038dc8322ca4b3f97abf893125cedec
 AUX 7-stable/rsyslog.initd 985 SHA256 7b3b32e89c051566b68c5e5a077cd5960da183e071e411b1248d4e4702a24279 SHA512 982f2f11370a87fc5d3dd6d1961d35b4e2c1d0d91b4806f9d2ce422e08c08f8d62c7c0f0fdfa6950c0114da099f61bb3142af431a13ea62d7c6ea1720a6d6682 WHIRLPOOL 4b906fbed7d8a9acb2c0989d94d4611f63f8598d77c124506426ddb9d9d24ff9b92b7c91d5405158e18542fb8a383e0abdfecace03959507c1180244d1b93973
 AUX 7-stable/rsyslog.logrotate 547 SHA256 5ade60899ab0f01b757e2f6322ef044b34d143697151431fb0ff7ef65290b53f SHA512 1a43dad1d64f3fb08d55f3d8b60072b06d277eff40fa3e2092998110936f871e1f21ad19a2ef5e17fdd06c3b0643abf4c5668cf41e81847f1c8d7a5c5f9ebe0c WHIRLPOOL ded39f72f185ebfd623f75e60ebaa236f4c1c9fb25c63bd0e751e7b8bf32d8d23dac08e0e5246d6390f4b79040561053ccfebe747e7350e07d1f8ffc78493d39
-AUX rsyslog-7.2.5-json-c-pkgconfig.patch 4459 SHA256 55ba883c9d2b69cd8a08cf1417b838fadba4fe8d23107729e5358c81b877bff7 SHA512 06e5e07e97cc803476149d3f37151d612a24afa6862b1f36e35c9c80abcd0176f9b6d9d496c3633db4e1dd3d4257c3fb97e744afbcc377b2ec20a44f862bb8ea WHIRLPOOL 4086b1fb077554b0115cf7fdf83f28a1e92a510d09809fb89891b70a25b40b0fd2ba2c04ad0e2ef53b40ec3ef8b0e4bb5c2d7185310f87fe8f6d0f9479d8157b
+AUX rsyslog-7.2.5-json-c-pkgconfig.patch 5587 SHA256 107990512f1cbaf4459ec83870cde288fde8ca8c95905658b1202ee8ac12e6fc SHA512 04c4b12916fe158c580d5e9ad74449108d42b7242e0c5d8ecc89f99fdd13bf68b3576d187b4ef5b52d877bc7f7b3d7a2c12786fcd08140d23521a7bbf3c50a56 WHIRLPOOL 4cfc61d46d472b874864726c0ebb88495c4437106121b79fd05f338939ae48d3b8658676305a88d5de996da69f5bdee8b25dc73275ffe4aa01b209d89fb78c81
 DIST rsyslog-5.10.1.tar.gz 2390048 SHA256 2f643a2c613d5b09f242affd32a90cf4fb7a9ac4557dc80f218e6f3e5affb4c8 SHA512 5f70e97c60103c1f3198cd04cb1fb402d67c2e0232ff09c0aa0cd578667924e0a77a34529bcf4f530c0ef5b8da4f42b98bd5be029d1c2669dd04003e59c1b092 WHIRLPOOL 3f14b25dfca61bdcbdc954f0cd54f5e71481a8ebcbfbd45abceafac9185a51dfd67990e936dd3368c9944aabc9653435fbefc270aabcf925e1a2afda9d09e7ea
 DIST rsyslog-5.8.11.tar.gz 2393222 SHA256 f75b39cf22506f7a28d986d0a446a09a0806f253dba661f125a241a1b47d6285 SHA512 545db333efd136c2ae26131ad400e69f41aaa4fa458a5d586c73e9063f0acb044dbcfe3a13e48b3db77a72f471e87b3b8f9ab2bff008b1166b836dbdddb7974a WHIRLPOOL 2ab8ae35179dcade3953c612cb8bdbd48e7bce6c0cca54278d2949ff3c7c29311341855778511acc38328db4ebeca5599e632c94def038f7134cdd2df78e53e8
 DIST rsyslog-5.8.12.tar.gz 2393679 SHA256 18a408c92fa299773d26a8d6f324eec66282a148b0989c66d94b94318dd0a514 SHA512 18080b09a5e80d3a2dc4b04976c3470eb096560ebc038815dfaec73ef3e53ffbad74b2586d0247aeb318a6e2463e072fe84dad5a2040a9320f37b55511d890ae WHIRLPOOL 80b429beb88014c862fc74f0b9ff0b78bd54764b3c01a4b3f7595d4863eb2f8996d29e9db70b472c30c7cac02793a5290319f51b6eaab4b28dea4ca16246c030
@ -35,12 +35,24 @@ EBUILD rsyslog-6.6.0.ebuild 7056 SHA256 431f39720521bb4181c8bbadf9a6f86663572edd
 EBUILD rsyslog-7.2.2-r1.ebuild 7137 SHA256 2814946a6ad96181c33fd7a5b6f874d99035a5b2f9e156a8bf1d99ddab76a39c SHA512 3ab258ddc9f8c1747c772ef9f9e7f209aa5285a5098eebf0bd445a65c152c8499b73944c0da64e1f584f568b776c338bc8b903977b35e144b6555abe6913fedd WHIRLPOOL 3b00dfe36d159dc57429cd05595f1d71bf6fcf0511657e96a07d327ca0e2d3ccfde25206ff8b3231a6fda80776d42965a31f321369b527d20b7951a28d535d31
 EBUILD rsyslog-7.2.5.ebuild 7138 SHA256 ad05447d4f322c4f901c43ac192accc3a9d30c20a261bbb7b925a84e10c667a2 SHA512 e8ed53579c636b6f2f863c02ab92d8cfbbdbc915a8a3f1ebe511c1c20225c980f574d6b708cd057b43d0f175798ae60c66dc50bcdcb939b78f0a48f819adee62 WHIRLPOOL 7e37583e9990e0e5952a0eb89beff092ba803d236dfb08dc49efd4af7b135117a3d8fd9168d5f4149cbe6e151c16984185a6506279c645f766a7f785e3a1e443
 EBUILD rsyslog-7.2.7.ebuild 7157 SHA256 f25a9ce11153d1dfa0e17f9c036c373d19b2d1befa9924fd0677151e2e8904c0 SHA512 765dc0cac35c9af5b3fba35e0ad7d2df6d8790b60bb823f7dce299bba47cbbda7f19160bd83ffa5e78517e05cc8f7ca0dd10de10504b250312cc847771833ee4 WHIRLPOOL 4d024decf1d6bbe4622b64e651b20e4215c35c076707ded85c39509f553a932815de58aba99c4aa871a4c59261a9574f64f58731a6539a0a7781d76aefcb8fae
-MISC ChangeLog 16764 SHA256 7b528de21fe1ba8f55d68d2a45d40c081d5c10ef14094e187133d737e081a22f SHA512 bb41af18e04c791462c69e3dc8474fba7dee4a7995a6a068cde082969b1cd7a5f780174e5bcc0524ee81075bf92ca27aeee42ae3c8e3e66f605c5559d3d17844 WHIRLPOOL 9fb853bc3e6456affaadd5221d104f73b50a1cc7c87b99f2b1a148f53ab9df6d2f85b70b7e56ffc22af60e6e735ad636484793f8038bafbc865e2d3a22122759
+MISC ChangeLog 16951 SHA256 d2f748a02bc77c2735277a6e83900bca2680e6d69a21f2b00f39a4d0e2696951 SHA512 a5cc28375ea55e28ecfd09e2975fb04e47faa2962bd1c12eb44799770ae4da386cc8dd5d09311b9603f73fdad008b4e3f45ac51d0917f8f02eea32a1918908f7 WHIRLPOOL 1fe4de591f307515b768081ddc4cdd493fc173c329b62c8f0ec23dfe6341d744ef6e6474b4653c2b0d474b102dcb13e75434ed40c91004a6c8847880a886dd66
 MISC metadata.xml 654 SHA256 64c2e80b469c21ebea4933e47f601d390cc442d6c0ad83478888b7a2d39c3782 SHA512 f2d7bf3151036af2a023c959e75391b796066b6fc62c95b8493409a20a092d39ed2d9ac9f3ca466d5dcaeb4cc9eb82d899da381a21b1df6d9ee11b1537a54907 WHIRLPOOL c3529400558796c324cb007acb9d600e1b02f4227c5587600072e8addc207ae53c531d2929901f3d41912708d2be1ec943fab4b513f199e2822ba1ba44f6617e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iF0EAREIAAYFAlFv9D8ACgkQKiQSS7ZY+hNw9gD/eu8KELrjeVqSpoVlKiRDImGF
-OlmFb72xEtbF/RcvhMsA9iU/6ZarphEcTQYByGZS99m1nXAvmX5FJ1HxGSGih1A=
-=2sFj
+iQJ8BAEBCABmBQJRfPfdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88rcUP/ih3QwK/eCtqtxMIiH5v3a3b
+3qLVoB7D8D7n8VUGZ5PcAClsXTTnvKDUkXc6tVal+D40Ut/taE7bAWmgXDzdn+On
+snxmnmHPZl0/doqi4ECjP70tVWGUQck70DaNrj5A+WIGEiWfZpWojs6gvD2KX1aw
+EU5lRyq4nRO2vw1e3DP6U/YfIAhA4cBwyzRt/uOZ5x2nEKaRdsICOf4nsCX1lDgV
+J1S2fLZvI2Nta0urD0oAkJHnjrL0QIrG6pnFa/4xhz9ByRvzV5DCZwZnJPo9xaJ1
+/hanTJcS//BWaJu0vel/oYqtxLUzupbl8SPvfvqeW08Sz4zsFgHwCMSugc+UBBRb
+Im+ICarRS+j/MNUigTu8u9bGbRi91L9GGXyUXWTjuwMMQBvLwZ5mBajEvjCMKDuH
+SWf7EE2MCdEAT1EMNBN4cM/2C6+8Kknb8J/RvWkNvDi8DVKOB7xO+mLfTBKoTr9z
+EuO52P4KhpS2YKQGuNNBtbN6DzYy2NYkWhrsMIKpe17ykgVGIRpkArMgzw60IW8d
+0SB5EEkfquSzYFb247Z2SMOD8yUw7IrStt76evS0lsPbUCphYGK2Og21OvqH8ht2
+4Ptg0EH7+6ZkJ/LuHQipv45n7Vf/sidjtcq/YT2Cje8hg0o2UFxnPAjV4QkyrzmR
+Aql6k6rhwYja0Qp3zEZS
+=t8VP
 -----END PGP SIGNATURE-----
--- a/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
+++ b/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
@ -1,13 +1,20 @@
 From edf9b718d3007bdb519b3d64cb1f8145bba8e15e Mon Sep 17 00:00:00 2001
 From: Justin Lecher <jlec@gentoo.org>
 Date: Tue, 12 Feb 2013 11:55:17 +0100
-Subject: [PATCH] Use pkg-config to detect json-c
+Subject: [PATCH] Use pkg-config to detect json or json-c

 There was a typo in the configure.ac which prevented correct usage of pkg-config
 to detect json-c.
 This patch corrects this typo and removes all paths from json.h in source files.
+Moreover, since json-c-0.11 the pkgconfig was renamed to json-c so the
+configure.ac file was modified to check for the new one if the old one was
+not found.

+Reported-by: Thomas D. <whissi@whissi.de>
+Tested-by: Thomas D. <whissi@whissi.de>
 Signed-off-by: Justin Lecher <jlec@gentoo.org>
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
 ---
 action.c                          | 2 +-
 configure.ac                      | 2 +-
@ -21,10 +28,10 @@ Signed-off-by: Justin Lecher <jlec@gentoo.org>
 template.h                        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

-diff --git a/action.c b/action.c
-index 07f3a6f..d5cf983 100644
--- a/action.c
-+++ b/action.c
+Index: rsyslog-7.2.7/action.c
+===================================================================
+--- rsyslog-7.2.7.orig/action.c
+++ rsyslog-7.2.7/action.c
@@ -98,7 +98,7 @@
 #include <strings.h>
 #include <time.h>
@ -34,11 +41,22 @@ index 07f3a6f..d5cf983 100644
 
 #include "dirty.h"
 #include "template.h"
-diff --git a/configure.ac b/configure.ac
-index e9fce3f..cad0d57 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -758,7 +758,7 @@ if test "x$enable_rsyslogrt" = "xyes"; then
+Index: rsyslog-7.2.7/configure.ac
+===================================================================
+--- rsyslog-7.2.7.orig/configure.ac
+++ rsyslog-7.2.7/configure.ac
+@@ -34,7 +34,9 @@ PKG_PROG_PKG_CONFIG
+ # modules we require
+ PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.5)
+ PKG_CHECK_MODULES(LIBEE, libee >= 0.4.0)
+-PKG_CHECK_MODULES([JSON_C], [json])
+PKG_CHECK_MODULES([JSON_C], [json],, [
+	PKG_CHECK_MODULES([JSON_C], [json-c])
+])
+ 
+ case "${host}" in
+   *-*-linux*)
+@@ -764,7 +766,7 @@ if test "x$enable_rsyslogrt" = "xyes"; t
   RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
 fi
 AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
@ -47,10 +65,10 @@ index e9fce3f..cad0d57 100644
 RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
 AC_SUBST(RSRT_CFLAGS1)
 AC_SUBST(RSRT_LIBS1)
-diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c
-index b771d68..1c3ae4d 100644
--- a/plugins/imkmsg/kmsg.c
-+++ b/plugins/imkmsg/kmsg.c
+Index: rsyslog-7.2.7/plugins/imkmsg/kmsg.c
+===================================================================
+--- rsyslog-7.2.7.orig/plugins/imkmsg/kmsg.c
+++ rsyslog-7.2.7/plugins/imkmsg/kmsg.c
@@ -35,7 +35,7 @@
 #ifdef  OS_LINUX
 #include <sys/klog.h>
@ -60,10 +78,10 @@ index b771d68..1c3ae4d 100644
 
 #include "rsyslog.h"
 #include "srUtils.h"
-diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
-index c47aceb..56db557 100644
--- a/plugins/mmjsonparse/mmjsonparse.c
-+++ b/plugins/mmjsonparse/mmjsonparse.c
+Index: rsyslog-7.2.7/plugins/mmjsonparse/mmjsonparse.c
+===================================================================
+--- rsyslog-7.2.7.orig/plugins/mmjsonparse/mmjsonparse.c
+++ rsyslog-7.2.7/plugins/mmjsonparse/mmjsonparse.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <ctype.h>
@ -73,10 +91,10 @@ index c47aceb..56db557 100644
 #include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
-diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
-index fd2004a..45dde98 100644
--- a/plugins/mmnormalize/mmnormalize.c
-+++ b/plugins/mmnormalize/mmnormalize.c
+Index: rsyslog-7.2.7/plugins/mmnormalize/mmnormalize.c
+===================================================================
+--- rsyslog-7.2.7.orig/plugins/mmnormalize/mmnormalize.c
+++ rsyslog-7.2.7/plugins/mmnormalize/mmnormalize.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <libestr.h>
@ -86,10 +104,10 @@ index fd2004a..45dde98 100644
 #include <liblognorm.h>
 #include "conf.h"
 #include "syslogd-types.h"
-diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
-index dd99741..64d501d 100644
--- a/plugins/ommongodb/ommongodb.c
-+++ b/plugins/ommongodb/ommongodb.c
+Index: rsyslog-7.2.7/plugins/ommongodb/ommongodb.c
+===================================================================
+--- rsyslog-7.2.7.orig/plugins/ommongodb/ommongodb.c
+++ rsyslog-7.2.7/plugins/ommongodb/ommongodb.c
@@ -33,7 +33,7 @@
 #include <stdint.h>
 #include <time.h>
@ -99,10 +117,10 @@ index dd99741..64d501d 100644
 /* For struct json_object_iter, should not be necessary in future versions */
 #include <json/json_object_private.h>
 
-diff --git a/runtime/msg.c b/runtime/msg.c
-index 68577ad..664abb9 100644
--- a/runtime/msg.c
-+++ b/runtime/msg.c
+Index: rsyslog-7.2.7/runtime/msg.c
+===================================================================
+--- rsyslog-7.2.7.orig/runtime/msg.c
+++ rsyslog-7.2.7/runtime/msg.c
@@ -41,7 +41,7 @@
 #endif
 #include <netdb.h>
@ -112,10 +130,10 @@ index 68577ad..664abb9 100644
 /* For struct json_object_iter, should not be necessary in future versions */
 #include <json/json_object_private.h>
 #if HAVE_MALLOC_H
-diff --git a/runtime/msg.h b/runtime/msg.h
-index 564441b..caa825f 100644
--- a/runtime/msg.h
-+++ b/runtime/msg.h
+Index: rsyslog-7.2.7/runtime/msg.h
+===================================================================
+--- rsyslog-7.2.7.orig/runtime/msg.h
+++ rsyslog-7.2.7/runtime/msg.h
@@ -30,7 +30,7 @@
 
 #include <pthread.h>
@ -125,10 +143,10 @@ index 564441b..caa825f 100644
 #include "obj.h"
 #include "syslogd-types.h"
 #include "template.h"
-diff --git a/template.c b/template.c
-index 1ccb375..974aba3 100644
--- a/template.c
-+++ b/template.c
+Index: rsyslog-7.2.7/template.c
+===================================================================
+--- rsyslog-7.2.7.orig/template.c
+++ rsyslog-7.2.7/template.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <ctype.h>
@ -138,10 +156,10 @@ index 1ccb375..974aba3 100644
 #include "stringbuf.h"
 #include "syslogd-types.h"
 #include "template.h"
-diff --git a/template.h b/template.h
-index 018e2f5..c87e7a8 100644
--- a/template.h
-+++ b/template.h
+Index: rsyslog-7.2.7/template.h
+===================================================================
+--- rsyslog-7.2.7.orig/template.h
+++ rsyslog-7.2.7/template.h
@@ -30,7 +30,7 @@
 #ifndef	TEMPLATE_H_INCLUDED
 #define	TEMPLATE_H_INCLUDED 1
@ -151,6 +169,3 @@ index 018e2f5..c87e7a8 100644
 #include <libestr.h>
 #include "regexp.h"
 #include "stringbuf.h"
-- 
-1.8.1.2
-
--- a/app-editors/gedit-plugins/ChangeLog
+++ b/app-editors/gedit-plugins/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-editors/gedit-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.30 2013/03/28 16:37:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.31 2013/04/28 14:41:11 pacho Exp $
+
+*gedit-plugins-3.8.1 (28 Apr 2013)
+
+  28 Apr 2013; Pacho Ramos <pacho@gentoo.org> +gedit-plugins-3.8.1.ebuild:
+  Version bump

 *gedit-plugins-3.8.0 (28 Mar 2013)

--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@ -11,15 +11,17 @@ AUX gedit-plugins-2.30.0-replace-all.patch 1305 SHA256 1bfef4341f0fe8dd8b9f89ee3
 DIST gedit-plugins-2.32.0.tar.bz2 616927 SHA256 2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107 SHA512 c00535a8a166752ef764319eb79fd7dd5a55df495bf0f3de32e287214f5da8ddd32a52c5538d5e8714843e7e724d24aab9f6fca0f1f339fe299a1ffdf264761b WHIRLPOOL d7385fe3682efaeaa5fbc57a8e8fb68480983140daf78643392b6a7b335a2a5e8ce21cc8f04136efcfac6133dd1c1cd65c50eab0b0cbde766eebb850889796eb
 DIST gedit-plugins-3.6.1.tar.xz 1402568 SHA256 c5e92830e6029110bf1117bd9f31b23a9ad907210b8cb37039772f5bfcf6d174 SHA512 71bdcbe427125be1a3b73086c5d1e2c9f51e9fab6e66c6142578cbf2e30f4b2de3264e1301f6232dbc2fee84202ab1d449b1fff6e13c1a7477e23a9418f10b49 WHIRLPOOL 11e860e567f13ace41a09de0585b0e5248589f09ae22d7cd0d8b84d1381617d45c40b865050e9f4d89a243b59624c45bbd493062d6c7fea539a7ee086d72491a
 DIST gedit-plugins-3.8.0.tar.xz 722464 SHA256 44e8d61ae634898bf3a86be8b6b2fd4f998f85dcf6cb92ec80a508ca245ce6b5 SHA512 72991f5969b26cf44c185f231b2a173c9e436acd7e6d1bdbcb4dbd454def085e1a1b4437ddf4f58549a08dfe816c1bde4054a2c14e8552f7af06a40fd2e2c4d8 WHIRLPOOL 2d507e255a588c8a08a248c84670d88c2f5294961da3e8bca77eec2b6a7c68e8d97fe2148cdfeb27f21d70c8571bdbcbab3fcfb07078563243257d9b5004de84
+DIST gedit-plugins-3.8.1.tar.xz 724572 SHA256 659d379f9edfbba2db37522991c734c5d50e03eb1f70985e978d93a718273141 SHA512 2f8e0bb811d8d15bcdf7dac1c2079fd66147768031f0f4d35861a296ced23ac7458aaec6f33ec7f8faa77db19a46df1a23710016a8250a36435e6126165b6e87 WHIRLPOOL fdbabdddde257138a8958bca5182860c6ce0f55f8170bba79a69df200b100006b58f2780acf70eb66f03b80a7ea8db934d205d9bb04806de2b409f6253442d80
 EBUILD gedit-plugins-2.32.0.ebuild 2297 SHA256 a62ae40c5a037a1a6ee19d5a1364aabf2bb2b6a1c11b18fbedc42258bb2b1eaf SHA512 5447ec6f2d1ce3ab6e4b5861f5b676d4b10da191faf2a7d5288da71293c93e1f2516d4530834423529427cb4146fdafa2f056fb992bc480c3a4756055335c031 WHIRLPOOL 76ad4638ba488774428b0972dc53d68a06cf3dd54f745cc86717d15976fd511218f250375c3bdb287c9fb726aa688fd33eff6ba0ccd133a5461c2c1b2441d2f0
 EBUILD gedit-plugins-3.6.1-r1.ebuild 2080 SHA256 75c86729a15a050c4ac3ce3e9425caec397306493de5743ac8913e7d9eeb1057 SHA512 7ff4bda8b05dbf62cd61023ac4dcaeb9887896732c82744ea98a13e1dcf86d17dec24220a38356fb0f75b20fec4ac993e607be7509198f0271140ce69152f75d WHIRLPOOL a0ac8c318e074ddc21f5b1ba9792c869a0937f9539dcf42da3aead11fc033574af10019209135719eacfe3942306475dc9a92948858068be7f23306c49fdcdc7
 EBUILD gedit-plugins-3.8.0.ebuild 1980 SHA256 12fcd53a95fe3b04a5bbbd68b15f04de834e3ab2a141117a73449c79eca9dd91 SHA512 e4086faa04845550c6143b58b79a8b921c173ad7412f28511489e491fa7df9226cdf0245f3f2984eac33901e88efb636b8ec771ec955ff02ddcd790cb80b719b WHIRLPOOL db726a31c340c9f7d8af24031f3d3036ec1b08dd30bdd4d52ff61a58c7a40e70a3d158ae9c35661f5f49f2badfd0d3b853d37070608d5db09b57c0eefadebec5
-MISC ChangeLog 6255 SHA256 51b1dbc225ac3f6fa715eec22f0507e6f00ffc54b91ed15ad1dfe1a2e63c497d SHA512 9d9ff1325a2e1724f25b877007eb9acd0548ea83bed8595dbbcdee4688cd65406a6cbd4efe0541b6799ec1c7e926a2cf18f052f85acdfb6cc4d3318441820887 WHIRLPOOL ade7ae6b18d989e636236822dd93eb0a7003b9bde312319a31fa59862aca243fc51e2be1d90a40a629253bd5f8c1bead5ba999623a6ff08540adf4cb51eeabf2
+EBUILD gedit-plugins-3.8.1.ebuild 1983 SHA256 74eceb2c046827360b273c0f4a7613ba4a825f50c16916a7a5afcd66452d70ad SHA512 f1fcf6fd35b130fa134dda7adeeae5e1664e40658dcb204d3b3456a106914f40d628938146beb40e6b5ce995111549e1f95148f8a0ba2393e12eccdf6f66d002 WHIRLPOOL ad3eb0bbeebdde39bd139dcd11317683f6908a297c6f6214073c1d6296c0c998e4544eef3a3a3375861cfff0642768f52e56ebb9ddcdaab8b3aab7939a5ee992
+MISC ChangeLog 6382 SHA256 216fa2c38b49914fbcacea54b1100d85ba06990ff728d9d737008328891ed85a SHA512 4dba0003bf267ce8d1a6437f59ad742e384d16dc5c53c8b9a81f5b1f101c64f2f4e19b72c2baa1e37e9f04cf0bcd4e9b260cf43ca418b34f2dffc0d10db12c5d WHIRLPOOL 2c7667f8db2bd7c41d5d55c0ad9a9c738a8eb2f7c56bd187685d3fcb78b575587098582222285c495d3f71e29bc8c55a0e182f197b2fa3b7d5be72ceff3d91ad
 MISC metadata.xml 482 SHA256 f842b0e12beea9918cdef5f9d9aa5dd70a5bff42790692e1b873fd0b3899b7fe SHA512 61db183494688d36fa9c245128b68a3e5223f3c6b8a11f6eb3dbff1463047a542892f8784115b1462cd2e4a7e2aa6cb731e13aa52a0d7864a572b69793434e8d WHIRLPOOL 85f55b6aea35dfb679d596a4c05d73934e08a7d00b49deded64cfd3ea9924cd6211433c0646c3e292525c7dfb6cd1ad9b982966b4d154fab00731d41481cc71f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlFUcbYACgkQCaWpQKGI+9QQUgCggucNDIVn7dSYCXtvjFNdwg7Q
-4YUAn1X/cEVfOktWvWN/lQK5ZIBYgTRa
-=fZ9i
+iEYEAREIAAYFAlF9NQgACgkQCaWpQKGI+9SKPwCggF7Xu317N7o9CBwxfxRlyKib
+iwYAnAr7Dbs/DRHeDRhgH2tUrwhHrfth
+=R3C4
 -----END PGP SIGNATURE-----
--- a/app-editors/gedit-plugins/gedit-plugins-3.8.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.8.1.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.8.1.ebuild,v 1.1 2013/04/28 14:41:11 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_2 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 multilib python-r1
+
+DESCRIPTION="Official plugins for gedit"
+HOMEPAGE="http://live.gnome.org/GeditPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE_plugins="charmap terminal"
+IUSE="+python ${IUSE_plugins}"
+REQUIRED_USE="charmap? ( python ) terminal? ( python )"
+
+RDEPEND="
+	>=app-editors/gedit-3.7.1[python?]
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libpeas-1.7.0[gtk,python?]
+	>=x11-libs/gtk+-3.4:3
+	>=x11-libs/gtksourceview-3:3.0
+	python? (
+		${PYTHON_DEPS}
+		>=app-editors/gedit-3[introspection,${PYTHON_USEDEP}]
+		dev-libs/libpeas[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pycairo
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.4:3[introspection]
+		>=x11-libs/gtksourceview-3:3.0[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	terminal? ( x11-libs/vte:2.90[introspection] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# DEFAULT_PLUGINS from configure.ac
+	local myplugins="bookmarks,drawspaces,wordcompletion"
+
+	# python plugins with no extra dependencies beyond what USE=python brings
+	use python && myplugins="${myplugins},bracketcompletion,codecomment,colorpicker,colorschemer,commander,dashboard,joinlines,multiedit,textsize,smartspaces,synctex"
+
+	# python plugins with extra dependencies
+	for plugin in ${IUSE_plugins/+}; do
+		use ${plugin} && myplugins="${myplugins},${plugin}"
+	done
+
+	gnome2_src_configure \
+		--with-plugins=${myplugins} \
+		$(use_enable python)
+}
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.351 2013/03/28 16:33:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.352 2013/04/28 14:37:17 pacho Exp $
+
+*gedit-3.8.1 (28 Apr 2013)
+
+  28 Apr 2013; Pacho Ramos <pacho@gentoo.org> +gedit-3.8.1.ebuild:
+  Version bump

 *gedit-3.8.0 (28 Mar 2013)

--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@ -5,15 +5,17 @@ AUX gedit-2.30.2-tests-skip.patch 1402 SHA256 faf11f3817052dd76aa9d34af938c4cd81
 DIST gedit-2.30.4.tar.bz2 4705692 SHA256 a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c SHA512 31d96a86d4d207fe83aa1c8b8faadd82c2c6eeca019f2df4fdf75a8678233e76edf7a09f32dba6350ab9fc003029cbb585608d864632e1d13c42650d1894b5e1 WHIRLPOOL fe5183f33992d6ec1ce8365321f829828d6c9606b42a6872e323351ac4bee0c488fb5ed06dda8e1aac4a09be3dbad7196e48d9cccf5d0f1c6dd759224051eca6
 DIST gedit-3.6.2.tar.xz 3060832 SHA256 ad4c6837a7e844e000f7cf2c248e636febdcc9b9b9559cf9e27b99392f5735c3 SHA512 772fc51f19eaf7a8231e8f7d758e8968f096fa234636323d10e3c655116ce96768e13670380b337d346a047b8f3dd2d18fd1ff99d88637ab28d31c5772e667a1 WHIRLPOOL a8ce3752c90f4059845125a96a78660841f4d64fb38d784a21415a5ea349c783efd4e6037b02571aa821bd7a2c48bfac3f2110f519a7bed532f2e2375d86e65f
 DIST gedit-3.8.0.tar.xz 3085232 SHA256 1438146371cce64da932bb7121d6d0238684632c5bf53f9508d31552931ad1a1 SHA512 1af9783a4af5998dd6e3a3dc0aeb2b4092947cb08f3c98f6230adabfd9fab56d6197c2dc8a2ea4c2a3687e2ab53410a060a74fa2b18de8c6fe068a096ee25cb2 WHIRLPOOL 3a00ea66aa84dc4592954889772a6b2e3971ce798a4c31d9208b3722b38aabebf76c670dc44db3367cba4a48b5819c2d97ffb53f0409a26497b4cbbda6521fba
+DIST gedit-3.8.1.tar.xz 3105644 SHA256 9e0b8a831c6d6d2b82a8f42a0e01ab1f3398fed2cca0b65d0a105d134a5c4dce SHA512 2938d6af7acf10fa6580b7c13a151e6a03d437d196024805ffee7400105fb5d44627ea3f7c8c824780cb1650476599f08b66618bd8f09e76f25c540504090984 WHIRLPOOL dc39ebe33f0db35b09553656e29ccc9b1164bd3dfcd9a161c92e47dba2c8b2a605b0fa8fe5d6030ac6e1db874a83caed1b1e2d0f789d9bdfa4e486d102ed0ebe
 EBUILD gedit-2.30.4.ebuild 2170 SHA256 8ffdb9b1e5c0d153bf60bbaa7caa28bee9e36bfa976bc6c059ab47610b925300 SHA512 b49016b665412c4a87f748420160b2400cd161be91b0136cfdbbeaaae1a04d3e5a9fb96d67c49a5defcd4ba0aaacfe997f7c7fb62d72d985740cad6df0e4f7b0 WHIRLPOOL e1ca6ffe01a6de3cf915aa017846b5ee969c83d8adf8b98e6381245758ec81e2d9f775149f4e49772d0a932dec524ff53f4fbeb9e8750a80326284a0370df82e
 EBUILD gedit-3.6.2-r1.ebuild 2416 SHA256 029049805fb073a68d9115e3ef43d914870b5d6b2a4f73398031f35b0a18d3de SHA512 13e1a13f4d68e1d158eb401360a8a3dcb56ecdc050656a683ca3636948448ced65a8d1f72848afe4018542973904036998662bcf8c47d33103ac979edf1abda2 WHIRLPOOL 5ccdd5e602a33dbf65ce61484a0da1018ed67256d3fefc78d81b9571eb934d23821a509d608fe9242dd219dcf8de31c08dc1b508f7e41331f6ff323d74593133
 EBUILD gedit-3.8.0.ebuild 2318 SHA256 b598d8325384767442cbaa0b65e8618c1daebe8ffefdeff98f1bc5959437842a SHA512 2e08e1620c153811d600fbee23d5e1a0d219901b2e8a63b847d4782b9ec3701e90ce21194571cc8ef78a6bf4cd5a171f82e241f902cb780ef7ac440d9e47e3c4 WHIRLPOOL c4d5698ad6c84d7a1c352d1e718c298d211e792c574af5a456c656873f786293f8b2b2523eec5ac48c3a2eb1f207f6dc6c358f3960f6ba4f24db0b5e26fcc539
-MISC ChangeLog 44444 SHA256 78b4fe1c196a7aa7ee4263d9429a859c910379d9fe8a2bd734d975729de30a9a SHA512 bea893aa8a96333a1e827986940d5a468bea39257c7e51f8b7f8ad0b7539e30bed9c8f1a996325f7186c3e8397aad88acdfcfc602c10ed8846a6cb8e475feeae WHIRLPOOL a0ecc6473e428427ea2ed4d3e02402d43d8745b791a19953379e44c6233ea30ccc189cde3348bac7e3f15b2886356d9bbf19a58321875b6883d80cc0b66143cd
+EBUILD gedit-3.8.1.ebuild 2328 SHA256 a60c05bfdfa1ad49794f823fe7d7c0ebf842ab3331105fb06eff0c632d842290 SHA512 e609cb6cf5fba31b28fb9bc6f6471a6fb46ccda1c78973ee61df06dca6c3bf00c18feeb94c6556730d00059915f79203cd7a3c3ae5e411bd76f485f1ca07bcc8 WHIRLPOOL 23b9d57e2277c5519d939b639d751afef4325838c53ac425cd7807e37341b27c4fe4dcbd1e6d1e9642ab0623a6a0fa32f9cebf91c34190e0397feea0353b7d16
+MISC ChangeLog 44555 SHA256 289d8fe3afc8b570c3b63f117a4bd21d71a1b459b0fa0b408d362e6c4daa417b SHA512 f16821ea821a52dfdfcbb8d24e700d3e72dc895d8b18e4c944f57886ac374acfbbc962d0bb481bfa9619e64531be3070c732a4fe6241e891c496376ba8381664 WHIRLPOOL 059e490af82b950904cd2e6a957b1919cde60d768b89a467b07f6c30b2133870ed5997e486f91bf3d2c0f769e6e41513126f0113b699dc61a600fbb194318df7
 MISC metadata.xml 276 SHA256 8dec58657a80b4973306f2f6d5da03a819b949c3f8e93b3065eafda55f1f8465 SHA512 9c1f48389dedc905b448e4085b9fec8f37ef777aacf14e18541e39680ccf83a968c7ee8fea8b9ede61704ac174380c7cc56858182fb6f59a589ab1d70b8eea7d WHIRLPOOL 902de8d338629274e1ec7a7a6b13316e88f09847d5158a92fdc3337e33c26dcda79ff8bf425dc0de42657ba14769478335249d13cba2342f8adb247a1f40e905
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlFUcPMACgkQCaWpQKGI+9RzJgCfZIZfS/iS+geMOg6fC6Gkk1Lk
-5FMAn0WP/rXO6bqzrX5BxuMbkUld3qCV
-=d84H
+iEYEAREIAAYFAlF9NB4ACgkQCaWpQKGI+9R26ACeIx0JvXLlNnCfVACxzSerOaUc
+c8kAn0TwXvP4bZ6IRnslKwus+FWPpxAT
+=KfIT
 -----END PGP SIGNATURE-----
--- a/app-editors/gedit/gedit-3.8.1.ebuild
+++ b/app-editors/gedit/gedit-3.8.1.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.8.1.ebuild,v 1.1 2013/04/28 14:37:17 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_2 )
+
+inherit gnome2 multilib python-r1 eutils virtualx
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="+introspection +python spell zeitgeist"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+COMMON_DEPEND="
+	>=x11-libs/libSM-1.0
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.35.4:2
+	>=x11-libs/gtk+-3.7.10:3[introspection?]
+	>=x11-libs/gtksourceview-3.2.0:3.0[introspection?]
+	>=dev-libs/libpeas-1.7.0[gtk]
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+
+	net-libs/libsoup:2.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/gobject-introspection-0.9.3
+		>=x11-libs/gtk+-3:3[introspection]
+		>=x11-libs/gtksourceview-3.6:3.0[introspection]
+		dev-python/pycairo
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
+	spell? (
+		>=app-text/enchant-1.2:=
+		>=app-text/iso-codes-0.35 )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/scrollkeeper-0.3.11
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+# yelp-tools, gnome-common needed to eautoreconf
+
+src_configure() {
+	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-deprecations \
+		--enable-updater \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable python) \
+		$(use_enable spell) \
+		$(use_enable zeitgeist) \
+		ITSTOOL=$(type -P true)
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.153 2013/04/13 20:12:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.154 2013/04/28 11:49:20 hwoarang Exp $
+
+  28 Apr 2013; Markos Chandras <hwoarang@gentoo.org>
+  virtualbox-bin-4.2.10.ebuild, virtualbox-bin-4.2.12.ebuild:
+  Add dev-libs/json-c to RDEPEND and restrict v0.11 since the library name
+  changed. Bug #467310

 *virtualbox-bin-4.2.12 (13 Apr 2013)
 *virtualbox-bin-4.1.26 (13 Apr 2013)
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -25,24 +25,26 @@ DIST VirtualBoxSDK-4.2.10-84104.zip 9717481 SHA256 c4d8490ecf397c67119e40e8dffd2
 DIST VirtualBoxSDK-4.2.12-84980.zip 9719647 SHA256 b61fd0228ad33764f14b23833908b9a520f98985a5ab45d96bede4a8c47d71c3 SHA512 8e085ebb0a4053c7972054bb4e2452c15536bb88e5c28e4c40fb1b50eb2d1f4868176d88ec4afeec3a88a48678fcdcd770fd43654e540e0a39246fad8d63094d WHIRLPOOL 518e9e1eda7a46fe9095833ba7809b95adeb87b745c205ae060934f2dad7bc01148ae29c54f82280756bd3508456a1c824f95251a0e550125fe4b53f79a02ec3
 EBUILD virtualbox-bin-4.1.24-r1.ebuild 10340 SHA256 2fc9fd35434445173259834c8bbe2b608a0d32d70bfe202ca1a06d269a806893 SHA512 0ab42bf363357fc40ee942b36e14406cfaafd3f2546f1d6e800c6eaa15da5ffa06618a36c388e3cfe0da46a9c7692b96dceb5517204da0d78f32be031b421f52 WHIRLPOOL 52b8cd0840e8ed6b3fccee35eb32bdf731c3048080df0ef1232d1d506d08e4f566165954de6624a13bcc9e390e5c59be2858c13d659c02a74594bb335f0d08d0
 EBUILD virtualbox-bin-4.1.26.ebuild 10348 SHA256 179a1a447d4155dc4178611bc0cb3acb2e80b278ab59e574810b1817267c56ca SHA512 dd4fd8fdb80464eeab9cd36f07e2b16bdb6e8ce6c50f4fd3084d81ad28288f366550423b363d7f4ef84d6998bbaf2c64c52bbb4e73a8896341c06adadfe352bc WHIRLPOOL 41b82b42e5a62058540be719f7dd43156655b4aef348ab7b05ab3e86dfb01a1940f61f40c436f8b544dcb4945fbc263aa54d9479e8f188322eabca0caef6769e
-EBUILD virtualbox-bin-4.2.10.ebuild 10412 SHA256 c18cf9387b45f7a8533009a676e8a52e4d72a2b5364e8c463623439598402626 SHA512 e39e22d077fb0cb138f262d383df7f290b04747904ba5e6d440480a3ac9dd0e28712515746c1419d22efd67526ff045373674abc031f4861e88ff8ef3c003389 WHIRLPOOL 501b79ed80090c4e1653d64660ce4f88fb1df50d3a89e49e220ea031cc5fa6238f1f20dbf10d3277db46d802b18dcbe5f0c8e21ac4452aec2d8adca54462827b
-EBUILD virtualbox-bin-4.2.12.ebuild 10412 SHA256 ed2c922696cb75fa4771ec4a64acd3a6e476adf07c2117b0a97c29ce78115f00 SHA512 7135dce2cf346e2eb58ac0ad31cee49ab73ccd8c1db4b68e856560c03fc3a5217750d162d7b0988c3fb23a10b0669c217909932d564908a40d872c9444618397 WHIRLPOOL 3822049f8d87248304f2a576899403c191a1e706a65d735057d137d859aed74fd7f2992e675e4cc86eb6f4218baa21752db05053333f59d58f1eb9b24f19af1d
-MISC ChangeLog 29682 SHA256 d7005c7b1ca963fa54e70db8b87a3ee08c527389ad85475e4748a596d2b810d6 SHA512 d6696e59ab737e8dce32e1a7f84299d6abdd66ba5e6d1c6d901bdb6427bcee1b22203a9c070d809efa640efdbaf3f2095e066adbcdf27925fa1d6920a5420881 WHIRLPOOL 3726cfce2c68a3fd7e271157ff3d2e21ab0f7536a5354cb2eb87271f1efae4d05b5b2822575d4ce766f1255dde40d40f13122b7877e3fbfd180dd9d788598b77
+EBUILD virtualbox-bin-4.2.10.ebuild 10431 SHA256 0c4dc4cfa4782e6185560e31fe72766366b219d6de5588bff764be8cd1f909b6 SHA512 4fb3f783a1f5208e8e68b9334d8ebc90f10a8be24d1197f23866b64b18e82f3232011a70ab9d0d91ba066ac7626afb4938a2961f89428c22d3b7b8438ef0c58d WHIRLPOOL 7ddd7fba557c694bd767ec77a4fcdb9f316c83a2c6eabcc816517ab39532431674315670559df86787c9d7dca4fd76c85d11cc4253c756861edde8943f47b380
+EBUILD virtualbox-bin-4.2.12.ebuild 10431 SHA256 c7d65d0cbc3f426bce0a1ceb4d5cef65f9dbb38690ddbaf1a3a814d49fd9f3cf SHA512 d5e6c4ee766342676831034092b863a673b62119431fea65781ef64424f02ed52cb85925fda368009ee44606f76e517c52feade771077c79b90a12c588bafef1 WHIRLPOOL f47197f47e2c15319b9a065c56ec229b604d2674f32244d9c3a3ab37bd38b1192b8f7a2c801ab9d048d52dad129527c8b5afcbc9d27733dda4eb7e4e6d96f01a
+MISC ChangeLog 29892 SHA256 4596cc0ad163a25c5858ff4fb7828f59fe946d486b6cc089f0950028e3bbd441 SHA512 4ad059625ec346f7520df59744d0f08a47a1d5a6e08dba70160cc90651a291b6234bd8efaf82ea82e082cbf334379e37440b9a67f5f838517beb2f6fac2aa51a WHIRLPOOL 648fca10a316d05138acc49a67f065213940d6a1f211a69eae8f4ca716c0bd5fc2d41ec370d9652a592d89a09f3870af59aa2d1abe18e7f67b03d5786ab2ceb9
 MISC metadata.xml 662 SHA256 1a43722470ad0c756ffba63e85224410ce461c6567fa41d649094c9d7b887b8c SHA512 6276b85358c9c1e24775caf3af3deca45634882a3be7b14c12a8f11e97163b3bb17afac955097b849b1646ff99321ed89373c4091c235c58c069e648646227d9 WHIRLPOOL 69268a11fef6d6cf15a8b6d0a104f1030c401c205777b10c7bfe82c4846482f8251942d674416798f45cf8dcbbe6897aea1f1d084e3283fd2597d76aa2f74600
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCAAGBQJRabxEAAoJEPiazRVxLXTFBfwP+QEqo1V7EChsOuhFlMzRYwAj
-jF0aAaqS1ifyGEeiYdIF+04OIaVvOqlyPJmYjDQtd+er6Hv/hrT9umuF8D6Y8W8z
-no88u6fPi+64kG/lF0wN4pX0PArZSas7ftz7oTJwQ0H+sKuKeM4rW1Fbb7TbgKtv
-Ml8lWv2icjaR2NHKeE9cCs9UbrvN7OIlxrBAYiAA3k6IIAAeFPGaNx1mkmLl5jbP
-w7PV1+JkUtTYVObPP9iwMI3puRgn57WEe7OXNAYWO9iMqjk3JCwOLj1HVrj3hKnE
-/zIPy0Rhp5SOGeRueJ3jecLGqbS5R1dBv7IGBlN05XCZAggwA+woJKHnXEw0DpR8
-wNrbrM4VA+7LfkUQbylCy9sd6NT+P0jJ3FoGMKHMeYUBZcDeab5yp2CarnSNH9eL
-ZKgvHemqCqFaX86neZ+cOQjZJEsfdtPDUclBZwCwBbqjdWll0QnEayMF2H+EmTwu
-MWv9082UvTis1UzBNs7vOG5bgm3twdiHgboGI9jICn3CBoxGlVKzp99amwcDndNA
-uKGC7czcX8CFoZoHq6QEbKVIRVhNR/+LDsgV6Hi9OBVrrL19IYra+a5hqZZLIpuu
-KhnC2ta4aQ3XCeE0CGKrCtidKd4j996I4XL8whfwDJLLXNL4obAuD2TQYT1y2GsW
-NMtDJqyQCCZEirY5QJqn
-=OjSA
+iQJ8BAEBCABmBQJRfQzAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun888i8P/AhbkaOEVc0hIHVTw7SJ4cRJ
+ZLAyp1eo3s2mOmX3DHZTXHd9Qo8DtjWMLJa3HgKvY2nsL5VqDO/Fyqz7ZXG1dRvj
+2Es6rg5udpyfpK53D2W9gAi3t/PoXCQaY1iTfzcDPsvLMDSkUJ554XJUwzPAqN4X
+pUZ4ppK8mRxNSaJHC2FVlKkCXDKBOVG/ugvIoGUIf4nZAebuhT04S92fypMf9dt/
+ktRA/BK6e/I7wowBivH/2CiIYRxiFOy8NsbAejIdyK5eyLznzuxP9vwU7M50ZAW1
+BSs6mVbERj6VRgWNPMtXCLDhtWf72jvWKUbQ2PkZtWiGWToKvCneJe7qso5fZ1+A
+Voja/b3nf17OnhJY3AGBoAPz86Ebo4h8y0LUnZPUvcJJKd85eRkC2rFjV4BiE5wQ
+MV7kiYMGXxlqSI35quzsMHFCKkYXzPWeK2tL5biof9VCp+YVLIxnrPu9JtW7jPOs
+/O4kfWc8eypXLNsw2djJ4zVW4TbaFDgj8UbwISK5mkROY2OA5iSvgRyDBuWqIhvK
+ica0zB32F8wP1z+WoLRhfH4pTzJ8GsCZ++OTRRhmsJM/h3m5ACxGLaR1MU1Dc00+
+JR7WbWE3MjEMt38Po+iD1RyZ4Rfg+iiOsUtXZqWH6vZy0U2cfNfMtYCDvtAFQw6o
+lKD/6bPQ/OSkZsI/ZEg7
+=Yp61
 -----END PGP SIGNATURE-----
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.10.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.10.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.10.ebuild,v 1.1 2013/03/15 15:38:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.10.ebuild,v 1.2 2013/04/28 11:49:20 hwoarang Exp $

 EAPI=2

@ -48,6 +48,7 @@ RDEPEND="!!app-emulation/virtualbox
 		dev-libs/glib
 		chm? ( dev-libs/expat )
 	)
+	<dev-libs/json-c-0.11
 	x11-libs/libXt
 	dev-libs/libxml2
 	x11-libs/libXau
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.12.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.12.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.12.ebuild,v 1.1 2013/04/13 20:12:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.12.ebuild,v 1.2 2013/04/28 11:49:20 hwoarang Exp $

 EAPI=2

@ -48,6 +48,7 @@ RDEPEND="!!app-emulation/virtualbox
 		dev-libs/glib
 		chm? ( dev-libs/expat )
 	)
+	<dev-libs/json-c-0.11
 	x11-libs/libXt
 	dev-libs/libxml2
 	x11-libs/libXau
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.153 2013/04/09 21:26:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.154 2013/04/28 14:27:32 pacho Exp $
+
+  28 Apr 2013; Pacho Ramos <pacho@gentoo.org> tracker-0.16.0.ebuild:
+  Add an eautoreconf call to prevent compilation problems caused by upstream
+  refusing to use upstream libtool and using patched Debian one instead
+  (#367975)

  09 Apr 2013; Gilles Dartiguelongue <eva@gentoo.org> -tracker-0.14.4.ebuild,
  tracker-0.14.5.ebuild, tracker-0.16.0.ebuild, tracker-9999.ebuild:
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@ -4,14 +4,14 @@ Hash: SHA256
 DIST tracker-0.14.5.tar.xz 6065728 SHA256 cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8 SHA512 ab65d5618ef51d23b65e3d6972834e573415dba52e7bb9f20f8f9d4d4aab467b667301e6540083401d91c9e36cb63fdb2259f6dd9e975e9ff60bf1f83245b777 WHIRLPOOL 4c2c5ad9ff0d7a35c5e9c6bc42b354b9967a436cb1a8b2b640ca09e102a428e268bd011e0405a2b331f80df5a69dcd7e0afc693ae4969604ee41088e5da0c25b
 DIST tracker-0.16.0.tar.xz 5921104 SHA256 299c6a180370522d1d794c184aaef8d8222d3f737d564b8e5ca25b8751470c4f SHA512 621b0ab202bfbe6f29d8d75333a8f051b677c14c9c352d09afef92aca7f908b82307ceea4e1e55f14fc0666d8256019ff7e2664737eb34b6ab8c22a742696a40 WHIRLPOOL 245a64d577bccd65798ad90459a027d5f5b9cc344fcff298ed8912562a7391b982b2fb5ba12aa81b9208fab35f6cb769ff27c3b694e1f0d709696f473ee329db
 EBUILD tracker-0.14.5.ebuild 8949 SHA256 a4f76ac7ed979e120b3c0ffb6cda195e8131c99acc64022666df4f780ec91c36 SHA512 55be06d87dcd1f730d89e71d199d1669f25b86a4b70552440627c52d420359a396a45350d7697a6acc1acc595d0732da23a1f9afcd0f6b0e6f29f33dc4d19361 WHIRLPOOL b4946b2b891a9cb3bf04ee3fe3a02f0243845bbb20e2fedad310ac9b9f262e701472a803c48e561f7c1549431b5ec1b150300b49d7b61f3fdf40b92682559f89
-EBUILD tracker-0.16.0.ebuild 8659 SHA256 2857f115694caf3dcf3aee49e68945279380e637edd3e5677c0eda9cdf13a638 SHA512 1be6eac7efa5ba1d5c85fc0e31c14d63e00eec56b5d7fa1355d51626f396f0c0a3fcaebe6a1da2304ab769f9c1a614c80efc508ef6abf814a0a2ed811ab7d6e6 WHIRLPOOL 8e86ea2755d4124977bdc57efdb95b1187adb99dd76cddd8252efa1c1994fb7a470908bdac0c6adce126b1b60b28737ef5fa15e6816beb92d363489067f79b11
+EBUILD tracker-0.16.0.ebuild 8702 SHA256 662827a6ef125d0d7379b210e97220cad193d8cac553d8f88c1fbf84f93de38e SHA512 862be236bf6396e357842804455eed6436e285fa6ce8bce7a7a7fe695db0c87231c5781021b73600944bea0823d7a720d4cd38509839e9f8c8acd628abf23786 WHIRLPOOL df205438f909eef935eb85a58428e59947e05678cbd3f21aba07503594d44e5283ce41021d20689fa3d9a0b37caf4e224250788ea347f19dbe6c1d568bc81aee
 EBUILD tracker-9999.ebuild 8221 SHA256 49f1c3c69b4ac33522b5f8a54eb1dcf103f084847d98dabdb9e7d0cce65f4c6d SHA512 1176c893ac8d3abaaa3d711fd0fb5ce9cf1da56490537ae6a7136937a15fa0f60481a8e1694a124567cf5f1dcb7574c08c3ce131b70f15e2c2b8a5d4a9fec30a WHIRLPOOL f72b3074065993e01e314c63a3d4a9f42999a66b8d6b3a57f0d37d1c829eb322683b275b555e24c01b66b64a3dff57622dd5fc846d76089e403d50e1d1ae67c1
-MISC ChangeLog 29181 SHA256 07f3b74fb62fb63988c149e05e0c9d0c2e946c804ec1cb2ab9a8ce5e9c4a78bc SHA512 ded7825c002e8cb27fa726e086261d8a80ba70edee6c2bdaadd53053495ef77ce0feff131e2394a57bb6916dd1389cd348610abf98f7ba1aefd458c4c0b3104c WHIRLPOOL 356ba0dcfece799dd9d3c4336b3118dcc7e35626b6b5a39ca127368b09549e7207a158a9de09d11256281836301cc83a216a69e19ceb220e061e08a013de0450
+MISC ChangeLog 29414 SHA256 3e9023c3fa361af5b5c8a1aedcfabed1a3d634f3e18945298216342f81bf2479 SHA512 dc26f786c10cec3d2340747eb62728a63ab23a9cd1965e08557e69ee987ff5af00dcf06abd4c471fc775d8441eafaf8bcdcf70cbd916f0ba39d47c928a6643e5 WHIRLPOOL ef36f1e4740d01034cadf4047d31c58a6eaaa18f96a1ad6cd5504897abdc2735955d5ac669f30fe249350f09dc9f636395d32a54594496bdbcae0e918c243d15
 MISC metadata.xml 1601 SHA256 b7d9768eb7b4d1c588947299912d742751c1279f2cc1bd88a437b48eb3824554 SHA512 bc9ec7bfed8d73e1dfcadf6c2b2239595c6d06ad6d4f1657b4e405f8ff1e87af82fb122e267426fbed53fd7011699fa551bc66503d9cb58bf96ac1d6da1e9e61 WHIRLPOOL 27982acb9fbb780837c7a598bdffe0e4283bcb30ce72c3fcce069b933955cb5b7f485a75b7f54dbc66e851b4d9843959efcc0555435e27dc4bec7154112eaf56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlFkh5kACgkQ1fmVwcYIWAajSgCfeDRLcBBCAt0ov0r2r220VhQP
-v80Ani0QpUYfLlNfpVbl1K2jdReLq3O+
-=NFU/
+iEYEAREIAAYFAlF9MdUACgkQCaWpQKGI+9So7QCdG7DUY7SLwymCLcIocltEx8Mv
+70wAn1gEtqCRH8KBSNX4Ud4AFjO3KuO/
+=QLGC
 -----END PGP SIGNATURE-----
--- a/app-misc/tracker/tracker-0.16.0.ebuild
+++ b/app-misc/tracker/tracker-0.16.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.16.0.ebuild,v 1.5 2013/04/09 21:26:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.16.0.ebuild,v 1.6 2013/04/28 14:27:32 pacho Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.14"

-inherit gnome2 linux-info multilib python-any-r1 vala versionator virtualx
+inherit autotools gnome2 linux-info multilib python-any-r1 vala versionator virtualx

 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
@ -148,6 +148,7 @@ src_prepare() {
 	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+1 d' \
 		-i tests/tracker-steroids/tracker-test.c || die

+	eautoreconf # See bug #367975
 	gnome2_src_prepare
 }

--- a/app-text/lodgeit/ChangeLog
+++ b/app-text/lodgeit/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-text/lodgeit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lodgeit/ChangeLog,v 1.11 2012/10/11 08:17:28 qnikst Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/lodgeit/ChangeLog,v 1.12 2013/04/28 13:25:39 ulm Exp $
+
+  28 Apr 2013; Ulrich Müller <ulm@gentoo.org> lodgeit-0.3_p20120507.ebuild,
+  lodgeit-0.3_p20120618-r1.ebuild:
+  Fix LICENSE, bug 444580.

  10 Oct 2012; Alexander Vershilov <qnikst@gentoo.org> metadata.xml:
  Add qnikst@gentoo.org as current maintainer
--- a/app-text/lodgeit/Manifest
+++ b/app-text/lodgeit/Manifest
@ -6,14 +6,21 @@ DIST lodgeit-0.3_p20120507.py 12785 SHA256 87dfd329e7d1fdf1902c6d1903a0b629b6374
 DIST lodgeit-0.3_p20120507.vim 3882 SHA256 b8c1e918a7d6e7c5675ccd05893ad7bf3dae19493248e85735fded16903b06bc SHA512 d8a627fa2430680b78de9d0412c05955fd3294b56590e0e3448d75d9b3f8f5c8921187fee6de5eaf7f9b8e93080042eb3719e2f690c601508ea08878616f301d WHIRLPOOL f6d399c76f7873978d63e2a2f0720bde672d495e45f1fbec02c4125e6e5ae1a3ffa1effcda9e9b8402928c5134456a48a5f53a09f7ffb2667cf4933bbc0c9aee
 DIST lodgeit-0.3_p20120618.py 13010 SHA256 6a48885c6215d5b3abea55934cddc74a9fb3fdac03e29e269c7e7913b99f0f3b SHA512 23da205f2fc3c60c5df9816dcf08a45ff87523698675122ea231ca29ba04d178c003d2a55577f0e0e4dee08c670d5a18826e6bc6cf325b9e28c5668f1bd4d027 WHIRLPOOL 788e52c4533f153fc43c8ea8f316fc691ff48469e28541471524208ad2c54807e24c192d489fe68279586d28cd20fe8004b588cab9730fd8b9fdfc4b84a3d4b4
 DIST lodgeit-0.3_p20120618.vim 3882 SHA256 b8c1e918a7d6e7c5675ccd05893ad7bf3dae19493248e85735fded16903b06bc SHA512 d8a627fa2430680b78de9d0412c05955fd3294b56590e0e3448d75d9b3f8f5c8921187fee6de5eaf7f9b8e93080042eb3719e2f690c601508ea08878616f301d WHIRLPOOL f6d399c76f7873978d63e2a2f0720bde672d495e45f1fbec02c4125e6e5ae1a3ffa1effcda9e9b8402928c5134456a48a5f53a09f7ffb2667cf4933bbc0c9aee
-EBUILD lodgeit-0.3_p20120507.ebuild 1200 SHA256 afbcbd41541c991cc59df7397bd8c877ae7372285e85fcbc4e15f4b5eef0a99e SHA512 ab68caa2ab3f584f9a50bf52f1e5c3066c6b0a32ea29290d7691b7db74a37b6784332a3b10e37e5a7b376bd453d786b69a95ba63ac50e0fdbb9a873fe2b71a1a WHIRLPOOL 48f188d97a3ae496deadfcba9757e4a50ee272cfaf4f1535f8c1efb9c616f48d447fd46bf418771a3a7fd8d68a75e05a27f90a7090925f13c8486080665b01b1
-EBUILD lodgeit-0.3_p20120618-r1.ebuild 1419 SHA256 3f24aec22997fdcf6ab6f7db62ba773b83cb2b09fd2b3a4f36b55a532d9c9883 SHA512 575cb09423ee4f82c2c059df24be3697a418b97a1fe90d12a2da439b11956fc3672933423ce1fa9adcf0b55d6e577903987cf24024ffde7488cafdacab743bc0 WHIRLPOOL ea7395dffb98ad76eb521d561d6051eee60ff8a8b581ee8224bb75609f14496cc9838940a190efeb9e4b88d1dd3a5c9802d96379799fe2ac1bc83dbfeb41c70e
-MISC ChangeLog 1980 SHA256 3ad7079b4bac5f4a39ce1b10a11b9e0c4407a2f45ac03509502a6f388bda4dd8 SHA512 f20762aabd7155d48e8f6bb0c3844a9c1bc7aa08c2f10567802c65d5f11265cebb5f8206013151263b3e1d34796d6be1660088f4f86b4c675bb9287c6bf94a1d WHIRLPOOL 45e143d3751d87008c17fbcfdcf9acc19588b632d7e84b2a00ca8bb4d491ebd098cd3c4ca3627550dbbb0f6446e05d2c053adc40409f3968ff9d2bd82f7e6e57
+EBUILD lodgeit-0.3_p20120507.ebuild 1195 SHA256 eb45eb3bc7bd2dbdd8166224ec6b904cd8f45368d7e05f1100048f710b36b9bd SHA512 10ec29a6032384fc63fa1f0e6813d9dcae59be6117e3573e757eb5f42799a046390d797e7c49d9c1c8943fd47af21d03b38dad0f94537fee79f24e86605289d8 WHIRLPOOL b2e34b77076499c353b8610fa6867f6a3b101d6196656c528e677f8ae14cc82c8c49e2d5f66fb2641bd6c0b34c662310c232737dc2650aba4b32c5b0699e50a7
+EBUILD lodgeit-0.3_p20120618-r1.ebuild 1415 SHA256 fe38331d5209e141b87f8120eb95c52afed44b4b88276d931cf1037bce8c14ac SHA512 09cb13953305f1071b0ca11bc1d9d2cf6b16f6ef7545ae23e37534d46c203c0282788d6ba5a1ebf202b19d2e024fb2b87c601777e782551dc6435915d2d311a2 WHIRLPOOL cfbd1e78a470d1c791df12ff963146f65a41be2b5de5564326d29ea547220bdaf6693c0c4b8d734ac315ee181f4f139dd113be210be5afdb8f9dda3d53c798dd
+MISC ChangeLog 2117 SHA256 0c32278fc6bd8d78d11f33345e4693cb5edb33691db5a847f219ecb8ad85c69a SHA512 41ab95ccf0e7782cb01a0061e64a993447b8bc3e61ff03e32d3a6c72e093b61d85f225dba48630a91193431480f23c156bb7511e8a3b2127b816a3211940d3dd WHIRLPOOL 98c70b872fdf9eb533f8e8c1cd1987304ae93754c35ec08f0d9e946d7fff8e43c57868a1a9e6ace97aa79659c99e30f43b67c45fc5dc6b367d617a827c09db41
 MISC metadata.xml 332 SHA256 c36acd0e22fed5805af5cc5ef3fe8aa7aae4957f00fbf175e495fd47deb430f0 SHA512 d940ce447ce3b92589c69b5c0d627bdcd87b3c277478a70606b7a4291d8a67222157f4a37631a726456da950a6fe3b1c81de8d1236bb98a339f0f1368c756710 WHIRLPOOL 802c61800c30faf645a03585539ee6fa4f63852eb9a074de9bcc2494fbda8ffabbe4127ae6f2cbb26ba1c21cbd9bca7b74d1043b0a7f1d6c4d8fc3398f7cd7b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlB4ddAACgkQ/ejvha5XGaN45QCgyQIjmMLD4TLobEX1tyoi+d2g
-fJcAoOnqVT1rLBZniEOq7IrXfkLK++Fv
-=Yw5Q
+iQGcBAEBCAAGBQJRfSOqAAoJEJQzkH1pP7W4BykMAI3JL3F2wgxNUGSw08cY7Fky
+q84xluR9GU0IS5qXtmwOtzvert4wT4vekOsNjSsxD7Z0MNdEWEmUupB5wpIERN1l
+gYZq5y8Dm80iYhI3U4sXHuBFNmVrU+kUe7pUUM4E+HJlEusLu9Xm8MgzwegmYUCB
+M2gkBDKqvoI9Z1zkqleaZGGGCS61wOszV7R/tw7qjRZ/4Q8EvjHzWHcL/RSASz2y
+U0HcVuCT3k0GA8s7NUFb5sYJveJ0q16aTqFhmboS2dIdVMzZZo+Wt5G1UHW6GZMp
+DQSpn8KXAXrJazYAXipmKFZIude/SHCk5CYZbxyWGwUQvNtlsWdFRar7hT1FaOvS
+63w8HPbs0DtnSBubzEDkeAphRn9F99JH4YYyevxkvepHojc2b/Bfa/hr2o5Qvi/Y
+2kWoV+N9ECsU6/l/AL39g84vzTtLCCWkH7eyj2VOQAxGPwmBuxmyjqTl8ctFgEJQ
+aP7rtu0uHcK17aeHV//T1Eixgmk+vTgAHG27om0OeA==
+=XODS
 -----END PGP SIGNATURE-----
--- a/app-text/lodgeit/lodgeit-0.3_p20120507.ebuild
+++ b/app-text/lodgeit/lodgeit-0.3_p20120507.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lodgeit/lodgeit-0.3_p20120507.ebuild,v 1.3 2012/05/21 12:30:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lodgeit/lodgeit-0.3_p20120507.ebuild,v 1.4 2013/04/28 13:25:39 ulm Exp $

 EAPI="4"

@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/skrattaren/lodgeit-script-gentoo/raw/${MY_REV}/sc
 	vim? ( http://www.vim.org/scripts/download_script.php?src_id=8848
 	-> ${P}.vim )"

-LICENSE="as-is"
+LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="vim"
--- a/app-text/lodgeit/lodgeit-0.3_p20120618-r1.ebuild
+++ b/app-text/lodgeit/lodgeit-0.3_p20120618-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lodgeit/lodgeit-0.3_p20120618-r1.ebuild,v 1.1 2012/07/01 10:43:35 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lodgeit/lodgeit-0.3_p20120618-r1.ebuild,v 1.2 2013/04/28 13:25:39 ulm Exp $

 EAPI="4"

@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/skrattaren/lodgeit-script-gentoo/raw/${MY_REV}/sc
 	vim? ( http://www.vim.org/scripts/download_script.php?src_id=8848
 	-> ${P}.vim )"

-LICENSE="as-is"
+LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="vim"
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.81 2013/04/26 13:21:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.82 2013/04/28 13:09:21 titanofold Exp $
+
+  28 Apr 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  -postgis-1.3.6-r1.ebuild, -postgis-1.4.2-r1.ebuild, -postgis-1.5.3-r1.ebuild,
+  -postgis-1.5.5.ebuild, -postgis-2.0.0.ebuild, -postgis-2.0.1.ebuild,
+  -postgis-2.0.2-r2.ebuild:
+  Cleaning out cruft.

  26 Apr 2013; Agostino Sarubbo <ago@gentoo.org> postgis-2.0.3.ebuild:
  Stable for ppc, wrt bug #457958
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256

 AUX postgis-1.5-ldflags.patch 1379 SHA256 dd06c5a6dbf085cee2f4d08bae1c6440511596d21876f955f6b6d2e133c97559 SHA512 47164ecf5a875267d545504f2dec6b52d34161cd9598968d323bc8949d9bdcfd911d20519faca1a1cf3ce67d6dd0a9bc201c6afc0df7881752368c70bd3cb69b WHIRLPOOL 8c9fb2945c696b1208ba047e51869f11ceabccabd34d0cc0f2d345bb17d1d1c27421e5536882488eb64460e1e703823e5d3e6392eed1667448313b0fd7330601
 AUX postgis-2.0-ldflags.patch 1355 SHA256 8fd78bcee5d20e8735b4b8d034ca762af0d56d42586449e78207fcad2d52d308 SHA512 5e53f5812d8e4f0be72e92632f881ee8520a9fc0a73ae68a9abc494296075fdc82df51573f7a7d68ea4bf6d691d8de4496bb02f7fa78bf7cf73dcc202af6ae71 WHIRLPOOL 606cbb6a229000f18378f2e3a5e6e0e61d767b2c183df0b28927d4ba9b51488cce2ae36adbfa32386f3c2f5bade3ec6bc92d18bf107de1f9a46c0bd320220af8
@ -8,40 +8,18 @@ AUX postgis_dbs 2096 SHA256 dafde4a1d1d95e18facb3287baddab3c1c116933498c310438c9
 AUX postgis_dbs-1.4 2096 SHA256 287224c16cbd286c75098e786235ad07226217fbcf76071279081e6cb1d1add1 SHA512 520711a6165dbb08c7ce86001f885340b5dbc54efc2a863726b09d93db9e0d888c21fa5b466506456cacadd55db8531284c5b85f484c599d313f4d9aac56c1ef WHIRLPOOL 1b87d8edf109dd76a54a8c7819731a843e7ec139bcaef4b69605304a336eb3d558e656c1adf06ca487f1c5624c542634be7b885dd888e5ef4ec89e2970d38195
 DIST postgis-1.3.6.tar.gz 2227317 SHA256 d3b04d4a3439596a1f6368b0627f21762347cef1e0694d5471ef17c6a3b7d144 SHA512 0e98aeaf8c3c3ca1c51c617a6f50f066a69129b63721507708f02c69b5ff8e75c4b7b076f5075263ceedaf10904eaf950784b2c2f9f27ba3bb982f871b68fd4b WHIRLPOOL c45c611a992b044f63be3259c046f01e34b0772f2f95bf7fb7b71b54adef1c72aa3c86141bff8d305751e4598ee18a40e1ebc5439501b76e6c430c19c988d316
 DIST postgis-1.4.2.tar.gz 3276515 SHA256 5ce49b83b4c8f62eccb7080157f05299ff0e49c6ba06c3e1fa1ecfa2682c4d4b SHA512 3c27e8ed9eeb0e884190cdd5e4731989f9752e2ba449cdfe45d09cd638bd5b600d5cef16140e072d5e328cac035b2ffcc18392651c7306dcc4b5401429efc73e WHIRLPOOL 34a92d15018c5c414f93bf16c7cccb53af0943564b378bf2ca49d1692ebe51b9935214a5b2e2bddee716734954be7aabe0b4ce8b9c6b7d9cfbb801fa177bf5c4
-DIST postgis-1.5.3.tar.gz 3779956 SHA256 a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf SHA512 fe51f6cd452de577d361b56196adcacd6715f608c3e2d073375f36e35a6b47b5cc92f8232b9d1d29cd00d1f85c77dbd035379687f7a180074ee7dbd38ca8f3cd WHIRLPOOL 1139e63a8875c98c6f147cba1b3693602846b61c93d73cb561ef567b29f04f51558dfe8a09e0778247fa3b6fc7d221b5ea8df44862808272123c879b21e36589
-DIST postgis-1.5.5.tar.gz 3802212 SHA256 6f7fbb417cfce8cd120d098219ba5f9a19ccdcec0beb0163320b163b23231cf3 SHA512 c9252721c9b6bb9db5c4e9c5d89efdb9767eadc3f8bec0663bb61129c6c78d867114de31aa0022ec4434fe24e5ce3a6d5002158ec6a1e006b2cb2612a4200ea7 WHIRLPOOL 551e1b9f11c9f21409d4f77174f2c2e4433212290b0fdfba53f0e7149bb3c309dfa17a1cac783623775718b4b027d74109164179fa51cdb4ada1d8d5fbe3280c
 DIST postgis-1.5.8.tar.gz 3948219 SHA256 4896fdae2f814b88c3ca458b7d01d7eca7e9aca021599c817919f131a1b0d804 SHA512 30167c56083dcd2aa764ee82b5b124992bfca2ab4eb8753a80f0fe624b310a060411f0714a8e56a1aebc277c3fdf8e1157d13d91560d5a8ffbc64917e9f3c727 WHIRLPOOL c889546679f69bbfc6d015c245721323c39fc18b6da2cfc28e24c7c736be112274f5c43d7d2ce61ea11a49011123d66d1a8f3c79ec3356227c48325945bff72a
-DIST postgis-2.0.0.tar.gz 5446748 SHA256 12179e24e348421c60c501590fda25bd349e2f697003958d9493f5c91b280081 SHA512 e6756d9bb2c88cb3cdbd7f74a8d4dff238b7e9e738468234045dce3646e211a28fd760f245cf93af55e096375de580a8283bc836c52ef216e060481dbe216894 WHIRLPOOL 18dac47cb4b3bc8104a79084da6bd32f32a58c3aaef5b96ee2ec67161d31ed0a4bd739e602a57d888f3b481e3b98ab2884ae8d9f8255c59b85e0f83222917d07
-DIST postgis-2.0.1.tar.gz 5373194 SHA256 32d181bbf0e648fe31c95b3dd23f7e4e49094d93cb4278fdf71c8feed4e9593c SHA512 c3dd03b8ae6e8917336bbaac0b91343f662d2477a7f54dcb823ef43f5433813615e992e729f2f1a30895c14a5039d3c34d9225e850f193192829380e043fc387 WHIRLPOOL a7df5478b3c23b652d48ac16d4f3fbc2d97bdb70ad5f1a450a3ad6142d977ae7de4cf5d2e53b6aee1a3beaf7feeccb12cc925a2cd08b6b5e74e2ca73e1d1786c
-DIST postgis-2.0.2.tar.gz 5573652 SHA256 57746d040080e624f3e81633a180d8a5fc16b0c035d94fe2c16306023ab1c391 SHA512 b301d77ec5f4fe216b641b150f93520a11d3b14e76af7854df8f3224a6f971183bd06ceb381c94f0089abced3dfb830591654022d43e4506ed0de9717620c5fd WHIRLPOOL 81eb53565849f2e155c5cfe5dac588b99e48eb175c98ea8afb3159ef3b7d1af55ad053c049934d63bae3f013f8d88decc35e14a2f4be44363b2303c9bfe9d647
 DIST postgis-2.0.3.tar.gz 5581619 SHA256 7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0 SHA512 e49232a0aebd202a053e2f6cb741551e932e49a8c535fadd22fe15c654e3823c2f43a4c78dc0340cddbbc7f9298651dc16e1737be3bfe0779cc4feede032facc WHIRLPOOL 9c7985ab6d50a4a8ffa4e8fa5ea69c7e365aae8d90a3ea70c978149e5a9efe4a29a29d11db5d2a6b5c830dcd5ba458a3263288f32a5af54665f5d1cab3357415
-EBUILD postgis-1.3.6-r1.ebuild 5595 SHA256 4cd4f8fa35064a3a34b873ad7e77dabead3b225bd7028ebbc95f3adc252fef13 SHA512 3eb25213a082b382efcd67ddead113d84928d730a6fa14dbb7a249757268170aef98350fe21d6b2eebaf5febb7bb9624bfef582d597bdee2a898af280267e864 WHIRLPOOL 5217be7480e86c55b51a2ce5fc4e7824ce07cf8af49f95f41c4793c805897a6213eabf4dacb9a1d61268388649115b32643859b54ccc43a45a423131a9e9e081
 EBUILD postgis-1.3.6-r2.ebuild 6017 SHA256 af5177091e4ff0133ab6ad1320da6a7e77975e3cb1972853e705591be54c059f SHA512 58a3a87c8187534c57f5bb7e250e144ad32883a565bc5bda9a035d4bf382860e21485b8f2bc2e5d16235a4b0b5e97b3847aa3b0480a9d552c22a51742bfb535e WHIRLPOOL 1d8c0bc8f29b7bfb73ae56bf5d10f804bdea5342fcb5861f8358295219ef1fcaa62f142d2ea4b952214352e0ba8e10e11e3ba82fa6fe29fa8c5d5cd51f545bfc
-EBUILD postgis-1.4.2-r1.ebuild 6696 SHA256 789cd4a5a6515f10946931330b4241c5bdd7f3a8519de059c290713532f2cc11 SHA512 1ebb80920c2d468aba3b31ceacfd5011fc3f8cc3f879506cdf80ca48bb080e01ad541f4844ab73c9635a68f360b8f229aca502e5c35ac4d2f07f52898be3df18 WHIRLPOOL 34ed155d44362eedb82df185203883963458c95598e88f48bb2ca2d604231655c5ae4120261f546a07a928bb13bed64e536ae4fd58dcb5bcd19e565f495c556f
 EBUILD postgis-1.4.2-r2.ebuild 6683 SHA256 86e7e7a070bc058d621658961c8e9baf1eb16a109b973a1dab3e4e9305bb90b2 SHA512 07ec50fc31a5ef2adbe067fc2049a5fc987ed1bf84cb06b3e1ac80075df79f9ff4a17b54d94b1d613ad322aa1497a66271279983f14a5e184450463c20737c24 WHIRLPOOL 7a1a670f9a0c12f55e8d2cd611f5381e24d6fd6dec2c10d0bb8d7121358918545cfddfd3ff582b26ee56a76f3a5ca0c900863331864311f62b32c28948cf2d41
-EBUILD postgis-1.5.3-r1.ebuild 6912 SHA256 8680d2bf4db5fc0ff1d1631e7ecf827aae1786f86c5a2f19951bd86a549a156f SHA512 93f568e74cfc1332554655b57963b7874fbd121f7b4904176a24ad7ed796b75fa25080eb82888197b84409a8dcd3da8833515fe5f44f4706851a7ef8b1854ad9 WHIRLPOOL f2e65ea8cedb7ca3ad86a8ba6d342e8c702c6d63aa84165496c0fbfa1e546eda2ffbaaa7a26b9afccc02e6f83d796eac7e6ccd48aafd256fac4306214b1baaf5
-EBUILD postgis-1.5.5.ebuild 6913 SHA256 49fa5186e567d8e857ee5088055d2380a3a72b6ae375c40db9bfae53ad78530e SHA512 61baa1c718f490822993d74749da7acdc8fba3e241d976b1526058844e2dd1bb3e2bec2f17e1f7f90047a46b642d3c8ea0fe7e8fd14db6ff5d991634edf46767 WHIRLPOOL 1d85d06d394c0ac5022ba72000fd03412e76aec2cbe4a56a0dddc8440eca49bf4316d29f9b825c8bb0120e125d77d1065f7a7f93bdf3acf901df56eda26ebdb6
 EBUILD postgis-1.5.8.ebuild 6704 SHA256 3faab2cd45dc34a6db623e46c9f62575cc566fe8ebf49ec3d5a634d987e34fb9 SHA512 452941afbd1d2d4789440910aaf02e297f62162c02dad712b8acfca4c4739c760561fe67835abd1dc02c20729e562c001b6fbeabf7df274efbb9266f0f6587eb WHIRLPOOL 89084aced98180bb1f0b60765f0d17b1740ab2f92c53586c780763c295f65e7d7f739e57cf03e35b26930e53af1812bc46dc7359c0fb45e29485335c3132cb35
-EBUILD postgis-2.0.0.ebuild 6901 SHA256 94fddc0709cad9a31370308593318277697d6f88cda576625db57547661c37d9 SHA512 f3985bbd13e2faba0e2c9e8ebcdcbae48b9ffc67c2b5ea965cd66e33f7f9f620217cf029ea487756eb5a45fab5ddd40297b7127c1354c7beb89ae4aa3e1a5708 WHIRLPOOL 6de8c7fbb55e17541d3d86b6bdb475cc28677cf517d286e1f8b392caa2fc0643b695ee4466533ff0f5354e1cce77c2482e7dd16915b45fb37f9134bc0caa78ed
-EBUILD postgis-2.0.1.ebuild 6960 SHA256 c2d3875e8c482790d4e7d603048e600863e2cc00faf94f3db365e73038525ecb SHA512 dc45b7fe13883f4c2706c45c3156d4964f4cb09041e8ace5de89adaea4b37ef2ddaf98fa22155ddb6c07bc9a840f32c9088d650952974a9e7c055d6c0e246947 WHIRLPOOL 5870ca61c8cc9872b6bdc917d943e0738356aa3d7947567b6e50f27dc90dcb390d53546c5b14ccf51e94ef8b852481c38343177ab672ae409f4f36c145f2c3c9
-EBUILD postgis-2.0.2-r2.ebuild 7186 SHA256 906a9854856466c233d1a262fc91517abed639c376a314e74999f2ad4370625e SHA512 abe273a464675efb48444b786d513bfd48d7498011718fa87a6609756016df106d1be4672dceb699f58cc7b8a78ea3e6f67281730c380bdba6e4c6c352827485 WHIRLPOOL e5eb6e92118c30b82c4a1a900e9fc6071b9b010bdbe3deef78324d20041d7c0b4b9395e8cecabeeeda50dc73117db7586fe53af99c8f1b94c165aa0e709b40e8
 EBUILD postgis-2.0.3.ebuild 7173 SHA256 23a8a46795272d037cce3c13d24661437d868bc619728db03c54ce5dcd2da455 SHA512 f86a22ee0dc79d68446733988ca4945bd4c0f6164d13e9719b049b774098709a9c40af71f487c90f4e45af09261920e24aa44c745c463c2bad1c7a43ffff3f1e WHIRLPOOL 8d970567789cf660c7496fa04e8287c28e6ceb4bfea782cb6c7d275307e9a6cdc370874ed4c1e4cbee9ec17ffc8e58443935046bef39e40c13733f0416a1b87e
-MISC ChangeLog 11575 SHA256 46f64b8bf45a6877ab63153df8c3140a5e606c54ca3b552598164f394f8aa5bc SHA512 0c745844ffb08dcc1c1d565501d24b0074daac27d59503d3360360775dab520c4d93f534f30b3bb7b395eb2ebca88c2ffe3b09632b417b62ace1bfa5af95cde0 WHIRLPOOL aba88a44f05efce73f7bd9b59e370bc620752aa2efbe378d5bd1c4518c45885dd148c82feb304bbb0128f8979d86242f01abcea53ea9503b96b689d6f9381f4e
+MISC ChangeLog 11840 SHA256 60f444ff3a75025e94d13de510280e457127065a1ead15fef65de8a5320c0af4 SHA512 9f5efdc97d79cd48e96355ceeb85c753465c5b0d11a983b00da715f4f8d8342ed0e443ac6d338f151e66a7d7812bc7c4d497839b2c2d32c1ef71da936ae7ba44 WHIRLPOOL d9748cbb6c2ecc5205568025ab3c32230bc10782e0b0ba8322551f42f016a4d05ce010d35a2752535f94d9632679d2c18b7c88657e84f7426e5ce350600dd8a1
 MISC metadata.xml 481 SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef SHA512 5299745d72d13ccc71d5f6eee5d343268a59f57ac208621c81643e7f2160b66382c3dd0bf07c97f4cefaebfbbbfc5e11e6b84318f5fc536877f123be2fd7743e WHIRLPOOL 257b7f00ffcd56df202c0e1cd75383bf7ed9b0c854cadb9371a281bbd200b8686c70d3d28cadd06756510f9d6536ee64c636a12f5170ce5c608e82d1148ba9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCgAGBQJRen7JAAoJELp701BxlEWfO34P/A6ejpJ1NWAOSFTV+3hiIhGi
-E4lPt2G7VgfmwrtV11LWpPxNq9wuxLJnbodghmfWB6M/+B40aN+DNV10pCur5CxM
-ZFu2T5eMpgvbCxJPyZgvGrmfxB8w284kG2Xpz1FNrEl5RshfB3CeYnvZTMrFNl7M
-sqKrKm3fwjRp/8HWYiiGi0NpJmcIj6GFkM1Gn7qiFRX/IzonJ88DTkXasHI7GYx8
-PMFg/UK5M81HRuYkITf7En4PZypBXDYAFkIEUfaHwJwfb+IOXDKUdDGbFnHXNjB5
-xuL4I+vX0mVbmh84Gikevh10gWi0sm2xUFpiT80jDGATeTTF1zc975IkbTEnOAA8
-FmwlAicTzzbQMuQ4I7lbrIJri9vCussTlXgnBPB2QXRaxePuIREQ1K4WxCFw5sBs
-cJzciX6Hj28G6yUlr+moQbDjmQs4Es2cUHyHkvyoG6f9ov7e9tiHGUf7zBW66RmM
-ku+DZnBXS7yH16JPTWxRGW1RkBpPNmmXk8siDmru3+EAB6R1A+hOZzx8jd4L1v9w
-hVCzErq4De29qltRfqoNHjPAFmlw64hvOk+gZP/435glYAeG9f67cTDzHKFuOIed
-/fCJW5SZGtY/lbwhu64c+tCAdmoYLkokxQ8LzUsbDhuc5j+yvRfV+UrQd2BXCUx4
-t87a3PPUrRdnD61mvnkl
-=Dzb4
+iF4EAREIAAYFAlF9H4YACgkQVxOqA9G7/aCVZQEAm4cbGyNsd5+DhSb2VOT477lw
+b5DR2sVPJri3iiDky/gA/22Fta6L3InmxTes8oA7JEaIzcX3ULUjpaaiDZVrYCR5
+=qhVe
 -----END PGP SIGNATURE-----
--- a/dev-db/postgis/postgis-1.3.6-r1.ebuild
+++ b/dev-db/postgis/postgis-1.3.6-r1.ebuild
@ -1,192 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.3.6-r1.ebuild,v 1.3 2012/06/04 06:47:41 zmedico Exp $
-
-EAPI="1"
-
-inherit eutils multilib versionator
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.refractions.net"
-SRC_URI="http://postgis.refractions.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="geos proj doc"
-
-RDEPEND=">=dev-db/postgresql-server-8.0
-	geos? ( sci-libs/geos )
-	proj? ( sci-libs/proj )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets )"
-
-RESTRICT="test"
-
-pkg_setup(){
-	if [ ! -z "${PGUSER}" ]; then
-		eval unset PGUSER
-	fi
-	if [ ! -z "${PGDATABASE}" ]; then
-		eval unset PGDATABASE
-	fi
-	local tmp
-	tmp="$(portageq match / ${CATEGORY}/${PN} | cut -d'.' -f2)"
-	if [ "${tmp}" != "$(get_version_component_range 2)" ]; then
-		elog "You must soft upgrade your existing postgis enabled databases"
-		elog "by adding their names in the ${ROOT}conf.d/postgis_dbs file"
-		elog "then using 'emerge --config postgis'."
-		require_soft_upgrade="1"
-		ebeep 2
-	fi
-}
-
-src_compile(){
-	local myconf
-	if use geos; then
-		myconf="--with-geos"
-	fi
-
-	if use doc; then
-		myconf="${myconf} --with-xsl=$(ls "${ROOT}"usr/share/sgml/docbook/* | \
-			grep xsl\- | cut -d':' -f1)"
-	fi
-
-	econf --enable-autoconf \
-		--datadir=/usr/share/postgresql/contrib/ \
-		--libdir=/usr/$(get_libdir)/postgresql/ \
-		--with-docdir=/usr/share/doc/${PF}/html/ \
-		${myconf} \
-		$(use_with proj) ||\
-			die "Error: econf failed"
-
-	emake || die "Error: emake failed"
-
-	cd topology/
-	emake || die "Unable to build topology sql file"
-
-	if use doc ; then
-		cd "${S}"
-		emake docs || die "Unable to build documentation"
-	fi
-}
-
-src_install(){
-	dodir /usr/$(get_libdir)/postgresql /usr/share/postgresql/contrib/
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}/topology/"
-	emake DESTDIR="${D}" install || die "emake install topology failed"
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	cd "${S}"
-	if use doc; then
-		emake DESTDIR="${D}" docs-install || die "emake install docs failed"
-	fi
-
-	echo "template_gis" > postgis_dbs
-	doconfd postgis_dbs
-
-	if [ ! -z "${require_soft_upgrade}" ]; then
-		grep "'C'" -B 4 "${D}"usr/share/postgresql/contrib/lwpostgis.sql | \
-			grep -v "'sql'" > \
-				"${D}"usr/share/postgresql/contrib/load_before_upgrade.sql
-	fi
-}
-
-pkg_postinst() {
-	elog "To create new (upgrade) spatial databases add their names in the"
-	elog "${ROOT}conf.d/postgis_dbs file, then use 'emerge --config postgis'."
-}
-
-pkg_config(){
-	einfo "Create or upgrade a spatial templates and databases."
-	einfo "Please add your databases names into ${ROOT}conf.d/postgis_dbs"
-	einfo "(templates name have to be prefixed with 'template')."
-	for i in $(cat "${ROOT}etc/conf.d/postgis_dbs"); do
-		source "${ROOT}"etc/conf.d/postgresql
-		PGDATABASE=${i}
-		eval set PGDATABASE=${i}
-		myuser="${PGUSER:-postgres}"
-		mydb="${PGDATABASE:-template_gis}"
-		eval set PGUSER=${myuser}
-
-		is_template=false
-		if [ "${mydb:0:8}" == "template" ];then
-			is_template=true
-			mytype="template database"
-		else
-			mytype="database"
-		fi
-
-		einfo
-		einfo "Using the user ${myuser} and the ${mydb} ${mytype}."
-
-		logfile=$(mktemp "${ROOT}tmp/error.log.XXXXXX")
-		safe_exit(){
-			eerror "Removing created ${mydb} ${mytype}"
-			dropdb -q -U "${myuser}" "${mydb}" ||\
-				(eerror "${1}"
-				die "Removing old db failed, you must do it manually")
-			eerror "Please read ${logfile} for more information."
-			die "${1}"
-		}
-
-	# if there is not a table or a template existing with the same name, create.
-		if [ -z "$(psql -U ${myuser} -l | grep "${mydb}")" ]; then
-			createdb -q -O ${myuser} -U ${myuser} ${mydb} ||\
-				die "Unable to create the ${mydb} ${mytype} as ${myuser}"
-			createlang -U ${myuser} plpgsql ${mydb}
-			if [ "$?" == 2 ]; then
-				safe_exit "Unable to createlang plpgsql ${mydb}."
-			fi
-			(psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/lwpostgis.sql &&
-			psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/spatial_ref_sys.sql) 2>\
-					"${logfile}"
-			if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-				safe_exit "Unable to load sql files."
-			fi
-			if ${is_template}; then
-				psql -q -U ${myuser} ${mydb} -c \
-					"UPDATE pg_database SET datistemplate = TRUE
-					WHERE datname = '${mydb}';
-			GRANT ALL ON table spatial_ref_sys, geometry_columns TO PUBLIC;" \
-				|| die "Unable to create ${mydb}"
-			psql -q -U ${myuser} ${mydb} -c \
-				"VACUUM FREEZE;" || die "Unable to set VACUUM FREEZE option"
-			fi
-		else
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql ];
-			then
-				einfo "Updating the dynamic library references"
-				psql -q -f \
-					"${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql\
-						2> "${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to update references."
-				fi
-			fi
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql ];
-			then
-				einfo "Running soft upgrade"
-				psql -q -U ${myuser} ${mydb} -f \
-					"${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql 2>\
-						"${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to run soft upgrade."
-				fi
-			fi
-		fi
-		if ${is_template}; then
-			einfo "You can now create a spatial database using :"
-			einfo "'createdb -T ${mydb} test'"
-		fi
-	done
-}
--- a/dev-db/postgis/postgis-1.4.2-r1.ebuild
+++ b/dev-db/postgis/postgis-1.4.2-r1.ebuild
@ -1,254 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.4.2-r1.ebuild,v 1.1 2011/08/23 22:56:13 titanofold Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.refractions.net"
-SRC_URI="http://postgis.refractions.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gtk"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql-server:8.4
-			dev-db/postgresql-server:8.3
-			dev-db/postgresql-server:8.2
-		)
-		>=sci-libs/geos-3.1
-		>=sci-libs/proj-4.5.0
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.3
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick
-					media-gfx/graphicsmagick[imagemagick]
-				)
-		)
-"
-
-RESTRICT="test"
-
-PGIS="$(get_version_component_range 1-2)"
-
-# not parallel safe
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	export PGSLOT="$(postgresql-config show)"
-	if [[ ${PGSLOT//.} < 82 || ${PGSLOT//.} > 84 ]] ; then
-		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL between 8.2 and 8.4."
-		eerror "Set an appropriate slot with postgresql-config."
-		die "postgresql-config not set to 8.2, 8.3 or 8.4."
-	fi
-}
-
-src_configure() {
-	# Configure interprets --without-gui as being the same as --with-gui
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	cd topology/
-	emake
-
-	if use doc ; then
-		cd "${S}/doc/"
-		emake
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	cd topology/
-	emake DESTDIR="${D}" install
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	if use doc; then
-		cd doc/html
-		dohtml -r *
-	fi
-
-	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
-	doins postgis_comments.sql
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs-${PGIS}"
-
-	cd "${S}/doc"
-	doman man/*
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs-${PGIS}"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
-	if [[ $? = 0 ]] ; then
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_comments.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_2[@]} ; do
-		ebegin "Upgrading from PostGIS 1.2 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_12_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
-}
--- a/dev-db/postgis/postgis-1.5.3-r1.ebuild
+++ b/dev-db/postgis/postgis-1.5.3-r1.ebuild
@ -1,255 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.5.3-r1.ebuild,v 1.4 2012/03/06 21:24:46 ranger Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.refractions.net"
-SRC_URI="http://postgis.refractions.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc gtk"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql-server:9.0
-			dev-db/postgresql-server:8.4
-			dev-db/postgresql-server:8.3
-			dev-db/postgresql-server:9.1
-		)
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.2
-		>=sci-libs/proj-4.6.0
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.3
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick
-					media-gfx/graphicsmagick[imagemagick]
-				)
-		)
-"
-
-RESTRICT="test"
-
-PGIS="$(get_version_component_range 1-2)"
-
-# not parallel safe
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	export PGSLOT="$(postgresql-config show)"
-	if [[ ${PGSLOT//.} < 83 ]] ; then
-		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.3 or higher."
-		eerror "Set an appropriate slot with postgresql-config."
-		die "postgresql-config not set to 8.3 or higher."
-	fi
-
-	if [[ ${PGSLOT//.} > 90 ]] ; then
-		ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
-		ewarn "This is neither supported here nor upstream."
-		ewarn "However, all indicators show that this should work."
-		ewarn "Any bugs you encounter should be reported upstream."
-	fi
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-	use doc && emake -C doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake -C topology DESTDIR="${D}" install
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	if use doc; then
-		cd doc/html
-		dohtml -r *
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	cd "${S}/doc"
-	doman man/*
-	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
-	doins postgis_comments.sql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
-	if [[ $? = 0 ]] ; then
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_comments.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
-}
--- a/dev-db/postgis/postgis-1.5.5.ebuild
+++ b/dev-db/postgis/postgis-1.5.5.ebuild
@ -1,255 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.5.5.ebuild,v 1.1 2012/11/01 06:39:12 patrick Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.refractions.net"
-SRC_URI="http://postgis.refractions.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gtk"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql-server:9.1
-			dev-db/postgresql-server:9.0
-			dev-db/postgresql-server:8.4
-			dev-db/postgresql-server:8.3
-		)
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.2
-		>=sci-libs/proj-4.6.0
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.3
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick
-					media-gfx/graphicsmagick[imagemagick]
-				)
-		)
-"
-
-RESTRICT="test"
-
-PGIS="$(get_version_component_range 1-2)"
-
-# not parallel safe
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	export PGSLOT="$(postgresql-config show)"
-	if [[ ${PGSLOT//.} < 83 ]] ; then
-		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.3 or higher."
-		eerror "Set an appropriate slot with postgresql-config."
-		die "postgresql-config not set to 8.3 or higher."
-	fi
-
-	if [[ ${PGSLOT//.} > 90 ]] ; then
-		ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
-		ewarn "This is neither supported here nor upstream."
-		ewarn "However, all indicators show that this should work."
-		ewarn "Any bugs you encounter should be reported upstream."
-	fi
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-	use doc && emake -C doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake -C topology DESTDIR="${D}" install
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	if use doc; then
-		cd doc/html
-		dohtml -r *
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	cd "${S}/doc"
-	doman man/*
-	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
-	doins postgis_comments.sql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
-	if [[ $? = 0 ]] ; then
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_comments.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
-}
--- a/dev-db/postgis/postgis-2.0.0.ebuild
+++ b/dev-db/postgis/postgis-2.0.0.ebuild
@ -1,255 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.0.ebuild,v 1.5 2012/08/11 15:26:08 maekke Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.refractions.net"
-SRC_URI="http://postgis.refractions.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc gtk"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql-server:9.1
-			dev-db/postgresql-server:9.0
-			dev-db/postgresql-server:8.4
-		)
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.3.2
-		>=sci-libs/proj-4.6.0
-		sci-libs/gdal
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.3
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick
-					media-gfx/graphicsmagick[imagemagick]
-				)
-		)
-"
-
-RESTRICT="test"
-
-PGIS="$(get_version_component_range 1-2)"
-
-# not parallel safe
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	export PGSLOT="$(postgresql-config show)"
-	if [[ ${PGSLOT//.} < 84 ]] ; then
-		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.4 or higher."
-		eerror "Set an appropriate slot with postgresql-config."
-		die "postgresql-config not set to 8.4 or higher."
-	fi
-
-#	if [[ ${PGSLOT//.} > 90 ]] ; then
-#		ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
-#		ewarn "This is neither supported here nor upstream."
-#		ewarn "However, all indicators show that this should work."
-#		ewarn "Any bugs you encounter should be reported upstream."
-#	fi
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-	use doc && emake -C doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake -C topology DESTDIR="${D}" install
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	if use doc; then
-		cd doc/html
-		dohtml -r *
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	cd "${S}/doc"
-	doman man/*
-	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
-	doins postgis_comments.sql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
-	if [[ $? = 0 ]] ; then
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_comments.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
-}
--- a/dev-db/postgis/postgis-2.0.1.ebuild
+++ b/dev-db/postgis/postgis-2.0.1.ebuild
@ -1,256 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.1.ebuild,v 1.2 2012/08/20 01:46:29 ottxor Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.refractions.net"
-SRC_URI="http://postgis.refractions.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql-server:9.1
-			dev-db/postgresql-server:9.0
-			dev-db/postgresql-server:8.4
-			dev-db/postgresql-server:9.2
-		)
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.3.2
-		>=sci-libs/proj-4.6.0
-		sci-libs/gdal
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.3
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick
-					media-gfx/graphicsmagick[imagemagick]
-				)
-		)
-"
-
-RESTRICT="test"
-
-PGIS="$(get_version_component_range 1-2)"
-
-# not parallel safe
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	export PGSLOT="$(postgresql-config show)"
-	if [[ ${PGSLOT//.} < 84 ]] ; then
-		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.4 or higher."
-		eerror "Set an appropriate slot with postgresql-config."
-		die "postgresql-config not set to 8.4 or higher."
-	fi
-
-#	if [[ ${PGSLOT//.} > 90 ]] ; then
-#		ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
-#		ewarn "This is neither supported here nor upstream."
-#		ewarn "However, all indicators show that this should work."
-#		ewarn "Any bugs you encounter should be reported upstream."
-#	fi
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-	use doc && emake -C doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake -C topology DESTDIR="${D}" install
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	if use doc; then
-		cd doc/html
-		dohtml -r *
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	cd "${S}/doc"
-	doman man/*
-	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
-	doins postgis_comments.sql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
-	if [[ $? = 0 ]] ; then
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_comments.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
-}
--- a/dev-db/postgis/postgis-2.0.2-r2.ebuild
+++ b/dev-db/postgis/postgis-2.0.2-r2.ebuild
@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.2-r2.ebuild,v 1.1 2013/02/11 14:11:31 titanofold Exp $
-
-EAPI="4"
-
-inherit autotools eutils versionator
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql-server:9.2
-			dev-db/postgresql-server:9.1
-			dev-db/postgresql-server:9.0
-			dev-db/postgresql-server:8.4
-		)
-		dev-libs/json-c
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.3.3
-		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.9
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.3
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-RESTRICT="test"
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-# Because developers have been fooled into thinking recursive make is a
-# good thing.
-MAKEOPTS="-j1"
-
-pkg_setup() {
-	export PGSLOT="$(postgresql-config show)"
-
-	if [[ ${PGSLOT//.} < 84 || ${PGSLOT//.} > 92 ]] ; then
-		eerror "You must build ${CATEGORY}/${P} against PostgreSQL 8.4 - 9.2."
-		eerror "Set an appropriate slot with postgresql-config."
-		die 'Select a PostgreSQL slot between 8.4 and 9.2'
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-${PGIS}-ldflags.patch" \
-		"${FILESDIR}/${PN}-${PGIS}-pkgconfig-json.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf ${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-
-	if use doc ; then
-		emake comments
-		emake cheatsheets
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" comments-install
-	emake -C topology DESTDIR="${D}" install
-	dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	use doc && dohtml -r doc/html/*
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
-	if [[ $? = 0 ]] ; then
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		local comment_file
-		for comment_file in "${postgis_path}"/*_comments.sql ; do
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-			retval=$?
-			[[ $retval == 0 ]] && continue || safe_exit
-		done
-		eend 0
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
-}
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.708 2013/04/25 16:41:21 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.709 2013/04/28 16:24:59 zmedico Exp $
+
+  28 Apr 2013; Zac Medico <zmedico@gentoo.org> php-5.3.23.ebuild,
+  php-5.3.24.ebuild, php-5.4.13.ebuild, php-5.4.14.ebuild,
+  php-5.5.0_beta4.ebuild:
+  Bug #467648 - Refer to /etc/portage/make.conf, not /etc/make.conf.

  25 Apr 2013; Ian Stakenvicius <axs@gentoo.org> ChangeLog:
  updated manifest for php-5.5.0_beta4 , per bug #467232
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -34,24 +34,18 @@ DIST php-5.4.14.tar.bz2 11961015 SHA256 5450f3843bc651eb3fb00601f0cce1930aaaf65c
 DIST php-5.5.0beta4.tar.bz2 12247231 SHA256 6599d34cf68079c2cdb5744ae40395fadde82357f0bf160dc88afde8633ed7c0 SHA512 f1decca6093f7afabb727f3ba5b6759ddbde1ee56314da9fe6351d4ddc19bd13941496daf0469509abe750759e4f9c7b6c558fdd0cb5ee28a6525eabd9feed1a WHIRLPOOL 215b295903d0f42be2be994575df4069ab2c7ee2b67ecb27f7b22717769180f7d3705aa3675da5c1b4e82da5a38122fd3eed25dca36d71f8aacb47d31ea2f4dc
 DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
-EBUILD php-5.3.23.ebuild 24610 SHA256 35436a0deaa000f4a7160d1a64237c763ae9d6ae0ae4ee450145f552428002ec SHA512 d3a3230489ad62b7b5efd1bc98356449a617aaf7c265d758f4dc4bda3c7dee9327c34a9867206c60c5657b63c0445ccb4c2109297405cae5e5d066c913e4387d WHIRLPOOL dcac9adafbe9c5ddb7ba8ce8c2dfbd0c17ff521a8147da29856c7fa5c656621cbbc35a80d390e6043f92759c2e681d8073f7df96e7fce7e7cf814cb982aec9cb
-EBUILD php-5.3.24.ebuild 21819 SHA256 fb770b61cadfe419942c33e5e4ff4a052e1382aee31dd22eff8b6f4a6253861a SHA512 945ecebb5d40dff63cbff33c654a160150706f8e63bb820f87f881eb21240f73243c7f9d5e00da238a38a94289e889cec67707d770580710212f3aaadb39f287 WHIRLPOOL 4b782ad0b30633e5f90af2a7428cab0a067f5d55c719a7919b0eb45eb46a43021badec02d1a84100f732abb810d3c92257917efbae43afdb8255f8710cd8b6bb
-EBUILD php-5.4.13.ebuild 24050 SHA256 c4eb0a963547743d628ccb906a2e947604581aca3f2a5366a662da31f2645f57 SHA512 3d45ba51e1627ea176b1bafbd1b6252c653e2496724806c1d761705397465e09b2d4686a5c589e05a5f78f1f66ce4ba15b187468e643207eeda5b0f6d958db82 WHIRLPOOL 9b7d817d7ad4f4df6ce7f2d7f0947d11ca2de9d649fc16b45b2af2328c03079e171d4b5252678cc6c2af42d33db55ce41874df10d737707f8769f3998d91414e
-EBUILD php-5.4.14.ebuild 22098 SHA256 7e18b169780b41bf512fd9f72c972430436ec6bf86d0f1641d77597939a8a165 SHA512 08d08b5887df700d956eff8464126923fda7a76d0bf2fabd41d23a2c2afc9fb6f0e4bb40a4b5012db7613247c5920f63b4f5adc3bdfd398f5c7a7e0edb068c6f WHIRLPOOL 8788b867020a8ddcb16c833ab0eda69f80e1c4fcd8cf3e69e0e1afa038255b98dfee0c163d6a614b2749e3f15ca17be04e85091378177242b32c82c9dfdc19b9
-EBUILD php-5.5.0_beta4.ebuild 21891 SHA256 b3ccbfe036c06a81fa6e7d350f192007a7d77c2e9947cc41d64a346642124f1a SHA512 b474d02ad53d8ab12e6cf4483a7e3b8c089381092f838d4799ece440adf2e662af94ee3f34d5e61b095aec4284be5490506eb26f83e29f81501296a96bd007eb WHIRLPOOL 6e334d7220471ab6ffdc33794c7bb15d0f93b8891b31adfce97c01534b35411e59357d982c2dbdcb101c02988cd6893aadc85c008d0a3b4697fc7bd91ffe389f
-MISC ChangeLog 7825 SHA256 94269eba4d23c0d972fc98b088033c29c5bdf025bac6366a4fabe924c9da6a2c SHA512 5a0bcfaa0f19839d42514570b550df98b22f93e4b3d72441a5b2f2b12c92cdf448564de2a3d7ec1956ef8154c798157845250e235670619a14d0f369cc8b9198 WHIRLPOOL 7d41c1491d9b7dcf50f7e32e33c627315206545f7fc4d90d46981c44ddb604d536944745c3d0d78627993348c7ca209bd403720bf8323076523989daf993cd03
+EBUILD php-5.3.23.ebuild 24630 SHA256 b69eaa182ae8735d2e564f02760d1dc4a337bce81df994cc86d9ee0bdf5492b6 SHA512 e9ffc5860bb7fb5834c8cea1344e10e548f2971175e97d7b42d480945c695d7cddb35a7567d6e3c13c7a1897d045d54ef23d1e9121ff9c84f3a2833465068bed WHIRLPOOL 435978fc7e83db2a16bd0c70f39591ab843c5c98aad9799c4a30cf1bf6b82b1130e2a223875fef7c60c478e76f23de1d3bacb40ff9466191ad657c449312e6ff
+EBUILD php-5.3.24.ebuild 21833 SHA256 8e74baab956e804d2183fbd5de59717d05a24785d1f30b25b2f6e16ee651dee8 SHA512 90b13d794f7e8d232652c09055872453fff1801f0896526f6ffb9415c467ff918b8d98185a429dad1e6eb1f6c37bf6cb26d19f3e715098feb9ec83671839c92e WHIRLPOOL a1aa4c56122f51fda773fbae47b37086edafcbf058d413fb7e75a9f8a6433d48a52caa0982203a0158b5f41287de1eb6ad0bae3c4c0c584eacb81185839eced4
+EBUILD php-5.4.13.ebuild 24070 SHA256 c1ead57abfb3be4a2b08b1bcde8423d187ed8298b9553787c02ab79716d237ea SHA512 678256e380a153be0e8d5700f446888181711db85e566f6b05fd1b8309bb6a859b7fef6d502031f4450e53c6e4e7972e3ec347e6b65b5bf90cd264ed4415c6bc WHIRLPOOL 2cc907010f17f045f22aba239fba34b21bbdf89d43e56b553be87cc520488dc4556b9aa4e27a99c018061592beb1d5881c90790b71aee66aa3b81d25bd444181
+EBUILD php-5.4.14.ebuild 22112 SHA256 001ce96d13dc35b738c3f75f564e8f9c630eb5b41b06b9a17c724bc7efb6af9b SHA512 181c2a7088c7c1e46feaf4d12710538aec8799a85a9bcc14fb9993abd96c058178516a8a65cc353e49c8ee7a957686d612688b545f794c7c14b10f072819070a WHIRLPOOL 0438b440e4fa669d93c7ff871ed22b1c5634b63a034d16e7695e6d7c8455530e46b3e8d037b2f7574e08457a5f8270cb0d88e86b8fcf70bf053ed3ffbb077de2
+EBUILD php-5.5.0_beta4.ebuild 21905 SHA256 b4d3376ff8e0d2a650101a427a16ee16e9f4c5f9ba9f787070fd21f81d017dd7 SHA512 fd864d6a2a02b028111eabdc6efbbf76a9e57f6ee80dee28d06344d0495c260e1d32209d34f1a82b382686480ccc771e5e050ce9a2bafed22df97bcbbbe58693 WHIRLPOOL 6ec75d6d16d64778d00a9cad3347e7c1101289824ff98113cad780f7824b91860bee356c8a9143cd0a511281b7c93e024af2db081000df3b51c6e2748b6a1a82
+MISC ChangeLog 8050 SHA256 0e187c2f223e6e5ae4d4c037227fce07eb0a62f70c8b951ddc0c78ee39e6a8f4 SHA512 57817b554650718b4a89b41281717214a488cc1d52f021d2cb0cec47ee1124caa3abed805ab5bd34784c20e98d22a54a8174de2850abea358d976535d621856e WHIRLPOOL 9a215ce8b2a5edca36079b01e081f9e85f312ff0ede63a65190d9e7cabfa38a0ab99a03000a1f9755bb51f3c36f7845b6fda57c8d0e3600a160a06ce6cafbf70
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
 MISC metadata.xml 1600 SHA256 f69cee357d251547d4e97cbb562ad6ab6b78383b4bcd8e183523b29a63c2f214 SHA512 2c7f74d61e6b9e86f9ece5981a26868316c4dc0ad759cc4eeacece9e33854d33d6265b4ee2d00e2e36baad6ec09ee916114f3dde6ded9cc9e45bef0c560e335b WHIRLPOOL dc007ba84a95d047f01d789302246033363bc412ebbdb75fe50e67088e91356c0c8cee76f2da59f771bbf99ad3f0113860852c82ac0ae5ad1c2a21a380e3ae0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQF8BAEBCABmBQJRejDQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv16sEIAJI+ByUDtlsLiE0E3xv5l/ZI
-ZAreZlngjQxTFeHTp8PiCDrz8iw3Epz4Z5/NerknLW3MbL4GbXA+MCTfzhmfd9Tv
-0CiI9geN9rjzm5S20Vu7+S5JsyXp7snl/RqnCpNsMv9irm4mzVQvN5zklPmasZ6g
-UVmk5WcauOBr7ai39fFkohHaIP40lImacHF9xNHPeKlHX4Y03B9ICKJq5Cl5aIof
-t55yzMIiezfwvmMDpJEJuBSr9zG74Y+bI96Uvrtp39fIX04VPx/PUrJsZpr7aZSG
-KDA3ChrD5xeG6oyAj6dFZAjWr/NyYCp+s4PNNp4gSZ8+q7f9p7+oe1eCLdZiPPY=
-=g+uY
+iEYEAREIAAYFAlF9TV4ACgkQ/ejvha5XGaNInQCg77ZLZF3pPU3ipWLJ47ynzCNt
+9n0AoOq8LhxtFtfmM/QqQHZAoPp3CIHV
+=jslT
 -----END PGP SIGNATURE-----
--- a/dev-lang/php/php-5.3.23.ebuild
+++ b/dev-lang/php/php-5.3.23.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.23.ebuild,v 1.13 2013/04/13 20:46:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.23.ebuild,v 1.14 2013/04/28 16:24:59 zmedico Exp $

 EAPI=5

@ -875,8 +875,8 @@ pkg_postinst() {
 		fi
 	done

-	elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
+	elog "Make sure that PHP_TARGETS in /etc/portage/make.conf includes php${SLOT/./-}"
+	elog "in order to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
 		ewarn "Note that in order to use php interactivly, you need to enable"
@ -885,7 +885,7 @@ pkg_postinst() {
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in /etc/make.conf"
+	elog "'production' or 'development' in /etc/portage/make.conf"
 	ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"

 	# check for not yet migrated old style config dirs
--- a/dev-lang/php/php-5.3.24.ebuild
+++ b/dev-lang/php/php-5.3.24.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.24.ebuild,v 1.1 2013/04/11 10:28:46 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.24.ebuild,v 1.2 2013/04/28 16:24:59 zmedico Exp $

 EAPI=5

@ -781,8 +781,8 @@ pkg_postinst() {
 		fi
 	done

-	elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
+	elog "Make sure that PHP_TARGETS in /etc/portage/make.conf includes php${SLOT/./-}"
+	elog "in order to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
 		ewarn "Note that in order to use php interactivly, you need to enable"
@ -791,7 +791,7 @@ pkg_postinst() {
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in /etc/make.conf"
+	elog "'production' or 'development' in /etc/portage/make.conf"
 	ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"

 	elog
--- a/dev-lang/php/php-5.4.13.ebuild
+++ b/dev-lang/php/php-5.4.13.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.13.ebuild,v 1.13 2013/04/13 20:46:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.13.ebuild,v 1.14 2013/04/28 16:24:59 zmedico Exp $

 EAPI=5

@ -816,8 +816,8 @@ pkg_postinst() {
 		fi
 	done

-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/portage/make.conf includes php${SLOT/./-}"
+	elog "in order to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
 		ewarn "Note that in order to use php interactivly, you need to enable"
@ -826,7 +826,7 @@ pkg_postinst() {
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "'production' or 'development' in ${EPREFIX}/etc/portage/make.conf"
 	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"

 	elog
--- a/dev-lang/php/php-5.4.14.ebuild
+++ b/dev-lang/php/php-5.4.14.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.14.ebuild,v 1.1 2013/04/11 10:28:46 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.14.ebuild,v 1.2 2013/04/28 16:24:59 zmedico Exp $

 EAPI=5

@ -767,8 +767,8 @@ pkg_postinst() {
 		fi
 	done

-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/portage/make.conf includes php${SLOT/./-}"
+	elog "in order to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
 		ewarn "Note that in order to use php interactivly, you need to enable"
@ -777,7 +777,7 @@ pkg_postinst() {
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "'production' or 'development' in ${EPREFIX}/etc/portage/make.conf"
 	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"

 	elog
--- a/dev-lang/php/php-5.5.0_beta4.ebuild
+++ b/dev-lang/php/php-5.5.0_beta4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_beta4.ebuild,v 1.1 2013/04/25 11:00:17 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_beta4.ebuild,v 1.2 2013/04/28 16:24:59 zmedico Exp $

 EAPI=5

@ -747,8 +747,8 @@ pkg_postinst() {
 		fi
 	done

-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/portage/make.conf includes php${SLOT/./-}"
+	elog "in order to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
 		ewarn "Note that in order to use php interactivly, you need to enable"
@ -757,7 +757,7 @@ pkg_postinst() {
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "'production' or 'development' in ${EPREFIX}/etc/portage/make.conf"
 	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"

 	elog
--- a/dev-libs/libgamin/ChangeLog
+++ b/dev-libs/libgamin/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libgamin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.38 2012/09/30 16:18:22 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.39 2013/04/28 13:01:20 ssuominen Exp $
+
+  28 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  libgamin-0.1.10-r3.ebuild:
+  Fix automake-1.13 compability wrt #466962 by Alphat-PC

  30 Sep 2012; Raúl Porcel <armin76@gentoo.org> libgamin-0.1.10-r3.ebuild:
  alpha/ia64/m68k/s390/sh/sparc stable wrt #433227
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@ -13,13 +13,17 @@ DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c2
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 SHA256 9cb1bde5a34888ce4de4c4894c7d31dbfdbfb3279007b9eddf2da35510f6a9b5 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004 WHIRLPOOL 3efbf3781a55f44f383e573db4a3b3df731e9f77608d73db4ff3027eae0bda6abb6eae022c094735c0d8d2a85e224a980436d8557f9350bb1558b40d99280701
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
 EBUILD libgamin-0.1.10-r2.ebuild 3950 SHA256 e526bd55dffec64977d9bb28edf710b25a7d563553919fd42317fb21ae90666a SHA512 c89f02ec77d51e2ec4ebe6a7ec6c0751e34a97136a93afa23891e0a6021dc833296eb61a8e4ad81c00807f390405de6115c2e86c1f7909bf496cdc383b72ccc7 WHIRLPOOL d6f518a27eb43e851ec2179bd2887aae3da81c958e4d6435603b6aaea87855c64545e18ef67f17be80014f4be74f19f382366807f38d9e94b02a9aa126965a1d
-EBUILD libgamin-0.1.10-r3.ebuild 4082 SHA256 9a55be7069e62e6d0a0f0a8519372b8eb8061d6f3e83c3436b7bc4a458560328 SHA512 8074c6839ecccdc6a6030f64ae0657e81fcb7bb3b64e03e3a30308ac97f3a2e77a88053ceaf95504fe163a7a4303245d52b78d87ee584b97ada9a4fe16c91f0e WHIRLPOOL 12389a9551ad0b52787134618e0647103ada8851ca9513dadcf7481c5753fce5ad5b02f354104db9d617a7aecfe6321ec4699b6dde48c95c99481dee0cf8942e
-MISC ChangeLog 5807 SHA256 bfbe0e7cd4e8f54e4d15f7ef9a6ff5f2b2735ef9766d76ba078db0e6b4f25483 SHA512 c94a9baf3ad757286f2d7d0b7d6a48e83331ec3684e907ddb02a9b0cb7774df1aab97d4a8b524842a45202a26dcd36a17fcd84286892bd6d4a15a287874b0455 WHIRLPOOL 4d13cbbebf71ef0cec7cd1292015a19ecae1134a4b6703fe1284a362a21e8161c6d9b407d95e9119c7a3ccd4a0f1f25071af456b093f2beda40c22c9834f2d6f
+EBUILD libgamin-0.1.10-r3.ebuild 4211 SHA256 b4b586ddcbbe2c14d9e2fa2eb3b426f8c0007e683b7e45b2aaf065dd4fe8391e SHA512 eabef41c492b49fd57994ec8a9d8d77bca33fa3076efc843bfa54de6c3784e8623a05673b8542d52c755acd1220a2a790959031844ebc00a2379c647466607cd WHIRLPOOL b70749a95534a2759be29d035f275b67936af3ad3bcd315a59a85c4845146b8809cd70389b31a55bb67545c0af7eacef4da469489a72bd5d475d8edb0a5adbef
+MISC ChangeLog 5950 SHA256 ea0f4ffaf04d72bc037b9bae2bb69c72700d300e69733f0df30a057b05e31db2 SHA512 bfbb0b91c7a9b67e3af1c30f7b1c4689d6f57ae7eac8345cacca952ef7148031812fa8c519a0ffb98f4e4c7bbf21031cc5d06b45195190bdb60cee1b9cb40d63 WHIRLPOOL b14d543c3bd7cb407e379f4d2a461e0aba02bee1b66b7bd460376c3e2b287c9ac354cdecab1289ef51c1585ca24faa3450c7a36fac16ec2e5856c65a9a7c040e
 MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlBocNQACgkQuQc30/atMkDBtQCdE0sBFJnvleb7nOjOQcrUVbT+
-h28An33WaVZmnkvXZYByTSjkXCbGAe3T
-=D1/L
+iQEcBAEBCAAGBQJRfR1BAAoJEEdUh39IaPFN/aAIAJBm2gzcbeABFw9FYJ04cSjy
+Cl+5hiTkl//cYWWcniruqhZlLOze0YocY+BK71a3eiqBZnOoGPe7VyHQn5PnX61C
+sY/aPVTGZEZCa6f1Ef8Ya71dTT5OVb0orNJstq0iEtOWKGpdlbgGOZH764PDB8Go
+RUfqY6RNzesxFeLWkoXSRCHtUvXZFn7F0SkksHCCxruAguIBTQEGR5lew3Cinlvu
+KpzSxUEwvhS+IAZRW1P5kWJkT6tH4C+l7DOB8fSzn3Kk+ayKg67kF8I7EsQLwpts
+4GYE8yh+Jpk7RpWxpdBZsqruXQDXwzDgBRPwpKwLx08JdTZQtdqcWgxOW0BHHno=
+=JsTt
 -----END PGP SIGNATURE-----
--- a/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild,v 1.7 2012/09/30 16:18:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild,v 1.8 2013/04/28 13:01:20 ssuominen Exp $

 EAPI="4"
 PYTHON_DEPEND="python? 2"
@ -75,6 +75,11 @@ src_prepare() {
 	# Python bindings are built/installed manually.
 	sed -e "/SUBDIRS += python/d" -i Makefile.am

+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.in || die #466962
+
 	# autoconf is required as the user-cflags patch modifies configure.in
 	# however, elibtoolize is also required, so when the above patch is
 	# removed, replace the following call with a call to elibtoolize
--- a/dev-libs/libnl/ChangeLog
+++ b/dev-libs/libnl/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libnl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.139 2013/03/20 01:26:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.140 2013/04/28 14:01:29 jer Exp $
+
+*libnl-3.2.22_rc1 (28 Apr 2013)
+
+  28 Apr 2013; Jeroen Roovers <jer@gentoo.org> +libnl-3.2.22_rc1.ebuild:
+  Version bump.

 *libnl-1.1.3 (20 Mar 2013)

--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@ -17,6 +17,7 @@ DIST libnl-3.2.18.tar.gz 739175 SHA256 6563e4e72a35f9f96380086f6bd17307552977af9
 DIST libnl-3.2.19.tar.gz 740008 SHA256 37a611ad84e84a15daf2736cdd2c5191f3af4e1b12354f7d260f0264383b098b SHA512 1a4c0f9cc0a274749f442d0c4a386c5d65b904384bef1e866c768422d0f542607dc8f65604f44241347ee31c1dc0c8ee63f216fabd81219d6d93a19d076ab54d WHIRLPOOL 2c44cec21eb3ed2c2ecbe894dbae178b2c0297d2bfdbf9f110b1c899436bbec8b942f6c06770674404570288e27af29f9c80bc50640813c0560f6fa5859d6643
 DIST libnl-3.2.20.tar.gz 716354 SHA256 9fce0b8f946312b3b47ef469ba372dc370821aee9d8795bdc42f5121bee2d237 SHA512 23a427254346d6725bb2be5768cdc887bf56a865f13088eac565abc9ccb7a57b4b956b90aa63fbf7dce4b8135db07cafd4d44aa8783a802156e1e934df49c9f8 WHIRLPOOL e5400e95a874273443096ec5cc6346431b31d5edbd8edf07955251228250852421662f94e5a7a001e2efbbb70b8cc59fd7a6e8c1b51623e6ea57d3958681e050
 DIST libnl-3.2.21.tar.gz 716377 SHA256 2dc80f043116ec8610d9d418f5f5e9283f3d9a3a48b8d51a8cb0146b3f279604 SHA512 d0efd2d536c2c58f4bcf8cace2f8a13e0d788c4cb2d189e3afd995a0fcdcb861c6606cb3efa223d4426d0f74daecf888fafadbfcf9adbbb64b56c5da5eefa4fa WHIRLPOOL f2cf29c4713c49b9baa58b178f6155c2ca05139e7320404b71bdf52bd8d68ebee42ace7fe2bb6d4d19d487108f836ea343ed58b1a8980fa97158ebc258c068b0
+DIST libnl-3.2.22-rc1.tar.gz 730346 SHA256 b11687564248f31fb6d1812e2798d4eb0b11e21c021df93f0e36c1b6900eaea1 SHA512 b2956f8a51ce4020179d9f9120400d0695ce4ddade4439b1ae1eeb063aa4598d595356a1c7a4568c0e5d63378741aeff8c3511315d832e0647fb9ee2a4a867a7 WHIRLPOOL c1e1fad4813dd3c0cf2ac14d9c787c70efccfe58a93708a9eb4d65cc600911357361e56bb819105e4588aab2390af0a08c9f8bafb1fd44a2f179efc1af4f1497
 DIST libnl-doc-3.2.14.tar.gz 8766064 SHA256 1db05aaa61c14ee578fa432cc1973a73379abe175859ef9e92ea033eae005e43 SHA512 2692f6d4c3e3a9d4fe9cc210fdb03751356daaebe19f8d9041804252a6c220dfc7ad4e72da428b56ade30afa2ef3ec3b6c86416f07b12013403dad8f735b0c0b WHIRLPOOL f55436bc28750f4d4d1bf716fc73e36a01b27d8799c0b2d8fee785db3da935fae4c4ab05a03dd4c65b9ef0cc32d2c112182b4e343e97b116a28da90e3035d96c
 DIST libnl-doc-3.2.16.tar.gz 11792430 SHA256 71c9aef7bf1495b5c2a488abf247ab5a4744783e8b4c6641b0bbb8e28d92605f SHA512 9224f308e3f01fd7a2d98f0cca0bf6f6d6535cfdc905c61bbb242c788a7c6121dee80c135552fd87a6e0dce31be4dea89e981066982f9d4f96b29f35ce92458c WHIRLPOOL 58902aff10580f1374dca9885060a20d32aedf1264c628c0105a860c8870d1ff9f4491a5b16389fb677815ae19aa98b9218ca3ce46385510d4bc88d0f5e574f9
 DIST libnl-doc-3.2.18.tar.gz 11717270 SHA256 60c8a4893138f655f34019bacec022dd3b5930fced839e9aa6405b69e903099e SHA512 c1036ee0005e71fc604125ad505e01ba248124f0cf0efdf741f7bb844296fb462f10b0735dcc42f3cabc9f52b022352cd681306432189df98bc36c1c1af6c3dd WHIRLPOOL 4af9a7b5edc27c82102e32c59d35815078830a67c0566690e60d3ab9cbeef786417abe538bc897fdbfda771e0004c0ed7b58f0ac271ed7e5dbdb68d9554e5596
@ -31,12 +32,13 @@ EBUILD libnl-3.2.18.ebuild 1169 SHA256 5c0c28d7a590e725fa91bb46678fa8e71aa78628e
 EBUILD libnl-3.2.19.ebuild 1169 SHA256 bb66337b68b39206125bff5f30b93ff71dce611f0e9e94156c19ab2fea6f6022 SHA512 28aa593ee24d4cb347d89878d8e765b822d1914ab783322b47f01db5b146045cd516af9d109080c4171b2f4bee2a580b3ad9c13f1f94fec7d40efa1ce9a61d91 WHIRLPOOL c1ebde6f089769e5e9cc080e0f89f9064745c2165d975c5c823dd996b1055deb1aa411298b2fd1e8d1d6127de1580523be4cc2bfe42c8b270b96cb3076019386
 EBUILD libnl-3.2.20.ebuild 1277 SHA256 b6ec0e5c2869c04d7a3e69a31424cf3dcadd184a61f12343b159e07409180f41 SHA512 b51b0e159f5e1917e7ee025a452dc64d402890a5cbf748ea01c6cc85b8cf31593d2f7755cdf3d7230a90808242d0679794676446c4f0031a902b2b2827801e6d WHIRLPOOL 57657c19ac8428122182cfdf08f1f4de13b120d1d305331f9ab7b867c41293c7a3fb5530ecb5a03ba60b0affa306a53927144c21a4c97aca796b871fd9d6133e
 EBUILD libnl-3.2.21.ebuild 1277 SHA256 941173ce9c10386c27f38c6101072e9284a2a1f0dfdf7316013e8dfd9977f231 SHA512 122b7f39e3f35ca5e7d3956da16e8177ae135d1e110e602421ff5d8d4f1e3dd3fc28dbfe461f37f8c1480fde3305eadfb6290b8afb3e06ee23d0c10a061d1aa2 WHIRLPOOL 8b1cff20591d7db2b6b1dc894b9af96f015f137bcef2c6ec6815d3580c0bb66f6d078b21e4dc56604646abcd5d72ba5bd925ece6cc6bd40078685adab76b1e06
-MISC ChangeLog 18466 SHA256 699856711c9aa822d6499d4e103d934ab45938ec3bf41465e07c473222f91c51 SHA512 72cc6ba52f4ef8891036a2a5874266b295b09f04d1bc2eced9506e62b2b8947a48780869c5fcb24ab36f667f6e64c98e8b5b52fdd5735371a23d862de431cae1 WHIRLPOOL 68bfbcab852fb9bf240e23ca0bf9580ce76ef0d22e55a7dd593ee0f451d90a4bb50998da410f0431b08613ab2fe50a6698efd65150ebc0e0a04d015caedeaf64
+EBUILD libnl-3.2.22_rc1.ebuild 1118 SHA256 d989d50be444fb8746c8954700e3418e3fbc0f4b0910237e9966acf2d8ed6f25 SHA512 acca96a097ae305d61fd44b698d9e5407606a1144cf503eff41897089864fec53afa0b1e1577115257f110381f1a9d72b1bc20d2436eadba3ce9c0a6c866cafb WHIRLPOOL 03c848389a91d1fa20ee02e85b91dcd9548d4b9debc7902e02b329fc7ffa7afb6cc3b0c32d9f4da0348662eee04e6c01583e807d531a911a8afc2b2f7832366e
+MISC ChangeLog 18589 SHA256 2ec695ba07da1d7279cb134734a810f6e32668a63b1cd702ae467084f3f022e4 SHA512 a96b12f6e2f27400aaa09d4ed7a94ac372bb5413042982d5d7c422c5f9725eb3183b187e3a34e741b4f6ef15274458ddf8dc412dc993d9cf2d3c25efa771e5f7 WHIRLPOOL 1d14f4d125738833320a4520cb2f6b580eccc6a8667161376919e643a0e7518aa7541001019e8320f1cf2722301472ba9c68161e731228ee5fc65ab2acdcc98f
 MISC metadata.xml 293 SHA256 917507ed4b28e1337f6a1e7df924690e50daea2478aa3e5d7ca0017e9f1c345b SHA512 35b9f3bf23026a6ca2d5354ea9fe5c05cca7d513e1a84ade3ebe06537353574701fd19d4f74ab4f69ae82ec0bb9f1b126de91a3117cc79a29fb5356059fb285e WHIRLPOOL 17007fffd2f94031ea1477ccb05d5ab663ddc16537a24e9fc00f2ea48be0dd43a64c0ed268e5ef22a87d052dcfb4390758e28209ae1be5f304c736b9a56f2cd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlFJEFUACgkQVWmRsqeSphMEYgCfRKOiE/goXgaZ7mTJ8Zb5V4rJ
-QOsAn1HlzFQmj+yLG155wMIF7dlNx1Jw
-=17EC
+iEYEAREIAAYFAlF9K7sACgkQVWmRsqeSphNmkgCaAx5EhbDO15tj0crk4ZGWsWYu
+KYAAn3ZZauxTTIwVUIQYjruQ6xsJotTz
+=yktG
 -----END PGP SIGNATURE-----
--- a/dev-libs/libnl/libnl-3.2.22_rc1.ebuild
+++ b/dev-libs/libnl/libnl-3.2.22_rc1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.22_rc1.ebuild,v 1.1 2013/04/28 14:01:29 jer Exp $
+
+EAPI=4
+inherit eutils libtool multilib
+
+DESCRIPTION="A library for applications dealing with netlink socket"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+LICENSE="LGPL-2.1 utils? ( GPL-2 )"
+SRC_URI="
+	http://www.infradead.org/~tgr/${PN}/files/${P/_/-}.tar.gz
+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="static-libs utils"
+
+DEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	elibtoolize
+	epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch
+	epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
+	epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		$(use_enable static-libs static) \
+		$(use_enable utils cli)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files $(usex static-libs --modules --all)
+
+	dodoc ChangeLog
+}
--- a/dev-libs/libreport/ChangeLog
+++ b/dev-libs/libreport/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libreport
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/ChangeLog,v 1.18 2013/03/25 16:21:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/ChangeLog,v 1.19 2013/04/28 14:38:45 tetromino Exp $
+
+  28 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libreport-2.0.13.ebuild, +files/libreport-2.0.13-json-c-0.11.patch:
+  Fix building with json-c-0.11 (bug #467700, thanks to Markos Chandras for the
+  patch).

  25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> libreport-2.0.13.ebuild:
  Stable for x86, wrt bug #458984
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@ -1,31 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256

 AUX libreport-2.0.13-automake-1.12.patch 2285 SHA256 b4c764e104cf76336661d96228786ce2d347ca6339e44c85a993c3c10fc0a215 SHA512 59a6f857604ab45c049030ab351cef28dc51b78aabd5575ff45abdd607d6b973020f32687666fd11a879e0ee18aca75650fa9e3fa2284a8e05c6b65216479b9f WHIRLPOOL 660303844f839d8d7f494d22f041d4543b502074603183801def34741f7a3e5fddb06a54d0b8372c49e508ca1076b1c81063e36c426134f0903efb642b17cb4c
 AUX libreport-2.0.13-gentoo.patch 10369 SHA256 7dec2b0708121c5deb5e8036d9ef5ee20aebd9713ee191d701b27920a4ab0f49 SHA512 762e389c62efaeaad08a04871e5dec05aadc26fb9457291bf2308835128241068b2e799585060b3ce4f7bd17f275a4e5c7da37835d4e8940651ea5e5928402f0 WHIRLPOOL 0b253ba384ee40aa60c36564739101e328e326fcf5e3543644ed46b71a89fbb34d8567ce5892a162ba7b26f6bc780514601e6fc32f883f3276c7a1229529ac92
+AUX libreport-2.0.13-json-c-0.11.patch 1145 SHA256 e47adb08f2c4d844e8ee824f33f6861331773308520e75714fe07b4e9f9126f2 SHA512 fd07c360d599d71fddb6766860203052fb390cde6cb795779e75a2d2a826affd6f03c6977eb99237caffdc41ac9f0e1c600a9414f72629ff5fc2102c70d8ca67 WHIRLPOOL 4b0dab98d5390443296d26c808fb095d45b7977b55073f69556905e4e60d6326b993ef3c031fd6d9b9fb28db40a35bcb765b348624cba04a1a6230ac578bdb2f
 AUX libreport-2.0.7-uploader_event-syntax.patch 610 SHA256 b93e9e05396b70754fcacf7e7358ccfa4cc995fa3e1a3fbe598c540ae4f0c148 SHA512 b0ae2617a013fd8cb3475e5a51073677f2ea965a57169c760e542474351293e70f70e678a66beeb3b3fa163589aaf7f79f0883fa55ff524e62b5fcd3ae919bf0 WHIRLPOOL 9c0e00a502a216ce47c513f052e1a63b0d57910d8790d180978522f860d980f8f216cf5773830f9ba3b5fdbf8dd7e3f661e41e008398a8d6de5e525a2e95c8d3
 AUX libreport-2.0.9-gentoo.patch 8795 SHA256 f3d0ee0e1c9f6032ce71d6daa92d8796306d9bfd91a346fb0c874f49368807ea SHA512 308ca2d73deadd351ff188941b37ce4d01c3b9d395038fa58b4bd03bd418659942d4def77c2423976f0113160642e92a9c55e7826e30ed2afe8c47116c7658ce WHIRLPOOL ba7891e9859de7cf8927da24080153c4e1c7f8df8762e27fc9d6d12e5dd5b0e0801511af341739000db41b3c6f39e775edd419ee1bbb0cff8e4e2dd54fd57907
 AUX libreport-2.0.9-no-bugzilla.patch 2620 SHA256 794b862cdd8d3d946eb80558cd7531f01a18944a2fa11be2fb9f585d397c4f05 SHA512 3d00eaa2aca33295af7331a0ebde312506edce6b8df5efe26ca190e9c431b6d5c6b9055c7dfbd5be923e39315f3b23a766b3ee2e46dea2d379839933467c348f WHIRLPOOL 46d3a99a8880ccbd9247a49903adbfc3e94a127253d5c0267a14da86f8023cae04dea9ef79f9a1ca23a2b02166415097931bf61343729c5386a5dd796f5fcbbd
 DIST libreport-2.0.10.tar.gz 1204194 SHA256 ab8f2bb2eeb93719b6a946b8a810527cec653815fd59c3fb03efca88e6e80408 SHA512 f9eca6aacb28c856e5bc109545dbd371baf57de4f2431b988dfce0d9d1a1e38269a056a924453bbfaed7c80890ddddbddca086754385a7397e23b6d1b8a17702 WHIRLPOOL 2429cd98c9d897a953956d92a9680fd65ccaf79f89da84c0862356c11acf318a50b41a674ac4de07e020836a2e4efcd38f1d949e2136a2abb854324a2c9a2a5a
 DIST libreport-2.0.13.tar.gz 1190147 SHA256 4a0609abe80b9432ae81c5a512680a7035b547cd1fef29c63c730d92c1be8b05 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181 WHIRLPOOL 647da27bf88cf77dbb25ace9f446dfe9a875370c27fef05999843dcee1f653ba07af44d4e5a36107dbf69f0241f1f66d3a6a58ae7897faca7b049d2b1aa00301
 EBUILD libreport-2.0.10.ebuild 3082 SHA256 2e3c64992a0709e7299cd3d7060198760efadaaa936b2f497310c77bb4749c6b SHA512 f0d76b4ab8fb66ea207e0940189ee8afd44d02c88b3007806098a68756e3a5b0a83a356e94a5f678eb0dd74a9c4ed0d0f58f45d950ed84e0e4dbdf216405ee75 WHIRLPOOL 7d43bac6f66fa5d037b0e64d52ef8027478d822143b5a4a0faf95eeb62f5b1c684e49e08905279f06f6f1966a75b7ad0224f7c5ce28d043fc5d7a515b9b22a5d
-EBUILD libreport-2.0.13.ebuild 2109 SHA256 083eb20cf883256fe47c247be3b4061840198ee0d2f9ee13391367827845ad58 SHA512 c853ec9fb33cd041155428529a24008ded99d7285cfe7d88da8e5f9702d2ad09027003aed1afe4178d4c65836b455bc6003e197e367c3eabe1475e91fe7eea8d WHIRLPOOL 7c717e2ab2acb750be4e86221967dabce3e18e91b386cc0de2f346eddfaaa1bbcda4e58b84fc12a047b2b4fdda94a57ba7417d660c4bab99220e257cdde82658
-MISC ChangeLog 3040 SHA256 4e52e4555b46447953389229668db5461fcf79b26bef76b835c9aa9737975867 SHA512 b73af1de02d297f83a7202b592a2d19b433951fc81e54f1d6996b5c8512352f3ebfaeeb93a726cb24756b6333ccfde1c41ea2ea1141d9eeda1cc23b228a8f911 WHIRLPOOL 9e748938f3b9cb52e82536bb93fd1d8d5be496ded260d1c2b595d3df61fd208bebf247aecedb8e6ea606aa32a15c5b75f1be9f22f97a923f69c8dd2efeccf9e2
+EBUILD libreport-2.0.13.ebuild 2228 SHA256 7ad560fdf03a76d36a6188995f470d77b059cd7ee457ee6cc5361985267c2634 SHA512 696a26a6629c71e3bad88304943611fbb2bf0e45d60eb5305400d475ac132dd6c3178e9d1a8ac353cb93403db0e21db5fe54d6eb84c37279e6dd28203f018af8 WHIRLPOOL d316e1b4ac57545bcdd597b4b4fcc1bca63d43546b1bc5f02379bf7613ba4c3a0cea921ae1ee12dddc36b2df02b5d8bd58680d610bd6bb8805f12351e45436c1
+MISC ChangeLog 3266 SHA256 7c258be6fbdbf6193ac9f222d1e9a689fa4bc61b4f52c103cc4364d871b2815a SHA512 e3db67964a5608d07fba38fe49253204acbddc6b6bfc3d7421f2c2e5528a468a8a59358f4e6a91f0fb5cdd99afab5d634ea11c488f35bc600d1f25191bd2e1bc WHIRLPOOL ae11acdc3a991dab0ef430b29a8f09fc52a7220bbd8e8f9deb7d1ddf878aae4389d2fff51d20d81e127928808ac42ac64f5afb3424e30894157e9b3c3649ee5f
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCgAGBQJRUHjyAAoJELp701BxlEWfe0kP/0DrJAXjhjKRIV2F55MPSTzZ
-Q9alwf3Ex5ayKkMvxik914i0QLh1Rci1tqKODlPhc1ALGYDlICNhFlZnv/sxIfbX
-d/vdgq2nPLvhtETocHXs/l+NEVDx6V/UEFP1zHcosLsPSW4pkxhNnQ9Hd2xGHGnd
-V5hQLyuONgaM2ENFHteiyG+K9Cxxc7cH8Wc3cJWPMii/e5rS84z38+FGBVN388/s
-FidseOdyIeVvrECenl+E0mE8plIw9bKj5uoGssx09d3mzrG6XcszY6we+l6BnUoh
-ywMClwf59Rle3lQKb8IQBN1l7IsVVpSDe+rC1WbV5ux/Vlz8Yh9xUzoTYh+lJzbx
-E8djPf7aimYSRlgda+Qv395HDqQJ8vMNL/xulUTegW6+CzhESLXrjnFHjG6yiBe0
-w+HbvYCwt1snJtoOgRh9iozTGOuNZIRYPUoHmjicMVzW3uLaD1XIhmfEx/+hhIRr
-Y7vIMykkaURLSDEz3wXwZIawuUN+crxyUs1KRXg0UrsK2CWYh5zlIvdgRNmCMgN9
-megEfotAhfB2QKgk9sJ9DtONhZtTac84CqtGwDF2jtJ2zNlAzAlrvGwww9nntqvD
-nuSo/UYsDwNVKc6KXUtUMxsWrhhcWtTaThHf58EB4brX8feDU0q2+Zyu7PG0/rxH
-BOXpmBUIwDt51UCNvr8o
-=6Bcq
+iQEcBAEBCAAGBQJRfTR2AAoJEJ0WA1zPCt1hj1sH/1WsV7bdp9UVrrK+f1bP3oPD
+xASVe2soLtLs8jayLxJJdOc8emytTmc7p7em/vAMSwFVfduiZOvAcbYKP6qMP1TM
+h0vnaowjuCJLoLJJaAUZn/NWLQ6+xQPfn7dGEZ4Vy39ZrQnuaY/Iu027WL9f9KS2
+Vob7/J1K1d3pOtqlsHXaHZXyPbRoBiqmH9FrOUd1nFoED7R4KHjYylv9+G42Y5SD
+9voPy9pceuuVtRt1unbFf4xvUQ8bzMTQUfAeAOjJtQrXZx4I+CrU6gHBpeBu014X
+B/h8z7gtu3t9deVVgqmNig6u/xKN5kTYOKhYJ2gdQVnTjEHCfs3VPZN7PkG0t5w=
+=hna+
 -----END PGP SIGNATURE-----
--- a/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch
+++ b/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch
@ -0,0 +1,35 @@
+From 4a874dde53cf6acca7db2e7be3c10106fb50ec62 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <hwoarang@gentoo.org>
+Date: Sun, 28 Apr 2013 12:27:57 +0100
+Subject: [PATCH] configure.ac: Fix json-c detection for json-c >= 0.11
+
+json-c-0.11 renamed the pkgconfig file to json-c
+https://github.com/json-c/json-c/blob/master/ChangeLog
+The configure.ac file was fixed to look for json-c if json
+is not available.
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.0.13]
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd50bcf..0ca5e67 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -104,7 +104,9 @@ PKG_CHECK_MODULES([DBUS], [dbus-1])
+ PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
+ PKG_CHECK_MODULES([NSS], [nss])
+ PKG_CHECK_MODULES([CURL], [libcurl])
+-PKG_CHECK_MODULES([JSON_C], [json])
+PKG_CHECK_MODULES([JSON_C], [json],,[
+    PKG_CHECK_MODULES([JSON_C], [json-c])
+])
+ PKG_CHECK_MODULES([BTPARSER], [btparser])
+ PKG_CHECK_MODULES([NEWT], [libnewt])
+ PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [
+-- 
+1.8.2.1
+
--- a/dev-libs/libreport/libreport-2.0.13.ebuild
+++ b/dev-libs/libreport/libreport-2.0.13.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/libreport-2.0.13.ebuild,v 1.3 2013/03/25 16:21:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/libreport-2.0.13.ebuild,v 1.4 2013/04/28 14:38:45 tetromino Exp $

 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@ -60,6 +60,9 @@ src_prepare() {
 	# automake-1.12
 	epatch "${FILESDIR}/${PN}-2.0.13-automake-1.12.patch"

+	# json-c-0.11, https://github.com/abrt/libreport/pull/159
+	epatch "${FILESDIR}/${PN}-2.0.13-json-c-0.11.patch"
+
 	python_clean_py-compile_files

 	mkdir -p m4
--- a/dev-libs/ucommon/ChangeLog
+++ b/dev-libs/ucommon/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/ucommon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.17 2013/02/26 10:59:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.18 2013/04/28 07:14:41 maksbotan Exp $
+
+  28 Apr 2013; Maxim Koltsov <maksbotan@gentoo.org> -ucommon-5.5.0.ebuild,
+  -ucommon-6.0.0.ebuild, ucommon-6.0.3.ebuild:
+  Fix compilation with new automake-1.13, bug #467674. Thanks to slepnoga

  26 Feb 2013; Agostino Sarubbo <ago@gentoo.org> ucommon-6.0.3.ebuild:
  Stable for x86, wrt bug #457292
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@ -1,34 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256

 AUX disable_rtf_gen_doxy.patch 446 SHA256 19742ff3a149ca50d7397f9ffafc5c70fb332837e2eae81b914e47cf9e8b1f20 SHA512 fe4168b313b5eca78fe8787b758c789c4b91df8355e380acd71c32735ad5c6984a3d6c06747e0215326870eba05d38ca015c88e5ca4166f42b3213ecfb1ad793 WHIRLPOOL 3bb313489028b0e0098e6338fa563327ecfd0cdd3f3e0e410d0c07d532ffe0572e742e4e81b4a9e8e94730211a0b3c4bd473302700f6cb78cd93a5998076796f
 AUX gcrypt_autotools.patch 1843 SHA256 9c449f270645e4809ea629533529e60297fd408606a126e4063d0685d6ed1a7d SHA512 019cbd580b7da5097a8de595fce2585cb9c84636260452ad8f03d03f8ce5b157a655f21724799689a94cc8eef70c1e0445aca5f458a659c301eaeb490f86aa83 WHIRLPOOL 1817daa10642c183dc30872368e20494dac5ef7c794584940b9074a788e1576c69abb2805c3eda80a3af7603ef64cc1ce615e7a675057d598839d21e3852cb41
 AUX install_gcrypt.m4_file.patch 4970 SHA256 9a161813addb5be01b411539a65fc0c2848fa109624986b81be861f8b044df6c SHA512 03039a04a8fafe4b23e74efc89ee1391caf0c4172ff3f2176cb47fea3777061382e756b81c01d1413cdbf5d7715c85194842ff7e17d1b679e2db4ac5de14d683 WHIRLPOOL 4db79a5ac8086cca33c88b902a1bc91cbd9bbaed66138761779d72455b4233751469ce268d6f9b4fd7855723af9a13ed4b3152c641cdb8ea6d3e822f079a53d1
 AUX ucommon-5.2.2-address.patch 1289 SHA256 1185931d42376bf3b980eff21a255b4a1bad5f61a97bf9129711afbbecbbd8ad SHA512 22950b7c5adc3af05e21e8324dd46665ac197f1de4c988fd2b28096d3bd18f00c5e4ab275e02571251607bdd3661caae950a2397e253293b62097e9cfce8847c WHIRLPOOL 73c616b7dc99074c95241a50bd2a0aa63d0322412588674431988004a27372c0df25df7a69a96d0fcc08bcc29c96b550097c08c717f143425d912bc750e357c8
 DIST ucommon-5.2.2.tar.gz 792081 SHA256 9d5f3f4d1ef897482fe470b0dd65b0df516aaeb874eac3a33a455abca13f39e9 SHA512 5d5e526675cb39dffea48c38a14dff4eb1316a59c60e2352cfdbb0727ff4db00417e9704026f106da5d34f92ec2be3385b0763d66196f345f0b775bf62eb0125 WHIRLPOOL f857c4b06aff4bbb1ff84edc810d674c7d77a92bb4bcdb62fed64e77e9979c7d736b93596166de6c5fb848745aa7efc1b666231bdb6a33c3b959953b4b114ac2
-DIST ucommon-5.5.0.tar.gz 803892 SHA256 fd4b885ee5abdb3cc44a501d92428af71e1c50ff9166a0e5c5fdbdf16a853d8d SHA512 c860d0134a5c888bbbd008b1716eff985f152a8bf3e3ee54b85adcf89f3d073ea1d080a071def3314584579841a270f5323a7c092bf516af9efb2b3180b12440 WHIRLPOOL c7baf57390c415011a48fa7472932d73778b1f2a0b435de55a8d6564061ca28c29ef0660f03727853f7d96b6ea8f0d1e8afc99fff9556de4694ea9694f8363c3
-DIST ucommon-6.0.0.tar.gz 806713 SHA256 b28fe9c9f596c58bb796ec4aab54db7c525c8ad42bf5b7c57fe08d7d260c5099 SHA512 1482be954582317535e7b3668b433e4ee2bfe53ad05a7391f1152e19895221411b1900f66b0971c642bf1c5ff76241fc2d7ebd3ad020d20fce1e46d32d228bf7 WHIRLPOOL 546623fe5f5d4807c0f04145627b0e69f67022f15daf3ad6a49a69ef7c6a9be61cbbd9a255a674e2ea1f6cec54a65a5efe266b97243bc8f8946ae131b375a23e
 DIST ucommon-6.0.3.tar.gz 806841 SHA256 228f3a0fa78173e9fa43e154250a7ed4f1e5be720a81fd2768506c088190c432 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762 WHIRLPOOL 93135ae4ec3c0e6d5203ebed6c6736b9b768d623d99a20674ee0a0ce48622d783efea6b8ca4eb22d5c2653b5059ff9626a35bf0ccfbad7d422a5cdf6c190c7c8
 EBUILD ucommon-5.2.2-r3.ebuild 1382 SHA256 4c335d815c0c6306497d489fe8426d79ec090561457d4c2d9ea2f3a65cdf71aa SHA512 78361e73d8f17b4981bfd2431720d974e1ff186d16d387cb01557301d06dfb036a20388aebd10bf03711212e1686a2abdd0c76cb0dd3fa6843c7f30eccd4f8b0 WHIRLPOOL 433211d6cb3b7ad1441c2a92ee722c897bfc28c01881a15c480b106381087000d6e4e51f2c654fef7fde88ffd62a5bd333c2de421948a3ebc94a7e42dcb73f1f
-EBUILD ucommon-5.5.0.ebuild 1491 SHA256 d6d24324b81cebf2fa5bc881067278b80677c013e8a441a967974578a52bad6a SHA512 1eeb5b3c946bc7c17107be70a3ee31845625f244ac2af914eea11e877e991e3229d14c24505afcd85ab66e39993fb0acd02a39bb2068497c27411ec4ede0a65c WHIRLPOOL b5341c708badf228ca32a788fcfe346aa069b44a73557e60f2db3a1316471006853c542447c71d3904dd5c1c054df4af3d89342293be0a07b13d3feae43f64c4
-EBUILD ucommon-6.0.0.ebuild 1491 SHA256 b7871fa1fd38e46ecf24b439532b7a1b8d6e7e0f86119d46bf3cd16c875beb6a SHA512 b0fd10aa67e0a4c5f3229f40d0125d9a993e9996bbc3f542e8c6b3869abcb9b981467cddd4cdeac517848400ccbb0549329660d80bbfd848baa076ada087e947 WHIRLPOOL cf8d38174b3f7d1fbd021b44dae6bc15ddac607c9da25fe9d312b4b205e1133f2f95990e75027d0caf297d323e0e442a100afd1f38a08084177f44677cff36a0
-EBUILD ucommon-6.0.3.ebuild 1483 SHA256 71cc415e87604af5c999405496816d94511685fa0b8598d39618f0c262ead5d5 SHA512 df6564474285ec1ff6035c702c2368592241d21ac0ee7c30b90c7ac16f3a1be71aa76d1de47160a376a3a58fe2f82546c783e8c914f4064227d1081459e79208 WHIRLPOOL e7f420c75c45085f8761e37fd54147796557c380991950d1375244369ca06ef5559fcf9f97001bbe54f423c4f3e99f89efef00aba6fad6e36e22280a217c1032
-MISC ChangeLog 2946 SHA256 71450c0f35781457b603af32054a1002338f4559aea8a92c925c10f206ac6460 SHA512 f8d3db215b3d3ca36e936794ee2b366d38a552c247556920d6cd5d5a7bea671b0229740110d4114a72926a0ec0ec20b538eb133a0bda4041c7ee2e7527fce397 WHIRLPOOL bd26a8cbc342dacf2f45203d516fd49240a2c4f483a1df08ac21ab39a34939dd5c9a4dab6130708f084753605a7ab80c1f6a4272c38fd8fc0e5f75bb92d10f4e
+EBUILD ucommon-6.0.3.ebuild 1619 SHA256 ffa2d55a0f1e241a7a1927b31511a256d2391c1843439007646a2bdff5ec2041 SHA512 1b729a606f880139c730266b64597c5dcd1c40cdb16b87bb8817f21ab16eba387c1d3333285a4ec9c48b73df1a81d95d71283d3828e957c70ccda915333230e2 WHIRLPOOL 2f6a49dae570879289390a1e2d714081a2131fd49ddc8f78b7ba9cfdf7d988a02b21000c9e317715eb25d8d035e101f12d3ee48987f11978726a3f633e2c69fd
+MISC ChangeLog 3149 SHA256 bf4357290d91f4da179e1c254ebe4de37111e4e9431a05930f5b733c4ab68cd1 SHA512 40d3f30b17565d26b34c6969545745b2c605d7f6697a26aeac34a132102f643d31b5faf7f02bc8cf05bd93187c7b626f515859c8abdfa33ffaa7a3d23d52bebe WHIRLPOOL c421e5cee9048f4afd63eb19eeedaa469a15d2600ea4444589db85c1a5ddace182eecee50730afd9dc8fcbfe6f65302703d6117b132151e18393f43eb6d6ef6b
 MISC metadata.xml 438 SHA256 a8ececfa37303e2e3822d69cacd23567fb9813b6fb0f319b08b6676808a26484 SHA512 c39973823d63c3506f0f572f4187aa000fa57dca64d96d3d5f5baf9b0e00bed2f1cc6fd116fff8e802b71bdfefbf527d6bf99051ad23136d9b6f91be6db55451 WHIRLPOOL 24719f9882adcf8bed378d899117a817b678f6b79623db49b9a833bc85cadb240f31ff61c0fc798772e7395ec9b3df9dfeeb27a7c47cde7a91a34a883e95a050
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCgAGBQJRLJWFAAoJELp701BxlEWfB60P/jqdCfiEzqlcK3F8j4uKJvUN
-0yDdDP8hS/JuY0nd+ZllNScmXPF3IRWS/9DOVDe29IWBQB4tj4U2NrbFoPM/UFE+
-B2zq7qzgkE/aGhjxCBwxl72FvEkwduArYo+xPC3MIT03paISLWkI1XVbCb+ElU5Y
-gWWAcfSWmuCpmu+d7N7q4O+xtStYaiJTAi5puCIRDR42VOKiRnZVxC1cE2t32/+S
-ChNkLgZtzMuKJvN3Jkg60KKwp6eNqg8s5L6VWT4g4QCCveIbzIBK9ECN5GsKV4YV
-DYjvW9fq7LXsqg6cSlwjR29DDmDK8B9mmT9f47osoJBHFqnxqEvhdkFsanwWJxQb
-CYGX+H6mdFN4vrBvCnHnrYXW8PyPJzk6CU+z2SmGw6Ap5sezHclgCNbGRstNK6Qa
-jsfbtGVHWgdPD5oS6t6CYVz3IXbqbhMPVY4xeJZrJVAb8L7pZl0uPBmrxmHAs2tD
-/NrgdB59fo+57eovuSQPE1eoe/4XrSWdASfjiQcrCdvdDKTiDF5TqmZTLWOloJnz
-IV9T1C7yyU2SbCeEMsws3P8hFQGkIiNq8UKGInns4QoVG1l4rhyXGUynHt9LuXPV
-f0faeNuI6Mp0iKc80O8K4vCCdZ2L5XqJcPi+4/ka1xLLSIx4Eu+HNgghfhi4GWfl
-k1X9nCrhHt4EnEHXd0Pr
-=eWCs
+iQEcBAEBCAAGBQJRfMydAAoJEAmJmMX429reTzEIAIvY2QELEotcDEAY7Jai2NZY
+DaDM7llTSVDnHPzq1BkpSFr/lKgjyzDaz2Vp62DQ1pmizWFCeyfWh9rKrDrq19n+
+fXRoerxYd/UsspPXy6vuqgJEdDuO3xUgyv5t+ppvMJsVLOag1R3JdUQXyO3ksQ0V
+CneUdL+WT1SX/UDYG7WaRPl3QShTk8yC47dM1/CfEwhSSkzI9Lbn3O6of9RkZ7on
+DJBaoiZJcdo9un5gUGmmBCznRJu0OVWF1m82ZbNPnyRU6k1UjkevBDgovhqP+LKK
+N9fRuPhl1aP7RS3KyW2uSU+fI2lkhwmHeRk65ZRh+SR+GXFIXcU4fUb44VNlJEU=
+=WyY7
 -----END PGP SIGNATURE-----
--- a/dev-libs/ucommon/ucommon-5.5.0.ebuild
+++ b/dev-libs/ucommon/ucommon-5.5.0.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-5.5.0.ebuild,v 1.1 2012/11/26 18:05:54 maksbotan Exp $
-
-EAPI="4"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="http://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug ssl gnutls"
-
-RDEPEND="ssl? (
-		!gnutls? ( dev-libs/openssl )
-		gnutls? (
-			net-libs/gnutls
-			dev-libs/libgcrypt
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
-		  "${FILESDIR}"/install_gcrypt.m4_file.patch
-		  "${FILESDIR}"/gcrypt_autotools.patch )
-
-#"${FILESDIR}/${P}-address.patch"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
--- a/dev-libs/ucommon/ucommon-6.0.0.ebuild
+++ b/dev-libs/ucommon/ucommon-6.0.0.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.0.0.ebuild,v 1.1 2012/11/26 18:05:54 maksbotan Exp $
-
-EAPI="4"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="http://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug ssl gnutls"
-
-RDEPEND="ssl? (
-		!gnutls? ( dev-libs/openssl )
-		gnutls? (
-			net-libs/gnutls
-			dev-libs/libgcrypt
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
-		  "${FILESDIR}"/install_gcrypt.m4_file.patch
-		  "${FILESDIR}"/gcrypt_autotools.patch )
-
-#"${FILESDIR}/${P}-address.patch"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
--- a/dev-libs/ucommon/ucommon-6.0.3.ebuild
+++ b/dev-libs/ucommon/ucommon-6.0.3.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.0.3.ebuild,v 1.3 2013/02/26 10:59:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.0.3.ebuild,v 1.4 2013/04/28 07:14:41 maksbotan Exp $

-EAPI="4"
+EAPI="5"

 AUTOTOOLS_AUTORECONF=1

@ -34,9 +34,16 @@ PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
 		  "${FILESDIR}"/install_gcrypt.m4_file.patch
 		  "${FILESDIR}"/gcrypt_autotools.patch )

-#"${FILESDIR}/${P}-address.patch"
 AUTOTOOLS_IN_SOURCE_BUILD=1

+src_prepare() {
+
+	# Aclocal 1.13 deprecated error #467674	
+	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
+	autotools-utils_src_prepare
+}
+
 src_configure() {
 	local myconf=""
 	if use ssl; then
--- a/dev-python/jinja/ChangeLog
+++ b/dev-python/jinja/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-python/jinja
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.63 2013/02/02 22:01:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.64 2013/04/28 16:14:34 chutzpah Exp $
+
+*jinja-2.6-r2 (28 Apr 2013)
+
+  28 Apr 2013; Patrick McLean <chutzpah@gentoo.org> +jinja-2.6-r2.ebuild,
+  +files/jinja-2.6-python3.3.patch:
+  Revision bump, add patch to improve python 3.3 support (fixes bug #451928).

  02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> jinja-2.6-r1.ebuild:
  Stable for x86, wrt bug #454314
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX jinja-2.6-python3.3.patch 2923 SHA256 ea056a4d046fb61e6f6de5a1e15d96cc64e00257e128535e68878ff265b8293a SHA512 27a5dade64e555eaefe30512a5cf3ff09bbafc83ea05d051a9a1835a7122988c5d6e93a44d50a0c4d9eaf5eb339d6dc5cf97b239f2b521b83f6609be1257f63c WHIRLPOOL df8d052bbfc24636ee2969e5dbc8e7724f2ff8c2460a003a5dd2cab188f48a3d3631ce65c357891ff2f010f81dd683c7803fd3751797e240d3da28b8c990a5ed
 DIST Jinja2-2.6.tar.gz 389741 SHA256 a85e185375db75c109f99ecde3d55415f035e7068a82252cf4f16c667ac38f49 SHA512 6603bd6a7e4956433746da15b18b1206b67c901262337aab8352ddff154efca9eb6d652c244c63e8ffad492d204c724db3e86222ae371e75e3f5f2011244554e WHIRLPOOL d6d27867a6d4d9f82e956d5d116faae4adfb5f1fea4ecc067fec61d67eca0d16ee6dc80d8585f34a49a89a2da18c65395a4d615b5723241866ff27e3362f915f
 EBUILD jinja-2.6-r1.ebuild 1834 SHA256 6cc0b89c803fb4733a40953667dce8cec445963dc46dd813f4bce341a475d9bd SHA512 dc21f64353a3615fb866a4d9e40223b5f85d492def513a310a8e63e7699b67d06c66db0ffe52b40e8d602d9b4f71fa704e37cfd995b2b2b7601e9f3c737f0e14 WHIRLPOOL 37b95f984eaa5254278cb48073233e31caa14ed6a501b8e83e1df016df1e7e441db529b16d8f829e39e65938364d37180c896e30167582c38f0a5b812df81eca
+EBUILD jinja-2.6-r2.ebuild 1913 SHA256 f849c6169b0addc9f80088a25be63210547524b9757c3c8f4c4a3ef55976f127 SHA512 0faaf37cafbbed355ec8fac75268cf2d1ee4231b44fb3f94ec5522431a06001adc11405657e853682c16a2b8c69db6eb23df2c70c8b3bc8ead36c3d2ff0f2d45 WHIRLPOOL e7c0d426fbe9c48804a0d567add1986f6d69e2e6cc008bd3be96ad7a6aa79d2a328a976576ed0d77e4065be43a00601ef454086e8fdfea90d6c724f93b8b022b
 EBUILD jinja-2.6.ebuild 1885 SHA256 ca7229d425db7195fdb936ce819b014664de41a9847face956612288e0e6a9e1 SHA512 88d8513f5132d5877704db80d320b3cf1210b56118d2bca034aa6cb4a5135fdd330cafc3439f357746c721af49d2368c095d6501e63ef14525fab0fc97034e6c WHIRLPOOL f5eb57b60bcc43905da22da49f58aaa6c4f6a23e00322281149d63588ef1d8430bad8b2364b510efa0cee760450d0855464a0a409d8e34b4e2657cb9a49b55c7
-MISC ChangeLog 12665 SHA256 327de588b1f5801934f0129ee9acc5e88b0be33f3658dfb0ebdbd51912a637bd SHA512 bd81f55ec8b7450d14c4ca63ceeb9c8b3bd1c361d2eb378abc1e261efaaded9750fc99fc22a0a42f3258b5be9ae00eb4ea93c074165edb4371e4612cda10a0b2 WHIRLPOOL 1412400ff9b12eec7187f7537fe0dad97b8b6ad913bcaa0ee23d1f9876d73c70094ab5a5be79def677c7aca7f9c49a07f58f2f525c7caa507644391e94ba7f1f
+MISC ChangeLog 12888 SHA256 619eb331b17ccb68690366e580335d4f178510b2499d485bf5285f5dd95e53e6 SHA512 f3d820b8d8b2581a75367524a0da9204a3823b7df6d6b08359dc583cd4c5bdd07cb2f812b2b5a0a8a60b6c3f7b194ec297ecf90536ec823ee37c6383f97f2301 WHIRLPOOL 71539b28eb91287b516b6e0e96d26a8f8f24501efe6583b5bb17f5d2deb81ab6e0de64533d65a1c04da2d7db9b7b28c9ed41fc73ddce9e938401d91686169ef2
 MISC metadata.xml 260 SHA256 bda84a3528019ac7c58b2435d70ad4a5f5c5fa29f0f8643569b4710081c2e555 SHA512 ac8108e6022705d5954c6ea7e504f0fb9dfd618c22d126ea6d22d181f6784dbd504ed705dc995cbd6c444067d43f46acb1cda58481b1c5459e4f9df7f260a81b WHIRLPOOL f6d4bb49f06a00d8ecc5d2e28ebdb80dee4dca9a77ce5d1926b45386301a2c267c943c991375ffdcde1473a8e30073803512a9e2f091e318fe6401d039c4c696
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRfUrrAAoJEHy/RO9cNQiDKCYP/3SM2iyRyGLu6xEX+8i9ELZc
+YvYEIT1UAK7bGF+twmgrx3kF7sufxo1PeFfX3vM+RkYcq9PD4Tpx47lhpOGMOttu
+Iz3K9Wzi7OsUETE7RSdsEct94hNO9NG1YRwNqslcnp2U4oHZqQyPB/87ZYdUTEFB
+yQs2Ua7z3lGNIqYW8LHSE/awhCrLQ5CW/ZW37lvfAwnECqnp6lcyIWxuFW5jWi9F
+ZsdTi9RiB/ReN6osfGQyPGOPIW1IF8MrOdBYwVU77AUJz6kN40ZZezKfgvQVuFV+
+t7ewvLBNvy9brPEdTcyIchjb+ZFMS+EpOFXk9cEF6/pW95aKVs0MhMtWBPoWZB1F
+lF6TkAG2BKcIJzS1TeDOGegYxQHJmuE34q4H3bA3SIinPLQ8+tC6730ze9sKUWc8
+k6zpqjCBvYWgFbNHc58xotmKOb6cnfsl4ygTQFbsq2EYFOrmfiTxua3wuUhU0m9W
+EoZ89EZOsNOBSbP6DNMBGofd4GiucQD3lSyG8yHDK3C++ONAOLIHkv5jomnWzHDE
+jUVvmeHOwOrJ47ORcvfRGJIjG8ZTFv56gKl0vmfRHblxY0t7cDEN0fF+SLbDPK8n
+j5asprbrsRBi48C6OytkOKTXd/qSgkj7S4YUhu/Z7AvEuCotjZdgAivnQi7nLVCz
+B3oB7odyf80bDCqc9f2r
+=KzZh
+-----END PGP SIGNATURE-----
--- a/dev-python/jinja/files/jinja-2.6-python3.3.patch
+++ b/dev-python/jinja/files/jinja-2.6-python3.3.patch
@ -0,0 +1,74 @@
+diff --git a/docs/jinjaext.py b/docs/jinjaext.py
+index 12b5447..8395a55 100644
+--- a/docs/jinjaext.py
+++ b/docs/jinjaext.py
+@@ -8,6 +8,7 @@
+     :copyright: Copyright 2008 by Armin Ronacher.
+     :license: BSD.
+ """
+import collections
+ import os
+ import re
+ import inspect
+@@ -22,6 +23,7 @@ from pygments.style import Style
+ from pygments.token import Keyword, Name, Comment, String, Error, \
+      Number, Operator, Generic
+ from jinja2 import Environment, FileSystemLoader
+from jinja2.utils import next
+ 
+ 
+ def parse_rst(state, content_offset, doc):
+@@ -110,10 +112,10 @@ def dump_functions(mapping):
+     def directive(dirname, arguments, options, content, lineno,
+                       content_offset, block_text, state, state_machine):
+         reverse_mapping = {}
+-        for name, func in mapping.iteritems():
+        for name, func in mapping.items():
+             reverse_mapping.setdefault(func, []).append(name)
+         filters = []
+-        for func, names in reverse_mapping.iteritems():
+        for func, names in reverse_mapping.items():
+             aliases = sorted(names, key=lambda x: len(x))
+             name = aliases.pop()
+             filters.append((name, aliases, func))
+@@ -145,9 +147,9 @@ def jinja_nodes(dirname, arguments, options, content, lineno,
+         doc.append(p + '.. autoclass:: %s(%s)' % (node.__name__, sig), '')
+         if node.abstract:
+             members = []
+-            for key, name in node.__dict__.iteritems():
+            for key, name in node.__dict__.items():
+                 if not key.startswith('_') and \
+-                   not hasattr(node.__base__, key) and callable(name):
+                   not hasattr(node.__base__, key) and isinstance(name, collections.Callable):
+                     members.append(key)
+             if members:
+                 members.sort()
+@@ -169,10 +171,10 @@ def inject_toc(app, doctree, docname):
+     titleiter = iter(doctree.traverse(nodes.title))
+     try:
+         # skip first title, we are not interested in that one
+-        titleiter.next()
+-        title = titleiter.next()
+        next(titleiter)
+        title = next(titleiter)
+         # and check if there is at least another title
+-        titleiter.next()
+        next(titleiter)
+     except StopIteration:
+         return
+     tocnode = nodes.section('')
+diff --git a/jinja2/environment.py b/jinja2/environment.py
+index ebb5454..1b5dc40 100644
+--- a/jinja2/environment.py
+++ b/jinja2/environment.py
+@@ -570,6 +570,10 @@ class Environment(object):
+             py_header = imp.get_magic() + \
+                 u'\xff\xff\xff\xff'.encode('iso-8859-15')
+ 
+            # Python 3.3 added a source filesize to the header
+            if sys.version_info >= (3, 3):
+                py_header += u'\x00\x00\x00\x00'.encode('iso-8859-15')
+
+         def write_file(filename, data, mode):
+             if zip:
+                 info = ZipInfo(filename)
--- a/dev-python/jinja/jinja-2.6-r2.ebuild
+++ b/dev-python/jinja/jinja-2.6-r2.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r2.ebuild,v 1.1 2013/04/28 16:14:34 chutzpah Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit eutils distutils-r1
+
+MY_PN=Jinja2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure Python"
+HOMEPAGE="http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="doc examples"
+
+RDEPEND="dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.6 )"
+
+# XXX: handle Babel better?
+
+S=${WORKDIR}/${MY_P}
+
+wrap_opts() {
+	local mydistutilsargs=()
+
+	if [[ ${EPYTHON} == python* ]]; then
+		mydistutilargs+=( --with-debugsupport )
+	fi
+
+	"${@}"
+}
+
+python_prepare() {
+	epatch "${FILESDIR}"/${P}-python3.3.patch
+}
+
+python_compile() {
+	wrap_opts distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+
+		if [[ ${EPYTHON} == python3* ]]; then
+			# https://github.com/mitsuhiko/jinja2/issues/115
+			2to3 -n -w --no-diffs jinjaext.py || die
+		fi
+
+		emake html
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins ext/Vim/*
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
--- a/dev-python/mock/ChangeLog
+++ b/dev-python/mock/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-python/mock
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.61 2013/04/26 13:20:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.62 2013/04/28 14:00:22 jer Exp $
+
+  28 Apr 2013; Jeroen Roovers <jer@gentoo.org> mock-1.0.1-r1.ebuild:
+  Stable for HPPA (bug #467308).

  26 Apr 2013; Agostino Sarubbo <ago@gentoo.org> mock-1.0.1-r1.ebuild:
  Stable for ppc, wrt bug #467308
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256

 DIST mock-0.7.1.tar.gz 1083629 SHA256 990d46cd6bd7a1a79fb73cc78c9be981547bf85b3cba52be503d2eecf6e3b772 SHA512 ba700449f87fe98aa8197820cd671e06530b703cc2fa322aa9bf874b0a97ce886d2be66102eea418c0c121ee75ac2763299c55fc6af3894955a383f4cdd1017a WHIRLPOOL a774e6a603af99908856e68827fa032faeaf922424b20fe66b3032adc5db1c3cb20db10ee7bda4768c5f395d891230a6a27a316aff8f79d35e0f22875c5da4cf
 DIST mock-0.7.2.tar.gz 896135 SHA256 ec0d59c3f8ba6fa850cde44a63d592bb35b9b5b893e77227cf118e7ee14039f2 SHA512 74f00a499c60ed55371c384f0d2401d3e8c14953904efd6770552370da7dc5bd483a274e1d3819112953b5687de136377b01a961e460be2aa165d545880bfd35 WHIRLPOOL 3b3a60e20049cdc7809dbc14fc28071231636069c3322b3b9ffb31f19938b9589808a2e38a526fff2d8b9478213de5807c834aa3b9fed8ca295732e171f279a0
@ -10,24 +10,14 @@ EBUILD mock-0.7.1.ebuild 1035 SHA256 bafbc00881ea0013f01869f7d89aecab43b294f3fc0
 EBUILD mock-0.7.2.ebuild 1047 SHA256 1ff4dd64ab006add9cdb71f49190908cb83a5cf85e817581e0e3c26a21c9a4a1 SHA512 ffdc89786d760446841dc04d5ae0f4f501819a5347b02ee37037c34f5d474452ccf3e620070e1927089729371b2aea79f9a46fa4cd442cb99d3bac31177037c5 WHIRLPOOL 39e620a633c5334cfb7d7159cb4019455e46755e00bab31256657cd0e342c3ac672797a32e5c0e107bf9d896a57f97a56f9a187ad04a41899e7101f9bbc3337c
 EBUILD mock-0.8.0.ebuild 1046 SHA256 75173a2ecf34f023d8f24ea71db460a2327ad0ebefe183e04f05579722226a0d SHA512 886cc1333a303620e0e7b79688347d684064c9797f3d7de7e3d3a18e5edf1f35c5c924b116d217cef36e7cd836a55394ebae6048cebb08200d483938e4fefbea WHIRLPOOL b65cbd2638470debd16665170736791bbcd66734ba575f487e83e47e60932b2ef28ea5b74e883ba205f84cbe9d83ff8f770097a52bf2e69b50e29d34a972c908
 EBUILD mock-1.0.0.ebuild 1057 SHA256 c61a6ccfb1a2e6c125ca9a79f3cba6789887212a60074e2e5aa220c61cdc3e99 SHA512 9dee7d02c6a0a9970d818f48e0840f5a0b3c06104ba7b8412cbf39b0f5a7812dd97dd444617fa255fc94151d71a22d7f361f904088a7378ad23537f55b518b23 WHIRLPOOL 6dc5870098d3429bd56fb0b3ba81f623249b0d5e7766b15b8c608b8dbfe3048f27581219e64addf7ea92106bbfcebdd2fa0e00fe7cc6ae272244ee0fd89179b7
-EBUILD mock-1.0.1-r1.ebuild 1130 SHA256 5a96b6001746a58523ecac95961b5f9e44a1cd960c0751300ca1fb79b72c6876 SHA512 71a37a818c5655fb34a80a7e23487037c420f1a617f012494fdcf46dc18a6f1c51b356d42060ef72e43f3657c12e81f54e2433ae5dba4d6f4f4504c6862f03e4 WHIRLPOOL a364c594f3f65e3517ae4a7bf44de3f63f234d0272aba61670accb900361caeeba3016a53b68522557ca5b189ee82ba7d9da83fa2f05d8b13dc171e4b15ada11
+EBUILD mock-1.0.1-r1.ebuild 1129 SHA256 da2d978e9b45dac7aa14e09b801fc62240b855875ca3548d041c5f099791e7d1 SHA512 c21d4081b3962d5decb1ae1c5cee61b265f1635c8d44dcf2fe3f7ea8fbb8b52e4908d9fecb26b5c8b28124e204a3c26e30ddcf77932c1af0ac187c7a417a3a7a WHIRLPOOL 8e4792f670582047074fac1c6a3b331dd74e748d5935e23f8b8cbbc3a9f150d0239e1727a9153892d31aa3850631daa4d10ad6e580b6c3a587e8112ab30e81d7
 EBUILD mock-1.0.1.ebuild 1081 SHA256 8e042e77b61d0a06ac4be2a6eb1dc96b1bb87a8c7e2563085e64fa644a543562 SHA512 5b89e6b2db12589231e219671a9ad86a81aad97c7d60e9f9bc667aba5bf1a3d15adefa1b77bd9492619a5cf7cf2f9232ba501fdab9a244027760111ffc96b9f1 WHIRLPOOL 17800c0aee6bc53c28aff843c5729b4aa0278498c3d503a05e0a48ed01c4390b8f0add58f3d4b954c423a6fc4174137a0574d325a1cf678c2aec297bf8a9c6b9
-MISC ChangeLog 6905 SHA256 0a544dcb0843739cd840651d109adb253ea3b4504630b616ed5d3a00efd4c49e SHA512 92e1bdded943bedbab2454054e3f6f7aa8385519679f459ff6eed50a11fc6cc3b441ec3e6e868e8dea4525b9d1c9f8d16453fd3aac024d02b25c6d8b1a627d8f WHIRLPOOL 0a6fe5b2e59825e8d25299b8d7f31b4588210d17d350a4b7c8aa3ee2eb8817a70da8030dba2e03ceda20702e0ba7758edb0f2a0b3da14626c18d4f0517f1b6fa
+MISC ChangeLog 7008 SHA256 fd559b3787e8f26cd3fb653351f1f0a7a21b0d6aa9850326cb447b0092ae2162 SHA512 703cecc4caff5d9b3891e012dac3832916f4c3ea09137cf9e9e800b6596833b00c9a89649cfc08b1c40dd1b2cdd4e99a3157e6b697fc5bca77c12a6c545857d6 WHIRLPOOL 8737ca8bfdf09ffba29cbb0435e3e30afcc442f2aa97e81e8d22bd68f4efb1fa682d9c36dfff51201e94f029cd3144ccca469a38218a480a3b862fef0e053f26
 MISC metadata.xml 227 SHA256 0df81518323132374e9107018a8ba84576833f8cbb9e9570e1ed449909f537f0 SHA512 12a8567e73ff8d3c2f0808ace03005abb52df5c0470f77747c7ea3225c8614b01180c62fec4a414d5d0d26a77472da32fe879926e64478596571cb6c63b20168 WHIRLPOOL 23d248d9cab8febf4ab6f11472ae95de01f1897350134adba6fd16a7ff0f032611189210cb425a9692093f8d8488f4226d233b1422653edd75d66aaf8d5fc69e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCgAGBQJRen6VAAoJELp701BxlEWfngEQAKW1xNdO1xYGNtFYlGTBh6sX
-kWNI8e6zdXjvelBgRQtlpBr7dMsW/djpxYFyME34phli8DDeomCHU9uxQNfkcj10
-NZ7lkKETz6rJfW8lSinXO9/erXFAFlPetPnE64/W9XzNaLgcOf6iLOSXbbfKeF+i
-Bq77zXvYX7MDkVnaToHgaYDJ+36gcLAOOb2N5MAF3rJLB/BL97eYGpkXb/7rGdE0
-FthbM3XAkSQDTgvVD0olLksv72kpsfcxZnX301sSPNb65/KDV2dhznLZudLwQJrv
-EMGL4XzH4zlpIr9gxpRFPZPuIpmMyhy4BAvdP9f5TbkDusgRi6hSg5qzyCTYqQHW
-HaVRGN5dk3iheugkdVyf2kzy1ruwUsMqlUVEtpGNtisYud9uvHmdCSpPYLR+W1iq
-r+sMowL2H7FWzn5o28tKYq/cy96KmTHkeglB8OHl2Mwalir6cq691iBldxnXOnxQ
-6ALwIs8/Lg9YbDLxhClfftdyT5ElcI8ZI8qspdD2dAU/hxP5QEWxuP/RtjSvtZFz
-dtkV/mexVXQwU/B7jgNnaedEhjuOumNleeMMTrvq5qTBk1/qqORKFEdt8mAQIi0M
-6jZo4dK0mGKpEcyXYZLLrgr/YgFkO9dCn5Rt6gq4J/Dt7SnRgvikEYOHZHyImtiq
-gJI84l6i02y8FfLgexZG
-=s6jU
+iEYEAREIAAYFAlF9K3cACgkQVWmRsqeSphNx6QCfQQsqpSyLnZWl9a4TKTtj7Gu1
+JQAAnAw0PE+ngFc29bDHkNLyV8K0dBcs
+=qc0o
 -----END PGP SIGNATURE-----
--- a/dev-python/mock/mock-1.0.1-r1.ebuild
+++ b/dev-python/mock/mock-1.0.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r1.ebuild,v 1.5 2013/04/26 13:20:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r1.ebuild,v 1.6 2013/04/28 14:00:22 jer Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"

 # dev-python/unittest2 is not required with Python >=3.2.
--- a/dev-python/numexpr/ChangeLog
+++ b/dev-python/numexpr/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numexpr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/ChangeLog,v 1.10 2013/03/17 15:58:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/ChangeLog,v 1.11 2013/04/28 11:23:45 xarthisius Exp $
+
+*numexpr-2.1 (28 Apr 2013)
+
+  28 Apr 2013; Kacper Kowalik <xarthisius@gentoo.org> +numexpr-2.1.ebuild,
+  -numexpr-2.0.1.ebuild:
+  Version bump, drop old. Migrate to distutils-r1

  17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
  Add proxy-maintainers to metadata.xml
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

-DIST numexpr-2.0.1.tar.gz 68549 SHA256 29492a08d5137c9a3a369527a899680ef7c1908cd4851ad2827b6c1d3767b092 SHA512 4d1ee18981e7d75165d0dad6060371dc9aa1b7bcd561708105da03983920b715b25d9d7c24c595809e20917e37cd387ec293d37ede62cf0e213f8170ed1d9970 WHIRLPOOL 0b0eb3bc60d3d792579abd046f6b8752a356d71b21bea760948713301d1790e095f85dc420341ca9f03322ec273ce98cf92302fff5732c0504f5083025274e26
-EBUILD numexpr-2.0.1.ebuild 1261 SHA256 729a6a8e49f4e0824a27fd88823c824984bf79ad9cf1fc67bb8eca32239a3699 SHA512 a86608ac42c05e4f88358395ea1141b88b536edaf9139d0cd47e244419599ffb479f741f52f179996c1e7919b875c3942376faf5a4fe9bcd78649c13a4e17398 WHIRLPOOL 6261c94df48c60e70fd5095fd1f58fd59edd66c2e131564d62abd67672e4e903914f783f72428b7604ea53bff1294b57fb2a3dcc3b52ded095627e76b4df9ae1
-MISC ChangeLog 1678 SHA256 5bc078c0f6548a3cfac58a5e1b5a9a45bbb843fdf9b6c55a4e8d9e35e68df2ef SHA512 d80e9d16462dfc96532141d4dba07d952c2098fbb7ed250a184f8088af1939d14d79e280f3314abd1121669af1c6fb3a3eff0f9c3cad9d2b0d45334d256ddcef WHIRLPOOL e75c198cce9abf2291b2db9413cd4a96c88a536fbd69c0994f685c866e0447d55193e50dc8b3e8a8373f0b42071ee6da86128dfe3e706e9ebf654b4fa436d0d0
+DIST numexpr-2.1.tar.gz 73944 SHA256 39f2fed7f1b8125c0f2df3af454c97e5dfa636ce487ad7921025815e24c17df8 SHA512 bca4c73441b3265c60d3682b47b9a94cd9a4669b8bde284c7043dccd97177cc829e8e2e50daf99e5c8bcee7565800670319c999914f3846af15f03fc2974cbea WHIRLPOOL 7f906e2a75f888a020db95a312eb9d2592c3046fde51e25b83f716199e631c484efd570b7f7c6fc40e7dd7fb78f83ea3a35a23c88be67783c3c97a1de3539fbb
+EBUILD numexpr-2.1.ebuild 1284 SHA256 935f140040702b83ee113297dad55884f1a8dcc5b7219d53185376a06c9f6c05 SHA512 66300afda6af2a004bf710d0c7c815261d286da79f398d2a47bc87ee053605689b182022a15346ca93a54013d9c263b537941a91e0dca2def1ad85ea5b460d48 WHIRLPOOL 6ee52ef76ac248ea0b30fabe5ccd1ef5f4253f18bc71c0823203e039a71baa34668272297c80f518edc53de4684835f00d7113ba6360ef870f824b022e4982d9
+MISC ChangeLog 1859 SHA256 8b51d97c5e792ae82adea0a426f134e6c6a1c8e0b5c3e15d93b647554fb33c64 SHA512 8e38a6de55400d9809b1ab6f0cad19f8034cbf40be2bbe1df2865b9a52c5a2cf9538cbd8622f2bb185a3da744879cb9dc3896faac46d42eb8f001bb8096735e1 WHIRLPOOL 0ec7a186fbec206e923d9cd5e3461f3a312673317f946387ef7ce852836e003481bb6d40eb694270127988ced063b523f27e984e9975ce8c7faf66d7735fc98f
 MISC metadata.xml 879 SHA256 9bb44ce2e541a717d38e29bb689c7bc57e0d65594bde4aec7d1fead3aa8e6346 SHA512 4c42b9b40f4254c19d5773ed935729b68a67efc98556168b6d7b349f90a7295379d7bc040aaa01257a451b7e4e7985fc1eb5d26a67e8762abde91297408a001e WHIRLPOOL 5480e53ba9b36d798ec7ba85985ecddf898a9343bff3a44974c4a976efeb44adbfd05443413257085813c81a0ca1fd408d753614b05bdff06d77a4e3dbe2424c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQJ8BAEBCABmBQJRRegsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88EPsP/2oUQrn5vaC7nKPu8FlVUnEa
-Qo2IXtCa8cn6GmvWR+XV/lJcWMmEBBhQaS9PP3S/h24lQI2HrYLpV/tj9n9ZGhmz
-TLFaAeIqa7MoOa1S6o1GxeWyeUfJgWnYKQggx03GMYUrrSYwtM0F/e2UQyS/IYSz
-knXmTLmdYoINkmF3htW5IlF79kd9sIw3/dktiFyonr+hMGbOruNNgTAWU8j+VT7n
-ZYLsDdpqeSidUhb/G8p0Fzolp15OKjk7X2CSav9EmCAJpIrU212VQEyMdfBr431O
-+OZnZP3Wls/3WnGjv9NvBHolJYbcilEPmMiDRSLAc0hHJ+i2p9FPaGDorp1UPlaj
-VU+fnKIErELNHyCbVOkQLBaWYUGLuBFZrqemqaImaQm9XLnZkgyyGHwM0+jFd5jx
-224TIy0d6uUxg3gJOf1H3xJEcFbUNWFktACRe38LNM0fplLIB8kM4MvXKzVPX1aj
-ksmisqoSYrXZHoDbdlzz7D3M8Ip/xxquPtV/wjhdpmnjcYMO0kmjxk4hvY+c8UYk
-ntbCwtYl5fFYO2W7HfiVKVQEL5LMvOCCSkNENLvEZQiGMlSafp9lZYbmoxFlsZpC
-5m3ftXVwu/OmHBIkkL14lzzjsvGQq33tGxVLWaRlvLVVSYbvQ/v5t5O9XVcB0cTr
-H2y5XOQ06pJFZLLPjyan
-=rUeo
+iQIcBAEBCAAGBQJRfQbHAAoJEF0huFKJUZL5hWcP/ibfx15td5nTaUVViOEd/sqV
+JMlfPEjK97zrFN8IhUvR4Rmcoppyq52OYsrKd1yhuod2TPXAUNP3GZDW1NIx9aOV
+iNCSEI7y6uB8IAsmQ7PErstt5kSfNqTaNBR6+1vlvspcGclu9F0s8xfqjhRLRoic
+bCofAnGldoLgmcYHtyBZ9WWPuIMUuYd765+1Ry14t5VXGyXkjJmr6emJXPXoAUoh
+/QayYAaohKIjBCD2ZDSIszMaF3VrKDsjG4Jet2fQd3Vl1qYn1pT8kzOO8gh4ltj5
+n4Sc56NWhpo50B9pwiirMu3rjmP0s2pFGn/AMG/HxOfvswZsmEpZpwvVsKH+Fx1o
+rlEdmheu+pvCMDBJruM/B2KyANu1xLESLWyfs6zBhYneft5JU0JvnwrUupFswCv0
+wypSvFRGg8ewbOb7OQe3MA8kZJWDA4NkrLLIPPYTylaADbdxodiZMgHsio37bNL5
+10m5QtTtU2FPCwBtbb4XG8aYOylYDvTgU1LlpsYsZ9kzAWhRJU9NM9V72yU37N5
+SXquOZcFknW2RylAQKsramynj5CB284NeptGGRV/7wbhqv3ZLAUOVpGa3xCxjGZ4
+EXAag4b0PK58BSxWK5sXIzHBzlBIq1Vyt/NmjcXKrg/+aLzwY1F7MZDjp1TxeJZW
+V2yBuZwQy5hsWnLT10aJ
+=4KOa
 -----END PGP SIGNATURE-----
--- a/dev-python/numexpr/numexpr-2.0.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.0.1.ebuild
@ -1,13 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-2.0.1.ebuild,v 1.2 2012/02/22 09:52:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-2.1.ebuild,v 1.1 2013/04/28 11:23:45 xarthisius Exp $

-EAPI=3
+EAPI=5

-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )

-inherit distutils
+inherit distutils-r1

 DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy."
 HOMEPAGE="http://code.google.com/p/numexpr/ http://pypi.python.org/pypi/numexpr"
@ -18,10 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"

-RDEPEND="dev-python/numpy
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	mkl? ( sci-libs/mkl )"
 DEPEND="${RDEPEND}
-	dev-python/setuptools"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( ANNOUNCE.txt AUTHORS.txt README.txt RELEASE_NOTES.txt )

 src_prepare() {
 	# TODO: mkl can be used but it fails for me
@ -39,10 +40,7 @@ src_prepare() {
 	fi
 }

-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
-			"$(PYTHON)" ${PN}/tests/test_${PN}.py
-	}
-	python_execute_function testing
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	"${PYTHON}" -c "import numexpr; numexpr.test()" || die
 }
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@ -7,22 +7,12 @@ DIST pyflakes-0.7.2.tar.gz 30107 SHA256 e971804569e26a120ded70ca94882cbbf3603905
 EBUILD pyflakes-0.5.0.ebuild 702 SHA256 97794a3c4b85f54665a9567e7049fd60f584f02c41d0cd8ec132f791df28cce1 SHA512 fda0dd264790351c2314e330af71723030f6ce92eb8efe8acdcb25d210e0a26113c6987843c82452d3b19a96a9092a4547377a2db32242bd2dabe2ba0c28a85a WHIRLPOOL a25da6bd87e085591f7ac758176f8ea2673fbfbf368caff28bc1d1e1a359f272943ea81ac09579a3b73a8b77b74b42aae391707255bf7e168fee2b62a2f0a1b6
 EBUILD pyflakes-0.6.1.ebuild 919 SHA256 58d39240cc29b49ad88cc5e80291ace286f8605fd7dc0bbb02f4de93cfc618ee SHA512 f2f8b4f0cd6a37ecfda7ef98a20d69b16dfcbda6f7f3370f57ccb313e7c6285b0f434244fe7f9b7817f0e2e0c96aae3116bdd4f6e81d24bb54a5459bd5ceef93 WHIRLPOOL 1ffdc62bea309e435f62840fc9b35ccf252dbadfe5b6500b42d96328efd8ea04861293528f6d912c13e021a6285192b9aa5cf456e1fab026dff613178184e1f1
 EBUILD pyflakes-0.7.2.ebuild 651 SHA256 d79b3b8c365f4379eb1438375d5f65f2761bbeabc46ac56c6025c60d4ae123ca SHA512 b07b3a7b90a73cae104a201aa2078eeb357b43d87e6fb9c20af219b1a5f57ec67a0eb472fca7e2b6749c3a07befce1f4b7cf623ea7f75a15618ef1a835a9b56d WHIRLPOOL 11d919c180aaa58202f1f6f88aae0bc6f19a524fb4125849c8b8bfb8d9b2c2ce27a63a3d3c4b450468a69f0a1798319c019c4e13b4dd6c2ee30e949d9ae1c72f
-MISC ChangeLog 3580 SHA256 d151c05ca8693e544a0a5fbae124a3ddbb7e7a13a6d89a1e93d4dfe50e3223b3 SHA512 93bebc0c7dbbd46a4c8b487bfe52b4fe644b584aa523d4e5a57db7be65f0d39f5a73af82812e3b8c1e800d2cbde9aa8fd678b308155fe2730216f84bbb2c9120 WHIRLPOOL d3d8605587c85e81b9bedbdfc58de8a480bd385ce49ae3320fb7ec7c63fd1945e9bb86de2930b2f21fd86632965026ed82fef330703eb54ec043bc3d2989bbb8
+MISC ChangeLog 3580 SHA256 c01c04526963d3222061a3e33345fbad43c72667838abfdd491683f4651c4500 SHA512 f2e36b9832b2c24b8df2185a5a21917995191b6eeccd21d9452df9ce8d8caf7e5d1383a7738c83a40768f9045eea606925d278a4623a91872ec0555cd51f281d WHIRLPOOL e6e042495aad432f6228674eb4d909da9f95e156bd374549e1b772198c9b35a2b4f27f4e306b4cba64b645bed70f6ed8564ef92c782f7980bfa471cb7455b5dd
 MISC metadata.xml 600 SHA256 2512e5a45e2e9f1f3e114f91b905d0b7564cf260e9a670ed78edffc0448490e0 SHA512 75d3e82bfd282381d622eca3b24e213711a70bf78d7b24d8140a9248865953f9ce90aacbe5387edf5b5717ce59a625f70e4363e3a75192c094829f010789e4b3 WHIRLPOOL a92dccd8879c4bf127995a630fdfd69b711e98239d3a517e5c4d707736d289e99974d2bb538ab1f8d90ee6cda371bb7bdaded4ef74ff9c712f3bad10d4f766ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCAAGBQJRfCMOAAoJEHy/RO9cNQiDsKMP/2BYB2NOtrY/sbimZQUfthob
-k0tQNJKjgGMjJZhLIEyKqN1yWgInUN2QHZDAbLDNdCmZCAcwdk2zEdhN3PBj55Wx
-W0B1S31qKWmITrqM8rPMS94+KjZRVlMu+aKZCvGdW0Cm0G/noIf1THba9vakmv8B
-xPz6+v8NnBhep8OKJ0XII3z5z/tKMcGgbNg5wCuJwnm5QtF4mXoz7Xm9JI1zoFw4
-H2mdW0hAuLLCZ1T7fwIsHTuWZCudiehossI3UeC10YMFMgZ430ByjV9IFtUSH7rV
-UbfwUaJR9fLEN4xeSO/BFcgOrT2wZQrJEkowKttgnHOoe3XkuAbHemagkXhj7Z4C
-ZEvfgbZjUp4PCdWdem8rf6PM0rLZDN41X/heVWepeufrh91YQRDz2r9nHoMT7YHf
-qJpGmthX8or+5PLfcI0vuda9X/0q+CrDuocuipxt9LY8r4PKgu8pPQ9XSc8aIPtP
-vEW1ou4gCy9hL1H9glCrI7fizsZslWPXVH+9kCt90isDUOLm88i9FkD6jjaLW9vt
-oCyWCcf5fPXqtiblDwakyxtWEbUiLyrwl1Hi3WqjFFUCEi+jiqQf7yFbcjXmtmxE
-btyWCx2Er5GaEa71vMQHpRgQr6uacJNx/fJoHkXBKWTzaiqGlSQiGfVfWY3KnpMw
-x7eFvxURl3LeVxGei3Zw
-=cxp1
+iF4EAREIAAYFAlF85J4ACgkQhH1PFcSeJvavMAD9Ez09yfFwbaAPgv+rVWmPW8Bl
+MOIhlnc77rs92oZC6coA/RB6yNQG9hpSy1XQnL3kkblInR0OcAm6xsnBOqiAkyd+
+=4VbU
 -----END PGP SIGNATURE-----
--- a/dev-tex/bibtexu/ChangeLog
+++ b/dev-tex/bibtexu/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/bibtexu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/ChangeLog,v 1.40 2013/04/25 21:26:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/ChangeLog,v 1.41 2013/04/28 10:17:36 scarabeus Exp $
+
+  28 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  bibtexu-3.71_p20120701.ebuild:
+  Use subslot on icu so it is rebuild automatically with icu update.

  25 Apr 2013; Agostino Sarubbo <ago@gentoo.org> bibtexu-3.71_p20120701.ebuild:
  Stable for sh, wrt bug #449298
--- a/dev-tex/bibtexu/Manifest
+++ b/dev-tex/bibtexu/Manifest
@ -4,23 +4,23 @@ Hash: SHA256
 DIST texlive-20110705-source.tar.xz 131207904 SHA256 772d19795fd841737f5b00472810b49d98b3b62373fba67c12c757e95c510da2 SHA512 1efb5713bf80379f5104b41576911a4194d378ce35be5afb568c3b4aff6461b2b22e72fb34bc294021cf14a28d07bab083872f17752441f269f36c50f9363cc1 WHIRLPOOL 11cc5b53dedae8977b5d776f9141a849b23b877b836f56469336018e3529ebbf369c99d534c1d645aa99fe0750968f0089034a232dcf9401967e20afb5ce8dd5
 DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
 EBUILD bibtexu-3.71_p20110705.ebuild 1105 SHA256 0ae0e61f2a124dbf1e1a3bc98fa0f89762061fa73d4b3e7a3264cbea2dd4c3e3 SHA512 abbb4180bb66819db94b4b79663cbc4e35580227367353c6ddd17979954ed81e522ba767c246f52959c923989f062f75fd224f42b5d6557dda84710a390ca245 WHIRLPOOL 5a4bde4b88f3db854049e32b07eea149b0d3563aebda824fd1af75b87b8099af780a2889b96d33b071c1bcab299511cc6654f4bdb95d85988ba83fc0f6371c2e
-EBUILD bibtexu-3.71_p20120701.ebuild 1093 SHA256 8128b26eb5dfb17576e0a495452e5519bfc9fb211c39e20ec65a84f04ebe030c SHA512 250b377a6b1e2626ef480b441834181925288e167bbf1b7d5a21a45522ea266a38e0ccd336a7681bbb9fa58dc632a36b38cdd66dd65e2af9c5ba0bef71435492 WHIRLPOOL 8a42df8afb85fd58a52ec0305af121ba62870beac77d613ee1d321acd1c57bd19af972fa2d328ad6029fb9cfd38d83050dfd6d9672a80ed2228ec6fb531776ce
-MISC ChangeLog 5320 SHA256 4a5fc5cd86e4defa84f67bd4759484d8da8a50757c09414925aab49e27a12734 SHA512 e9dc19ed42c6298b49fa3bab799af4e699965be41d27b39d563674f85e57f9a38586756303852f28c2e7c26636ff408181bb09b0e08dfc268273a1da147faa2c WHIRLPOOL 3a00689defed2ba6c3de646c8975adb85d889a64a0b09fc8688e9d4c9fb61a1c29a5bf924f11dc6d8c5713467a1052a5ec29df7e2b7c42ea16db889688f366bd
+EBUILD bibtexu-3.71_p20120701.ebuild 1105 SHA256 9102dfd16c544f2967de2939f504380abd69e5eb0b32757bbf607c699251fa76 SHA512 b07e7cc93b6f1dd24b3eaabc16560db1f9e4fc4a850288df521c28660fa138abaa7d3ebdfe2fcf113798ea60315365f70fe155f49b9cf093e0f13dd1ef1604ee WHIRLPOOL 867d59e8bba82bc17c162f5b937a6ce5c313e36e39f0e6c3a7145bf1e8f707b946b114d5a03717de434963742539d15f6cf6a290d265d449b1f529be1f58a50f
+MISC ChangeLog 5484 SHA256 3e277956f994f0ee6b708e8ace3bd2ad21bce9d347f4a39d292b3b9e9095ff0c SHA512 7e3fc5028cc46ec8037ba5b16dc0b2f11c69d448250bdd3c402cddb9cf69415f51d941e7bdd6f70fa6ca64189d07b1275dca8f0527c4f0866fde98cdb21fe4f1 WHIRLPOOL 0ac935ec68dc5cf8ab091b006d8e988878cf57df6b823506b391cad8cc340e40a72413315a52b0359632f374ba6da815ad984c0cb0927d2fe2c2acad072e3133
 MISC metadata.xml 156 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 SHA512 cecee760dd314c182191a282255f2415e479a8cc6cab9cb664e5b82d52b700a3444aa0d33b30a721a756e432819decc8c92588c769ea6fd33dabe9adc16d75c0 WHIRLPOOL 88a15092b616df72dd0ae91d89c80d852ad49ab9fee8a9688f3a1be59c365cc3dc77e90be68b5c4ec9cc1dc9885e06e723abc96830df4d0628df8c97f8b2a332
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCAAGBQJReZ9sAAoJELp701BxlEWfuu8P/RMNz9F//3q/riDYfnLDaBnF
-ggzAqOwxhGs3e/AwIfqpY3xIgas5SvgGIeag5/wEp2XOUTPnnw7RWq2RKqN586l+
-MCOMJ2w3+lyqN0eiB4b1hjhrPfRpZBpcNpcQYwz/CuvXze2ZvHFcRCyAjqg9LHhQ
-uovVsj37H1YDU8AYxzsPicmF6QzcedPM6a0QLblaNpMj8fj1vmiReLVB7xAZQzY9
-4iFX8jo1DhoBoV/Pb8XRdMqqudmxueIJTrWEUbu45RvnD9dU8NSfkWdKXo+2oJPv
-4Xe/TTbxMAaXr1nK6Jl6PnX9RGIxwZVHQ5zpI2dAkXjDaNXWb2fxWBpopVOUBpKR
-8EUktfLBHEySSpu6DlHX9V/hQL3i0ZQDs557BYN0Ld3O/SzDTYlY1/EZMK6vNWj9
-qi4UCX3R/rm5bUcQUBFd8okTjofMKRwOu5yJO4XVrLnnlehobXYwSLWjRrGKzGSd
-MfPqarF7HcDpdki5pob4y874tDfTBOWFiaWfau+bs3wrNx4UzUCFXPZ8cWARpqXX
-SDQCwHiyLv9usyR1/tAtV+8wh33syDWQvr7eBNALesInHkARq4IcsETZmhlbxGSl
-8AWzGDGXpOZIrEpC57/lanZ9tdCcMD68Kpma+eOsIRRIcXIxb0JLXhVtge45D52f
-SJzdfzOat9blw5anz2nZ
-=pJ4V
+iQIcBAEBCAAGBQJRfPdBAAoJEOSiRoyO7jvo31wP/0ZKHus4dEhwPG7l6i2lxRns
+CaRvdfcgKnYiQib8xGAExENZn6MDXEU/dg+FLQbibafm3FoHRTvteB8dvZVZ1Tun
+w43VnSxihUo15zeFAK5cw7vtzn26afFcMvZZsn2ngtZu0X+q48bjmsW2gqoJMEqH
+msIevVGTl5Jk7/Sy+yqiLLbHHnakTtPc4XqcLShqINRY8V8927oKFhin0mlbWMgF
+2QY60iM+1n1St33A8xYbRfdaEizRt34u3dxClwALhgZDpq3xF+jXcze0pHmbyLJf
+fd+MLiVzyJDD+Wsi7ZNfBp+U3tBVGJ+Aoh95Zpo16PGv46k/V3+aoszuC2DNxRaS
+YRnz4vnBkwnUVMW+VlMu0Uzd/UgQWzDYaaBJM6T+Z3SEPihKO6kc65CoBa/Fj9xm
+4URWf9ZTprf1KkBmUpUTpd1JzyATZN7WQfbTRgD16HU0lAFyMOzp9OYIdXYN1Ucm
+qgbpELL/AVyZaNNWZK3O+HLitWRxOOqhyltV6GBqrJSb3gpFxsGNMxzxMm82CxGO
+dyL8CjmZKQHC4W77hCIgGXr+q0X8jjZDuwIq7q8ZFvxE5KJCQe3hFBx+dssxww5C
+xl4VF8zfKT4aNmPBEiBI3q/WOn9perOvBcesX/3NXJAuDbTPeXmXYNU6CqyryGOc
+mhFFZcovCYEz521zRe75
+=Kwve
 -----END PGP SIGNATURE-----
--- a/dev-tex/bibtexu/bibtexu-3.71_p20120701.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20120701.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/bibtexu-3.71_p20120701.ebuild,v 1.12 2013/04/25 21:26:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/bibtexu-3.71_p20120701.ebuild,v 1.13 2013/04/28 10:17:36 scarabeus Exp $

-EAPI=4
+EAPI=5

 DESCRIPTION="8-bit Implementation of BibTeX 0.99 with a Very Large Capacity"
 HOMEPAGE="http://tug.org/texlive/"
@ -14,14 +14,15 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbs
 IUSE=""

 RDEPEND=">=dev-libs/kpathsea-6.1.0_p20120701
-		>=dev-libs/icu-4.4"
+		>=dev-libs/icu-4.4:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}

 src_configure() {
-	econf --with-system-kpathsea \
+	econf \
+		--with-system-kpathsea \
 		--with-system-icu
 }

--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.801 2013/04/24 01:49:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.802 2013/04/28 16:15:33 zmedico Exp $
+
+  28 Apr 2013; Zac Medico <zmedico@gentoo.org> apache-2.eclass,
+  haskell-cabal.eclass, mercurial.eclass, perl-module.eclass,
+  php-common-r1.eclass, qt4-build.eclass, selinux-policy-2.eclass,
+  subversion.eclass:
+  Bug #467646 - Refer to /etc/portage/make.conf, not /etc/make.conf.

  24 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
  Remove old, conditional src_configure call in src_compile.
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.30 2013/03/08 10:26:42 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.31 2013/04/28 16:15:33 zmedico Exp $

 # @ECLASS: apache-2.eclass
 # @MAINTAINER:
@ -569,7 +569,7 @@ apache-2_pkg_postinst() {

 	echo
 	elog "Attention: cgi and cgid modules are now handled via APACHE2_MODULES flags"
-	elog "in /etc/make.conf. Make sure to enable those in order to compile them."
+	elog "in make.conf. Make sure to enable those in order to compile them."
 	elog "In general, you should use 'cgid' with threaded MPMs and 'cgi' otherwise."
 	echo

--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.153 2013/04/23 19:16:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.154 2013/04/28 16:45:37 vapier Exp $

 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@ -245,7 +245,7 @@ _at_uses_pkg() {
 		egrep -q "${args[@]}" configure.??
 	fi
 }
-_at_uses_autoheader()  { _at_uses_pkg AC_CONFIG_HEADERS; }
+_at_uses_autoheader()  { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; }
 _at_uses_automake()    { _at_uses_pkg AM_INIT_AUTOMAKE; }
 _at_uses_gettext()     { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
 _at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; }
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.38 2013/01/06 13:06:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.39 2013/04/28 16:15:33 zmedico Exp $

 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@ -38,20 +38,20 @@ inherit ghc-package multilib
 # @ECLASS-VARIABLE: CABAL_EXTRA_CONFIGURE_FLAGS
 # @DESCRIPTION:
 # User-specified additional parameters passed to 'setup configure'.
-# example: /etc/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared
+# example: /etc/portage/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared
 : ${CABAL_EXTRA_CONFIGURE_FLAGS:=}

 # @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS
 # @DESCRIPTION:
 # User-specified additional parameters passed to 'setup build'.
-# example: /etc/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v
+# example: /etc/portage/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v
 : ${CABAL_EXTRA_BUILD_FLAGS:=}

 # @ECLASS-VARIABLE: GHC_BOOTSTRAP_FLAGS
 # @DESCRIPTION:
 # User-specified additional parameters for ghc when building
 # _only_ 'setup' binary bootstrap.
-# example: /etc/make.conf: GHC_BOOTSTRAP_FLAGS=-dynamic to make
+# example: /etc/portage/make.conf: GHC_BOOTSTRAP_FLAGS=-dynamic to make
 # linking 'setup' faster.
 : ${GHC_BOOTSTRAP_FLAGS:=}

--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.21 2013/03/15 21:47:58 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.22 2013/04/28 16:15:33 zmedico Exp $

 # @ECLASS: mercurial.eclass
 # @MAINTAINER:
@ -36,7 +36,7 @@ DEPEND="dev-vcs/mercurial"

 # @ECLASS-VARIABLE: EHG_STORE_DIR
 # @DESCRIPTION:
-# Mercurial sources store directory. Users may override this in /etc/make.conf
+# Mercurial sources store directory. Users may override this in /etc/portage/make.conf
 [[ -z "${EHG_STORE_DIR}" ]] && EHG_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/hg-src"

 # @ECLASS-VARIABLE: EHG_PROJECT
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.135 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.136 2013/04/28 16:15:33 zmedico Exp $

 # @ECLASS: perl-module.eclass
 # @MAINTAINER:
@ -175,7 +175,7 @@ perl-module_src_compile() {
 #  and apply them to Test::Harness.
 #
 #  If you want more verbose testing, set TEST_VERBOSE=1
-#  in your bashrc | /etc/make.conf | ENV
+#  in your bashrc | /etc/portage/make.conf | ENV
 #
 # For ebuild writers:
 #  If you wish to enable default tests w/ 'make test' ,
--- a/eclass/php-common-r1.eclass
+++ b/eclass/php-common-r1.eclass
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.18 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.19 2013/04/28 16:15:33 zmedico Exp $

 # Based on robbat2's work on the php4 sapi eclass
 # Based on stuart's work on the php5 sapi eclass
@ -92,7 +92,7 @@ php_check_java() {
 		eerror "in front of your emerge command, for example:"
 		eerror "  USE='-java-internal' emerge =dev-lang/php-4*"
 		eerror
-		eerror "or edit your USE flags in /etc/make.conf."
+		eerror "or edit your USE flags in /etc/portage/make.conf."
 		die "Kaffe JVM not supported"
 	fi

--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.145 2013/04/07 21:14:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.146 2013/04/28 16:15:33 zmedico Exp $

 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@ -152,7 +152,7 @@ qt4-build_src_unpack() {
 # @FUNCTION: qt4-build_src_prepare
 # @DESCRIPTION:
 # Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
-# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
+# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
 qt4-build_src_prepare() {
 	setqtenv

--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.17 2013/03/09 12:07:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.18 2013/04/28 16:15:33 zmedico Exp $

 # Eclass for installing SELinux policy, and optionally
 # reloading the reference-policy based modules.
@ -52,7 +52,7 @@
 # This variable informs the eclass for which SELinux policies the module should
 # be built. Currently, Gentoo supports targeted, strict, mcs and mls.
 # This variable is the same POLICY_TYPES variable that we tell SELinux
-# users to set in /etc/make.conf. Therefor, it is not the module that should
+# users to set in make.conf. Therefore, it is not the module that should
 # override it, but the user.
 : ${POLICY_TYPES:="targeted strict mcs mls"}

--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.83 2012/07/29 05:54:17 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.84 2013/04/28 16:15:33 zmedico Exp $

 # @ECLASS: subversion.eclass
 # @MAINTAINER:
@ -31,7 +31,7 @@ DEPEND+=" net-misc/rsync"

 # @ECLASS-VARIABLE: ESVN_STORE_DIR
 # @DESCRIPTION:
-# subversion sources store directory. Users may override this in /etc/make.conf
+# subversion sources store directory. Users may override this in /etc/portage/make.conf
 [[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"

 # @ECLASS-VARIABLE: ESVN_FETCH_CMD
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.230 2013/03/30 23:01:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.231 2013/04/28 13:38:52 pacho Exp $
+
+*gnome-keyring-3.8.1 (28 Apr 2013)
+
+  28 Apr 2013; Pacho Ramos <pacho@gentoo.org> +gnome-keyring-3.8.1.ebuild,
+  -gnome-keyring-3.6.2.ebuild:
+  Version bump, use fcaps.eclass (#454908 by SpanKY), fix dependencies (#467416
+  by Tolga Dalman), drop unexisting configure options. Drop old

 *gnome-keyring-3.6.3 (30 Mar 2013)

--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@ -4,19 +4,19 @@ Hash: SHA256
 AUX gnome-keyring-2.32.1-fix-undefined.patch 783 SHA256 a7b0d99728960af4e81e97941fc1aa9f06e49b7ed06669ab17d72628cd05e408 SHA512 2f60202c4b07c37cc59d19838344ac666371495b9230c8f6b3a3030e58364dbb9a012ee8eeb6d89ed1e8dbb9324340971259a5b75e7666563a402c88735dc916 WHIRLPOOL 7030408d34850a6ac827149b3aaf1dd1f7f80ea7fa9731e4c76b5c95fedfec2bad51797f428685cdc9232fa455f2d78c814d35c06b905b2126d9a7aa8c2661e2
 AUX gnome-keyring-2.32.1-glib-2.32.patch 1355 SHA256 042bf9bc95f8e37bf9733531cc4d38db5c33d382f15152afdd7288ea09145fee SHA512 5745e64d77ec48cb8fe5b76bfc902f97749ee125e0c6db6ee7aed87f996cbae92e3c835792e76e33f49386ac8a9a4ec3613212f6ff5f470d038f2abf737c4aa7 WHIRLPOOL 23c45dd081eebaf9da75d159c71c3addd40e6f15b88c167ae932c6d3e0c261296c5e9222a0ed8cdf47045e9e30dc9f27bf331cb0482b26acfd5d2ac3f0ca611a
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9 SHA512 23b91bc11be2805df228de98513a5f96386a89d6ead6434b7fdf4a3bee86b6601bb994b9de4524f8751c7d7f1ac9462c592bcd9b77c32234fc709148450e382b WHIRLPOOL fa9ed1d79a8af912ca8c4957d6dba30322a0239dd2c9b40f5c6adbfc66147402870a6400ae8bbdb56380c250e095b601ab9689f65ea17c95a76e7e2defe27c7d
-DIST gnome-keyring-3.6.2.tar.xz 1139836 SHA256 ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6 SHA512 d469e7cf5721aa3fd22bcf87799f303d01135698af7919f9bb9421ae043729bc8924d6e245b1e7c16d501897c259df35e9e015e79ae4d4c17af473a48dc337c5 WHIRLPOOL 0b24551a964d68e9f6dab211d409e80c49808640cd613a9d8b0cc47edfe288ac167dbc71e3164a81cbad64a1a3f1376f84ecbd023a3443b442da13770969d2ec
 DIST gnome-keyring-3.6.3.tar.xz 1141948 SHA256 e0153a3f16a25e943237e6242054870802815e0f694c5a4cd808ee72f6014151 SHA512 aff1de6831be7b1e3e8383f14bcf408153c8729cea247e63be852bd527d4221238f182f2d2c73b081dab4bd6564e5c4df5d6848cfa311ba66c0fcf0dcacaa4bf WHIRLPOOL 141632220bed40b9faa9a1a481860ba0207986c78ba4072ad9726acc8cc24cc39e61f197d25b709c2380f8b06ad349f7179f39ab11d389ff4a8a199ca172c7b8
 DIST gnome-keyring-3.8.0.tar.xz 1137888 SHA256 5ef9f4b7ff983a4fbc3d049aafee0fd3ecaf4d5cc7573517ac17c1b1a56bca6c SHA512 105ed4f37b080b79b3fafdcd8d4bec2d56fe39eafdc0f2e76549999fb574038252d7935bcda78352ea910602bf4478e66adfb934952009a2e980d96f8e7d03ac WHIRLPOOL 693cad3dd1fa820b2cc8fcd9c80d7861be6a7487e46baa44c770c562034cfedd8a6da71074b87af9177b5016cd863f88094a99923e252c06294f7599356fcf4d
+DIST gnome-keyring-3.8.1.tar.xz 1140232 SHA256 56e0a47c021fb2d2fd2c723a0e1c9e46c9a0a81ed865ac1588c19aca16ca4f37 SHA512 a31ebada5528082c511ad3cb6a11aab03a76a3fc2b1012ea505483a1078f6ad229fd32fe846cbd77703ca4644225091aa05870c870c7c31262bc0338fe011fad WHIRLPOOL 9c0e561ab6047ff59d917c51a90311b320c533dfd076d66030efac15a55292d893d6b3c78813f0ea05eaa8a93a0c91527e26d82cc5eb87d93e413a64cfe6b671
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2050 SHA256 3a06de08fda7f013e5f2ec5dd2bcd2d3e44f98fb1036404bc0862caf1094f39a SHA512 3dc6362f2687a3989879937abd67d43e925b46c0822b41fe0b530d8feecd41f39c15c00ee6b8bc12576c789c980fa5ca585ad93731b35ca1d1c537439e330f53 WHIRLPOOL dfe94dff29550f966515b202d7392f5340604da3ed7fa1d4e9b8dac76746c62fd9330064896435f7a800c6b0ab213f2fee4ebc1d42c41d67e36eb36df6e08065
-EBUILD gnome-keyring-3.6.2.ebuild 3673 SHA256 7728a6a945132c6174267f3fe2031b84a2f4ea38730687dc72b7a442c4c415cf SHA512 dbb4f914cba91cae625896a7564b7a1187677f4f68677e6ad8f8cc6d2cea512a1c1b5ed8f2b9d17312ad81dbdc5f9446151ff0abfe78ed938186a7183d14493e WHIRLPOOL 8d5a0021df1405f990cb3bc19e380369c7302b48e8ef8856c224681fa6bbc9483b00b199ad38d7c0db7b2c50d6ef00b5c7ada9c407781a1e2186df20aa6b5426
 EBUILD gnome-keyring-3.6.3.ebuild 3656 SHA256 e2fa6c3aacc64af11ef6660bf1ac4a763552d96f8734c1e392a3729b3d23ba78 SHA512 34400878f1e4dea9e02fadd24be683df024536a5f652d0c39ae3578ec5cb8597cfd51c6a9106d6c01138bb10493f597690040a98da45629f84a2077d8fa69650 WHIRLPOOL 35d5ce0bb086cd85d50f9aefd21958c5751d2419a9eb2bcfecb3b83451a613a16fe22ba506b6ab20764ebc9ab45acae0da749cda45f1a59d769625be9557e74a
 EBUILD gnome-keyring-3.8.0.ebuild 3635 SHA256 5a72c4b00410e9fa10ebe875ed0d400cbfbf26b6923f1f91cc92ba88ce816054 SHA512 dcadaeb849fc3311cb4a87d1f9983c4d68590cde75f87b73cad42dc4096ee5c89fd5a03df30280410b6ef8532732d02163d1396755470d9e0178a773f04edd03 WHIRLPOOL d7f0e9915d1589190f6b2370e43f4f9adbfbcd7b46d9909cfb8805984a81c8166496df8e54562a5afd10318bb44fe8b8b4176dc5d81afe82fb6e78b76d53900b
-MISC ChangeLog 33855 SHA256 0e4727417e2cf28351f82b6ac109e46ac1a0e45568b6c4df23f12e5651a1dc64 SHA512 dc97704e7e53c02ac9b36a9986af63d1a6bb617fa6bf8edbdc812045133d17f561e1008891ceb83b021fead19202dae63bda7da8bc5a1326e228fe4dec5510fe WHIRLPOOL cd37a868a485a20de49d8001585587f17ea2e190d9df6cbcb8328c73725cca3f676cc562f08d4c389668f62b9f2801303ea21080a662456cee5b4148d094f993
+EBUILD gnome-keyring-3.8.1.ebuild 2261 SHA256 4a811504b9164d4df8375cd280042423d425df28772ac6aa202f0bc20e772fa3 SHA512 6c48088d2c1e4f8c59e5e80763da986a2732848547ead9ad1c8d807db700033e17a915ef9dc7e42467f6dd281046a8a76f805a0a85048f35842e2356fe8201d7 WHIRLPOOL 74717cc66281e920e2e6cd670806b3ce4aeb83d686016970fd5e9ee728b0f31080054694d35558e09099f6ef5030aead618590387c1225c10af13ac120406549
+MISC ChangeLog 34144 SHA256 9e2e0ae314f4143acecf4913dc251e5dd039637e583b11814dea268affbc4c31 SHA512 ad66409fb5a444ccc385cbf6008b32ca37898bcbad722335987b3a84521c618ccc5f026c2fc55c59f1e49297d367c58aa98f8074391cf30a6b7f5fe0c98f11d5 WHIRLPOOL 0f2c05949de31b37597dfe7704733e628820f82997f9b7b160598db2f2421691f53b874bc9ffe488e28197a6f4fb74fc352f7dc599ac9b90d41836c0318948c5
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlFXbroACgkQ1fmVwcYIWAYlgQCdHP4GqRwL+6LLBiqhMi0vYR/a
-DPIAoKzRilf3hn/rXxeMS4t32KFn0qcW
-=7l0J
+iEYEAREIAAYFAlF9Jm0ACgkQCaWpQKGI+9RWFACeLb2q7bb+mBJptgnBWfW7X9RK
+rNwAn1Ylb2JCWLncNpAFOqGeI0X82LZQ
+=BpWE
 -----END PGP SIGNATURE-----
--- a/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
@ -1,125 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild,v 1.2 2013/02/25 09:18:12 zmedico Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 pam versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps debug pam selinux"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=
-	>=dev-libs/glib-2.32.0:2
-	>=x11-libs/gtk+-3.0:3
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:=
-	>=sys-apps/dbus-1.0
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.9
-# gtk-doc-am is not needed otherwise (no gtk-docs are installed)
-
-src_prepare() {
-	# Disable stupid CFLAGS
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	# FIXME: some tests write to /tmp (instead of TMPDIR)
-	# Disable failing tests
-	sed -e '/g_test_add.*test_remove_file_abort/d' \
-	    -e '/g_test_add.*test_write_file/d' \
-	    -e '/g_test_add.*write_large_file/,+2 c\ {}; \ ' \
-	    -e '/g_test_add.*test_write_file_abort_.*/d' \
-	    -e '/g_test_add.*test_unique_file_conflict.*/d' \
-		-i pkcs11/gkm/tests/test-transaction.c || die
-	sed -e '/g_test_add.*test_create_assertion_complete_on_token/d' \
-		-i pkcs11/xdg-store/tests/test-xdg-trust.c || die
-	sed -e '/g_test_add.*gnome2-store.import.pkcs12/,+1 d' \
-		-i pkcs11/gnome2-store/tests/test-import.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	G2CONF="${G2CONF}
-		$(use_with caps libcap-ng)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		$(use_enable selinux)
-		--with-root-certs=${EPREFIX}/etc/ssl/certs/
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		--enable-ssh-agent
-		--enable-gpg-agent"
-	gnome2_src_configure
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-pkg_postinst() {
-	use caps && fcaps 0:0 755 cap_ipc_lock "${EROOT}"/usr/bin/gnome-keyring-daemon
-
-	gnome2_pkg_postinst
-}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and Flameeyes
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-# Requires versionator.eclass
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capability got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missing kernel support."
-		ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
-		ewarn "where <FS> is the filesystem to store ${path}"
-		if ! version_is_at_least 2.6.33 "$(uname -r)"; then
-			ewarn "For kernel 2.6.32 or older, you will also need to enable"
-			ewarn "SECURITY_FILE_CAPABILITIES."
-		fi
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
--- a/gnome-base/gnome-keyring/gnome-keyring-3.8.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.8.1.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.8.1.ebuild,v 1.1 2013/04/28 13:38:52 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes" # Not gnome macro but similar
+GNOME2_LA_PUNT="yes"
+
+inherit fcaps gnome2 pam versionator virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+caps debug pam selinux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=app-crypt/gcr-3.5.3:=[gtk]
+	>=dev-libs/glib-2.32.0:2
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2:=
+	>=sys-apps/dbus-1.1.1
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
+# eautoreconf needs:
+#	>=dev-util/gtk-doc-am-1.9
+# gtk-doc-am is not needed otherwise (no gtk-docs are installed)
+
+src_prepare() {
+	# Disable stupid CFLAGS
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	# FIXME: some tests write to /tmp (instead of TMPDIR)
+	# Disable failing tests
+	sed -e '/g_test_add.*test_remove_file_abort/d' \
+		-e '/g_test_add.*test_write_file/d' \
+		-e '/g_test_add.*write_large_file/,+2 c\ {}; \ ' \
+		-e '/g_test_add.*test_write_file_abort_.*/d' \
+		-e '/g_test_add.*test_unique_file_conflict.*/d' \
+		-i pkcs11/gkm/tests/test-transaction.c || die
+	sed -e '/g_test_add.*test_create_assertion_complete_on_token/d' \
+		-i pkcs11/xdg-store/tests/test-xdg-trust.c || die
+	sed -e '/g_test_add.*gnome2-store.import.pkcs12/,+1 d' \
+		-i pkcs11/gnome2-store/tests/test-import.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		--enable-ssh-agent \
+		--enable-gpg-agent
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+pkg_postinst() {
+	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+}
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.215 2013/04/25 20:00:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.216 2013/04/28 12:36:35 pacho Exp $
+
+  28 Apr 2013; Pacho Ramos <pacho@gentoo.org> -gvfs-1.16.0.ebuild,
+  gvfs-1.16.1.ebuild:
+  Fix deps (reported by shiznix via IRC)

 *gvfs-1.16.1 (25 Apr 2013)

--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@ -9,19 +9,17 @@ AUX gvfs-1.2.2-expose-archive-backend.patch 1607 SHA256 a6cd0f6b848e1943f9121cf4
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062 SHA512 e3dbcfc257a5ce2ecebc2011317717d853f8069fbdca1c4bb81e90c79acbe3661f64c68321a1d209fdb3584e09efaf3c655d10b8a586f4a9be3d51d62ada9662 WHIRLPOOL 6c417af80339cee72de22c6ddf055057eefabc059c944a848283566ec20ef4785025b72d79537002254bd4a4675d68d892f7aea435b992245d5b22db689ebb97
 DIST gvfs-1.12.3.tar.xz 1361968 SHA256 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2 SHA512 1b2a2947447fa0917c64a69e02c84a1f870e88fb12c65169a86fd54165e5d4df671e324653ce1d1f123e03187f284e645ef6d4311000b9e88ac2aec055d48a58 WHIRLPOOL 07b21d6ddbb2388944e88af5057d5c027ea9cc4848e6901d74f428498cc4e87db4b80846ca2914802777c32b536bb220a7a8a3c0eae3a8e1f9373a032cd4511f
 DIST gvfs-1.14.2.tar.xz 1466384 SHA256 c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc SHA512 f7f4fa2b69d51f087d0f5094c4a170363cad2cd86c6de94241bb4fd9adfcde48ee34c21f5e3e761ff13ba39d842f886dbabba5cecb466dcbae9a40c9b7976a58 WHIRLPOOL dff3f4fc334cb5f3ccd82260fd0feb7c57da8d588e5e9fd5ec5c8563dc52922fe58ff6ac3de85af94d7c7ff6d32acc85edb9def6db90130ef75681566222cde4
-DIST gvfs-1.16.0.tar.xz 1493176 SHA256 b0cf3ec2be053ef42a25a34c64b90fdf28a5334c595452ee2e246734696dd55e SHA512 0d03534ff084d0f8dbad0fc336e3c9bd62fa557189ca61ecd629eb3450d532308b198d9d9c59c82c926d1b7d0bf01b0a9e6bcd4591bf317c0fa30793d26fc038 WHIRLPOOL cab313c6f043a58b0f1526f8a53a504d38402c8cd30141a5c048b92d5f3d611f868fb0e58994682a728208f92bf1418c6637376b0690afcb43902c1fd532a4ef
 DIST gvfs-1.16.1.tar.xz 1493260 SHA256 e7ec47547ff8029a2e8d81533bdfa870fe4a547c9d7c4e1e946d42d38970b0ac SHA512 1e30efe1dafc9bee0916063ee39808a18e2e8e15ae28ba9f9aa49a39dc83d574dad926917dc82fadf0386b0370ac3ad294dc602df36c28f265dd4e75f85de772 WHIRLPOOL 6872730e4ee331fa998b3cce27495ddfdfb64c43a65a3904c58dbe9f2377c93350d08c729c4729efc3b7a19ed072ce988827dd2d8f1c6b3fa8b407708e9c6100
 DIST libgcrypt.m4.bz2 1526 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 SHA512 fe7916d01efb1d14c4d84ed37f3b53b04d3b005cb04b603bded8d24e147fe69a4c0823164483dba3bc95cf540eaf93a0c0ad59f29f8e1edbae9566a81be5900d WHIRLPOOL 6baa8ed005a691fb1f31ac420d801d20a1611519a38749718dcf3956557f40a058c24b988d20534a62084fadd4141c44893cfa751ebf8011cf55d83c759868dd
 EBUILD gvfs-1.12.3-r1.ebuild 3361 SHA256 d7dec2b44edda8d1f96026583b737539b328dc6aee9a99e50b3f2d87ffdede9c SHA512 ebdd5ed06ad17c47666d51d993ff7d5b00ba42335756f2ad75ab0962d0e3174d6472439171221f7e5442b98a8ac7a70610c1d54dd09d6eb06d7d4a03f1047116 WHIRLPOOL 4a59239fed3d82ad2940547584e64d4e41229edfb54e7984177529939fa19b4af8ac76b130d2637e5178028e4be8530a635cf19035e9bf4b6b5c970369328c74
 EBUILD gvfs-1.14.2.ebuild 3818 SHA256 54d24deee019e14d06355b1430960d64e51fbafb7f14e2e84e38b48b0001ae0e SHA512 035f40bec065c8727a3223b3b86603ffab3ac2560aa94048d0c95ec1d466e9f95fe9589769c2103499957e19f8571d06db5e11eb215c7f84ae974f0aaaecf330 WHIRLPOOL 8e4d470b5750f6eb2aef5c07ef40dfb4459640d7ef696223b8b1a36377cf60240983570eb7ce7347b7b0e37a1a30f09d17f28d5f544a4f40eec600de9bc171b0
-EBUILD gvfs-1.16.0.ebuild 3671 SHA256 c903a127bcef46bcd270e74fd35602f7ab8b11a09416a519377750fb7a5dd4a8 SHA512 59db0d9aa501b09bfad3ff21cdbe76b97beccdc8e3c46285eedcfa0001cb5d1b8a30f909a05c5031d5099b4227f30f03edb12ca23e0a5301b3a403f33a123853 WHIRLPOOL fc63a528f723d9d556c1d844798f2e343aaaa61b9793aeedddac2ba5d986bf20446f73ea9fe4d5256f3a2bdaedf89b9baf73f1a64361492871f0692973a97227
-EBUILD gvfs-1.16.1.ebuild 3396 SHA256 52e0a6b7a29120e73d31a088a27eb138a1fe23cb11ec33d262635925ae3de34c SHA512 a52e29a1401d0f9d14e57c78b3759ac19c1d7b159096acb406e85fd0e2d01f8f5255b1367589c46a4291ff0c405aff43996b4542bc81613604dea281df109d4f WHIRLPOOL 526f2e903d82b2373eff5c7d6909f659b83a0f5399d3d5dbaf17c59c37716562e888faac38e23bbddf76647e1837c07b145abcfb090252df5f731e1312308b1b
-MISC ChangeLog 30830 SHA256 c88285027e4076737faef5335f964616161cd0e514c66ac7548f1d9b9da9dff0 SHA512 d6cf3721e45921d7c88c6e54b2b0aa7983d5c1743dee3a886b6ec0c391238039d665220307e22e2cab57cf2afc674f45bf861bedd31604673894b51410b7374a WHIRLPOOL 5254922a32d6235be17a8a39a37fa64cc1e0aae42cc456951f4d4f0489751731522a2943502078195968d73d34927d3e8b81b29d61a08d5addd1665bce8189f1
+EBUILD gvfs-1.16.1.ebuild 3389 SHA256 dfd47724f5942ebca89fe666301f7acca82b21a343ecb5ade99556a1c68ae866 SHA512 8913bed8164176f900713cf388ded5f76ec1155f1c0d5d27c1b2a0f074470138e9757dc10d75fab92633fef31361e387b978c16b47669b444bdf77002897f5e3 WHIRLPOOL 4d48c27fb50789a8fc6f13ea817d270ad19da079be32dd49d7aca315e9d47cfa5f7feb8b98b567951d29f81828df2f7e13af55fc1d20130259ac88d01c052592
+MISC ChangeLog 30961 SHA256 1399aa7c032017094b37f5e994e9bf0c90db689c2735d1a798d6129f58a3707a SHA512 86e46c4671a05d9481938a3e8c4a9de2168d8bd851e2a04dc061e7bf1887d5a44f4984540e7ba64a3b5f90aae0f354e8329c2f73eb0286f77ddbec37c0265587 WHIRLPOOL cc865038dd584cf98f7b0435a37211dc226ec26f07bf64219b3d37baa954b7d91eee327ea3a3ff2e84360ab45229d54be3d0450c21eb2bce277a58c0e666a5ba
 MISC metadata.xml 1440 SHA256 a02bc760008f281e624b5bb457002578368cbd4a6cd6c0022a8e6e7e7dda9603 SHA512 93e1c99b3108f240d9543a22c9ef67a1ab6baaa25d99bbe721d6fcba7e939b40bacabe727310d2ecda1200e3612c88a7245c55dfb2a3e25ef5afc20b69b59863 WHIRLPOOL 6c3357fadeba19ff338ece726468464973b74a37b40aeba8925ccf6eba41b46d8e2c62bfca58d4b7f83138df248cd4c0ccee418b66ab374d8eef045ba21d0717
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlF5i2MACgkQCaWpQKGI+9QJMQCfdVTEATk20BH17jlSTM5bAxJp
-yKcAn0Akz2+is/SmDhgBX3LFVZFnXFSg
-=NObt
+iEYEAREIAAYFAlF9F9UACgkQCaWpQKGI+9SMnACff1g09VYWkfkxtwZnOdO/hK+V
+lhYAnRT41CBStDIDb0+j3SAYdvBXWW92
+=Zd6N
 -----END PGP SIGNATURE-----
--- a/gnome-base/gvfs/gvfs-1.16.0.ebuild
+++ b/gnome-base/gvfs/gvfs-1.16.0.ebuild
@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.0.ebuild,v 1.4 2013/04/07 09:43:07 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gnome-online-accounts gphoto2 gtk +http mtp ios samba systemd +udev udisks"
-REQUIRED_USE="systemd? ( udisks )"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND=">=dev-libs/glib-2.35:2
-	sys-apps/dbus
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:= )
-	archive? ( app-arch/libarchive:= )
-	avahi? ( >=net-dns/avahi-0.6 )
-	bluetooth? (
-		>=app-mobilephone/obex-data-server-0.4.5
-		dev-libs/dbus-glib
-		net-wireless/bluez
-		dev-libs/expat )
-	bluray? ( media-libs/libbluray )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gdu? ( || (
-		>=gnome-base/libgdu-3.0.2
-		=sys-apps/gnome-disk-utility-3.0.2-r300
-		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34.0[gnome] ) )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.0
-		>=app-pda/libplist-1 )
-	mtp? ( >=media-libs/libmtp-1.1.5 )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
-	systemd? ( sys-apps/systemd )
-	udev? (
-		cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-		virtual/udev[gudev] )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-REQUIRED_USE="cdda? ( udev )"
-
-src_prepare() {
-	if use archive; then
-		epatch "${FILESDIR}"/${PN}-1.16.0-expose-archive-backend.patch
-		echo mount-archive.desktop.in >> po/POTFILES.in
-		echo mount-archive.desktop.in.in >> po/POTFILES.in
-	fi
-
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-	fi
-
-	if use archive || ! use udev; then
-		# libgcrypt.m4 needed for eautoreconf, bug #399043
-		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
-		AT_M4DIR=. eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	G2CONF="${G2CONF}
-		--disable-bash-completion
-		--disable-hal
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
-		--enable-documentation
-		$(use_enable afp)
-		$(use_enable archive)
-		$(use_enable avahi)
-		$(use_enable bluetooth obexftp)
-		$(use_enable bluray)
-		$(use_enable cdda)
-		$(use_enable doc gtk-doc)
-		$(use_enable fuse)
-		$(use_enable gdu)
-		$(use_enable gphoto2)
-		$(use_enable gtk)
-		$(use_enable ios afc)
-		$(use_enable mtp libmtp)
-		$(use_enable udev)
-		$(use_enable udev gudev)
-		$(use_enable http)
-		$(use_enable gnome-keyring keyring)
-		$(use_enable samba)
-		$(use_enable systemd libsystemd-login)
-		$(use_enable udisks udisks2)"
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install
-	dobashcomp programs/completion/gvfs
-}
--- a/gnome-base/gvfs/gvfs-1.16.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.16.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.1.ebuild,v 1.1 2013/04/25 20:00:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.1.ebuild,v 1.2 2013/04/28 12:36:35 pacho Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -42,7 +42,7 @@ RDEPEND="
 	gnome-keyring? ( app-crypt/libsecret )
 	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
 	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34.0[gnome] ) )
+	http? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34.0 ) )
 	ios? (
 		>=app-pda/libimobiledevice-1.1.0
 		>=app-pda/libplist-1 )
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@ -1,6 +1,21 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.79 2013/04/27 00:33:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.83 2013/04/28 16:47:56 sping Exp $
+
+  28 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-0.2.0-r1.ebuild,
+  +files/gegl-0.2.0-introspection-version.patch:
+  Use upstream patch to fix introspection version (bug #416587)
+
+  28 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-0.2.0-r1.ebuild,
+  gegl-9999.ebuild:
+  Move perl from RDEPEND to DEPEND (bug #415107), thanks to nzqr
+
+  28 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-0.2.0-r1.ebuild,
+  gegl-9999.ebuild:
+  Migrate to vala eclass (bug #467396)
+
+  28 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-9999.ebuild:
+  Drop patch from live ebuild (bug #460778)

  27 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-0.2.0.ebuild,
  gegl-0.2.0-r1.ebuild, files/gegl-0.2.0-ffmpeg-0.11.diff:
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@ -7,6 +7,7 @@ AUX gegl-0.1.8-cve-2012-4433-4757cdf7.patch 2118 SHA256 b9d0d3a304525af4524d1865
 AUX gegl-0.2.0-cve-2012-4433-1e92e523.patch 2365 SHA256 0351770b65c4620868e575ba8e3f5d4e46b09fcf83cb52231ecdc42b2bc96bac SHA512 f27c89ac3b7742da348f75190cb1d5ad2569ab71a188b42a64e23a6254489770c701714e8de49602fdb8e8f063c3c9130abac330dceacee15603098bc1b70348 WHIRLPOOL 107f7ae3d7aa6eac22a5c127cc2dcc1387f808bbab4254cb55aebbc5f1e70be2dbf9b40d6b79c2b62fdc5edde5f2384164ec3b441c281829ba89b366131c873a
 AUX gegl-0.2.0-cve-2012-4433-4757cdf7.patch 1952 SHA256 6ecb465e6fc060417b353418c23c1d97d664666f652f2c4967d7fa6e0125fc84 SHA512 c48ed73b4a042263464819981e5f9fb0c0fc7abe8291840da9e839833a8cd548077fa99fed4b523a5bbac120d4336d2007a243baa359b40a0f0e3ff633bffa57 WHIRLPOOL 34287b2ae70f0d2f61c1aa817e767b3db6041857ce6a09a85371177ae31575d3b73d1f2efe6dccdb6776bdbf9cc518a06e7ed77662eeee85fe4658bb13815dc7
 AUX gegl-0.2.0-ffmpeg-0.11.diff 2022 SHA256 79b2385d828a6e9506f715b423bd5fd1e0ad3d62f3f02bdfe336952f1f3ca46f SHA512 b2d56e4abaae76d7995e8e454b023a5f1e4e74e3bf1f3cbe9663040031762941c3947db5de312ee516733f23e03d72d779794ab7f206e7334b14e298c0ceb493 WHIRLPOOL 2dbd04451a4372289bed0f34fdc8283b85b55bd2d75c32c9b08507a7404e5f5d4274076df300f8caac25df31361f855ca30c19df4d45683136878ebb9ef5603a
+AUX gegl-0.2.0-introspection-version.patch 1233 SHA256 7238b314bcefedb0cc6e9d65547c0b9cf81466b3ef35ba179607c10f81381b8d SHA512 539508215c769a5571ba0b798ab001d37756a0f264817394282ee3aa9d46ca83fe10a3d37ee8915afe79453d1e72e7adcb928fbb54a22229a06cf0a308095d23 WHIRLPOOL af6f735fce74d161fd3d8e758a38a18b1c65c1192fa7d67c2e10105ae9d0ece6bc771fee385aa76a1f28a089f952480d918e529da9d31b78a2210fed2197a48a
 AUX gegl-doubledestdir.diff 438 SHA256 a39da1569b510092ba345f52f33486fc246165ffd0f84d0129d29e77a26ccc2b SHA512 dcfd999de171ebc80a4016d380793ea5bf39bfb4839715acd01a26edd28dea0a81cc31e92343934a6940f5aece8b2fc476f3328ba45343a3995e79040560b131 WHIRLPOOL da248cfb52a39157d0ef010121182151a00ad684e354c8d3fd2110d64344ca80f77acea5cf0c22ee6467a63ca43d6c2efc846d74137d1a9262d56baa042bad1f
 AUX replace-imgconvert-by-swsscale.patch 2154 SHA256 d0470dd22814afffbbb2fffa7fc9488129b9cae715f26c8330eea913550885dc SHA512 e988ea43516b5664ed8e359e1d964875916540f617b810e958f0644efc98f41abaed6c6cac41c049524dd85decf8819382fb49a5ddd3df42c12747a16fed79e1 WHIRLPOOL 0f28afaf5b9bedb18b178f5df9eddbfc6219899a189e16e15bbeed5da1d1417c55988cf1b6ee5da643fe7494c53f54c2d531cf2d543c94f03869279947b73ef0
 DIST gegl-0.1.6.tar.bz2 4118465 SHA256 a166225625eebfb57fd417c88cf1fa6e29b1d308d50ac3bd9ef30bad9f3726d1 SHA512 dc1cd83d822fc52293357601172b066eca842b74b459b0efce2348a60cfd57116e37b4ee926829fb7859355a48c2fee082fc057d72f2a8cf3f7de02e11247a5f WHIRLPOOL 1cd5cdb0714f79982918a8bb9ff9b653e242d1c472fc8b43b64042cefe905f225fd9499598ef9522dd871e629b87ac62b9f158e20df9eaf16a82b512e3402f63
@ -16,15 +17,15 @@ EBUILD gegl-0.1.6-r1.ebuild 2957 SHA256 0e86587d32b6387a9786db121602d5753a8f6e7c
 EBUILD gegl-0.1.6.ebuild 2743 SHA256 6829f93779057e10caf9a985556190e72ff64371511f952971f28c421dfa6884 SHA512 a5ee9f166ed68698c55e1a1da561536705c9c8282dcb949694eeae751dd31748972b943c2f4cab38ffde9caad12eeb60e45639e0cabffaa594e6006a87bfb3f0 WHIRLPOOL e6dbf18465bf4112dde66c20c4e87fe47634d119cc787db48390f2e6324fd76e93c3a1f6372c0ad4b7b3fd89d868ec3c5a04efb84c45f2782f782d5e79210445
 EBUILD gegl-0.1.8-r1.ebuild 3413 SHA256 c3a016c6ca5d9e889e68552c6af85b34718dbce5825949c8d4b1334aa0b3e759 SHA512 c6d7b97ec39b7fca698a5b2e2ffa4da2690a2b45630746920102e4e0e5f99ca43abb76cbb6b68786990be448bd0faf8ae984112aa881da6b2bad7316280f3346 WHIRLPOOL 01c3f567c5171dbe21eee204c587a588ee63c7cf848362d95a2c05edb4334de19fd8a80450369e16fb58d120e590bb4d574a5f83572fe3e1a6d5e8a7839ea743
 EBUILD gegl-0.1.8.ebuild 3215 SHA256 3eb7db2d937e0dc698bea674f40fc1b4bb810a8e40267e28eef7ac21a1f4b708 SHA512 34c57cb573ec2387b69128dd3a2b523f6ef8120f17e84c29a05961f88b75203b91cf53500f4e323aa41523c71cce4900486da06f3fe627ce1c87740fda046242 WHIRLPOOL c04c028d7d12c42f007ca31a8dc3ef18c99213c6a760e9802e92d42a2cfef6f47afa918eff29ae77539346b45ee223579fb6af08cca40226c7335daae6910248
-EBUILD gegl-0.2.0-r1.ebuild 3510 SHA256 f27060a197048acfff082d54a1733385a9b8ef44d4e479b25d9060d97d9561b0 SHA512 d4776a42d6aa36a9e329a38908582ae41ff9775904f0756ded6dc233102ad8c668d7cf1b0029aa65022a2a5ad9c89f35f07c887ae4596fce2eabb54987e0e559 WHIRLPOOL 8933efbe6c84de8a66a2abf3cb2aea2fe3d13a95e8be4a13a87a5bf23855f633bc0123c5314a4c69bbc9d08e5fdcf9b530dd7228e5b54677db5efcf130d65ecf
+EBUILD gegl-0.2.0-r1.ebuild 3622 SHA256 598a0cc88b750b39c221ba3727ea84f47d4ef0fade46764f98417c47393a5184 SHA512 bbd947495b60615e71d91a9d3a92bdf095021722908173ff824f74bf999db97cbe958cb71e2aee78b1c4d685b9525d67c12cd9b2ccfb9649c0e3b93c232e923d WHIRLPOOL d4dafb13f7e6f5e96e75fa35403551cf54d3168fcb27a916964c1e5c0c5f7482db98ce47811fb30d33fe48b94c4cdebdc4b4f4a52763a3efb94d9d9a5bdf529d
 EBUILD gegl-0.2.0.ebuild 3306 SHA256 5abb3122550e7d6ce38a19882448eb0585569506d6a9c111a9bddb98f54114be SHA512 d63eaf38b8d071009b561040d169071f53d00ac003cf3278d4a84dfb665ac2958d0e833702d6ba3237685347a3bafc61f1bb8ab4c316cc90002724ddd61f16e8 WHIRLPOOL 41ef434bf73b549292a98e8c2b7c3bec589820626e93a5e1943d6767398342d5446ae119c281f8d517bbbb18161caae2e2b494bacb7d3956ad9a971289fc7cba
-EBUILD gegl-9999.ebuild 3213 SHA256 64924f23669fe5a6ea8579f30eeec24df6f3f05a852ee52cea6de7aa591a3fa8 SHA512 53377b14f7d843bcf7ef15a6cbc7222927c9d362102544c6bba056fccc0815df3e221eeeafc1e2d982279b0a010c95698f7a84d4ec0f44a9b87e17aba40da221 WHIRLPOOL b1612ce56475dfd9674966e4353455e60abe90eb1c5bc2034eb682d77539f8e978c6f9b7d6109d9ae9162427513411852acb18b731ec363a933df8848f2b48f3
-MISC ChangeLog 11134 SHA256 48c97af4e01376e5f549840626090bad3afedc65c5a6bedb9e48c8e431269a53 SHA512 4ae91fd60a54cad4ae7ac3ce142fa7c61bd7125569ff2300b37030059679e54c8cb9885d1737657c540074c87451c696ddc394a200db2ee18321ed90e49fd6a3 WHIRLPOOL 9ca71cccf4131462a0d530de06b168e98d29d4d8a9c5225ab3a1305d3102f1bf4ede1871621323747bfc491c6dc4de0fe834474a920dad109b606df28bce7e33
+EBUILD gegl-9999.ebuild 3168 SHA256 aec89937b0e4d17260a39821be64d4b6089479cc1aad3a6ac09a1eb1360722b5 SHA512 3ad32fa66b6f36be22f23e354a52f27fb8ab507db4fd1eb74eba5e3ba067d15519559c067a4801ccbfda28d3e4f5870206c4236b59b9fc225a267f2765e76f6d WHIRLPOOL 762b9157b43045de85fec0a4da5b8bfa995f75b9aa2d089db5769ee3f31f0a2241bffb524d4c4c73ea45d942558cb8763a5787e5206a2e49d679f48b907cd4f5
+MISC ChangeLog 11731 SHA256 46a972bf4ebffeedd25f95408cbf38453cfe57518f96f731e387ab584102cfc8 SHA512 c4ee2ed6ba0b27a8e5db7daf17ae90902959dbd52314234495154850c2453f622215e30e559b3f1fb2905d980243165f418237f968b3c7a5f3914f4575905c62 WHIRLPOOL 608c8e4feb3626676dd5388df7f09cbc8789e572dcfed15543f23a8506f12771d9160b3bc98710ac5015a72254ad53cd306b6fc343b7641edc5d6cc05b08d078
 MISC metadata.xml 546 SHA256 76148af87ef72e06a1daae6476a80a97058f4f9e5d115c0603e156aeb3fd492d SHA512 0aab6757fb995142f0407c2b9aa35fdd7d18566541ca2dd06134451482287d0fb9b3fabf3b744644edba43d7d5b5838558c622792c041144d1b160f44cf48fb4 WHIRLPOOL a073c9fe5d73789ed6ba380b1c0337948300765d1e509f0097be34f1bdbbdebf8863608dbdfa63b0430695d9f22ae0c3b2a2513cba1520a6fc4178419854bee5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlF7HRgACgkQsAvGakAaFgDOvwCfZXge2hNWmizOVT7i/B4L63yC
-GJIAoNZY5guHoZ5teINTFxvXwM5aOGXN
-=cWLJ
+iEYEAREIAAYFAlF9UuMACgkQsAvGakAaFgArSACfcQXOzuAvfPFZOmdII8fnh7DC
+wXgAn0p70X5l+EMvB2U0alZGh65wKclO
+=lZW9
 -----END PGP SIGNATURE-----
--- a/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch
+++ b/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch
@ -0,0 +1,31 @@
+From 35469116fbf0b398d748f8116e4dcc8bdaee12c7 Mon Sep 17 00:00:00 2001
+From: Jon Nordby <jononor@gmail.com>
+Date: Thu, 12 Apr 2012 12:10:05 +0000
+Subject: gobject-introspection: Fix build after 0.2.x version bump
+
+Remove hardcoding of version numbers so that this does
+not happen again.
+---
+(limited to 'gegl/Makefile.am')
+
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index aef4c33..43010ce 100644
+--- a/gegl/Makefile.am
+++ b/gegl/Makefile.am
+@@ -118,10 +118,10 @@ introspection_sources = \
+ INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS)
+ 
+ Gegl-@GEGL_API_VERSION@.gir: libgegl-@GEGL_API_VERSION@.la Makefile
+-Gegl_0_1_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
+-Gegl_0_1_gir_CFLAGS = $(INCLUDES)
+-Gegl_0_1_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
+-Gegl_0_1_gir_FILES = $(introspection_sources)
+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+ INTROSPECTION_GIRS += Gegl-@GEGL_API_VERSION@.gir
+ 
+ girdir = $(datadir)/gir-1.0
+--
+cgit v0.9.1
--- a/media-libs/gegl/gegl-0.2.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r1.ebuild
@ -1,10 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r1.ebuild,v 1.4 2013/04/27 00:33:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r1.ebuild,v 1.7 2013/04/28 16:47:56 sping Exp $

 EAPI=4

-inherit gnome2-utils eutils autotools
+VALA_MIN_API_VERSION=0.14
+VALA_USE_DEPEND=vapigen
+
+inherit vala gnome2-utils eutils autotools

 DESCRIPTION="A graph based image processing framework"
 HOMEPAGE="http://www.gegl.org/"
@ -16,8 +19,6 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-l

 IUSE="cairo debug exif ffmpeg graphviz introspection jpeg jpeg2k lensfun lua mmx openexr png raw sdl sse svg umfpack v4l vala"

-VALASLOT="0.14"
-
 RDEPEND=">=media-libs/babl-0.1.10[introspection?]
 	>=dev-libs/glib-2.28:2
 	>=x11-libs/gdk-pixbuf-2.18:2
@ -37,15 +38,15 @@ RDEPEND=">=media-libs/babl-0.1.10[introspection?]
 	svg? ( >=gnome-base/librsvg-2.14:2 )
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( media-libs/libv4l )
-	dev-lang/perl
 	introspection? ( >=dev-libs/gobject-introspection-0.10
 			>=dev-python/pygobject-2.26:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40.1
+	dev-lang/perl
 	virtual/pkgconfig
 	>=sys-devel/libtool-2.2
-	vala? ( dev-lang/vala:${VALASLOT}[vapigen] )"
+	vala? ( $(vala_depend) )"

 # tests fail in various ways:
 #   see bug #362215
@ -58,6 +59,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
 	epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"

+	# https://bugs.gentoo.org/show_bug.cgi?id=416587
+	epatch "${FILESDIR}/${P}-introspection-version.patch"
+
 	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
 	# fix OSX loadable module filename extension
 	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
@ -66,6 +70,8 @@ src_prepare() {
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
 	fi
 	eautoreconf
+
+	use vala && vala_src_prepare
 }

 src_configure() {
@ -73,7 +79,6 @@ src_configure() {
 	# libspiro: not in portage main tree
 	# disable documentation as the generating is bit automagic
 	#    if anyone wants to work on it just create bug with patch
-	VAPIGEN="$(type -p vapigen-${VALASLOT})" \
 	econf \
 		--disable-silent-rules \
 		--disable-profile \
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@ -1,10 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.2 2013/01/23 23:09:41 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.5 2013/04/28 15:29:57 sping Exp $

 EAPI=4

-inherit gnome2-utils eutils autotools git-2
+VALA_MIN_API_VERSION=0.14
+VALA_USE_DEPEND=vapigen
+
+inherit vala gnome2-utils eutils autotools git-2

 DESCRIPTION="A graph based image processing framework"
 HOMEPAGE="http://www.gegl.org/"
@ -16,8 +19,6 @@ KEYWORDS=""

 IUSE="cairo debug exif ffmpeg graphviz introspection jpeg jpeg2k lensfun lua mmx openexr png raw sdl sse svg umfpack v4l vala"

-VALASLOT="0.14"
-
 RDEPEND=">=media-libs/babl-0.1.10[introspection?]
 	>=dev-libs/glib-2.28:2
 	>=x11-libs/gdk-pixbuf-2.18:2
@ -37,15 +38,15 @@ RDEPEND=">=media-libs/babl-0.1.10[introspection?]
 	svg? ( >=gnome-base/librsvg-2.14:2 )
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( media-libs/libv4l )
-	dev-lang/perl
 	introspection? ( >=dev-libs/gobject-introspection-0.10
 			>=dev-python/pygobject-2.26:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40.1
+	dev-lang/perl
 	virtual/pkgconfig
 	>=sys-devel/libtool-2.2
-	vala? ( dev-lang/vala:${VALASLOT}[vapigen] )"
+	vala? ( $(vala_depend) )"

 # tests fail in various ways:
 #   see bug #362215
@ -54,7 +55,6 @@ RESTRICT="test"
 DOCS=( ChangeLog NEWS )

 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.2.0-ffmpeg-0.11.diff"
 	# fix OSX loadable module filename extension
 	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
 	# don't require Apple's OpenCL on versions of OSX that don't have it
@ -62,6 +62,8 @@ src_prepare() {
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
 	fi
 	eautoreconf
+
+	use vala && vala_src_prepare
 }

 src_configure() {
@ -69,7 +71,6 @@ src_configure() {
 	# libspiro: not in portage main tree
 	# disable documentation as the generating is bit automagic
 	#    if anyone wants to work on it just create bug with patch
-	VAPIGEN="$(type -p vapigen-${VALASLOT})" \
 	econf \
 		--disable-silent-rules \
 		--disable-profile \
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.467 2013/04/05 22:02:10 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.468 2013/04/28 13:47:45 chithanh Exp $
+
+*mesa-9.2_pre20130427 (28 Apr 2013)
+
+  28 Apr 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +mesa-9.2_pre20130427.ebuild:
+  New snapshot.

 *mesa-9.2_pre20130404 (05 Apr 2013)

--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@ -20,6 +20,7 @@ DIST mesa-8.0.4-gentoo-patches-01.tar.bz2 2380 SHA256 bad7443e7163b87b3c14f8f565
 DIST mesa-9.1-gentoo-patches-01.tar.bz2 1162 SHA256 f068c3ee3a97da8107ee1f96801e92076ad87224086c97c42ebca2cb0b7407ac SHA512 cc55fa3eb4ec66eaba8f441687942520304556d5ead6cf08cdbf0d23efbc271c71ab728de803aa992a1ee5f0f9c231ebc638a09782a49b738e52b89a8468981a WHIRLPOOL 1483eccaeb918bdb68ec493ac925d21c366d26ad7a222d9fe4f7fa44724fd7183079e42f42ba8e85cb7f4fd15b3a0c091cd477954e85071b5f562f4fe0356113
 DIST mesa-9.2_pre20130404-gentoo-patches-01.tar.bz2 14890 SHA256 0e9d0c707494ae96a39e028659c4a013d11110d19ecb791a0a999222ee49885f SHA512 1eec47fc3a7b3511d64634350b51cb646fd3272e3b713c0e59a4a09dfa9cd8d56fe3a75423e6b31b69b6b0c73f86ac3a444e9a296296e2cb2608bfd3cb96a7fd WHIRLPOOL d01f6c022693aa308b7376092fd5f6f119cb182ee8fa15e8cf6b3035a6a292a9ee676b8f545f8fdfa5674625a9cfe5b86c25a3936b6c82c9c08627d424aa7b7f
 DIST mesa-9.2_pre20130404.tar.xz 4655504 SHA256 59fd8b0ab0adf35949a8111d5d535969b9d741b0a9bcaab3a8b73c59a51652b2 SHA512 f82bcaf5aad872666061029ee098c553784f868ec24612acb362337d3e5174323edff975886b5ee9517d50f2df08c9ebccbafad11850bdad95115725a9beeec5 WHIRLPOOL bbc423dcbe3a4ebdd1fe381a526f3aff5bd609b2d50354ff0f8b957f4d66c12cd108f1becf7a9f1d0a3d836ce5379bae3eae3882d6877f0c29d78898bcfee379
+DIST mesa-9.2_pre20130427.tar.xz 4793628 SHA256 288e2f284c6933240654ef70a1957e515bb5d0b58f73add52e3487c19c180f7a SHA512 653cadd8003a1345b19485a24b8cd01f99f327dc34722e81827d7d67e0d79995ed390e20524b29dab43581d7feea5bbb8562b0f77addf9384c0634b1150d619a WHIRLPOOL ad0a8b2215869c3de0fcccaf9396dda3179eea7a8fa70e5d656b8e2a5b5cfff8c1c097706036ec9a9b84a73989458c3589da6cf7038560d5144ba96bd321136f
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 0539d7b38201da07040eae24c996346d5e3fc2c9c2cd7271a91886bbfa8a503c SHA512 e87083af5e10b923863369f225a3791adb91c085933aea7c449f879510a3202c63b849abc89b272ded7b90428413ec5480cf14d101eba3756b8d2603d8798d27 WHIRLPOOL 722c321abbc61ba2ac5f7f727b370d760ab17c0da0baddc353aa45acfc874f762f68066010b451f7e048b7f9f50b5a59d88eeb6f0cedf9159ac4efb54143f7ef
 EBUILD mesa-7.11.2.ebuild 9981 SHA256 f0c47c532ad67ed7fc2abe30eecc727bba71bbe8fc302df4920ef6ddee6d5776 SHA512 6c3968a4bb3601dd9dc8ec4ab415cd3df11e6505e9327ea66d62594337f27bfba65cac00a262ad6066b5fb49ec8b10217cdb66f139123bc254a1582c78925a30 WHIRLPOOL 0ddc6b9fe995216db9b4611e5a97e3cba1dc7a08a3a59e0ce1706495643f89eb3d6b12fbc41b42db4b092ece690ba1c90464df29b09f00cd79a124faa6da5c89
 EBUILD mesa-8.0.4-r1.ebuild 10843 SHA256 e2d5aa6a67796611e3e2eddd97f8be407b2aa04cf7f70c1a874084d269f37331 SHA512 291e02e7990ae4eb8fe7394e1eefda0493b9dd4f5439720ca3989a935b7448ee3ed58e95b8e187f4839b7466f4b0974796d9180498de487deb992ecde09beda9 WHIRLPOOL d4724d1a98f4ab09e6982e75e1f986d7f2b8fb1c67c7b0d269c8df3fd03f9271e9e9f9ec36b194240bdccd58d4f6a07842468e68f1600bf6f0164eebe164a140
@ -29,5 +30,6 @@ EBUILD mesa-9.0.3.ebuild 11065 SHA256 b2fbbde969886a0cd94624d772bf22f908c72f8ea0
 EBUILD mesa-9.1.1.ebuild 10990 SHA256 95e5c318bde526b82c419737bc73d451be47357a1607ce6faccc85a1c729256a SHA512 0bf60745a83c931eb5b208460f4460f58b0081a32a463b1940c54a061be9917aafc6e6c88d8f1c1413a8802939912e5a74c8557cc163b4b918b7a430a06bce92 WHIRLPOOL 0dc3faeca905e87d25b426d3c5530cfe75865151699a53eb5e30f52c504bdd5554f33c27eee35e96fcf16212f069820bed1cc2f3fd06e226ab234af1b3d876fe
 EBUILD mesa-9.1.ebuild 10988 SHA256 97e819e9c0b614157c773b9d0209ff66b1a3af4a28a7437f4eb5b1feb44e981f SHA512 71c1654787e4b6cdc925eea13901687c8ca7333766c629e236ba3deb46eb0ff063dc8621a0d3fe164f5d3b80381efaa2ff8ccf40268b4ca346da115d903a1516 WHIRLPOOL b6e8fe21ed317b23e24b2c9e2693820906e74c3593f1b1d0f9f65cb3154a2d6dac96555616be629be8ad3a059ea955198703fa91c1dfb676187bae173351f8a9
 EBUILD mesa-9.2_pre20130404.ebuild 11003 SHA256 895e15b0a070ea1929d2336d8b6da3877d63468a47f0f57316ed4652c67c7d9d SHA512 0ba8c8232ed32080db4145f96460dd5897bdc59816eeea4d2526e16aa8aa1f56593276cf6e16e4ace9b5980ece46faf89473451153b2ee1201125d75c0c28d13 WHIRLPOOL 5f7bd3f515b2e9d8a05e981380f8f9dea1d8fc6a1692e06e70e0a4ea114a3b7f09e1408d7f6919ee3413b2d2f7ec72d2ddfb2204123cf7868c713db86ea240e8
-MISC ChangeLog 75896 SHA256 7c972eade2730b43c09f16db1862de8334aab442cad3703818ab9b150145746a SHA512 82b2429a588bafb921f121098f318dff762afafa511ae1cf71b965fcee3172fb604036d71eb0519249e873ae664ffb324f62ce3d1fce479d28443ca6ba708372 WHIRLPOOL e304243b0911a5cdb9fb117c087b8214a8475f47209ecfd5e204758981313cb9ec24b1a6f9c9af2998aeb5f8a4dd287c4f18c78d47270a179fe6b2c8ea108eae
+EBUILD mesa-9.2_pre20130427.ebuild 11022 SHA256 8816a73fa8ce96564cf744daf3ecebf95deff70cd942db467eb004fffc494edf SHA512 6b3e510d32fe496cf5e884031e6a0861a542dcd1275a6057fa58487377ee66e00de2123ac162ce73885ea7376d972f5756a472607c74659a1fbf40b1acb15c49 WHIRLPOOL 46e17f573d7107bdca2d2d46ad30abec509b838ef9f26f0bcbffc6792e59da7d7aeb98b422415afe392020c33a3b26be662b40474048aa6742fa32c2ba449123
+MISC ChangeLog 76051 SHA256 edad75293a0d9cae18eb7d974abf6b47e9d9be38ced50dbd1dcdf57ebaf4030b SHA512 fe102fe6238eb2eb0536a4a4a21ca57b0b21d92ec3d6c10b470f1a1aef53a3211be5236c79140b5d8bd81eba34df06ba41c113fc6c7246100810975efe274943 WHIRLPOOL 9ea772fe338114591add969a9174aeba420b4d363d1e595480ac602028e76879b47055cc98a5185645b9af2709959bfb313cc73582d9524718a7b4cca4157e97
 MISC metadata.xml 1986 SHA256 7a518f3eb77d4b51d4dc5c5cd347bebdc2c849e43d17d1057afeae6be2dc13ad SHA512 1dccfd236b8b8e39560d5056281e774979cd8e2299623b34c2e0f0d9e1ae84906932cfbc0ab15bdd1effc1d82cb484ca4d23acf7cd8d849a33a82f9ee2c60b90 WHIRLPOOL 14e19a3782775f7ca600526f1bf852ed55e328585b7e095a8ab239697ca351f812bf914205166faf714420d179ac7e36b6d1b10fe74188a028c580d40640e31c
--- a/media-libs/mesa/mesa-9.2_pre20130427.ebuild
+++ b/media-libs/mesa/mesa-9.2_pre20130427.ebuild
@ -0,0 +1,420 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2_pre20130427.ebuild,v 1.1 2013/04/28 13:47:45 chithanh Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-2"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit base autotools multilib flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		${SRC_PATCHES}"
+fi
+
+# The code is MIT/X11.
+# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+INTEL_CARDS="i915 i965 intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
+	openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
+	wayland xvmc xa xorg kernel_FreeBSD"
+
+REQUIRED_USE="
+	llvm?   ( gallium )
+	openvg? ( egl gallium )
+	gbm?    ( shared-glapi )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
+	wayland? ( egl )
+	xa?  ( gallium )
+	xorg?  ( gallium )
+	video_cards_intel?  ( || ( classic gallium ) )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.44"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+	!<x11-base/xorg-server-1.7
+	!<=x11-proto/xf86driproto-2.0.3
+	classic? ( app-admin/eselect-mesa )
+	gallium? ( app-admin/eselect-mesa )
+	>=app-admin/eselect-opengl-1.2.7
+	dev-libs/expat
+	gbm? ( virtual/udev )
+	>=x11-libs/libX11-1.3.99.901
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	>=x11-libs/libxcb-1.8.1
+	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
+	wayland? ( >=dev-libs/wayland-1.0.3 )
+	xorg? (
+		x11-base/xorg-server:=
+		x11-libs/libdrm[libkms]
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
+	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+"
+for card in ${INTEL_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	"
+done
+
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+
+DEPEND="${RDEPEND}
+	llvm? (
+		>=sys-devel/llvm-2.9
+		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+	)
+	${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	>=x11-proto/dri2proto-2.6
+	>=x11-proto/glproto-1.4.15-r1
+	>=x11-proto/xextproto-7.0.99.1
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# It is slow without texrels, if someone wants slow
+# mesa without texrels +pic use is worth the shot
+QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+
+# Think about: ggi, fbcon, no-X configs
+
+pkg_setup() {
+	# workaround toc-issue wrt #386545
+	use ppc64 && append-flags -mminimal-toc
+
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-2_src_unpack
+	mv "${WORKDIR}"/${PN}-* "${WORKDIR}/${MY_P}" || die
+}
+
+src_prepare() {
+	# apply patches
+	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	# relax the requirement that r300 must have llvm, bug 380303
+	epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch
+
+	# fix for hardened pax_kernel, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+	# Solaris needs some recent POSIX stuff in our case
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
+	fi
+
+	# Tests fail against python-3, bug #407887
+	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
+
+	base_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use classic; then
+	# Configurable DRI drivers
+		driver_enable swrast
+
+	# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+="
+			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
+			$(use_enable gallium gallium-egl)
+		"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable llvm gallium-llvm)
+			$(use_enable openvg)
+			$(use_enable r600-llvm-compiler)
+			$(use_enable vdpau)
+			$(use_enable xvmc)
+		"
+		gallium_enable swrast
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		if ! use video_cards_i915; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if use pax_kernel; then
+		myconf+="
+			$(use_enable x86 glx-rts)
+		"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	econf \
+		--enable-dri \
+		--enable-glx \
+		$(use_enable !bindist texture-float) \
+		$(use_enable debug) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable osmesa) \
+		$(use_enable !pic asm) \
+		$(use_enable shared-glapi) \
+		$(use_enable xa) \
+		$(use_enable xorg) \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+src_install() {
+	base_src_install
+
+	find "${ED}" -name '*.la' -exec rm -f {} + || die
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf
+
+	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+	# because user can eselect desired GL provider.
+	ebegin "Moving libGL and friends for dynamic switching"
+		local x
+		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
+		dodir ${gl_dir}/{lib,extensions,include/GL}
+		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/lib \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
+			if [ -d ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/include \
+					|| die "Failed to move ${x}"
+			fi
+		done
+	eend $?
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+					insinto "/usr/$(get_libdir)/dri/"
+					if [ -f "${S}/$(get_libdir)/${x}" ]; then
+						insopts -m0755
+						doins "${S}/$(get_libdir)/${x}"
+					fi
+				fi
+			done
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
+	OLD_IMPLEM="$(eselect opengl show)"
+	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
+		eselect opengl set ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+	fi
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
+
+	local using_radeon r_flag
+	for r_flag in ${RADEON_CARDS}; do
+		if use video_cards_${r_flag}; then
+			using_radeon=1
+			break
+		fi
+	done
+
+	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for media-libs/vigra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.59 2013/04/12 08:14:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.60 2013/04/28 15:42:20 grozin Exp $
+
+  28 Apr 2013; Andrey Grozin <grozin@gentoo.org> vigra-1.8.0-r1.ebuild,
+  +files/vigra-1.8.0-doxygen.patch:
+  Upstream patch to fix #417667

  12 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
  -files/1.7.1-automagicness.patch, -files/1.7.1-fix-nosetest.patch,
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@ -2,21 +2,30 @@
 Hash: SHA256

 AUX vigra-1.8.0-automagicness.patch 1509 SHA256 55b89813234db00209c5c7c5f191861e6e3a0d363006acf972311ad4c3b0cd2c SHA512 a460f6764fff98e4e982863b2444f8ec832506b9c75695b721214ffde28831a8d9828985929eded72ad4f36b0963a6c93434313a3ec801ca244a66eda74cd55d WHIRLPOOL 385a939d54dc73ba50c9be7fc89defdf1d1c28a31fe33e16dfc459ce9d6231f3dc3671a80dbe3623bda56862e7af02975c9d911185d13f62f2d4d6d3ad8b7d36
+AUX vigra-1.8.0-doxygen.patch 2018 SHA256 8bd12921d90a14f91d22dcd6709a4cfe2e96b48d60352c9141c842f6b9c6bb88 SHA512 9c6bf091175fc02b56ec89e0f0211de7848202d950fdf81323da78cf9942bc2567f3af313ca17e02805403f0eb2e5e53e3e4335e5bf4dd9e209ccb292dc46085 WHIRLPOOL a464eee54d1c4bf21164500d30b34c026421ee06d789049a5ab21dff0b97c641fe15b67cd12c754652d043183bda460b0aac78e2b90ea63a911c6ad3d58cd745
 AUX vigra-1.8.0-gcc47.patch 951 SHA256 d5639c277d8e1504ea37a492c505dffe85db7285bed1a4de37a92698f2b1aaab SHA512 a05f7b2ba49b3241bba92b4483dd57c34b5ff51d71d274817e3967cf8346d5156d8179f3c0e98939ae6318c4b1cde2d5b9766a1e949a3c0ec991f8262551fbcb WHIRLPOOL 7bdce572c8ea23e887e2cd3e6f7a323ac70e09b1c2aeadcd7720ab38044643e3c9daefcc484eb03132a1d822ac3ab182986cd08d04408b8d8882159e58d0fdc2
 AUX vigra-1.8.0-numpy_doc.patch 990 SHA256 799527eba516607956030487b084f99f47037cc928a0ab84fec86bc9c00074f6 SHA512 da5f73c2d18735be63e3e1637b14fb243e509f6c0e7988acc75eccb41e41d3b16b2b8f241b21da517d0e7a454d6be58e1585015d9ce6908e6863bfe0790a5049 WHIRLPOOL a086912ef98565a2fa177f2de19bc26c699ccc2393a7d5d073152f9763913951457cf6e1557d1ddc12387cd126bfd74b5c054f663c09ecdff7a6e4d31aee49e5
 DIST vigra-1.8.0-src.tar.gz 29814914 SHA256 fc3a87d220ce23e79d163c58dd280fd534b81a870d2b140f1d072bbc82c78214 SHA512 a7de19bd7e24442fa488053ff16e54c7b1789a2836069a94a2f5a77e8dd7e9aa246667034d582eb98b1b396ffe4f860d1a87436f804d5256e916cc860c973de1 WHIRLPOOL 002d4cb5a74741db53e4215888357a68c39680632059f3e83e1f67e820a99a48b15c0f0ebde5aea8ba50dd53a7c80d4408c1dab32bdfeb6f1c3c95685597f3e0
-EBUILD vigra-1.8.0-r1.ebuild 3094 SHA256 4a9efef8fc6d258e92279cebea250069f99fe57ba5fb39b950d4001a5f4f3637 SHA512 11076c86766af283599626d9b4e36bd6730529388b1be6d35bac46e699d056dab67953ab6fdf9227a96a7803a36728086b570ed70c988e9cee5332eea6601d4e WHIRLPOOL 07c0d450fd5993cb2f5db831283b159a3fb3956cff056ab9abb188e84e6996ab2da86037bf3347867eec7fc2d1fb7b737bc93ea56b09b8cbe2711bf4ed2a88b2
+EBUILD vigra-1.8.0-r1.ebuild 3128 SHA256 4da063e377133eb2170f737618554cb3fecdeb1ebd7e59aba9a4fdec04ba82c6 SHA512 432332e4818b15ffc569ecdea0498c9b6fe4840ffe3dc2497386e322a0827ad448da226c748cec4828632ae6c10b2c277cde05f2bee4ac029ce36fe34dcf24bd WHIRLPOOL 9d328c9e12f799081d1948b7fbc57f5790a9ee88db30e30af67d790efab31657ed27f8b196cdf20beb353caabeb1dfc6341c3ec040f37185f6675064a4e5c3a6
 EBUILD vigra-1.8.0.ebuild 2782 SHA256 68381d99ea67f61481f8d98333a9ca063cf657b5ef4993e831847d960f631943 SHA512 eb5773a44f026424d9bb478d5fbfc6856c26db6b1167be9bbe189ffb3ef9053b4819db8931bee555686e8651a1faeb3805ca6320a0253f6ab0efaa4316eca251 WHIRLPOOL f5a0045c703cf5be8b09ee66320a736723a26e82448d590a171e9cd23b95e5a35d0ddb3344a4ae8148da5505753a2e5f6a4c0eb4a9246dd8df7b730728304e84
-MISC ChangeLog 8773 SHA256 4e9b1ea875f219f116519803e1b6958967419699a03fcc76b34bb7bc2736ecd9 SHA512 dc94bd5da5d45d057c155b28aeb48a3f8d7e8dc653d0e02c6b58bac775f6ddf6e62e2dd6baafad88929d05dd67ad0fa0dccb116bdfa3813abca00d68c0c4d236 WHIRLPOOL 7ce1027af5ab948a31937e0bc0a65bfb4361c88d6ee62cf2014c22d041af078f6878c17ae0bf19674d878ee33cc5c4c204ca8b5df300e8528911b0dad95ab3bb
+MISC ChangeLog 8911 SHA256 0a1ecce4cb103a973393c5ec93c145b47af14d290c07725f9e2aaf47e641ec77 SHA512 2dc8c0c8a8c83d665a711b38699470f73021f67f2961603ba504c849808fdb9f952bc8ad068842e1f5e2ac4100a643576bbf0759afcc52e2b3eee5185d8f75ca WHIRLPOOL 6d77b4643323394a260e904dc21d3a6272ac36e98ff1efdc4be6bf0a407a52403cf618b6f81fc53aafe9bd3287948dfb427127945de6474a34290883837c47e4
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQEcBAEBCAAGBQJRZ8JpAAoJEEdUh39IaPFN2cUIAI0sw6DG0CVraGBlFg35FkyY
-+z2YTWjaHf+4URn+3gNX/GkY/me3AA9tNvyTcz7pLmCygcILKc5lex7caa26qPaX
-fwyuG1Cid98MyCnIu4YaE1HLfSoInvFoiPnh83cMJBHiXxDcpNZ8W5EwrbILGIVt
-iE1+kZN7tQnraipWh95SqgbDCFcn2+rn6G0YFdTUHnFzhqLUaDr++uzhebVVc/uE
-ZrdkcB/8kI7Rngd1SoeTGt64dO6ZvFzyaiW70yRgSYXrX//iiADX3MHR4M3anNqX
-MM816G1wCBhay6xLcDtg7OSuwWN6ZvELFR2kMujSOx3IyUewZDVaZCyPRWazUW8=
-=fYF2
+iQJ8BAEBCABmBQJRfUO/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MPBwP/0YZnmA4xQPJccLUeZQLKKkH
+Gw4GA7TUHdOBktgDjdRjjujLvEtM+T+ZGIX4enC/IfcgMmmaM4JVNkZRnG1mrl6j
+eO5o4N1Kp56w7VH8QPZae4tzBSB21sryMqV4RIpzz8EgZmO4GebhShk9A4Ys/92
+1YmRbnDpUWsTaWDFyAN2wVl/11WHrMX8xlU9tbNCaC6WTovdlp0WX/fC1qUUpKLy
+o58/EmxmNwhyzZ+rX7nLK98z5y84EoZtsKhAS8krYz6JrKeS9OrYmkE75OWliuwG
+d/tY74oOlRd+CPeFtTJtaXrvx5SVJB+WbmiTnQ590CVxIluAxpKhgfzFifgyfy6V
+M/Z/oNwa626mijU9ux3iZoSW+Ba3IukRNYFrKTN6CYApA4xq6hkIRIQCHUxulIVd
+5qpF8fsT65zD/GeIpMdKDOa41sutoxcVHUNhdGRprmT6sAZT9KxDDN64wct3USEW
+fdEeDRM4+06AwpgBkgjpWOWPmnTrTDwntpWGge1zNfX3kCQ71JMhbFo0PU+aSGcC
+do6kL60g3+VvMNr3LPgIxgcvTU3jsrdvc2C3J5+SBi8DNF1nCDoIC07BBCNUI1XA
+K+bmwAQSwiI1viSbqqfmEE/K5Uo0gjY1A1sJ2Ybky1Qigzo7EMpOLxA4NfdlT2oq
+WFF6UCGCmF3UamoJ8SRN
+=FYDB
 -----END PGP SIGNATURE-----
--- a/media-libs/vigra/files/vigra-1.8.0-doxygen.patch
+++ b/media-libs/vigra/files/vigra-1.8.0-doxygen.patch
@ -0,0 +1,57 @@
+From a8fd9ff8062152ccdcec7d63f2d5075f29ee2429 Mon Sep 17 00:00:00 2001
+From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
+Date: Wed, 21 Dec 2011 16:31:56 +0100
+Subject: [PATCH] adapted regular expressions for doxygen 1.7.6.1
+
+---
+ docsrc/makeFunctionIndex.py | 4 ++--
+ docsrc/post.py              | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/docsrc/makeFunctionIndex.py b/docsrc/makeFunctionIndex.py
+index 55e74bc..06300e2 100644
+--- a/docsrc/makeFunctionIndex.py
+++ b/docsrc/makeFunctionIndex.py
+@@ -119,8 +119,8 @@ def generateFunctionIndex(functionList):
+     text = open(path + "/namespaces.html").read()
+     if text.find('</h1>') > -1: # up to doxygen 1.7.1
+         header = text[:text.find('</h1>')+5]
+-    else: # for doxygen 1.7.4
+-        header = text[:re.search(r'<div class="title">[^<]*</div>\s*</div>\s*</div>\n<div class="contents">',text).end()]
+    else: # for doxygen 1.7.4 to 1.7.6.1
+        header = text[:re.search(r'<div class="title">[^<]*</div>\s*</div>\s*</div>(?:<!--header-->)?\n<div class="contents">',text).end()]
+     footer = re.search(r'(?s)(<!-- footer.html -->.*)', text).group(1)
+ 
+     text = re.sub(r'Namespace List', r'Function Index', header)
+diff --git a/docsrc/post.py b/docsrc/post.py
+index a8836d5..fc51f8d 100644
+--- a/docsrc/post.py
+++ b/docsrc/post.py
+@@ -51,13 +51,13 @@
+ </div>
+ <div class="contents">''')
+ 
+-# tested with doxygen 1.7.5.1
+# tested with doxygen 1.7.5.1 and 1.7.6.1
+ mainHeading4 = re.compile(r'''(<!-- Generated by Doxygen .+ -->
+ </div>)
+ (<div class="header">
+   <div class="headertitle">
+ )<div class="title">(.*)</div>  </div>(.*)()
+-</div>
+</div>(?:<!--header-->)?
+ <div class="contents">''')
+ 
+ mainHeadingReplacement = '''\\1
+@@ -149,7 +149,7 @@ def processFile(fileName):
+     f.close()
+ 
+ files = glob.glob(path + '/*.html')  # use given path to files
+-#files = glob.glob('../doc/vigra/index.html')
+#files = glob.glob(path + '/index.html')
+ 
+ for file in files:
+    processFile(file)
+-- 
+1.8.1.6
+
--- a/media-libs/vigra/vigra-1.8.0-r1.ebuild
+++ b/media-libs/vigra/vigra-1.8.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild,v 1.1 2013/04/12 07:52:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild,v 1.2 2013/04/28 15:42:20 grozin Exp $

 EAPI=5

@ -56,7 +56,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-automagicness.patch \
 		"${FILESDIR}"/${P}-numpy_doc.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-doxygen.patch

 	# Don't build nor install API docs when not requested
 	use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.3 2013/04/27 18:57:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.4 2013/04/28 08:07:39 scarabeus Exp $
+
+  28 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
+  Update wayland useflag usage a bit. Patch by Nikoli.

  27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
  Try to enable wayland stuff via useflag.
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

-EBUILD mpv-9999.ebuild 7578 SHA256 8c8afd20dee7ef9430a92b5234fccc6e9383a2d4321f51c0375f9ea833c1b133 SHA512 ed737f7325e6a3167e0dc24b3f1491a74a68850d5f870e559404391ad37bc4913f3ce0deb21f9b04ee3b67775cef58db3ebff0193f79b928354bd26789ed546c WHIRLPOOL d611c2dbd0fe677eca1438530efa89d18c6d97ca8d36a9780d7a845f94df56d3f601acfaf7f444051d97ee7b3f7ed7a970d30426959a4c85b0738f079cfd271e
-MISC ChangeLog 694 SHA256 27ef054407a407b804b8ddbc6ecb4b79fc251ee6f0f57ec3e6658ce8387bdccd SHA512 2bf74ec2d39480999007c11847d809214b612c9606ec7a548c0488d134920ddcecf01184bfc7fc4e9087700446cee8cf73ac1684aa261493cc7e597ae4745b09 WHIRLPOOL 4366700f6b600f4ffed553958ddec0b6d0c00aee29e55ecd7ca2ae5bf93d866bcc6331a740a9842735841ea960c9ce6c4b8df2349132e9d4fa068415fe917e63
+EBUILD mpv-9999.ebuild 7710 SHA256 384e4e7b01bd78cacd559552ddf10cc9c60f7167ca4d95c74d0663be038d525d SHA512 e1bebacff28e6b914758ad0b0cfd69bce7381b2ac8278797ea41dbe8f0fe2346eb20018efc8724f9cb722b10efd0c3bce51ebeb2f686dfcc02bf94b298919017 WHIRLPOOL 3c055f664bd3ac539cb3fefd07248c8b2007440315e8b944daa71ce228a6c0702a4146457365226d6b76b48965541f61c24671b6372c7103c0bee58ec6655d31
+MISC ChangeLog 822 SHA256 9a63bd36006d23604e9ff5c1a93bc6079389492ee4c1531db10c8c96a0798f4a SHA512 d4a85a8dd64aa87547742258c4bbacff81aeea0b242265f438a4b7333a45cff58846b47addfff1e9754a267977aa6556aecab1a26ea6e01f8af709cb64534cfd WHIRLPOOL f82141fcb1c42e3b376cfbd543387d7fd3ec72c9bf1eea848b9cde1f76ecbcec6dfb59aa739d494fe8f377929cc1ee197eee187173b7f70522995df80109ea49
 MISC metadata.xml 1270 SHA256 7b7a247933e1e83c76902cabed57625c61781d528b098c30918a952c12b25f76 SHA512 31329829392854d79f701a59cce3eafa36a15869df786ce9f4897d14e37dd40c0af2788717ffa446cdaff0c200322c29954fc5a48cb67bc73726fe1c9db437b1 WHIRLPOOL 7bf76e61f9dde30ccd7a5317829e413ab8c8d00697a93669f0ee0d0a9c9912ab2fb59e12b2881c7225d17f7977c2d3d4735f0bc3bcfc37d64e289c627e9311cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCAAGBQJRfB+mAAoJEOSiRoyO7jvozVIP/3sFcM6kWgzJwTD9Yw/ShG8V
-Qg8vlWA0M5YzNWdAtuYB3n6R4DFgDDVZgDSegr+soO54Cf1qWJJXNAppTJV6gk6u
-7lyON9JJcNOTydc6UGnwc/brww6Euq6ZbQIsjCbw4tLdvzDVHgZpZyuXvEJ2ckCt
-NnFGdOKKOZ51c01MSEw3vjTv8BGdhBzyuD4c7JSHVKUbGsWtEvwgHyuEnJxpAbCG
-aYIsogTYlEB1wQoxPatKQ9IOQSbwYjART0fH7pA3cYyYyp6TVf+yjI7MIqzpF/ml
-e4hBkNA4vVw8+mYyx8jRuK8NFAPDUBfQjQ4w+aKXDfXJ1qpkTjoWp/Iz+L/t6lOa
-vAtyK+NTLx8tsHPDCZpLRYKmrhAWy4U79hf556HHPOq6xh5ja0yHNfQ4ngHV9q7X
-1lIJjt27x3otpuMtiYRYl9HB+rOKGk+TPP/QTZ4yDR/SUz1KI83YWY4V9qkNbiiA
-OqUwJn84yvJ6Nud1byZ1N85+slemr6tRRQw637gSXQw9uGfMLmU47ReCvhpX3ORS
-tC/cYfJsbqklp0YTKHOonJCoZKKmZcPkaKT3UOU2y1oK58QL/PS2Pc9eRhJsrkOA
-c0cEpSBfv0T9dJQZq3f+0YikdTrKfNK0pDi+K8yVwqDZyd5lMQ4q+xo517nGum9q
-ZiiMICoSqTzESudZbZ0R
-=gCy9
+iQIcBAEBCAAGBQJRfNjXAAoJEOSiRoyO7jvo8m4P/3edJCjCzRLfUilezlu5svqK
+i42prUWGQU4bFtHK3zQ300JQ+9EpRe70cs0PW4a9zlyopDXTI5IxHDiuLZWAzKaH
+CzuTRJa62c+cxIO59xbUgUj8Vt+Q7nxygC3EE5EOtO7DqOuBbt9mbRit6xywe5ls
+8K1z9T5hTTII4RGqrJzj8I0CsT7tRGLKgfYmSTXHBk/oQ3hl2dyALEbem+OWqc/+
+BzQ9WsL+vO/Vos1nQZNQy04/YZ5BQZFqYs0K99ej6rGpNNPPPvkT7mEet8miieNB
+gCRlih6r/XasZkcJdjHy8K8Em87n1k3zTW4dRrmd1FW9xAw9uY3iJSplI8gjhr4x
+ZLinsAiME5A9SdrTnCv7X9yK7WfrYOJCzT+vcs9WORLmchtPgdt1ZViic6M4HWjq
+wPfpyrEt8g+ZbruhMcxB0ESbaHC1nDXmu3YCZk5+t2alInYrg5UJqOI28raNmqDB
+iSxG9uRm0Tp8XnsJOLJMEyECp44AUO0LbMLytq3/VJ0HlrxO7enppzRy2bgFfexs
+N5gEe4rfEBTStSKjPwQTCqqcd5VWf+zIKGgAxUl9U4G+WOatbx0OOXGkaazrH3fK
+BeaAZryQwuDdMqKu61Ri/g9Dd0lwAppLTNhpftT/VZWBsahph1omHG+ch9hMH06g
+XTkKtQ3+YNfIH7F1rNV2
+=uI+S
 -----END PGP SIGNATURE-----
--- a/Show more
+++ b/Show more