Sync with portage [Sat Jul 20 21:59:23 MSK 2013].

2013-07-20 21:59:26 +04:00 · 2013-07-20 21:59:26 +04:00 · c0a1c9eaa6
commit c0a1c9eaa6
parent 5502459010
594 changed files with 8771 additions and 5178 deletions
--- a/app-admin/ansible/ChangeLog
+++ b/app-admin/ansible/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ansible
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.20 2013/07/16 12:23:02 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.22 2013/07/20 10:17:05 ago Exp $
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> ansible-1.2.1.ebuild:
+  Stable for x86, wrt bug #475602
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> ansible-1.2.1.ebuild:
+  Stable for amd64, wrt bug #475602

 *ansible-1.2.1 (16 Jul 2013)

--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 AUX ansible.env 99 SHA256 04a806ca12249b1b1387e17cabd85c8b09bac64914650d7a776576153e32591f SHA512 79d0d6581116ede67d6b184d1a16c2ba6586d4ca8cd71047bc5a81a82696b0e1a124f22248877aefc0a810f0ae3bd2724dadaf71dd5078bbe0910a9e8c3ab111 WHIRLPOOL f347143d490cf1dd6784059022fb7c6c85eaa5e957b6b5eb85f6b1b8a98d1b90c26aa0602fe2cd6679c4709fb9dad2fa67bc53326bfca80205cb7b7ded757c90
 DIST ansible-1.0.tar.gz 629525 SHA256 6e9bba5eef2575284bfc533c0cc751468d7a07dd608845437c2f96fc57653a54 SHA512 d5f84184cb7c0bc086ee726188d5e13533172cb219b6dde0a570b165540f08f64ca708b515e52fb95b1675755f1f90550a962c3b51fd085763389daa12ec971a WHIRLPOOL bb0cdbe096e4dcf6cf1d473b4678e9a3deec59d34da5fdebe1d80b20b781392a841bc5641fefc7f0f581be79c4829f9436792545cc2dfd0f70097d9d16213935
@ -7,18 +7,24 @@ DIST ansible-1.1.tar.gz 718567 SHA256 85331eda53171fc5faba9835f978e721c091b2f979
 DIST ansible-1.2.1.tar.gz 777619 SHA256 5b46639fea3576233c8f235468a8b19f0b180fc0ddd6ede3014bc570362c5e66 SHA512 4efe9583f91e36bb07787d272b6a5e79d1cd37e17d1d1bdbcf99c54736838642cba051601e95b38b957deb9d7ec92c11b84da6fa4984bdeeee3b951b6df94ac3 WHIRLPOOL ad63ac251b0ed3f2ba48feb742271498f698b956cfc6be129080d0e33b086180a41d5c99f45423eebeab1a3a191048d6ee8d71311e81871368e2235a25a73705
 EBUILD ansible-1.0.ebuild 1623 SHA256 7e2971067a5ce06f98d88dfb77413c4805e098ca790cd5936780f71684bccc13 SHA512 4c8f079f57ca4daf2f0e768c34085e012873adae7ff866eecd310758402e7d590e1aec4ab6e4bc9469ac5ce2c9e087fe8a77a623edc4051b91294ff0daa12391 WHIRLPOOL 17227af2c83b42d74111d654f8232db9692a34b40da5cff19daab95c19065e1025b5c8839b5d5dc1374d0041bfb2b472f4a02e5d16101ff8b9cff73c9dfc84a9
 EBUILD ansible-1.1.ebuild 1566 SHA256 b80d6bc404e743f4cdbc8176183316d784e9f4e80fa4d7a6886f69255239d02a SHA512 d2aab5aa819f5c7dcac21601a0a2610c9a04600d2c3f703fbc1b83fba5f8a08efdd1f843af760427ff23327734ad4978873031737fc8069c95c4170250d443bd WHIRLPOOL aee775bb53c8cb77ee32e2075f0c47fcb15a2437a9074c493e279939f6aa05d5f3413eeec36a2cc554e347fdfefc42c07556dd3617bcaca6a30dc566e14cca50
-EBUILD ansible-1.2.1.ebuild 1520 SHA256 cc380b79484f4f583938894fc8fee68f4a2db76a2dfa12d2d6775a5f2acf47ca SHA512 36708eec915e4ac3ebab4f43eb67114476b43ee462c971d3d1b226b6305e89a225946aa09149f8c808e7fa39b3c091afffc919c03b3694c3c04eaa271ac68f75 WHIRLPOOL 713a4c56ff57148c17e75af3e0ad04c86b3a3da3a590272418a23427ad1d38f1ab23372aa5b410b3e713e32d36e7e4237db5a2510ee01d4898c354714cc06ca0
+EBUILD ansible-1.2.1.ebuild 1513 SHA256 d23fabf7de552c349fcc8809e381d090e61d9b391dd2dc15b109e67f35a98b3e SHA512 f1431e35b9f0e781db12a15863bfacd359a6bf400bbd2e433e861ccb5fc097fcfc16e17a5ce6f3d88fefcffc08bd933b95b9885b91a75dea99c3ee32f6a63acf WHIRLPOOL 6cf52bff85e29116774fda742a6d131d64d266b5711888d9fe24ea78a3c9ea3fef12a0f1f84f28003029948b40da7967f5187752470b076f6d911b5f255adceb
 EBUILD ansible-9999.ebuild 1520 SHA256 ac58a5941e05a4cb5797ecf88c1c798b8bf5cf7f1c7f6969e4dd2e5e4536577d SHA512 ae7bbfd5f44239ade420096ee7f96b1fdcc5263f241620ef082adf2dfb167a54234eb24b843c7853fcfbdb96a2cee940a3685e5a695fe6b8fe278ae74280e70e WHIRLPOOL 20ebf7dbecc5803c4d90755a0ca438fb7bbd0e84611df3869d0d057518c3cf60c461372b808ce382f632b2849cd19b51b92f61f3ab37c3933d7a89b4cf9d9299
-MISC ChangeLog 3548 SHA256 b5439faec6094e6025daf899a127d31ad2f262483cb20f068dc916f2145a8060 SHA512 8673e40a65708d1f057e5a781443967be3dc9222128d3ede6fe90273d30c9a1090f7ea1f4bc6f46ca84e19ba3f321b2a96eed2a16bde0a0ba011f07b88d4e367 WHIRLPOOL 35dff3f9d71c5b8204924f4ab4018cf8e268c0b440d0899d33fab9f1addc06a87139816952918af1d74e5bb9f9133c197139f454ccf7c23725b331e5c717945a
+MISC ChangeLog 3757 SHA256 5c3d677b753328bf1f2b78be5c326907f5420f9f9e49f9c199dc0b750af8a758 SHA512 d34349157f208815961dba97e6507be8fa12a2a2fa848b22542dc4ab9d45c03cffc13738cca9d0d338f5bb015457f016e29e4b7a25d0445732e51164108e6641 WHIRLPOOL 297ca37b26fa48bd036ae26fd3b13de34d608aac22b1552609b1595467d7930af8a2e07cb3c129a836607b957186041d48c4eaa187636e9bf063401271524ce6
 MISC metadata.xml 523 SHA256 0c114d8c4cd668f23d77fc851ed059c6116386ff8c39e7817d4a3f821ba01418 SHA512 54be61d702042ec2cfe0681c76bf4f86668878072d8009c0b7173faa15d1a73f5fb15bfb6ca8d4b132bccaed0b47b4ec6085e1d88ab9124bd7a34bc16e73ed1e WHIRLPOOL 66db565db3bb92934610a6ff408a0712cd6f8d962fb1c702ceab4813243ff2b910d510d0ddc91c3a8ab678eadfb385235a4bb1916942e024f162646ceac99c42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJR5TssAAoJECo/aRed9267zpUH/RO8cX/4yCce7fOf5NgT+f1s
-kPEL6VXbIxza/wN10pKQX82csePwa5Gm2jd3xqiKQIUeEedhC6PyWomYlhUC/mBJ
-5Rv3KsYobrGHx6cq1gqZcBmg/gqJGYpTf5UjT0DE8vBU4HZ+FquG+ARUTjsN/kaa
-Lr0OarX9rCytwL1KGhu0Xgf0g0dxcO2XoSGmSFUYNETUBkR17TXpgb5xe6Nn0XVk
-SAf2tRxtUkaKu1aT0T4j55mHAsOAzwJ+cbx16bQf+58m1NWIk9h/V5M7Ra3mTsW/
-Tkkqe+dV8EWnzq+nm4MlibhYoj6q4D9LUfM/b8wZVFVGl4AzhJLVJk3YJHgeQzY=
-=dgFA
+iQIcBAEBCgAGBQJR6mOWAAoJELp701BxlEWfU7YP+gLC77ehLigB+oxq8VRntkp8
+UL7AIOMvKsgEgwiXb0q7sUpfui1cQlta7wkIDjaeTHIgbexD5sZl5y45ueEW46+Z
+lbTyvBe+DBMK8HGrx7fVc6d+kMKgkiB+/gRvj1Zv2QFt+43xRh8tWnOH/yCYgiIo
+nG+6q0en6N25mmqX7ICzOIyo6lLUKFpOpbeoc37GDgJh7FnqXl5TTWVlE9pdPabS
+e1tT03THXTATSgGAWUz270U1Aos+0dF/q5t5f83Pf/IF6VmG5RtQuG6Iv6KIdIfm
+sY5rKkUGSmbSjgZBG2bUiacRKNCRgtpsE9/hnWhmSQmGyk3u6lJ3y1IESTzQ3Ezy
+NVcYF8BowW5SFkR8QBHqkz8jkbfHI0hMWuDMCSwTJ2XVfIQXzX+xDNcN+HnrrMqM
+6Z6TdFUGqpyFbb8bYogYZzcAsmPi/jguwBAExw+5VJEsYmxULVWkGcqVzEVSpgud
+sA9HMrH1uM6PZowp3KI16NYQtRA5AXmfDaeNey/OIIvFM3YrM8XLtj82zUYwTYC0
+bFlc2yXLBvYnAhiUVaiig3AsNOJbQLGwHsKFlexB9mq52ZmUydGy5kDKeW3FqkPI
+wABo9/3fOf3KAGlDXYNqnPDSpbU+9/ayoFgszJisGW2kR5mddGcnf0C/1Tv0mKUn
+7bJWuwMXZh06rA9wAywJ
+=LmpW
 -----END PGP SIGNATURE-----
--- a/app-admin/ansible/ansible-1.2.1.ebuild
+++ b/app-admin/ansible/ansible-1.2.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/app-admin/ansible/ansible-1.2.1.ebuild,v 1.1 2013/07/16 12:23:02 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.2.1.ebuild,v 1.3 2013/07/20 10:17:05 ago Exp $

 EAPI="5"

@ -12,7 +12,7 @@ DESCRIPTION="Radically simple deployment, model-driven configuration management,
 HOMEPAGE="http://ansible.cc/"
 SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.100 2013/01/13 14:33:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.101 2013/07/20 05:37:14 jer Exp $
+
+  20 Jul 2013; Jeroen Roovers <jer@gentoo.org> webalizer-2.23.05.ebuild:
+  Spelling.

  13 Jan 2013; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
  Adopting this
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@ -10,23 +10,13 @@ DIST webalizer-2.23-05-src.tar.bz2 308238 SHA256 afc88b8ee0927d9ed004962cb7e3d30
 DIST webalizer-geodb-latest.tgz 639447 SHA256 f2a1bd7fcc9c93ed6a627bd15f2c31866d5a6c6b7dd48852d84a129386327218 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117 WHIRLPOOL 26f1edf87ea6102c5047b41702fd273d40360bde7c481183a3303e2c89af3d6ba7470cd942d4af1574bed8822b776a26ea13c2388b7654fffccee856cc99e571
 DIST webalizer.conf.gz 8986 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b WHIRLPOOL 58c2ced08eeba65e1c7acf951e2e0e1806af58fcd37997c4d824504235303d7f75cf6c05c7ce051e2e2f3b3abff9a929f0dfd7722a995a8ab65232cfb549e83a
 EBUILD webalizer-2.21.02.ebuild 3270 SHA256 51f1b9fdf4d5556d0ddce769128f03539d8785c50149c9117afd9ef79516a4f0 SHA512 a4a152603a344aae62a35d78eae63fd1526e14a3e6ad3b7d86e6a7430d36b96977512aee210daa71c174ed92ef6428f877b37c35fb98cc770db625b2c9dbc3ac WHIRLPOOL 6d09af3f363fe1de4645f745cd012277aa3171857c4b165a118b22df3d92db6bcc356c4c9856e5f761829337a67711c858f3f5f6ae81048b454bef4b73bb4136
-EBUILD webalizer-2.23.05.ebuild 3969 SHA256 95bc9132b9ef862095d97b9a8cb61221dd850b7ed79cd718003199bd6ffefae3 SHA512 98bed3dbbefdc796faa4257137ff9b6b0d73cc506f9cc7877b63588d5890a63bad1afc7ee0be90361f705315b4045527b4ed466374926ad0fa550b3b48733bf5 WHIRLPOOL 9b1f6e94b7ea540a6d8792f92b56ad60fdf32953c56698307288a39dc2b65d9cf01037a5a51c467a2c8471a7868e6448dbdc26af975ff624547041f0c15fa099
-MISC ChangeLog 14706 SHA256 a8f10efa5df6a26b93ef11135217dd9f3b29d361d68b2535b5915a9211924f9f SHA512 b8990560c81016caeae9e0ba9770baec9fbcab60168ee215e7bc7aa361fa240768e442f37f1444e3a75e96f197255e60c7139573462947afd6b5a5a58f9a6dc2 WHIRLPOOL b3a231aa85fae0a8dcd8c64e78e565107fcbc759a941664d0963d03cbf4b078f34fdbcb7e4a7b8bbeb18c702da3fdf2fc2b13c5bcde4f0cb9a34d480889b8731
+EBUILD webalizer-2.23.05.ebuild 3971 SHA256 218c70f9c830450f16f2f27697521a99e70f68feac47741765358b998ace1559 SHA512 9962588d2ef1e7d89e454169d202bf1b8c2d1d54f2a9be7e4ca543b633729270efe9a7359825b9bbd4e8896d6b5fbdfb25aa01cfc03cbd07588c84efb9a9d35b WHIRLPOOL 2abb46021df76f450fe6097dd4e88f38ba4a79fc34ee9d99045973fece53090db7ec239f5951130036f2d0ee486a513db421dd1027d6eb20149e9099a98fb819
+MISC ChangeLog 14787 SHA256 6a9bac6a04a6b436b07413e71f9675da36a1a192851f35c81766580b4f2fea63 SHA512 1d72d02cdfe251014dbfb676814ca3785d46567fb56dee762170673bfdc7192419f68e9196bd400a5be43506e540b49494103f5fd056454cfce79dd637a2f05a WHIRLPOOL ff306022abaddcbb527aed5e434afa87d51f70ad38256f676a59d430f19f2d10f51d6234caefc31efec0dea29efc7e5e157203d30ad7802a88861abc5b22b060
 MISC metadata.xml 332 SHA256 2de3324bcfdce10e56f50527f20c54ce51249bbaf01fe7a743672efbd1709cc9 SHA512 e21aaa66c2b438d52a0d2f663d59c030b796f838104b03f83ba2fa7a25146952c388dd973960881b0ec3558491a375fa7920f575cd92df624b2434cf53e1a1b7 WHIRLPOOL 3d3dc5fd37f8dd699ef39119235d4a699e070168e158f9d242674fd57a40add85d0be023960e66e4534cec7f2b118a85a8bdd2fcf7312180b88541b43e882ee2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iQIcBAEBCAAGBQJQ8sWwAAoJEJOE+m71LUu6Y6EP/0oKQsuGrcp3yC0RJoJ8VeJP
-ZAqAzACBVX1/xI10/vtI77emT0kz3n7cYJL70Hhod03/nmjf/6RSC7wFZ1l+pPUf
-ehNuCBOG1W2Krda99OrMsFSe5YnFA27f6cIpn9L9fNzyylrp8dSgTdURGYE3X8Xw
-kbvNXQbQfCxFjX0uUPzgb2Cde62i8rKmWvh7Ie/AeuwcvRxi56h9feJBNHIOgB0Y
-HqVtO+XPfNaw3mG8VpaxZ0gWHsDaESVv6khCCVGpRTGjpW1Ynfr8M22QB+6h1O5p
-oRhyuJus18Uel6QoyICz9+3bJagaZKmu0pbDyW2RZ8R7BrSbc3Fxqc+T4c8eHgtl
-78euUNRuHX6nNKb7vGzcE55L95i1boveGwp5WJM7kfYLKPGCe8uSoCEr1be2AhqG
-8Eij+HUmRjjOTwoSOZuQ7DJqAvWxNvzM62lYeN+x4xcMl5e5a+TLtHPeThHeKfM4
-XOhVjeHtHpE4pDR5ELHYDLq9Q/OQyr5Ub8LHyD00nnc9Hs0LMM95U8sH0ppnUafH
-CE3xO9bjgY5gG110+R8KTOEy62tE61mUIiszWrq23raJSw+UtJvaEVj5oUA8TqG6
-H6PPzjjdFKN3/ZKPjNt1TrS13f6sqAkwiOwhqzSZo+icYbs3udmklfbD6QePqisV
-3h223TujXNdDnOkkQMBR
-=VGIt
+iEYEAREIAAYFAlHqIgsACgkQVWmRsqeSphPTnQCbB+dbUBatV/5E22mgNZgdKAmi
+SRAAni0AYwxIQ5SZeUqggnK5qDs/Xm2R
+=Ga+c
 -----END PGP SIGNATURE-----
--- a/app-admin/webalizer/webalizer-2.23.05.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.05.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-admin/webalizer/webalizer-2.23.05.ebuild,v 1.9 2013/01/13 11:29:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.23.05.ebuild,v 1.10 2013/07/20 05:37:14 jer Exp $

 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@ -113,7 +113,7 @@ pkg_postinst() {
 	if [[ ${#LINGUAS} -gt 2 ]] && use nls; then
 		ewarn
 		ewarn "You have more than one language in LINGUAS"
-		ewarn "Due to the limitations of this packge, it was built"
+		ewarn "Due to the limitations of this package, it was built"
 		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
 		ewarn "you intended, please place the language you desire"
 		ewarn "_first_ in the list of LINGUAS in /etc/make.conf"
--- a/app-arch/libzpaq/ChangeLog
+++ b/app-arch/libzpaq/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-arch/libzpaq
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/ChangeLog,v 1.9 2012/10/14 07:59:21 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/ChangeLog,v 1.10 2013/07/20 14:21:32 mgorny Exp $
+
+*libzpaq-6.38 (20 Jul 2013)
+
+  20 Jul 2013; Michał Górny <mgorny@gentoo.org> +libzpaq-6.38.ebuild:
+  Version bump. Increase EAPI and introduce sub-slot for SONAME.

  14 Oct 2012; Michał Górny <mgorny@gentoo.org> -libzpaq-2.02a-r1.ebuild,
  -libzpaq-3.00.ebuild:
--- a/app-arch/libzpaq/Manifest
+++ b/app-arch/libzpaq/Manifest
@ -4,16 +4,28 @@ Hash: SHA256
 AUX 0001-Add-autotools-files.patch 1704 SHA256 dd96581f0dcc61be21db94201b4a4d5b8256b73b12e1738a60c17b5fa33b70cd SHA512 f41aa1476c05a7af6b2ab3c07a212d811729ea25ebca0ff0bff55ad79b4164c50275990ef100ce41e607892b6f59aa59a981c68da54e5a90dc647f547e0225e1 WHIRLPOOL 3f82b23914e8707d61a595ec509aac270b923afe1058ff262b58b359179b3bed9e476b2a19f03ba6d6c758f85d00a2b165ffe6bfcf3acc62060c8aab82d18afd
 DIST libzpaq501.zip 43716 SHA256 3ea073fd7f02a5eafe6bd4e64723f8098224484eaa2ff42f5c56508bb48cc689 SHA512 67e7301297a56eb1b75db863f5e9dc79c66c1b478b92dfbe4bdeeef0605323c78f940798faaf2828510d3f40064a19e31032ca35f32c177462b9958d7f6b7308 WHIRLPOOL 165c23488142078fda516b98518e90508484dd1963e48ba9ea53a628a4a6b362746481ce578f71211d8aedab7b976d77ed5c9707ecb8d79eae802da9c75ca146
 DIST zpaq610.zip 266105 SHA256 886caae1779b67e8daa1a3aa7b2dc744da297a5e6d160755ccf3dddb55409f83 SHA512 ff1337877d5393b099392582820cb493d5e695c52070cfd6ce6b1967326bc0c3985e5ac6872959f69ec9c3945ed365570711b4e590f7f437bc1a30e46a61f01f WHIRLPOOL c10a7d98eb694c540832f7c209668d07e40c7e752932d30ed21ab955c13d9a39e557daad928c3faf5b2098654bfc5bffd1a5ab74537dc16a88f9fbbdf1ce38c8
+DIST zpaq638.zip 568402 SHA256 83d6a0a018e8edbac721517225475c06f0e7d88e6a1a69abe3b58e687eb6e13b SHA512 a2c038c6f9861f74c18cbdbf81ed94a18cc4b4440a931e3355abb5a14a906e91ff38f0c1be771b4b43a0442985d7d85779dfe1efed3d57b8155646f379204441 WHIRLPOOL 1d1a8aa7e590f81771ffcee58b12fe253802528e7decaa3442a6448270ef3cf32f1233757e17eee58d3b37a0df9b0c8def9460541ac4ac97e559345a0ca29046
 EBUILD libzpaq-5.01.ebuild 950 SHA256 c5f55252cdd2af19177fc7ff1c4610bba382be82569057cd00dce0a960b9ce59 SHA512 ed8020126d4a01aab25379f6e1895e76c820a2e326c429590f1c6d01b70e4702511239488590230fb35516f567f9e5a1d0ecfc862fdd1e23fe85482f29b5f45f WHIRLPOOL 8b1a85d3e98051b5ce3a00df0f4c38c93f4e8bfff1ba1fc4d346291e63499755042f02328c1c71e31edddfb1d22e341d0a89b2486ba7f86e7dbca4477fe1f67f
 EBUILD libzpaq-6.10.ebuild 1040 SHA256 d84744633f947c7a0ab8348c48de9a5f2bc62e4b5cd6446c8de2f8226bbf4449 SHA512 40b1546ce52a2089181d6dfdc15b77b92d533145b180d88bdd8cb41c162f659cd3106e9cc9237dba61b282ad88998f56b50f10872049d6a890dd0dd40e2a6e55 WHIRLPOOL 29e42bb95caa8fb392adafde0994186d2e9c8dfea32ffbfa3de67c7f6db9639310304f5df39e4fbe7d6db5daca4c334ba39b47cd5c1e76cf0f1601b0773ce4af
-MISC ChangeLog 1696 SHA256 ed2261922d6fd4a4a24ff291f48e33679f93d08824e4f64a6dd781007f09ad09 SHA512 d6d56fc2c1fd16df363c57ab31f0f97fb2c044427ece13b23016b975c0b88f32f6d2ff55b279ae36928358368b7ffe247a50b325bb6564dcc1958f22994b9a15 WHIRLPOOL d0aaac16e37821a9d4c8babbbe837a5417ed48d092e9ecf29cf1c021afe0cf86c03bf1d442f5788e12471b5d173242dfca416a4cf2fa331bdee0fa6f907c4e7e
+EBUILD libzpaq-6.38.ebuild 1051 SHA256 90c39b9871514e19eaaf5e0fc934849af4bd18fa974cf7397322431a020aad99 SHA512 635cb6feacba89f2c1db7a01570123cfbb44690545d65184044ce2c70cafb87ed2e83c4933e744587778b4f26652ddc203af4d00703532639542f7d715b85581 WHIRLPOOL cebb51c34c3d2f4be8bb826b267773e0dcb84b57e367ee23198b032c7680ef266de52db7d2a6220bbfef8d518a21f1d39465e16e686c667cd31068228a210ede
+MISC ChangeLog 1864 SHA256 0040afed71f80fa26f436c32f9f03c13f57a925d02900a7b8332d5959732736a SHA512 0b563db2e0701eeeb4420bfef56c95e7c2497ece15a96f4de6cb3367bd3fc8a4b42833c65058d9228f718c052e87dcef559908c1ebe9a050c965c576947a4aeb WHIRLPOOL 794889d94115872d2dbb35456a05b4c802c66578af10addeb430326cd042794225d341e0ae48ff448af0caedaa7b91e3b46567cd98320827e0dddef16b2b54eb
 MISC metadata.xml 348 SHA256 16cf630a1013b7e3cd7a7d4fb0f1ee14ea8e3ab85c6a44b7fea2d955ff5f0617 SHA512 f8672521b00e6101acecaddffaedefd8c5cd3d692f0d24d21ae110e063bd1d565c4bf510bc8049145ba8a5e07193e50c4e34b51cad777b40830ca6cc1617d26f WHIRLPOOL eb9c6c5b66b2e492629ef7d0b0599f4c8321df7df78ca19000715f6f7be4754cbed9d9a8a7eac2aa2f665d6884519851224b13014d574f9d5eda3dcf2306a661
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iJwEAQEIAAYFAlB6cQEACgkQfXuS5UK5QB0RowP9F0ZHlcIojptM2kc6w1McrqZI
-yi9I+Vo5tpJd72/MzSN9qjkP271GBwSN2WIy9Xqa/QRwKDXt9v8aOh76URzt/C9F
-77T4Wl16HnQfo6JyqhIGWwkGJ2QoVbLM2C/sj83pwXJZnoEA30cbHRq096vHbSyu
-A3f7IsX/vC3TeTD03Rc=
-=s6Lk
+iQJ8BAEBCABmBQJR6pz9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDk1YQAK9g17AlkMjH6R83xNVTGE80
+i+OpIYyygQoqnbyljfMKXImfHwli2XMTap5j2btsghpt1VOSeGp9vxPFEmFz4STE
+CJwLu7k9ekkwhowCbYNyuo7Jct2cUYBgVq9Tfja+LeSLz2ZyYO+bbCrvjZdTrpKd
+wOs+07MkNz7C/gjw5jnAXawD9coaxNqjtC0OD+5IKLuSRBSKggbFDRUE8xvnBGXH
+3oh7MA2zbWtT7Lbmlvh+C+NgD1dmhTP7zjJ2vFtgaD0ezSbU7nC+renmsJ4WljMC
+6LEqlvdm3qyVv3zGAxgMf50QMxLxNj132IGyKTN6b8VJGoOQb58sbuKz6D1LScpr
+en7qagUkxADFmHmqLz32gqucqLyUg130doQ+527BlZ8eZ7CxtAauNg79c4NL4vt9
+vv3Nk5hanPJ5m6o/aY3HKS6XQNNlKXONBNLMz+jk75ZYkX26JuOJ/TF6EMETL5zb
+4zGc6A+mA5IhyOOb5VvvlCSrTfwS1b2Zh/mProbitnDTJJgQuWao+A6rPyfQfRA4
+XkFA+eFM1B3yjelxHOxUxPS5JLlvn4Ucv3Ui5puxX90MKA6Ma2vz7MS4nRnQll4t
+9kvSeVmrkh96AJJeJCfoaypwRbg2EPYKTPcl3Rcc44mA1sEVLc2en5pSjd+PkQIQ
+Z1lYc5eytjRNkYU/WqEE
+=8Qg1
 -----END PGP SIGNATURE-----
--- a/app-arch/libzpaq/libzpaq-6.38.ebuild
+++ b/app-arch/libzpaq/libzpaq-6.38.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-6.38.ebuild,v 1.1 2013/07/20 14:21:32 mgorny Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils flag-o-matic eutils
+
+MY_P=zpaq${PV/./}
+DESCRIPTION="Library to compress files in the ZPAQ format"
+HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
+SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
+
+LICENSE="zpaq"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +jit static-libs"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/0001-Add-autotools-files.patch
+	# XXX: update the patch instead when the old version is gone
+	touch libzpaqo.cpp || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-library-version=${SLOT#*/}:0:0
+		# man-page is no longer there
+		ac_cv_prog_POD2MAN=
+	)
+
+	use debug || append-cppflags -DNDEBUG
+	use jit || append-cppflags -DNOJIT
+
+	autotools-utils_src_configure
+}
--- a/app-arch/zpaq/ChangeLog
+++ b/app-arch/zpaq/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-arch/zpaq
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.11 2012/10/14 08:00:29 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.12 2013/07/20 14:22:19 mgorny Exp $
+
+*zpaq-6.38 (20 Jul 2013)
+
+  20 Jul 2013; Michał Górny <mgorny@gentoo.org> +zpaq-6.38.ebuild,
+  zpaq-6.10.ebuild:
+  Version bump. Require exact version match between the library and archiver.

  14 Oct 2012; Michał Górny <mgorny@gentoo.org> -zpaq-2.05.ebuild,
  -zpaq-3.01.ebuild:
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@ -6,16 +6,28 @@ AUX zpaq-3-autotools.patch 13117 SHA256 d30aea3989594be8fc5512d9ea22a358c9739684
 AUX zpaq-4-autotools.patch 12417 SHA256 7f322b6feda67186c558c0b2582980d2194352af4c1dc686b45ed9033871f96e SHA512 919cfa5d2562cc3f731ae74616141005374dad47b898989bac3917b3d3d065f50e1a02cdd93cfee877c151c40f64da1b391bf2062da9979747af9a6935060e3d WHIRLPOOL 7a8571142a92f73178d13c442ba1a9ca73518f9d17d9173d8b5ad75dca94a7a38afeba7f4592484528e9627a3508e1f6d423e78d691667d004f42324bade5097
 DIST zpaq404.zip 45770 SHA256 ce946b8a9cb92c5656a20ff83a3a0ef88e23b374a58e33c295ef00b1843dfe30 SHA512 b624eeb358550a77979813ad950c940ff9de91636292eaa3b6e034a58474882615c7e8d154e7efd1dbb6ad77e20709d271ddb95897e294281a53d16ce0f26432 WHIRLPOOL b925fde2b55d4ba1006dac86a46abbda7c5ff18f154bec84d4400889ceec1cc9bf23e17490c5a9f6b5fb4088695bb76ffa06ee7b66063317b1682b0659179aee
 DIST zpaq610.zip 266105 SHA256 886caae1779b67e8daa1a3aa7b2dc744da297a5e6d160755ccf3dddb55409f83 SHA512 ff1337877d5393b099392582820cb493d5e695c52070cfd6ce6b1967326bc0c3985e5ac6872959f69ec9c3945ed365570711b4e590f7f437bc1a30e46a61f01f WHIRLPOOL c10a7d98eb694c540832f7c209668d07e40c7e752932d30ed21ab955c13d9a39e557daad928c3faf5b2098654bfc5bffd1a5ab74537dc16a88f9fbbdf1ce38c8
+DIST zpaq638.zip 568402 SHA256 83d6a0a018e8edbac721517225475c06f0e7d88e6a1a69abe3b58e687eb6e13b SHA512 a2c038c6f9861f74c18cbdbf81ed94a18cc4b4440a931e3355abb5a14a906e91ff38f0c1be771b4b43a0442985d7d85779dfe1efed3d57b8155646f379204441 WHIRLPOOL 1d1a8aa7e590f81771ffcee58b12fe253802528e7decaa3442a6448270ef3cf32f1233757e17eee58d3b37a0df9b0c8def9460541ac4ac97e559345a0ca29046
 EBUILD zpaq-4.04.ebuild 998 SHA256 f5f7ed744db64cc047dc447699940290ee2bb273b2223bff6f7ee343c9675f30 SHA512 d648b7b563916232cc32d7ccb253f1965480055a547b81b2f4571c02d4e0290191fe99759e745bf1943f355bcbe0a91949bfe2054a8066c22811eb039c221942 WHIRLPOOL 076ae6b76f0224e35db74b9ccec8333b476eab671f522045be8974f90ebf504b7cdb6b53ffc22a54c588b1d927fe9361c0a4b908c7f86aa872b6994abc4cdd2a
-EBUILD zpaq-6.10.ebuild 1063 SHA256 78e3fe671fa8e02306774480bedf5e22f17494255a5a6ab9ebf2cdc3bf006a09 SHA512 b626f56d8cab48a80e668086b36499dbfff71c5a62c5d0f9a2a9f1d78be7c9fa89ad8709e7d2f717f4935686ccd8643ad21047b87607bf3547e0b8b613894285 WHIRLPOOL d24ba8ab1d7a69d5357a311abc7804cf27804ae76b72a2518ade0a10ad0a9735eec0518b06d8fd1912d24e904d6b117c170a962f749e4ef0f669321b17dee844
-MISC ChangeLog 2202 SHA256 e77fceb06f4c1838a315054806ca51f9113f28c91aa0b651da0da36e7881420a SHA512 854688722146037909f4008bfbfec746263e9a9506bbb19e7d0fb68fee2d9a96328a3b77aeed97022fb3777336b1167c92653e2dee88f49db785a7badc56c08b WHIRLPOOL 5490bb24e686a41510981302e40d9dfefb58da29298c3c416c207c3d993db856431b752a0341c81a16fbe20a9cb37cd776d5f095903b3b916c00e555b521bd6a
+EBUILD zpaq-6.10.ebuild 1066 SHA256 34eb9581f03900a38c44d6f440428f4c0f1a6621a1fa979b34b87e82d05b26b7 SHA512 15043309dd6cd21e9dcf93875429a6d03f6a8d22b0b636e82cd3de6b42350c5d707ec78848a8cbebb8eb94083fd082b0681037cc22a29e8c096fcb155a3f9fba WHIRLPOOL 05c918a1a53a3bbbd3e29250e3206021083de6a4f3d06c7bb2203c88f059552880305353d9267fcf1544c59870fb50404de937ff000fe0afefd63d62f8052589
+EBUILD zpaq-6.38.ebuild 1066 SHA256 8abc741e2856a5fd1c3676a14b897c3c18586817b2abb3f858836241faa45f12 SHA512 a3ccbf33cc7db4ad597133b97f99e040a6abe94a240dfb63c32cd417f28b0994d534b3b8ce703ed2ed7d85775fb662af887cd757399ceb3d5e945ee650457578 WHIRLPOOL fb6e8354be1b71d2aec2e1a0a947f85ea3bb1405ab57528296ecb13c4c31626c43571627fe55c87e7611da75d4b2021649b9f65787cc322448c0f206541c67ef
+MISC ChangeLog 2396 SHA256 367cb3b861ef6b4b282caeef8e819e40aced4b0c3cfc6e34649eed1ca05a5ca4 SHA512 230ecf69b6d766914932c354c15436f7c56f930ec52304f3ed87473613d550412289f522929269ea899e75e7a72b9e1332879eaf529db8d44f56f649aa835d8f WHIRLPOOL 79f48d2fef7441b938f3747a33c451a4f9683a17b31d32444705ef601954aa4ceb307e2b29b6cee870d1727e1158967da067995ea8a52f2dcebc814e7d4f8640
 MISC metadata.xml 233 SHA256 fd88d74157f79eb4a06067443b7138cfb56fe1c66bfa5dfe72bda038ea5a9dda SHA512 6676f74cc1b612ba4f95101b64570f257e4b37cfd803a987e3afd9e12ef9b1480918c5d6e4fa955b8447eba9e319c94aac11abe247187870406986b476b154e8 WHIRLPOOL 3c1f192d1fb5e213e407a70a7be417170b651f3049b32ddf1f6b1c1983dedbcb498fa92eb96a41463c0ff0754044930150f0e5940708a6584923e12b86200349
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iJwEAQEIAAYFAlB6cUUACgkQfXuS5UK5QB1lcwP8DUKuDrXW6TMLxwFQLpLf+Nov
-XMBxf0oDC1PH/BdyY2XGTCg+LYp3FES9zCCQXMqOy94+fgHXPAdUUTLvJs+tCISL
-fw8XaYkLemZEbMUB+FBcwbDzzgiUC1Rck0C9ZBw9IkoOa+sMHg4DkpSoZsDAUh+5
-rw978WWDM3fwriCcHeU=
-=bd9Z
+iQJ8BAEBCABmBQJR6p0tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDIOgQAMArjSBPg5rTFXEqhhD5VRTF
+sPlvHJfj1mEojk3clmM5JNLWP3LocYvTW6ksOtdPg8lUSWI4kYfnszwk+CfBHl6s
+EKJFdm/my1ei5hxOD9iunzlT4vR8A4WcN05UAeFpbhYZwBQm1n3FeYwqjT1QhSj5
+UL65fuEi6v0l9JNG6rM0CMcRz2oZ2HwGdyss1PrKQNhkGPokHhLS4l+6xmDPz+hn
+OedxnjYzdpAnNNEBe++UV4uVsrbsLxMw/EjF3FTzjIGq7NdaDh6vIgCceROEGEYu
+YObjFCdS85rVwZAq4GqwW71GgGlcS+gLx2EkS72AhVqx+m52iWnNeV3c3dKv7Ofn
+IlA6hWKK1FO/5GtyBMaYuvPcZClYF050Lp3xdOdRv8wk/Bwz+f3xf/DpmC5NcnSi
+tRgmr2ad7fRnDaz/JuMw+cfzp16LIENODYtGbwXhjmE1AXA9/Ew+JgW6eCp204JX
+xNL+nnEyy8k49EMkmAUNdWt2lDIhtFoGPbOrSdMRHYj64wGvvyvF+AXIhm4PP+a6
+2nJcavgbyUMOAVYQwQo76nwHSbjf27FWB7vif466jZtVdg+++Br7rrysy+RhnW/y
+ll0vH5qdZbbcisZUN11UmFYbO/V3gIe2vVmxbxU0zXbWnLeN51B6HLNaIz3HdcQa
+mMSAouvQOV3xuMmfhEt9
+=m/NV
 -----END PGP SIGNATURE-----
--- a/app-arch/zpaq/zpaq-6.10.ebuild
+++ b/app-arch/zpaq/zpaq-6.10.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-arch/zpaq/zpaq-6.10.ebuild,v 1.1 2012/10/14 07:43:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/zpaq-6.10.ebuild,v 1.2 2013/07/20 14:22:19 mgorny Exp $

 EAPI=3

@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"

-RDEPEND="=app-arch/libzpaq-6*
+RDEPEND="=app-arch/libzpaq-${PV}
 	dev-libs/libdivsufsort"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
--- a/app-arch/zpaq/zpaq-6.38.ebuild
+++ b/app-arch/zpaq/zpaq-6.38.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/app-arch/zpaq/zpaq-6.38.ebuild,v 1.1 2013/07/20 14:22:19 mgorny Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils eutils
+
+MY_P=${PN}${PV/./}
+DESCRIPTION="Journaling incremental deduplicating archiving compressor"
+HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
+SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="=app-arch/libzpaq-${PV}
+	dev-libs/libdivsufsort"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/${PN}-4-autotools.patch
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		# man-page is no longer there
+		ac_cv_prog_POD2MAN=
+	)
+
+	autotools-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "You may also want to install app-arch/zpaq-extras package which provides"
+	elog "few additional configs and preprocessors for use with zpaq."
+}
--- a/app-benchmarks/ltp/ChangeLog
+++ b/app-benchmarks/ltp/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/ltp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ltp/ChangeLog,v 1.23 2013/05/18 10:03:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ltp/ChangeLog,v 1.25 2013/07/20 15:35:55 jer Exp $
+
+  20 Jul 2013; Jeroen Roovers <jer@gentoo.org> ltp-20130503.ebuild:
+  Marked ~hppa too.
+
+  19 Jul 2013; Jeroen Roovers <jer@gentoo.org> ltp-20130503.ebuild:
+  configure: --with open-posix-testsuite => --with-open-posix-testsuite

 *ltp-20130503 (18 May 2013)

--- a/app-benchmarks/ltp/Manifest
+++ b/app-benchmarks/ltp/Manifest
@ -7,25 +7,13 @@ DIST ltp-20130109.tar.bz2 3816172 SHA256 471b21f1d6f952957f534cd0c5ee5bcbbf50b9f
 DIST ltp-20130503.tar.bz2 3819156 SHA256 afdb1479e73d4da7f0d4d5d3fe1570bc5fc96e3317d4a5c10c59c046d3dfa4a0 SHA512 efe7c3e5ffba51b03f01ee66d940d400f4f007dcc42ca45f9597fc1a325950ee14f663762280d63004080c717f16f39bc0d53b5905290470952ef5af3725f089 WHIRLPOOL 924cdc730e85d66d8d7655461e0a59a563b7a9039133b4e991a115d20453f46dda158ac82f474fc8d9ea720a4d03fc67d4d55c231c11d35dc3bfdc5b10a7258b
 EBUILD ltp-20120903.ebuild 2169 SHA256 4a30fdda46c8e24ab8917e71ca50b9f64fe2b521c3d34e2a4e8ef799d934a9c1 SHA512 a3deebf70483509f005afcd8cb7653574a9eedf4c5ca35b7f979b7d9439ec76d2979bbec8744ab1a84cdbe077ff3577cc9cc18b04ae57fe173597c94b9c6eaf4 WHIRLPOOL 44f68e6c364e043bed4e11b544c99f3025d4be09fc7ce51a8029c71c1cdb836a18719865c53363a9ff87d38da27039187ca5b6bf936f6f47019f8a6837f580b8
 EBUILD ltp-20130109.ebuild 1948 SHA256 33257bbef90e764b643002f337d04642f7793b003842a0d40574fc38aea28802 SHA512 7ba6b9fb7a9290eea9fce76652ef4d0dade1e9482eb18022c4911fe4fb1f03218d7b5ff241b35bf791723b796678922b58ae5578dd0c7676a3dcad7dd98a6f6c WHIRLPOOL be143b757caa552f1945f143707847bf4bfbfdb1f5874a7aa1f375a624f79f738389b13519b190bb1c4529a6ad0a7352949a813b1b5feeb04203d2a1985083e8
-EBUILD ltp-20130503.ebuild 1948 SHA256 e7c8e5bb8adc7b0722dae362cfff819cacab3bdba2a290d72bc5ca53053fd18a SHA512 63e64f0fccb954dbf56239a0af59ba34d470a130a477b7b3acfd2b5b2776f5fd4d00f9dde252614047fc0bcc80813883fd1f152ec2f8faaeff9a7ac0dde8820d WHIRLPOOL 0e7f3fc1961ab16a7da7ee9b5947519ef86a8d2a5767f08aad4fd738c850d8306024a05c4608f8a7b5401b8638ac5283ee26e5d3a2516cc7c70734c18597471a
-MISC ChangeLog 3395 SHA256 540b824ea69af3059988029afc3e6bb8003449067af67b154dcc2da6873bdacd SHA512 928fd9537f40a7e0c18dee70fc58f6f5e9793900f028530ec3372d3e1940637f464eb83c9c4521ab478cf1c322f22aebb8b3fb2373d1f04a838821347b0e03c7 WHIRLPOOL a2d859b13bb7138c24ac2a1ebcb7e4936b4e011f124fb2576c68244bf2b1fc50e093d5937a002108df0d582819d8648f68a16f1db7f622aaa29898618ce16a90
+EBUILD ltp-20130503.ebuild 1949 SHA256 f6bed04eee97a1e8f333bccd45a715b9e8b064ce82e9f51822e2d233136179ae SHA512 717e24314c715bdcd7a87e5aafa5ca85c5b66cb275f7dd6cd79b9dee2590dbc0bb022315ba8d9722728d167008005c4516ad0b793178a09646c560d60c8a3c16 WHIRLPOOL b8be1cd73208548f08342030900ea620de05333cb0d5b4230f7386b978873b45d82a50a9adff6cd7a72831c552736de826eb577248481047e14927409555f7bf
+MISC ChangeLog 3620 SHA256 0598b6d8a795ab17051e9d41463f6f12891c420c59da054673c7d4947c26721d SHA512 6c20e45d328177b005c501b556288aa8a5d93f2084bcdcc2f65b594930efb32a8858249067c98d5d1599e6dbdec503c2a295a8c2e498f8892bd37e0aacaff0bc WHIRLPOOL e23ad665a4024c3ef579df655cbc6e5bf34a6f4920bb25bdfffcb7bc49ace4132b349d9197bc09a88b0c03897efc782e5b3da3aaf1db440a2feef1e114d8f1bd
 MISC metadata.xml 919 SHA256 53e3beecda275deb5138e2eb9a3d278b677e72e25802584aa89cb5393e50559e SHA512 67f09324b73021d23a76e8e4e95f62b65e051372a0385a289edbccc9571f51346a620ffaa231e8f5f2472979e12423a4a1aa30b154680ecab42d4228ba30bbb1 WHIRLPOOL 64a5d38f1044dd8517c20e1ab37c023317bf77a20062b0a2b20007d6d7e25f4030767edd414a638eb30358602735143fc415f5940a8cfe6e6cb9044b5f98ee52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iQJ8BAEBCABmBQJRl1H7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88roEP+QFvge3nkIlpwE72+Yf9e872
-87eErqThmLLPPGWW7exBYvyHvupEBSZ5azKggbTeA2XfnpZySIcVYmJhu3ZK51RD
-A2EyJGu7QVUDfu/D+CeRgs0nfzwSg3SSUjcWQrZKR88RJgPBU7fFdxB2sv8ARlP/
-uxVzTC6XT3FD03JTwUVjT7yoMm0ZAaRrLel6a0m7TAvflyWVzAwWCaq0xPmKWI3i
-hsqd4acjcs7oq+OAVBxW/yULNSnzlPQb+DbvWgHRcqGfiaAjcI7nev0op1uDq3ue
-M2ikUBT8ZLCaDfhw2O+z0fJq991TCBNBLOuOU/RaMrSVRuEihICxswGS4JZMPk88
-mo2xZcuMRJLdummDJZzUuCRB526Yy5P0IPRmW+f9gFhQiakAc1msn0DuzpIZx3QR
-xPs8iACnPWqdVRMHGxnYGD/0dP/09lOvIQsSTcxeAwgpDQd8/GC5/KSUvszzsNB9
-QkiiBT0DSzltPD+KLFNnA/4/A2p7m1ACFavWTr6RwuL7nRa3z73EZLgJ0d0nnVUP
-dn290xhDzwWi1WA0mjCMZs1I0rplEPvZYWbbVCqrP5s4+TMsr3s9x50z+ekSYhH7
-k85hIGtNJxfLeZJZ9KaBZa0IU1AXq00h1fcTZSrXuiC8fPE/syOyyqP2mDOCb+4S
-duAbhQkYDY55KZoT7C5/
-=8x6N
+iEYEAREIAAYFAlHqrl0ACgkQVWmRsqeSphOMNACdE56NTto+l9iYW03gXHAGoE9f
+KksAn1ZhUXEP0PsqjXAHrpwz790tgmDg
+=XM8M
 -----END PGP SIGNATURE-----
--- a/app-benchmarks/ltp/ltp-20130503.ebuild
+++ b/app-benchmarks/ltp/ltp-20130503.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-benchmarks/ltp/ltp-20130503.ebuild,v 1.1 2013/05/18 10:03:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ltp/ltp-20130503.ebuild,v 1.3 2013/07/20 15:35:55 jer Exp $

 EAPI="4"

@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/ltp/LTP%20Source/${P}/${MY_P}.bz2 -> ${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"

-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="expect perl pm open-posix python rt"

 DEPEND="expect? ( dev-tcltk/expect )
@ -44,7 +44,7 @@ src_prepare() {
 src_configure() {
 	# FIXME: improve me
 	local myconf=
-	use open-posix && myconf+="--with open-posix-testsuite "
+	use open-posix && myconf+="--with-open-posix-testsuite "
 	use pm && mytconf+="--with-power-management-testsuite "
 	use rt && myconf+="--with-realtime-testsuite "
 	use perl && myconf+="--with-perl "
--- a/app-cdr/cdemu-daemon/ChangeLog
+++ b/app-cdr/cdemu-daemon/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdemu-daemon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/ChangeLog,v 1.5 2013/06/29 04:09:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/ChangeLog,v 1.7 2013/07/20 11:11:20 ago Exp $
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cdemu-daemon-2.1.0.ebuild:
+  Stable for x86, wrt bug #477004
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cdemu-daemon-2.1.0.ebuild:
+  Stable for amd64, wrt bug #477004

  29 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
  -cdemu-daemon-1.5.0.ebuild:
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 AUX cdemu-daemon-2.1.0-DISABLE_DEPRECATED.patch 1479 SHA256 00199cd43d7f887f7d30cb6b821e874a20722359c948d46629e07a57e29575b2 SHA512 84201d2d16a685c82a5942bd83d38fe9826ff3d1a12a18baaf18cee7cf6704ade4dcd7e0209c5e925ce328b9879d770b4ed782fa8f7219efa26ffdd134631bdf WHIRLPOOL 34eda50f34859172883fe5b24a8d01efce5249fa3522dca8400a1ef40799d54a2a326f2d2c5479cf8c4a751b061651a7b5b8f776295688cfd43a4d27017db770
 DIST cdemu-daemon-2.0.0.tar.bz2 61590 SHA256 9def5ac371bdc64ed1b7b8fd3dffa9573561deaa7cf4b52c8a2744d852dfc53f SHA512 71daf0c745df2daf4c0344e8c85d146de8c3f68b1f0a8f8f402a1bcfee7a29e32e6c0fb54fac873e2abd2912327eca9a8bbbe3584ba7afc70dd151057575bbd6 WHIRLPOOL 8aa953fcf26570492a5b959e172f9b287c858e0578fd271b269c2884c29324624787ee27e9133827a2734b1c5267e7afb5b14c8d624065d9e6025ee8ebab2012
 DIST cdemu-daemon-2.1.0.tar.bz2 62540 SHA256 8224a5d8d16cbd9a2294e9c7ab544d61059d9870023e48705699af7366846580 SHA512 8e7ab25c64b8567664c4d0c69f26341a2c8fe4cc98faa34b768965097d017f1c361672129b8dd5224b48a02ba7b4623b6a66ca0eb3fd50d5d8446bc758277f82 WHIRLPOOL 8e515fc2aae7d160ed97a164b092db6acee91ae7370cb562a786ce4b7612dbe45f5b28ba196aca92cacab344fa4a68f431b1e6392726307c15a7e4f3a713bdb8
 EBUILD cdemu-daemon-2.0.0.ebuild 1501 SHA256 b048d0e5d76426f06256a6193ae14b06dcd3777430b27ad8eb079ba106d1eb33 SHA512 2957430929e46b4892ad0ea7d152bd49b37c5705108f629374d2d7054a1629e70afd54d5da2bf4453df471d2bb921cf743245da8c492059faaf4f65e561e492d WHIRLPOOL 8c273040d269491736a7c2fc33ec759feda5c35fe5a8f895ec68cafeb75cf8e8c6d638265a24266f9b8514f23fd06c321cf62c6536653aa2e593d1a450f4ad31
-EBUILD cdemu-daemon-2.1.0.ebuild 1322 SHA256 c1af3e6044b601ae9c911b0771c91216178da5042b455951a01152f8af5715ad SHA512 e71705e9d3d04af6f063927760ef1e21c9b37f08d462567ce7f892a73ef706b02e3548a031b918837e3e5ff31cd9ea27a60fab017623225c13c53e95e89d700f WHIRLPOOL bdec835034d4a7a1f93dad4b8498a874cdaac81aba41a2e81b0e9adae5de3440d39f9742d2f6fa140930509a3219330c45c875ff4001b040f1104a2e4dec83a7
-MISC ChangeLog 5647 SHA256 d689cd792eb166269da75d00129d53a598f3024c700bd9c1a571a4925fe7713f SHA512 5080b96351e64bf075225ee69155f7ef8363791f9a27ea2cb118debc28f1892c63573d14742f1bad8a5bd8772cca55a5719ed2c8e4b103ec348655d43f1d1af5 WHIRLPOOL 4aa6036873d6c72f487b32b56ba26d35832b870ee80d970161fc4bba86cf6575948d9b0e19d2328a2651cb90219353eae5c60e0e84c574eea8ce36c01e21473d
+EBUILD cdemu-daemon-2.1.0.ebuild 1314 SHA256 7dc41c607f6cf605b818a7bb984f6da118556d8218feceb0eb88e8452acf0e50 SHA512 8a3e82fe07c12d769035bbf2d52e6c6afa67bca3aba5b84f77fe5a9c0832d175aa6e1daec1ec731646333f0ce2726d532462e81e90e3a3e03ba016ccdbe599c3 WHIRLPOOL 83d3690b9bda5188222d5e46f1bc1f681a2583d56bdb063a59b034131ea0b6e081b4c235b5c93a11cd14751b6e4a0a9d32e45ea7ed7578189dc73e2796cd03e2
+MISC ChangeLog 5865 SHA256 67da4de7874d59950bb94a507c74bb4896627718cd647f170a0b2dbd6ee2eb7d SHA512 54d757095a9e4db1b939e699aef42dc6094a70c82eb714fe90e2afeece055198c8aa50ebdd181c80b7815a051fa95222097e4821b2e3c4be0ab8af04cde62f37 WHIRLPOOL 66cd6404fbef76f8e6acb67d3e349d82fdfe02a35cb142f6c16f424737d5bd9e6c9940b9dc01fca4ab6eaf5e539e1b24a496441a6dff891efa4450e8e3ad9132
 MISC metadata.xml 240 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477 SHA512 14c9405275f11667ad7e035376fe7e5caf99ac982596621cda18a2f8a99e9a9b2464806be5d016d1a4c2fa794bf8b1400a5cb658a7a874e65d825b8baea69d62 WHIRLPOOL 0e2fbd97c0146322cf226d3086acf3e95dc86d17409f3d350ba2de1b81a2d93b0dc3f370d5c444475e129fa511791ea5b48ca00c47583cedc6ed60ef9e61fae7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJRzl4NAAoJEJ0WA1zPCt1hQw0IAKK3OAfz+l0bYOkWg8zPDa7V
-GDaVXAuCutUgf7hIIBtIN99E9LZlFZawap9G5N1LbeB7kFz4sTKGlpc+gxetSltg
-q1ozu2vgfg+ThlDG7pdTZGatd+T0wEUdURyDsU1EXsFUPZZlux9j81uQlPzyjh8x
-KPPpkpyPCLCX0QffwXjF8t52J6c6HkLZFkYB7vBehXTkNyyS86Ktirv0LM6Wwtlw
-XFaFLHBu6zOORq6mY2w3OXxIql2XcI23ooJ92MkNYv9HGBe4SnXCNYfL3ZF5C6OV
-ZvPJ6Cdkv3qKWHI4Qkk7XnH1ToBQvhUM7wobsnbsc5mubMq2mdNbykmhsmwKQ8o=
-=WUji
+iQIcBAEBCgAGBQJR6nBMAAoJELp701BxlEWfy5IP/23/Pz5GXnuXcrhDcmg7H8Ll
+fNJGId0bNWB1RcWhBb8C0Qk2danMulYuQFKai9EfFh2OyZB9zaKiH6lvlcmpZjmb
+cJ6y/WDsXdENO9BfXSTGPvmjz4apxo2oBnBEOcbe25+bV5MUQ+kBfrQxVXxQz6Eu
+cF7RbH/9HgXqFNajdW0ieaL3XAyxGe2d/ufNtyLJdE/MP+OszWiJqpd+26K75T4j
+cJSdxOzXWluY2EtFuI72+ZNXY/h60fT6mByKLFU1wpDCUKUdTZGuzb7LQkTksSpg
+52iPyzqMfncYM6jTy6g0P0vBDrxi0Rf6X7C39MivaVuXM0pPcKDCaM7D8RHx8zSj
+yVy6cv+zzQrwxUnkXRPI1Qs9dMGEDAILukmVgbvA+hiNjl/lskNL4XcmffQKluNI
+9gzvqtx9P4SQbtsdK+yWtn3TrAADF/fvt7wdEbNIF+LcqU7YXpltaNWJDFcXC9gj
+PgT7qKyQGpJmPJ8w0MicRCm6k1Ga4e6dQeaoWJHAQM5dCppHblGyDo/6bs/AsMg8
+FIAzpcCvRwa7UJ8kx2LPzxkSwO1YHx6VymNfTOr1vTWOonw2rWkkQHjjjxUQ31pK
+2NlJLGq392AbG4LAwPQWFlZfqMooig/MMnSzWfjU7NLD2FBS7yem9S1PO6EMnCr
+tb1uH988NsL7XM+MCSld
+=K60e
 -----END PGP SIGNATURE-----
--- a/app-cdr/cdemu-daemon/cdemu-daemon-2.1.0.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-2.1.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-cdr/cdemu-daemon/cdemu-daemon-2.1.0.ebuild,v 1.1 2013/06/17 04:18:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/cdemu-daemon-2.1.0.ebuild,v 1.3 2013/07/20 11:11:20 ago Exp $

 EAPI="5"

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"

 LICENSE="GPL-2+"
 SLOT="0/5" # subslot = CDEMU_DAEMON_INTERFACE_VERSION in CMakeLists.txt
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE=""

 RDEPEND=">=dev-libs/glib-2.26:2
--- a/app-cdr/cdemu/ChangeLog
+++ b/app-cdr/cdemu/ChangeLog
@ -1,6 +1,27 @@
 # ChangeLog for app-cdr/cdemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.41 2013/06/29 04:07:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.45 2013/07/20 11:11:24 ago Exp $
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cdemu-2.1.0-r2.ebuild:
+  Stable for x86, wrt bug #477004
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cdemu-2.1.0-r2.ebuild:
+  Stable for amd64, wrt bug #477004
+
+*cdemu-2.1.0-r2 (19 Jul 2013)
+
+  19 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cdemu-2.1.0-r2.ebuild, -cdemu-2.1.0-r1.ebuild,
+  files/cdemu-2.1.0-bash-completion-dir.patch:
+  Fix completion filename for bash-completion-2.1-r1 (bug #477378, thanks to
+  Alexander Tsoy).
+
+*cdemu-2.1.0-r1 (19 Jul 2013)
+
+  19 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cdemu-2.1.0-r1.ebuild, +files/cdemu-2.1.0-bash-completion-dir.patch:
+  Do not use a hard-coded completion directory to fix compatibility with
+  bash-completion-2.1-r1 (bug #477378, thanks to Michał Górny).

  29 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -cdemu-1.5.0.ebuild,
  -files/cdemu-1.5.0-man-paragraph.patch:
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@ -1,21 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 AUX cdemu-2.0.0-bash-completion-dir.patch 392 SHA256 507efb0d806f15b398d9c9473beedf7063b3faa8a453e2eb52384d353f40ccbc SHA512 c508bc0b7a4f6af34d17907938fc769f523e2cb9f8455d038ffcc29b046f489fbff0be0ba1ab30e374f48f682647790a5a85d0bc8ca6f0348476e47cf4e8883c WHIRLPOOL 024a54cfcc10cb4b72e747164391eb4ba46da5f38cb986a3781eba19ab35d8175b634dfe26ddf0cfdc9ac23dc04c9ef9ed29d50b0f4714934cb0d3b419d90971
+AUX cdemu-2.1.0-bash-completion-dir.patch 467 SHA256 992d3c5abf786c7385235424dc82dc46b3b29f25a5c0319bf30eaad0fff7d0de SHA512 3d363b34749c60dddbcd8bf3b861ca91650915cc79df194c1a00dfe309b53b2a73a62d25545d1b57b0d8d62137fb09006e03b6e5f3784fd6c925de99f7b8b9fc WHIRLPOOL e18cb21f05b243fbb5717ea7e7e4cde37a52359b5e9d45be1b0060df9fd653b7733665706b9fc030819a373b4f80dec7ceefa461766a1045b2cc4ba12d497156
 DIST cdemu-client-2.0.0.tar.bz2 28346 SHA256 a049df0d97b46bedf8604123c9ac6207f6b506855da6c379550513cb40e45603 SHA512 c510087a3c2a343beb99f4a02c9db0407ee4a27fb640af5343fac081aab10afa616ce3477fc2baf7aefbcde12b2de0c80e330be33e82ed7f60cf6eb3b03f854f WHIRLPOOL 1e3843d3ce6dab95726f563ea385e9a091055585f537b57942b2e51a547b342369c7577bf55f63a75fa378f95300c1eeaf8c00be0a42a04384654a13bff42fae
 DIST cdemu-client-2.1.0.tar.bz2 28173 SHA256 9bd0448368b5e51eb2acfe420f612f67e3b3d4aae4aa80fa36ce130fa0a10c9f SHA512 bc02e3fb6df10702ee9e710ad8a881c92b5462015d19152fe784778a9106a4c2ef03d0e2a23850a742cdf3242e1f81350ce8cdf89671681104dd4cfa85a48d3a WHIRLPOOL 0da8a25919144cd57696934fce0c42618f3d04bff315e7e55f319785e72a27fea954ebf05a7e7120919b9741f1b65a2193663bcef29982acf6b04c4a2e10f37d
 EBUILD cdemu-2.0.0.ebuild 1346 SHA256 c767aa9feed533eeb6257f31329f830310a8c83bf8d6d3084b63cb10978a6c30 SHA512 d1a02ac936561a67e70397348bee91e8e9a85810e2baa499bc63f6b7f9722a32d7068f6bbf99a9a186248d81b8fff96349f35d57a9269a46aeb8f7fbceab33de WHIRLPOOL 76498f6ac04dbb061966423c58c1672539f27e642049b37ac2a36d86a5cc7682e45542bc1f838101902961e66ae244a8dc59c0f3f5e8d4f9b93dec82db15bae7
+EBUILD cdemu-2.1.0-r2.ebuild 1455 SHA256 2b0ab524bf6aca8d4adcc5250e81e9731a1a8882a311326b2a624427324a5cfd SHA512 e5f95b4c5172c36b4c832c9feea9695507a9c0cba3df628cd1914ca5f0dcee10ce197c53d4d20b36b5e1e2f9aa7c9d16f022bdf2fec1950c9503e2bbeaff3928 WHIRLPOOL cb5d560daff9f722dd956d2c7e0b4955d91c246081ae51adecda92fa2c1e95f3d0c819977f557eaf21e1ee58f4813b73cf10ad7d1da68754bb385ba6638ec94b
 EBUILD cdemu-2.1.0.ebuild 1394 SHA256 14ce81a0af738a49f745bc8506199b210231d6b6a6f263dd1b2f44efd1541e99 SHA512 af9b60e09fdf914f06b9b9f0d4ad196696c626f1428d80ed3628aa0e1d5860858753e253f1274ad93a067670213c90a4c21b98bcc630ee7b87119e8304bd0e13 WHIRLPOOL 772d0b369968a7b9182dd0047dcad894ddb4df68833564eeb22d49aac3314b06943decb405070998570b6a4fc3a24c4b18cc1b83e2b01f2a829cce0dc30ba113
-MISC ChangeLog 6274 SHA256 60847fcd423f864eb5c95c373025e6a0174f2e23aa152baef7ee226ab3b63389 SHA512 32d8e377179c1e2493aebd7e69c13554f8947e44df09b2254e77b25357c7f06f7b18a2b29b37a31b05d5747606a39fcdd748b3ef69e595e1dace8b5c1edf9f81 WHIRLPOOL 26694a7f1dfbd350b54436ffed139ba4ca62ec160384b6c6710d23502d4ae87836214668e14dd594698c9f627e79355900d6b7791ad58c38b3551ad41413ade3
+MISC ChangeLog 7070 SHA256 359e1f81097d8a66fe3578e814058b3a8d918735fec0e3a941fa19ce397d7b78 SHA512 04ab49f9e58e85ed7f0c33816d5d3e1c7279515781d2739ba2f18126b16260fc263c3fe865899adc6f251c0775d8ecdf223985f697808f4a0dcbddbed308ad6f WHIRLPOOL 9dbd4ac7889b3dabec38335c87a03fec2a1fe71619abe0736b14ded16c36e48b90b8c783b072d28b2e91ac1d6630b56886fbae1bfcb10e72fcc69003f585a09d
 MISC metadata.xml 431 SHA256 48171f5b68cda683ad7bad2680218da9430ed068dbe441d86d5639dd9c9c3c07 SHA512 c62007c25bd76a0a5673e29e1c391d48c6d6f83e84a6fa30fc6bc7fac2d1924139fbd463f0025779bec87d0359cd28dcdb4d6df2778d5f0035b7811845da2900 WHIRLPOOL d86cb4f30b390600d7eae7c82783961a1e22d33d9459a99a7afe5eb49c42797b30a19b9a054f7f0b7cb415f427c6973b73fcfbc5e571af84d07aa06e8234fe82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJRzl2QAAoJEJ0WA1zPCt1hjPIH/2pjWukKgtEXBu+BftYPgndh
-w1cuEPNzQec//jBoQXrZzg5Dpk+9viEBjO8TS9R2vli3aDDMUjso6YeAr6kdDf2k
-QugqGrGRArcupW+eFw5AM2n/g0aoZGS1seNozSp2xI0KQSJpCEN1uAV3Odx8nsxv
-mz2bX7ahRW/xfYX12XB1Xmx8uUxGjqNByKkGEeW0EhBXN/uFFt11CoFFqiKjKPYm
-47IPFAnt/rgmo4dmi5/ZKVHJqgD2U4ENRBegfajh6Cu8G/jzJ/47YW5LL1thgOY7
-98DAHYtge0xNAp5W8GbaxewQYwWt3Omzx9p+q8E822AkpsdRTkzgBJlOwfiD7jc=
-=Iljk
+iQIcBAEBCgAGBQJR6nBQAAoJELp701BxlEWfWkcP/3u+eEY5uviPuMf73yny0/aU
+mif+RoD3dqAS/OFbMG5OOXYPAOaIZtLtd5OgXnHDlbydzWAR8tPMkZK4uSvOAuEw
+Gxu/ucfKdMObhe7oHiFrdgF3zr/Cs8bUH9RNLskyl4FTSslWsYz9GknfZ9IpKfe2
+q408VzOHh0jzBPWMtqVZreJFvjrmObSDOb7DmCop4+ZCnn+Te+AcW/VRRNNeh3Vz
+gZoKwsDvp3KXLbdRkRaznM7fs+VmKWgkSB4NZ+CK7pfAAFkZrkcD81/5MuLgAxPj
+R2C6URwXCzAbD9clf+iO10BVILL8ruwuxdaKtz1HW+9GqRTgDE0SRlT4sKydSsxY
+7W4WiWvzK5W7sBuYnuHwY4nWyONM4Iimm3QkJjO9IY/RSx1OcRh/9jtcHkTOwTKV
+l7R4RFWQijCQMx/dY7HR2keiQ5pd2YEYP1sJYyS9n7BG81bZbIxSBqv/XVItvkxv
+UctaQYWN9O5KKwjAFGFnobMhCGbQeOhQEwWbGkVpCepxoY4RDaU6EXYHc6B9LrO1
+F+QfJwbScpZXXFJ4pgauzApW+W09yJAqIdPJTPGAhdB0Zx1f3Dt6Ke2Oc39jnqRi
+P/2Q/ClYpAPY4HP5xVqGWnkAWxW0s5wKKpJ0TUAnTmDWZwQW9HuEdsJDIw7Kfocm
+Sav5L0FS0/eco7i7EaHp
+=tZO3
 -----END PGP SIGNATURE-----
--- a/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild
+++ b/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild,v 1.3 2013/07/20 11:11:24 ago Exp $
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+PYTHON_COMPAT=( python2_6 python2_7 )
+PLOCALES="de fr no pl sl sv"
+
+inherit bash-completion-r1 cmake-utils eutils fdo-mime l10n python-single-r1
+
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="+cdemu-daemon"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/5 )"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	>=sys-devel/gettext-0.18"
+
+S=${WORKDIR}/cdemu-client-${PV}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src/cdemu
+	epatch "${FILESDIR}/${PN}-2.1.0-bash-completion-dir.patch"
+	# build system doesn't respect LINGUAS :/
+	l10n_find_plocales_changes po "" ".po"
+	rm_po() {
+		rm po/$1.po || die
+	}
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_configure() {
+	DOCS="AUTHORS README"
+	local mycmakeargs=(
+		-DPOST_INSTALL_HOOKS=OFF
+		-DGENTOO_BASHCOMPDIR="$(get_bashcompdir)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-cdr/cdemu/files/cdemu-2.1.0-bash-completion-dir.patch
+++ b/app-cdr/cdemu/files/cdemu-2.1.0-bash-completion-dir.patch
@ -0,0 +1,15 @@
+diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
+index 6f33b7c..3c61daa 100644
+--- a/cdemu-client/CMakeLists.txt
+++ b/cdemu-client/CMakeLists.txt
+@@ -41,8 +41,8 @@ install (
+ 
+ install (
+     FILES data/cdemu-bashcomp
+-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
+-    RENAME cdemu-client
+    DESTINATION ${GENTOO_BASHCOMPDIR}
+    RENAME cdemu
+ )
+ 
+ intltool_merge ("-d" po data/cdemu-client.desktop.in cdemu-client.desktop)
--- a/app-cdr/gcdemu/ChangeLog
+++ b/app-cdr/gcdemu/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/gcdemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/ChangeLog,v 1.28 2013/06/29 04:05:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/ChangeLog,v 1.30 2013/07/20 11:11:28 ago Exp $
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> gcdemu-2.1.0.ebuild:
+  Stable for x86, wrt bug #477004
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> gcdemu-2.1.0.ebuild:
+  Stable for amd64, wrt bug #477004

  29 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
  -gcdemu-1.5.0.ebuild:
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@ -1,20 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 DIST gcdemu-2.0.0.tar.bz2 39502 SHA256 c6afa3b720618389119fd12c6006218510c1515d77637f27087b06f1a258c54f SHA512 af2ba5ac7bc8ef9ef442c511a28e0d77309b6b1d58170803ed072b712a52a5283e5b4c4c3b2c79cf687b1decfb87128a2cd956dfb8a0f32143ba8d9efe23c610 WHIRLPOOL b33ebb8c184c93e8e1e7d3fea4c99d6f3c4f063a8e4c80eca8829348d477eb1fc55581c41b123ccd878f8f28c24e9b817831f3fd55886b687d92baaab3d55a08
 DIST gcdemu-2.1.0.tar.bz2 39864 SHA256 1428192ba37124a8f756c5cb5a3bdce0c32745ff429abde9adad4133d41e1254 SHA512 1a61cd945316686326624da55cdba9a053a56f62a0a67fa3d377b95f51c83680c98b19fa34d9c6a4821e4b235d6394aab89423682333197a6dd8ec46b0c54b85 WHIRLPOOL 4aa0058a9d4158a60857a59ecceb2e5d3c3b4f242e4e05e6d4a4ed61695125fa3a607d90fc55809bca66131fd0f5cdbb5e1d81587f6c421d8ad13046c05f44ef
 EBUILD gcdemu-2.0.0.ebuild 1351 SHA256 6f315cadec8909ea17d508f297ca26b777fd71b0ebddfa1b958ab6ac2d994c16 SHA512 2891cedf5ea7fb82dae8bddf7cb48982715dd885918235eda209392648b010a6e19d4477cb8f6e02ec957019b00fd311c08e8f5bba273425613c8d4c4116b6c1 WHIRLPOOL 7fa9fac297caaecb861f49cbdd1206b718465f29803213e3b242d01780bf26080052088500228dd440a3f31ce8160824915c918cdb292a0212c8fb7dc2548b7b
-EBUILD gcdemu-2.1.0.ebuild 1399 SHA256 1c946501da3305bd55c88c081b1547f67cc5b9322942e58c82348c767eb660d0 SHA512 261d0ae0fa0cb357b2dd9aed8c19bbe2567659e4f6e18743d9a3f401b94b2e3a151c71c90f37e8426507344a775100747b0ccfaed8b8123de6e2732363e89376 WHIRLPOOL ff94b241866cfb11ea40a4f5c2a865b71c5324210f25cdd4736fd532f28a49fe813a7940dc1edc53c06a14bfb63615f24782a831db58dabb549adab8dcba77c2
-MISC ChangeLog 4988 SHA256 7d3317e16bc7f4bffd0c561e440f82cf5a3e343f5b3b0d6fbd1c62ad468ba575 SHA512 b7e0ab92f58a0f2ea7e5325927ebab512182ca87438ec7053ac2c4aa35e2ddfb768013c83e43e8d3764fd818dbbddbc25fa48ababb3106d3f6b55226ccfed49c WHIRLPOOL a8dc6c36da9e14eecf916e122923ea39dd432b87f4c19c4766dc57f5104df158a0a67def584530834318d235e9bdabdf28996ac663385edad044b86400c68a1c
+EBUILD gcdemu-2.1.0.ebuild 1391 SHA256 f20a567bfb1421bf1a19a418d00e52de872967cf5244a05097e03df29a3a9a0c SHA512 dc1b0e39d356f72b8d687e8fff32145825d4fde8f97b2c56a864c8a71603eb19922a7a697f6ffcdbb15b4877775396aec49a2c18e9f40b32240e95a72f3572a5 WHIRLPOOL 1bcb3a84c9266baa424725e53fdadf18d79bd94a573af38fe28c163e004c3f1bec5113692f09e3deae1a46cc7a6d15ead722f2fd0726b06f5241eeca1f137262
+MISC ChangeLog 5194 SHA256 386c6c4be511671a159df82657d60665870991787cf0e97e8068e3ed1602227c SHA512 e79237ed3fcc1c66f6812492c965cb4f0549bfead5bab4a170a50981323c85e90c1a90a3c05381a650426e8ef3ce56da8a34d6ba293be5e79727c084be168e1c WHIRLPOOL 5a131bea6c805f40f59626119208c5f1f0b8f5d6217a83aeae946665b51afab7138edd939c345397e96ac8c2c2afb1340221e1a3be3db5f56cf4a070e30e1da2
 MISC metadata.xml 240 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477 SHA512 14c9405275f11667ad7e035376fe7e5caf99ac982596621cda18a2f8a99e9a9b2464806be5d016d1a4c2fa794bf8b1400a5cb658a7a874e65d825b8baea69d62 WHIRLPOOL 0e2fbd97c0146322cf226d3086acf3e95dc86d17409f3d350ba2de1b81a2d93b0dc3f370d5c444475e129fa511791ea5b48ca00c47583cedc6ed60ef9e61fae7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJRzlz+AAoJEJ0WA1zPCt1hVIgH+wZFRksfifQAMoB+Pgle1nlE
-7xb+Xi0akbcONmIVfbiNShzRNk/u0zifRSoUwBLVaQi3TFFi0dzxWeSns+D/8O+f
-73QKj612EIhEWfc/ePPdG74H3LipGCtcb261tmlWh68/RhRUTWflxWFtI6ciJhv6
-cuvKY7kwT/1mNGLLc71ycRT8rBRJmrau4QL/gVN1EF79P5TClSjbXlKy+ZWEv750
-2ZyTF2PlGyMM6MxyOnQuudL0JvpK1AfMuLfeqYZJibe+V1tMmaEUXuxB9YueDBaC
-IQYyPi+9yhdgoAkSD3IrObqMra1Sf3FsJnOmzzIDtHq+oiqMUt/DQi34pKcArQI=
-=zn0C
+iQIcBAEBCgAGBQJR6nBUAAoJELp701BxlEWf8fAQAL1xwNkpGQ7ELmM3oWrb3TDW
+S+T+pq7E84HqwG35rj8X4VtkOEyCRTsKCuPiJhC9ijuSNMDReUYN5iGi2qaCUD89
+v7OaFsMkIZ2caVIsF/eUA/QiEAv61Oepl3tO+PFXyasJHOTA9Bxv5TCucRqTne8i
+z9VTZjoKYamkQQU+MMynb8+GQfPIyBIqqCxMWQf3iICFLWkEDzxq/tbEZr8UMn4A
+qMI5dmluY8mPJtvFPnD46XGg6ZOaxeVXfZ5S6a3u/oTkSCOck2IHEAHAJNgd2F1W
+xNgQmLaowMcs4YQxvj2dU51p6xafJT14NXjV3XUJwrxea7wd0mSX/x//B9ug8rMM
+n2fnbbAs0w526eRazvcdngrm3akosvOedCaQnHByXHdv7XGBzOptDxSf76JXEAAT
+93xyvwHB5JcoX1emgCtJcM86bfGvbMTVdKK6ojywP6wSnMXGslrpWjhWXVn+b9h9
+mc0JAe4jNRIJvaZDe0L6L46/1Qp6ec7q7aVxl3Oj3+s5XSbrgXGZKashZc3RNO4e
+WtiIMxd2RjpfkTxDz/BEAXlyXizoA7lb76XPg+U/WSPtGwE6UsAxEVJl+YrEedw+
+sS8mhZ7LhneRga73MhV1APTXyVdqg/O5OfmgX7t+PKw22fU88l1GT8bkAjZtCfZX
+VDoviMLTJXvCwXIA9Vi
+=C6fR
 -----END PGP SIGNATURE-----
--- a/app-cdr/gcdemu/gcdemu-2.1.0.ebuild
+++ b/app-cdr/gcdemu/gcdemu-2.1.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-cdr/gcdemu/gcdemu-2.1.0.ebuild,v 1.1 2013/06/17 04:19:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-2.1.0.ebuild,v 1.3 2013/07/20 11:11:28 ago Exp $

 EAPI="5"

@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 RDEPEND="${PYTHON_DEPS}
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.213 2013/06/27 20:40:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.214 2013/07/19 13:04:28 eras Exp $
+
+*heimdal-1.5.3-r1 (19 Jul 2013)
+
+  19 Jul 2013; Eray Aslan <eras@gentoo.org> +files/heimdal_db6.patch,
+  +heimdal-1.5.3-r1.ebuild:
+  Add support for db-6 thanks to Lars Wendler bug #476362

  27 Jun 2013; Alexis Ballier <aballier@gentoo.org> heimdal-1.5.3.ebuild:
  keyword ~amd64-fbsd
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@ -10,6 +10,7 @@ AUX heimdal-kdc.initd-r2 550 SHA256 17dfab0e7d56e0c0b27c258838c34c0adfd17e75be40
 AUX heimdal-kpasswdd.confd 148 SHA256 ee533af2cb109038108649bf3f44988fbb63d5a7fd2bacfd9842140790116003 SHA512 198d8f219abdd349213d26119e7cc343956981a5cb7d031186c81cb1a0b3f017097f4a429481089787b1cde6f8f013a8ee3909f6807f44b51531ac19a7a3a17e WHIRLPOOL bca32249a033919dd8b00ce94010408b8d2e259a11653372bd02f52a044a216146fe488ca91165095880cdc19bdc7a74fb9b9ce16ff803eeff760b6c39b70444
 AUX heimdal-kpasswdd.initd-r2 569 SHA256 4dbadcf17cd41807c0c470b3b81f8f1be0eafa72a888a49433c534ae179d1d47 SHA512 6244e81248f3a70b68b58de3c8164798b9774bc80ae34a3b4fc27d204a4f32c69640be38376f436eb3edaab341e0ea0d05fe03b90a2416b43b2d84bb8364a2a7 WHIRLPOOL bcbea16e319f153042d7000972623f0c399d6b432f813c5dca6de61e47b99382f6374c408e0cd087c13c6c97f588a98c124b675ff847e78497275e9b3384a423
 AUX heimdal_db5.patch 923 SHA256 5dac2109683705b2ade8962abfd88f1d989a371b811bc17176c5b360a67bcbe3 SHA512 63fc130ed68b4b39dbb828d25da5eeafaa04a5aa659c14c03fd2312dc78715bba681cff9b43992f4e4735b1a2267453b89b5c606c8a854bc92b04958788273c3 WHIRLPOOL b15abd5698aa7e8a8d5d828f8bc6d2c6aa9ea5c2400bbc696884f83301f68ea12802cb116122d1be0730c2411d8face9c0a2f115146feb9353cd682b8458048a
+AUX heimdal_db6.patch 1241 SHA256 a8b4385ce097b02317786f7227e55431253ea319bcf6364aff6bd17b484e84bc SHA512 923f045852ddfab6b1102ae69dff66775ae417384833afc36ff96c480f2809bca01e72a3d4f0b4bde6b3269cfcdf719ab8bdc9a0639d316ee384e7d1614724f0 WHIRLPOOL 4575687c8902b97b2ed23dc28c213aa38f792c70f29a10ca094d8b608f91b48fa491e6869e340d26514ad7bf9899d6c544db643fec26cb4b537888bafc73ef74
 AUX heimdal_disable-check-iprop.patch 577 SHA256 b2ab6f335b5a756856a5df635df82488f9dcdb3ed02a7114f90b4a34911f9721 SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e WHIRLPOOL 115bcf67b370a24aa911bfcaba5c9eee3015d02e14dd5522f9038bb31cdd968f046225eef064fca9134db885719e00499cba48ea43248f6793c4b3d477f6c52d
 AUX heimdal_link_order.patch 1164 SHA256 794560047c549a996d03140ebcbd0476646f4a8e9e36d0cfe6cbaddba611e754 SHA512 f3e411592a87ef49695641ccc30d2ff9d08310df6a157dfc4c366f0a909340a7a5c2667b57dc5f736e8b0e76d13461770191dbe826fdf179023547d15fcb30cf WHIRLPOOL e2e66bd92ca5e5e1a53372c5bf542cebea665bd32a3d281cb858a36bda98932cc1506c32d874cf9126d156d06f1bf481cda13ebad8853c121676cf6dde792f6d
 AUX heimdal_missing-include.patch 255 SHA256 1ad9d71d01776e2d2dd49da5951f6f02630ce137be910ff8484968e8327837c3 SHA512 18f4a5b0c74ae11fbd8874d2954639f36d480655d978af2b2dd19a8ec2b206057ef4be5861d8daca0725926b295604daeaa895b6024b2098922cd189d3e4484b WHIRLPOOL 346f1117fb5558203e0b01bb5f35596fd9e89b3fc0b8ddee58e331fada9024f9cf6b8dde20773f26079a4d9d4f9e1fe224d4a24a1c51ac6d9475f3519dd5a521
@ -17,13 +18,24 @@ AUX heimdal_missing_symbols.patch 821 SHA256 f8ef2353ce328e444dc48e211a32e77af16
 AUX heimdal_texinfo-5.patch 617 SHA256 4010cb2f6d09585aba071b9c9891c77704b62468d9583f82088d020b9538a24d SHA512 0e61e9c93263fa8f6d308315ca907b75d7957fd73ebb6d500efaf6b9920e70623b2f9382cc565ee35dcfeb0eb0e350e2a165cca98f9017153ccf1154f258fb5a WHIRLPOOL 976da1d738205a3ef7ca313e4b81ca658cfdad8e33f115a6ffc7c603dac845c7033fa88fa6bad3eaa69ecb2d0350bd29388d4eeb8b30372bdbcfed1540890856
 AUX krb5.conf 424 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38 WHIRLPOOL 43526f52aee4dfb456058001bc553a81e478edd315c7c7ce8e639958afdb3049ccaa686234066b17b2edfc5aee0b4af95596e0fbebd0e66455ff0599de1af5f4
 DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
+EBUILD heimdal-1.5.3-r1.ebuild 3690 SHA256 9e47b9bee533713d9ba582af58dd96b181c02b574e2817b822420df01037881c SHA512 c6dd27d1ebc8986fb89b1b74b6eceb314743c0405bb70903c03b3b5090e0fcdad786683932d0e6fe951ecfbdfbd11e5d85da3692e8634a7ffb0a29afbcc70b2a WHIRLPOOL 5c24ecd637228e2047b93ada58f0669b38bdb01175512a9740fff2cad9f52a87570f6ae576a9925fd98d1eb467d8ba3353d3328204b06233a494f72368a3edfd
 EBUILD heimdal-1.5.3.ebuild 3734 SHA256 862992f1fd985b71b396c14b0b8750dad34d230d48d50410257620b7f2a97a41 SHA512 8d617f74ae38a2176718aa3b96a629893bbb70718ab240ee0bcdcc9f690101c3af45e8f37bc7f2313d05ec43c03b18ed75a7660f45a98327216feea24e4468ed WHIRLPOOL f6791a87e4fa058c8027d2d28cae76287091dd019c636e33cb0f681e9e7146563cd97e1bbfadc68c6eb8aa1318afc9a66088ae4a129bc35d3177b7d97a56c885
-MISC ChangeLog 34111 SHA256 aad4900cdb80a4c19261e5a405aae03ebf397458d14f084bdc81c9bc37f98ecb SHA512 b0b23f559c7d352eff3dabbd54a4d450909e2e330fb576e148725ca370dd6b721afb13d966de9ffde761aa2dc1844d28be7408c412743cdea4e5eeafaf901802 WHIRLPOOL aee5fa47e181db9deafd9cf94cad8e2c281f85b83e8e79bea7d550cf833a96434317c1ba206f1634f26bd78cc6f664c80469bde8a7c4e68cc0abc82a0bbdf803
+MISC ChangeLog 34297 SHA256 2bf5283dabf2a8835fea099aa5074d907b224944d1b966ac8ca783d1e72e3ec5 SHA512 ce340bcdfdad7404eecb53dbc254c96726756fa14755d8cd4829918266807c3f250f4955530e76ee5f2b069ccaa145a0413abf43ce6edf09ea2c044e69e16e48 WHIRLPOOL f050d747766b67ef36e9444f652ff6e9782d4331103e9f740ea22242a2979f29250d72e2e2edf61426f3f0613d0640c794f20084762811f0c28828ef4ff4e81d
 MISC metadata.xml 469 SHA256 8d648750dfc00c8726d98166f672d9d35396cdad6f1ebed89e0ee4a29045abad SHA512 726af6834fd00706fceef63690c5605bd9d80930d707e6186bc19b7b0b325fe5edb8c71792c555d128efe7e95d4b9319d4f85cebe98261995b2d8280cf3735d3 WHIRLPOOL a873152dd611446f88202324526de306f5d6be8a6224aa9f28a4af963f9cecd4ba9c08b317ce51653e579dfe51c2ecca12b3f5ace910be83ada0cf6ae493669b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iEYEAREIAAYFAlHMoz4ACgkQvFcC4BYPU0raOgCfUWvWEd8n2N62xb5Q1jGJPau8
-S38AnjTob1V3pVb85SVt1HNrWK63g+Sb
-=8vFW
+iQIcBAEBCAAGBQJR6TloAAoJEHfx8XVYajsfyewQAK/ZRhfjOCCdcejYKhtCmQ4X
+G8/8Dd5qRtMgLvTRqQ871Wkvv7nB9Xv6kN1QprEpmf7uc89MUAAzQQzFpmj1oPIe
+c3K/DeF+jPg8yyRiF35RIL0ALg2J1r/kJ6eiyv9yxIZQy7/VW2QUQrmuzB5mh506
+Dvbmp+P5Avg/KfNNpffo0Jj02ek+r3gc6zJKaZJDbuOQ+wqd9QDDB2ZA/YLr4vlf
+JTj7+XtyUqo5U5hcXR6/BkBDGFxtGtXHSDnq3aJg/w0g7jknPD8bIgln+fvC217O
+AXMQlZTl0n3NleT9KtzGqmdFSeSNaPgciEvGdTbvjKJaIqZshJz48gQ8de44LvQG
+6gYtJtEMjEr/N6wA3BUojzw2Sh70YDV+7SPDOG85+hCYQKsqtBjhyPe3YAy0sAbg
+WVNBsOm/UiR1vNj1GDvWNTCWhLooNrE3cIly8p6WaGypqsFqEoh2ufZ+V6waSNf6
+z4aqnge1JV3gN10+Ob0HS9hy6MtWfzW97GLnJMUp1YSo8aFms+Y5CctjLv1TC0uQ
+I/mXdOeAyxkBtQ5HHq8mI6h9SDwPgW5FfHxXlqpnSzs3J1dAAfCztyWP+mf0ngvR
+0QBeOX2a4HS04uPXepapXcSXhW9ujMjHL4kkcnx6l8FrWAIJpm8C07K/51e0b/ka
+pWwnYA7m9I21qHfR2xpp
+=IlMK
 -----END PGP SIGNATURE-----
--- a/app-crypt/heimdal/files/heimdal_db6.patch
+++ b/app-crypt/heimdal/files/heimdal_db6.patch
@ -0,0 +1,41 @@
+--- a/cf/db.m4
+++ b/cf/db.m4
+@@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5
+   #include <stdio.h>
+   #ifdef HAVE_DBHEADER
+   #include <$dbheader/db.h>
+  #elif HAVE_DB6_DB_H
+  #include <db6/db.h>
+   #elif HAVE_DB5_DB_H
+   #include <db5/db.h>
+   #elif HAVE_DB4_DB_H
+--- a/lib/hdb/db3.c
+++ b/lib/hdb/db3.c
+@@ -276,7 +276,7 @@
+     }
+     db->hdb_db = d;
+ 
+-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+     ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode);
+ #else
+     ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode);
+@@ -284,7 +284,7 @@
+ 
+     if (ret == ENOENT) {
+ 	/* try to open without .db extension */
+-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE,
+ 			 myflags, mode);
+ #else
+--- a/cf/db.m4
+++ b/cf/db.m4
+@@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno],
+ 		    fi
+ 		   ])],
+     [AC_CHECK_HEADERS([					\
+	           db6/db.h				\
+ 	           db5/db.h				\
+ 	           db4/db.h				\
+ 	           db3/db.h				\
--- a/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild
@ -0,0 +1,135 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild,v 1.1 2013/07/19 13:04:28 eras Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+VIRTUALX_REQUIRED="manual"
+
+inherit autotools db-use eutils multilib python-any-r1 toolchain-funcs virtualx flag-o-matic
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	berkdb? ( sys-libs/db )
+	!berkdb? ( sys-libs/gdbm )
+	caps? ( sys-libs/libcap-ng )
+	>=dev-db/sqlite-3.5.7
+	>=sys-libs/e2fsprogs-libs-1.41.11
+	sys-libs/ncurses
+	sys-libs/readline
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	X? ( x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXt )
+	!!app-crypt/mit-krb5
+	!!app-crypt/mit-krb5-appl"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+
+src_prepare() {
+	epatch "${FILESDIR}/heimdal_missing-include.patch"
+	epatch "${FILESDIR}/heimdal_db6.patch"
+	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
+	epatch "${FILESDIR}/heimdal_link_order.patch"
+	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
+	epatch "${FILESDIR}/heimdal_texinfo-5.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+
+	local myconf=""
+	if use berkdb; then
+		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
+	else
+		myconf="--without-berkeley-db"
+	fi
+	econf \
+		--enable-kcm \
+		--disable-osfc2 \
+		--enable-shared \
+		--with-libintl=/usr \
+		--with-readline=/usr \
+		--with-sqlite3=/usr \
+		--libexecdir=/usr/sbin \
+		$(use_enable afs afs-support) \
+		$(use_enable otp) \
+		$(use_enable pkinit kx509) \
+		$(use_enable pkinit pk-init) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread-support) \
+		$(use_with caps capng) \
+		$(use_with hdb-ldap openldap /usr) \
+		$(use_with ipv6) \
+		$(use_with ssl openssl /usr) \
+		$(use_with X x) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
+
+	dodoc ChangeLog README NEWS TODO
+
+	# Begin client rename and install
+	for i in {telnetd,ftpd,rshd,popper}
+	do
+		mv "${D}"/usr/share/man/man8/{,k}${i}.8
+		mv "${D}"/usr/sbin/{,k}${i}
+	done
+
+	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
+	do
+		mv "${D}"/usr/share/man/man1/{,k}${i}.1
+		mv "${D}"/usr/bin/{,k}${i}
+	done
+
+	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
+	mv "${D}"/usr/share/man/man5/{,k}login.access.5
+
+	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
+	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
+	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
+	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
+
+	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
+	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
+	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
+	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
+
+	insinto /etc
+	newins "${FILESDIR}"/krb5.conf krb5.conf.example
+
+	if use hdb-ldap; then
+		insinto /etc/openldap/schema
+		doins "${S}/lib/hdb/hdb.schema"
+	fi
+
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+
+	# default database dir
+	keepdir /var/heimdal
+
+	# Ugly hack for broken symlink - bug #417081
+	rm "${D}"/usr/share/man/man5/qop.5 || die
+	dosym mech.5 /usr/share/man/man5/qop.5
+}
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.401 2013/06/17 00:58:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.402 2013/07/20 05:19:48 radhermit Exp $
+
+  20 Jul 2013; Tim Harder <radhermit@gentoo.org> gvim-9999.ebuild:
+  Update VIM_VERSION.

 *gvim-7.3.1214 (17 Jun 2013)

--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@ -51,17 +51,17 @@ EBUILD gvim-7.3.646.ebuild 961 SHA256 cbb1a32a5c1e81edb59c62464a9fd6a27a168edd11
 EBUILD gvim-7.3.762.ebuild 960 SHA256 fdc9908bdddf2bca1fe7db48fc9adda653c9cda4cb87cd83f536d3aa4d3de4c1 SHA512 11b1b463516a6ec0f7417abba2b8b226103f58b735ff9c55dc6f30e860081f151cd3be17ee4cdd30d0ecdcf1a8df78d74d38901833370a4df0b9d013158269e6 WHIRLPOOL 1d35b92002f4bd66991fe91eed28ce61295526fefa5ac94d2fe881b8e6d09a44d66498fccaca748a80c47f9d760ca6b47f0152ca79991f22486eafdb378d957b
 EBUILD gvim-7.3.905.ebuild 1139 SHA256 e23ec1376bba1f4c2295f332f488f3e5043c2d2cfb63aa5d0c7f01f4b0c150f1 SHA512 68ab370c09d995ab92d19e9e8018f5f1850d49ec721faf959331fae1d1642b478930b9d8f08ef42a11e52e9fec9cf2b4c2f5094790a3060b2b78ae3fc58ed71e WHIRLPOOL 95f0052f7813d0f99a9764d8c3f8d76fabeeb33f6745c1d20f7d220237ba6d556eae29d648df8b4cfeb9cadd576dc2a673cd406854f230602dba7077e85e468d
 EBUILD gvim-7.3.931.ebuild 1130 SHA256 484f8efe9e6607aea9feae3c792140ffa4f847c3fbc4c0bf24ebf8347e205ef8 SHA512 10e1e9c9a7bec5cffb53421ce3857751a813633a0f0b14417882ca5c3a4f2e57ad107f3dce15949f32dba6da6b836d2dcb2548315f72839122fdbf904045456e WHIRLPOOL 849a8d48e6f1874184352a06d0858218f48d461539001357f5c2a174c5267bc1addd3880d06a9df072c83b3984c224896f04392726af73c56e55cc5d241392fe
-EBUILD gvim-9999.ebuild 408 SHA256 3e9e3e99b9317ef1273171f9a80546593f684cb3a96e3d336ae4eef558577437 SHA512 e43f7da3cb763cc5333eacb955dc1d2875c20b11dcf489bf242b711210059600e1d31f5d342105014091097b69c41ebffea53688ad62b15dd0272ba518da5725 WHIRLPOOL d6b684d63a81b3382a766517aa10b74d88a6c2f1ab486d3850f8fb8d82bef2373dbd3383ecea73274822f692a3726463542b62ab2b48af51d7e4909a281cf8bd
-MISC ChangeLog 54209 SHA256 73d8979fa3d5f5eeee7fba6a641e1155eb410213e6b4f5b3be93fe048d6fcb1e SHA512 df8bbef377ebc8de7e512c4c06c9fc050d880f866194113ca7be5e153d48382a959a36af6f240484e23237af9b5c6784225c6df3af0118465df3fd99e4e6758a WHIRLPOOL b350206681c169846cf8a7e4d53f00280acfe0d6f385863a0afa2f18d6821c5bb658001893bb8e0b14ba2a07f628b23231f80bb37eb4a1c6fe5b40d68006c30a
+EBUILD gvim-9999.ebuild 409 SHA256 55c6a13ca05ffca6141798126e228c619962f62a4bd0ca5123cf816a01a64c91 SHA512 cecaa97eae12ae3ef63a8c78216cfd9e2df1b86a70181756b57682b13d75d2c497f8ca9fc50e54dc8854acd81849ef64e6831f8d7e0d026fb1cc3ff4c0b4654b WHIRLPOOL cee15c589dbbdfec02defdf1893ca0c229a06aec856ef77e5185e6ca2663c20b1eb73a90fd791abc91c9767d4d0e9ccd47f89918ba6876d62bd91c5801387504
+MISC ChangeLog 54299 SHA256 2094be265381598307605a9b762dd9da8c79da5d1261576f20f2dbded6b53fa1 SHA512 e5e90055c499c3786a43baf9620c32e5b8bcabad6d9d8cc5e3b9387708f68aaa1ba5739b40d565d64c276e383e0ac8bc4ea784e19575a4695637fb044fc92ef5 WHIRLPOOL b4efd820bfd6cc42f508cef96e3762f2d2271fcbe467d9d8c0c0add3fa063bf7d50eeca17ed1acb96330b34db2cdb0690da91ea082d19255ecc45debda802c07
 MISC metadata.xml 256 SHA256 f4c244e16d3addc264e2dd76e6fbf341a933584e86e2e325488580e5cfd88d22 SHA512 43a8d355895af346a37d75e0e720bc8a11934f781acf7d2ead09f2285f11938c428a15bdef3278510b1d8d986afd392b9895f40a9bf055492de66c784826d373 WHIRLPOOL ba679403f463f83c0b039f24a01d04eac83df70b0b964c7b6a3a9e15e69311333e5735bf12763a86da0eca4fa295b00bdde90ceafcdfdeb73248e769ae1feca6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJRvl9FAAoJEEqz6FtPBkyjUdcH/juW9FQwCn0Lt4yMfPSHgh8b
-uhog47n4A/kl4kHKLsZA1wCosWCy00+fxXzabAv61YLs/qQrjh2QazxHUKshZx01
-qtzY1aa+HKdwTLfQxohA+pdJMsRC9O7RyYxBLQwLOrEeGT7PEvzEC4gRP0JLRrLS
-M2+/C98vUuV13/YeaEEu0W8tGdAHjxX/4JoUAGvKmPgJbA291xF/DCfzBvLREBxk
-oZZKURGp1cuDldnlQSGHiL0xBiWEEEvOBpa/4Hyd8uNbPKFY7HjoRDEyDBVgOjlB
-IGV78FpXY3onklsNjKVBdBLHHtAP4GPuDyLXGuOQpvkr15dCvHNJiOAwEOL4sK4=
-=x27Z
+iQEcBAEBCAAGBQJR6h32AAoJEEqz6FtPBkyjsEgIAKdUJlUzsLVfRUcJ1zwv52ER
+xEJFgZQQVpQPz/8uNdrlddgF3e4FE0gB1xO+IxCaz0bnwMouF+dZ5MEhCPzRQ6zt
+2fdg7XW7ij9PGP1n3qfyfMhVmfHFHF7D2gaZs0RlyT84980LzpsebhzmpVRkS00k
+N0toVDarKR9bC3Am+pr5rvLhiFJ9h6bFOnMXMiaMYc0c2tYqgwctd2vh2fLuMWVz
+7GoSge7hjT3Spm0oQNggGF0jn8egm1CNwfRbFgc0VCpI9NbfVDVp46X+mLs31Erx
+qjgcXJaydnf/yrcaRU5txjol8bsnmVH8Z9+cTgMfOwngdFPV339HgZ2ENE9mzns=
+=3urV
 -----END PGP SIGNATURE-----
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.1 2013/05/17 00:44:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.2 2013/07/20 05:19:48 radhermit Exp $

 EAPI=5
-VIM_VERSION="7.3"
+VIM_VERSION="7.4a"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 inherit vim

--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.421 2013/06/17 00:55:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.422 2013/07/20 05:17:30 radhermit Exp $
+
+  20 Jul 2013; Tim Harder <radhermit@gentoo.org> vim-core-9999.ebuild:
+  Update VIM_VERSION.

 *vim-core-7.3.1214 (17 Jun 2013)

--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@ -47,17 +47,17 @@ EBUILD vim-core-7.3.646.ebuild 992 SHA256 7038e6a166239a3ed97059e69d773ee76d3b0a
 EBUILD vim-core-7.3.762.ebuild 981 SHA256 90dc7fe6f060aa0832fb14635707c51bef58dea713fef0e1b475299ece29d3fa SHA512 b413a8c456ac6f1f0974701c05729ecde3ab3919e60b993ed4aa064f20abfbdaf1d556b588e6575708438fd5c94bba0576a5725e9c8346783684166db83f554d WHIRLPOOL 63b8bc9acc28d07a8eb180c5a88510cd59b570d318b24f437a16c32f2430cb3eaf5b3f298734c1e249b82f937c36bd8fa8095154c31f5184b59f2c2fd9bc5261
 EBUILD vim-core-7.3.905.ebuild 1054 SHA256 ed1055a936450ad9a334bf226cd0246f7b7cae184f402388da1d2b925f1f27d3 SHA512 3f7db5b96318cec5d29196450a143fb3761a0b1840fed93969addf86601a9035e5f843c7a681593e93adb65550977330a1e375dd676422cfee667feb1a2b7452 WHIRLPOOL 93f39652c6580cdd7f7313592c6498f6a4a5377247df52e110a780bd92ccb8e90f3549c4c8b6c97c52f9149611e0bd6e43b2bea760ed7b6187d4f428afa89472
 EBUILD vim-core-7.3.931.ebuild 1045 SHA256 f4961ff7d7ac5dd5489faac899de2e21f30adfc8456c07f5927c3178283064c2 SHA512 750441bf0fc65f4358a4eb8c638f5f2412a86108ae059c8e057b645be9740049e561528aabcf325893eca3b90610a2964ee19d8fc0f750d972a21d08f7bf2387 WHIRLPOOL b1a79a17a0c7ab9167b2af25c1598e5ed37d36732d90747221b3a5749541fc52158ad5db14e03de46d7f9d67e637c8856ef460a976a27615662fc276e72e0a64
-EBUILD vim-core-9999.ebuild 330 SHA256 bbfb17f3b9d93300bb0ff5e511fcc180f35d33a63edf09f419c31edcf46a47d5 SHA512 31ca08b09e37fe696e9d61a2567cd29b3d9dcfc21fe9484aff3e4a69e83452e1f97e70350816fe32de7f746262f34764c41049d82ae40129372b4a0e5ccad927 WHIRLPOOL a4e03cac7b11b9a7fcc1df26ef52c862f47c8b22af9a082471b9a08799fe94c99d238da3cfd23a245a521b085af4f532be40816170d0d745baf2393551d1942b
-MISC ChangeLog 56715 SHA256 ae20c85b28b79de122baca3a5896cd3f1d52e60cd22a14485102c132b7e4c918 SHA512 6ec52d077d117cb5f9b7603754a445cd19ca8b4b9486bcab971d6ddb45926470b705518d2094017b78b6aed57c36ea1336b7f65949c1d0275191ce2ba7ff2a04 WHIRLPOOL 418511db1a2b03e5922f8183e6f2475922895288a7f828f217f42fa61ef7b5394448bae4625cf1aaa8585c60f93dec3e105a103e9e57a8f2b2a8b5daaa233334
+EBUILD vim-core-9999.ebuild 331 SHA256 904d6d4f76df18076a051ad3842cafe86656428db0c0cd4b6e3933a1eabd3795 SHA512 26d62220f7c641f7cdae4173aefe1c8101c7afaca1264e5d5f4c187af4f681f4ea7c56b3c38bf9702f55ffa4298873499061dcfccda7ecca15b0ebbbf1fd00a2 WHIRLPOOL d3a38f529b40f9d6815ba9506893c44062a107065868ad3babdd87e5cb4f58c3395a463140460626fdc961f839db30450312ae91949ea7d9a273ddcef6a2e907
+MISC ChangeLog 56809 SHA256 9aa1f9a703c8683a8418231d1e23b379264607abc47e3a7e79f080057baa5286 SHA512 4aa1b2de403d602bb576ab7c532b9d7198579b69e8e362cb01ebaf34f4436ca06cc992a34e80072981a7e50d322f9e1955011f54e9deecc2ae06ea92331a7f91 WHIRLPOOL 938ec2885df75b4f467d0fecaf20e969ab2780e122bde890813b1d06fb4e1dec582fb9481d367ce826f4167c1b4b059997a05296a12a146532d38a2a672e5677
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJRvl6RAAoJEEqz6FtPBkyjp9UH/3vnt2atGyh2fZqhpnAOB4yn
-q9sBlIrwa/jnMBiRA0F9Ok4vvy71zDVbDCT/qUhEGhsi5Dg/AycDqwmBqoGHWDhO
-is8JHQ2Vi+p4UOILO8WB/RPiPLQJm5DjKTXFvizbxcvw2IeAUSQm+HL5qjP0N+pH
-sX9gDtPtsZ5o+h2OS/wYMgxUKoWjyXNeJNL7dJmcj3GisKLlnr0GS3eMJpQchlDa
-C2xUgZB9tGJihE8bBlQCaz0myzk92OLY+KO0bSxOWppgQws187ws4wWvPAI9NVkJ
-XJ78FaLiOQ1pxjn15bWRCpQJCbSl9F+EGGxBS7Zvyl5hrv+46O2nR0oNM+sy/8w=
-=pjTw
+iQEcBAEBCAAGBQJR6h1uAAoJEEqz6FtPBkyj3K4IALm96hgQqkoveSq5wTr8EvoX
+U/Vy/ekW98YFoSyKp6a9iWD4sDAuHq9lwDBNCykGgss7RFKa77iD7s8Z1W3GoJ2F
+/dH+0zHJuBiZO5YyFDnvb5PE00IAzgBOSCGgI6fcXGDoTDFwTYW85jiHodflyulm
+vTtzF22CnJ/TKlpIE5daBAb+oR/ws9fa/3ljhupyPvDE81+eSG7CqIZM6ctQ4lp7
+lYDG8TLHubhntr92HwQm3A+wZnmt8T9XruBlI8w6Z70kyYV3T4Ka6hGDbKkXqZ0S
+rI8NwYkIGoFo2WZYAnrIzQxj2qUjCKzUvwco8mVvXuZKJghOBpkGUt3I4DhTjXI=
+=rd/z
 -----END PGP SIGNATURE-----
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.1 2013/05/17 00:37:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.2 2013/07/20 05:17:30 radhermit Exp $

 EAPI=5
-VIM_VERSION="7.3"
+VIM_VERSION="7.4a"
 inherit vim

 VIMRC_FILE_SUFFIX="-r4"
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-editors/vim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.436 2013/06/17 00:57:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.437 2013/07/20 05:19:11 radhermit Exp $
+
+  20 Jul 2013; Tim Harder <radhermit@gentoo.org> vim-9999.ebuild:
+  Update VIM_VERSION.

 *vim-7.3.1214 (17 Jun 2013)

--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@ -48,17 +48,17 @@ EBUILD vim-7.3.646.ebuild 1012 SHA256 b05b3d34e05a1d4b52030d4578cf7adc2cb39ac770
 EBUILD vim-7.3.762.ebuild 1001 SHA256 17cb878cf1c5922ac95d2d6c04215ae1bd695bff7a4ac742f92fbd0a8d688829 SHA512 2c7dbc515e74af5614e9a3290f61adb270c6f4dd0be4795f55a35d9d723c2bc7f3af4b890b571c21962be6585551b685dde68d6c1838368af7a1721ec87c1219 WHIRLPOOL 2a17ab2e9a9e903f1d2792d29d39086a8d3eb42c55683a409c6a6025ab2a5bbe1ca3750b5ac815164b293a6ecd59d187c37558e084baf66b4b6818d290800325
 EBUILD vim-7.3.905.ebuild 1190 SHA256 b4f16c94016985c7b05fbbc17c713d06bffed04c673a34174f3a20a58282a6d8 SHA512 7034cf512f61a3ce1dbc60489084ad4c58b90c766daa2c3967ca80a29f2d89fc134fadf1383c18cba1e4d435fcc4a31a6302abb8836967a13c3a0d575b8e3829 WHIRLPOOL cfc0e883c9b79e931faa5de97eb460e5d83672f683e311155450ae11dae2ec123fb1ece31fa907a34cf1b04f6e78a15b074939805cfee762858c53ff62602b63
 EBUILD vim-7.3.931.ebuild 1181 SHA256 06607685e6f99de763e858ad25e92a124712e74212026c87f125e156e5ea8725 SHA512 c9a2f2532a76b9e230f0e3f4b244ed8866a6095ddfb2510e969ef25c31a82be3da9ae60b6cbf83ecaa69f81bf433f5f8a971ec9d8c0238e9b7cd81f05bb6cf18 WHIRLPOOL a370b9eb022829d8a216aba5e1d866030fb83759ffc7f066105151744cba4fc1143e27580999d81cf69d6ca77b7e7af6298fb991f9f669ea682604fa3254290f
-EBUILD vim-9999.ebuild 357 SHA256 b9ccbd3f94f0335c37d2c19a57a7231837cf177b1f81b3da1d66bb37c502aef4 SHA512 b914449c66ea950f030549bfd70f0a328d01bb0b54c58deeb33a2dcde2d7afd6b3bede6b007460fa6858204f3a059d6eafe06d1d2467ed7c44230f9c95ea8f96 WHIRLPOOL c67274eb6064a1c6101d9facde12f71a013c135b1dd037f8477c3516438d29a5cb63c94cb189b4aa39f8f7fc64f618cb3f15819b723a064a5b31944526be39a7
-MISC ChangeLog 58206 SHA256 643a45449d3fd8a201a662dc9e81fa95457646d73d9a0e65c5878dbe2f1b6b27 SHA512 70beea733b5bba1868270e407d1f81a7bad914f526a614c12f5327cd2e7767a5186bf590fdb3bd48dc1bfbc75898d15b61a45838581198b5e581f23ae1ef9797 WHIRLPOOL 56e7a984626bf31e5ada54747b008056b997e6c9a363553a4057371327eab39a96be290b0f56412470ff0eb31da0e0790cc2186ab5b481fbf32b7407b9178f49
+EBUILD vim-9999.ebuild 358 SHA256 d75672d176cca926d2cd8cd22cd39eddfb25be728cd907b0bf91b26e42beef2f SHA512 4dd3de029a281c0e5cee005cc64b96a75cc3f915bc447f6829545d1040c9ba53b46251a9c924bc6ac8e2ea486a0e72dbeb4e9acb1562a62d78acc376f038c4be WHIRLPOOL 5686e3942539997dd4e154ee1799e10d16d86b6e06f33650595f8f7d2b07eceea7124c727bb534c12b88729314a61b7dafdbf8fe51c2583c11d1201b739e9d2f
+MISC ChangeLog 58295 SHA256 1a2184b2aae629adf5f5dbfc2f2d43c7be1538a218f36d24d0ae520437fb0eca SHA512 dc48cbb3f96ad03c7f73aa95937c42f2a2ea3db2759a4eca87cd067c08ba8ea2e9f15e7c2db21545b7528d6f6c412b2d5016faee026bf7686241d88178421205 WHIRLPOOL aaf04680171d14d919bf1d5cad85525000ac8e9d6f0df94f3d2a1b916eb3b284b3eacedbf25f01cfc7a0dfcf1aaa85109290bbfa1dabb8ac573a2514a2ca7525
 MISC metadata.xml 428 SHA256 ff986f254f55743671cf673ce2c35d9004857f2b7b59466c974ac4aa46011661 SHA512 00b31eb0c7ea19e7c117d575522ebe8827373fe05ef449355a6330a21a300848f635263182ee7ca82d1e3da2110fccc4e9fb25304e5ec1cfe8f51b60106dc308 WHIRLPOOL b15e24e2244a8fae5f6dc3dd6e18f88b8ab13301360d57aabf6b8ae2945abffa21c546a10ffe119d0cbabff19e4ae46a55a9068e5eff51e47556024df41f6c8e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJRvl7wAAoJEEqz6FtPBkyjiGYH/je2uhQspFY4zcd34iIijr+K
-SHrEa6mPCIQ1KgpEGWZcJn7XZloogVFVbX9Dmd2dZHKJUmCkqGImIshwWlw9eGE7
-ozHL7v90jbff8UIV2pUJOIE4AgdM/P5PZyF6MzfmfGGiBO/p8gWETVOOPmiSGXHa
-hlaB73y11k3nhV29PEXSlM5RYrsUwcPViCWzx16zhGARgEWMfj5yaHR22QLT2jEx
-OayVTP9Zpp3FqsAGTvJRpFrc/ji6PthzyZwF+KjHDtvI/+9v/+KzuUYS5Tw7S2xw
-nZytUZ3UljyJ8uhEuqsQkwubFLjK6wP8H84b/DtWOLnovb12ffBnVNvaGh/+wyM=
-=47u1
+iQEcBAEBCAAGBQJR6h3RAAoJEEqz6FtPBkyj5g0IAIlcEKTgYZvHIR93E+bW7j0z
+k5J//YsqJdq3NF7Kyi3L5lOyVt6M1r9hfuyq17tZktoav5OIM5ISvONrKaxYRlp3
+vc4L6qCXp3U8b2iIw2UI+Y0a5PkYLrw1kIJHyC4vf+MoT/qi07yd0pgPavypOyut
+id3IHu1FWkJYX4T7YJhvGMUOs8fvAOUjSU080w7Zo3rWTeUdD4Pk+chGIwfp+zmC
+r7jFp2739fwNSG29c0+3fbYwYD773qRkMsr8J6RV8MGu4SjaTOzG+mGzUgR8gmEC
+6ShpfR9AzEWw8E1YBGLeIPBR1eFjy3HlSpNtcjh+Swkn1GPN56+MabuY5B1nNPc=
+=PM8Q
 -----END PGP SIGNATURE-----
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.1 2013/05/17 00:40:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.2 2013/07/20 05:19:11 radhermit Exp $

 EAPI=5
-VIM_VERSION="7.3"
+VIM_VERSION="7.4a"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 inherit vim

--- a/app-emacs/undo-tree/ChangeLog
+++ b/app-emacs/undo-tree/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/undo-tree
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/undo-tree/ChangeLog,v 1.6 2013/07/19 06:32:47 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/undo-tree/ChangeLog,v 1.7 2013/07/19 17:17:07 ulm Exp $
+
+  19 Jul 2013; Ulrich Müller <ulm@gentoo.org> undo-tree-0.6.3.ebuild:
+  Replace elog message by DOC_CONTENTS for readme.gentoo.eclass.

 *undo-tree-0.6.3 (19 Jul 2013)

--- a/app-emacs/undo-tree/Manifest
+++ b/app-emacs/undo-tree/Manifest
@ -7,13 +7,20 @@ DIST undo-tree-0.5.2.el.bz2 27985 SHA256 35b3bef32c39a99656fb46d9ca7b2eccde4287c
 DIST undo-tree-0.6.3.el.bz2 30745 SHA256 03ca2e1a46ae6edfadcde89e9e5f06a86401a1bc994af88fb36931a7587cb084 SHA512 4d9461a9a074ec670fdebaa27310d350a8554e24ab8fba12a17ca1e339e6bc2ca616545dad1a374b20d0d427e735a3dc342373b12a56acc4553180ee6044bb04 WHIRLPOOL 433f28d49fb870db7c4e69b3e00304c68b38d6f1e0bbeba803aff84dc0b1b2ef67414185af586149a1d68e31511d9496e142134cb377778b605811643f3ff89f
 EBUILD undo-tree-0.1.7.ebuild 666 SHA256 a251bb14644972c4916fee3ea3c3a7214f6c72214ea2bfde196494bd3a25338b SHA512 59fbe019a8ce7f8b570859cae187c38cf85aaf5a63743e14252f7b6c793e27010c8174d2a818779e841d2b71df4bc450253a1f946744df6e68f2292c503690fe WHIRLPOOL 917f5589a37cc6dda5433b83416ba2df316981774d5b07c824507171c70f521cb098b0218e01807cd7f2924bb2edaca73f557b9f8a6e211b4684bea486bbbae0
 EBUILD undo-tree-0.5.2.ebuild 620 SHA256 4d845ea11094cc7b856ef2552e3c666ab2569b8cda30319e0ada3041089ad3b6 SHA512 368af046ae51ade92d5b4a1ec92b37444f5c28cba36bf4b8998682aad16f83ff183bbbb9277bc325bc133c3621b03613476442d70c7698eb225c7ee70662b957 WHIRLPOOL d38d9407e8d0cba383ec6ed7c820e17329cf3b573b86fcd6402da5f7ebeb7d4534322518aa42733222e30db76b6f8da66df2c223505daca2e7c227652b867a79
-EBUILD undo-tree-0.6.3.ebuild 622 SHA256 eec7da8440efae5d899f77ad26cc9b9b426361374e1430dfab8b67d87f9a39d0 SHA512 75369989d665b8d1ace89d3baa092d7ff0cec758b499947a290108fa8f109a5a94d16feae8a0dbd4b6258bcc5fbdaf886fc40a897470aaee46ee233ed0fca073 WHIRLPOOL 78ac3d1b0927abe0ae8ec82b8f96fa5e739500048493521fe75caef6afa1ed52cd58adee808aa4d785209160ee635c18322e763151d06971546f8d81cd093661
-MISC ChangeLog 1283 SHA256 bd72fb75488cb46e6dc8e05fc4fc85552000748690f68af6d72e231521d5bbde SHA512 155ceecd92196c1593567495e48c9de235119cc8876882e117c94b44bb9deb423c48412a00e03ae5c9089c312041e3bbd65dd94defb5a57135c19c3a7d29c0a0 WHIRLPOOL ff8d73a9290aa82af0f4563e869e7a0ae97eac1b49834f599ce9aebced388456a52f850313d16ac8213573ddd9cf531519b66720444655a408b02c682d274831
+EBUILD undo-tree-0.6.3.ebuild 589 SHA256 3bc63206e25f48d7f16751efe059c82311cd4858638a9b6bc2a1a9ebc5db14ee SHA512 2609eded81f25d487b6f29a22c15faaa489b343e50f1592031032b3013782f0eec788afe14446d145342fd3c6ea254cd87439f7b0549020dae5c9925f405c99d WHIRLPOOL 8568ba86e78359309dabf584a1ea857ccb0affe5bff85f00fbcb5f8d48716d4ce78e347ceccee395b2fd588c92c3520193afd87c0d9674e32397f4dedd2bd472
+MISC ChangeLog 1418 SHA256 e00147e19e987643641c3389e4977d5a6f23d8dcbff2168cd586a62f770ecc2b SHA512 422f9b1a7cce2b350a7a2733a71a751711f023ab7e29f0eac0e995dfc9e8083854777d56a75d24cd5ffd166df90eb4dca32110363e4fc432f141eecb570f963d WHIRLPOOL 9e8fa20bb91839463dc46559156d898a701804e1eb9d456ae7eb3c48c6118b0145eef8faa5ee3a68e708ac1b5d0eb735c5493f313a0cfa7b9a37812182ac22a0
 MISC metadata.xml 1580 SHA256 7923ba0f468e65948b10ac3511f149aad115f7769a8fdaa1242bb0fe6d168b23 SHA512 a356463f42ac393b72989641937d823ca00529d1859a8cc41594422c216dece0a3024e5daa4df98bed4701eb87eb1567958d32e80935abd8b3520598afd4bd46 WHIRLPOOL deb138c0478ce8580084308806a825c4eeeeafe896d24e2ea7e752c7c31d90e42c415ec7182ff35da484680c1ac703d3f49ab92f7e73825e954abd434311b832
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iF4EAREIAAYFAlHo3ZEACgkQid6yGVZcMrwp0wD9GR/A11taHxz2G7IJTLBhH0eV
-0n4GgjMsTEVCtmBgfAgBAMGdjUDq6DuUp1TPSqOP8IkDhZDYl+1UbhoUT0jKLX6e
-=UIOp
+iQGcBAEBCAAGBQJR6XTdAAoJEJQzkH1pP7W47kQL/AgraoHy4vXQNwjUO6ndQy5Z
+aJYSwQ3ycwTKcTUvV6Bs8INpgW+TxLAbUmiNNnYNOr02GnSfeag1G9RMR/cvSAyV
+eSrgAu7bG1f9ZidyXWFc9GXTwR+n80GB8DC0Rttkp7BalPni+iNbMlL0vrE6ROQ/
+WGFkcgRljB7z7qrhZylF0inalPYWm34esnE+F10HwVsmhw6WQLYLCoYEqzu1L0mX
+/reXMQ7rGJfN3AFXVqvuYsG1jkpcQbYiv3KeNHOCuzJKnbHkFMQqb5XnCdUpBZbD
+BIDycLNd4/fKZ7wJKLvNLRzbmSNmzJN0Ex3QHDhjGbZumToUVUpUQDAsO5a/0hpd
+CWed1g1tYP/yMUCMCZVZ7rDNus8VvUDB1v/Z3XA8TSiEi2P8uZdWhDM1fLN0Fma2
+FZCpddHAJP5qV6zTlv9qkpW9Fxk0m1/9pM9RgUOb2m8ob0PzrRcTjI5i0WnIvj7g
+w0lk6q7ZsqYnZ3ho+HPcT2Y0JSl/aYsQ7KMAdvNQVw==
+=4qbQ
 -----END PGP SIGNATURE-----
--- a/app-emacs/undo-tree/undo-tree-0.6.3.ebuild
+++ b/app-emacs/undo-tree/undo-tree-0.6.3.ebuild
@ -1,25 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/undo-tree/undo-tree-0.6.3.ebuild,v 1.1 2013/07/19 06:32:47 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/undo-tree/undo-tree-0.6.3.ebuild,v 1.2 2013/07/19 17:17:07 ulm Exp $

 EAPI=4
 NEED_EMACS=22

-inherit elisp
+inherit readme.gentoo elisp

 DESCRIPTION="Undo trees and visualization"
 HOMEPAGE="http://www.dr-qubit.org/emacs.php#undo-tree"
 SRC_URI="mirror://gentoo/${P}.el.bz2"

-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""

 SITEFILE="50${PN}-gentoo.el"
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "To enable undo trees globally, place '(global-undo-tree-mode)'"
-	elog "in your .emacs file."
-}
+DOC_CONTENTS="To enable undo trees globally, place '(global-undo-tree-mode)'
+	in your .emacs file."
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@ -1,6 +1,31 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.291 2013/07/11 08:50:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.296 2013/07/20 13:02:44 cardoe Exp $
+
+  20 Jul 2013; Doug Goldstein <cardoe@gentoo.org> libvirt-1.0.5.4.ebuild:
+  stable the stable series
+
+*libvirt-1.0.5.4 (20 Jul 2013)
+
+  20 Jul 2013; Doug Goldstein <cardoe@gentoo.org> +libvirt-1.0.5.4.ebuild:
+  Version bump stable series
+
+  20 Jul 2013; Doug Goldstein <cardoe@gentoo.org> -libvirt-1.0.3-r2.ebuild,
+  -libvirt-1.0.5.1-r3.ebuild, -libvirt-1.0.6-r1.ebuild:
+  Remove older versions from the tree
+
+*libvirt-1.1.0-r3 (19 Jul 2013)
+
+  19 Jul 2013; Doug Goldstein <cardoe@gentoo.org> +libvirt-1.1.0-r3.ebuild,
+  -libvirt-1.1.0-r2.ebuild:
+  libvirt-1.1.0-r2 went out slightly too early and missed some patches, notibly
+  CVE-2013-4153 and CVE-2013-4154.
+
+*libvirt-1.1.0-r2 (19 Jul 2013)
+
+  19 Jul 2013; Doug Goldstein <cardoe@gentoo.org> +libvirt-1.1.0-r2.ebuild,
+  -libvirt-1.1.0-r1.ebuild:
+  Bump to address a number of issues fixed upstream.

  11 Jul 2013; Justin Lecher <jlec@gentoo.org> libvirt-1.1.0-r1.ebuild,
  metadata.xml:
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256

 AUX libvirt-1.0.6-CVE-2013-2218.patch 1287 SHA256 88ee8883841d20909e63e96b3eeaff7a319d78d7ec096ed6e58e24e1417ffdb3 SHA512 bb7f8f997918f375db57d49d476373c23e597fd4e2080c9facdb056ee1eb279c4d616af959a9a14bd4a29cfafb2a2e2491b65c3a9a227f49f319fdbbe038b022 WHIRLPOOL b31cc722d5e0eadfdbc687e205851b466a0767634e27bb589a4416e84105f9d5816bf7a751bb8fccc71339633d33cf59fcdbc86e573a877e9a63747a22dfac45
 AUX libvirt-1.0.6-virinterface-udev-backend-ro.patch 911 SHA256 45b4d3752e9a117b7f8bb31dcfba97be6cb02b305850f8d66bbc277969802195 SHA512 627745ad7e1c64f3c57cf82fc29605e5bf3b16beaf0491cf7b61e8d8a326236d17b907f257202e127d765ff21d4d403eef4dafd358790b26b2776dbc79aa00f1 WHIRLPOOL 97d200d956b85179148ab3d933c6281ba60b78e952c9fbdcc369b5355f3ef51f4c09cc6d0a88d10a95fe5e50e77c6be9a92d5be5da98d17779e7a5216cde4094
@ -7,36 +7,26 @@ AUX libvirt-1.1.0-CVE-2013-2230.patch 780 SHA256 a705087434fd11128e70f2721631a86
 AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3
 AUX libvirtd.init-r11 3656 SHA256 51c3b79c1a71638211056f11085936d40874c5eb1440512309a5c0837f5a59e1 SHA512 c1743271fcf18eef38d9202ca58c7d052159262cb75283ce13739f6a21f3c6024cac567f52f082744c8f4321b857ace4489cc363281a7757920dc306b618d27f WHIRLPOOL 827f3908c5580e526ba83efd005c72d5024ed04072aab00e372347315d9cb6be88512c9148b5283d01190c2ef2ffa4fec477c28299afe70414c76188258103b2
 AUX libvirtd.init-r12 3668 SHA256 bae1b0766423b8ff879a7490a2b3e6381029638558923d8c0047414e97b881a5 SHA512 b24cf7dd0f6db454bb23bf4e9c4d40050f6d5aaa43f5b95a04238e028f1cb5c735ba605f6f01caf814f2d2a36407abc6fd1d751e66887fc7af78d543e4b61dd6 WHIRLPOOL 3c04c3acfa061144d16e1e9f2b35e37437855b0162d3ce0d7d3d39618fcfe855d8e82fdf4e16aee8d6cc591424d3d0875a32edd02646e02203b5ca239b7f5d64
-DIST libvirt-1.0.3-9bf6bec4.tar.xz 7032 SHA256 841f062bd4185ac36a5633103c899d4ef5da6a2092ef1a2f7125298ec336b18b SHA512 7eeba343a27c4dbe5e984641082c6f8c59ba0c04a22c5a3e390c0bf03e65a966e7db15be732c61473d2dfb245bdd53f950d3a848980153b90310439b781bbcdc WHIRLPOOL 8d90ebc9fc17a7c8ac119f34b2e64679322878c0c8dd7eb837f2b5e89047b084ec87e9966841d0aaf7ed19e75548b9d5f5f66d461e2f177a5e817669471a27c8
-DIST libvirt-1.0.3.tar.gz 23238381 SHA256 f64f4acd7cdcfc6ab5e803195ed58b949f262b54e3659d8c37b33f0fec112757 SHA512 f0002d40a018e22bd05c9bc990db0b14e0ec815613f54d04fc3b631081d87b6659620188da9f0ba376f290206d979467013274ab99b7394c66bde54c82e08fb4 WHIRLPOOL 29dad8e6b1e4d61fe83fc450436c0fdc200b360f93772c2fefe40ab443ec2a7cb6566e634d15290beb4f7ea1f461503b1cd86accddde59659ed46b60b56e3d76
-DIST libvirt-1.0.5.1-b8430867.tar.xz 5044 SHA256 9e3cdc94159a97fe2a0fd7ca889abff997443f6ac744841fe175bb586dfee9d4 SHA512 67eef7c25a2e477c4e745dd67602045a0581b3cd28a077f4d5dd230e0a05a9ebd641f3ef4440c69edd56db0ec2acfa81b5c579a4392372d0b87af8125465efe7 WHIRLPOOL c3e463c74acac975c4a2596892825fc79179c4dc75efbe7941845066ce987a6ffa01abe11afe8169dfd7009b7cbfcd81b071e64e1e3fb899ae114a62c8a9635a
-DIST libvirt-1.0.5.1.tar.gz 23928327 SHA256 38a67d9dc979ed28440791eb3fd63e94e4d04e4efbe7554a83bdf0cc614d0a6e SHA512 8cc3850dcda93b2d4efcd055a91ca9f2a619ccb9585e5b9fd7e2daf6ee8e93c1a0354fbc7fa06f6d5663913f358c2fbd9569a5e307b90e91607b0e049f00c89d WHIRLPOOL 51298d87cddee79f352609306c77d3f1813684c931b11ea577d96560e366b112dfc625553a86fe21c291d7e9bba86024055b236029be56c3c6390cde49875e8b
 DIST libvirt-1.0.5.2.tar.gz 23953774 SHA256 79ba3ade0646c5500a333d2abfe52d3bfc1eeae8986c0ed433eeae2edd4799ef SHA512 00a369502a7ff4be17c547feca13b88419c55b0a6abec6dc83e7ea2306a17fe495e217e1b759aaea962b44da44cb7cad64f3866ae41a059820ed48c2144f7b21 WHIRLPOOL c7cff2f603a676c6810e0b3f95a91e3d8887ec5b9e3799afd13f025aebed52e43948ecf0a8e50b2bc955083fd62ef52be1dc4384086fa98e84283e4d7963b925
-DIST libvirt-1.0.6-9eea7e71.tar.xz 2100 SHA256 27ec140988d6f8a5d6b68fd57ea06e4f3f04ec2e5c93f712826c77c5dc123277 SHA512 cf288715614ccbb247fcc2e73e6953967be56c3ba1d7b2569305a5001e3160c797fdc28697548fa09983bcceea4f181528967ff03ccbe071ce620a0144749c2e WHIRLPOOL c558eead1619bd20390051bd1f0af9db2dfb5012a2521e5868d420499a93324c3d8c8ac13a2ced70ebb1784e90c4797e6d668dccc01e20df018162b52e1c1612
-DIST libvirt-1.0.6.tar.gz 24056615 SHA256 a188eb2056d7936c4c9605f4d435b9097880ec359e10be6546f2c9fa665de67d SHA512 27948694d80df73de335ccd1dffaff4b4e14345f06d9e4043a7a2402dbede3db441da3ceffe3d54fcf6a34c37ea862b91198dd9b63a131b40aedab95a1646308 WHIRLPOOL 99a37abe34d17ce083ad1f908027ddf79d75a9c2c9ae1d30986ca7c6e112adc326208bd100faacc93d70879f59f2cfc2acd3f274181dac0a9d1b156268d91714
+DIST libvirt-1.0.5.4.tar.gz 23972364 SHA256 fe51da9d5c3d5e8521d0c89a3379ec3b19083a31e30bc4eb54a860aa6ccf2771 SHA512 f44006f5cf00e4682266a306c819075471abb52cd9816bd75e0b83962bcb4a085fc0ffc94b688bedbc4042489a2997b77ebd1aad6f1560abe808140a24682865 WHIRLPOOL 0d6609f9d437e344f6c5b74f1c34c24004e256efd784b61f35fa68483086213a47fe27e2ec5f5f4e2ce7bbb7a02c2dabe75511e8686221b6b9be6d2719dccd0e
+DIST libvirt-1.1.0-cafcec2f.tar.xz 8284 SHA256 ce68c2e6e54d1d3190c45cfe644d6af6c32dd8c4f661276868f90feeb8020b46 SHA512 95637c6577ac1cfbdfe087d5e5ad2671026f9ed35231780821a86db9ce610daceaeae55ce750ab345052cbbdeef030265e293de03c4a2add51d77b206df5586c WHIRLPOOL 5e21511ae6e0c4498c053133b4041aa9dab86b5638455639da97e05d177f2986c123b5c0cb61c41c7a60efe8d78592b789a06e25cf89ac0bbf5143c2ffacc167
 DIST libvirt-1.1.0.tar.gz 24397962 SHA256 ce9e765697ecb595469489665043ce221d9b70babc16fec77ee938fe37676928 SHA512 0ac9c8b02a182ad4c66609bc949282455b362fc2aa576d1c2413366dfb1ce70d3737caad0101128f8629c34e0ca47295128bafe5608e3ac60e764c3f8178c7f0 WHIRLPOOL a526350aeef2d72cb079750bda0f18f9f9ebc4b2cf56e7655c9ee0e8a744b0fb540089f64da0820628779c1456435043bf8c6dc2c18bdba65c0e705a43777f90
-EBUILD libvirt-1.0.3-r2.ebuild 12003 SHA256 9487bfd65d6c0f959c0932d78a3852906283473e2cea81c6f481a291e01e19f8 SHA512 e330564b03751f950da2a83a1018f857631231b27b7976d379ee1bfc44bf6e5929c08a1f69f3a4fde7ccf92f25a90a25e720c6ad6c9ec6efa15c27a8a6cf6814 WHIRLPOOL 9ee7c51da91107e99247e0d1eb0bf4d22110fc43cdb5c47b749e5d2a2226c882ce9d5c5b0a5761ce01ac1344ce7d375670e6935ce760c47766f042c96e3247d6
-EBUILD libvirt-1.0.5.1-r3.ebuild 12187 SHA256 e23101724a1e7939f7cb0d3953b35b4a6b85047bdd9b99314523811871a02eb6 SHA512 7a7075372fe63aa56f14519cb80bbc7b23ed4dc612872195aeba6a6efca67525c0723e02ba62ed7c8df914bf121cb0dbab18b5f6839d7d4f5482bfbd123a02f5 WHIRLPOOL 0f15bbed19316d8d45d42192e1265b7ca9e49e501c91a8af788b7d76e0a9a92489e001ade7f92e94537fc5c8b3883dda8f0f5ebcbc422552e7a79b7f2634565c
 EBUILD libvirt-1.0.5.2.ebuild 12185 SHA256 42e08f7da2c8179ffc4a4e34700d4c62d35fd2d977b0235f214abf93c6ae9303 SHA512 aa461a75d875fd50c50d5d06891ce9633d908825e1aa914fa22622ac953783681781be16479f7e6ff40a054492a36026cad44844483461e835f602f8f8032fa1 WHIRLPOOL f6581e9815408471cc51c6ec94a45ad5261743127fa440da599712de0ff3735a6f443ea4472f2a6ecf9e3d98c955aad38c4efd3420df5f2db471653c2cb6aaee
-EBUILD libvirt-1.0.6-r1.ebuild 12185 SHA256 0f0df7f054370b2103ff2c1bc7bd7a3b60e685d92121ebaaf74e6718d1dd5e91 SHA512 31c15f1139bd1199cddbc5d1367ed05d0725859e44850fa7a2609f6a3f39b4d0044c7efa5a306c98703e6934e7cec605bd308095e3deeafd30832ea1fc3e16d5 WHIRLPOOL 83950fbbbc9294305b64519fa671a502d5d20a13887ef153d99b1324800fe650ed59726343ebf0ab68b1f08dbe3235531c994c42755e12a75aa7ebbdeffd5c18
-EBUILD libvirt-1.1.0-r1.ebuild 12113 SHA256 12e13ecfce62164a4f1a49492a18821d79766be96cecd75572ba97871e478e7b SHA512 5836fb302a584266a2ad8a2a10b2fdb1a6630c3adf2b5967ab973d62fdeccb037829096e9e1416058f5cf2184c0763c8eab07f89822fb697e3ab1bfce3ab7a5b WHIRLPOOL 5170164e1601c72a0c5a1307bf2a86e85f28627df89a0b95aadbf552bfdf23cded6027e7f57d2dbf031055acf21bed1d76d7e3429844b6b5e24dc4809f8678a7
+EBUILD libvirt-1.0.5.4.ebuild 12188 SHA256 8e09a74393de564cb8210ee08d3fbb7c091eec5ad8389538a9db82f3858bf8d7 SHA512 9af9015afae592b9d0641a8238deab05564afdc1621e6f03aff9ed150f18403e9f8716da889b10385023448137c14feab44594967e5c1d7a2a79d881ab968d9e WHIRLPOOL 27513e3c89d24ca0984079000cc8d7a0da4a5f5becaaefe44a933c8d4e3202e0cbe44f83e5575c8c89534d0c8a058b7f3d6f7df7555c07d144df5010926f239a
+EBUILD libvirt-1.1.0-r3.ebuild 12057 SHA256 0fd48e1b79e01daecf200c22f72ea81ac42cd1819f270eec95ee407589e0e687 SHA512 09ce8a454c235a0000028ba32786e13518cd00556b07164e4a085aaa3593a7064b61e60038f7bd9053d67d5dc1c471d6a7aa6082abf77d0a1978dc24badf75cb WHIRLPOOL 5ad4456797d7e09444c80c311936b3533469cb631c7bd06cc149fe40117fa6372be7513a4b9e05c50d88192c2c02975ea20c39cebff370199d390c17ce48a9b5
 EBUILD libvirt-9999.ebuild 12105 SHA256 76709a5ecd8cead07f1a596f4875a55f828047673361334047c33aea331b8463 SHA512 596b9ab9ed3fba45d7a518e1340eb81ac6f6aebebe67ff23e3e624f90fa0b7ce87c03517b9eb3e693a1f59db3c14fc2900f9a7a0876c35a1dcdc90a58e926012 WHIRLPOOL c5338f9b9fb26de8319bc772e728eaf18ef8b9c4b4423f2317d9b58a4bb596a488dd511c61cf0c0dd8a8b4971618d41ed4e2ab815cec01eacf9fe53da8d6a3fb
-MISC ChangeLog 7077 SHA256 e456d880057847b98c7f89082f63f62a7f4d22bd78be1ce77f91c727ffb84bcd SHA512 f3152a64d6fde23b0dcf9a192c46ef323fb452f2b0b006d2d5f6755c2b4cfce947959c89b6110e847c7d1d840f284d651ca1b1d03eccdca8829ea8a83392ddaa WHIRLPOOL d3655ff51b2ba48c400167b87f18963a5b4e64772ea03fd43e78a376c03f385f70f29570d243643defa7b27d27fe1e5ed4307cbca336824dbb38dce47c80e3a7
+MISC ChangeLog 7933 SHA256 fd9ead119fc22a8d2f2f5bde6ed30ed150cfd05a34f4389764fcaab375c65916 SHA512 80c6f15c85f2b4e0b79a22a0e3bcf526e1fa0224fed0e554441e212d4da65f4ab66dce78c867fdb8f1b0a02eccf1ce1b012ff94a648f51dee680d300bfb55bf7 WHIRLPOOL c09b4d7962707368366157efe2972b2dfb0fdd7475a8bce4d88a87220c829a86c3fc204de12729fb107c5d5db21a27d8223282c009e21e4d36efca4423a6f18a
 MISC metadata.xml 3534 SHA256 8678edfd233eaa04266d7e15f71102fb45d1e4843697ba0cd04fe57b45dbb6c6 SHA512 e4b2cc5f9001697b784034ae6e58fea39e9fdc223192772592bcb671a4e1436186ed7757fc72993ee81c1e4005502fbb8c0a2d4588666a186d42024a98c052a2 WHIRLPOOL 9f32ac2763d17e5204da7396eae2a8c79c63e1e82b4a1035c86d93c029902159d3f5697aad86b7307b6e8acee0a4f0f02023d0e5e824a471cdad80a5cebc6886
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQIcBAEBCgAGBQJR3nH0AAoJELnU8jG9FVirPw0P/1+hKqsmQ1ymZbVSt3Tfgph+
-HjtxU1kzjh/Kk5ci7GEl9BABqTCqtqpuITpgUEB3VuoTyLM1Bop7TR5YklQGNrJI
-ixhUNHWAxas/XTvY6+qPMVOOprh9jvJPM0pafWmDCzl3yUBgiDosAqIpv03YL5g3
-2nNI1QckMeUktb5qpzNUqFw5jky9wBFAasiUolF7YMHqa4bX288kILdo6Y8fti6O
-wNEQTe4adqwZCeMEdWfnAhhJTWeCAZzfB6DCzudZCfzscN8/ooUhIcHfUyDAw3dw
-ISMN2oYuFnePY2N8p5trIaoAKnDKMmn8tT4R2WJjchyIYpjnlsIBKZOlNEyRbT5/
-8k7tlWSa6cbZ4IxYSa38qsoJXF9W4Ees6joY8qS8vtx8jPE8v/ifdfsitfsCLwj0
-SFZhdmwtTN7eh5rOjR7YPBrMk8bf1BtRHjSUgxBm4AAvA3nnk9DdmQfKJF1A263l
-JsURE2Xi/UJLurHyboTS8a11QlgOnQf9FBykC+GDK8RBvGDLg5+8o+mUxganDaqK
-JGDCz1Aq0vXWwSQySVN/fnGdQmAHaIREqF0dBBCknBoNQiv3ZmFZ24DQiADoaq4o
-262LI3jAvMu8ECvmc48d7AlZ8RWd+uYKRZIki1yRPwV2AyhbOSJ31SQ7A6YL18Xm
-VAzGjKA3fGpzNClz7JL4
-=QJCX
+iQF8BAEBCABmBQJR6op1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvA1EIAJPiKPN2ttByw8/VA7U3lYuO
+FciSetTk2Knr3dhgwLlUxdb0h1xvp3QC4zaSI1QsQx295FKjX8OYW76Zj9kp4j4y
+uswO53/+zS4jobtiJAzd6kpPDZpIQOLluUp5meReYnQtup827Qt3qNQvCHuFC7Li
+5httf/zMucrRYbRQ3qzt7lqQDnQXe8pd+j01suHzdDA6GFA6xoIJHAHZSQdpkef4
+7rDq+NJJ6qU/PvNMq03u2ISRNW99c1C0v1hAJYIWlW4U5Y8ZWIvABytyfFx9uHOO
+k51Q+eKjTcmuRVNnmN1Zrdt4zfNRLhlGf50yU1hMOr/KX5L+3sclIFK/zmh2jhk=
+=xfCd
 -----END PGP SIGNATURE-----
--- a/app-emulation/libvirt/libvirt-1.0.3-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.0.3-r2.ebuild
@ -1,427 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.3-r2.ebuild,v 1.8 2013/05/22 15:56:22 cardoe Exp $
-
-EAPI=5
-
-BACKPORTS=9bf6bec4
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_DEPEND="python? 2:2.5"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python user autotools linux-info
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
-		${BACKPORTS:+
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="amd64 x86"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm +lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )
-	virt-network? ( libvirtd )
-	firewalld? ( virt-network )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	dev-libs/libgcrypt
-	>=dev-libs/libxml2-2.7.6
-	dev-libs/libnl:3
-	>=net-libs/gnutls-1.0.25
-	net-libs/libssh2
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	app-misc/scrub
-	audit? ( sys-process/audit )
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
-	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-		sys-power/pm-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-misc/radvd
-		net-firewall/ebtables
-		sys-apps/iproute2[-minimal]
-		firewalld? ( net-firewall/firewalld )
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/xhtml1
-	dev-libs/libxslt
-	=dev-lang/python-2*"
-
-LXC_CONFIG_CHECK="
-	~CGROUPS
-	~CGROUP_FREEZER
-	~CGROUP_DEVICE
-	~CGROUP_CPUACCT
-	~CGROUP_SCHED
-	~CGROUP_PERF
-	~BLK_CGROUP
-	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
-	~CPUSETS
-	~RESOURCE_COUNTERS
-	~NAMESPACES
-	~UTS_NS
-	~IPC_NS
-	~PID_NS
-	~NET_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
-	~BRIDGE_NF_EBTABLES
-	~BRIDGE_EBT_MARK_T
-	~NETFILTER_ADVANCED
-	~NETFILTER_XT_TARGET_CHECKSUM
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MARK
-"
-
-MACVTAP_CONFIG_CHECK="~MACVTAP"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup qemu 77
-	enewuser qemu 77 -1 -1 qemu kvm
-
-	# Some people used the masked ebuild which was not adding the qemu
-	# user to the kvm group originally. This results in VMs failing to
-	# start for some users. bug #430808
-	egetent group kvm | grep -q qemu
-	if [[ $? -ne 0 ]]; then
-		gpasswd -a qemu kvm
-	fi
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP}"
-	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	if [[ ${PV} = *9999* ]]; then
-
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	epatch_user
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
-	# Tweak the init script
-	local avahi_init=
-	local iscsi_init=
-	local rbd_init=
-	local firewalld_init=
-	cp "${FILESDIR}/libvirtd.init-r11" "${S}/libvirtd.init"
-	use avahi && avahi_init='avahi-daemon'
-	use iscsi && iscsi_init='iscsid'
-	use rbd && rbd_init='ceph'
-	use firewalld && firewalld_init='need firewalld'
-
-	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
-	local myconf=""
-
-	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
-
-	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
-
-	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	myconf+=" --without-xenapi"
-	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
-		myconf+=" --with-libxl"
-	else
-		myconf+=" --without-libxl"
-	fi
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
-	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-	myconf="${myconf} --with-vmware"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with virt-network network)"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with rbd storage-rbd)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with numa numad)"
-	myconf="${myconf} $(use_with selinux)"
-	myconf="${myconf} $(use_with fuse)"
-
-	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
-
-	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
-
-	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
-
-	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with vepa virtualport)"
-	myconf="${myconf} $(use_with firewalld)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	# user privilege bits fir qemu/kvm
-	if use caps; then
-		myconf="${myconf} --with-qemu-user=qemu"
-		myconf="${myconf} --with-qemu-group=qemu"
-	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
-	fi
-
-	# audit support
-	myconf="${myconf} $(use_with audit)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# this is a nasty trick to work around the problem in bug
-	# #275073. The reason why we don't solve this properly is that
-	# it'll require us to rebuild autotools (and we don't really want
-	# to do that right now). The proper solution has been sent
-	# upstream and should hopefully land in 0.7.7, in the mean time,
-	# mime the same functionality with this.
-	case ${CHOST} in
-		*cygwin* | *mingw* )
-			;;
-		*)
-			ac_cv_prog_WINDRES=no
-			;;
-	esac
-
-	econf \
-		${myconf} \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		--with-remote \
-		--localstatedir=/var
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# We really don't want to use or support old PolicyKit cause it
-	# screws with the new polkit integration
-	if has_version sys-auth/policykit; then
-		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-	fi
-
-	# Only sysctl files ending in .conf work
-	mv "${D}"/usr/lib/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize libvirt.py
-
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# support for dropped privileges
-	if use qemu; then
-		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
-		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if use caps && use qemu; then
-		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
-	elif use qemu; then
-		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if ! use policykit; then
-		elog "To allow normal users to connect to libvirtd you must change the"
-		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	elog
-	elog "For the basic networking support (bridged and routed networks)"
-	elog "you don't need any extra software. For more complex network modes"
-	elog "including but not limited to NATed network, you can enable the"
-	elog "'virt-network' USE flag."
-	elog
-	if has_version net-dns/dnsmasq; then
-		ewarn "If you have a DNS server setup on your machine, you will have"
-		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
-		ewarn " bind-interfaces"
-		ewarn " interface or except-interface"
-		ewarn
-		ewarn "Otherwise you might have issues with your existing DNS server."
-	fi
-
-	if use caps && use qemu; then
-		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
-		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup libvirt.py
-}
--- a/app-emulation/libvirt/libvirt-1.0.5.1-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-1.0.5.1-r3.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.5.1-r3.ebuild,v 1.3 2013/06/11 10:20:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.5.4.ebuild,v 1.2 2013/07/20 13:02:44 cardoe Exp $

 EAPI=5

-BACKPORTS=b8430867
+#BACKPORTS=b8430867
 AUTOTOOLIZE=yes

 MY_P="${P/_rc/-rc}"
--- a/app-emulation/libvirt/libvirt-1.0.6-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.0.6-r1.ebuild
@ -1,429 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.6-r1.ebuild,v 1.1 2013/07/01 14:07:41 cardoe Exp $
-
-EAPI=5
-
-BACKPORTS=9eea7e71
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-
-inherit eutils python-single-r1 user autotools linux-info systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
-		${BACKPORTS:+
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~x86"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
-	systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )
-	virt-network? ( libvirtd )
-	firewalld? ( virt-network )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	dev-libs/libgcrypt
-	>=dev-libs/libxml2-2.7.6
-	dev-libs/libnl:3
-	>=net-libs/gnutls-1.0.25
-	net-libs/libssh2
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	app-misc/scrub
-	audit? ( sys-process/audit )
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
-	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	python? ( ${PYTHON_DEPS} )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-		sys-power/pm-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-misc/radvd
-		net-firewall/ebtables
-		sys-apps/iproute2[-minimal]
-		firewalld? ( net-firewall/firewalld )
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/xhtml1
-	dev-libs/libxslt"
-
-LXC_CONFIG_CHECK="
-	~CGROUPS
-	~CGROUP_FREEZER
-	~CGROUP_DEVICE
-	~CGROUP_CPUACCT
-	~CGROUP_SCHED
-	~CGROUP_PERF
-	~BLK_CGROUP
-	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
-	~CPUSETS
-	~RESOURCE_COUNTERS
-	~NAMESPACES
-	~UTS_NS
-	~IPC_NS
-	~PID_NS
-	~NET_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
-	~BRIDGE_NF_EBTABLES
-	~BRIDGE_EBT_MARK_T
-	~NETFILTER_ADVANCED
-	~NETFILTER_XT_TARGET_CHECKSUM
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MARK
-"
-
-MACVTAP_CONFIG_CHECK="~MACVTAP"
-
-pkg_setup() {
-	enewgroup qemu 77
-	enewuser qemu 77 -1 -1 qemu kvm
-
-	# Some people used the masked ebuild which was not adding the qemu
-	# user to the kvm group originally. This results in VMs failing to
-	# start for some users. bug #430808
-	egetent group kvm | grep -q qemu
-	if [[ $? -ne 0 ]]; then
-		gpasswd -a qemu kvm
-	fi
-
-	python-single-r1_pkg_setup
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP}"
-	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	if [[ ${PV} = *9999* ]]; then
-
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	epatch "${FILESDIR}/libvirt-1.0.6-CVE-2013-2218.patch"
-	epatch "${FILESDIR}/libvirt-1.0.6-virinterface-udev-backend-ro.patch"
-
-	epatch_user
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
-	# Tweak the init script
-	local avahi_init=
-	local iscsi_init=
-	local rbd_init=
-	local firewalld_init=
-	cp "${FILESDIR}/libvirtd.init-r12" "${S}/libvirtd.init"
-	use avahi && avahi_init='avahi-daemon'
-	use iscsi && iscsi_init='iscsid'
-	use rbd && rbd_init='ceph'
-	use firewalld && firewalld_init='need firewalld'
-
-	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
-	local myconf=""
-
-	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
-
-	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
-
-	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	myconf+=" --without-xenapi"
-	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
-		myconf+=" --with-libxl"
-	else
-		myconf+=" --without-libxl"
-	fi
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
-	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-	myconf="${myconf} --with-vmware"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with virt-network network)"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with rbd storage-rbd)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with numa numad)"
-	myconf="${myconf} $(use_with selinux)"
-	myconf="${myconf} $(use_with fuse)"
-
-	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
-
-	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
-
-	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
-
-	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with vepa virtualport)"
-	myconf="${myconf} $(use_with firewalld)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	# user privilege bits fir qemu/kvm
-	if use caps; then
-		myconf="${myconf} --with-qemu-user=qemu"
-		myconf="${myconf} --with-qemu-group=qemu"
-	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
-	fi
-
-	# audit support
-	myconf="${myconf} $(use_with audit)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# systemd unit files
-	use systemd && myconf="${myconf} --with-init-script=systemd"
-
-	# this is a nasty trick to work around the problem in bug
-	# #275073. The reason why we don't solve this properly is that
-	# it'll require us to rebuild autotools (and we don't really want
-	# to do that right now). The proper solution has been sent
-	# upstream and should hopefully land in 0.7.7, in the mean time,
-	# mime the same functionality with this.
-	case ${CHOST} in
-		*cygwin* | *mingw* )
-			;;
-		*)
-			ac_cv_prog_WINDRES=no
-			;;
-	esac
-
-	econf \
-		${myconf} \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		--with-remote \
-		--localstatedir=/var
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF} \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
-		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-
-	use python && python_optimize
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# We really don't want to use or support old PolicyKit cause it
-	# screws with the new polkit integration
-	if has_version sys-auth/policykit; then
-		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-	fi
-
-	# Only sysctl files ending in .conf work
-	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# support for dropped privileges
-	if use qemu; then
-		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
-		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if use caps && use qemu; then
-		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
-	elif use qemu; then
-		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if ! use policykit; then
-		elog "To allow normal users to connect to libvirtd you must change the"
-		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	elog
-	elog "For the basic networking support (bridged and routed networks)"
-	elog "you don't need any extra software. For more complex network modes"
-	elog "including but not limited to NATed network, you can enable the"
-	elog "'virt-network' USE flag."
-	elog
-	if has_version net-dns/dnsmasq; then
-		ewarn "If you have a DNS server setup on your machine, you will have"
-		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
-		ewarn " bind-interfaces"
-		ewarn " interface or except-interface"
-		ewarn
-		ewarn "Otherwise you might have issues with your existing DNS server."
-	fi
-
-	if use caps && use qemu; then
-		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
-		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
-	fi
-}
--- a/app-emulation/libvirt/libvirt-1.1.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-1.1.0-r3.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.0-r1.ebuild,v 1.2 2013/07/11 08:50:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.0-r3.ebuild,v 1.1 2013/07/19 20:29:39 cardoe Exp $

 EAPI=5

-#BACKPORTS=9eea7e71
+BACKPORTS=cafcec2f
 AUTOTOOLIZE=yes

 MY_P="${P/_rc/-rc}"
@ -196,8 +196,6 @@ src_prepare() {
 		) >.git-module-status
 	fi

-	epatch "${FILESDIR}/libvirt-1.1.0-CVE-2013-2230.patch"
-
 	epatch_user

 	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
--- a/app-i18n/mozc/ChangeLog
+++ b/app-i18n/mozc/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/mozc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/ChangeLog,v 1.6 2013/05/10 05:27:20 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/ChangeLog,v 1.7 2013/07/20 07:15:49 naota Exp $
+
+  20 Jul 2013; Naohiro Aota <naota@gentoo.org> mozc-1.10.1390.102.ebuild,
+  mozc-1.6.1187.102.ebuild:
+  Update license wrt #471010

  10 May 2013; Naohiro Aota <naota@gentoo.org> mozc-1.10.1390.102.ebuild:
  Call epatch_user
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@ -14,26 +14,26 @@ DIST mozc-1.5.1090.102.tar.bz2 54911799 SHA256 b52c1879c4749041032578ec6c591d974
 DIST mozc-1.6.1187.102.tar.bz2 54828375 SHA256 2a9b54275400c768e14156e7654e9b9a4ca27353573627607c70d221c0e2db65 SHA512 0f182316e80baa8c3d268a266398bd2abad4db9ed54bba351b275681d17ef6fd5348d3b66fd95201028c38f29de293f124b9c4f45a5818f20faf17b1eea495ff WHIRLPOOL fb064dd78471d2060871f905cb1c81fd9c52cc15741493aad26df49db4259709860593b65586a6c44893a6454fd7f2d27815739e1525f1c8fd0cf9eb0efff92a
 DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf SHA512 52b0208c685e44126cb3915a74bde692ef91430f0407144b6c30b72a9f143b1ee4f1eea47a550184c689a1758b92582e7f26f0683c2d387205b957a69830f2f3 WHIRLPOOL e5462ff35f63413aff58640c24b9b561ac55749c489803ae009de21bf5d954a77516714361353ef02cfeb3c2d762620c89dc08a5fdee571e3a33b6f5c20edf6e
 DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
-EBUILD mozc-1.10.1390.102.ebuild 4932 SHA256 1f1db204385e288ae71d153e532179dc165243969633f7366f3d88848612b6e1 SHA512 1f8fcae1e8bf96d71d50cdf779d425a099ddfa64a0ad3921cb737fe87d5baf589b020189ef04333a5d08dd048b380e73b7357bd2c63d6baa09d5ae861e6ec855 WHIRLPOOL 3b7d5b94420248c39c9d7214e3aa971687376894aca5771e5519c50817eb4150917cb258a60eca9a52154526ec75594770ca46aefe841d87b1496f8b0ce67ce2
+EBUILD mozc-1.10.1390.102.ebuild 4911 SHA256 4002fd48783c47c3273084e96b1f839cc30beb43805098c90d76fe31c76448e2 SHA512 67980673974f3911e7acd123902be55e3170f90a5e21d4369542a5250e54d1c9f90ad6909c1c7ca2a331e815a26663ee76571eab0bdca499b7528a99477cda81 WHIRLPOOL f1f98260823fec632a24fa274111e73b427589bb5a1c3ba37afbab4b4d6bf726e950a9c2d576c52064e03876205c996b01147e4225e5081a9107a9b926d27726
 EBUILD mozc-1.3.975.102.ebuild 4383 SHA256 281dca5a4704df212a07e616db4779f9f241c600c4c026d8092a6604a5388d09 SHA512 34e6be151e59f79232b7bd352081f87b061841d26238a5e737c1b4be96d0206fd9d73c2dfd0623eb4efcff4610da604faa00dced14d21e6a4cc84e52110f1022 WHIRLPOOL cbf87dc98060bf4a86112ab1aff0c1571d3acd478f84d83b8e5885100833a8ec963e5c0c95eaa4218c141824d11b6c773a5a2b78acaaa304763e1557930710d2
 EBUILD mozc-1.5.1090.102.ebuild 4833 SHA256 de99a5e45ecc8bc3b4d279495cd7befa08367660a71f36bf8fc34e5548b1197b SHA512 b420913dafd09e3b7cfea4d10d9a8c89fade2928e36c1fb072089d7f1ddc833634e72ef1b22e845a0f280d8def928982756119b32fd97a14b073f2d0a7a867cc WHIRLPOOL 7549a42e848ed58b343c5c6491e62addb505d75a2bfe8e06a0afde235c2151ffe0d0883de9d8046b3f2abfbb5981a33ec36b765d2baa875f9206a1040a605fcd
-EBUILD mozc-1.6.1187.102.ebuild 4164 SHA256 5cae4c0b185c35852a15213b12fcf12270bc1dbdb03f3515995095fa594e39ac SHA512 8af02bd6a4fcf628c4b43d768ff768d995f53909ec2837e2106d977c462170f3942b3e446ab8b50e0f0f962a8d988fe47fcb07b5d40e3b5707b9c474c5baf292 WHIRLPOOL bca8d2db9320f91dfe860b1e40fd96229eafbbef94b8a61b44e1968396328bf5c4e6a494dc18075d325a5fe28affc12bedb5e7ac02f1948695abb23fa3cfcb28
-MISC ChangeLog 6996 SHA256 928ee841609cacfe7f45d00f6ff4dba40672ac121741e6020e09505b9eb89ea4 SHA512 3d05cf6459c164ee75eedc8137006476b03a776ba48095a087e2f2d63e024a9f3e27c849e363f232fe6594c2ba36fb40bc49125234357dbc7bc8ee46f1db96f0 WHIRLPOOL 63755d31b67a9f6a98c4b971dd1fb9903a14608a7011d59042a9b14c08ceb797296f136b14bbe4a47858d7d86fbfca3efc6d8062b9cef4e952730bb603b6e6fc
+EBUILD mozc-1.6.1187.102.ebuild 4151 SHA256 8a3dcb043725bc7d4289f2649e14f20196bc6ed00ccf5af648d308ec81bb97e4 SHA512 7d72dd7fe3520df151187bfcda42edf184671975fdb8188f80188b6cd3b370882787a36adeaedf33a6d6c2973f0b4addcb28edcfda69f32c5d1cab14417728b6 WHIRLPOOL e94eceeb63de930740f72ebae3abc25fab6cfce2303a7d22f4ec5d5e0c9cca3fc50796d035d1b5ede822e07f757c36ff084d5c3ee9630062e66e31a686d948ca
+MISC ChangeLog 7128 SHA256 4550816b58da6765714c8aee501ed825a52e1689c1c8837574eb7fa2099ed15d SHA512 fce7b84c33a3cbbe45048128ae9764e21f859bce4cfbacf2633a5044df04d8ef85943bb20e3bf27409d11558d600bf29a0367defa27fb8cc863639cef9507fab WHIRLPOOL 3af0c35a5ddf801694f422c407abee668938942db738c4a7eb1b57f10820da928357847211f1e59dff013dd2254a823abfd7d50564c523a4f5e396b894bc771a
 MISC metadata.xml 603 SHA256 e77d3254c53a7546df4dcde995975b713e7b7c1819e6361a98b8e0d1be183190 SHA512 5890a0bfd8e9a8584468a7bd8cd162e2135a6ca2f3c39a9a2da7bb3b1c64f77f18578241c4013da83dddf6af68817ebb02438d317996f8e712f4b6a17bf07c93 WHIRLPOOL 438f87eb3a1d199d931e0fadfad91e847f3f8e6f376e7b3d317ef2c77f278006078addee4162fd7816c81b75ca8a378bcec84e0f441c3bf73b89e95b6a38bcc3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iQIcBAEBCAAGBQJRjIU+AAoJEDYO1FT4VRUUPOcP/RFDFljmZwXsODlS6HWASMYJ
-ZzgWl5jNDLglSJLWBuSO2XEDdfnf1cSnoq1JNjaX3aCw8wZMzFUDuLN0qiqEp8M/
-jywAOCRUxCmqqGeqcY5BLDDByQpGupZPBiMPpnAR/ma1ybNxHovbDExgkZ/oM9ib
-yHaKS0qO+jjo5pC9UuchPqcODThfzZM+PFj+C+BSvvFYca2F6DfYXO5NBei22uWm
-s7w9o4eErgkbE42h5mcfseY8BQr5RuON8BCndYw/nThDDdC7z5acIVgOUFftFhd9
-Qxt0dErAa99ZoEarl76BmqNaXh4nYFMz7aSZwyBNKtcnBkoUUoFqb75K5/9ccQ67
-rq3GolqFOPEi/fJzYzP5qqlEu7hwtiX6MgNFOwh8d2yx9ZHPxW5Z0Cy+aqfWDq+O
-2/aZrU5VKPzW3utwb66HHQj8+/+660CYhAlfkGU2fP0lJXb2qaNt0xqS5rQDRKm0
-LBvynSpGnGzzj2xuURCdP+qiLC3mAa9LGxmUuBD4ETE/SKPJXgiddbhWU+vg5/Zg
-6bD38K/cTiU7ye3clZ48kVgk/EDxsOeYm2vFytUqzcbpZxgxFkHy9+CT3QobT/kn
-I2lCmYX4wsaK5rRt0TLim84Ma1XK+xRVZDQyzpctabprc94TK4Vf6rpds/UAcFW7
-5CfQGYECNBqADsydWu5c
-=BxVZ
+iQIcBAEBCAAGBQJR6jkmAAoJEDYO1FT4VRUUuYIP/RWaP7rBI/EgxsHYj5okq9Fk
+K5s2mjSj0C/LwZAyRxF1USVV3fQj3anL5sAmjRFhWjSS8LkX1Y9uKcD4yx/V0KrH
+Q0s4o+lGeIL0jMZ0f5bN1wZI7FN/l0SQIx3Y6ZeRs2qpFUNBG99yF+dHG406kvx/
+F9JFWUxy/buTUNmPJ2SZUsz+NC8xkbnTmb2lXz68rmZ+jtkmxXht4iJ4lLY7kJmm
+5va3WULFfksMjExkduoRch8yXi08vbRFG2uujWlr+kDwawpFWk25LzPdZWPWb/i+
+hM8NuF/sBF3MF4WejXrLlBJ5Y/ElRs+PQ2DcYctrxs5gK5MPsRVvRUH9cObPXKex
+Ly00Trhbb0C1lbwLNz0NGQOiglpYJp5KBpgabspL4cZX5TZG0zY/rAfKsT5MbT9t
+e1WrDbymV4RiaLgprNbyZY7Tw29qU06E+NRePO9RXjGQL13p/VwNrVk5B5PV9niW
+rXGunPSubYNmfQtfU2lNoPQhqUOaAwvmpr3PRl0BssbUC6BiX2C3QqiOGGRzu2dp
+2HXx4EA+/TcS129nkG1H/UtQjnnLoD7gTHAlTbncZxu7L+oTfEfQEto1OPkds8UO
+KNSeejppOlYimb7wqN6h7ZaAJL9hyPV8RiK3UkryJ07ERzceFWBGhH6UuOWF4R5+
+PCdqbJIhzii1po9V3OsX
+=Wfzc
 -----END PGP SIGNATURE-----
--- a/app-i18n/mozc/mozc-1.10.1390.102.ebuild
+++ b/app-i18n/mozc/mozc-1.10.1390.102.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-i18n/mozc/mozc-1.10.1390.102.ebuild,v 1.2 2013/05/10 05:27:20 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-1.10.1390.102.ebuild,v 1.3 2013/07/20 07:15:49 naota Exp $

 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@ -21,7 +21,7 @@ JSONCPP_URL="mirror://sourceforge/jsoncpp/jsoncpp-src-${JSONCPP_VER}.tar.gz"
 SRC_URI="${MOZC_URL} ${PROTOBUF_URL}
 	test? ( ${GMOCK_URL} ${GTEST_URL} ${JSONCPP_URL} )"

-LICENSE="Apache-2.0 BSD Boost-1.0 ipadic public-domain unicode"
+LICENSE="BSD ipadic public-domain unicode"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs +ibus +qt4 renderer test"
--- a/app-i18n/mozc/mozc-1.6.1187.102.ebuild
+++ b/app-i18n/mozc/mozc-1.6.1187.102.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-i18n/mozc/mozc-1.6.1187.102.ebuild,v 1.2 2013/03/02 19:28:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-1.6.1187.102.ebuild,v 1.3 2013/07/20 07:15:49 naota Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -15,7 +15,7 @@ MOZC_URL="http://mozc.googlecode.com/files/${P}.tar.bz2"
 PROTOBUF_URL="http://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2"
 SRC_URI="${MOZC_URL} ${PROTOBUF_URL}"

-LICENSE="Apache-2.0 BSD Boost-1.0 ipadic public-domain unicode"
+LICENSE="Apache-2.0 BSD ipadic public-domain unicode"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs +ibus +qt4 renderer"
--- a/app-i18n/opencc/ChangeLog
+++ b/app-i18n/opencc/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/opencc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/opencc/ChangeLog,v 1.12 2013/04/02 20:55:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/opencc/ChangeLog,v 1.13 2013/07/20 07:04:29 naota Exp $
+
+*opencc-0.4.3 (20 Jul 2013)
+
+  20 Jul 2013; Naohiro Aota <naota@gentoo.org> +opencc-0.4.3.ebuild,
+  opencc-0.3.0_pre20120819-r1.ebuild:
+  Version bump wrt #476790

  02 Apr 2013; Agostino Sarubbo <ago@gentoo.org>
  opencc-0.3.0_pre20120819-r1.ebuild:
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@ -4,25 +4,27 @@ Hash: SHA256
 AUX opencc-0.3.0_pre20120819-cmake-libdir.patch 619 SHA256 72beab447b850e83a115ca37d6f0893b749d742f5a887a360a435b72c5316929 SHA512 eb900e6a7009031ceac0a23549ae8f232ec4cefcdf6547385c99e93fde410804a280744021d3850cd2c5c97e5927e511ca87fc59a760fd0a3a2dbbb85d3100c1 WHIRLPOOL eee2b999ca989065868cf85c8f7296ef99a9ba837d708ab21e01fc0602606c538de07b7bcd762f3540e3bf0877ce6c90a059f36c629c7d334b24e241e677bc8f
 DIST opencc-0.2.0.tar.gz 496313 SHA256 fc4b3203482c7e5ad5c887dc08f83cd1d0e0c1fd1bdd9ec48672ca89bfe2a424 SHA512 46c03a1605b8c464d8836bfa6e69fef1d1978102aa6a75ab75c9546635da91223bb26412639869a1f7fc3f8db1f4ebd12645c53d07cb1375605dbb42c7e4524a WHIRLPOOL 98675c15579e573633f68e9c73a83164a3bd0ebb82b7b92dd31dfddda4a6cd3c81dd4cbd5fd775021b29e7c543952bf2206c2c00257fdc11f91754f56a969e9b
 DIST opencc-0.3.0_pre20120819.tar.xz 363528 SHA256 3ed46594547b86f1326b07c3ea910148b1c58b74c9d21c8d4e11ec30e2254fae SHA512 0ca231b5fd7b314111a76bfaa8e288fc2d43e02dbbb2a7c7e9312c1f1f0aed1a0d3b67b04b0cc3634d1b48b8fe6983e6219db053f3a2114abadec1af00b9f8d5 WHIRLPOOL 268d331479bffefdc6e1f58600422a36a32abb7d4dd873eeb216977daca05f4a4775ca547bb301bc16ea8fc702ef04cfd5d8f88c90d10e224a585575129e67c6
+DIST opencc-0.4.3.tar.gz 535151 SHA256 7bdcf9e38ac05a16750d5276494d810db107c8a8b5f8b87e2357ee167a13a587 SHA512 ac31c3c018467cf047e077d399903560feb0f8c214accd1ef45d0b1477d011af8e9bf2dbde4497c133daef61b6508460e9b2b04c0b5f336c2d67fc840a1d07e6 WHIRLPOOL 316857e7720e962c9fde27c04327c0c6b5137ca7290b170cc1ead86dcd0c6f14202ac2386f6e565ad12ebca99c939a511447902054792203edeabed88e149a2e
 EBUILD opencc-0.2.0.ebuild 1009 SHA256 e02ff9b6dd2c26cfd8d4e665d059765bbb0c3593503179e587924ccd541832c9 SHA512 b862d5a1ddc735e81997d3a2d193d5f427cd15895c3df0fec9a6342eda4894313e03e15f4f5214cd1b5f21c4d804a983cb0ebd5f25847c1f89999b38863041fa WHIRLPOOL 88f5203e765923dfd064cb2eaeda35b3d328223760a1f3184d78958be6e76fb6f39918b2c6402f7200a35c797e52db2f09f3778992e118c6d05ce6bd6b9928ec
 EBUILD opencc-0.3.0_pre20120819-r1.ebuild 1059 SHA256 22ee37d3a0e1802ac442c554fbc2738e74226962fb006fc1da44a3c4162df2ef SHA512 9b74c1939d68542caf080f87c8093b543a7c668913420d19ad56b118d4af778c501f1e80858b11835128aca99001e626aaaad458894c8478c5bba4150c932fc3 WHIRLPOOL cc6f4ea8b6a08c61170df57701cf1a93043c9300e1dbaccab03b2982fe05baab16ea8e64d577a2812fc0e9a139e34bfc86059272d7426642f2c16c8a429d00d5
 EBUILD opencc-0.3.0_pre20120819.ebuild 1010 SHA256 fca1df01c8b52d996f14ca8ccacc7935c100aca6fbe920f7a66494d02d25cb23 SHA512 45661ccd33781da88b6f36debd8061509d5c4519112663fa7533a8e5be22962b435f4e0c3158a584a3fe766f143702e8bb6de34197fa057c7bc3709510d1d8e7 WHIRLPOOL b594747f1f57f70291643634883ed817bce3be0377ce2611eb7833ad894b231398a51b4af31de666a8f4cc8a3f53b64351a01f263f3c3c7fa7b95d968fffb258
-MISC ChangeLog 1758 SHA256 4e9e55ef3ea98014e0ed1a0bc0389dc838ecd0a5bf6ab2f6b16408f1af73a179 SHA512 751e22a24987eb8ecfd758994b42019d2a7b1db2abec08a2958cb53d731693dabf2ee3fe08b3aa591a96d49299a90b97f45681aad5953d6b44c05fc4f75fc935 WHIRLPOOL df5f835f428fdd9abfff17ebdd31f1dc80ff742a59b4784ec23e3026d7ce5dcd0d216228d87ff0456cc1aed2aaa857fa1d70413c247a6cc69deb30edab0f87c3
+EBUILD opencc-0.4.3.ebuild 934 SHA256 0fba1832fdea9d89a9eedab9ae7153e903974427e158eddb7e09657cc8f14739 SHA512 254f9229bc03994952afdc5240850d00e99ab7d477d7ccf19a4b9217f9fa58e87ab3e7ba5af75c1b3731c4d79407efc2458389460d715cf577f9fceeb977ad74 WHIRLPOOL 2e44a9fb17051cad81cfa086be4f7931b90aaed8d63880e94b6518c639dbb423f5ff03ba3ceec9a37f423a696f252a36fffae47eb9bc436442d2bd30a60f2e63
+MISC ChangeLog 1924 SHA256 a3b9cf79fdb266281aae61ee62be04eafd7b32a213256fdc5defbac263e54b54 SHA512 3dcc6d7d7ebfb899515547869c6d80639ab268c9e453746df23bfee6725ca025b2cb6fab1228615585c8f7637d6081d393676ebe7d97cccc867d600bd7947232 WHIRLPOOL 6ac5abea0618bd3e5ff99d2205a3ab558479c6719e2ae7c0e6a743535d9b4cdb6339d836f415d9b62f8acd58a6cbffd9b3d831b43cf85610deea5c263e36a513
 MISC metadata.xml 403 SHA256 6d4162cc06b73e91f946ddcaae8a007e2ad98d91116ac89474757419258d6ab4 SHA512 083b88943e89084cfb8e1f573eef9be16322eb5b0d07108dd1f5d6e17069d7214e692c70c0bfa59c90859a0610abfa0de9b3d03ff196960105bc9e5bc38b6dfa WHIRLPOOL 6474e07c3fdefac790e62b97ce375ac0cdb22dc381a55bdc4a7c56e206143671cb1b228b53390a72880d455d8b0723de07362f7a1ba7b1ecc5634c414e778707
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iQIcBAEBCAAGBQJRW0XPAAoJELp701BxlEWfkDUP/0FAzxHhwtCFxLPI/9s22G0k
-5QkiunLqwvO68At2njyMjKpaqSG6XSOth6MdFBr547U0I5ulGbZlCwY5+JMorGee
-lpMFKRoalaqsRB4IE7GYdFhHGKiBNjIt15Pz4oY2Fv6eg3Oz6MD4l7oeyg0h75Qx
-DhlQxr/dmC1lf7gL6uWAjgln8L4g5Ubh7Oo27LD8s9MziNoof0G10NQAp1d2xaOS
-tt6pqJqcE3b/sD5eNG3pFg25x/mNbxSxx2emqj5PaWlfet62UvtDGB7fI4yZ+Rnd
-8MrqnFQGEHcPqedPMU3+nr3/DoL0Fp519kLnwMuYql36ZxCFI2+ZqQxAwOdGyCLs
-g82ewpYxeeA3EqMyzS/MbgrtV2Ih/OSb5CIyFYOM+D9gDUluBt+bUgxS2xskokW0
-65IumUjCMxoIsjGCD8Jx+481RspR4u7WC5pbfUGUK0Vc+DJeNRaLHGG5z7wWtKZ5
-G3S+0C0SlCkgq7MjqtaEkO9jtz7YWsEI8S35JlJLKVnz8ePmTGQYQwlQmHJQgdHB
-CIdKsLs1TTyxPNUWk1IXTB8mBNsdtqT+HEkKUAdL8RdDD/epWv+97HBI95gM+LP5
-NW6rKynb4n1b8ZyPdHhpdscqCm+H+XzdGQYeb6QyOw1sCUeIUosCBG+ntR5jk6iF
-8TEMFUnlnY33CUq+tOK4
-=kLcs
+iQIcBAEBCAAGBQJR6jaGAAoJEDYO1FT4VRUUjqsP/0Sq8otFwGxdpp01qMk1MNjy
+BOm+nBWVnpnkV3puEuySoojVAkRcyE5L0oL0SJICBZanZW5OdLBtO43gmrupJ4Bi
+aBCJElyk2KRjm1Ua/FBs2nSxPYAS3uiBtdhJljjuuzh15VWVNFKe1Ct53G7DR2CR
+bUWJTPfzbjT7KPielTS182/mGZljSqncPuzFQw606xwoTSyQADks9pAVtibrRz+9
+6vGdlMliUWI27TuRX+TEolYalsqR3vE7x3MuaofajZiNiUc9y7aNSFADsGLjQpCE
+986lW6kGWz5EpoSmM3R/aBJnAb/OS9SFuEEAOvkq8CUGyemwfh/Vn7zrSjNaoolv
+lEkHWaRL7mdcLSjjZocDIY43sf7ReBjc/eRZUMHgrru0KfbjFoIV4Oxe0X0IDbiH
+upUvRJCXN/c/GEcvd2ktDrIxR/ealw4IzTcH9bgTUDq8lW/pJXiUwnJ4eieRoF/G
+F3i3zv67tmCvm191IMlzrPwcscpBDFcSUEnh4kWUjl4wgcvDIUG17OVTBMrGXY7o
+dKWvRpEMxGsQDWPrxeK4pRiykaFqz15mqU7YQIvRslv3yZpB2qoTRSt2UQfMz9pw
+fx4jlHynbEYkmPsU8cwR0HjBhl/GBRX7ImmczPtPm/bgz+bfy0ZooSbQwdmAiPzy
+OYDOLoupcTBfgndMZPhK
+=Vqtd
 -----END PGP SIGNATURE-----
--- a/app-i18n/opencc/opencc-0.4.3.ebuild
+++ b/app-i18n/opencc/opencc-0.4.3.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/opencc/opencc-0.4.3.ebuild,v 1.1 2013/07/20 07:04:29 naota Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib eutils
+
+DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese."
+HOMEPAGE="http://code.google.com/p/opencc/"
+SRC_URI="https://opencc.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+nls static-libs"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="nls? ( virtual/libintl )"
+
+DOCS="AUTHORS NEWS.md README.md"
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake-utils_use_enable nls GETTEXT)"
+		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use static-libs || find "${ED}" -name '*.la' -o -name '*.a' -exec rm {} +
+}
--- a/app-misc/media-player-info/ChangeLog
+++ b/app-misc/media-player-info/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for app-misc/media-player-info
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/ChangeLog,v 1.23 2012/11/28 17:53:50 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/ChangeLog,v 1.24 2013/07/20 09:02:58 pacho Exp $
+
+*media-player-info-18 (20 Jul 2013)
+
+  20 Jul 2013; Pacho Ramos <pacho@gentoo.org> +media-player-info-18.ebuild:
+  Version bump (#477334 by teidakankan)

  28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
  -media-player-info-16.ebuild:
@ -111,4 +116,3 @@
  24 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
  +media-player-info-4.ebuild, +metadata.xml:
  Initial ebuild, closes bug #291417. Thanks to Giacomo Perale.
-
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@ -2,17 +2,15 @@
 Hash: SHA256

 DIST media-player-info-17.tar.gz 107176 SHA256 ceab4699e27b683dec4f985be5667b684e1502728243a1bb711590a58ee31e46 SHA512 7e9092b8f3f5a661f8e858647eea471851327fc0ef84ecbf45753f2a3fd564229754c866ed9e1eefba193739d38a2c6d04257c93b9525431d49034fbed6e38c5 WHIRLPOOL 00fa9c2b4cb6b990c60a77b2a3ef513cf8a3698104821dd9ad35f7872817cb171f793cae2ecb9f0bc680c32a6e609d4115de046a9b265a9ba1f87dce007a1067
+DIST media-player-info-18.tar.gz 110068 SHA256 21f186714d8c90e9a78c861cfdbfc1c9ae7eada7b80152a82bec685e7b7fc565 SHA512 0847097312109496b289240be5a2fd72f38e6eba784eaa97db903bf05d062d7d085f4f38851c4832f3a5d60886483b56fe3fbd31a3711cdad14c673536381d5e WHIRLPOOL 4d646c601e0d470f458887523a1caee350dd824421b536cf829d3cecd8137383361922ff498eb9344a98a11330bd0fbf60502ac839cd74921d3183d47a509540
 EBUILD media-player-info-17.ebuild 715 SHA256 59e5f900a80fc7bd7afa6b63f820add50577c378b20ab00b3dcb563ef7c4969f SHA512 ff91adfe54674c6d807f342e3b0c59a8543b2f6a2895a650ed9145b89ee1c1d80bc5baa3095346296a0b03f56baacb42b3d9ae7ea245ea9be6d6a86b16351aea WHIRLPOOL 6709e221ad1d92b0dbd70f92c4951a6a868c0867450c990e57291b9c42adba4b56b2af3e7ca80af00176991321840f5cf5728c4141f120977a0477c9efe66748
-MISC ChangeLog 3734 SHA256 56126679490f6cc9958468f99a60fcc2e8709c5c4d0ed1b7c8b61fa0f611b542 SHA512 eea436dd4fc8971d3a926dfef565554d514121f3e454d415d8e21033f7b46d8c228289eb8f3552324526d4a23eacd04f04405aef354917bd0a6545bc787381f6 WHIRLPOOL d40d49f84043e1fa21c35b9fdcc4186b52b6ab6cbc67c071933f25e959516e9b3d0f8b5134b582ff8e77e927e3552ca21662f95f7e38b893105dbad325f27d0c
+EBUILD media-player-info-18.ebuild 715 SHA256 7aebaec9f160fc944a39aa3035af9b0770905c9cd06df16f236ec2ff5d56a47a SHA512 3287d89ff6026ca9daa14903c2c35a74cde6735f47eb317a6ff356f6b7ff957d23823531dc035773214d16317b155338eb237d341fcc0bc6f329e3b71e8a0fd3 WHIRLPOOL 45c212fc6d23eec49b1ec2f10298804e0dfaa401bf689aefd91f0ab142ceffb008e05bb4c4db0c1548599c09ae758bc86f93f6ddd68580949e0e8b91abf1a0b4
+MISC ChangeLog 3883 SHA256 3b484f2fdfeb09e72ec63f08262ab4332c19901a01040293a04edfa97a435f08 SHA512 87b7fa1a941b028197e1d612ed00af63c96119432f6f0fcf11e6bf0e9edde87a5039fa79c8a959a41b456170691df748c9817a8f8a9e0fc9987e663983b7027b WHIRLPOOL ee8efaffb74ca2412f95518bb7e3bec54b39ca04b124577a7cc3ca5ba04dd1b8ef87919155c82e6d73220efd50ffea7be7cf6d9444aff9facd273a184605e109
 MISC metadata.xml 164 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48 SHA512 87c2ce9c93ff1fdd7fb4768b89912acfceeeee0bbdb88d0cebdeb3e5f3b93e53bfbfbe2c1c3618629044a01af390d8fe9ec795472df58893df65503150dcf2e9 WHIRLPOOL d4c178d01829841a4f2e694280036c74f68c215c4ab64869f5a8ce2ee5005a30a204ab0e9189fd752563f392480c3c5e7fdd59cbecb40f7e51fe2ff8d1e4cd7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJQtk94AAoJEEdUh39IaPFNQPUH/iG3uHElML/Pf8BXD3td/gvD
-tusBR5Cu9Ny2/WQV+JA4g7GxYNunh7t6wYGoopSjjFARuMwfz58yOFNPsfcyvslL
-kEvupjbIz1H3c/nbno8VOqcEBw/9aSxP6+fDH1IcdVBIIXdMSEnMWIut7l8TuqR8
-HOADOoELG6V2aoA9K8UL8Msxt/y78Y9wb0grS5W599G8dP63zYPnQaCZgrftrj9L
-eV0j/Y/c+b2i2tSEGerP0tN9DTwFGZhreFCpvqWbJ4qzSyWwN0Eo14C1XEv9K/wc
-Z/AjOhvtjS4WPcwAALv1IHBDIAeW9X3+uRkiW2/uu8NqOCcE2+SbmWKVNZ2XgeQ=
-=BLW+
+iEYEAREIAAYFAlHqUkMACgkQCaWpQKGI+9QEpQCfdzVjLGLUQVja7oOfZ4tvhzTf
+gKIAn0N6juy3YRszWJot05D9fcWE1Q7s
+=sDPH
 -----END PGP SIGNATURE-----
--- a/app-misc/media-player-info/media-player-info-18.ebuild
+++ b/app-misc/media-player-info/media-player-info-18.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/media-player-info-18.ebuild,v 1.1 2013/07/20 09:02:58 pacho Exp $
+
+EAPI=5
+
+DESCRIPTION="A repository of data files describing media player capabilities"
+HOMEPAGE="http://cgit.freedesktop.org/media-player-info/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS NEWS README"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.249 2013/06/26 17:18:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.250 2013/07/20 09:18:23 pacho Exp $
+
+*gnumeric-1.12.4 (20 Jul 2013)
+
+  20 Jul 2013; Pacho Ramos <pacho@gentoo.org> +gnumeric-1.12.4.ebuild,
+  -gnumeric-1.12.2.ebuild:
+  Version bump, drop old

 *gnumeric-1.12.3 (26 Jun 2013)

--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@ -3,17 +3,17 @@ Hash: SHA256

 DIST gnumeric-1.12.0-annotation-syntax.patch.xz 13408 SHA256 8cc904ced03d1cdb894afa896c7fc8be22bd3cf16f0c8427c965eb813a406a48 SHA512 b1062a75750630e4e0cb479a994db2c98aae4668355a7756bd6ca9f64407571d73af0fd428453e373d4d0d9f77d842869cbe4f7d5ba0054103cd8add0e09d5b6 WHIRLPOOL aec5b51c9af1e6b3806c7f5f22930c41d42ed0dfbcb66407a18ded9cf565b78daae76d2b8a5952ce4f7379b11c9bad68a02982f7248a62d0c5a87e8ae60a71f4
 DIST gnumeric-1.12.0.tar.xz 15631708 SHA256 037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111 SHA512 5bcf5e04d3c871d755a560207db2bce9d81bbe24f9c330a8a0555a386c38f505997c0a24a44afe0ab28539f03a921ce13f82ea8c6e828e17d998ce4951639223 WHIRLPOOL 2de92f2fecc9389e92a1e50f3c37361e0c06e792d0e75ca17beb1a5c6a9b344bc14d3eeef561ecdda5a3e6c60f4fe73f6fb2fd22e343b6edf842f7a81d64a825
-DIST gnumeric-1.12.2.tar.xz 15517296 SHA256 d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874 SHA512 6f41941e40f5fb3cafebb194082e6d4597caee6b9b1d2c271b8d67e8c78e2d87e366932914d62bd6f5ce6c1bbc2b7e26d5800fbfbc16905576057c3de1244fed WHIRLPOOL 6d8aab376cde73feb2d51d2110ec12c3eecf6e31f8d815e332c88dbfd21040f31828563d4ab5464b79fa238f40e3cefc066b65c0cd5e890eed061dd544ead7a9
 DIST gnumeric-1.12.3.tar.xz 15503384 SHA256 b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6 SHA512 f3591db341d378979eef4de5eeae0f9b7035940d46ff0876ad7cc038879a722541b098520f60078f83c47280870a0c6b90369a03394d05adcdcc10b0e072a15c WHIRLPOOL 39dd401d6f4e83d736aaa6816e3f917c7f43ca20fb809ce2f93b15b8fe7a3f000e2ea9f9921be1b09dfba798096c1cb9843b2db3c7ad4d2eb5cee709a9688d7d
+DIST gnumeric-1.12.4.tar.xz 15501540 SHA256 562e17d8b56f4587e33f54adff89a65ede6e6e0c57bcd561589453d8edae80bd SHA512 58ae4015a8c7fbef1fc8675092ed8f3997091cd7efb579db402d253b0bbb61f1445d97f84e5bda864698f96a25f979c82ced338d5d2c887b20d31d131a8c4884 WHIRLPOOL 63c9c56aee4ab4486ed8e06b98a5e15389b789abbccaa41eb6e4a707f67d742337079dac526a7950523c8feedcfb2a317a0801b799c423e7410382111570ab2f
 EBUILD gnumeric-1.12.0-r1.ebuild 1886 SHA256 fd6400c6fa9584e87a4701d6a116f82087819bc943146f6dd29cd02bc17fbea2 SHA512 574f5b13f2382870b325131940b34c4f7c31e934ce6f4cee6c7ef490f045e72241f4016c9250e8a6388b5d31bd16c669cd22a840b76cc828d5eeff277cc5e2f0 WHIRLPOOL f3b324f698f5bbcd2362fcb93a0d196bacd569d3e71505afd08a96503212bcca0a79c919f5e4c7b1240c7803f50193844ac46b69aa88726ac1194d92a05342c3
-EBUILD gnumeric-1.12.2.ebuild 1553 SHA256 5451469e149c44779403978b4f822899aa62dd37df421cc4d01c90500a59b0b0 SHA512 659ff22d56c531ad398efbe6a9d0ed38af16b29ad17b5471c8a2d9e12c3103b9216bae87340d61e96053c383123e33ece1e22a16c3cbc590c6d052e5113022b8 WHIRLPOOL e0f7425f74eafe3b404da64164eca324f3aa80d99542184e598bdb6e5783f9068a03f2d1b7876d542d2c7fba819944764a5d7c045f3b55a8d3391f0f25f717dc
 EBUILD gnumeric-1.12.3.ebuild 1583 SHA256 be2e40334c6cbb6b88242e048a79b22923653df40da477d2bcb63f98a50ffc62 SHA512 9a8deda573e5a6677bbe7a438d41e042157b7c6fcf2f05472ac246b80277d028f3913cc3fafc98a69880586204ba173e2d35a7e04b3d0c60e9f46376e6e75229 WHIRLPOOL 8a3ca316b01453a080592bab91c951c6e07717add796bb2934f184e68e1c2649065ceb898aa454c6cb2a1779c933ef093fd4392ab041005fab274fbad0706d01
-MISC ChangeLog 34390 SHA256 e0cedbe2b81a4994577fbc08ec5085e691762f7e4a26a2e22bc261f3308364b8 SHA512 3450805d9d2cc82d8f48f1eca0379f8743afcbe34e636db27a626d3c3a3ea90fc0013bc515eccd464a37c7d115ea1821700945963e1500b26fe0ff4f4a764d1b WHIRLPOOL 43ef7eed8027bc4fd21245180ff51c6abaf9e7606356b16b13eec13bdbdfbd87ac4990a834bc00d2baf6a571997ce17d29e6ea03fbd5fe5a5ba173db61dbb542
+EBUILD gnumeric-1.12.4.ebuild 1583 SHA256 a599156cb9c6a678b79d7e8ee6ba05af3044881d4fa41afeab3e011bdf2418b9 SHA512 9c7ca270bd417ed66c93a6ed15d679ebea7b29b59c2fb312fc84583bb9b114cfe3b76d97ad93462e907761a0bd65e60ab6633dcc5cb527498c13511c83ba36e9 WHIRLPOOL fff4b5e03584c2a95286c550e0f0b7016bdaafef19832f6e952bb233cf8b8e3561467e0be45d9ce8d7d1fb4541b90f970c5b7dfc0b8fa3dea650e204860c1b34
+MISC ChangeLog 34546 SHA256 681af3c7a0eff58856aa2ac4191eb7f85b5e87ee6a20c1de636018fa01a20c71 SHA512 65f4fd176917e37097386b115fd12d1b7ec598f93275b313a24fbda253bae58c29cbddbb43c26dedd91878ed8773c7787c252dc233e9af9fc1db40722c694937 WHIRLPOOL 1d90c36ce913b58815d3e28ea598a265069a085d3017eb48c43c54aa0349c112c4951eed18068347445f132f7dea35d1124eb10d262427799ce6b31c0f52c51d
 MISC metadata.xml 288 SHA256 483a2aa5f0d22403863e1179d3baec278bfe44056193d3fe85ecf2ce1f4495ff SHA512 cd58e78b65bbb9d400512d53380cf5372f891471eec1427b3f9ef32af9af744f7b18fb089a1f6e0dac6e03bcfea03035918cc45bd22c71343735b5ab222698f1 WHIRLPOOL da660558be1f76f31fff8c7166a12504710cbf7b73d5373965e613fc7f0da7d947b911a6c8b33867e3e4489a3f29400b2f7490823e1e481be588bd7118f64827
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iEYEAREIAAYFAlHLInMACgkQCaWpQKGI+9Q6qQCffKQIxc3QQJWk2/5zVz085k6d
-CLAAnAyiTRvmBRqxOTKMRwXnm/Ih1ZGy
-=Z2nE
+iEYEAREIAAYFAlHqVeAACgkQCaWpQKGI+9Q0awCfZRXRGlAn01l2oMz3qxmRiIm2
+njEAn18kpEUWahsw9q/GYf4LM7Pqvnxg
+=zzwT
 -----END PGP SIGNATURE-----
--- a/app-office/gnumeric/gnumeric-1.12.4.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.4.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-office/gnumeric/gnumeric-1.12.2.ebuild,v 1.1 2013/04/27 14:19:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.4.ebuild,v 1.1 2013/07/20 09:18:23 pacho Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"

 IUSE="+introspection perl python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 # Missing gnome-extra/libgnomedb required version in tree
 # but its upstream is dead and will be dropped soon.

@ -29,7 +31,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=dev-libs/glib-2.28:2
 	>=gnome-extra/libgsf-1.14.24:=
-	>=x11-libs/goffice-0.10.2:0.10
+	>=x11-libs/goffice-0.10.3:0.10
 	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.24.0:=

@ -52,7 +54,6 @@ DEPEND="${RDEPEND}

 src_configure() {
 	gnome2_src_configure \
-		--enable-ssindex \
 		--disable-static \
 		--without-gda \
 		--with-zlib \
--- a/app-portage/deltup/ChangeLog
+++ b/app-portage/deltup/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-portage/deltup
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.27 2013/07/07 13:13:59 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.28 2013/07/20 12:11:44 creffett Exp $
+
+  20 Jul 2013; Chris Reffett <creffett@gentoo.org> -deltup-0.4.4.ebuild:
+  Remove old.

 *deltup-0.4.5-r1 (07 Jul 2013)

--- a/app-portage/deltup/Manifest
+++ b/app-portage/deltup/Manifest
@ -11,19 +11,17 @@ AUX deltup-0.4.4-zlib-1.2.5.2.patch 1063 SHA256 b423d613a677122c217103cf58aaf5ab
 AUX gcc-4.3-compile.fix 159 SHA256 fdedf8dae46e498f289ab590e2dff81ab2d361fd219d7576470dc5d183b1ec78 SHA512 c963977702a6b728ebec71df49f9dc17ae393ec72daf2e2086f73d0e4ed83ef7cd8038969c33af898c9f5fe2907b826e7d95c6759c79890b94f57b1bd3e9415a WHIRLPOOL b64312c2a7f6ca4ae7854a8888c10b48bdacf60c97d8b1ec757ef452234c406e2a88fcd27494ef21d0d8c78982790ee511ec4c7817d511387fae89a4256704ea
 DIST bzip2-1.0.2.tar.gz 665198 SHA256 4b526afa73ca1ccd6f5f1f5fd23813f159f715c3d0e00688f1df54b51f443cdd SHA512 2d857226af70621737823a69e2f1790378636d5d8cfe60d4f87bf4e0cd9c5458aa22d358fbf51cf50e187a2c673b3304f276448ca07e6ae205a2c5e64135eeff WHIRLPOOL a114307c966824ecbe3d01fbae4e0aba3049a3a70d071f4e59febd4b450fc10ac4ff6d099419cc076f89eedf72c45a3d32b45d028d1bc9e2313b481cc8a0fcff
 DIST bzip2-1.0.3.tar.gz 669075 SHA256 4aaa8e7b4ecf03d91c33e8bf92d489533fa6c1f99e825c34058003f18eb68c13 SHA512 350728188009faa0685fa18ddcb0ba1fc869963ed119953664b7abaa5f3b1393b72588417f0a5a6a5e088691678a6156d05b616e0f5ea38d0b2049b2537a9ae9 WHIRLPOOL e8c8e10d9512b7cb51adab1d89f474f905f1b9c4116a85210ed53a5f9a6b8a27ac4424ca7c1779a6c62a30c6397ab726d11908a8e4a5043c1d19faafea77c742
-DIST deltup-0.4.4.tar.gz 14905 SHA256 fba7f1a970a04b2b786402e55c017c667b065f1974154f2ba6a65c855357b744 SHA512 52c269e1e752cd733762245256f24cdac7da493abe2793d9f4978a5884306d65d4c1bd25f30d6b86d22f8b3e4aca47b3dd7cf13e310259ced4aa87d9f45d9277 WHIRLPOOL 97a4b34abd1ed2e74424da73176c1a08cba43277d9db9c8306fa10ccbe3e778fa937324ac68bc52b5d5f1cb390f0be42f8a4a8ef799c3b36f0f8b6f50ea2b7b4
 DIST deltup-0.4.5.tar.gz 14728 SHA256 9c8597780513e5231eb07b05cb1a1ee07b0fec71a4be2dd4a5cb2dd1011fc795 SHA512 fae6814f74fd62eee45701eed4df45ed5f6b6da50cff53d7a04ff3f6e11553ad526c3b3262048e210b1d932b6d30cba69ac1962b867b01aed90de58b45bf6c37 WHIRLPOOL a91994aa049ec25fc1b5d3a816595354114ef37e9655b5d91aea973fdfa187b77aa33aa620de3c38c5888bd2d9c89f376a3de8dd43104515961b3ffc128ab77e
-EBUILD deltup-0.4.4.ebuild 1843 SHA256 29fada4f09ab0544d2136fb1aab985e9a040ef0c6c87ae535f6da81c60805f7e SHA512 cc61a0378f2b5aa9e648522bbe0bc700d7afeae4bcec17884be5c84b82788e2af1b6bd3f67f591db1e109b4c9c6bc527715adc33c81c5f83cdb4f77d3b4b3ed7 WHIRLPOOL 5bf2aa9b5f76847171a2e1f5d7895284f2dcf10c0ab95eb81bde05d2edca2972124e4d91aa9aee5fad683a7ec4ef60d99f7c8dde6fb10e3dc855331d0a580673
 EBUILD deltup-0.4.5-r1.ebuild 998 SHA256 6da8cbb20779ba9ef8f8c9be6cfe4ae1597ef1413b703238f57200e511613498 SHA512 634ab1f809645a12839b11074a91e4fc63cf202829d7e8708ade1b669e0cac6483c98bcfaf8145e41dac1a796ea7fe8de67c9c5cdeffcbbf882f068fb3178a6f WHIRLPOOL 6846326a8b776d554af6216e2cfb53e12ba4cde2ea07578204410b8c4b5bb4b9702088c527dccc503f393d3eb189244ef27ce66635c4dea4d8d6fe60740c0798
 EBUILD deltup-0.4.5.ebuild 1688 SHA256 95ac3bc1d29c25326062d2a1a3149f072e3c605fef3be994fbc437c5d88804be SHA512 960cc3b4debf0ce56cd83d179b2c5145bba210011e40ea57103253f4b29490ed7d6642efdc67619373b1c6b5a335570046791b00d4e1c8306c512242a1b8290d WHIRLPOOL d950fb7e42e85aaa615a63208167b0b6a87b2f063133947ad834842b6fe75e6ee22dd792e890efe72092e8d79dac81549cdd1d64b95b6972d9b9dcdb1b9855e5
-MISC ChangeLog 4023 SHA256 776fec965b209a5e5d9e65a31f3a7cfb1c6522f4b1c7beaaf82e19b2fd84899c SHA512 53fe746ce689a0c00a3f20f78b926befd3067ddbc7b5ba2d1c5c61e6dc79ea6ef3de43ba817cd81f9b976c7d469aee6a88b5b3c242f9133ae6182b2f8e8fafa9 WHIRLPOOL 558ef205892f61f7b11a9d1d1be54acdda1cc618323584e31fee0dccb642706244fecc9aa6a34e786b76a145bdbb13a8754de8d4b628ee5b9e1a28098ac8b5c2
+MISC ChangeLog 4111 SHA256 30a47d687be2a5ad0282b7fcba0997b8e69f5a8ea06e4733df18cd21ddcf8c0e SHA512 cf3630ba673df0a8ad828d6aa91144f0366a91809f2d7c7dd939e70d2303ed7a557621e8637195d9068a1eed76587ae86e10fa0e89e06ad18b14605caa516daa WHIRLPOOL d941bd556ac56b4034ee74122968fdfc4c424155f832b73f3211f67488440c6db0fc6554f22c9f369712f71ed2dba10dcf40c868e13f6d36a99333089246b11b
 MISC metadata.xml 216 SHA256 dc9f0e4dfaa8a668f5ce6364f434d92b4554d1bad537282169d99f5619bc5db6 SHA512 0dad3752ffc8f74d74afc8ac6c641a7bc88d454fa809915a0c457efe1b346af84fa196e54f8154a4fd32c0a70f05a0ef64be5b1e8038ae7af86d0871182b5a46 WHIRLPOOL 5e0282b01def229ecea3dd39768c307b02372487d3c7bd61b65c73f43943d58d84e00f79dee38cab85dcb2abb2412d1da9a89b2c66e37c627ac92d37af8a67a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iKYEAREIAGYFAlHZaaZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iKYEAREIAGYFAlHqfn5fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1TIkQCfT3xQyGV3d/kzVCxevVa0kbHF
-o1oAoJuROzYE1IMinqPf50WtfN4gVDO4
-=k9Qq
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1Qd2wCfZvdssE6sSQQfKnx2hYukHYON
+ZWIAnjRium+w2bckB2mbhjCd44U1ixY4
+=s7aa
 -----END PGP SIGNATURE-----
--- a/app-portage/deltup/deltup-0.4.4.ebuild
+++ b/app-portage/deltup/deltup-0.4.4.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.4.ebuild,v 1.11 2012/12/27 06:46:36 pinkbyte Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Delta-Update - patch system for updating source-archives."
-HOMEPAGE="http://deltup.sourceforge.net"
-SRC_URI="http://deltup.org/e107_files/downloads//${P}.tar.gz
-		http://www.bzip.org/1.0.2/bzip2-1.0.2.tar.gz
-		http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	>=app-arch/bzip2-1.0.0"
-RDEPEND="${DEPEND}
-	|| ( dev-util/bdelta =dev-util/xdelta-1* )
-	>=app-arch/bzip2-1.0.4"
-
-src_unpack () {
-	unpack ${A}
-	cd "${WORKDIR}"/bzip2-1.0.2
-	epatch "${FILESDIR}"/bzip2-1.0.2-makefile-CFLAGS.patch
-	cd "${WORKDIR}"/bzip2-1.0.3
-	epatch "${FILESDIR}"/bzip2-1.0.3-makefile-CFLAGS.patch
-	cd "${S}"
-	epatch "${FILESDIR}"/gcc-4.3-compile.fix
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-	epatch "${FILESDIR}"/${P}-CFLAGS.patch
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-zlib-1.2.5.2.patch
-}
-
-src_compile () {
-	emake CXX=$(tc-getCXX) || die "emake getdelta failed"
-
-	cd "${WORKDIR}"/bzip2-1.0.2
-	local makeopts="
-		CC=$(tc-getCC)
-		AR=$(tc-getAR)
-		RANLIB=$(tc-getRANLIB)"
-	append-flags -static
-	emake ${makeopts} bzip2 || die "emake bzip2 failed"
-	mv bzip2 bzip2_1.0.2
-
-	cd "${WORKDIR}"/bzip2-1.0.3
-	append-flags -static
-	emake ${makeopts} bzip2 || die "emake bzip2 failed"
-	mv bzip2 bzip2_1.0.3
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README ChangeLog
-	doman deltup.1
-	dobin "${WORKDIR}"/bzip2-1.0.2/bzip2_1.0.2
-	dobin "${WORKDIR}"/bzip2-1.0.3/bzip2_1.0.3
-}
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@ -1,6 +1,16 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.82 2013/07/17 15:53:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.85 2013/07/20 14:11:43 xmw Exp $
+
+  20 Jul 2013; Michael Weber <xmw@gentoo.org> mupdf-1.1.ebuild:
+  Fix desktop-integration.patch, thanks Balint SZENTE (bug 477490)
+
+  20 Jul 2013; Michael Weber <xmw@gentoo.org> files/mupdf-9999-sys_curl.patch:
+  Add extra -lpthread for --as-needed
+
+  20 Jul 2013; Michael Weber <xmw@gentoo.org> +files/mupdf-9999-sys_curl.patch,
+  mupdf-9999.ebuild:
+  Add curl dependency and fix build system.

  17 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
  mupdf-1.2.ebuild:
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mupdf-1.0-zoom.patch 355 SHA256 e079ab9c832feb80f0669353606d665378188355bc699a0431241a303ad421a4 SHA512 ee1f6d8f174563454a6cae5e8a8e5c1f6aad237bd5a91d264510d7d939b44c165527b1daf3e5e10b31e4984bbbe8eb75dfa8a89ffff1dc465f96687e4dbc9706 WHIRLPOOL 13d2a509eec81dfe9474435428acb193fe37fe2e9cab6b5ba3df603fddfde4667c9fee67cf9d8ad0b5d48302b2f465c1be77f4230d5a3628e9306aa5cf873cbf
 AUX mupdf-1.1_p20121127-buildsystem.patch 638 SHA256 a069157b29f15d9e7efd904ce4b3558b397889be2e8982cc51b6272e3e7e73e1 SHA512 b4d65c3df3cf32241b5bd6296a62a62750a33535f2bab5acc2fbbe2f3deb8420cbab335c74b6d50898f2edc101a28cec23d70f2ae1f720d2a5a62b7e6da2dbc9 WHIRLPOOL 1d57cf9126be7590fe1fd03b63f3b92335b20921958a754a69f79801a8bbef74d9e68f38f97e2ee232c0ed4fc552f845e3af248b38952ea978076ea4d634f9f3
 AUX mupdf-1.1_p20121127-desktop-integration.patch 413 SHA256 b32f6a4a403e887935b6a0eb9f79f960b709601d31c695b5f6200b004c070f53 SHA512 6198c6d9beae6375dad4a3ca475eceadc6e98237e7d6f84de34170db00d61214c858eebc43e252a356f2515e4a573f2f8d895ad19e7fa4681fbf151ae457c390 WHIRLPOOL c1b991f6c24417e9130ee08bb6f024282795b801fabb76ca46fe6016cc5656e610f762253d824a9591ec99bc4a44d655435e4be11a976d88038e7809569583a5
@ -9,15 +12,23 @@ AUX mupdf-9999-CFLAGS.patch 251 SHA256 c2fc5eb9e09527385dd73ced61bf4e5ce0102ee0f
 AUX mupdf-9999-forward_back.patch 612 SHA256 e0ac626c00a21c607c158ed215fb8185dd01500af79727f48660170e761815d7 SHA512 42fec7eb1e5aa171ad6f7d8f1984a1804287fb1ad54bed7bcd0e3df6493955873ba376eeaf2ebd428d7cee2d1327d56002e3717ff8a7a74ea00ece51f9ab943f WHIRLPOOL 6246bf21953ea91f279240f86e98979b0f2d3ec5eafcb5c385d65172df10e91bcfac3f99d151afa7b594c540291b57d4e12d0642b4f7ee4bf9406071b111183a
 AUX mupdf-9999-openjpeg2.patch 567 SHA256 64f0d8946d0fe037a95fd5a58b4622c913622f930b21dd6af39f030d282141e9 SHA512 0a43bc4eadf41bd0bf6a6f0e400d0cc0eb701575ac7fb44c271aa5f298071bfcd7b3c5d83709782c0c935721a27470c58cefd2b385178c2b121b620061a070f5 WHIRLPOOL 76e2a7d1146d8bf55819e0588863a9b21c2272566820d90c3779de00f33b9863995d2b1cab6804be2f42579bf1fa874a78e9380f575aa50461f2908dda3761b6
 AUX mupdf-9999-pkg-config.patch 568 SHA256 409432fd7021cc353e0b72fdda891d0d0f0f7508f8514e735a2d9c7884199ebe SHA512 1ad447d5d6468a920cf71b3e12bce1862894734522b5c0e5f87871799b239582f56eca08d69b5d1b366369dda6f93037136dff07126398d2b7a746406a9fdc0e WHIRLPOOL 6f0df1978cf4ed97a92b6e681e5bbdd888e55a86ceb6b538a6269df0474d090de7c7ba924090eebee271261d2db237593f5ba226f1851a2a6830a9f50fc7f9f0
+AUX mupdf-9999-sys_curl.patch 274 SHA256 842d421c810ae0f94736e1e832573daf2a6e9b4014c385af65980f7c73f4ff88 SHA512 888e8c8a6591b00e6f459ff4c36b842765a8e7f06b9382d453466f15576d22d88e53a42b372d94cc4f74c7ab13c33ecd74da52f371e330ffbf092480844c5ea1 WHIRLPOOL 4901caf92900d129ef2d5ef820e1fa28cadecda92bed3f306dc0b670ba9e88f9b233453f906a911bf9c938cc4a0da23c3d997531087cfa8cf9dc01134efa1a26
 AUX mupdf-9999-zoom-2.patch 216 SHA256 239f60b41a1afde0f01095c5d5052503491593887cb2338f201889ea0a1ef814 SHA512 caccead68c45f06b5f209330040d4afdb51da2506d5692f27c93ad96577d4f16fad27fc9a66097f09326d65225a3e2fe9206eef8698fb549d83c5a93a57fb396 WHIRLPOOL b8fac668373049887f06248800f39a239a133b905969ca1972bf4c6cb9529570a1df5b5816a367ad74dd3cdb49b59abff15d386524a65305564454fbfa48a8ae
 DIST mupdf-1.0-source.tar.gz 4208530 SHA256 4f5e12625f7f827f6eb5606026c9a7a7dbdeaf935fcea3bc173ed8d469698ec2 SHA512 00f71288740a137fa3eb3537453f0465949a2dbc590a38651b3dd7a651dad6d0dc5070a3072988439f52729b12478cb467f202157ceb44e5a560431354567861 WHIRLPOOL b58166c37fa6ba81e946e53326dad50426886380b051943f2988657780e3c77e4970541f27ec3efc29ce6693012293bf3104dfd79dfc50f644c6f051431294f3
 DIST mupdf-1.1-source.tar.gz 4281735 SHA256 e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34 SHA512 d61694041d28309e8119283fb97cef5e1f2effa6e93bfe5ad0b2a0b6b76e38a575a23b0ba367cb59efa77f35b131bf82667f2c7c8df29eb4cdbe3c12b0ad3a33 WHIRLPOOL 67ba7df6c0b94f3213b2e6a709fc3d9ec02945a0825169fb8833b2919b4bd4d8e6fd5f29b2b231df213f8e68d092526b59c152281b56d1c3a9064799ed35e60c
 DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
 DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 WHIRLPOOL 86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
 EBUILD mupdf-1.0.ebuild 1530 SHA256 7d66f2590ba2cd7e91f29237467d654f2768130f9c8b2aeec0d9670a8b4ae98c SHA512 59f4f7cd267e1be73ef16617d9fa1b6609774e22da4cc5424a2906ac04135d24b0154ff860e3b684feaba5dba82f10c6bb4eded52d10336233fafe28db3bf8a9 WHIRLPOOL 4a37ffa9e9217968883af86c25bc3f39ec104e6bda7d7d4c77c474edd06709c00bce5e787396a2499551f02eff973c6bfc5429d5626beef81764d862ac54a35a
-EBUILD mupdf-1.1.ebuild 1553 SHA256 5957e8e39a40c7bd80c60cc8964dc8cd6f77f5a61e9fe7aa498ea13839a2644e SHA512 494ddc8b2fabb2ba0ac2d12432e22162ecec37b1a4167994f15ffbee4fa8a2460993450591843e6bfdd319673109dd77cd4d02453575e5d0df01c2161e465565 WHIRLPOOL e0c33e733a33723c3ac91b45f001e2afe323260a235435a2a36783fb4c9eb8c5ae98895938bff3a6bd506346efdc582fd8e5575e84f133e733bf12bade4eaecd
+EBUILD mupdf-1.1.ebuild 1568 SHA256 d4abfb60ee5a76f3a4f945f39ea2711a2db798e090aa4abbb7fb4e824e75243c SHA512 3606032a262c47af85ad11d9b3c456382b6c9076268bcf23d055be973d60eeeef0002b59b44c6ceb15e990c1dc26a5c01d87212fc6c4f33f9e0ea6b2f3d1020e WHIRLPOOL 442c049ccc06de1a6cd7f810b8433bc50678acaa8c3982e21fe615233aa8d1e983f3cee7ceb06fb439203c6b7ba16674593c7f7ed7932be6c9650ae5633bd267
 EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 4e11b767db4d78de3d5b7e83ca1ec97880c30375249db419265100366fd20585 SHA512 fdbe754cf384c594f754a31e3d5153f25fc43966fc359f999e2852eb3eefbe13d1ca03a022dfbfd0a649a1b1a4f6d84fd5232005a5203ead16768eb12fa32f90 WHIRLPOOL 7b1e8e8b2b2c5209a5cd81de3bc70d0dae0d905d12006800618b1ac31212fe5b2bb0aef6a7e6dd8151052f1d56a1437d0687b10e635ddf2529e35eb9daedb6b8
 EBUILD mupdf-1.2.ebuild 3266 SHA256 c872fc73b7f9ae250bf85ccc68cd7fb4fa3e991bea6843b751d154b49a6904b5 SHA512 f334e42f9edf370998169cdbf177267e78be07a050de91d9bf27369c28782eed67a94a19bd40a382657548a8467c81c7e690a01e94de666445c3a5ef3da26d08 WHIRLPOOL f647ab1dced46b023da7f1bb88dbcc00ff9eb3a48755e05ae5ce13f3e8fd8ac3315c2cb3780b1e106a6d90b2e8e2db6a28d8c674dcf876f876a424ddcf82911f
-EBUILD mupdf-9999.ebuild 3514 SHA256 0bf2f93d3c8c1234f2c7116aaeaaeefea781f19058e98d8451d8176c39bd380f SHA512 8e53403f9e0144a4e012e2778ed0285e6817a82e6737fb3c7f2ff03b5dc153529d2e84b8653967a52fa02792679c565ffd8c47a2b69a9d67ee889cc603080348 WHIRLPOOL 94a4ac30a2b45795bba20e9f7edcb8d47fde1d6a0807ca47b9869978237c307570725dcfdab67cfa955fadf53ca70eff5faba0cb2a8b77af3b7018c9f4968f9d
-MISC ChangeLog 12974 SHA256 5fca5427aa0fa00dc5c9ac2b057bcac0394fddb94acde0813bb35f4531144cf1 SHA512 4af580cd09a066205751defb2bd1a07ee869343c7506af1417ed7aaaf9f15056538aa7b7bd5e56c6bb9393acda718cdb1ff895818f600c65b63069c3ad382d9b WHIRLPOOL 1694c2cbef06dcdf8bd96677d5cb9ca3060b0b2ae73b5f665868e45008029ba2196a63cdaf6a6e4a265db37ab8f963e3048b1a09a11386d03d816ac2bb234299
+EBUILD mupdf-9999.ebuild 3581 SHA256 dda33f873c8fcccec942f1a59758a2e9bdd1cbad12253f478ffb91d4f9b7a0b0 SHA512 87ad4856b7f3a91017078b1e31e98690ea4bd8d1de7d74f7d6f31f24cb83f4d0611cbbf3d181061843ebba64cdb7e5b49890c93634c22272b07f14609acdd957 WHIRLPOOL ac62a4e59e4c76d05812376703596fbffed75e68c2d7d8c9bee43834dbcd7d151fcb50a68afbea9b858a5fb65a0910124476906880ffd61dcd8e80cf6ad07d6f
+MISC ChangeLog 13365 SHA256 be9e4ce7aa67631837039d884ccbd6b22aa044193df65e3779d75873d328cd45 SHA512 2ecd84e078aedbe147fb149496db3455f10f3c06c9e8176dc6782b1854690667c4a508282bf3dfe06280549f517d0f483d434a2c0ce46eb959054f721dfcaba6 WHIRLPOOL ed9807e8bd56b0ccd3919aa54c8ea5e94e23e61ecad13c69ffc1d29675ba5f133ed135a2b582cf566f9774f74d4d5ce16785a43018c835f6842ec2a36eb0b223
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iF4EAREIAAYFAlHqmqQACgkQknrdDGLu8JDT5gD/WJrVVIKDaEPZOtErgvvoq2z2
+42AtgGgm3sDdqgGov0EA/1Zka+FvlZpLJzWbHA/6aSaW9W+N8LQutmsx58Ju8gsh
+=N2r0
+-----END PGP SIGNATURE-----
--- a/app-text/mupdf/files/mupdf-9999-sys_curl.patch
+++ b/app-text/mupdf/files/mupdf-9999-sys_curl.patch
@ -0,0 +1,11 @@
+--- mupdf-9999/Makerules
+++ mupdf-9999/Makerules
+@@ -63,6 +63,8 @@
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
+ 
+ endif
+ 
--- a/app-text/mupdf/mupdf-1.1.ebuild
+++ b/app-text/mupdf/mupdf-1.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/app-text/mupdf/mupdf-1.1.ebuild,v 1.8 2013/06/07 22:52:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1.ebuild,v 1.9 2013/07/20 14:11:43 xmw Exp $

 EAPI=4

@ -29,7 +29,7 @@ S=${WORKDIR}/${P/_rc/-rc}-source
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.1_rc1-buildsystem.patch \
-		"${FILESDIR}"/${P}-desktop-integration.patch
+		"${FILESDIR}"/${PN}-1.1_p20121127-desktop-integration.patch

 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.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-text/mupdf/mupdf-9999.ebuild,v 1.38 2013/06/21 19:13:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.39 2013/07/20 10:29:40 xmw Exp $

 EAPI=5

@ -20,6 +20,7 @@ LIB_DEPEND="dev-libs/openssl[static-libs?]
 	media-libs/freetype:2[static-libs?]
 	media-libs/jbig2dec[static-libs?]
 	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
 	virtual/jpeg[static-libs?]
 	X? ( x11-libs/libX11[static-libs?]
 		x11-libs/libXext[static-libs?] )"
@ -39,7 +40,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-CFLAGS.patch \
 		"${FILESDIR}"/${P}-openjpeg2.patch \
-		"${FILESDIR}"/${P}-pkg-config.patch
+		"${FILESDIR}"/${P}-pkg-config.patch \
+		"${FILESDIR}"/${P}-sys_curl.patch

 	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
 		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.97 2013/06/01 11:49:41 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.98 2013/07/20 00:38:43 tomwij Exp $
+
+*icedtea-7.2.4.1 (20 Jul 2013)
+
+  20 Jul 2013; Tom Wijsman <TomWij@gentoo.org> +icedtea-7.2.4.1.ebuild:
+  Version bump to 7.2.4.1, I plan to do the 6.1.12.6 bump tomorrow; fixes bug
+  #477210, reported by wbrana. Removed zero hotspot tarball fetch due to
+  http://icedtea.classpath.org/hg/release/icedtea7-2.4/rev/08d655f1631e

  01 Jun 2013; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.3.9.ebuild:
  Add ant-core dep, we aren't using the java-ant-2.eclass, reported by genstorm
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@ -27,6 +27,16 @@ DIST icedtea-2.3-langtools-fd956199cb82.tar.gz 2312634 SHA256 2806de9d41a91acff5
 DIST icedtea-2.3-openjdk-12b96a57263c.tar.gz 131726 SHA256 651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc SHA512 2f16e5ce13db60d805a4f784847a0ff377d334cdc054cd684c7662cf895fba5bfeabfa40184bece81d7be853fa91e7cd8f85e2e442c7f2096c7e6d2ca40b336a WHIRLPOOL 72e7e401117ded89691a1ec0595c28c3523ec259e5708c45beaaa7af783d9a53fcc0e43b934005d855305c5d6a3ceb73c03be161f9269f207b9f4529164850fa
 DIST icedtea-2.3.8.tar.gz 5053426 SHA256 750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153 SHA512 2ecc4b71b167a71789dfc099225df848c6a8763ae15d1b9396ce4c6068b7d7d6e9a428b09d1e2c99e013650a7136a9d1457979b8d1a38d74ca22817e31716b7e WHIRLPOOL d79e964e83537ddcaa2161614f6b78564f36fc28db751dc599b031ef35d85b9f4a3b801c8e288248a8759645745f3a408652abcf19668a33f9a4a92ac9058b59
 DIST icedtea-2.3.9.tar.gz 5056166 SHA256 7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da SHA512 93fd7f51ce9ff8912985d1754bc2284621356bca39a1a2906a317d8509edc1d05f212e9edb9ab34f90a649c11ea87924afe18b7c0f642310b4f59299dc2fe174 WHIRLPOOL 87b0eb3766568f7a9e4e47d6cc1e7273061a42a74ba0bc9a50b931b6669a8ceb78213c3bb2417cab63ef151e4a0281505ce375ef039c59294dacd9d5ccb08d1c
+DIST icedtea-2.4-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
+DIST icedtea-2.4-corba-23ae4e0e0cce.tar.gz 1439212 SHA256 618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395 SHA512 7089a47c86f9e8381262d593a686c6e51055e4262efe447e473ee9d07654d03cb373fb99870a4ef7862aab5deac8f8977252008267478aac886be8d5db3f8049 WHIRLPOOL 6ddbb2fe9118c69be77db404214d43cd19dc7301830ab5c1e68c143a6155dfdd73b1851df3d46925b797edd5540e97b5d13c98ca7a987bf3931535c5d8a166e3
+DIST icedtea-2.4-hotspot-5f53e7717116.tar.gz 9606522 SHA256 f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42 SHA512 b695fbcbcb05a78fd140fdaf26054b1ee5cca68702359e7e6ebdadb31b5073c9c62290547c9be6be480fcf55e0c95641bcdf36389bf9d742772835a43e99a50e WHIRLPOOL 429300b7925fb127a6aba24d1ca59a989e9de02cfde83a47a6a769fe5dc2774ee393c87d703a1716354eeed6a04e1bfde2bf0c96c55cc0dce887d6acd8ec6311
+DIST icedtea-2.4-jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz 314689 SHA256 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97 SHA512 dd5e7b122c82987b9508ef809c7bbc797f509ba817a72852d708e23039b2f2c7efef4ee0431ec0e0a0f7ac612928bb9bf49eb80b476494c4b3176337aedbf2dc WHIRLPOOL 7e4366d19571ecce408370454905772393af86bbe88039911b495154a45dab8348aaf02ce6a1ba6be84dc991ae7e636d74e10ef53ae7f273ba6f0694a8421bc9
+DIST icedtea-2.4-jaxp-5be6b670d08b.tar.gz 3870365 SHA256 df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34 SHA512 a61a50487173260dff3f5961a66b990b68181493177282974d17d91ae515940609ad5f27e2a13b904a6c786cdf59c4276934cfe8c318fa847504240126e6c927 WHIRLPOOL 154d5c15fe027e092f4b52cda4d0c0b876d1922938bb9626d3cc456c8f585288fd0f73640e8f10501f483f3612b89eef0aa7b4fbb7d5834eaec5e6aa9aa513ad
+DIST icedtea-2.4-jaxws-c0e48fdfb695.tar.gz 2759642 SHA256 972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037 SHA512 b8869a70814d890f2b60841254f526a39bcc2ecac1e21598b608e7d77cdb48ca848d6d67f65866ed068b2d9ceada5ded62d07f6ff97c622d44226d62e3320918 WHIRLPOOL 56ca3e110899d48587c6b9b5bb9defbbdad57eeb882cff8e596ba70100a8293ccb5d7643b019bde57ea34895f5d5a1a4bf04a3a9c5126143721b1bfaa860ba29
+DIST icedtea-2.4-jdk-65d95818d79e.tar.gz 45188076 SHA256 97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432 SHA512 3f7d493cc936683f6a91ca57e573769333a3b897cd6b77cc38c12204c1cf4565efc70379ded5439f3e3afab40a492078033b07e11d276f9b9738b3a52fdc9ecb WHIRLPOOL 2dee12a9e926874f5d4de14244806aba98f92eb6509e34550730737ebc2fb17a49ac008406195cd0cd93243429f094491d1e760ecedb05d21cacdf8d62f094c4
+DIST icedtea-2.4-langtools-91c95fd8eea8.tar.gz 2317418 SHA256 6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561 SHA512 abab6b3efbad1eaeecc79a375840cb13b739bf3a0536662d876e4b2bd7cb9367cdd89f6dd0bb4bac66ace05a781fd5f20adec3fd61e3e69a5c30e2d863a8a9ea WHIRLPOOL afbcc219703a92216583848c0fcd83e2ca66898da67bb6ae00a0ebb94be370e68ac0d8370a6ce58f58105bb835c63ce1de04eb08d545b31c784e39ceddf00602
+DIST icedtea-2.4-openjdk-ae86c6974e8e.tar.gz 135344 SHA256 f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a SHA512 f0a05d08508863733f11dcca96a7e67cf4f16825902f9100bd7c963976e2196a09b652b7b9c267821fe4204f590963904564c6219364041e7f62665a6a376278 WHIRLPOOL 3b85dfb13e236a73522b79c5c1eca216453fa0592ae91aabd930f1073ee3700912f941a468dbf4fc69c9e28ff7d941c2fa46220600f07226759febe569f26970
+DIST icedtea-2.4.1.tar.gz 4806525 SHA256 65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a SHA512 e12abcb3f28f8b2924147b77af5f3dd7163fa54bfde32d36a37cbd338f42b5e11a516ad16d210d9123e15c04b982aa2951d2bf19a070add1654102ddf00d75d3 WHIRLPOOL 5e1e3343a275d308628542948a2544038e8b681d993b36a33894574309ed9c9760684f696203dcd3e02926cd035ecb2be7b9348b1345eed3370cb7953d107886
 DIST icedtea6-1.12.4.tar.gz 6689142 SHA256 eb326c6ae0147ca4abe4bd79e52c1edc2ef08e5e008230e24bee3abb39e14dda SHA512 f7d2834edd051b2080acd596d230f16604eb616eb1a6a0813dd274a92c7ad9711a25b65dacea06a12591c6121beedac44f9bdeb2e6cb60fb612bdeea63957a55 WHIRLPOOL 6109ed8cc94ee4e14882f0b787ac1a8a4859c542b7f92b896e46a33bbef5ef1cac532bb54616dcee66deff4d6fc50296f533f0979d7efe31f98ddd42a3d8c60c
 DIST icedtea6-1.12.5.tar.gz 13044886 SHA256 c61d6eb2f98d5c4059bb6eb6d808dd0954cf7d35c14290e5c77c3d7db75d2b35 SHA512 c8356216b4ed03630ebe338b790d6cb594dc24da5fe2df2740f4fb0e2034d19fd3b25025b1abf2ceb0cd656e8a08fec1f1455caeb450bd75fc29ebdddf9ab766 WHIRLPOOL 64e225c255c3645e6a126a3a6729b42ddda7f84a1e38397be801966203eb2c13903cc170f1b6c807c4ce0c15234f0ff8b857913bc0cf4231b0ebe5ac0f4db06c
 DIST jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d WHIRLPOOL d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a
@ -38,16 +48,17 @@ EBUILD icedtea-6.1.12.4.ebuild 9777 SHA256 27b401c55d14db7eca1c72ea0a952fc4ede7b
 EBUILD icedtea-6.1.12.5.ebuild 9550 SHA256 a9dcdc551c11f17754ad5883394e9e2e9c27108ea81dcf799549574fd91a807d SHA512 226f398f2eb0c348ecb58bbada52af0f0ed05817ee45635ea36045f36022e8d471e72a5188bc7a4b544cda9529d6c7e33be8e40d560604c91a40d5a3d94b4041 WHIRLPOOL 48ba6061cd9c8d8045423dfe150edbf544b2015550d2926c251f1b34140d32d68478b1696d75887fdeb52a54b4d77707b66f9fb7c20905727f6e9468da2d6d62
 EBUILD icedtea-7.2.3.8.ebuild 10836 SHA256 6975e1c89bca7044ed507f2669f7e712cf9c900ddc19aec723124e63124388f3 SHA512 d1f660e8abbee0b9b52c11990b345916cc9a9411d89d300e99f86002103d1ec82233ffafba7c55b481c8b281b3e55efc93a89b9f6b58e5397651feea8bfe0ee4 WHIRLPOOL 7ef88df4c190bb60ac12ac8f0b421289bbf62efd2a413f6fb05de31031020126cd284ec816da0706f9d7f54062e850e59e9ded7193c16b0558d88e90f21efd64
 EBUILD icedtea-7.2.3.9.ebuild 12131 SHA256 9576c1402b81a90fe2103616fee4610bd0cda72cdfa1fd70ecdba749987bf7ff SHA512 6e443a55675c58a10498580a0063e0c6de7c436fa90aed6fe1c9233d9f9ed6ca5c0035a374fd8e716f5026b86d23c4c6d961cfbc13a683979b1cc28069b8babe WHIRLPOOL 648a716b4d57872d64d3febe304778a6c29201dbce3c10c27030a1cbb8767da7eff55827b287623fb4f40e4d8d6f2513a2a9650e7d67e056bb4cbd1f002dece4
-MISC ChangeLog 22126 SHA256 3d2ce17753ae0aea9e4990c57d613eb83e47f32e44f44cda428d9ac7aa1241d3 SHA512 0798a3572f830b1fd000390901b7d13d7fd4827ebafe4666d9aeb563fd9f609f44de6d1c8d729f5aae06a7b560aa8574391cd10484ba764f5fc8ef90b055b128 WHIRLPOOL 9da53e94b63ab397d81396d9c6cf75aa948fbdda3159348d1957dd256df57a0e37042b0f2e7dc6663f7dccca876aa2b9ccd4323180164b166951ba81ffba7ee6
+EBUILD icedtea-7.2.4.1.ebuild 11825 SHA256 76a81093ae609d42959d4cbcb6f4ebdc1d1e41447d5ccf8bf75300cac0ef401e SHA512 8021a9f656a0ce6a5dc6a3165a841a13b26688440a81b0a5076246621a57ac4d75948b2a9130d71a1a67235bedb021ae256cd1fbe5457b45f922a6a325f423a2 WHIRLPOOL 5d9b3ecefa98b04cd3626ace79327b118eadc6c0faa943c96f83fe997de8f0ca99aefb7efd1e218053ab790f7e2563773b4a8426f404e49976396d253b2969fb
+MISC ChangeLog 22456 SHA256 f34d6352026e0953a8d56a6b99138a44153dec7802b7477851f7f4a19a248142 SHA512 f7b74156a6ccb893ee18dc8c99cede47463869eb94e77ea262fc29ba51a6d0d56124e2248707949bd3e80713d013f7fe140b8d0c348f0715e2c3f2157f51efe4 WHIRLPOOL ad9c50daf8e83aa555ea0196e60d138c26b495a4db2d8ece479fd23b2c95c0b6fd04167b2e1402cf1697bdf740b76c77697eca3cd0e92c82bd54fc574be5d0e2
 MISC metadata.xml 1524 SHA256 bbf85ab93611dba9d16ddb6f9889af231a9420a857b4c2b7360320a53b3dde1b SHA512 e1ab2d668de0086a5bda71a8323da63ae90e233a10df0af3eda9a2f2162a92a65e8a93ab8d752599b12e9b1dbad3776fbd86a01b38c59b9d60ad221c6779ba60 WHIRLPOOL 0ddd7461553ae3612ee53f1403dc66e17ab03428bd6eff7de5e3ad2db3d971cadc8be62b6fa0426733bd7ef5e4da9d2f0a9c04b0a97ede7bb908e14ec5141c01
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJRqd/fAAoJELjwI6Q8XPdaWB8H/ia81ohhfK2JeqLWTZIb7uX3
-2qnOyHf7iupBiZF3EX6VJsRlQHh/ynSF7vBbNtgB73e9ohFsDIrvM9Vx45250xvo
-vEjA+MpOPJxoLbn2pe3TQHQix/iriTgZbkNRtTbFpUtNrxDsgqCRY/m0pG+x8mbf
-pa4ims13u+w1Ol2BppT0fl0pPiX6yjAlm0SJAg4Sz/rJEvgvA62YBkf5Rdze+R5t
-6EAEMN3qWD5BMnqrJdLH+nRIc53LDRmVZlEgB+pLZdbAJbRWNSUAnzNt8ppla/IG
-THKqMk0EVM8U2GQGfjPQLt3f3hngF4bisSQKo/XAXZt0l5pRmMmcUc6xFjR7lns=
-=FFb3
+iQEcBAEBCAAGBQJR6dtJAAoJEJWyH81tNOV9ig8H/2owlTjL2BYPVQ1bQccaEDma
+EdhfneHhPE6VRPovjC27p1D0KjKzBr5b+OPRuVzdcy6I6MLij7Jq8svaYaTTRjUd
+Y2HnIYAVNMfpwKpLup5geDkff2Ee5PtXfMiiT2sfwpi/wocYkfSJrRBo6kWU8dD9
+FnlsE1LSHMpeMAcoiwaJQ1Mk2KQ/S78fKOz773OPlawU4gpgAIT1HmkW/q5+0fdr
+P66IPNVpGI07cGv6C8zFEdOVtUpjkSI+RIvfzlVSH2q+icIr3B/9Pp3IOS+2y8i
+/cEgqqE8e9R8A+cx5Ze8WZLSawEO+lK2YhKIdLpwdUAmWbPG0fXDcYEHOyaBvaE=
+=9xPV
 -----END PGP SIGNATURE-----
--- a/dev-java/icedtea/icedtea-7.2.4.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.4.1.ebuild
@ -0,0 +1,359 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.1.ebuild,v 1.1 2013/07/20 00:38:43 tomwij Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+
+inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
+
+ICEDTEA_VER=$(get_version_component_range 2-)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+CORBA_TARBALL="23ae4e0e0cce.tar.gz"
+JAXP_TARBALL="5be6b670d08b.tar.gz"
+JAXWS_TARBALL="c0e48fdfb695.tar.gz"
+JDK_TARBALL="65d95818d79e.tar.gz"
+LANGTOOLS_TARBALL="91c95fd8eea8.tar.gz"
+OPENJDK_TARBALL="ae86c6974e8e.tar.gz"
+HOTSPOT_TARBALL="5f53e7717116.tar.gz"
+CACAO_TARBALL="e215e36be9fc.tar.gz"
+JAMVM_TARBALL="jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
+	 -> ${OPENJDK_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
+	 -> ${CORBA_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
+	 -> ${JAXP_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
+	 -> ${JAXWS_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
+	 -> ${JDK_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
+	 -> ${HOTSPOT_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
+	 -> ${LANGTOOLS_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="7"
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source systemtap test +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=dev-libs/atk-1.30.0
+	>=dev-libs/glib-2.26
+	media-libs/fontconfig
+	>=media-libs/freetype-2.3.5
+	>=x11-libs/cairo-1.8.8
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	>=x11-libs/pango-1.24.5"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6
+	media-libs/lcms:2
+	>=media-libs/libpng-1.2
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Require >=ant-core-1.8.2 so no additional ant tasks are needed. #466558
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+
+# FIXME: this version can't be built with icedtea-6 
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:7
+		dev-java/icedtea:7
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.2
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	virtual/pkgconfig
+	sys-apps/attr
+	sys-apps/lsb-release
+	${X_DEPEND}
+	pax_kernel? ( sys-apps/paxctl )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:7 )
+	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-7 icedtea-bin-7 icedtea7
+		gcj-jdk"
+		#icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+java_prepare() {
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+}
+
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
+}
+
+src_configure() {
+	local config bootstrap
+	local vm=$(java-pkg_get-current-vm)
+
+	# Whether to bootstrap
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
+		fi
+	fi
+
+	if has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		bootstrap="enable"
+		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+		config="${config} --with-ecj-jar=${ecj_jar}"
+	fi
+
+	config="${config} --${bootstrap}-bootstrap"
+
+	# HotSpot > CACAO > JamVM > Zero, though CACAO is somewhat memory hungry
+	# CACAO is not yet available for icedtea-7
+	case "${ARCH}" in
+		amd64|sparc|x86)
+			;;
+		arm)
+			config+=" --enable-jamvm" #IT1266
+			replace-flags -Os -O2 #BGO453612 #IT1267
+			;;
+		ppc|ppc64)
+			config+=" --enable-jamvm"
+			;;
+		*)
+			config+=" --enable-zero"
+			HOTSPOT_GENTOO_TARBALL=${ZERO_GENTOO_TARBALL}
+			;;
+	esac 
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if use javascript ; then
+		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config="${config} --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		--disable-downloading --disable-Werror \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax paxctl)
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+	# disable all optional ant tasks
+	export ANT_TASKS="none"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die
+	fi
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
+	# install it anyway. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	if ! use X || ! use alsa || ! use cups; then
+		java-vm_revdep-mask "${dest}"
+	fi
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-7.2.0:7"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
+		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
+		elog "If you had icedtea7 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for dev-java/maven-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.82 2012/12/22 15:39:57 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.83 2013/07/19 23:58:10 tomwij Exp $
+
+*maven-bin-3.1.0 (19 Jul 2013)
+
+  19 Jul 2013; Tom Wijsman <TomWij@gentoo.org> +maven-bin-3.1.0.ebuild:
+  Version bump to 3.1.0. Fixes bug #472850, reported by Joerg Schaible. Also
+  fixes up some missing dependencies, remaining dependencies are listed in bug
+  #477436.

  22 Dec 2012; Agostino Sarubbo <ago@gentoo.org> maven-bin-1.1-r1.ebuild,
  maven-bin-1.1-r3.ebuild, maven-bin-2.0.11-r2.ebuild, maven-bin-2.0.11.ebuild,
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX maven 5108 SHA256 ddce53375271fd6e9515350083fd4c97ae86213e5bdb9984faf770ccdac1ff10 SHA512 91901a50153e148b2799b8a1298b4ef26ac07af4b7bbb3ae5c76edccdc8efe41b5613ffd78bd1dd917a78fae8086cdbe737096ff2d4912d0333fff206026dd0b WHIRLPOOL 6f281693bcf3201e9aa245494dd4dec6b623adf19bf89a44461eadb27e6747c590cebe7c73b5f16b77f5eaa04991236ce6820cd0e5980d7e109f110338c6045c
 DIST apache-maven-2.0.11-bin.tar.bz2 2104711 SHA256 f8e91b43def9b78d01f0ad8374644aa737365144dea04a97f9503ac0011ad39c SHA512 829a583e44ea997576cb0949d74f95e6557069489329523c28c44b546f07cd9487a75f4326d7dc0a098a9755fd52630f2ee27a60daf35006eb48d6af250f84de WHIRLPOOL 5e467ee3f35ea7bb4a7d396e61c3f163702d1cc02d7daf4208b475e3d28be5e0d6d6e0a15ebc1a6d2d6d9697047562064c5309eec1491a3837067a71bcf81b42
 DIST apache-maven-2.2.1-bin.tar.bz2 2839688 SHA256 a8d819f78bec0505f5773962fc50117f0c5db4a69c7207d0c27cabffc950939f SHA512 ffbf74b6b51616dcd87252973ddd776f13861fece7cd25df9cfba4bda1d8dd574772cb5d37ac7ed97ef8b93b507939d428d47b9b81742c801c7958b9fd6188e7 WHIRLPOOL 17cdba09856646acf5a37c252c6dcc200bae6eb16ee07ee6620bdee832b452a3a1db8d61289cff3f849f5c0d57c673cfc4749e220dc52b2b5ec50d4d9cd1062a
 DIST apache-maven-3.0.4-bin.tar.gz 4873043 SHA256 d35a876034c08cb7e20ea2fbcf168bcad4dff5801abad82d48055517513faa2f SHA512 d6935daff3b80ed6e40ee0acb4f269b4b16e63bc29b792316599a9847f1b33d9309d3c399cdb170710714a1d150957eedc909754de8f8a77d87bd20a0abcb36c WHIRLPOOL f1e15af0bc0f942a8c4e435fa2cde57221e3ef8f86d43197dd4486812b115b684ad8e0ebf5ba3f2f0ad9d0ae0c5f0b0ac26a10e5e170fffe2d47bb77522c4e68
+DIST apache-maven-3.1.0-bin.tar.gz 5439122 SHA256 59088c62c14b996d597bbd55e720866b0e13e36daed8a46a81c01058ee74bd54 SHA512 8c6b13c680de2f9cddb1dffd15ae44a8866a29e56c92ccd905fba1a656d2cab26c40b10c4168ffe11dd3bd4e5161c6d9ea01f450e7c89aba532b2a20f9fd2b07 WHIRLPOOL 9b80b5e5d49a27784bd9760dd326677809fd5bcc8872bc2ee356bde92a6523d6cf1ad0ddcfc3aff96b07fb315af5f3c04b2278f5fd11964c76f179329dca8c8e
 DIST maven-1.1.tar.gz 7625074 SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0 WHIRLPOOL 2137afc57306d840d04a38a09f5b40d946d10f8216ebff4a3a0a385f475316266339f4b8d07b461a2004d487c6b74a68fc2db5f38cb831ed0947259f1cd08d48
 EBUILD maven-bin-1.1-r1.ebuild 987 SHA256 6924f1c13682cf67663cf528f4add2bf86ed7ea961f4a1e9d73f72794b03818a SHA512 d6e6f2f3b985538ec21f7ee98e8a2b3e6c3e235c220a297578b6145163978a947ce4df9a36938c06da2067cee8030520e839ace01cecefb130389ac55458c5f1 WHIRLPOOL e19f5560de9cb5f2fd1cc24c4e0d7ce31b00c1338e53ba2f04ac103d1ca0589b2330fd3366d63f69373291ea9b851abf8f33558525d3bf91a98793039ff64831
 EBUILD maven-bin-1.1-r3.ebuild 1090 SHA256 a2d2156c44b57db6b2a12158da35aa98e2d9d6f8e50d31eb041863b795496fd2 SHA512 bfde0905f0fba2b1834164d9dd144d000e8b2656355022a70a1f0468095f9cc0543507175d5e3c4485cbd75e3a1dbe49c656352115615188e16cd00eb09fe80f WHIRLPOOL 71c4542ced2982886140faf950429c4c5811accd5ed97cbd03bbdf9eba20ca267567f84bf1dfc847ee8845d034fc09ff1c6b8c1e3501e9a606dd29477b8ce87f
@ -10,5 +14,17 @@ EBUILD maven-bin-2.0.11.ebuild 1212 SHA256 a412f1c83c4fe06ee2bcf0c0ea3b3562f81f1
 EBUILD maven-bin-2.2.1-r2.ebuild 1347 SHA256 8c9ead085dccec00107993361926c89e46d82d5076cd55cc69fa55258e8d1f71 SHA512 5d8e9f12a3e8735061ea767382b44ff95a130825e1bbd390ec532a7aea47712b1a42a69f8fdd288029882620bb11210c525cf5fca642135dae8806e70a8fc1d9 WHIRLPOOL e6d705613e88ccf1cd87377e86972aa5c74045a71b8c0550acac28416bcb36a59774d4227dbbbc3896ec06b0709e40f4420b058529ef03dd7562cc1b5dea81f8
 EBUILD maven-bin-2.2.1.ebuild 1213 SHA256 539b9d7e06b5720045efdcae66b10e5724d4aa21c7427d85fc7020e5cef5baa2 SHA512 1ba760c68a0084d80ccc92fe4f40a4ff9309dd063006fc464647a0c523ffc3e3e7442cac6a00548273895d20de447fd4376c283f3524fee3aec1118d09cad5f5 WHIRLPOOL 8b52e00b64ec7e990e4fa739451f5a3ea0f0ddea08a81862695997f89f0a2740453120da6872bab3c79f85e76e07a2683d983f08c863a5289f2a14699985cd73
 EBUILD maven-bin-3.0.4-r1.ebuild 1424 SHA256 0d3cac6c344403c89dc4fe0ba35bdbcd05ea3b82ae7c5a7a5e2f79d5399c1b8c SHA512 76e04157fd320893d4d3739c57dd7666d377ad59b3adbc987f31ddaf2a285a79ec10f75a52d310fe5af96a7d3b325da55892caf15784610fce8a496f0eab130b WHIRLPOOL ce14fce8575a8027fa2829bb49d2a2727ac87ac753ac0915c8aad245aea3208b7b536a9e1ab1944c6c71336b794a1a68196a359d1e633c71b2cd357e1703c068
-MISC ChangeLog 15325 SHA256 b77bc4dcd733928033d5da51213c1dfac73c48087e2d4035a61bb9f9ba2804e3 SHA512 58a19abb2b344819ea023c884e04cd6f70e562eaea6adc1a9919b116b6e867d6ffc0a61be45038c95775cc764ddf19441e10f00131af82a9df6aed7f7aab3d8e WHIRLPOOL bdc6a93717fed81d119ca58b76b10e2c09737c8115cc568cc70ffb35b3f8ba09928c87d7830344dd28cb727fdf707f3e14d5fedf042490e6f1c4f54b1ccb2ac5
+EBUILD maven-bin-3.1.0.ebuild 1801 SHA256 c992e05b5ae7103b8e63cb4545fc4426327d13c0ff34f84819ede5c55d20447e SHA512 60e18b6c90f8b44959ccf2822de67e7cf490c0713040090b1b9795de54963dd5cb0ee1cb36d78a056f1849f2ce72bb938f78f8d6f2efb2a6420c8c2d4f42b915 WHIRLPOOL 3c7adfb63cbafbaba88ae4aa68c219f7ce4106cd7740e93249d8ff22e4f5f6f77b171f3d471efd10f8faf04a6b3cb8998def7f9630876d95677bc04ac3465314
+MISC ChangeLog 15600 SHA256 3eb09c02fed909cc03fde2bbec58248b36b9e0e2edbb81f011dc4bbfce7f4353 SHA512 4f8491483a362535e5fc871e18a43b457f3ba2800e899d871345699200f554a875ca7df849a35f2eff8d0a8cf419816a21780a4cddbfac3ed8baf674cef2c893 WHIRLPOOL d24f8b80b4f4e44a76e930e5d2fafc10997a6f1dbefe3c451d92028285799c856af042ed967e1ebcf5825cb8a3acf1ff8a6e1845bc38fdbe90949669a97f396e
 MISC metadata.xml 532 SHA256 737cab248d8870cc15bf2526d49b4e1a92ad53078f466210337075c1c57e138f SHA512 e71f154a1baa3eafe6f6fcaff059f59f62f1e5dde4610431b49ee91dfbdf046bfc2ac8b05ab740662911869e62327de6b6e7394cb6dc6f652021aa53f99d1b68 WHIRLPOOL 97d324d82f92bb3cf5bcd3cb55842bca1d2b2c87a8a76e2787b30e0b1de990ea3ab1d9ff5d953a69fc36ca1dd6c2be3073e166dd1fdbbc9e184bcdd4d33737c3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR6dHKAAoJEJWyH81tNOV9FagH/j3v4Rfca6/5v7oObR4Nh5WI
+fBI4T2sq8YMC+dNGM2N8QOz6m4BCiw7tKexlK2//9Y82u4ST3tglBBBV9gK4IHLx
+R2TN6WLQZTWPNLL6PrcqclrEv8NAP4/aoR3lDtBZ4EutnZef5Yqo3doKO3HiTQbw
+Vp/6yIfzl6OZu8knbB11RxxANjrtSalE+5O/ILRdB32mzGSJEZSk0yn5zrjgpr5r
+X4zXh6t97OK8QYCk1m9wWG2Vhb4UiCQdhTWgOLy+Lvr+UpPzzcZB337Goy/8BtTa
+lU9YJPIV0h1qfqwflj2iM3CDOw0BIlmvFRpYDhDD/V0gPa6wmvEoTPbiCru+JRc=
+=IHPE
+-----END PGP SIGNATURE-----
--- a/dev-java/maven-bin/maven-bin-3.1.0.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.1.0.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0.ebuild,v 1.1 2013/07/19 23:58:10 tomwij Exp $
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )
+	dev-java/avalon-framework:4.1
+	dev-java/avalon-logkit:2.0
+	dev-java/commons-io:1
+	dev-java/juel:0
+	dev-java/log4j:0
+	dev-java/osgi-core-api:0
+	java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v "${S}"/bin/*.bat || die
+
+	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
+
+	java-pkg_getjars avalon-framework-4.1,avalon-logkit-2.0,commons-io-1,juel,log4j,osgi-core-api,servlet-api-2.4 > /dev/null
+}
+
+# TODO we should use jars from packages, instead of what is bundled
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
--- 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.728 2013/07/14 17:36:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.729 2013/07/19 14:34:23 olemarkus Exp $
+
+*php-5.5.1 (19 Jul 2013)
+
+  19 Jul 2013; Ole Markus With <olemarkus@gentoo.org> +php-5.5.1.ebuild:
+  Version bump

  14 Jul 2013; Agostino Sarubbo <ago@gentoo.org> php-5.3.27.ebuild,
  php-5.4.17.ebuild:
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,6 +1,3 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 20php5-envd 145 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce WHIRLPOOL b9cfe0e80ba437bbc6008223c268bdafcde306ba8083dce96815804f3e1ec0937706e0db091149785a0076a6c6eaab8f7dff28578b706e84b4bb4e67850a4ecd
 AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c SHA512 c74ec09c3c4124a15e14ece4bb769bb889466160cc0878ca3d55d5afc30fd4c05673c40428b75be669f72e82ba29f60ed19767caca77bba8adc12aae1c83f6f3 WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441
 AUX all_mysql_socket_location-gentoo.patch 633 SHA256 d1c0fcea4509cdb7504701e5b1996661483c3b5eea194c07fdaef91a1ce18a27 SHA512 cc55b3c1cd2e9fe4d4aa887146de9306afbbc44a3bd652225982cc04b9aefa8ca094448a765f52bc36e49726034cc702d9ef41e6da518946813103920f5ccf4e WHIRLPOOL e06c83a8852fcb1387a38774e91377464086a4908aee379d7196bc9ce2a76c6850399266aa0390e8f9885f6812c1ea717c8d98a4eb9949c3d86db357f95c18ac
@ -35,6 +32,7 @@ DIST php-5.4.16.tar.bz2 11690340 SHA256 3ec25fb5c260b3b512a5079ad1674fa6aea9c3bd
 DIST php-5.4.17.tar.bz2 11697434 SHA256 dc49935387a5d1f6ac798a3bb4902ca5020f3aa74117ea848b58d1bb61327eb4 SHA512 b35ab1d815bb56247c5f8842967859bfdf37ede5e4c5da4496e4f1540b2412ecb08028ed29a3cb5b79204cddc8c2f5f50a1a0dd1484ed449503945f2ec3f817a WHIRLPOOL 3fcb8094ef8e2123cb7a620df17d1e900b61765bb8127f93edcc5b124fc4233c02467e8d202bcec9a72b45347597a978b33b5323c3c5666da99987ebe2dc5994
 DIST php-5.5.0.tar.bz2 12256814 SHA256 29bb5ea45256f3983fab95af1f18d76dcc045565b2f175f11817069cefcf6cd1 SHA512 eaf64042313ad1c642f06436fd297b536cf12cbb0fa56f87fecfbc579831f357329613e6c4bae65be243493f27e7e0c213acdc1d9b0b9ddf2ef438412b484b5d WHIRLPOOL fdd0c1d65e77fc318c87671af636d8a0480316546bd0d92841629fecaaecfda229f883ecf190b6214dd59f2dccf4cc8ba612dd90a3597ebd903d14c6b65912b6
 DIST php-5.5.0RC3.tar.bz2 12311336 SHA256 ab78110ca3753e007942564875f6bd3e4458b33843e734ab5da3521cbc1dc5cd SHA512 76fa69e16611b971c3bfbfb71a09d9d7fbce7298f7937dbf8f2d22563e73a46974f64166be67e63888fcd26ca7ee3b2a424da592045a7383d3df73d1095e0e11 WHIRLPOOL 1880a0cc6f5b701b0af16d98ab42368f50a6cde6a644cede602f840d20c28161c3f7889de20bf609e5da619a2c7ca7a5911e4997191b51d0b5f3c044a5c0e587
+DIST php-5.5.1.tar.bz2 12004597 SHA256 4c221b9ba65e2084ae8900ef00c7f23966702e943203299b278bdc758fcfc733 SHA512 0f78fbe97c3ea917f27bf84a3bda73cd963e661d6ab44351e976dbbb97d0c53bef96ce1e80aad80c3ed2d52b5295278e82e04ef3f6f83b676e86273b4699cf50 WHIRLPOOL 8a50c50e4ca4c466893cc2bc8a67729a8f4837c0bd00e31ba04841645c40f8a2f79f17938e326319716a5517a5fb4be739066288ad03a4fad7df61b6892e3273
 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 24630 SHA256 b69eaa182ae8735d2e564f02760d1dc4a337bce81df994cc86d9ee0bdf5492b6 SHA512 e9ffc5860bb7fb5834c8cea1344e10e548f2971175e97d7b42d480945c695d7cddb35a7567d6e3c13c7a1897d045d54ef23d1e9121ff9c84f3a2833465068bed WHIRLPOOL 435978fc7e83db2a16bd0c70f39591ab843c5c98aad9799c4a30cf1bf6b82b1130e2a223875fef7c60c478e76f23de1d3bacb40ff9466191ad657c449312e6ff
@ -45,23 +43,7 @@ EBUILD php-5.4.16.ebuild 22217 SHA256 f2b47d16627a7e1e4b07b2686b411b2a715899bf42
 EBUILD php-5.4.17.ebuild 22213 SHA256 3a118f9ebd675254536301c067853122650ba0594c7efb59537ed243377db3d9 SHA512 7d077bfedf55665b6488abf6e56032bf408d720426dc7e98d499546fc56b281bc2dc1ad80b611824302be0e91f264edf5e433436adad34d7db65929e1f42e35b WHIRLPOOL 9014ca95756ad162fae29565abdfd09858c8ad96e4ea5286ac8f4f4605f7a7bb87dea06599ad68be4b643ba7ed6620b0cc9b8448eabc53c10a3867beb11a9c94
 EBUILD php-5.5.0.ebuild 22013 SHA256 f6d3d4853b6298842f8ee99c2e14c59fbe8e52652f064fff98c1a45cbddfb16d SHA512 0e8b158e78fa2bfd88bb1adec29414fbf57c9d939e5b0009d5fe85c544610fde0e2f3856aaf19742912e19edd3a8feb466c5c59d925a6c7ccabdd8a1eeb815df WHIRLPOOL 491212322e57751796f358b553353723d6c1fdd89f3a7718db30adef4c6576cc672548cc3fd097eb7548103a47081d3acd47f265e24e6daf2b44cace73388e9f
 EBUILD php-5.5.0_rc3.ebuild 22017 SHA256 51a61c8ced87f673f3e56d5e3bdab3404ebb5eb559633240ab9942f19570a5e6 SHA512 5b28d101a3489e5f67baa08f47bac361f70b25c54af89d9273bfab001a14615a44b28601144833624651c91b1cfe3c095dacc07feb172f275e8165dd7b70050e WHIRLPOOL b97fd74dd94158e667c45f41088c62fb34cc8015c6c16dfbce606988ecbb5c990186e1ca7cf2804f7422d04471a8e95a0f83ed544f4a6cf5647bc3a66ce4ef23
-MISC ChangeLog 10676 SHA256 7e9deac171f47aefaa4e415f7dec357fb8176dca1827bc57fdfbaf3cd795f1a6 SHA512 44f662363619511eb902e229327212b2ba30504f0989c92736d6d750a9df688186ed10fccac9152159371a446b5263f1b709d3cfd3162bcc71b1e85dc37d2b77 WHIRLPOOL db78ea90f1fabbd9b402df40f4ac772700ba1a2d718f5bbf15978bdfe423f7f15ea54d622864621434b3a914df0dcc23cf9fcfb569afba7407738828664f48d4
+EBUILD php-5.5.1.ebuild 22013 SHA256 a1c0477eccc2ce3e6da98058bd1d0a8245d1072ac2ab98c6398b475a6bb02e83 SHA512 b2c7c0bf7f8bd191483e74d4d308864f09913a15fad91834255e6116dd90ef7ca5a91095ebcb0c281616b1cf8283e7d4f3826839b2c20bdab77b7427dbb27800 WHIRLPOOL dfd87b553c1123dfc5004122585e291e148023b50750c91b017fd8c2a04bfc45d72c734a23783bd8a62de0c0804d7d2aad710fd58d312906aac25ed182debc63
+MISC ChangeLog 10797 SHA256 cbffbe118ff72e3b550a014cd907a9ca4e1bea71057537319dd9df4972b3c081 SHA512 233e6165e3c4ce718a83447797843ef204187786f16ad65197ed0afa5120fe11166de53b05f92781df40c0dcfe80925ec84cbc6cce08e48428dc6da0a39cf31b WHIRLPOOL 989640290a26d907dee1daa90edd60dfcebe150a64e14400ca8ed9df5a3c090c638e872df22ca17703fc50d01d7c19740a38efce41a00af622481185334d99b3
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
 MISC metadata.xml 1547 SHA256 2ce287830b8238e330c0585ef3023f86a9e5d46204619c92588244c5d7fa2f77 SHA512 a3a1c2dfddb4d0d92eafa33d74dc0bb90f1a9976e1d2fe0d3717a0d94149d3023dfdc9e68d42d440873561b2e6c34969ae86cec24ac0f0bddcf9ba14103ba450 WHIRLPOOL d9d877b3ae1b304ff89f7b0dd3a1f23d78062280ee935eaaa02c44e8e1dc2fd78bf2c6336cfebb2d9e8dddc03414a7744114ecebee6e364e962c49ff5e2bdf57
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJR4uDPAAoJELp701BxlEWfGm4P/RuBigPzaqQf3qni2sAO74eM
-VU7+p7uAZyc5EzdfrimE5gqiLA2HCh99+dMzOlG5ZUtGQ1eByvNk00spY9fVlJei
-3qVzSnaOgQfcZVpRyct8pzNVoIMa0oN7/BieDkHs8xdH3eXvQlLMR8UofWTVSaPz
-/DsffBH9juRtg5Fc4RuxTDNui5ldD6gbOL4faXheR0sRE82waSpc7wEKrPHrHHqj
-aXvvyVWU0Le6u2z2tcw8tHWDGdZai03Lb0IFj/HLkb6FKuqlJZFQgpBfT5dbhBzt
-H0h9cHuLIeGIy/lXD8qYP0J7riSwoq5qU5L3ApLe8EdZsfXtlqwupuVIPpkKGTYl
-fQAv7LQW5UZIkSrRH314nDuEaK6nHHB16bYokdQd9GAncEuD7IxNeyJWwQpAep64
-83M6DQWO76Z09L8DpQ914y+/yUFBATkgxPbcJP8+JjwrqSr0vyrXzGyZ3doYout1
-gYcN1tCcBnrO+89xwnY38HVPzYl68CNCmf1BaQZYakrqpGcGyd/ysfkYONKVM3io
-L6JGaQ7LVKI81N6avGMW9T9S9AHqNW92yk7ceSFSWwaNusD0NLuzJwAmuGmhObcC
-bWW+yaEsR4J+Q7OLu34tI/+ZUjn8sw/qwIPuhWdpeBUKd8hMeKwk9JRqZsIYi0jG
-up/bRV14uhsLndiN/lCS
-=wXTr
-----END PGP SIGNATURE-----
--- a/dev-lang/php/php-5.5.1.ebuild
+++ b/dev-lang/php/php-5.5.1.ebuild
@ -0,0 +1,774 @@
+# 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.1.ebuild,v 1.1 2013/07/19 14:34:23 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.0[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+        [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+
+	epatch "${FILESDIR}"/iodbc-pkgconfig.patch
+	epatch "${FILESDIR}"/stricter-libc-client-symlink-check.patch
+	epatch "${FILESDIR}"/all_strict_aliasing.patch
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+	
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+    # Fixes bug #14067.
+    # Changed order to run it in reverse for bug #32022 and #12021.
+    replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		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
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	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 "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
--- a/dev-libs/geoip/ChangeLog
+++ b/dev-libs/geoip/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/geoip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.187 2013/06/10 18:53:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.188 2013/07/20 05:15:51 jer Exp $
+
+  20 Jul 2013; Jeroen Roovers <jer@gentoo.org> geoip-1.5.1.ebuild:
+  Switch to github based releases. Clean up.

 *geoip-1.5.1 (10 Jun 2013)

--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@ -6,20 +6,21 @@ AUX geoipupdate-r1.sh 746 SHA256 fec9ee8ee72c3d8479c0281005543e69b46993a268657c8
 AUX geoipupdate-r2.sh 852 SHA256 aacd1e2ad31e6dae8b57190db221cf12aacfe9f41be83a3fbdd5f8146b3e5870 SHA512 adabb01dc89e26fd1f3f00a0463ddfca47e27823916edf618fc662faa8244fab477006280d579dcc48a651130fd7ee68669e04c8bf300426e9f7a12687da4b82 WHIRLPOOL 36e8a28013bda0aa1d23726e0177f6cb0757f4ff8d175098313e3f5280f68c821e3de181b9adea92b166f9ac7148268ed9fba0de91e261f3b50d69646f6bb19a
 DIST GeoIP-1.4.8.tar.gz 1074829 SHA256 cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4 SHA512 aec70bdf002f1041ecb14f091e32206af033dc6ed89d20dffcc80e4c4edad993c9dfab7810576cb75f07d356ef34529ca3f2613e43e7f97c2b7ae099ce3be317 WHIRLPOOL 3dcaa7ef9610ede593b64a7a0f111adc0b2f9c4bf64054ef4f690d284a8c7ba45083d2739585047db18e3c22b50b026c9b5fee26142a4611af7b4092e907ffdf
 DIST GeoIP-1.5.0.tar.gz 1232688 SHA256 d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2 SHA512 87bc4972ae438f3f37a1f05e55377862a72437195e0241b7fa1ddf4ebaeb1da50a07a387ae13481dd1ff2a5ec39b9830a808618bb8c825417d25068684540b3f WHIRLPOOL 11ea882d6fd77426a2ffa05632dfc7ef9c16dc323bb01738ce9b0fa67a181d380e6c80f3a0f1065e12b95537e21ceeab817db2acf25492388fe6878bdf9ed6fa
-DIST GeoIP-1.5.1.tar.gz 1195457 SHA256 ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731 SHA512 aacb59ac7ced106ed420d320ffe6ffbec0d0e49ef3af8c2380c731824413386b6979e13f7a4ba81ba5b8d5ab4792830da232a02caa263752302acf55ac9bcae5 WHIRLPOOL 3a9761c30694b64d46727bc0da7620ab9db394a688017f48aa24be7d81b81e6d2fbb82e8b44bd350a58076c607fdfadca8e85695775904e05d774e3ea505dda0
+DIST GeoIP.dat.gz 339117 SHA256 ca087bc539609f89c5f1588e09d14a96ba6a64f891929852d12df0e0d38a87fc SHA512 8a1bc6d442bff4ca53292e0dae63b619d20a1b66045245f4128821bdb38d477e7abf284ce31b2dfd72412ab36ada1faf9e721010ddbb3b84b0e266f67c15ab79 WHIRLPOOL 2f1d35ff94870edd496f294ec52cbb8b21d91f0532d3e32a2c11442ffa0458a5ecfc07ce90857505700b4c839ae38ce7300a0d6e56e31423998a6e38cecd5836
 DIST GeoIPASNum.dat.gz 1848800 SHA256 4c4ea1243e7dcbef6067de7c4b7447be635d60c4b5a02174e878898fb54b8de1 SHA512 741541170506dc516af331e467906d0066c9b9a4fd8b50f17aa55a7d4a78134d37d3499bae09f8d95089d7003068f43dcecb11a985be2cde91fa630a459f1967 WHIRLPOOL 960da0748348ba6455acb59af5ab262279960b2c46c047b9dcdb2f6694accc8e140d41b06f75cdd82534d171512666b337ce4044b0a2f99d906e0dd0a3c115d8
 DIST GeoIPv6.dat.gz 932782 SHA256 3e83499214f44105c84989fe19fddba1208ed756443835064ffa69eafb5c74f8 SHA512 211d6035f2f7a5cc3f362395c9f66b21574ef6a2ee0d19da7e7dccc4484b75ff9d86dce5ced85824a0da3a29e8f39a51e32cc275d0735e9d2bde4a4bf0b1b5d1 WHIRLPOOL 2e7c17dc52c7f33b072b911e40b0a947b5e38bdbab342dd15f5470a143590d6be6df2da9a08243719bdb344e937db41a34a4ae20536e7a4c63459dc16ecefb8d
 DIST GeoLiteCity.dat.gz 12108586 SHA256 e322104ed00676102da1b5e66788a51bfd386447d2422b9cb770bbeb4e36954a SHA512 2503514df4908c1f0ed7a5d43b7f9d58fa25e2e6d6cd984e122a8bf3733f4b9372a4147a1c8678f70b83e518fd0b69a7e162643613a77ccd93d68af201a1497c WHIRLPOOL 12baea7c0a55122dfb72185896c71790f8d1e7b4023bab3594b02ee1ca9781a19bb8ee62b751d69ad6a55186caf6504845d9039598e35a877e200748476e04fa
 DIST GeoLiteCityv6.dat.gz 12962880 SHA256 ab9c4deee7b3ef8bd665db67f2ba312b61d3aeb0233e8b2277f8cfbb9d7f2e6e SHA512 c8b5fde5fc5513ab4f5149e8babe2f1c59a5ff94cb69b8b60eb347ddee42d89b5e93919128240578c2ea263d80191f8afebb21159d5d8dc6c372bb872b8e2cbe WHIRLPOOL b2253e0193b8a47b8a6d9d0fac887a9410d5e361d4be5636c2e5e63fe5123f998f71dbaa89ff7d4bd82dc47f771705878a342598c926b0130585bedeb00e6490
+DIST geoip-1.5.1.tar.gz 254157 SHA256 e0fa12ee0eaa3f851e0610071f8153c72baa95b9ac0fd9b663da7d637f78bd02 SHA512 ad8348f8e6d12a582da13052d7f0040a0792d7f3ef3b5f0508182b56437b885a73a6a08b6bb485e9aa903f2b664b23f982235be92456739c01d83f13596b02c2 WHIRLPOOL b32931a63f1f58fe5a32443997aad4776960da1346b583e6bf08092ee0c7d4ea4bbf06d51ddca228cc1f798151a0a8249b8e40a458b46eeb27aa792760ae3af6
 EBUILD geoip-1.4.8-r3.ebuild 2070 SHA256 1c20af8e8d4e4eae22845dc8aa8c64c9f70bbb5af0b35e3a2a21de942e89c049 SHA512 8d656bed1398cbcfd584bd71ecf552066208d89287fc9e89d8cccba32dbf948f6dff096f414f6fe8ac098e2ff688afe1af1975d8ff42aa186d9c170a07197553 WHIRLPOOL 8f5c09c81255accfc798a6b31fcd764bed0eddc930b51c76b087bc03bb55e3a05e80491a787d50fd09c97108f602a6adfe855ac77c34ef4c808a433ecaba6f07
 EBUILD geoip-1.5.0.ebuild 2103 SHA256 e1becf968d211a7cd7735e2b4ad0307af5625b78ff1dda76c1142686ab50d19c SHA512 f68642dbb8b26bbcaea7b8b9ad99b9e20dd4e1da245611300967bfea8513fee0331dae5b9ff2de50420816af98edd67d1508f8d0f5f3fb1f090163fd440de6e2 WHIRLPOOL e1dd22cfe141955f8b47e4a6f23f244c5d2eb0fb3f396682e741a00cad097093993dee088b61844ff8913b42b04ebba4054804141ceb534eb772908c4a80d0ab
-EBUILD geoip-1.5.1.ebuild 2120 SHA256 7e864d38ff97880e7d7f6edc579c81978dbed71dc45e43ccd590e74fa9e3f20c SHA512 402680cf1294397e6fbcedb9440bcf594e2173b7c3e743698d4dca3ce1abeb68cc80257f82443b98513d4dae22416c4c4ce0421eb98f7cf0239c47486fa931e9 WHIRLPOOL 15fb4f57ecb3d27881583dd0afbcb8da941a9c5e98d8c62c96780f4f2daf39ca55e0456c13b6690e3b4723897be60b49e4123f92342ce450cdfb0e30f85f67a5
-MISC ChangeLog 22637 SHA256 39e477c16b65b254fba0323de553e834caecb333cd72bef5083e82c4703094d8 SHA512 a0c203df618d431a7a02a203f79b22700b32effb479f3f392eb6482063b5d1c22806b3a47ec62a6c98e87f6250a7eca811f50e0919ab4fa35d51e931100601ae WHIRLPOOL 1e4e5a4996c40729a0b48edcd1bb16411e529686db3d9f0adf3df047148a284397e107244857e595dbea4fe91317f15259d0e3d353d3782f2ecddc924dc7a12d
+EBUILD geoip-1.5.1.ebuild 2231 SHA256 892751e88c5d273875f05194d50caf49ebcc646957b24c7fd0247ae23e186d3d SHA512 b31dd30ac048cfc00d978e151e5bdea87a14949f5e74076ea9682884d8f6ff8039667d22c475c99dc0d0427503fa396525f9a4b79741b33ec665d28475e5064f WHIRLPOOL c4589b6eb327cf49149bec254ee898206d46efd63e78884cca044db94204d623607919d6565cc0ebfcd5b0e9e62966293d310e6317123148da39cf0625f1947d
+MISC ChangeLog 22750 SHA256 7a08ad5a798b7866dd3da0114af573c7b83ed3c827bc7c5692e2bbcaace946a2 SHA512 ae21db2e4fbaa1efb67cbdf5875310ed29170ccf6597b4b5ac2d394bc9ac7c454a5571034ad2339f32ff3eec744f5f6fc3c7dad5fc9338d539de1b73ee47bb74 WHIRLPOOL 3f36cb1ffe9210314158cf75c26ecf53d0a89048c9cba1cad26d35f5d6365a0579b61f99de94e301167be0b64b8a3e3df782e8b70a37c62498e80c0d953a224f
 MISC metadata.xml 414 SHA256 1280aa10349cf419f09b873a052d4772b95daf2543c21a29a2d47b327935a551 SHA512 076663380d999ca1bb8c6570b674e150acf39d0b095fabea2a43f1ef1b32c406205eb0c49600fc92791f87d8b8c65fb39e8bd4b76b006a5b7bcef150411bf200 WHIRLPOOL e174135cc0c291d5c38a94f285f1830686d44c380a7d63e6f0b980151bafd91ad952bc44146ae43dbd6e30f967d50c35c49319ec568490eb177ecb0ef8c21bbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iEYEAREIAAYFAlG2IMAACgkQVWmRsqeSphODLACffO8e8z1g2Q0nKCL/51lt2FrE
-cVkAoIFJY35fRaoB10zl/NpYZztIzAPK
-=Pk/T
+iEYEAREIAAYFAlHqHQ4ACgkQVWmRsqeSphP8jwCdHoN0VmVhvdtkiSV+s6aEwn90
+mo4An0q7PL3o1S9RHtV2HCzm/wmBOvmn
+=6dyu
 -----END PGP SIGNATURE-----
--- a/dev-libs/geoip/geoip-1.5.1.ebuild
+++ b/dev-libs/geoip/geoip-1.5.1.ebuild
@ -1,17 +1,17 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild,v 1.1 2013/06/10 18:53:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.1.ebuild,v 1.2 2013/07/20 05:15:51 jer Exp $

 EAPI=5
-inherit eutils
+inherit autotools eutils

-MY_P="${P/geoip/GeoIP}"
 GEOLITE_URI="http://geolite.maxmind.com/download/geoip/database/"

 DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
 HOMEPAGE="http://dev.maxmind.com/geoip/legacy/downloadable"
 SRC_URI="
-	http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz
+	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	http://geolite.maxmind.com/download/${PN}/database/GeoLiteCountry/GeoIP.dat.gz
 	${GEOLITE_URI}asnum/GeoIPASNum.dat.gz
 	city? ( ${GEOLITE_URI}GeoLiteCity.dat.gz )
 	ipv6? (
@ -35,15 +35,21 @@ RDEPEND="
 	)
 "

-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${PN}-api-c-${PV}"

 src_prepare() {
+	mv "${WORKDIR}"/GeoIP.dat data || die
+
 	epatch "${FILESDIR}"/${PN}-1.5.0-pkgconfig.patch
+
 	sed -e "s:usr local share GeoIP:usr share GeoIP:" \
 		-e "s:usr local etc:etc:" \
 		-i apps/geoipupdate-pureperl.pl || die
+
 	sed -e 's|yahoo.com|98.139.183.24|g' \
 		-i test/country_test_name.txt test/region_test.txt || die
+
+	eautoreconf
 }

 src_configure() {
@ -52,12 +58,14 @@ src_configure() {

 src_install() {
 	default
+
 	use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl
+
 	dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default
+
 	rm "${ED}/etc/GeoIP.conf.default"
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/lib*/lib*.la
-	fi
+
+	prune_libtool_files

 	insinto /usr/share/GeoIP
 	doins "${WORKDIR}/GeoIPASNum.dat"
--- a/dev-libs/json-glib/ChangeLog
+++ b/dev-libs/json-glib/ChangeLog
@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/json-glib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.49 2013/04/25 19:39:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.50 2013/07/20 11:28:41 pacho Exp $
+
+*json-glib-0.16.0-r1 (20 Jul 2013)
+
+  20 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/json-glib-0.16.0-bsymbolic.patch, +json-glib-0.16.0-r1.ebuild,
+  -json-glib-0.16.0.ebuild:
+  Apply upstream patch to use bsymbolic and prevent problems like bug #475954

 *json-glib-0.16.0 (25 Apr 2013)

--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

+AUX json-glib-0.16.0-bsymbolic.patch 1781 SHA256 7fa2b96f99788974c2c71ef6b5873dedfe50b22965a0262ba10c48f854a9b985 SHA512 aadfd889803a574d623efc1bfb64fb04274dabf687e164f58fbef81b6a03b30aeff35318b1c4f02f95c09bf2ebd3de6158d9b66008bda381ec91f1322345781a WHIRLPOOL d76e2226eaa750d8ac5fbf1bc1350beb885e62c92f5a5d2d820b2bf0967859df5f76e642d217be26408bd7e5686caed457464d237a927915a8cbce6cc28dcadb
 DIST json-glib-0.14.2.tar.xz 445396 SHA256 b816a5fa3e5664b08679a6972a6e5693d6cc1990ff4a6f94c07554db96be94a7 SHA512 11a482eeac40e255dc844fc3ae2fca3240678ca131d2685ba574db5e1f2440f2305a4ebf74fcc30b18e4d883d1bf91d3a598819d93f204535dc949deb6749771 WHIRLPOOL 2afc121088d1c39ad0c04154b07f2758abf086c2e41810b0f6f21c83018d1f0dadc61d366cd4929121e9fd761bb88e60ce380cab29b72f769516b218eb169c87
 DIST json-glib-0.15.2.tar.xz 459232 SHA256 f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde SHA512 1cf07e09cc7eeba07a5b0131a760cd022160a9b13c380bcbf9f197dc23bdc07665d7c2832812c9e36bcefef9e8096662733832b93041d927cc2b05e31623e707 WHIRLPOOL 6cbec3c8ff36af13d46962b81bba7b3618b7de50383f81f5390b4a4178b941119cd36e84d25ae72a7712e8d08668e62c5b78c4c6e8ed855d1bbd84d25f5b459a
 DIST json-glib-0.16.0.tar.xz 505452 SHA256 e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37 SHA512 4e58b568a875087755622b6976bcfdcf5e029d1bff4ac0e187887f56223a2bdf1a288a1d1355d265a5d82f5306e2f6ef98b910e4002551a1fe770a79efb4270c WHIRLPOOL 020b4137ebd6f1243b17ba74d2c5d2adbc2c9c4e75ae13164db648f5e319b1f8e5ba9a8773607ecd398c03b0e303b9601d3e0e8dfbddba48f5d82197f6edf12d
 EBUILD json-glib-0.14.2.ebuild 941 SHA256 a5a16f85b7a852a92f681678855d036026f2bdc43ee689a8a665341026d4d5ab SHA512 9ab590bcce4be2dad22759841890115822b210f1ca59ad1da7a0d7c09b1210c9b1adce700e69c6a5254a6b21948de6c9ac734388c2b5579aad2a08abd3858a8e WHIRLPOOL 166f982cde0036275a434f83d6cba5d5fd3556fea342fb45429a7a790294d47fb237a7a1b9c047d6a6098226ff35d1e561ff3c0adc1288b4612d7af3baf3d53d
 EBUILD json-glib-0.15.2.ebuild 914 SHA256 3b110d90a9bc50df3a61738dbc1a6bd1708db37d8b5d117bc11122a317db0204 SHA512 681da7006e7a9b5b679a26d96ee4231c9564bb557ad9e551c995503fa9c146c8883fc15b87d7fd10a04f723e688c23ca5f944e0e5dc3941b162cd81297cac477 WHIRLPOOL 67488101d77b64a70219bf796eb81a1fe1ff34a2276f7e79b75d0b684c43a136fd138b690f9808ed67b0ca12b8f820f001c749b025efe43afe8545c3946b4363
-EBUILD json-glib-0.16.0.ebuild 893 SHA256 89887ffd53ebbdeb012d890c56f64f0c91892908d628a3e53f8eda4468faa97d SHA512 d1a34b5f681353c9e56a74192b5b296a23ef7134138642eb979cb458e692f5cef21e7e2701072ea95ef0570912929328e1890b218241cb476135dfcc7a7e623d WHIRLPOOL 277678c6d6d1907d79b5fdbdf4087de8cef15121bcf9fc3cd28c74bb47fd6756ae853a026a634c88b0a2451e912fda164a95faeb9dc7481d6819c45077787985
-MISC ChangeLog 6979 SHA256 94715ed1ef17989ea2870187a6bd32cbf754a83c7f9515767cf3b35c81e11ee6 SHA512 217998630044465809fc602b4a01ffa9f49adc495faa9ccab5d35a77cdbb07ab9c7d089e21a7c244d0e978b6266fed78de7575b97c3c5e045c50dece25344ad7 WHIRLPOOL f90ee43b7a4c22b5194c56c151c3ee6462675b4306545fff7e1574c8352c4b62bc6f9c4cc69ee0faa0bc893820eb6694045602326288c186fb78ea0722c26b16
+EBUILD json-glib-0.16.0-r1.ebuild 1078 SHA256 8b807a748adbb5e214a18748bbddd8ab7f03fa795e0027d17cd53e4f5b565f25 SHA512 55837c5d1bf79a8d16e8a4898965c52fdfeed2c0815000830bb5848b1f3208cc62c151f44a5ede6e382e8e73b3d336432f7738b6f89e1643f026277189e52051 WHIRLPOOL d8f7a181b082a34427c6725665118fc9834059bc5c9fafad231308f6d86c1868daa733db8766908d87073f5a1a061f77852587d72e06d01432dc06a439167165
+MISC ChangeLog 7240 SHA256 ca9af36763f63e7b7f8f239ab694ebc086079c43454b6bc00618d32cb2dc84f0 SHA512 9d54462c00c6acdbb4b679f2710d2ef3d5fe435d881c1483d1b8472c5aadf7701336d6b0eb2788fad5bb9c6ea8593bf41061262e9ad4dd73e7bab03efaa41bc3 WHIRLPOOL 660bc0559302919824ee7af2b572ed017ec4e46ce79b988df24fa1ac1927101ce42012bd144fffff5b2d668112c70622ee410ace1c4e2474ed44dc0517cf133f
 MISC metadata.xml 1060 SHA256 f8c41c5a7e4950f631ab6cdb55ed4e4867dbdb24e9a89b116f9189620a06f6e7 SHA512 b05ed9cb8464da4462cd56044fde8b720dac53276d5a76f1697e536b37d1e96dfb3348c93f2d838559f122050c75c54516527f758da40878c76c8ec772fe5770 WHIRLPOOL cff42f26f1d5de50756271e13b8ba28f9863ed08ed96b6418693fb47009f9d191c9bfbc60dd486140ad482034cf21a92c3c6e17a0c3d67334d63e6488d009047
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iEYEAREIAAYFAlF5hl8ACgkQCaWpQKGI+9RewwCfejv3Z5tuSIjO9tmcNh04zYNR
-XDQAn1a9uumqumakAVgHKoITXEoGaQI0
-=0z/c
+iEYEAREIAAYFAlHqdGoACgkQCaWpQKGI+9Qg7wCdFDpn0YBDFazQtpp/rDl1gbgI
+0vUAn2NpCZmPNLtrRnINiwuTATywHP0D
+=A8Sm
 -----END PGP SIGNATURE-----
--- a/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch
+++ b/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch
@ -0,0 +1,47 @@
+From a9327484746820a5a2b8c1acf4a78470b004f0a0 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu, 11 Jul 2013 15:49:14 +0000
+Subject: build: Add configure option to enable -Bsymbolic
+
+We should always compile with -Bsymbolic enabled to avoid intra-library
+PLT jumps.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=703734
+---
+diff --git a/configure.ac b/configure.ac
+index 7c640fa..90654c6 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -93,6 +93,30 @@ AC_MSG_RESULT([$platform_win32])
+ AM_CONDITIONAL(OS_LINUX, [test "$platform_linux" = "yes"])
+ AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
+ 
+# Check for -Bsymbolic-functions to avoid intra-library PLT jumps
+AC_ARG_ENABLE([Bsymbolic],
+              [AS_HELP_STRING([--disable-Bsymbolic],
+                              [Avoid linking with -Bsymbolic])],
+              [],
+              [
+                saved_LDFLAGS="${LDFLAGS}"
+                AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
+                LDFLAGS=-Wl,-Bsymbolic-functions
+                AC_TRY_LINK([], [int main (void) { return 0; }],
+                            [
+                              AC_MSG_RESULT([yes])
+                              enable_Bsymbolic=yes
+                            ],
+                            [
+                              AC_MSG_RESULT([no])
+                              enable_Bsymbolic=no
+                            ])
+                LDFLAGS="${saved_LDFLAGS}"
+              ])
+
+AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_LINK_FLAGS=-Wl[,]-Bsymbolic-functions])
+JSON_LT_LDFLAGS="$JSON_LT_LDFLAGS $JSON_LINK_FLAGS"
+
+ AC_SUBST(JSON_LT_LDFLAGS)
+ 
+ dnl === Dependencies ==========================================================
+--
+cgit v0.9.2
--- a/dev-libs/json-glib/json-glib-0.16.0-r1.ebuild
+++ b/dev-libs/json-glib/json-glib-0.16.0-r1.ebuild
@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.16.0.ebuild,v 1.1 2013/04/25 19:39:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.16.0-r1.ebuild,v 1.1 2013/07/20 11:28:41 pacho Exp $

 EAPI=5
 GCONF_DEBUG=yes

-inherit gnome2
+inherit autotools eutils gnome2

 DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
-HOMEPAGE="http://live.gnome.org/JsonGlib"
+HOMEPAGE="https://wiki.gnome.org/JsonGlib"

 LICENSE="LGPL-2.1+"
 SLOT="0"
@ -25,6 +25,13 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "

+src_prepare() {
+	# Add configure option to enable -Bsymbolic (from 'master')
+	epatch "${FILESDIR}/${PN}-0.16.0-bsymbolic.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
 	# Coverage support is useless, and causes runtime problems
 	gnome2_src_configure \
--- a/dev-libs/libcoyotl/ChangeLog
+++ b/dev-libs/libcoyotl/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libcoyotl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcoyotl/ChangeLog,v 1.16 2013/07/17 09:59:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcoyotl/ChangeLog,v 1.18 2013/07/20 11:11:51 ago Exp $
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> libcoyotl-3.1.0-r2.ebuild:
+  Stable for x86, wrt bug #474166
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> libcoyotl-3.1.0-r2.ebuild:
+  Stable for amd64, wrt bug #474166

  17 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> libcoyotl-3.1.0-r2.ebuild:
  Add some Prefix keywords
--- a/dev-libs/libcoyotl/Manifest
+++ b/dev-libs/libcoyotl/Manifest
@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 AUX 3.1.0-gcc-4.3.patch 1106 SHA256 baec176df857c807ddeefcea9f5c94fafb001e517bd4dce4dfe43054eada0648 SHA512 4db742551b39ce51b804588e22ef7c3691f3cece1414c6fc361c69f79682c91c06a9d58dfaa2d75c0654fbf75a80dd30c8f9b86de7192399f3601d145e84d1a8 WHIRLPOOL b9ab738535dc9a9c25ac488759ac79205e3c9e18bc53f7cbc257e315d05bb4523eb5bf88fcb87c372d83329f44dcba5956742cceb7beeab6375ff134f9b31de9
 AUX 3.1.0-gcc-4.7.patch 286 SHA256 a950273a70479654a2da9e4fab9abd9869df4b26d8941895aaab7dfd91dc6af3 SHA512 616ddbebe40254ac0d4b04f7f7633c3ae77a88d261ea8c74f4105f803c2bfffcf5eeb50822d65a9a3aab58cde020464b8ce7ff56a3e8551b9a04f33ecf35398f WHIRLPOOL 98d3e25077596c8987ee254cf0e4b18f3a8d6492053f51c494576c57ac3c88bf907615ba65dbc065fc555e767226c1f18eeec0215189da329cccadb03114f11c
 DIST libcoyotl-3.1.0.tar.gz 346384 SHA256 540cb2e131cc345f94eaa1a7682532e200b57efd6b6a5e2d9e68aa7819f63860 SHA512 18d0a71204dc57d44f73fe03fd88c2a040e83615557cf1f018c22ad7c9a11d793c7f71df8e10a156b9fd4fae910882ed6cec37f9e57efd3546ffc15fa82a51b5 WHIRLPOOL 66a08ae5827ce9bf7ab5d532dc29485fc4b82e15005cad5a91f1e9fbc27b9fdd64889d0c9f68bbc7e7fd6463b6dcee552ed906c149bb6727f01931c213404ca4
-EBUILD libcoyotl-3.1.0-r2.ebuild 1089 SHA256 2d41fd3ad8e06110bc270d1aa97c366a78464ba4e47fd7ec5f5a1ba38aad84c5 SHA512 d482df4429e5699edc9e31cb635f08f2ef2e228152b22cf62594adeb8ff3d041939fb4cfbe2d198adbe0a7ccd14b8e8aa5e8c51cea78216b2432cdba77c57223 WHIRLPOOL 046dd4f305e575ed48732a7b4d991f2de3084202e48c67377bf64901ac61c008098eacf2c2a0e1a338198a16dfb03a72f0e44eea3b86f3d0e46c1e86791f3916
+EBUILD libcoyotl-3.1.0-r2.ebuild 1082 SHA256 0d02f55ca63dffe8504304216f2fbdb2ea98066a83b8fd2bb0984d925e283ae2 SHA512 9793215101c2e94cba3b80814840ce4e156632dd100bba165dcfee4d9b23a37993fcdf3d4d15daea1f63b95fbe98ac2643ae8c768f8a3c08ec6069ad42ffcbfd WHIRLPOOL c02ad8596a27f186052be912c8d47a348dcb696b8abc990292b8fe8dc6b6b7c3c2604554a8182f04ac4bf7cc5e9f2d6ab4c138188cf6fd1a2256a7eb2a5c8ad6
 EBUILD libcoyotl-3.1.0.ebuild 1026 SHA256 35081ae2211ae850058b6d9bd8aa76ff0a644f7bcb745a7156388d4eb0ae934c SHA512 ef18877f779a51669e024a85532e8a2baeb0c475f7f2d9890e902cb19e09dc4ccf88da19bfd165b2b1fda419c48320939d30c40ca938d1d5c0ce7bd5ddc25ec7 WHIRLPOOL 0bdc0f7b87a69f5c9981fd2796f7ecccf5db748cc60c9c8e058d214c773005b6b9cdb63c79b69a1dcbd8608c38e81aef7fc5ffe5f9ec3a146072f530d1481d28
-MISC ChangeLog 2464 SHA256 edf401a33cc28a4ca1289d79cc8ceaee6afa9e0d1b460d690f4536c4a6dd6743 SHA512 9dcf3a8a6f58cef3492510969bf1bc6f527dc68e70be6d11a1c8e5ddb23c5b5bafda52072547d950d34dc78927f51d59934ca6d2935a73549dd6ed757baf0946 WHIRLPOOL c0beb88a1e3c6eda346c001945dd2e3aecaa11c3901c1217d949cab4786650986e498992c0cec5eba17ccbd58508d8b7d08fba12556184a6e362b27d43c9bb5c
+MISC ChangeLog 2683 SHA256 14ca7034f90e5adfa6f43520ca9f06d165f98163c2887826c46906895eec3550 SHA512 185242d6276c1b59a9213964dba652bb7afa22816879111165331af14540cb0970691a07f0b82c802456bd245753c43c46445013c38704e6cbb909f6bd915556 WHIRLPOOL 56b7786d923bb3ae0bb19498cc4cba898df06d5402b00c41b0d28529892fa50f490eb3d6f5856475b464470b2a219c0de47f282dbcfde9802e1a3517c28edfb9
 MISC metadata.xml 156 SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f SHA512 e91dd7187a03a5b11f6d23d0d620c7a0326c8b3631599d616c9bd4aaf5f7901fdf8405a86bae896ecbad57afcbc9f3515a067f78817d06de4a426d5a07e7cf75 WHIRLPOOL e7838d8e96cb2762d53f85ddc28d8034cd19c2ec76c5d5356d21e2508539b7dca9e8e2ed636731eb578aa9f914a6710f165e321aa3a321a4f622cf2624e38808
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJR5msIAAoJECo/aRed9267gQ8H/ieBoDD1GGkk6LmDX1SzBkXF
-wP2oyYbI51AjmlfbLea96sli4oR1RiKUaFBX35/QDwNgLm2PKv+gBz9vPLS6nkQ3
-F4/v3JXDAMQ2/iw3l6iN/NOec9aseiMbGvfeorTQa6VvN22FC/lIsyc1dVRvGJ12
-gYcQ233LGqNP3Bn6lkYeGLelnBcCohqEkXZN38OQdh6Hocul3KUuRjebLcfdtlS4
-YwUHz5hkFzNqMycX8dpsnD/dL8xhcwzIhVx2V2CUWi87mOqQjBbfGSIoX1pkals9
-17BYOhf17hFXEjq63tLCWrrsi1Aw/fbIEbfny7pIFqvyePzql2Lc1ONH1Yi/GyU=
-=M0h1
+iQIcBAEBCgAGBQJR6nBrAAoJELp701BxlEWfhy0P/iltmMAtkHBFTG8HdhpgIhbu
+hiEgyTL35xSWFf7jAIZqPlKoVsrnD3EkEdBTuAjPPgvXcExOLXViVKOWFbkSHoQ/
+GnbmiHIB4IT5D/ZMXf09bTQ3S0/fYoNaBJIqaCUDFbpQTD3ki4Bjp8UVNGjjtoI6
+1QSNcNDPrb7hotkywN02teUVgaoX2sGOiT27yyqSmOW+UocRwcY1mi0s7WlflO+J
+B8uRt1UnMpYtyNCQWx6vGiMK8g0K+VJOElc0BnK5Kg2KmEikxuXulAMIF3Rp1/11
+dKxYkPVX55zSpnYhVBJzjZ7gLD+1FRObfQ+RBEaN5j+c1aa0eHEUiQEC0vVYWhPS
+LH4r4+HY47W1QlrTe/VT8K1vI32S6Vg07fziCUD6BbYzx1WLEHtt+4Xri0t8bVpw
+GeAJC64lbWex1jQLbXh8ssURtfwx7Fa6yBF9nypF6ulcLtmyghJhbj2oD6bDAakv
+5HeqofNLGJX/1FMdwIkmtO79Kn9BavN3tzckTa+C+NbqQ8GChEpnp5RVnkpgTGpW
+NVgNsOZm2sYzYimNDkOOirus5lSUzaesPWJ7u7lGT5gxxe10LIKntupu72QwTQYh
+LZNo/f9qvSGntC7lbBtfHRxvq5prZifIqxHj71PepIuIYa44HYIzd9iTFZNcaA7+
+J8Q1+i9pgIQDv/idnZWB
+=zMBW
 -----END PGP SIGNATURE-----
--- a/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
+++ b/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.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/libcoyotl/libcoyotl-3.1.0-r2.ebuild,v 1.2 2013/07/17 09:59:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild,v 1.4 2013/07/20 11:11:51 ago Exp $

 EAPI="5"

@ -12,7 +12,7 @@ SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"

 IUSE="doc static-libs"

--- a/dev-libs/libdnet/ChangeLog
+++ b/dev-libs/libdnet/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libdnet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.72 2013/07/12 00:20:30 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/ChangeLog,v 1.73 2013/07/19 15:45:14 jer Exp $
+
+  19 Jul 2013; Jeroen Roovers <jer@gentoo.org> -libdnet-1.11-r2.ebuild,
+  -files/libdnet-1.10-gcc4.diff:
+  Old.

  12 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> libdnet-1.12.ebuild:
  Stable on arm, wrt bug #471420
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@ -1,22 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

-AUX libdnet-1.10-gcc4.diff 866 SHA256 42fb181305e4195ae8d5dd720a3553a58fba86a087a91ed355491b59e82698e0 SHA512 40871a746707dc27aa335c7bc42155514736daa77bf7076a1c7611a08a63cbf3b7022bd8752b3b80f838ff7172adff0e1035c0cd1de9f8f337e3b0f5940f23af WHIRLPOOL 116d40660f4f6d779a01809ce54808ed5247b114f90e7bfcf04516226e72d072f05e86c4b3111d83c9ba53e8fa30722c8a53961d62173afc02b1dca8b1a4ceab
-DIST libdnet-1.11.tar.gz 446233 SHA256 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53 SHA512 62d6aee6836f8e56fa7d941866416baae71916318a94e4adc3305a4d9634596845b112a500368763c813f7da32557ca85a4942fe7d245d34069137e6516b10af WHIRLPOOL 8578631d320e5157df351d2d14f76a4d005cbd0dbd4160efd3ec4912e39a1e5efed4920bec2b8afc4edb6e2faa58274be9fd2adde1884a201a4f030342fbc93c
 DIST libdnet-1.12.ipv6-1.patch.gz 5124 SHA256 5e646901ae13d8aa47f0c5c063b86ecccb90780f9e3734cdbabf7a2d472c39ac SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a WHIRLPOOL 27f356053749e1abdab24bd420f22e380e0970f7a2926474482a2e2532d1d8561f4b48d0eb243b5a62777543b3644adafd3cead4cc09f21d6cb5391a0b7e00f2
 DIST libdnet-1.12.tgz 970125 SHA256 83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3 WHIRLPOOL 9e5b3a217bfef840ca0ed936dbc3573e51a9283a5a7d3ffd43606b98e8760586196261f34a2508cdcf9f868ccd08c9fd1d499252c9a43bb2f71a5b7b2c00c13e
-EBUILD libdnet-1.11-r2.ebuild 1119 SHA256 745cac605358ab4d9b4d05296faa760ff5fafef7c66c8617d7989c4928cd20af SHA512 831801988ab9f600a7da971b8b81917a609ca06e9b4aae2da17fa13a90c49c1b6a80651808f569eeeeefdd4b8cd2d8d07486eb88bea087f108100bd0db96ace7 WHIRLPOOL 734039d98f7344e561f78cec697ecdc82b9a2b57520ae7fce33e2a9f958b4f69e360245265ccfdd80bdc3096730cbfe2ebc68e73fb8b97917bde5c0c7a0e2d89
 EBUILD libdnet-1.12.ebuild 1571 SHA256 68998c69ae3d3f5e1ff4fd7c9c048c50351804f44da62873dd9f674d6153a86e SHA512 7ffb710a5bccf8f905050cc16dbffe9701cf39b7bcf99fc90a84e8fba577617ad125e11ebad4e80923b513b6969ea08a138f6122d828db839e2222790ef47988 WHIRLPOOL 6dc38c70f3aafdd16b4b9b9a3514b0d8b372145bad0120097653c8bf8e1f72e7ded8d5eea047235e081a1dcc0f9518b0747dd57035d5906029527c0c98c1dd1b
-MISC ChangeLog 8799 SHA256 bfc01227ed2bfa9917f066fd42aca5bb0679d68afc8c63af929f67f9e872b7cb SHA512 7d63854331f1abfbad004685540954f1c59fb761ce6fb2bfa359655b9d3d4eccbf212880d28e47d2b23104941b0bb74ca0783ab1f04684e83234be0b175f187b WHIRLPOOL a4b4a8ddbf5de795487e52a3b28ce3305940eeae8c5d017a5438de7ad6e731779953b3780b9a94a1ee66faa0f7962804d9051aacff98fd7ac785e661211aec69
+MISC ChangeLog 8907 SHA256 52b14439d837be84b8e174310dd0e32f5544944a15c787ddff9a625690d5b0a8 SHA512 1bfcf91e554537889095a548059a5df567a8f99a51ec466e6b56f115aaf49b5f52e4b90fb313729181a323e635880458e2a56d469f352f9264adba5b01e78be3 WHIRLPOOL ce6540f5e24b87ede2e00a48bb6535e4f46cf27cf4233d152b5966dbe0ea8fad67ffb3438eeef874dc55faea55c208fa4de8c9b8c1dc383bbd1567e0c9bdd5df
 MISC metadata.xml 237 SHA256 05e77ed344cc3ff71619b1dc09df8abb07213392924b6ab640f6d20a84961a17 SHA512 8e9bdc99baef7851f946ac9e32b2dce194405cb153cefe844ddeb2bf67b42186614a8feae9f430b6abff82c3827f89a8fd7e38859550b6844439ad8cc97b57ab WHIRLPOOL 0cc42ae3a1cf54489a57a3e83eea78b4faf26d3ba7027425485e68a330bbe07eac541ff5e2eca9511b47287b1c9a5767a58713bca52c81c7972430e7425e4857
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJR30vPAAoJECo/aRed9267bTMH/1WpDdJG6nB9ZUsUzN1WuSY2
-lpfO1sfxshw5LyubG5Yr+FaSwaHVgfFrKzdhTCeTQ6rUh0anq9VSJTCs4EKl+uHy
-1F6VdMK3Qjg2N5V8Ny+i3YMBd6AJ36szl3kJcylqunvPyhfiQMy64t/CKrruUYI9
-q4Ay44HkSoS8tlsP542G9kdiEppmEJ4ZAzjwTYyluC65MPk3sVuvQwylotpQq7OW
-dbFO4R+TdWycBY/jZsZ2Hn/knVaJZ7A7Ol9alUERl5rm+8zbdSUuy3Xdw2wKEclg
-zGY/nf6T1TOZ5cUq6tB5CRS4tKDYfGF7XUJCf90F5/AWBIi75qh+AwHpugT8mho=
-=CtJl
+iEYEAREIAAYFAlHpXwsACgkQVWmRsqeSphMOXQCeLyw32QoIktK4rHvHjM1otXIi
+2uEAn3y+0dZa4Swxk5nhl4aCCQWxtsGH
+=vdkj
 -----END PGP SIGNATURE-----
--- a/dev-libs/libdnet/files/libdnet-1.10-gcc4.diff
+++ b/dev-libs/libdnet/files/libdnet-1.10-gcc4.diff
@ -1,20 +0,0 @@
--- a/python/dnet.c
-+++ b/python/dnet.c
-@@ -2552,7 +2552,7 @@
-   PyObject *__pyx_3 = 0;
-   unsigned short __pyx_4;
-   Py_INCREF(__pyx_v_self);
-  ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
-+  __pyx_v_next = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
- 
-   /* "/misc/projects/libdnet/python/./dnet.pyx":628 */
-   __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max);
-@@ -2564,7 +2564,7 @@
-     Py_DECREF(__pyx_2); __pyx_2 = 0;
-     if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 629; goto __pyx_L1;}
-     Py_DECREF(((PyObject *)__pyx_v_next));
-    ((PyObject *)__pyx_v_next) = __pyx_3;
-+    __pyx_v_next = __pyx_3;
-     __pyx_3 = 0;
- 
-     /* "/misc/projects/libdnet/python/./dnet.pyx":630 */
--- a/dev-libs/libdnet/libdnet-1.11-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.11-r2.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.11-r2.ebuild,v 1.11 2013/05/27 11:50:10 jer Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-inherit autotools eutils python
-
-DESCRIPTION="simplified, portable interface to several low-level networking routines"
-HOMEPAGE="http://libdnet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libdnet/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="python static-libs"
-
-RESTRICT="test"
-DOCS=( README THANKS TODO )
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e 's/suite_free(s);//' test/check/*.c || die
-	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.in || die
-	epatch "${FILESDIR}"/${PN}-1.10-gcc4.diff
-	AT_M4DIR="config"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with python) $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm -f "${D}"/usr/lib*/*.la || die
-	fi
-}
--- a/dev-libs/libmirage/ChangeLog
+++ b/dev-libs/libmirage/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libmirage
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.31 2013/06/29 04:11:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.33 2013/07/20 11:11:16 ago Exp $
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> libmirage-2.1.0.ebuild:
+  Stable for x86, wrt bug #477004
+
+  20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> libmirage-2.1.0.ebuild:
+  Stable for amd64, wrt bug #477004

  29 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
  -libmirage-1.5.0-r1.ebuild, -files/libmirage-1.5.0-gtk-doc.patch,
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@ -1,22 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512

 AUX libmirage-2.0.0-gtk-doc.patch 1350 SHA256 9390996618c4b1126e5d298729617aae12b9f922799bd2a58337c5ad49cdf77f SHA512 92f1bf208d0a971dff218bd2747c8d1a867e9d6beae169d5b952481a247fbbb3a35b6b2216075de5b5ee0a367f637bf3f555787c06383f84ed8b749836bf0fc4 WHIRLPOOL bf795d64900d2fd39802dd843a3c4bbc4e355a9c9da3b92a473118a0c939d6c300ca30869878325da267e22f3568d983656162692b0e8eeba4dd63fe4d26b987
 AUX libmirage-2.1.0-DISABLE_DEPRECATED.patch 1435 SHA256 1472837bb9734fc5574c74f7f8f113d44eb6575de0c2a81a7890b2d95651155f SHA512 1c102ccb9d9863c18bf2645c08b1f2bec13ba2268d6bce0e069f98a611db2b15b0412e135f37950d0169b412355af8f32ab6b3f65d82b26cf6aa5d3b3526c857 WHIRLPOOL ffc14708d4ffcf227e082b8367d96f6a5dc1f93077e6180253be8db4ba0001ca9873ef6c00752f01ae494a70a239b1bc44ab702c3e79885f0c7d7031ce87c956
 DIST libmirage-2.0.0.tar.bz2 179521 SHA256 8392a145094e58bf6c01056543646ddd94a6d2a96e787f368b8102ae1d779a26 SHA512 178eb64ad2c38c76baa4dcfa8cc9e14f57fd96899990ac4bc39d19a19d18fe60ed15a8abbbd1b9921f449f6e96ce8a1828718e13e9a011230c8b6e9d42792e8b WHIRLPOOL 2a2f37caf8fedb12b608a379377949b20fd7cb2a80f73a9a605c46b220c6c17a1bde7a3875769ef010f50f3920819b0a57cf42eab14edafaf0e18c73f5822052
 DIST libmirage-2.1.0.tar.bz2 189908 SHA256 fb30eea15b8c1fc55e194e1af55127fa3b3860a79fec0b6c60588cf9ae8d1ca9 SHA512 7ef3a6cf04cce96ac474d90aaf12705f85dc4f5b5354eb27b5ad9e6452f992a20a7d6ab6421e0e7f6a3fabef563806ce6c9c272668cc4f9fb086b8ed1981dcea WHIRLPOOL 9e76eb1abe407e81e3583fc2407ce7dc6db70a8d57808a6e349819959d679d74cd9f9b0af3d70372753d3166179c253de8b6ebc3b805f11c5de0a6842c1e700c
 EBUILD libmirage-2.0.0.ebuild 1810 SHA256 b8d3c2f53d6aeb7e407b7e29d262f852d607e95ee4dc0cc5e95cb2dac8d46a11 SHA512 58fa9a96e1ed90753f1e15129cd4695b5682b4eddcc19f1f1a21c2e045f78d8286edfcda4f08b1e16fee0e522321ba095cc27cd328b96c6dfc1813e861b036a6 WHIRLPOOL d9d6952efda3f0f68e69b84b8a767859ea2c8459914e8c6a79f6a258a0936e109bb26e03f848db6a514bb3bd6e4387587d73213e71f27c0bd9c8132d230718a0
-EBUILD libmirage-2.1.0.ebuild 1358 SHA256 341c201ffcd9c18689326eef1b5aa0647c6f722025894e4b4167dfbd3b3d545f SHA512 ce4cb12cb5a092c76d724accca0b3eeb7c8f0764bf37dbef2d1a1e5495a0193b40c668c168e37ae23cfd2173cb709eacd2e6aaa2a74e4abd3a8abcf8ee024365 WHIRLPOOL f278ba1518c00d024b1c1028aae431c0f5a9e29c82950cef72f8ee3a6cabb0565344d9a3721a09bfb8162a513acbc6f9333e86a29039bec23ebe5f99d022e58f
-MISC ChangeLog 5826 SHA256 50ae60e8fa78f33187772f9f34e33c9512a0dba26b4504858a77a9840d052447 SHA512 d8c83fe4832532db02c86f89098607be05f0c871cafd63d6fa7ce0d782d8a332281711ec046ad41a9fd5b563ac2e49db44feea7bae7f2236acc14e5334309700 WHIRLPOOL 2fb199882799833733ebe6334b79269a1ac20f1b3b62d15591a69adb1877a63d16a8279fcee06830040d66c21724b9eaa52e425a25550f294f220723ce596357
+EBUILD libmirage-2.1.0.ebuild 1350 SHA256 dfbe2d83717ca4cda5c37b6f513dda152b8c85d316d830356a8609e46e4c9499 SHA512 63f86e647c97fc21e656f826b9de72ca4cbc2206ac1ead04eaa4bd486e3513003476cdf489ccedb9b1d5c0bc6c88485c67344af1ae09cbb92128601e4500a7de WHIRLPOOL a456e3dbbaa8eed6b5a5d44541b4e858b961ffc152e23b583095bcbdf8fc99df0d943a46f8dad460a0c838e4b727888f71e2454c49541f8efe0bf22c1b629daa
+MISC ChangeLog 6038 SHA256 7a379251f62751a9e679dc270566edee9ea398f513c5143c7e6a99e3c9272051 SHA512 0092adfb96c179cf055062894b051b569e709e625169da4f6620f3946996c596e96dcaffff5bbab0fad1f9bf0941f85fe8425d45b0045e5602b24499e1af0a93 WHIRLPOOL 6da8606f6a3f19e711c5a1de5d36efb94393cf12b243cdb5b73a6aac7aa3f060dc90ab7072e9740d629a20edf286083be0995c5b7f6c280b7f66d8cd53c5c16e
 MISC metadata.xml 240 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477 SHA512 14c9405275f11667ad7e035376fe7e5caf99ac982596621cda18a2f8a99e9a9b2464806be5d016d1a4c2fa794bf8b1400a5cb658a7a874e65d825b8baea69d62 WHIRLPOOL 0e2fbd97c0146322cf226d3086acf3e95dc86d17409f3d350ba2de1b81a2d93b0dc3f370d5c444475e129fa511791ea5b48ca00c47583cedc6ed60ef9e61fae7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)

-iQEcBAEBCAAGBQJRzl6AAAoJEJ0WA1zPCt1h69wH/iYdsad2pyXOkSftsOReaBLN
-L5XRqzNe58YxUGM3rfkfxdzAG39h1lkEwkT85qK573dGwZH/u152D+JGtF7HYxa/
-IxVYeq9MoFv4pGldAsee4veAkpaV0tgtqb/sKBYgKoEzwmo3tPHo0KqgDViGSiMl
-PktIBlMLR+XAarv6H8iGTCR/98hrmKXzbBejsuiBCkuOKxjceC1h7XOknOkNlnFh
-sHh87YqrFH1+c9JsKHTOTmEWLL4yuf5NMYbONOCjLg/FT3Q6mJshXSktNKtfSEOT
-hvBSfqYYxUIe4OBKSMhWvgzrCNoQyDwMK9s8ASkCXXnQIGhRrLxX00GqF0g42Qg=
-=3+Vm
+iQIcBAEBCgAGBQJR6nBIAAoJELp701BxlEWfE7oP/AhO3Xq2KKQcgpaubaWhluBr
+VQ/pVWB5ajmXy3SJUwwJLuXVtSI1j1Ie4uLReRNLmP/lNoEHm6zSbk4J1kKJMLjK
+/BZYUmuQ7zciJPGiU4loUoIJ7I+UbiQXBnKR5U0z3Il0KQ+5roylGyqliW8639Xb
+n9gi9pjfUwDfrIW39sYOb5UiPNzckm0XD94E/OWkW6nNlKaYWDrQbDuNqn2CUw02
+Ukdj2+sNbwFE/PW5MotSQc3HTxPbBDBXirnLS1wzN6D8a+3Baitq53wTmR8VzgHU
+t/a4UpZ/pWifqs5XvGYZM8ya1IU/YlDSu6dRDjRSrwzzIg+0vgwMeUX16S3FWWQd
+OI29yrd1kDf/RjfGaion1PBy+AgUxAhCp2JnM1tPhbmsRLUMfIRWsXeW+lZ+8ORc
+9oBvVlmGnw3+y1cwZKf2PWfK/WIezkHK5yq9IEPomD1+wy09xXNQ6TS0tHIcE7oP
+4aMVUFPa2gW87TgkVTa7zjfyFi11/ukpjSWCjqaCbDkw4uEX4AgWE9hoDdTaEIGI
+hE1MjPya5mV3Q8t2NI3FgeycRBVyCgK6eiRVLHDyIfIzGPS3Zr74e7sO3UJMVlye
+q7RZ43EF5nnhlqM3HwabBpKjz4tBDeJ9JiYrtYcM/TUFg7FzqfeADJ6WVtaEnTQi
+p3IBisuwCbB+UpdFRr7d
+=97pM
 -----END PGP SIGNATURE-----
--- a/dev-libs/libmirage/libmirage-2.1.0.ebuild
+++ b/dev-libs/libmirage/libmirage-2.1.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/dev-libs/libmirage/libmirage-2.1.0.ebuild,v 1.1 2013/06/17 04:17:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-2.1.0.ebuild,v 1.3 2013/07/20 11:11:16 ago Exp $

 EAPI="5"

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"

 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libmirage soname version
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="doc +introspection"

 RDEPEND=">=app-arch/bzip2-1:=
--- a/dev-perl/PPIx-Regexp/ChangeLog
+++ b/dev-perl/PPIx-Regexp/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/PPIx-Regexp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PPIx-Regexp/ChangeLog,v 1.44 2013/05/15 14:16:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PPIx-Regexp/ChangeLog,v 1.45 2013/07/20 11:39:10 zlogene Exp $
+
+  20 Jul 2013; Mikle Kolyada <zlogene@gentoo.org> PPIx-Regexp-0.33.0.ebuild:
+  amd64/x86 stable wrt bug #470414

  15 May 2013; Agostino Sarubbo <ago@gentoo.org> PPIx-Regexp-0.31.0.ebuild:
  Stable for x86, wrt bug #461134
--- a/dev-perl/PPIx-Regexp/Manifest
+++ b/dev-perl/PPIx-Regexp/Manifest
@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256

 DIST PPIx-Regexp-0.028.tar.gz 146435 SHA256 48454e762311780ecaf9b3b32a3fbdc6e30a52542659cbccb95f62980013ce8f SHA512 8ddbbe692fb944f1ac461c189b755a5db3bb955c341133aa08a2ace78f9e14a79371d4f413c3b97a569825abfc0a9ccec80543ef1a4df67bd3fc7756baa16629 WHIRLPOOL 69ebb3b0b2aee37ff42eaba24b84bcb6189b7dbcdb49dd0adc56f006ad88cb1e71c40b27dfd63857426f7f3760d2060ccf9ef9ee9ea8aaca8a8213c9366c2dc1
 DIST PPIx-Regexp-0.029.tar.gz 149471 SHA256 e260d88e53947a061661a2e07381871e09b1f2d21bd8b8bb8027f6f5be306cec SHA512 b76062e29fad500d83129467d585878964178f47fc38192dab31f45c039dcddc43e32d0b067347539c79cc2d410ac140084be1088f070c73b84eab86145d7285 WHIRLPOOL e6e622fade368efd904caa62c7f2543f48e40c1a831499d9e5e4a1d2543256c64fff3255261eec23e12c01c7ba55ac8eb6365390c6cb7f7b4a97a4257126fb63
@ -8,23 +8,15 @@ DIST PPIx-Regexp-0.033.tar.gz 153667 SHA256 40adf6555cd8a692f79530f74f343d7d9ace
 EBUILD PPIx-Regexp-0.28.0.ebuild 544 SHA256 8cc2f4b2cc3dbe72ac18443887fea215b9f656cd0a473ab50caa749103f9bfb6 SHA512 04c028249441242e4aacf682c46c4754c9b3469259373618587ab262cea165a4b401ae999a465d57e1e51d1dd030e5fc26584ae7d81885b749cf669133578cb6 WHIRLPOOL a6f990609a61c8de4d8a5d8115c0432015037942a145f243010be5dca417b3a2a26cc89ad985593f4303b872c55ca07893df6fcba4d9c2d865e40894e9de5f3e
 EBUILD PPIx-Regexp-0.29.0.ebuild 546 SHA256 c651a28d397d407391e2c8906bd4b009d0ec1d73202c69d2a220a82f3a6cd901 SHA512 700f26efab82bd74747d08345712753895a713ded75e0961e8fdd0c9ab017fa19a41de9ed13ed6d3e900be11750ce3a18dd1e4cca47825261009a5af73aa622e WHIRLPOOL aa1c6d13ede79d0b09803b3f1c17b80b61d209067c699cac13e89add136e0587f5d869d121a24fae84ea31bdf81751da85acc3bbc84f9f8a0457dea665ddabf2
 EBUILD PPIx-Regexp-0.31.0.ebuild 543 SHA256 94bc64365fa294a49cb73d242ff0c9caa80c8362ec941ac70361c113d3ef94ad SHA512 a92b7cfc8b312fd00335ac60852d5ce8ce12a704566bf0bc500604f7ac95079ad3d7931bd6f90d5d02fe065750d7096c03add12b656c1f6c1a7def316ba67942 WHIRLPOOL 8f78d93dfeca39fd5fd87b5e08a23863291af1b26f12b997ff68664355497ec05e0578ce552d9073a06dd0f9b4a98661711b0708f2d6357ce37536155a30da2c
-EBUILD PPIx-Regexp-0.33.0.ebuild 546 SHA256 8fb03a6aec320985717a79d455d93f466afbe1edfff1061f10669e076f2c857b SHA512 d3e243ef988910409f8a20c759c778ae9c10ca8b537ce4aa69b98c0ed82e357ccfc3e9bced22a340dd426c26a62ec058fb596f12758600a068b51bcc5f099bbc WHIRLPOOL 91707e2e0af0d6d7ab57a8174a7017eea514e1f5954ebcbeee2d197ca2fd3069a15ae4b9b1d618184390de79d3d771cbe90e4351f4927b23b0beb80ab7901b70
-MISC ChangeLog 5642 SHA256 c4dc6cf3d0e6e8c7b8835444f771c731815344cc829c1db56be73a1f5f5c8773 SHA512 058077ee55966193f38eac0864cb52b07a1810de86bcddb6a26fe55b3de6dac4dd766971d26d64216174b5d8d2c4ce15749bb0c32506cd6580e1dad3b1eb2290 WHIRLPOOL f794227eac34b3325a4793e9e3c8822cf43fc4710598804e52a676426195e347daa3fe838eb889f38d389efc522c9122c52253c4139d7d2efd8e42861eec3a8b
+EBUILD PPIx-Regexp-0.33.0.ebuild 547 SHA256 c6e88811ac9b657fc4946f1f7e47bcd684aef384372a65e556774e7b7171e54f SHA512 6919c4f416020ea0c60f1cf3670016620144af3cc734e9974ca6193a7018b322e9ccf3c0ae1d41ecda23a58261f2f9d09b3237eb191a9a4380f00422579d2a8d WHIRLPOOL 4ac208ed30e2564387c29f087a623d64da92a9db446246d0b5bb88268543dbf6575252b78b05813c1dfedc32c379c78803475991a2086072de7b2060691d69e0
+MISC ChangeLog 5759 SHA256 ecca781ace32264c0dfb51eb22184fa70364db323c8243a29171b739c3153bbe SHA512 28233e798e1c11f77f76bfdc087e0ad4378795419dd862dbe0df9a0bd82bcf7866dfc1500b51e7ba7ef1ee3439ba99c22a66a99fb2292022f3c014b64c7b570e WHIRLPOOL 2d80d2a64c4d0a95dc19d4427b7c5e14ebfc9c01b8ef75c30ace994c3502922ad39cd14c7d173d26ac65e6665b85b6fa2bef233312dc59789d71a00ba0a01e53
 MISC metadata.xml 4815 SHA256 10a7ffe217d7130ab70454b1cf66aee3743a358f0b97d8e8d84aa63887319de8 SHA512 3af6d357a5ecf635efda6d9d30932c4377662bdea21cd8d400afcbcd733c67c18847f48ac8e6fbb843912ccffc217ee501479cbf2f1e76b79ed3d593bfc0213b WHIRLPOOL 8503859dfbe07f5b8c53fd08ba8f387493520fa3006fbc649039c0e30d419f18911ac8adcbe12b64fb3f943e148486bf5794042ad0e0fe73a103a83de91ef7e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)

-iQIcBAEBCgAGBQJRk5ihAAoJELp701BxlEWfBt0QAJ3N7OJCusRIRsimvn6Dplc9
-HB6VIh+gD+YCIIWGCZS5uZVWlCYoSgeobcVxhcWWVlWLmaVcEU4GNSNsALZ2u3Yz
-63CvHe0BGN1FEh9AXJnO1RGXn1hXcKZgwB764ny6gXsDCCsCe24GI35tEtWgIH/f
-TJ6aZQtA3Eqr9/y86i7y3JSrCxaRESuQthKwcdtBt1jxSpuRr8d3gE7Zzpa77HF+
-t9nnDndEEL/Y0qatqnHYP882SHx92kk1uyBIsT6RKv8Yf1OFYA2UdjQMedliJfld
-CYaKn28AFtmmOX6adDw3iuxizGjpXx3+39ABiZ22srZoJNKoirZRRChLohy/lHyk
-ju8UhLAa7zCDJMyz3144VNM6aPgqlKDev7UuETiesvWJCOO1cU6UX7AC5sz1KMaA
-J96a8xq9Dk5kBaQb8KyDG7jIP2a5xi/vJtbf5vnsUhvJb6i9ln78x5GDJKaDZQyh
-dz0tobHejPs/ZUdPOisZGQGhH2ChjOBdAtJk4GEOickE8FnZwWRlA8yz7J0cTN9T
-IzUzwOaV7dzjunzuQ1Nx8J+aQslrStXc1ApRjKLuqK4hF6sVJaoJwGnFmpWUICWE
-gEHCmkKinbVZwP+1n3vDDHRtyYfZ86FdeZPC+sQEywZCVJPXPMMDKHglBG3PT3xY
-aXc67UIZZeanJAIcvJTb
-=Wb3e
+iJwEAQEIAAYFAlHqdv0ACgkQG9wOWsQutdZj9wP+JeD9z9TxzWZ1A3PqTrf3NAjM
+bLgNcXcdkjLS1v94djXCKcWbNM04de9AwByMCECzqJkrTCK0A5r4Bxao0eIRCgx3
+sPvmCvYwQeKzJQPY+tApXqZzUM4uFavsBjE/zOa+DmfAsOX42EqN9BJPKZ1rfOmw
+zwxVXUsmZAK6vovawAs=
+=Ft9M
 -----END PGP SIGNATURE-----
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.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/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild,v 1.1 2013/03/18 08:30:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild,v 1.2 2013/07/20 11:39:10 zlogene Exp $

 EAPI=5

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Represent a regular expression of some sort"

 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""

 RDEPEND="
--- a/dev-php/pecl-rrd/ChangeLog
+++ b/dev-php/pecl-rrd/ChangeLog
@ -1,10 +1,15 @@
 # ChangeLog for dev-php/pecl-rrd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-rrd/ChangeLog,v 1.1 2012/02/22 22:04:03 mabi Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-rrd/ChangeLog,v 1.2 2013/07/19 14:13:06 olemarkus Exp $
+
+*pecl-rrd-1.1.0 (19 Jul 2013)
+
+  19 Jul 2013; Ole Markus With <olemarkus@gentoo.org> +pecl-rrd-1.1.0.ebuild,
+  pecl-rrd-1.0.5.ebuild:
+  Version bump

 *pecl-rrd-1.0.5 (22 Feb 2012)

  22 Feb 2012; Matti Bickel <mabi@gentoo.org> +metadata.xml,
  +pecl-rrd-1.0.5.ebuild:
  import on request from Grzegorz Chwesewicz (bug #389289)
-
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@ -1,4 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST rrd-1.0.5.tgz 18676 SHA256 f336a0a56963e0c6a34e335401483f84adde4c09fd6fbe8fe1a4c74596dc4eab SHA512 6e1b1d42e3cabb141052b10547f00b4c2de69518769aa661429cf59f424063ec68416a5f41f10cb4e8a9c079aa1dbc2743750db469acf35b0a37a146273f858b WHIRLPOOL 0b8727f42fcbec38b37d93291e37ab8b9660b111b627342b20de1e96ecd5fcc42073855fd4dca1aef247092054dc13193c01113ede8623e45afadebdaac9e22f
-EBUILD pecl-rrd-1.0.5.ebuild 409 SHA256 a6c0392e1be89bc3def606742cbf67a824837e6cca487dc812dc1dd1891c9c4f SHA512 286ae5e08b66a4b638227b3d29c34b6808803c560fc3070609631438d5ed7be3e00c3fcb2bbafee96b52c0d02f49151a8104e5c4f54645d9a0a8dc1bd994a6e9 WHIRLPOOL 0678b41e60ddc7294c5a14b0e38424a129a309a6ab1931c6ed6481ce2513fdd9916c7e9d9aae55a061319fb3b79663d1c7bded2f1a3608fdedb495f4c6a3dec7
-MISC ChangeLog 381 SHA256 defed31cc3cb9c254be4d6e904169eb10ae46f6959faf68f38e87dd42cbcce81 SHA512 df9a047e38fedf7f3fbd1253fcfe8384425b72eb5221011e9e8b7357a93d0068464443effa3d331f2f024b66a0437011e82e45940c99e36b6158a0044afc6d52 WHIRLPOOL f9a2e144608fb5ef8abb37bab0cabf64ecd012425210f504ae3b0472001c4ff767aa4a44339cc6dda772454b8b6371fe6ad8b2bf3a8eb207c40ee99e5d51255f
+DIST rrd-1.1.0.tgz 18639 SHA256 3c31c9e07da55a57978a1e2801051ebfcad4a35fd1664e9bea63ecdfca0fcfdb SHA512 5d6887fbe5e9f5589ab3876ecb187159b10727f4cd64d4aaaf98442c737aaa9e43394d7795b1eb06d62dc253bb98d4c40ab37520ccf54850b3306ef14225619a WHIRLPOOL 4a7fab06d295cc4f0ebe96cd5bf68b12a889bd0048619ea9ad82639cb3ad08f4a9046102a164cd9c812f6e1c709998d4366fc94f2cb88ea465eac1c1769ebf0c
+EBUILD pecl-rrd-1.0.5.ebuild 414 SHA256 94f53a830cffb88442f1f71853d7e7de23dd36c78c5618c3b4c88c6916ade49e SHA512 e2471c95bb441dbff9e5c7052c343336ccc3d4a10d44aba9e12e159f1d1608c2cd7cd3b36349c5436d5ad6eb890c7acc2abb5cfb055af272b6d52fbc9a9198e2 WHIRLPOOL 3bd34ba42f7bf33272553a3a863fdb86ff669de641d37850c0e9005f44016d67fc93b3bb14768f38d4de3dd91f868e96e51bb338a917886ad8d092d22cd8650c
+EBUILD pecl-rrd-1.1.0.ebuild 439 SHA256 059384c187a2da00fadc29e3a4f1f6febd9b2e5037c378513fa4f174a6aee592 SHA512 c12b9ede7fd3943665b3f9bf794d8b1dfd7df14b55c038604a98bf5b67e8c711a1d023e9c6d6d39c98dd47e2c6c78f0846c61d96192e33c2ffce7f234255b82a WHIRLPOOL af741efb676eb65dadcf3b1f55360c7444d869ac3faf511f161b08ecd8220df16542b5c0574305d163d0d802d950c60a13de997dd0b3ceb363feb5a416754acb
+MISC ChangeLog 535 SHA256 a684618bc8c7023024e5d18caaf87f8bf154b6359811b02b160a5fca101ec138 SHA512 6d0e27981b90db4f70b9b2b0593105799de696e4422e4267bfe2e98a73a0bc7c4e2579beb45a3bd32080e54cb1a4a6fa223173bb5d91db663a7bc0096b91fdb0 WHIRLPOOL 0f787d03cd3186aef2bacc09b13db438f7a397fa2ad680b9aa27c01dcaef711d5f0e8369d254a5c919fbda30cb159e8755c87cff0ccf6a92469f6dc9e4184225
 MISC metadata.xml 158 SHA256 b7f7a6cea33dd37220dd231c3d5fe61c3c2d78d567804dffe7e5538b9e519388 SHA512 ec150384d90e46b4c39eec3c2252d69f957f5f2af60d6c0c828a315df60decfa98a5143b7aa82cdd6dd34955919215fd64cc33a9d247d3393e323124e9ee927c WHIRLPOOL eca25060b06d28d711e03d6e25e0658108baa3b4381ed0f6b36c9769714aa00fe692e16ca264571d65e027b2acc43d76d8c353c1f3d6c567d0c62324517f9ee4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQF8BAEBCABmBQJR6Ul2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1cbMH/0kREA1VyOcYCLoVeH4ziZQI
+f6NRxebe4vROFGn4vPUsyvry8ksouAb1tA811R/Ss1+iQx2/hyifUzJL4H4LIW/g
+CeChoaeFDiEwM9yM44jeLJsLl7W2DPkJd8Wbsl29oKtePFNVM08nrlfptSFKzjhX
+NZBHtggayW+3UWI//xawf0N40aOPHC1G2tSRyA71qLcLiNQPpxZAWqIW4G+fXkJl
+yFY8EJnQg0pZli6VVaHormz1J3PI1lZ96U5lkbPjqdety92t0/6uekPLxkIkstHU
+RwrtAwTW3BbkXiT4974rfB2W+YvBJoTPLBx/XMtSgVaW6uove3GWC38Y6AIs8pI=
+=dFIL
+-----END PGP SIGNATURE-----
--- a/Show more
+++ b/Show more